Merge master.kernel.org:/home/rmk/linux-2.6-arm

cd0cca7b · Linus Torvalds <[email protected]> · 2005-11-24 18:41:59 -08:00

Merge commit. Changes below are compared with the first parent: 6d9885a8.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
include/asm-arm/arch-iop3xx/timex.h	modified	+1	−1	View file

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)
 