Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / zl10353.h

diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h
index 2660cec93f83700d10573613d4cc7a2ce123c1c4..fdbb88ff75fe80eebba27d7c94c67022c84e9f30 100644 (file)
--- a/drivers/media/dvb/frontends/zl10353.h
+++ b/drivers/media/dvb/frontends/zl10353.h
@@ -29,9 +29,9 @@ struct zl10353_config
        /* demodulator's I2C address */
        u8 demod_address;
 
-       /* frequencies in kHz */
-       int adc_clock;  /* default: 45056 */
-       int if2;        /* default: 36167 */
+       /* frequencies in units of 0.1kHz */
+       int adc_clock;  /* default: 450560 (45.056  MHz) */
+       int if2;        /* default: 361667 (36.1667 MHz) */
 
        /* set if no pll is connected to the secondary i2c bus */
        int no_tuner;
@@ -47,9 +47,9 @@ extern struct dvb_frontend* zl10353_attach(const struct zl10353_config *config,
 static inline struct dvb_frontend* zl10353_attach(const struct zl10353_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_ZL10353
+#endif /* CONFIG_DVB_ZL10353 */
 
 #endif /* ZL10353_H */