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

[pandora-kernel.git] / arch / mips / jazz / setup.c

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index a785797..f60524e 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,10 +76,8 @@ void __init plat_mem_setup(void)
 
        set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
-       if (mips_machtype == MACH_MIPS_MAGNUM_4000)
-               EISA_bus = 1;
+       EISA_bus = 1;
 #endif
-       isa_slot_offset = 0xe3000000;
 
        /* request I/O space for devices used on all i[345]86 PCs */
        for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++)
@@ -200,12 +198,19 @@ static struct platform_device jazz_cmos_pdev = {
        .resource       = jazz_cmos_rsrc
 };
 
+static struct platform_device pcspeaker_pdev = {
+       .name           = "pcspkr",
+       .id             = -1,
+};
+
 static int __init jazz_setup_devinit(void)
 {
        platform_device_register(&jazz_serial8250_device);
        platform_device_register(&jazz_esp_pdev);
        platform_device_register(&jazz_sonic_pdev);
        platform_device_register(&jazz_cmos_pdev);
+       platform_device_register(&pcspeaker_pdev);
+
        return 0;
 }