diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-25 03:41:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-25 03:41:59 +0100 |
| commit | cd0cca7bf5e201dcea5632f78ad9b37cb419a5df (patch) | |
| tree | 6acc75299ea7a3b9db84e59b8ac268827f397fb2 /include | |
| parent | [PATCH] fbcon: fix obvious bug in fbcon logo rotation code (diff) | |
| parent | [ARM] 3173/1: Fix to allow 2.6.15-rc2 to compile for IOP3xx boards (diff) | |
| download | linux-cd0cca7bf5e201dcea5632f78ad9b37cb419a5df.tar.xz linux-cd0cca7bf5e201dcea5632f78ad9b37cb419a5df.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-iop3xx/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-iop3xx/timex.h b/include/asm-arm/arch-iop3xx/timex.h index d4187fe9a85a..472badb451c4 100644 --- a/include/asm-arm/arch-iop3xx/timex.h +++ b/include/asm-arm/arch-iop3xx/timex.h @@ -4,7 +4,7 @@ * IOP3xx architecture timex specifications */ #include <linux/config.h> - +#include <asm/hardware.h> #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) |