Merge branches 'release', 'acpica', 'bugzilla-10224', 'bugzilla-9772', 'bugzilla...

[linux-2.6-omap-h63xx.git] / drivers / media / video / tea5767.h

diff --git a/drivers/media/video/tea5767.h b/drivers/media/video/tea5767.h
index 5d78281adcc2acb5af002f844e1abdb9aecc73bb..7b547c092e25215bbd81505b8635c7ec907611bc 100644 (file)
--- a/drivers/media/video/tea5767.h
+++ b/drivers/media/video/tea5767.h
@@ -20,6 +20,25 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
+enum tea5767_xtal {
+       TEA5767_LOW_LO_32768    = 0,
+       TEA5767_HIGH_LO_32768   = 1,
+       TEA5767_LOW_LO_13MHz    = 2,
+       TEA5767_HIGH_LO_13MHz   = 3,
+};
+
+struct tea5767_ctrl {
+       unsigned int            port1:1;
+       unsigned int            port2:1;
+       unsigned int            high_cut:1;
+       unsigned int            st_noise:1;
+       unsigned int            soft_mute:1;
+       unsigned int            japan_band:1;
+       unsigned int            deemph_75:1;
+       unsigned int            pllref:1;
+       enum tea5767_xtal       xtal_freq;
+};
+
 #if defined(CONFIG_TUNER_TEA5767) || (defined(CONFIG_TUNER_TEA5767_MODULE) && defined(MODULE))
 extern int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr);
 
@@ -31,7 +50,7 @@ static inline int tea5767_autodetection(struct i2c_adapter* i2c_adap,
                                        u8 i2c_addr)
 {
        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
-              __FUNCTION__);
+              __func__);
        return -EINVAL;
 }
 
@@ -39,7 +58,7 @@ static inline struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
                                                   struct i2c_adapter* i2c_adap,
                                                   u8 i2c_addr)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif