summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-igep0020.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-25 00:05:45 +0200
committerTony Lindgren <tony@atomide.com>2012-10-25 00:05:45 +0200
commit6d02643d64b4440394ee462ea4b870c8506cd9e7 (patch)
treee58aba813aa1d040b98355325459ec8ad1c6a4e6 /arch/arm/mach-omap2/board-igep0020.c
parentARM: OMAP: Split plat/serial.h for omap1 and omap2+ (diff)
parentARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h> (diff)
downloadlinux-6d02643d64b4440394ee462ea4b870c8506cd9e7.tar.xz
linux-6d02643d64b4440394ee462ea4b870c8506cd9e7.zip
Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-headers
Conflicts: arch/arm/mach-omap1/clock.c arch/arm/mach-omap2/board-2430sdp.c arch/arm/mach-omap2/board-4430sdp.c arch/arm/mach-omap2/board-cm-t35.c arch/arm/mach-omap2/board-igep0020.c arch/arm/mach-omap2/board-ldp.c arch/arm/mach-omap2/board-omap3beagle.c arch/arm/mach-omap2/board-omap3logic.c arch/arm/mach-omap2/board-omap4panda.c arch/arm/mach-omap2/board-overo.c arch/arm/mach-omap2/board-rm680.c arch/arm/mach-omap2/board-rx51.c arch/arm/mach-omap2/twl-common.c arch/arm/mach-omap2/usb-host.c arch/arm/mach-omap2/usb-musb.c
Diffstat (limited to 'arch/arm/mach-omap2/board-igep0020.c')
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 9a9a9b5f78b6..dbc705ac4334 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -29,14 +29,12 @@
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include "common.h"
-#include "gpmc.h"
-#include <plat/usb.h>
-
#include <video/omapdss.h>
#include <video/omap-panel-tfp410.h>
#include <linux/platform_data/mtd-onenand-omap2.h>
+#include "common.h"
+#include "gpmc.h"
#include "mux.h"
#include "hsmmc.h"
#include "sdram-numonyx-m65kxxxxam.h"