summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-n8x0.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-25 12:21:48 -0700
committerTony Lindgren <tony@atomide.com>2012-10-25 12:21:48 -0700
commit2da8a79f7d81853d00b6a00621aeef7545196084 (patch)
tree5a3962136d574d05a788f0fbac0f36c528efc699 /arch/arm/mach-omap2/board-n8x0.c
parent6d02643d64b4440394ee462ea4b870c8506cd9e7 (diff)
parent7bd3b61853da6d2fc579e27c7a1ac1e9fc968d1a (diff)
downloadop-kernel-dev-2da8a79f7d81853d00b6a00621aeef7545196084.zip
op-kernel-dev-2da8a79f7d81853d00b6a00621aeef7545196084.tar.gz
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-n8x0.c')
-rw-r--r--arch/arm/mach-omap2/board-n8x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index cea433b..e3efcb8 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"
OpenPOWER on IntegriCloud