diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:21:34 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-17 14:21:34 -0400 |
| commit | 6832c95599e1a04f4b56b533718d1cda4689aec2 (patch) | |
| tree | 3faf1a2a744245501c1743c909527d83bbb6666a /arch/arm/mach-omap2/board-omap3logic.c | |
| parent | 46cddc01aa6a017193ae7320ef8bfc8242782a66 (diff) | |
| parent | 3e6ece13d966a20a38ee7adfac452a47455ccd7a (diff) | |
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 @@ | |||
| 34 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
| 35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
| 36 | 36 | ||
| 37 | #include "gpmc-smsc911x.h" | ||
| 38 | #include "gpmc.h" | ||
| 39 | #include <plat/sdrc.h> | ||
| 40 | #include <plat/usb.h> | 37 | #include <plat/usb.h> |
| 41 | 38 | ||
| 42 | #include "common.h" | 39 | #include "common.h" |
| @@ -44,6 +41,8 @@ | |||
| 44 | #include "hsmmc.h" | 41 | #include "hsmmc.h" |
| 45 | #include "control.h" | 42 | #include "control.h" |
| 46 | #include "common-board-devices.h" | 43 | #include "common-board-devices.h" |
| 44 | #include "gpmc.h" | ||
| 45 | #include "gpmc-smsc911x.h" | ||
| 47 | 46 | ||
| 48 | #define OMAP3LOGIC_SMSC911X_CS 1 | 47 | #define OMAP3LOGIC_SMSC911X_CS 1 |
| 49 | 48 | ||