diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/rtc/rtc-m41t94.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/rtc/rtc-m41t94.c')
| -rw-r--r-- | drivers/rtc/rtc-m41t94.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c index c8c97a4169d4..e259ed76ae85 100644 --- a/drivers/rtc/rtc-m41t94.c +++ b/drivers/rtc/rtc-m41t94.c | |||
| @@ -136,7 +136,7 @@ static int __devinit m41t94_probe(struct spi_device *spi) | |||
| 136 | 136 | ||
| 137 | static int __devexit m41t94_remove(struct spi_device *spi) | 137 | static int __devexit m41t94_remove(struct spi_device *spi) |
| 138 | { | 138 | { |
| 139 | struct rtc_device *rtc = platform_get_drvdata(spi); | 139 | struct rtc_device *rtc = spi_get_drvdata(spi); |
| 140 | 140 | ||
| 141 | if (rtc) | 141 | if (rtc) |
| 142 | rtc_device_unregister(rtc); | 142 | rtc_device_unregister(rtc); |