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

git-mirror · Nov 25, 2005 · cd0cca7 · cd0cca7
2 parents 6d9885a + 3238c44
commit cd0cca7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)