diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-03-14 18:05:45 -0500 |
| commit | c5111f504d2a9b0d258d7c4752b4093523315989 (patch) | |
| tree | 6a52864aff79691689aea21cb0cb928327d5de5b /drivers/usb/media/w9968cf.h | |
| parent | 69eb66d7da7dba2696281981347698e1693c2340 (diff) | |
| parent | a488edc914aa1d766a4e2c982b5ae03d5657ec1b (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/usb/media/w9968cf.h')
| -rw-r--r-- | drivers/usb/media/w9968cf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/media/w9968cf.h b/drivers/usb/media/w9968cf.h index 8acbfe205bc7..47a6ff794171 100644 --- a/drivers/usb/media/w9968cf.h +++ b/drivers/usb/media/w9968cf.h | |||
| @@ -195,7 +195,6 @@ enum w9968cf_vpp_flag { | |||
| 195 | }; | 195 | }; |
| 196 | 196 | ||
| 197 | static struct w9968cf_vpp_t* w9968cf_vpp; | 197 | static struct w9968cf_vpp_t* w9968cf_vpp; |
| 198 | static DECLARE_MUTEX(w9968cf_vppmod_lock); | ||
| 199 | static DECLARE_WAIT_QUEUE_HEAD(w9968cf_vppmod_wait); | 198 | static DECLARE_WAIT_QUEUE_HEAD(w9968cf_vppmod_wait); |
| 200 | 199 | ||
| 201 | static LIST_HEAD(w9968cf_dev_list); /* head of V4L registered cameras list */ | 200 | static LIST_HEAD(w9968cf_dev_list); /* head of V4L registered cameras list */ |