Move LOG_BUF_SHIFT to a more sensible place

[linux-2.6-omap-h63xx.git] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index fe567129b22bac8918db042f6a47e909d2862790..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;
@@ -173,15 +174,12 @@ enum tuner_mode {
    when the tuner is set to TV mode.
  */
 
-/* allows to access the GPIOs of the host (pci bridge) */
-typedef void (*tuner_gpio_func_t) (void *dev, int bit_no,int value);
-
 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 */
-       tuner_gpio_func_t gpio_func;
+       int (*tuner_callback) (void *dev, int command,int arg);
 };
 
 struct tuner {
@@ -215,8 +213,9 @@ struct tuner {
        unsigned char tda827x_addr;
        unsigned char tda827x_ver;
        unsigned int sgIF;
+
        unsigned int config;
-       tuner_gpio_func_t gpio_func;
+       int (*tuner_callback) (void *dev, int command,int arg);
 
        /* function ptrs */
        void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);