Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / media / dvb / frontends / cx24123.h

diff --git a/drivers/media/dvb/frontends/cx24123.h b/drivers/media/dvb/frontends/cx24123.h
index cc6b411d6d20ba76da2a535ad103f854eec71690..51ae866e9fed631df412eaeb44866439c5137a68 100644 (file)
--- a/drivers/media/dvb/frontends/cx24123.h
+++ b/drivers/media/dvb/frontends/cx24123.h
@@ -23,13 +23,12 @@
 
 #include <linux/dvb/frontend.h>
 
-struct cx24123_config
-{
+struct cx24123_config {
        /* the demodulator's i2c address */
        u8 demod_address;
 
        /* Need to set device param for start_dma */
-       int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
+       int (*set_ts_params)(struct dvb_frontend *fe, int is_punctured);
 
        /* 0 = LNB voltage normal, 1 = LNB voltage inverted */
        int lnb_polarity;
@@ -39,7 +38,8 @@ struct cx24123_config
        void (*agc_callback) (struct dvb_frontend *);
 };
 
-#if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) && defined(MODULE))
+#if defined(CONFIG_DVB_CX24123) || (defined(CONFIG_DVB_CX24123_MODULE) \
+       && defined(MODULE))
 extern struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
                                           struct i2c_adapter *i2c);
 extern struct i2c_adapter *cx24123_get_tuner_i2c_adapter(struct dvb_frontend *);
@@ -56,6 +56,6 @@ static struct i2c_adapter *
        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
        return NULL;
 }
-#endif // CONFIG_DVB_CX24123
+#endif
 
 #endif /* CX24123_H */