Merge branch 'master' of git://1984.lsi.us.es/nf

[karo-tx-linux.git] / drivers / media / tuners / fc0012-priv.h

diff --git a/drivers/media/tuners/fc0012-priv.h b/drivers/media/tuners/fc0012-priv.h
index 4577c917e616ef1622d124fb5160551c342064ad..1a86ce1d3fcf03bbc87fcb884eb9621a1b25414c 100644 (file)
--- a/drivers/media/tuners/fc0012-priv.h
+++ b/drivers/media/tuners/fc0012-priv.h
@@ -21,20 +21,9 @@
 #ifndef _FC0012_PRIV_H_
 #define _FC0012_PRIV_H_
 
-#define LOG_PREFIX "fc0012"
-
-#undef err
-#define err(f, arg...)  printk(KERN_ERR     LOG_PREFIX": " f "\n" , ## arg)
-#undef info
-#define info(f, arg...) printk(KERN_INFO    LOG_PREFIX": " f "\n" , ## arg)
-#undef warn
-#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)
-
 struct fc0012_priv {
        struct i2c_adapter *i2c;
-       u8 addr;
-       u8 dual_master;
-       u8 xtal_freq;
+       const struct fc0012_config *cfg;
 
        u32 frequency;
        u32 bandwidth;