diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-24 15:05:45 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-24 15:05:45 -0700 |
| commit | 6d02643d64b4440394ee462ea4b870c8506cd9e7 (patch) | |
| tree | e58aba813aa1d040b98355325459ec8ad1c6a4e6 /arch/arm/mach-omap2/board-overo.c | |
| parent | 3d82cbbb3aadb4f8a30e3f614e51be96574a0855 (diff) | |
| parent | e8c4a7acc9ec0ee82feedcdc3c6d0ee44d67918a (diff) | |
| download | op-kernel-dev-6d02643d64b4440394ee462ea4b870c8506cd9e7.zip op-kernel-dev-6d02643d64b4440394ee462ea4b870c8506cd9e7.tar.gz | |
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-overo.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 3a9d1fa..1cfb037 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -49,11 +49,11 @@ #include <video/omapdss.h> #include <video/omap-panel-generic-dpi.h> #include <video/omap-panel-tfp410.h> -#include "gpmc.h" -#include <plat/usb.h> +#include "common.h" #include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" +#include "gpmc.h" #include "hsmmc.h" #include "board-flash.h" #include "common-board-devices.h" |
