diff options
author | Dave Jones <davej@redhat.com> | 2005-11-29 12:48:34 -0800 |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2005-11-29 12:48:34 -0800 |
commit | be37bdbce7ceaacf4f20c6cc759efbe75ebd1196 (patch) | |
tree | f1a42fb5a4a17eea41d47d2c002fa303009f5523 /include/asm-arm/arch-iop3xx/timex.h | |
parent | 019a61b99338d0ac05de25317b85da88e7ec4b35 (diff) | |
parent | d70aa5e4b54aa7e704c886838715ac8a45d5750f (diff) | |
download | op-kernel-dev-be37bdbce7ceaacf4f20c6cc759efbe75ebd1196.zip op-kernel-dev-be37bdbce7ceaacf4f20c6cc759efbe75ebd1196.tar.gz |
Merge ../linus
Diffstat (limited to 'include/asm-arm/arch-iop3xx/timex.h')
-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 d4187fe..472badb 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) |