summaryrefslogtreecommitdiff
path: root/arch/arm/plat-omap/include/mach/gpmc.h
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2009-01-28 22:27:31 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 20:50:38 +0300
commitf8de9b2c45c4506702da4bd3a5bc7630754077f9 (patch)
treef375f808bfdc0ef8c83671aca66f3150b08e44e5 /arch/arm/plat-omap/include/mach/gpmc.h
parentfed415e48f07799b278cd4353385fee1464d4aca (diff)
downloadlinux-f8de9b2c45c4506702da4bd3a5bc7630754077f9.tar.xz
[ARM] OMAP2 SDRC: move mach-omap2/memory.h into mach/sdrc.h
Move the contents of the arch/arm/mach-omap2/memory.h file to the existing mach/sdrc.h file, and remove memory.h. Modify files which include memory.h to include asm/arch/sdrc.h instead. linux-omap source commit is e7ae2d89921372fc4b9712a32cc401d645597807. Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-omap/include/mach/gpmc.h')
-rw-r--r--arch/arm/plat-omap/include/mach/gpmc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/gpmc.h b/arch/arm/plat-omap/include/mach/gpmc.h
index 45b678439bb7..921b16532ff5 100644
--- a/arch/arm/plat-omap/include/mach/gpmc.h
+++ b/arch/arm/plat-omap/include/mach/gpmc.h
@@ -103,6 +103,6 @@ extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
extern void gpmc_cs_free(int cs);
extern int gpmc_cs_set_reserved(int cs, int reserved);
extern int gpmc_cs_reserved(int cs);
-extern void gpmc_init(void);
+extern void __init gpmc_init(void);
#endif