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 branch 'depends/rmk/memory_h' into next/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-generic.c
diff --git
a/arch/arm/mach-omap1/board-generic.c
b/arch/arm/mach-omap1/board-generic.c
index
04fc356
..
5a9a54d
100644
(file)
--- a/
arch/arm/mach-omap1/board-generic.c
+++ b/
arch/arm/mach-omap1/board-generic.c
@@
-28,12
+28,6
@@
#include <plat/board.h>
#include <plat/common.h>
#include <plat/board.h>
#include <plat/common.h>
-static void __init omap_generic_init_irq(void)
-{
- omap1_init_common_hw();
- omap1_init_irq();
-}
-
/* assume no Mini-AB port */
#ifdef CONFIG_ARCH_OMAP15XX
/* assume no Mini-AB port */
#ifdef CONFIG_ARCH_OMAP15XX
@@
-87,17
+81,13
@@
static void __init omap_generic_init(void)
omap_register_i2c_bus(1, 100, NULL, 0);
}
omap_register_i2c_bus(1, 100, NULL, 0);
}
-static void __init omap_generic_map_io(void)
-{
- omap1_map_common_io();
-}
-
MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
/* Maintainer: Tony Lindgren <tony@atomide.com> */
MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
/* Maintainer: Tony Lindgren <tony@atomide.com> */
- .boot_params = 0x10000100,
- .map_io = omap_generic_map_io,
+ .atag_offset = 0x100,
+ .map_io = omap16xx_map_io,
+ .init_early = omap1_init_early,
.reserve = omap_reserve,
.reserve = omap_reserve,
- .init_irq = omap
_generic
_init_irq,
+ .init_irq = omap
1
_init_irq,
.init_machine = omap_generic_init,
.timer = &omap1_timer,
MACHINE_END
.init_machine = omap_generic_init,
.timer = &omap1_timer,
MACHINE_END