summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/gpmc.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-17 11:21:34 -0700
committerTony Lindgren <tony@atomide.com>2012-10-17 11:21:34 -0700
commit6832c95599e1a04f4b56b533718d1cda4689aec2 (patch)
tree3faf1a2a744245501c1743c909527d83bbb6666a /arch/arm/mach-omap2/gpmc.c
parent46cddc01aa6a017193ae7320ef8bfc8242782a66 (diff)
parent3e6ece13d966a20a38ee7adfac452a47455ccd7a (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.c1
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 @@
#include <asm/mach-types.h>
#include <plat/cpu.h>
-#include <plat/sdrc.h>
#include <plat/omap_device.h>
#include "soc.h"