summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-05 18:28:21 (GMT)
committerOlof Johansson <olof@lixom.net>2012-11-05 18:28:21 (GMT)
commit6c97a189592fadaa928aa3e6c673e061823f1597 (patch)
tree5a3962136d574d05a788f0fbac0f36c528efc699 /drivers/mfd
parent365480d67bfa6a3205708d20035abee4d422ee5b (diff)
parent7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a (diff)
downloadlinux-fsl-qoriq-6c97a189592fadaa928aa3e6c673e061823f1597.tar.xz
Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers
Again, resolve conflicts identical to how Tony did. Conflicts: arch/arm/mach-omap2/board-h4.c arch/arm/mach-omap2/board-n8x0.c Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/menelaus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 55d5899..998ce8c 100644
--- 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"