summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/gpmc.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2008-10-06 15:49:36 +0300
committerTony Lindgren <tony@atomide.com>2008-10-06 15:49:36 +0300
commit646e3ed1a349fbccce651fed2d3987f0e7b0f0f4 (patch)
treeb9c4d52027da1468e52294f3f8db3afb0720c86d /arch/arm/mach-omap2/gpmc.c
parentfd1dc87ded0f29c1ba1e8da62f03ab0d591d9bdd (diff)
ARM: OMAP2: Misc updates from linux-omap tree
Misc updates from linux-omap tree, mostly to update common device initialization and add missing defines from linux-omap tree. Also some changes to make room for adding 34xx in following patches. Note that the I2C resources are now set up in arch/arm/plat-omap/i2c.c helper, and can be removed from devices.c. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/gpmc.c')
-rw-r--r--arch/arm/mach-omap2/gpmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index be6a75306f10..149bfba43cfe 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -23,7 +23,7 @@
#include <asm/mach-types.h>
#include <mach/gpmc.h>
-#include "memory.h"
+#include <mach/sdrc.h>
/* GPMC register offsets */
#define GPMC_REVISION 0x00