From 7d4651c8e0961354b298165ec03219c02bc7c734 Mon Sep 17 00:00:00 2001
From: Gerd Knorr <devnull@localhost>
Date: Tue, 15 Feb 2005 15:59:34 +0000
Subject: - merge some patches from mainline. - tuner kernel message fixups. -
 misc.

---
 linux/include/media/tuner.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'linux/include')

diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index d4c8a026b..74378a280 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -140,6 +140,11 @@
 #define I2C_ADDR_TDA8275        0x61
 
 struct tuner {
+	/* device */
+	struct i2c_client i2c;
+
+	/* state + config */
+	unsigned int initialized;
 	unsigned int type;            /* chip type */
 	unsigned int freq;            /* keep track of the current settings */
 	v4l2_std_id  std;
@@ -170,6 +175,13 @@ extern int microtune_init(struct i2c_client *c);
 extern int tda8290_init(struct i2c_client *c);
 extern int default_tuner_init(struct i2c_client *c);
 
+#define tuner_warn(fmt, arg...) \
+	dev_printk(KERN_WARNING , &t->i2c.dev , fmt , ## arg)
+#define tuner_info(fmt, arg...) \
+	dev_printk(KERN_INFO , &t->i2c.dev , fmt , ## arg)
+#define tuner_dbg(fmt, arg...) \
+	if (tuner_debug) dev_printk(KERN_DEBUG , &t->i2c.dev , fmt , ## arg)
+
 #endif /* __KERNEL__ */
 
 #endif
-- 
cgit v1.2.3