Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid

[powerpc.git] / arch / mips / qemu / q-setup.c

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