X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Fqemu%2Fq-setup.c;fp=arch%2Fmips%2Fqemu%2Fq-setup.c;h=022eb1af6db12f5f8942b34061c4907096b29e9a;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=841394336f0045d518104821de2c49c7b7aa9eb5;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/arch/mips/qemu/q-setup.c b/arch/mips/qemu/q-setup.c
index 841394336..022eb1af6 100644
--- a/arch/mips/qemu/q-setup.c
+++ b/arch/mips/qemu/q-setup.c
@@ -2,8 +2,6 @@
 #include <asm/io.h>
 #include <asm/time.h>
 
-extern void qemu_reboot_setup(void);
-
 #define QEMU_PORT_BASE 0xb4000000
 
 const char *get_system_type(void)
@@ -11,7 +9,7 @@ const char *get_system_type(void)
 	return "Qemu";
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+static void __init qemu_timer_setup(struct irqaction *irq)
 {
 	/* set the clock to 100 Hz */
 	outb_p(0x34,0x43);		/* binary, mode 2, LSB/MSB, ch 0 */
@@ -20,8 +18,8 @@ void __init plat_timer_setup(struct irqaction *irq)
 	setup_irq(0, irq);
 }
 
-void __init plat_mem_setup(void)
+void __init plat_setup(void)
 {
 	set_io_port_base(QEMU_PORT_BASE);
-	qemu_reboot_setup();
+	board_timer_setup = qemu_timer_setup;
 }