diff --git a/[refs] b/[refs]
index 5f506d3baeb1..6284b9adefe5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a083dec0ed537a75fbe8f2f83d198e9e672240d8
+refs/heads/master: 318e479eb7ad9a948c6da381976d258464413816
diff --git a/trunk/drivers/usb/class/usblp.c b/trunk/drivers/usb/class/usblp.c
index 6918037e209c..708a292e5a0d 100644
--- a/trunk/drivers/usb/class/usblp.c
+++ b/trunk/drivers/usb/class/usblp.c
@@ -438,7 +438,7 @@ static unsigned int usblp_poll(struct file *file, struct poll_table_struct *wait
  			       | (!usblp->wcomplete ? 0 : POLLOUT | POLLWRNORM);
 }
 
-static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
+static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	struct usblp *usblp = file->private_data;
 	int length, err, i;
@@ -838,7 +838,8 @@ static struct file_operations usblp_fops = {
 	.read =		usblp_read,
 	.write =	usblp_write,
 	.poll =		usblp_poll,
-	.ioctl =	usblp_ioctl,
+	.unlocked_ioctl =	usblp_ioctl,
+	.compat_ioctl =		usblp_ioctl,
 	.open =		usblp_open,
 	.release =	usblp_release,
 };