diff --git a/[refs] b/[refs]
index 119b7e988b55..91fdb0e01278 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 106bdbe24ea9038cecc01c168324af59343092ee
+refs/heads/master: 7f9b1412f56eb5ec10694c27f93bd33276be0465
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index c16f765aae57..5544b8a26197 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -44,6 +44,8 @@ static unsigned int card[]     = {[0 ... (TM6000_MAXBOARDS - 1)] = UNSET };
 
 module_param_array(card,  int, NULL, 0444);
 
+static unsigned long tm6000_devused;
+
 
 struct tm6000_board {
 	char            *name;
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index f7e8a3710b37..58fcf6ae6069 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -54,8 +54,6 @@
 static unsigned int vid_limit = 16;	/* Video memory limit, in Mb */
 static int video_nr = -1;		/* /dev/videoN, -1 for autodetect */
 
-unsigned long tm6000_devused;
-
 /* Debug level */
 int tm6000_debug;
 
diff --git a/trunk/drivers/staging/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h
index ffc55019390d..045e676cc8fa 100644
--- a/trunk/drivers/staging/tm6000/tm6000.h
+++ b/trunk/drivers/staging/tm6000/tm6000.h
@@ -196,7 +196,6 @@ struct tm6000_fh {
 			V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM
 
 /* In tm6000-core.c */
-extern unsigned long tm6000_devused;
 
 int tm6000_read_write_usb (struct tm6000_core *dev, u8 reqtype, u8 req,
 			   u16 value, u16 index, u8 *buf, u16 len);