Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

[~andy/linux] / drivers / macintosh / nvram.c

diff --git a/drivers/macintosh/nvram.c b/drivers/macintosh/nvram.c
index c876349c32de5c0d8318db1bcacabf53ef2ed133..a271c8218d82b00c3311c3c77d26f135ce5791ec 100644 (file)
--- a/drivers/macintosh/nvram.c
+++ b/drivers/macintosh/nvram.c
@@ -100,7 +100,7 @@ const struct file_operations nvram_fops = {
        .llseek         = nvram_llseek,
        .read           = read_nvram,
        .write          = write_nvram,
-       .ioctl          = nvram_ioctl,
+       .unlocked_ioctl = nvram_ioctl,
 };
 
 static struct miscdevice nvram_dev = {