From d5fed11c19cae00e9a3a9ac64feadd8d98232fa0 Mon Sep 17 00:00:00 2001
From: Paul Bolle <pebolle@tiscali.nl>
Date: Thu, 28 Mar 2013 17:33:57 -0300
Subject: [PATCH] --- yaml --- r: 366895 b: refs/heads/master c:
 471c4dd38642eb881c4da8372d69e8d11e450a79 h: refs/heads/master i:   366893:
 7eb50b73c973fbe729408043e5fca501f9c5d491   366891:
 bd2368fc82c1f066ae5f9cf0e04935c86697faf7   366887:
 6e7c5416af762151ff33baf833296e7b8b0c6e90   366879:
 d2ac612262d89a14e48171fecf51ddabd55e0035 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/media/usb/gspca/etoms.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

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
 	{}
 };