diff --git a/[refs] b/[refs]
index eee61d7d4a62..7c711eca586f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27a16811ab4dc819eebbd4e7b07d485f6e8f0134
+refs/heads/master: 8aea5882c54feb246ef20399cc55ae4672697ac0
diff --git a/trunk/drivers/staging/go7007/Kconfig b/trunk/drivers/staging/go7007/Kconfig
index 1da57df5cbcb..7dfb2815b9ec 100644
--- a/trunk/drivers/staging/go7007/Kconfig
+++ b/trunk/drivers/staging/go7007/Kconfig
@@ -1,7 +1,6 @@
 config VIDEO_GO7007
 	tristate "WIS GO7007 MPEG encoder support"
 	depends on VIDEO_DEV && PCI && I2C
-	depends on BKL # please fix
 	depends on SND
 	select VIDEOBUF_DMA_SG
 	depends on RC_CORE
diff --git a/trunk/drivers/staging/go7007/s2250-loader.c b/trunk/drivers/staging/go7007/s2250-loader.c
index 7547a8f77345..4e132519e253 100644
--- a/trunk/drivers/staging/go7007/s2250-loader.c
+++ b/trunk/drivers/staging/go7007/s2250-loader.c
@@ -18,7 +18,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <dvb-usb.h>
 
@@ -142,11 +141,9 @@ static void s2250loader_disconnect(struct usb_interface *interface)
 {
 	pdevice_extension_t s;
 	printk(KERN_INFO "s2250: disconnect\n");
-	lock_kernel();
 	s = usb_get_intfdata(interface);
 	usb_set_intfdata(interface, NULL);
 	kref_put(&(s->kref), s2250loader_delete);
-	unlock_kernel();
 }
 
 static const struct usb_device_id s2250loader_ids[] = {