summaryrefslogtreecommitdiff
path: root/linux/include/media/tuner.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media/tuner.h')
-rw-r--r--linux/include/media/tuner.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 2f5f8a1be..f62c95152 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
/*
- $Id: tuner.h,v 1.71 2006/01/02 22:31:44 hverkuil Exp $
+ $Id: tuner.h,v 1.72 2006/01/08 12:05:34 mchehab Exp $
tuner.h - definition for different tuners
Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de)
@@ -212,6 +212,7 @@ extern int tea5767_tuner_init(struct i2c_client *c);
extern int default_tuner_init(struct i2c_client *c);
extern int tea5767_autodetection(struct i2c_client *c);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
#define tuner_warn(fmt, arg...) do {\
printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \
i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
@@ -223,6 +224,19 @@ extern int tea5767_autodetection(struct i2c_client *c);
if (debug) \
printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \
i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#else
+#define tuner_warn(fmt, arg...) do {\
+ printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+ i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#define tuner_info(fmt, arg...) do {\
+ printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+ i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#define tuner_dbg(fmt, arg...) do {\
+ extern int debug; \
+ if (debug) \
+ printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->driver.name, \
+ i2c_adapter_id(t->i2c.adapter), t->i2c.addr , ##arg); } while (0)
+#endif
#endif /* __KERNEL__ */