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

cd0cca7b · Linus Torvalds · 6d9885a8 · 3238c448 · cd0cca7b
Commit cd0cca7b authored Nov 24, 2005 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/asm-arm/arch-iop3xx/timex.h include/asm-arm/arch-iop3xx/timex.h +1 -1

No files found.
--- 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)