git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-ds3234.c
diff --git
a/drivers/rtc/rtc-ds3234.c
b/drivers/rtc/rtc-ds3234.c
index
a774ca3
..
bbd2622
100644
(file)
--- a/
drivers/rtc/rtc-ds3234.c
+++ b/
drivers/rtc/rtc-ds3234.c
@@
-158,7
+158,7
@@
static int __devinit ds3234_probe(struct spi_device *spi)
static int __devexit ds3234_remove(struct spi_device *spi)
{
- struct rtc_device *rtc =
platform
_get_drvdata(spi);
+ struct rtc_device *rtc =
spi
_get_drvdata(spi);
rtc_device_unregister(rtc);
return 0;