summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tuner-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-05-08 17:16:27 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-08 17:16:27 -0300
commit1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1 (patch)
treebfa305ec9d664d1562a7bce0fb4c96f7f6b22fef /linux/drivers/media/video/tuner-core.c
parenta55bfded81a0bffe5d07618b1983ad4abc6c2fbb (diff)
parentffd2e96a4ec0c5aec4c3629ce58c8f0cee88deb0 (diff)
downloadmediapointer-dvb-s2-1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1.tar.gz
mediapointer-dvb-s2-1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1.tar.bz2
merge: http://linuxtv.org/hg/~manu/dvbmath
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
-rw-r--r--linux/drivers/media/video/tuner-core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 00e073944..21bc09dda 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -257,13 +257,15 @@ static void set_type(struct i2c_client *c, unsigned int type,
t->mode_mask = new_mode_mask;
set_freq(c, (V4L2_TUNER_RADIO == t->mode) ? t->radio_freq : t->tv_freq);
- tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
+ tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
c->adapter->name, c->driver->name, c->addr << 1, type,
+ t->mode_mask);
#else
+ tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
c->adapter->name, c->driver->driver.name, c->addr << 1, type,
-#endif
t->mode_mask);
+#endif
}
/*