diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 09:51:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-18 09:51:57 (GMT) |
| commit | 9545eb61e5bb70055fd9358f25f95387f7398cba (patch) | |
| tree | 00098372c69634e0c493684227d7c27389d56da1 /drivers | |
| parent | 148b00b63a3f747141207e7a409f14bd26d0820f (diff) | |
| parent | ed96dfbcfea92233d27db9d3c77fc91a58c959bf (diff) | |
| download | linux-fsl-qoriq-9545eb61e5bb70055fd9358f25f95387f7398cba.tar.xz | |
Merge branch 'unicore32' of git://github.com/gxt/linux
* 'unicore32' of git://github.com/gxt/linux:
unicore32, exec: remove redundant set_fs(USER_DS)
unicore32: Fix typo 'PUV3_I2C'
unicore32: drop unused Kconfig symbols
rtc: rtc-puv3: Add __devinit and __devexit markers for probe and remove
arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS
unicore32: fix build error for find bitops
Diffstat (limited to 'drivers')
| -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 b3eba3c..e4b6880 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) } } -static int puv3_rtc_remove(struct platform_device *dev) +static int __devexit puv3_rtc_remove(struct platform_device *dev) { struct rtc_device *rtc = platform_get_drvdata(dev); @@ -236,7 +236,7 @@ static int puv3_rtc_remove(struct platform_device *dev) return 0; } -static int puv3_rtc_probe(struct platform_device *pdev) +static int __devinit puv3_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; struct resource *res; |