Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[linux-2.6] / drivers / media / dvb / frontends / s5h1409.h

diff --git a/drivers/media/dvb/frontends/s5h1409.h b/drivers/media/dvb/frontends/s5h1409.h
index bccfd8a6fbd44e889826bdb94bbf1508a22674af..59f4335964c6625a78ccba31e2db6ce24855466c 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1409.h
+++ b/drivers/media/dvb/frontends/s5h1409.h
@@ -39,8 +39,8 @@ struct s5h1409_config
 #define S5H1409_GPIO_ON  1
        u8 gpio;
 
-       /* IF Freq in KHz */
-       u16 if_freq;
+       /* IF Freq for QAM in KHz, VSB is hardcoded to 5380 */
+       u16 qam_if;
 
        /* Spectral Inversion */
 #define S5H1409_INVERSION_OFF 0
@@ -51,16 +51,23 @@ struct s5h1409_config
 #define S5H1409_TUNERLOCKING 0
 #define S5H1409_DEMODLOCKING 1
        u8 status_mode;
+
+       /* MPEG signal timing */
+#define S5H1409_MPEGTIMING_CONTINOUS_INVERTING_CLOCK       0
+#define S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK    1
+#define S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK    2
+#define S5H1409_MPEGTIMING_NONCONTINOUS_NONINVERTING_CLOCK 3
+       u16 mpeg_timing;
 };
 
-#if defined(CONFIG_DVB_S5H1409) || defined(CONFIG_DVB_S5H1409_MODULE)
+#if defined(CONFIG_DVB_S5H1409) || (defined(CONFIG_DVB_S5H1409_MODULE) && defined(MODULE))
 extern struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
                                           struct i2c_adapter* i2c);
 #else
 static inline struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
                                                  struct i2c_adapter* i2c)
 {
-       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+       printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
 #endif /* CONFIG_DVB_S5H1409 */