diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-25 12:21:48 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-25 12:21:48 -0700 |
| commit | 2da8a79f7d81853d00b6a00621aeef7545196084 (patch) | |
| tree | 5a3962136d574d05a788f0fbac0f36c528efc699 /arch/arm/mach-omap2/board-h4.c | |
| 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
Diffstat (limited to 'arch/arm/mach-omap2/board-h4.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 2 |
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 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" |