summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-h4.c
diff options
context:
space:
mode:
authorTony Lindgren2012-10-15 22:53:41 +0200
committerTony Lindgren2012-10-15 22:53:41 +0200
commit7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a (patch)
tree759e7942376794d13a792efd91a0013fec424cb1 /arch/arm/mach-omap2/board-h4.c
parentLinux 3.7-rc1 (diff)
downloadkernel-qcow2-linux-7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a.tar.gz
kernel-qcow2-linux-7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a.tar.xz
kernel-qcow2-linux-7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a.zip
ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h
We can move menelaus.h to live with other mfd headers to get it out of plat for ARM common zImage support. Acked-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
-rw-r--r--arch/arm/mach-omap2/board-h4.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 8d04bf851af4..3977a0276b4c 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -26,12 +26,12 @@
#include <linux/clk.h>
#include <linux/io.h>
#include <linux/input/matrix_keypad.h>
+#include <linux/mfd/menelaus.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
-#include <plat/menelaus.h>
#include <plat/dma.h>
#include <plat/gpmc.h>
#include "debug-devices.h"