Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / drivers / media / dvb / frontends / tda8261.h

diff --git a/drivers/media/dvb/frontends/tda8261.h b/drivers/media/dvb/frontends/tda8261.h
index b8d8e37b045b2475f6d46815f3d3cac72113ea58..006e45351b94a7730328356e1398ef945a004aa2 100644 (file)
--- a/drivers/media/dvb/frontends/tda8261.h
+++ b/drivers/media/dvb/frontends/tda8261.h
@@ -1,3 +1,22 @@
+/*
+       TDA8261 8PSK/QPSK tuner driver
+       Copyright (C) Manu Abraham (abraham.manu@gmail.com)
+
+       This program is free software; you can redistribute it and/or modify
+       it under the terms of the GNU General Public License as published by
+       the Free Software Foundation; either version 2 of the License, or
+       (at your option) any later version.
+
+       This program is distributed in the hope that it will be useful,
+       but WITHOUT ANY WARRANTY; without even the implied warranty of
+       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+       GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program; if not, write to the Free Software
+       Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #ifndef __TDA8261_H
 #define __TDA8261_H
 
@@ -15,11 +34,22 @@ struct tda8261_config {
        enum tda8261_step       step_size;
 };
 
-/* move out from here! */
-static const struct tda8261_config sd1878c_config = {
-//     .name           = "SD1878C",
-       .addr           = 0x60,
-       .step_size      = TDA8261_STEP_1000 /* kHz */
-};
+#if defined(CONFIG_DVB_TDA8261) || (defined(CONFIG_DVB_TDA8261_MODULE) && defined(MODULE))
+
+extern struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe,
+                                          const struct tda8261_config *config,
+                                          struct i2c_adapter *i2c);
+
+#else
+
+static inline struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe,
+                                                 const struct tda8261_config *config,
+                                                 struct i2c_adapter *i2c)
+{
+       printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
+       return NULL;
+}
+
+#endif //CONFIG_DVB_TDA8261
 
 #endif// __TDA8261_H