Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

[mv-sheeva.git] / drivers / char / rtc.c

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 95acb8c880f4f1ad61766b13d7235ecdc6367811..dfa8b3062fdad831485c7c8ee1f36839b6377a2f 100644 (file)
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -961,7 +961,7 @@ static int __init rtc_init(void)
 #endif
 #ifdef CONFIG_SPARC32
        struct device_node *ebus_dp;
-       struct of_device *op;
+       struct platform_device *op;
 #else
        void *r;
 #ifdef RTC_IRQ