diff --git a/[refs] b/[refs]
index a0fab9170e96..5c0e6e8c73c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71d69bc2c0202f438669073d849999d2f6b6ca31
+refs/heads/master: 3a8183a2061ba54c4c2b3cd31c3add6fd717e853
diff --git a/trunk/drivers/char/scx200_gpio.c b/trunk/drivers/char/scx200_gpio.c
index 1d9100561c8a..99e5272e3c53 100644
--- a/trunk/drivers/char/scx200_gpio.c
+++ b/trunk/drivers/char/scx200_gpio.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -52,7 +51,6 @@ static int scx200_gpio_open(struct inode *inode, struct file *file)
 	unsigned m = iminor(inode);
 	file->private_data = &scx200_gpio_ops;
 
-	cycle_kernel_lock();
 	if (m >= MAX_PINS)
 		return -EINVAL;
 	return nonseekable_open(inode, file);