diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/rtc/rtc-ds3234.c | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/rtc/rtc-ds3234.c')
| -rw-r--r-- | drivers/rtc/rtc-ds3234.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c index 37d131d03f33..45e5b106af73 100644 --- a/drivers/rtc/rtc-ds3234.c +++ b/drivers/rtc/rtc-ds3234.c | |||
| @@ -189,7 +189,7 @@ static const struct rtc_class_ops ds3234_rtc_ops = { | |||
| 189 | .set_time = ds3234_set_time, | 189 | .set_time = ds3234_set_time, |
| 190 | }; | 190 | }; |
| 191 | 191 | ||
| 192 | static int ds3234_probe(struct spi_device *spi) | 192 | static int __devinit ds3234_probe(struct spi_device *spi) |
| 193 | { | 193 | { |
| 194 | struct rtc_device *rtc; | 194 | struct rtc_device *rtc; |
| 195 | unsigned char tmp; | 195 | unsigned char tmp; |
| @@ -249,7 +249,7 @@ static int ds3234_probe(struct spi_device *spi) | |||
| 249 | return 0; | 249 | return 0; |
| 250 | } | 250 | } |
| 251 | 251 | ||
| 252 | static int __exit ds3234_remove(struct spi_device *spi) | 252 | static int __devexit ds3234_remove(struct spi_device *spi) |
| 253 | { | 253 | { |
| 254 | struct ds3234 *chip = platform_get_drvdata(spi); | 254 | struct ds3234 *chip = platform_get_drvdata(spi); |
| 255 | struct rtc_device *rtc = chip->rtc; | 255 | struct rtc_device *rtc = chip->rtc; |