diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-15 13:53:41 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-15 13:53:41 -0700 |
| commit | 7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a (patch) | |
| tree | 759e7942376794d13a792efd91a0013fec424cb1 | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/menelaus.c | 2 | ||||
| -rw-r--r-- | include/linux/mfd/menelaus.h (renamed from arch/arm/plat-omap/include/plat/menelaus.h) | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 8d04bf851af..3977a0276b4 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" diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index d95f727ca39..e3e8325054b 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c @@ -22,13 +22,13 @@ #include <linux/usb/musb.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/mtd-onenand-omap2.h> +#include <linux/mfd/menelaus.h> #include <sound/tlv320aic3x.h> #include <asm/mach/arch.h> #include <asm/mach-types.h> #include "common.h" -#include <plat/menelaus.h> #include <plat/mmc.h> #include "mux.h" diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 55d58998141..998ce8cb306 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" diff --git a/arch/arm/plat-omap/include/plat/menelaus.h b/include/linux/mfd/menelaus.h index 4a970ec62dd..f097e89134c 100644 --- a/arch/arm/plat-omap/include/plat/menelaus.h +++ b/include/linux/mfd/menelaus.h @@ -1,6 +1,4 @@ /* - * arch/arm/plat-omap/include/mach/menelaus.h - * * Functions to access Menelaus power management chip */ |