summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/amigaone
diff options
context:
space:
mode:
authorGerhard Pircher <gerhard_pircher@gmx.net>2009-06-19 11:40:57 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-08-20 10:12:21 +1000
commit66dc3304f3875ea85c630a57a88ecf79032890c4 (patch)
tree89fd0c5a862e7f429aa0bc9115a29fd5193e68d3 /arch/powerpc/platforms/amigaone
parentc124891f50f11e33acdfa276864ea089bab726b6 (diff)
downloadblackbird-op-linux-66dc3304f3875ea85c630a57a88ecf79032890c4.tar.gz
blackbird-op-linux-66dc3304f3875ea85c630a57a88ecf79032890c4.zip
powerpc/amigaone: Convert amigaone_init() to a machine_device_initcall()
This allows to remove the ppc_md.init() hook in the setup code. Signed-off-by: Gerhard Pircher <gerhard_pircher@gmx.net> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/amigaone')
-rw-r--r--arch/powerpc/platforms/amigaone/setup.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index 443035366c12..9290a7a442d0 100644
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -110,13 +110,16 @@ void __init amigaone_init_IRQ(void)
irq_set_default_host(i8259_get_host());
}
-void __init amigaone_init(void)
+static int __init request_isa_regions(void)
{
request_region(0x00, 0x20, "dma1");
request_region(0x40, 0x20, "timer");
request_region(0x80, 0x10, "dma page reg");
request_region(0xc0, 0x20, "dma2");
+
+ return 0;
}
+machine_device_initcall(amigaone, request_isa_regions);
void amigaone_restart(char *cmd)
{
@@ -161,7 +164,6 @@ define_machine(amigaone) {
.name = "AmigaOne",
.probe = amigaone_probe,
.setup_arch = amigaone_setup_arch,
- .init = amigaone_init,
.show_cpuinfo = amigaone_show_cpuinfo,
.init_IRQ = amigaone_init_IRQ,
.restart = amigaone_restart,
OpenPOWER on IntegriCloud