From: Andrew Morton drivers/usb/media/w9968cf.c: In function `w9968cf_release_resources': drivers/usb/media/w9968cf.c:2649: `w9968cf_devlist_mutex' undeclared (first use in this function) drivers/usb/media/w9968cf.c:2649: (Each undeclared identifier is reported only once drivers/usb/media/w9968cf.c:2649: for each function it appears in.) drivers/usb/media/w9968cf.c: In function `w9968cf_usb_probe': drivers/usb/media/w9968cf.c:3518: `w9968cf_devlist_mutex' undeclared (first use in this function) While we're there, move a few static definitions into .c, where they should be. Cc: Greg KH Cc: Arjan van de Ven Signed-off-by: Andrew Morton --- drivers/usb/media/w9968cf.c | 7 +++++++ drivers/usb/media/w9968cf.h | 8 -------- 2 files changed, 7 insertions(+), 8 deletions(-) diff -puN drivers/usb/media/w9968cf.c~gregkh-usb-usb-convert-a-bunch-of-usb-semaphores-to-mutexes-fix drivers/usb/media/w9968cf.c --- devel/drivers/usb/media/w9968cf.c~gregkh-usb-usb-convert-a-bunch-of-usb-semaphores-to-mutexes-fix 2006-01-29 01:34:00.000000000 -0800 +++ devel-akpm/drivers/usb/media/w9968cf.c 2006-01-29 01:36:23.000000000 -0800 @@ -47,6 +47,13 @@ #include "w9968cf.h" #include "w9968cf_decoder.h" +static struct w9968cf_vpp_t* w9968cf_vpp; +static DECLARE_WAIT_QUEUE_HEAD(w9968cf_vppmod_wait); + +static LIST_HEAD(w9968cf_dev_list); /* head of V4L registered cameras list */ +static DEFINE_MUTEX(w9968cf_devlist_mutex); /* semaphore for list traversal */ + +static DECLARE_RWSEM(w9968cf_disconnect); /* prevent races with open() */ /**************************************************************************** diff -puN drivers/usb/media/w9968cf.h~gregkh-usb-usb-convert-a-bunch-of-usb-semaphores-to-mutexes-fix drivers/usb/media/w9968cf.h --- devel/drivers/usb/media/w9968cf.h~gregkh-usb-usb-convert-a-bunch-of-usb-semaphores-to-mutexes-fix 2006-01-29 01:35:19.000000000 -0800 +++ devel-akpm/drivers/usb/media/w9968cf.h 2006-01-29 01:36:05.000000000 -0800 @@ -194,14 +194,6 @@ enum w9968cf_vpp_flag { VPP_UYVY_TO_RGBX = 0x08, }; -static struct w9968cf_vpp_t* w9968cf_vpp; -static DECLARE_WAIT_QUEUE_HEAD(w9968cf_vppmod_wait); - -static LIST_HEAD(w9968cf_dev_list); /* head of V4L registered cameras list */ -static DECLARE_MUTEX(w9968cf_devlist_sem); /* semaphore for list traversal */ - -static DECLARE_RWSEM(w9968cf_disconnect); /* prevent races with open() */ - /* Main device driver structure */ struct w9968cf_device { struct device dev; /* device structure */ _