diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 08:05:07 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 08:05:07 -0400 |
| commit | 7a996d3ab150bb0e1b71fa182f70199a703efdd1 (patch) | |
| tree | 96a36947d90c9b96580899abd38cb3b70cd9d40b /drivers/rtc/rtc-pcf2123.c | |
| parent | 7cf3d73b4360e91b14326632ab1aeda4cb26308d (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
Diffstat (limited to 'drivers/rtc/rtc-pcf2123.c')
| -rw-r--r-- | drivers/rtc/rtc-pcf2123.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c index e75df9d50e27..71bab0ef5443 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/string.h> | 41 | #include <linux/string.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/rtc.h> | 43 | #include <linux/rtc.h> |
| 43 | #include <linux/spi/spi.h> | 44 | #include <linux/spi/spi.h> |
| 44 | 45 | ||
| @@ -315,7 +316,7 @@ kfree_exit: | |||
| 315 | return ret; | 316 | return ret; |
| 316 | } | 317 | } |
| 317 | 318 | ||
| 318 | static int pcf2123_remove(struct spi_device *spi) | 319 | static int __devexit pcf2123_remove(struct spi_device *spi) |
| 319 | { | 320 | { |
| 320 | struct pcf2123_plat_data *pdata = spi->dev.platform_data; | 321 | struct pcf2123_plat_data *pdata = spi->dev.platform_data; |
| 321 | int i; | 322 | int i; |