Merge tag 'upstream-3.8-rc1' of git://git.infradead.org/linux-ubi

[karo-tx-linux.git] / drivers / mfd / menelaus.c

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 55d589981412ec6b956566727ed05bbdbdb15982..998ce8cb3065a5a68dc2c09289e13e68826c341b 100644 (file)
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -41,11 +41,11 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/slab.h>
+#include <linux/mfd/menelaus.h>
 
 #include <asm/mach/irq.h>
 
 #include <asm/gpio.h>
-#include <plat/menelaus.h>
 
 #define DRIVER_NAME                    "menelaus"