From a1cdd2cac2abf664ca41624f24ce78ba67cc683e Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 16 May 2007 22:11:14 -0700 Subject: [PATCH] --- yaml --- r: 56529 b: refs/heads/master c: 558a40f708bbfb1b260d605cca6c3b9d2c86453e h: refs/heads/master i: 56527: 78434bd94ca3a5bcb63b5a80a3c65d9bda766f5e v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-omap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8e5589c2a370..5ea622ee87c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83c6590cb83d3106df12fee36ac2a261951b8c88 +refs/heads/master: 558a40f708bbfb1b260d605cca6c3b9d2c86453e diff --git a/trunk/drivers/rtc/rtc-omap.c b/trunk/drivers/rtc/rtc-omap.c index 60a8a4bb8bd2..a2f84f169588 100644 --- a/trunk/drivers/rtc/rtc-omap.c +++ b/trunk/drivers/rtc/rtc-omap.c @@ -371,7 +371,7 @@ static int __devinit omap_rtc_probe(struct platform_device *pdev) goto fail; } platform_set_drvdata(pdev, rtc); - dev_set_devdata(&rtc->dev, mem); + dev_set_drvdata(&rtc->dev, mem); /* clear pending irqs, and set 1/second periodic, * which we'll use instead of update irqs @@ -453,7 +453,7 @@ static int __devexit omap_rtc_remove(struct platform_device *pdev) free_irq(omap_rtc_timer, rtc); free_irq(omap_rtc_alarm, rtc); - release_resource(dev_get_devdata(&rtc->dev)); + release_resource(dev_get_drvdata(&rtc->dev)); rtc_device_unregister(rtc); return 0; }