diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 09:50:17 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 09:50:17 -0500 |
| commit | 98014be39bda8277a5ad130bb274ed6eb18b74df (patch) | |
| tree | 974620a47c9350ff9b3c06ffd2b49470bbda72ab /drivers/rtc | |
| parent | 55135dfbf3dd83cb3e98deed8271b62d188404e1 (diff) | |
| parent | 6e2a587eb99267367409097b70cb2d61b09e5269 (diff) | |
Merge branch 'defconfigs-for-arnd' of git://git.linaro.org/people/triad/linux-stericsson into fixes
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-puv3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c index b3eba3cddd42..e4b6880aabd0 100644 --- a/drivers/rtc/rtc-puv3.c +++ b/drivers/rtc/rtc-puv3.c | |||
| @@ -220,7 +220,7 @@ static void puv3_rtc_enable(struct platform_device *pdev, int en) | |||
| 220 | } | 220 | } |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | static int puv3_rtc_remove(struct platform_device *dev) | 223 | static int __devexit puv3_rtc_remove(struct platform_device *dev) |
| 224 | { | 224 | { |
| 225 | struct rtc_device *rtc = platform_get_drvdata(dev); | 225 | struct rtc_device *rtc = platform_get_drvdata(dev); |
| 226 | 226 | ||
| @@ -236,7 +236,7 @@ static int puv3_rtc_remove(struct platform_device *dev) | |||
| 236 | return 0; | 236 | return 0; |
| 237 | } | 237 | } |
| 238 | 238 | ||
| 239 | static int puv3_rtc_probe(struct platform_device *pdev) | 239 | static int __devinit puv3_rtc_probe(struct platform_device *pdev) |
| 240 | { | 240 | { |
| 241 | struct rtc_device *rtc; | 241 | struct rtc_device *rtc; |
| 242 | struct resource *res; | 242 | struct resource *res; |