Merge branch 'linus' into sched/urgent

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

diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
index 2ee401ba0b2568edb7bb1c503df5eb880c8589d3..511e9ff2acfd997751d1b86b80e7165e262052a9 100644 (file)
--- a/arch/mips/sgi-ip32/ip32-platform.c
+++ b/arch/mips/sgi-ip32/ip32-platform.c
@@ -85,21 +85,26 @@ device_initcall(sgio2audio_devinit);
 
 static __init int sgio2btns_devinit(void)
 {
-       struct platform_device *pd;
-       int ret;
+       return IS_ERR(platform_device_register_simple("sgibtns", -1, NULL, 0));
+}
 
-       pd = platform_device_alloc("sgio2btns", -1);
-       if (!pd)
-               return -ENOMEM;
+device_initcall(sgio2btns_devinit);
 
-       ret = platform_device_add(pd);
-       if (ret)
-               platform_device_put(pd);
+static struct resource sgio2_cmos_rsrc[] = {
+       {
+               .start = 0x70,
+               .end   = 0x71,
+               .flags = IORESOURCE_IO
+       }
+};
 
-       return ret;
+static __init int sgio2_cmos_devinit(void)
+{
+       return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
+                                                     sgio2_cmos_rsrc, 1));
 }
 
-device_initcall(sgio2btns_devinit);
+device_initcall(sgio2_cmos_devinit);
 
 MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
 MODULE_LICENSE("GPL");