diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-25 00:05:45 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-25 00:05:45 +0200 |
| commit | 6d02643d64b4440394ee462ea4b870c8506cd9e7 (patch) | |
| tree | e58aba813aa1d040b98355325459ec8ad1c6a4e6 /arch/arm/mach-omap2/board-ldp.c | |
| parent | ARM: OMAP: Split plat/serial.h for omap1 and omap2+ (diff) | |
| parent | ARM: OMAP: move OMAP USB platform data to <linux/platform_data/omap-usb.h> (diff) | |
| download | linux-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-ldp.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-ldp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index 35ee018d9289..1164b1061038 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -35,9 +35,8 @@ #include <asm/mach/map.h> #include "common.h" -#include "gpmc.h" #include "board-zoom.h" -#include <plat/usb.h> +#include "gpmc.h" #include "gpmc-smsc911x.h" #include <video/omapdss.h> |