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/gpmc.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/gpmc.c')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index f14bd3f55218..9472541a4d8d 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <asm/mach-types.h> | 31 | #include <asm/mach-types.h> |
| 32 | 32 | ||
| 33 | #include <plat/cpu.h> | 33 | #include <plat/cpu.h> |
| 34 | #include <plat/sdrc.h> | ||
| 35 | #include <plat/omap_device.h> | 34 | #include <plat/omap_device.h> |
| 36 | 35 | ||
| 37 | #include "soc.h" | 36 | #include "soc.h" |