diff options
| author | Tony Lindgren | 2012-10-17 20:21:34 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2012-10-17 20:21:34 +0200 |
| commit | 6832c95599e1a04f4b56b533718d1cda4689aec2 (patch) | |
| tree | 3faf1a2a744245501c1743c909527d83bbb6666a /arch/arm/mach-omap2/board-omap3logic.c | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-h... (diff) | |
| parent | ARM: OMAP: move plat-omap/include/plat/sdrc.h into mach-omap2/sdrc.h (diff) | |
| download | kernel-qcow2-linux-6832c95599e1a04f4b56b533718d1cda4689aec2.tar.gz kernel-qcow2-linux-6832c95599e1a04f4b56b533718d1cda4689aec2.tar.xz kernel-qcow2-linux-6832c95599e1a04f4b56b533718d1cda4689aec2.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.c
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 5cfade235bb4..6f58cad5bf74 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -34,9 +34,6 @@ #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include "gpmc-smsc911x.h" -#include "gpmc.h" -#include <plat/sdrc.h> #include <plat/usb.h> #include "common.h" @@ -44,6 +41,8 @@ #include "hsmmc.h" #include "control.h" #include "common-board-devices.h" +#include "gpmc.h" +#include "gpmc-smsc911x.h" #define OMAP3LOGIC_SMSC911X_CS 1 |