git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
sram.c
diff --git
a/arch/arm/plat-omap/sram.c
b/arch/arm/plat-omap/sram.c
index
51f4dfb
..
226b2e8
100644
(file)
--- a/
arch/arm/plat-omap/sram.c
+++ b/
arch/arm/plat-omap/sram.c
@@
-437,6
+437,20
@@
static inline int omap34xx_sram_init(void)
}
#endif
}
#endif
+#ifdef CONFIG_ARCH_OMAP4
+int __init omap44xx_sram_init(void)
+{
+ printk(KERN_ERR "FIXME: %s not implemented\n", __func__);
+
+ return -ENODEV;
+}
+#else
+static inline int omap44xx_sram_init(void)
+{
+ return 0;
+}
+#endif
+
int __init omap_sram_init(void)
{
omap_detect_sram();
int __init omap_sram_init(void)
{
omap_detect_sram();
@@
-451,7
+465,7
@@
int __init omap_sram_init(void)
else if (cpu_is_omap34xx())
omap34xx_sram_init();
else if (cpu_is_omap44xx())
else if (cpu_is_omap34xx())
omap34xx_sram_init();
else if (cpu_is_omap44xx())
- omap
34xx_sram_init(); /* FIXME: */
+ omap
44xx_sram_init();
return 0;
}
return 0;
}