projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
io.c
diff --git
a/arch/arm/mach-omap1/io.c
b/arch/arm/mach-omap1/io.c
index
82d556b
..
81c4e73
100644
(file)
--- a/
arch/arm/mach-omap1/io.c
+++ b/
arch/arm/mach-omap1/io.c
@@
-8,7
+8,6
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-22,6
+21,7
@@
extern int omap1_clk_init(void);
extern void omap_check_revision(void);
extern void omap_sram_init(void);
extern int omap1_clk_init(void);
extern void omap_check_revision(void);
extern void omap_sram_init(void);
+extern void omapfb_reserve_sdram(void);
/*
* The machine specific code may provide the extra mapping besides the
/*
* The machine specific code may provide the extra mapping besides the
@@
-110,7
+110,7
@@
void __init omap1_map_common_io(void)
}
#endif
#ifdef CONFIG_ARCH_OMAP15XX
}
#endif
#ifdef CONFIG_ARCH_OMAP15XX
- if (cpu_is_omap15
10
()) {
+ if (cpu_is_omap15
xx
()) {
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
}
#endif
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
}
#endif
@@
-121,6
+121,7
@@
void __init omap1_map_common_io(void)
#endif
omap_sram_init();
#endif
omap_sram_init();
+ omapfb_reserve_sdram();
}
/*
}
/*