From 38f1ad8983d0aa3251d5f755f1e190751c80ac6e Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 14 Jul 2008 22:38:27 +0200
Subject: [PATCH] --- yaml --- r: 101295 b: refs/heads/master c:
 77e38bffe0fcaa48f0be68eaa1de4a59d1fd93ad h: refs/heads/master i:   101293:
 e3e3a140c395a7f9fbaa686fbdaa58c21e775890   101291:
 c2e1c1745d9ce95af70c97a6574f069f8b9fdfca   101287:
 472ff84617b4755fcb0714c46611a3cf2b387228   101279:
 c3b7c5d2a8595402abf4d6f4daffe113aee2f4cc v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/i2c/i2c-dev.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 99a3b73b14c9..a40a0a92cf3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bc1200852c3dfc312481f57622f48b289ac802e
+refs/heads/master: 77e38bffe0fcaa48f0be68eaa1de4a59d1fd93ad
diff --git a/trunk/drivers/i2c/i2c-dev.c b/trunk/drivers/i2c/i2c-dev.c
index d34c14c81c29..e96d98696782 100644
--- a/trunk/drivers/i2c/i2c-dev.c
+++ b/trunk/drivers/i2c/i2c-dev.c
@@ -366,8 +366,7 @@ static noinline int i2cdev_ioctl_smbus(struct i2c_client *client,
 	return res;
 }
 
-static int i2cdev_ioctl(struct inode *inode, struct file *file,
-		unsigned int cmd, unsigned long arg)
+static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	struct i2c_client *client = (struct i2c_client *)file->private_data;
 	unsigned long funcs;
@@ -487,7 +486,7 @@ static const struct file_operations i2cdev_fops = {
 	.llseek		= no_llseek,
 	.read		= i2cdev_read,
 	.write		= i2cdev_write,
-	.ioctl		= i2cdev_ioctl,
+	.unlocked_ioctl	= i2cdev_ioctl,
 	.open		= i2cdev_open,
 	.release	= i2cdev_release,
 };