diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:19:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-31 09:19:50 -0200 |
| commit | eaf6bdcc22aa742bdec32708647fe07d891631db (patch) | |
| tree | 409a735f957b7f172cd337276098cfe1a1ce9636 /linux/drivers/media/video/tuner-i2c.h | |
| parent | b9311eb8cce1ff6e214edd27ca2ad41ffa5cbeb2 (diff) | |
| parent | f1ff79eafc9d2ff01fbec2eaee2f81bcf9544f86 (diff) | |
| download | mediapointer-dvb-s2-eaf6bdcc22aa742bdec32708647fe07d891631db.tar.gz mediapointer-dvb-s2-eaf6bdcc22aa742bdec32708647fe07d891631db.tar.bz2 | |
merge: http://linuxtv.org/hg/~endriss/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/tuner-i2c.h')
| -rw-r--r-- | linux/drivers/media/video/tuner-i2c.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/linux/drivers/media/video/tuner-i2c.h b/linux/drivers/media/video/tuner-i2c.h index 422817129..159019ec3 100644 --- a/linux/drivers/media/video/tuner-i2c.h +++ b/linux/drivers/media/video/tuner-i2c.h @@ -47,7 +47,6 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf, } #ifndef __TUNER_DRIVER_H__ -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) #define tuner_warn(fmt, arg...) do {\ printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \ i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) @@ -58,18 +57,6 @@ static inline int tuner_i2c_xfer_recv(struct tuner_i2c_props *props, char *buf, if ((debug)) \ printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \ i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) -#else -#define tuner_warn(fmt, arg...) do {\ - printk(KERN_WARNING PREFIX "%d-%04x: " fmt, \ - i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) -#define tuner_info(fmt, arg...) do {\ - printk(KERN_INFO PREFIX "%d-%04x: " fmt, \ - i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) -#define tuner_dbg(fmt, arg...) do {\ - if ((debug)) \ - printk(KERN_DEBUG PREFIX "%d-%04x: " fmt, \ - i2c_adapter_id(priv->i2c_props.adap), priv->i2c_props.addr , ##arg); } while (0) -#endif #endif /* __TUNER_DRIVER_H__ */ #endif /* __TUNER_I2C_H__ */ |