diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-26 13:32:22 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-26 13:32:22 -0700 |
| commit | 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 (patch) | |
| tree | e696fcf3eb3b9c6311fc4fa51aa8c89a29aad9c2 /arch/arm/mach-omap2 | |
| parent | 8634155ef41d3a035f2ea0b6c5bed2806f2788bc (diff) | |
| parent | a0212796b58061a9716178d261f318925c246643 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 366ebd93ae2..bd11b0aa949 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-omap/dma-omap.h> #include "debug-devices.h" diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index cea433b9b7b..e3efcb88cb3 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 "mmc.h" #include "mux.h" |