2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 5b3490ad661a..dbeebe8625c5 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1426,7 +1426,9 @@ static __devinitdata struct usb_device_id device_table[] = {
         {USB_DEVICE(0x0c45, 0x6007), DVNM("Sonix sn9c101 + Tas5110D")},
         {USB_DEVICE(0x0c45, 0x6009), DVNM("spcaCam@120")},
         {USB_DEVICE(0x0c45, 0x600d), DVNM("spcaCam@120")},
+#endif
         {USB_DEVICE(0x0c45, 0x6011), DVNM("MAX Webcam Microdia")},
+#ifndef CONFIG_USB_SN9C102
         {USB_DEVICE(0x0c45, 0x6019), DVNM("Generic Sonix OV7630")},
         {USB_DEVICE(0x0c45, 0x6024), DVNM("Generic Sonix Tas5130c")},
         {USB_DEVICE(0x0c45, 0x6025), DVNM("Xcam Shanga")},
diff --git a/drivers/media/video/sn9c102/sn9c102_devtable.h b/drivers/media/video/sn9c102/sn9c102_devtable.h
index 35223e0d7e49..6ff489baacf3 100644
--- a/drivers/media/video/sn9c102/sn9c102_devtable.h
+++ b/drivers/media/video/sn9c102/sn9c102_devtable.h
@@ -44,7 +44,6 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x6005, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6007, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6009, BRIDGE_SN9C102), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x6011, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x600d, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6019, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6024, BRIDGE_SN9C102), },
@@ -57,7 +56,6 @@ static const struct usb_device_id sn9c102_id_table[] = {
         { SN9C102_USB_DEVICE(0x0c45, 0x602d, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x602e, BRIDGE_SN9C102), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6030, BRIDGE_SN9C102), },
-        { SN9C102_USB_DEVICE(0x0c45, 0x603f, BRIDGE_SN9C102), },
         /* SN9C103 */
         { SN9C102_USB_DEVICE(0x0c45, 0x6080, BRIDGE_SN9C103), },
         { SN9C102_USB_DEVICE(0x0c45, 0x6082, BRIDGE_SN9C103), },