summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-vr41xx.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-06-01 19:05:23 +1000
committerPaul Mackerras <paulus@samba.org>2006-06-01 19:05:23 +1000
commitc029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch)
treeb9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /drivers/rtc/rtc-vr41xx.c
parent0a9cb46a73abd6c45e7c986bec984eed60c417b6 (diff)
parentba8f5baba79da8eb502f8534c3a8ecb64aceb790 (diff)
downloadkernel-crypto-c029cc66cb3d83f70c02e0c182f0eed1419f8020.tar.gz
kernel-crypto-c029cc66cb3d83f70c02e0c182f0eed1419f8020.tar.xz
kernel-crypto-c029cc66cb3d83f70c02e0c182f0eed1419f8020.zip
Merge branch 'merge'
Diffstat (limited to 'drivers/rtc/rtc-vr41xx.c')
-rw-r--r--drivers/rtc/rtc-vr41xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index 4d49fd50119..277596c302e 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -270,7 +270,7 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long
epoch = arg;
break;
default:
- return -EINVAL;
+ return -ENOIOCTLCMD;
}
return 0;