diff options
author | Gerhard Pircher <gerhard_pircher@gmx.net> | 2009-06-19 07:40:57 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-19 20:12:21 -0400 |
commit | 66dc3304f3875ea85c630a57a88ecf79032890c4 (patch) | |
tree | 89fd0c5a862e7f429aa0bc9115a29fd5193e68d3 /arch/powerpc | |
parent | c124891f50f11e33acdfa276864ea089bab726b6 (diff) |
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')
-rw-r--r-- | arch/powerpc/platforms/amigaone/setup.c | 6 |
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) | |||
110 | irq_set_default_host(i8259_get_host()); | 110 | irq_set_default_host(i8259_get_host()); |
111 | } | 111 | } |
112 | 112 | ||
113 | void __init amigaone_init(void) | 113 | static int __init request_isa_regions(void) |
114 | { | 114 | { |
115 | request_region(0x00, 0x20, "dma1"); | 115 | request_region(0x00, 0x20, "dma1"); |
116 | request_region(0x40, 0x20, "timer"); | 116 | request_region(0x40, 0x20, "timer"); |
117 | request_region(0x80, 0x10, "dma page reg"); | 117 | request_region(0x80, 0x10, "dma page reg"); |
118 | request_region(0xc0, 0x20, "dma2"); | 118 | request_region(0xc0, 0x20, "dma2"); |
119 | |||
120 | return 0; | ||
119 | } | 121 | } |
122 | machine_device_initcall(amigaone, request_isa_regions); | ||
120 | 123 | ||
121 | void amigaone_restart(char *cmd) | 124 | void amigaone_restart(char *cmd) |
122 | { | 125 | { |
@@ -161,7 +164,6 @@ define_machine(amigaone) { | |||
161 | .name = "AmigaOne", | 164 | .name = "AmigaOne", |
162 | .probe = amigaone_probe, | 165 | .probe = amigaone_probe, |
163 | .setup_arch = amigaone_setup_arch, | 166 | .setup_arch = amigaone_setup_arch, |
164 | .init = amigaone_init, | ||
165 | .show_cpuinfo = amigaone_show_cpuinfo, | 167 | .show_cpuinfo = amigaone_show_cpuinfo, |
166 | .init_IRQ = amigaone_init_IRQ, | 168 | .init_IRQ = amigaone_init_IRQ, |
167 | .restart = amigaone_restart, | 169 | .restart = amigaone_restart, |