Merge branch 'ptebits' into devel

[karo-tx-linux.git] / arch / arm / mach-footbridge / time.c

diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c
index 004819ea85c8338cc126f449091621bd06379b02..cd1b54ff9fe2bc91dd81a9d258a4c5bafdaa8af7 100644 (file)
--- a/arch/arm/mach-footbridge/time.c
+++ b/arch/arm/mach-footbridge/time.c
@@ -22,9 +22,9 @@
 #include <linux/sched.h>
 #include <linux/mc146818rtc.h>
 #include <linux/bcd.h>
+#include <linux/io.h>
 
 #include <mach/hardware.h>
-#include <asm/io.h>
 
 #include <asm/mach/time.h>
 #include "common.h"