git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
arm
/
mach-omap1
/
io.c
diff --git
a/arch/arm/mach-omap1/io.c
b/arch/arm/mach-omap1/io.c
index
fab8b0b
..
82d556b
100644
(file)
--- a/
arch/arm/mach-omap1/io.c
+++ b/
arch/arm/mach-omap1/io.c
@@
-8,6
+8,7
@@
* 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>
@@
-17,7
+18,6
@@
#include <asm/io.h>
#include <asm/arch/mux.h>
#include <asm/arch/tc.h>
#include <asm/io.h>
#include <asm/arch/mux.h>
#include <asm/arch/tc.h>
-#include <asm/arch/omapfb.h>
extern int omap1_clk_init(void);
extern void omap_check_revision(void);
extern int omap1_clk_init(void);
extern void omap_check_revision(void);
@@
-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
xx
()) {
+ if (cpu_is_omap15
10
()) {
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
}
#endif
iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));
}
#endif
@@
-121,7
+121,6
@@
void __init omap1_map_common_io(void)
#endif
omap_sram_init();
#endif
omap_sram_init();
- omapfb_reserve_mem();
}
/*
}
/*