Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-powerpc/unistd.h
	include/asm-sparc/unistd.h
	include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 6c9ad92747fd..2011567005f9 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -141,13 +141,13 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
         /* try the driver's ioctl interface */
         if (ops->ioctl) {
                 err = ops->ioctl(class_dev->dev, cmd, arg);
-                if (err != -EINVAL)
+                if (err != -ENOIOCTLCMD)
                         return err;
         }
 
         /* if the driver does not provide the ioctl interface
          * or if that particular ioctl was not implemented
-         * (-EINVAL), we will try to emulate here.
+         * (-ENOIOCTLCMD), we will try to emulate here.
          */
 
         switch (cmd) {
@@ -233,7 +233,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
                 break;
 
         default:
-                err = -EINVAL;
+                err = -ENOTTY;
                 break;
         }