diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 13:22:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-07-30 13:22:44 -0400 |
commit | c893e7c64e36087dceb4662917976a81d1754fc0 (patch) | |
tree | 30e441fe3e13fc8fcf9690bfe5222f404e19daa0 /drivers/media/video/pwc/pwc.h | |
parent | ec3ed85f926f4e900bc48cec6e72abbe6475321f (diff) | |
parent | 2cefabc00ffdc1f22f960df946ae41b163081d5e (diff) |
Merge branch 'patches_for_v3.6' into v4l_for_linus
* patches_for_v3.6: (174 commits)
v4l: Export v4l2-common.h in include/linux/Kbuild
media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
[media] media: Use pr_info not homegrown pr_reg macro
[media] Terratec Cinergy S2 USB HD Rev.2
[media] v4l: Correct conflicting V4L2 subdev selection API documentation
[media] Feature removal: V4L2 selections API target and flag definitions
[media] v4l: Unify selection flags documentation
[media] v4l: Unify selection flags
[media] v4l: Common documentation for selection targets
[media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
[media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
[media] V4L: Remove "_ACTIVE" from the selection target name definitions
[media] media: dvb-usb: print mac address via native %pM
[media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
[media] media: gpio-ir-recv: add allowed_protos for platform data
[media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
[media] saa7134: fix spelling of detach in label
[media] cx88-blackbird: replace ioctl by unlocked_ioctl
[media] cx88: don't use current_norm
[media] cx88: fix a number of v4l2-compliance violations
...
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
-rw-r--r-- | drivers/media/video/pwc/pwc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index d6b5b216b9d6..7a6a0d39c2c6 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h | |||
@@ -239,7 +239,6 @@ struct pwc_device | |||
239 | int features; /* feature bits */ | 239 | int features; /* feature bits */ |
240 | 240 | ||
241 | /*** Video data ***/ | 241 | /*** Video data ***/ |
242 | struct file *capt_file; /* file doing video capture */ | ||
243 | int vendpoint; /* video isoc endpoint */ | 242 | int vendpoint; /* video isoc endpoint */ |
244 | int vcinterface; /* video control interface */ | 243 | int vcinterface; /* video control interface */ |
245 | int valternate; /* alternate interface needed */ | 244 | int valternate; /* alternate interface needed */ |
@@ -355,8 +354,6 @@ struct pwc_device | |||
355 | extern int pwc_trace; | 354 | extern int pwc_trace; |
356 | #endif | 355 | #endif |
357 | 356 | ||
358 | int pwc_test_n_set_capt_file(struct pwc_device *pdev, struct file *file); | ||
359 | |||
360 | /** Functions in pwc-misc.c */ | 357 | /** Functions in pwc-misc.c */ |
361 | /* sizes in pixels */ | 358 | /* sizes in pixels */ |
362 | extern const int pwc_image_sizes[PSZ_MAX][2]; | 359 | extern const int pwc_image_sizes[PSZ_MAX][2]; |