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

[linux-2.6-microblaze.git] / drivers / rtc / rtc-sh.c

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 6d87e26..d0d2b04 100644 (file)
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -649,8 +649,9 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
        clk_enable(rtc->clk);
 
        rtc->capabilities = RTC_DEF_CAPABILITIES;
-       if (pdev->dev.platform_data) {
-               struct sh_rtc_platform_info *pinfo = pdev->dev.platform_data;
+       if (dev_get_platdata(&pdev->dev)) {
+               struct sh_rtc_platform_info *pinfo =
+                       dev_get_platdata(&pdev->dev);
 
                /*
                 * Some CPUs have special capabilities in addition to the