diff -Naur /usr/src/modules/spca5xx.orig/debian/control /usr/src/modules/spca5xx/debian/control --- /usr/src/modules/spca5xx.orig/debian/control 2006-06-21 04:39:58.000000000 +0200 +++ /usr/src/modules/spca5xx/debian/control 2006-10-30 19:19:20.000000000 +0100 @@ -2,21 +2,20 @@ Section: misc Priority: optional Maintainer: Debian spca5xx Maintainers -Uploaders: Stephen Birch , Kel Modderman , Otavio Salvador , Itay Ben-Yaacov -Build-Depends: cdbs, debhelper (>= 5.0.0), bzip2 +Build-Depends: debhelper (>= 5.0.0), bzip2 Standards-Version: 3.7.2 -Package: spca5xx-source -Architecture: all -Depends: debhelper (>= 5.0.0), module-assistant, bzip2 -Suggests: kernel-package -Description: source for the spca5xx driver - The spca5xx video for linux (v4l) driver, provides support for - webcams and digital cameras based on the spca5xx range of chips - manufactured by SunPlus Sonix Z-star Vimicro Conexant Etoms and - Transvision. +Package: spca5xx-modules-2.6.17-10-generic +Architecture: any +Depends: linux-image-2.6.17-10-generic | kernel-image-2.6.17-10-generic +Provides: spca5xx-modules +Description: spca5xx modules for Linux (kernel 2.6.17-10-generic) + This package contains the set of loadable kernel modules for the + spca5xx video for linux (v4l) driver. . - This package provides the source code for the spca5xx kernel modules. - Kernel source or headers are required to compile these modules. + This package contains the compiled kernel modules for 2.6.17-10-generic . - http://mxhaard.free.fr/spca5xx.html + If you have compiled your own kernel, you will most likely need to build + your own spca5xx-modules. The spca5xx-source package has been + provided for use with the Debian's module-assistant or kernel-package + utilities to produce a version of spca5xx-module for your kernel. diff -Naur /usr/src/modules/spca5xx.orig/debian/control.backup /usr/src/modules/spca5xx/debian/control.backup --- /usr/src/modules/spca5xx.orig/debian/control.backup 1970-01-01 01:00:00.000000000 +0100 +++ /usr/src/modules/spca5xx/debian/control.backup 2006-10-30 18:51:43.000000000 +0100 @@ -0,0 +1,22 @@ +Source: spca5xx +Section: misc +Priority: optional +Maintainer: Debian spca5xx Maintainers +Uploaders: Stephen Birch , Kel Modderman , Otavio Salvador , Itay Ben-Yaacov +Build-Depends: cdbs, debhelper (>= 5.0.0), bzip2 +Standards-Version: 3.7.2 + +Package: spca5xx-source +Architecture: all +Depends: debhelper (>= 5.0.0), module-assistant, bzip2 +Suggests: kernel-package +Description: source for the spca5xx driver + The spca5xx video for linux (v4l) driver, provides support for + webcams and digital cameras based on the spca5xx range of chips + manufactured by SunPlus Sonix Z-star Vimicro Conexant Etoms and + Transvision. + . + This package provides the source code for the spca5xx kernel modules. + Kernel source or headers are required to compile these modules. + . + http://mxhaard.free.fr/spca5xx.html diff -Naur /usr/src/modules/spca5xx.orig/drivers/usb/spca561.h /usr/src/modules/spca5xx/drivers/usb/spca561.h --- /usr/src/modules/spca5xx.orig/drivers/usb/spca561.h 2006-04-21 11:33:24.000000000 +0200 +++ /usr/src/modules/spca5xx/drivers/usb/spca561.h 2006-10-30 19:09:05.000000000 +0100 @@ -758,6 +758,7 @@ case 0x403b: case 0x092b: case 0x092c: + case 0x092f: spca50x->chip_revision = Rev012A; break; default: diff -Naur /usr/src/modules/spca5xx.orig/drivers/usb/spca5xx.c /usr/src/modules/spca5xx/drivers/usb/spca5xx.c --- /usr/src/modules/spca5xx.orig/drivers/usb/spca5xx.c 2006-04-29 17:38:07.000000000 +0200 +++ /usr/src/modules/spca5xx/drivers/usb/spca5xx.c 2006-10-30 19:12:22.000000000 +0100 @@ -432,6 +432,7 @@ ToptroIndus, AgfaCl20, LogitechQC92c, + LogitechQC92f, SonixWC311P, Concord3045, Mercury21, //120 @@ -600,6 +601,7 @@ {ToptroIndus, "Toptro Industrial"}, {AgfaCl20, "Agfa ephoto CL20"}, {LogitechQC92c, "Logitech QuickCam chat"}, + {LogitechQC92f, "Logitech QuickCam Express"}, {SonixWC311P, "Sonix sn9c102P Hv7131R"}, {Concord3045, "Concord 3045 spca536a"}, {Mercury21, "Mercury Peripherals Inc."}, @@ -769,6 +771,7 @@ {USB_DEVICE(0x2899, 0x012c)}, /* Toptro Industrial */ {USB_DEVICE(0x06bd, 0x0404)}, /* Agfa CL20 */ {USB_DEVICE(0x046d, 0x092c)}, /* Logitech QC chat Elch2 */ + {USB_DEVICE(0x046d, 0x092f)}, /* Logitech QC Express */ {USB_DEVICE(0x0c45, 0x607c)}, /* Sonix sn9c102p Hv7131R */ {USB_DEVICE(0x0733, 0x3261)}, /* Concord 3045 spca536a */ {USB_DEVICE(0x0733, 0x1314)}, /* Mercury 2.1MEG Deluxe Classic Cam */ @@ -4595,6 +4598,15 @@ info("USB SPCA5XX camera found.Logitech QuickCam chat (SPCA561A)"); memcpy(&spca50x->funct,&fspca561,sizeof(struct cam_operation)); break; + case 0x092f: + spca50x->desc = LogitechQC92f; + spca50x->bridge = BRIDGE_SPCA561; + spca50x->sensor = SENSOR_INTERNAL; + + spca50x->cameratype = S561; + info("USB SPCA5XX camera found.Logitech QuickCam Express (SPCA561A)"); + memcpy(&spca50x->funct,&fspca561,sizeof(struct cam_operation)); + break; default: goto error; };