Merge /spare/repo/linux-2.6/

[~andy/linux] / drivers / media / video / mt20xx.c

diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 9c005cb128d7cbeb6d1327fe6845fb797791b30e..2fb7c2d1787a5a456282c2b70695e5d98678810e 100644 (file)
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -511,22 +511,6 @@ int microtune_init(struct i2c_client *c)
        tuner_info("microtune: companycode=%04x part=%02x rev=%02x\n",
                   company_code,buf[0x13],buf[0x14]);
 
-#if 0
-       /* seems to cause more problems than it solves ... */
-       switch (company_code) {
-       case 0x30bf:
-       case 0x3cbf:
-       case 0x3dbf:
-       case 0x4d54:
-       case 0x8e81:
-       case 0x8e91:
-               /* ok (?) */
-               break;
-       default:
-               tuner_warn("tuner: microtune: unknown companycode\n");
-               return 0;
-       }
-#endif
 
        if (buf[0x13] < ARRAY_SIZE(microtune_part) &&
            NULL != microtune_part[buf[0x13]])