Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

[linux-2.6-omap-h63xx.git] / arch / mips / sgi-ip22 / ip22-platform.c

diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index fc6df96305ed24e261453fae13e821d1e5bf1aba..52486c4d2b019739be2db360e3cbc8b7dd1fd847 100644 (file)
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -150,7 +150,7 @@ static int __init sgiseeq_devinit(void)
                return res;
 
        /* Second HPC is missing? */
-       if (!ip22_is_fullhouse() ||
+       if (ip22_is_fullhouse() ||
            get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
                return 0;
 
@@ -188,8 +188,7 @@ static int __init sgi_button_devinit(void)
        if (ip22_is_fullhouse())
                return 0; /* full house has no volume buttons */
 
-       return IS_ERR(platform_device_register_simple("sgiindybtns",
-                                                     -1, NULL, 0));
+       return IS_ERR(platform_device_register_simple("sgibtns", -1, NULL, 0));
 }
 
 device_initcall(sgi_button_devinit);