summaryrefslogtreecommitdiffstats
path: root/arch/mips/sni/time.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-03 09:42:39 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-03 09:42:39 +0200
commitc61daf6b0a2f7048c6e74d52b043fa6a779b128a (patch)
treea4a38656ac79775f38ce5fd6b00dd9b89cd5ccec /arch/mips/sni/time.c
parentARM: mx50: Select IMX_HAVE_PLATFORM_FEC as done on other i.MX devices (diff)
parentARM: mxc: drop now unused function mxc_register_device (diff)
downloadlinux-c61daf6b0a2f7048c6e74d52b043fa6a779b128a.tar.xz
linux-c61daf6b0a2f7048c6e74d52b043fa6a779b128a.zip
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-cleanup
Diffstat (limited to 'arch/mips/sni/time.c')
-rw-r--r--arch/mips/sni/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index 0904d4d30cb3..ec0be14996a4 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -1,11 +1,11 @@
#include <linux/types.h>
+#include <linux/i8253.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/smp.h>
#include <linux/time.h>
#include <linux/clockchips.h>
-#include <asm/i8253.h>
#include <asm/sni.h>
#include <asm/time.h>
#include <asm-generic/rtc.h>