diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
| commit | c30e05a83632aeb144f9d3912d39162564244a34 (patch) | |
| tree | 9877e4ed4167591ccb709ffbee27d7766986dabb /linux/drivers/media/video/tuner-i2c.h | |
| parent | ba8e7e903d8aaa290f8528c1beba1284c1d33ddf (diff) | |
| parent | e2b3b766697ca509f1281178161156ab8df5b0d5 (diff) | |
| download | mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.gz mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
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 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tuner-i2c.h b/linux/drivers/media/video/tuner-i2c.h index d7cf72c3f..de52e8ffd 100644 --- a/linux/drivers/media/video/tuner-i2c.h +++ b/linux/drivers/media/video/tuner-i2c.h @@ -59,7 +59,6 @@ static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props, return (ret == 2) ? ilen : ret; } -#ifndef __TUNER_DRIVER_H__ #define tuner_warn(fmt, arg...) do { \ printk(KERN_WARNING "%s %d-%04x: " fmt, PREFIX, \ i2c_adapter_id(priv->i2c_props.adap), \ @@ -84,6 +83,5 @@ static inline int tuner_i2c_xfer_send_recv(struct tuner_i2c_props *props, i2c_adapter_id(priv->i2c_props.adap), \ priv->i2c_props.addr , ##arg); \ } while (0) -#endif /* __TUNER_DRIVER_H__ */ #endif /* __TUNER_I2C_H__ */ |