diff --git a/[refs] b/[refs] index 654fa9a1e15d..67eb9f3ba1d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d43be7789db0455a82a3ad4ff5f713cc588c1e2 +refs/heads/master: 471c4dd38642eb881c4da8372d69e8d11e450a79 diff --git a/trunk/drivers/media/usb/gspca/etoms.c b/trunk/drivers/media/usb/gspca/etoms.c index 948a6357573d..26c9ee1f1045 100644 --- a/trunk/drivers/media/usb/gspca/etoms.c +++ b/trunk/drivers/media/usb/gspca/etoms.c @@ -766,9 +766,7 @@ static const struct sd_desc sd_desc = { /* -- module initialisation -- */ static const struct usb_device_id device_table[] = { {USB_DEVICE(0x102c, 0x6151), .driver_info = SENSOR_PAS106}, -#if !defined CONFIG_USB_ET61X251 && !defined CONFIG_USB_ET61X251_MODULE {USB_DEVICE(0x102c, 0x6251), .driver_info = SENSOR_TAS5130CXX}, -#endif {} };