diff options
author | Tony Lindgren <tony@atomide.com> | 2012-10-25 15:21:48 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-10-25 15:21:48 -0400 |
commit | 2da8a79f7d81853d00b6a00621aeef7545196084 (patch) | |
tree | 5a3962136d574d05a788f0fbac0f36c528efc699 | |
parent | 6d02643d64b4440394ee462ea4b870c8506cd9e7 (diff) | |
parent | 7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a (diff) |
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n8x0.c
-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 366ebd93ae24..bd11b0aa9495 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
@@ -26,12 +26,12 @@ | |||
26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
28 | #include <linux/input/matrix_keypad.h> | 28 | #include <linux/input/matrix_keypad.h> |
29 | #include <linux/mfd/menelaus.h> | ||
29 | 30 | ||
30 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
31 | #include <asm/mach/arch.h> | 32 | #include <asm/mach/arch.h> |
32 | #include <asm/mach/map.h> | 33 | #include <asm/mach/map.h> |
33 | 34 | ||
34 | #include <plat/menelaus.h> | ||
35 | #include <plat-omap/dma-omap.h> | 35 | #include <plat-omap/dma-omap.h> |
36 | #include "debug-devices.h" | 36 | #include "debug-devices.h" |
37 | 37 | ||
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index cea433b9b7b9..e3efcb88cb3b 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
@@ -22,13 +22,13 @@ | |||
22 | #include <linux/usb/musb.h> | 22 | #include <linux/usb/musb.h> |
23 | #include <linux/platform_data/spi-omap2-mcspi.h> | 23 | #include <linux/platform_data/spi-omap2-mcspi.h> |
24 | #include <linux/platform_data/mtd-onenand-omap2.h> | 24 | #include <linux/platform_data/mtd-onenand-omap2.h> |
25 | #include <linux/mfd/menelaus.h> | ||
25 | #include <sound/tlv320aic3x.h> | 26 | #include <sound/tlv320aic3x.h> |
26 | 27 | ||
27 | #include <asm/mach/arch.h> | 28 | #include <asm/mach/arch.h> |
28 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
29 | 30 | ||
30 | #include "common.h" | 31 | #include "common.h" |
31 | #include <plat/menelaus.h> | ||
32 | #include "mmc.h" | 32 | #include "mmc.h" |
33 | 33 | ||
34 | #include "mux.h" | 34 | #include "mux.h" |
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 55d589981412..998ce8cb3065 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
@@ -41,11 +41,11 @@ | |||
41 | #include <linux/rtc.h> | 41 | #include <linux/rtc.h> |
42 | #include <linux/bcd.h> | 42 | #include <linux/bcd.h> |
43 | #include <linux/slab.h> | 43 | #include <linux/slab.h> |
44 | #include <linux/mfd/menelaus.h> | ||
44 | 45 | ||
45 | #include <asm/mach/irq.h> | 46 | #include <asm/mach/irq.h> |
46 | 47 | ||
47 | #include <asm/gpio.h> | 48 | #include <asm/gpio.h> |
48 | #include <plat/menelaus.h> | ||
49 | 49 | ||
50 | #define DRIVER_NAME "menelaus" | 50 | #define DRIVER_NAME "menelaus" |
51 | 51 | ||
diff --git a/arch/arm/plat-omap/include/plat/menelaus.h b/include/linux/mfd/menelaus.h index 4a970ec62dd1..f097e89134cb 100644 --- a/arch/arm/plat-omap/include/plat/menelaus.h +++ b/include/linux/mfd/menelaus.h | |||
@@ -1,6 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * arch/arm/plat-omap/include/mach/menelaus.h | ||
3 | * | ||
4 | * Functions to access Menelaus power management chip | 2 | * Functions to access Menelaus power management chip |
5 | */ | 3 | */ |
6 | 4 | ||