Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 99acf847365caa81d4bab76a3dcd4e954fc145e0..6dcf3c45707d637518aef5b74d700fe8b2d261d7 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -23,6 +23,7 @@
 #define _TUNER_H
 
 #include <linux/videodev2.h>
+#include <linux/i2c.h>
 #include <media/tuner-types.h>
 
 extern int tuner_debug;
@@ -177,6 +178,8 @@ struct tuner_setup {
        unsigned short  addr;   /* I2C address */
        unsigned int    type;   /* Tuner type */
        unsigned int    mode_mask;  /* Allowed tuner modes */
+       unsigned int    config; /* configuraion for more complex tuners */
+       int (*tuner_callback) (void *dev, int command,int arg);
 };
 
 struct tuner {
@@ -211,6 +214,9 @@ struct tuner {
        unsigned char tda827x_ver;
        unsigned int sgIF;
 
+       unsigned int config;
+       int (*tuner_callback) (void *dev, int command,int arg);
+
        /* function ptrs */
        void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);
        void (*set_radio_freq)(struct i2c_client *c, unsigned int freq);