Merge branch 'e1000'

[powerpc.git] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 94a9511..faa0f8e 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -113,6 +113,7 @@
 #define TUNER_PHILIPS_TD1316           67
 
 #define TUNER_PHILIPS_TUV1236D         68      /* ATI HDTV Wonder */
+#define TUNER_TNF_5335MF                69     /* Sabrent Bt848   */
 
 #define NOTUNER 0
 #define PAL     1      /* PAL_BG */
@@ -192,9 +193,11 @@ struct tuner {
        unsigned int radio_if2;
 
        /* used by tda8290 */
-       unsigned char i2c_easy_mode[2];
-       unsigned char i2c_set_freq[8];
-       unsigned int  sgIF;
+       unsigned char tda8290_easy_mode;
+       unsigned char tda827x_lpsel;
+       unsigned char tda827x_addr;
+       unsigned char tda827x_ver;
+       unsigned int sgIF;
 
        /* function ptrs */
        void (*tv_freq)(struct i2c_client *c, unsigned int freq);
@@ -209,6 +212,7 @@ extern unsigned const int tuner_count;
 
 extern int microtune_init(struct i2c_client *c);
 extern int tda8290_init(struct i2c_client *c);
+extern int tda8290_probe(struct i2c_client *c);
 extern int tea5767_tuner_init(struct i2c_client *c);
 extern int default_tuner_init(struct i2c_client *c);
 extern int tea5767_autodetection(struct i2c_client *c);