V4L/DVB (3196): correct Thomson DTT 761x frequency ranges

[linux-2.6] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 567f05549e3af71fd43977764f413e22ce335b8e..aa91ce35915b769492790286140e23d02d06400b 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -102,7 +102,7 @@
 #define TUNER_YMEC_TVF_8531MF          58
 #define TUNER_YMEC_TVF_5533MF          59      /* Pixelview Pro Ultra NTSC */
 
-#define TUNER_THOMSON_DTT7611          60      /* DViCO FusionHDTV 3 Gold-T */
+#define TUNER_THOMSON_DTT761X          60      /* DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A */
 #define TUNER_TENA_9533_DI             61
 #define TUNER_TEA5767                  62      /* Only FM Radio Tuner */
 #define TUNER_PHILIPS_FMD1216ME_MK3    63
@@ -202,15 +202,15 @@ extern int tea5767_autodetection(struct i2c_client *c);
 
 #define tuner_warn(fmt, arg...) do {\
        printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
-                       t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
+                       i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+
 #define tuner_info(fmt, arg...) do {\
        printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
-                       t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
+                       i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 #define tuner_dbg(fmt, arg...) do {\
        if (tuner_debug) \
-               printk(KERN_DEBUG "%s %d-%04x: " fmt, \
-                       t->i2c.driver->driver.name, \
-                       t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0)
+               printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+                       i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
 
 #endif /* __KERNEL__ */