diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-01 02:55:20 -0500 |
| commit | 35858adbfca13678af99fb31618ef4428d6dedb0 (patch) | |
| tree | 3336feaa61324486945816cb52c347733e7c0821 /drivers/rtc/rtc-ds1302.c | |
| parent | 197d4db752e67160d79fed09968c2140376a80a3 (diff) | |
| parent | 4b70858ba8d4537daf782defebe5f2ff80ccef2b (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/rtc/rtc-ds1302.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1302.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c index 1e73c8f42e38..532acf9b05d8 100644 --- a/drivers/rtc/rtc-ds1302.c +++ b/drivers/rtc/rtc-ds1302.c | |||
| @@ -143,7 +143,6 @@ static int ds1302_rtc_ioctl(struct device *dev, unsigned int cmd, | |||
| 143 | #ifdef RTC_SET_CHARGE | 143 | #ifdef RTC_SET_CHARGE |
| 144 | case RTC_SET_CHARGE: | 144 | case RTC_SET_CHARGE: |
| 145 | { | 145 | { |
| 146 | struct ds1302_rtc *rtc = dev_get_drvdata(dev); | ||
| 147 | int tcs_val; | 146 | int tcs_val; |
| 148 | 147 | ||
| 149 | if (copy_from_user(&tcs_val, (int __user *)arg, sizeof(int))) | 148 | if (copy_from_user(&tcs_val, (int __user *)arg, sizeof(int))) |