diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-24 21:41:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-24 21:41:59 -0500 |
| commit | cd0cca7bf5e201dcea5632f78ad9b37cb419a5df (patch) | |
| tree | 6acc75299ea7a3b9db84e59b8ac268827f397fb2 | |
| parent | 6d9885a8ce45cd9b7d36517ee823a480eaf95c02 (diff) | |
| parent | 3238c448c6e26d7c26d2e9b070ef149d066cb6c2 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -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 @@ | |||
| 4 | * IOP3xx architecture timex specifications | 4 | * IOP3xx architecture timex specifications |
| 5 | */ | 5 | */ |
| 6 | #include <linux/config.h> | 6 | #include <linux/config.h> |
| 7 | 7 | #include <asm/hardware.h> | |
| 8 | 8 | ||
| 9 | #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) | 9 | #if defined(CONFIG_ARCH_IQ80321) || defined(CONFIG_ARCH_IQ31244) |
| 10 | 10 | ||