diff options
| author | Nicolas Thill <nico@openwrt.org> | 2008-04-12 20:20:41 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2008-04-12 20:20:41 +0000 |
| commit | 6ca5374194da640e898fa7ccded47b404590bc00 (patch) | |
| tree | f187ce4e5b0a0ef7494a13335f24dd6aa5c91654 /package/qc-usb/patches/001-linux_2_6.patch | |
| parent | bae7e5bebbdc9028fed382f01392f90cd5c4e562 (diff) | |
| download | upstream-6ca5374194da640e898fa7ccded47b404590bc00.tar.gz upstream-6ca5374194da640e898fa7ccded47b404590bc00.tar.bz2 upstream-6ca5374194da640e898fa7ccded47b404590bc00.zip | |
package/qc-usb: * update to 0.6.6 (closes: #3215) * fix build on linux > 2.6.23
SVN-Revision: 10796
Diffstat (limited to 'package/qc-usb/patches/001-linux_2_6.patch')
| -rw-r--r-- | package/qc-usb/patches/001-linux_2_6.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/package/qc-usb/patches/001-linux_2_6.patch b/package/qc-usb/patches/001-linux_2_6.patch new file mode 100644 index 0000000000..d0b8687d30 --- /dev/null +++ b/package/qc-usb/patches/001-linux_2_6.patch @@ -0,0 +1,23 @@ +diff -ruN qc-usb-0.6.6-orig/qc-driver.c qc-usb-0.6.6/qc-driver.c +--- qc-usb-0.6.6-orig/qc-driver.c 2006-10-24 04:06:19.000000000 +0200 ++++ qc-usb-0.6.6/qc-driver.c 2008-04-12 18:01:01.000000000 +0200 +@@ -821,7 +821,9 @@ + if (!cr) goto fail2; + urb->transfer_buffer = kmalloc(qc_i2c_maxbufsize*sizeof(u8), GFP_KERNEL); /* Allocate maximum ever needed */ + if (!urb->transfer_buffer) goto fail3; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) + spin_lock_init(&urb->lock); ++#endif + urb->complete = qc_i2c_handler; + urb->context = qc; + #if (LINUX_VERSION_CODE<KERNEL_VERSION(2,6,9) && !defined(CONFIG_SUSE_KERNEL)) || LINUX_VERSION_CODE<KERNEL_VERSION(2,6,8) +@@ -3006,7 +3008,9 @@ + static struct video_device qc_v4l_template = { + name: "QuickCam USB", + type: VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) + hardware: VID_HARDWARE_QCAM_USB, ++#endif + minor: -1, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + release: qc_v4l_release, |