Merge branch 'devel-map-io' into omap-for-linus
This commit is contained in:
@@ -678,6 +678,7 @@ MACHINE_START(NOKIA_N800, "Nokia N800")
|
||||
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x80000100,
|
||||
.map_io = n8x0_map_io,
|
||||
.reserve = omap_reserve,
|
||||
.init_irq = n8x0_init_irq,
|
||||
.init_machine = n8x0_init_machine,
|
||||
.timer = &omap_timer,
|
||||
@@ -688,6 +689,7 @@ MACHINE_START(NOKIA_N810, "Nokia N810")
|
||||
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x80000100,
|
||||
.map_io = n8x0_map_io,
|
||||
.reserve = omap_reserve,
|
||||
.init_irq = n8x0_init_irq,
|
||||
.init_machine = n8x0_init_machine,
|
||||
.timer = &omap_timer,
|
||||
@@ -698,6 +700,7 @@ MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
|
||||
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x80000100,
|
||||
.map_io = n8x0_map_io,
|
||||
.reserve = omap_reserve,
|
||||
.init_irq = n8x0_init_irq,
|
||||
.init_machine = n8x0_init_machine,
|
||||
.timer = &omap_timer,
|
||||
|
Reference in New Issue
Block a user