projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
arch
/
arm
/
mach-omap1
/
board-innovator.c
diff --git
a/arch/arm/mach-omap1/board-innovator.c
b/arch/arm/mach-omap1/board-innovator.c
index
95f1ff3
..
a04e433
100644
(file)
--- a/
arch/arm/mach-omap1/board-innovator.c
+++ b/
arch/arm/mach-omap1/board-innovator.c
@@
-181,6
+181,7
@@
static void __init innovator_init_smc91x(void)
void innovator_init_irq(void)
{
void innovator_init_irq(void)
{
+ omap1_init_common_hw();
omap_init_irq();
omap_gpio_init();
#ifdef CONFIG_ARCH_OMAP15XX
omap_init_irq();
omap_gpio_init();
#ifdef CONFIG_ARCH_OMAP15XX
@@
-285,7
+286,7
@@
static void __init innovator_init(void)
static void __init innovator_map_io(void)
{
static void __init innovator_map_io(void)
{
- omap_map_common_io();
+ omap
1
_map_common_io();
#ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) {
#ifdef CONFIG_ARCH_OMAP15XX
if (cpu_is_omap1510()) {
@@
-303,7
+304,6
@@
static void __init innovator_map_io(void)
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
/* Maintainer: MontaVista Software, Inc. */
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
/* Maintainer: MontaVista Software, Inc. */
- .phys_ram = 0x10000000,
.phys_io = 0xfff00000,
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
.boot_params = 0x10000100,
.phys_io = 0xfff00000,
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
.boot_params = 0x10000100,