diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-24 18:05:45 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 18:05:45 -0400 |
| commit | 6d02643d64b4440394ee462ea4b870c8506cd9e7 (patch) | |
| tree | e58aba813aa1d040b98355325459ec8ad1c6a4e6 /arch/arm/mach-omap2/board-omap3stalker.c | |
| parent | 3d82cbbb3aadb4f8a30e3f614e51be96574a0855 (diff) | |
| parent | e8c4a7acc9ec0ee82feedcdc3c6d0ee44d67918a (diff) | |
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-omap3stalker.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 3c83b9fbff45..ba1124538b9c 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include "common.h" | 42 | #include "common.h" |
| 43 | #include "gpmc.h" | 43 | #include "gpmc.h" |
| 44 | #include <linux/platform_data/mtd-nand-omap2.h> | 44 | #include <linux/platform_data/mtd-nand-omap2.h> |
| 45 | #include <plat/usb.h> | ||
| 46 | #include <video/omapdss.h> | 45 | #include <video/omapdss.h> |
| 47 | #include <video/omap-panel-generic-dpi.h> | 46 | #include <video/omap-panel-generic-dpi.h> |
| 48 | #include <video/omap-panel-tfp410.h> | 47 | #include <video/omap-panel-tfp410.h> |