diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
| commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
| tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /drivers/rtc/rtc-sa1100.c | |
| parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
| parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
| -rw-r--r-- | drivers/rtc/rtc-sa1100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 2bc8aad47219..a997529f8926 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
| @@ -247,7 +247,7 @@ static int sa1100_rtc_ioctl(struct device *dev, unsigned int cmd, | |||
| 247 | rtc_freq = arg; | 247 | rtc_freq = arg; |
| 248 | return 0; | 248 | return 0; |
| 249 | } | 249 | } |
| 250 | return -EINVAL; | 250 | return -ENOIOCTLCMD; |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm) | 253 | static int sa1100_rtc_read_time(struct device *dev, struct rtc_time *tm) |