summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Francois Moine2009-10-20 09:34:11 +0200
committerMauro Carvalho Chehab2009-12-05 21:41:06 +0100
commit56e93ed9cff06e258cff8815fde31cd61d0a6d5a (patch)
tree0286a8e78f169694e6f22be59c7da9a09d72dd31
parentV4L/DVB (13247): tuner-core: dont force every tuner to set frequency at startup (diff)
downloadkernel-qcow2-linux-56e93ed9cff06e258cff8815fde31cd61d0a6d5a.tar.gz
kernel-qcow2-linux-56e93ed9cff06e258cff8815fde31cd61d0a6d5a.tar.xz
kernel-qcow2-linux-56e93ed9cff06e258cff8815fde31cd61d0a6d5a.zip
V4L/DVB (13249): gspca - pac7311: Webcam 093a:2628 added.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/gspca.txt1
-rw-r--r--drivers/media/video/gspca/pac7311.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index 2bd1d165042f..a87a8ceb6246 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -241,6 +241,7 @@ pac7311 093a:2621 PAC731x
pac7311 093a:2622 Genius Eye 312
pac7311 093a:2624 PAC7302
pac7311 093a:2626 Labtec 2200
+pac7311 093a:2628 Genius iLook 300
pac7311 093a:2629 Genious iSlim 300
pac7311 093a:262a Webcam 300k
pac7311 093a:262c Philips SPC 230 NC
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index f954900c451b..a3fbd307bb76 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -1092,6 +1092,7 @@ static __devinitdata struct usb_device_id device_table[] = {
{USB_DEVICE(0x093a, 0x2622), .driver_info = SENSOR_PAC7302},
{USB_DEVICE(0x093a, 0x2624), .driver_info = SENSOR_PAC7302},
{USB_DEVICE(0x093a, 0x2626), .driver_info = SENSOR_PAC7302},
+ {USB_DEVICE(0x093a, 0x2628), .driver_info = SENSOR_PAC7302},
{USB_DEVICE(0x093a, 0x2629), .driver_info = SENSOR_PAC7302},
{USB_DEVICE(0x093a, 0x262a), .driver_info = SENSOR_PAC7302},
{USB_DEVICE(0x093a, 0x262c), .driver_info = SENSOR_PAC7302},