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

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)