diff options
author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-06 08:49:08 +0200 |
---|---|---|
committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-06 08:49:08 +0200 |
commit | cadde337858918e262302c0c5c97e273b60e6551 (patch) | |
tree | 4f889beb1553126a9634b07b93bbbc2eefefdca3 /linux/drivers/media | |
parent | 6c325f8726dac9679266c4fd4bbf4d8297455f92 (diff) | |
parent | 2a62bf255bf5e8d35e64f773053608b11afcdc9c (diff) | |
download | mediapointer-dvb-s2-cadde337858918e262302c0c5c97e273b60e6551.tar.gz mediapointer-dvb-s2-cadde337858918e262302c0c5c97e273b60e6551.tar.bz2 |
merge...
Diffstat (limited to 'linux/drivers/media')
-rw-r--r-- | linux/drivers/media/dvb/dvb-usb/Kconfig | 1 | ||||
-rw-r--r-- | linux/drivers/media/video/gspca/spca508.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/Kconfig b/linux/drivers/media/dvb/dvb-usb/Kconfig index 7847a8320..a577c0f89 100644 --- a/linux/drivers/media/dvb/dvb-usb/Kconfig +++ b/linux/drivers/media/dvb/dvb-usb/Kconfig @@ -109,6 +109,7 @@ config DVB_USB_CXUSB select DVB_ZL10353 if !DVB_FE_CUSTOMISE select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMISE + select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE help Say Y here to support the Conexant USB2.0 hybrid reference design. Currently, only DVB and ATSC modes are supported, analog mode diff --git a/linux/drivers/media/video/gspca/spca508.c b/linux/drivers/media/video/gspca/spca508.c index c5c9210b0..553695e6f 100644 --- a/linux/drivers/media/video/gspca/spca508.c +++ b/linux/drivers/media/video/gspca/spca508.c @@ -1544,8 +1544,10 @@ static int sd_config(struct gspca_dev *gspca_dev, /* break; */ /* } */ break; + case 0x0130: /* Clone webcam */ case 0x0af9: /* Hama cameras */ switch (product) { + case 0x0130: case 0x0010: sd->subtype = HamaUSBSightcam; break; @@ -1791,6 +1793,8 @@ static const __devinitdata struct usb_device_id device_table[] = { {USB_DEVICE(0x0af9, 0x0010), DVNM("Hama USB Sightcam 100")}, {USB_DEVICE(0x0af9, 0x0011), DVNM("Hama USB Sightcam 100")}, {USB_DEVICE(0x8086, 0x0110), DVNM("Intel Easy PC Camera")}, + {USB_DEVICE(0x0130, 0x0130), + DVNM("Clone Digital Webcam 11043 (spca508a)")}, {} }; MODULE_DEVICE_TABLE(usb, device_table); |