summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tda9887.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-20 07:37:17 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-12-20 07:37:17 -0200
commit75cd5f355fe382a2645a959e6ff2beffa09019da (patch)
treed78404ed6886ea5ab11db15af0ec3deb1bbd9952 /linux/drivers/media/video/tda9887.h
parentd70b230414d9b4799b0091981a1d4f9cd55d9a84 (diff)
parent3842afc175a16c86d1f3b719f07a3bfddf3c7815 (diff)
downloadmediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.gz
mediapointer-dvb-s2-75cd5f355fe382a2645a959e6ff2beffa09019da.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tda9887.h')
-rw-r--r--linux/drivers/media/video/tda9887.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/linux/drivers/media/video/tda9887.h b/linux/drivers/media/video/tda9887.h
index b879f0ec2..8f873a8e6 100644
--- a/linux/drivers/media/video/tda9887.h
+++ b/linux/drivers/media/video/tda9887.h
@@ -17,16 +17,21 @@
#ifndef __TDA9887_H__
#define __TDA9887_H__
-#include "tuner-driver.h"
+#include <linux/i2c.h>
+#include "dvb_frontend.h"
/* ------------------------------------------------------------------------ */
#if defined(CONFIG_TUNER_TDA9887) || (defined(CONFIG_TUNER_TDA9887_MODULE) && defined(MODULE))
-extern int tda9887_attach(struct tuner *t);
+extern struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
+ struct i2c_adapter *i2c_adap,
+ u8 i2c_addr);
#else
-static inline int tda9887_attach(struct tuner *t)
+static inline struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
+ struct i2c_adapter *i2c_adap,
+ u8 i2c_addr)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
- return -EINVAL;
+ return NULL;
}
#endif