Merge branch 'linus' into xen-64bit

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

diff --git a/drivers/media/dvb/frontends/au8522.h b/drivers/media/dvb/frontends/au8522.h
index 9952957ab7b001b606610093e15689d09b5608cf..d7affa3cdb27536190d24293ca658729740b95e5 100644 (file)
--- a/drivers/media/dvb/frontends/au8522.h
+++ b/drivers/media/dvb/frontends/au8522.h
@@ -24,8 +24,7 @@
 
 #include <linux/dvb/frontend.h>
 
-struct au8522_config
-{
+struct au8522_config {
        /* the demodulator's i2c address */
        u8 demod_address;
 
@@ -35,7 +34,8 @@ struct au8522_config
        u8 status_mode;
 };
 
-#if defined(CONFIG_DVB_AU8522) || (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE))
+#if defined(CONFIG_DVB_AU8522) ||                              \
+           (defined(CONFIG_DVB_AU8522_MODULE) && defined(MODULE))
 extern struct dvb_frontend *au8522_attach(const struct au8522_config *config,
                                          struct i2c_adapter *i2c);
 #else
@@ -43,7 +43,7 @@ static inline
 struct dvb_frontend *au8522_attach(const struct au8522_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_AU8522 */