From 841fefa5d19287a0eae2b9aa09bd3af3e4e16b63 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sun, 16 Dec 2007 19:14:31 -0300
Subject: [PATCH] --- yaml --- r: 76599 b: refs/heads/master c:
 daae58956bebeab6631ba078669970a27bdfbdbe h: refs/heads/master i:   76597:
 677724aa77e3fc05ba67fd49a881acf3fe1e256e   76595:
 bdbbe79cdde094319f28e840abb5c009381aa8a7   76591:
 2060e27641539d40e7949b1b2078b330817cecf8 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/tda9887.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 610b3d7d5fcd..dfa99399c927 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35e420357bd835d43c76d3ab5e35694be0b56f95
+refs/heads/master: daae58956bebeab6631ba078669970a27bdfbdbe
diff --git a/trunk/drivers/media/video/tda9887.c b/trunk/drivers/media/video/tda9887.c
index 8a95f097ba23..f265c702cde1 100644
--- a/trunk/drivers/media/video/tda9887.c
+++ b/trunk/drivers/media/video/tda9887.c
@@ -25,14 +25,14 @@ static int tda9887_debug;
 module_param_named(debug, tda9887_debug, int, 0644);
 
 #define tda9887_info(fmt, arg...) do {\
-	printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c->name, \
-			i2c_adapter_id(priv->t->i2c->adapter), \
-			priv->t->i2c->addr, ##arg); } while (0)
+	printk(KERN_INFO "tda9887 %d-%04x: " fmt, \
+			i2c_adapter_id(priv->i2c_props.adap), \
+			priv->i2c_props.addr, ##arg); } while (0)
 #define tda9887_dbg(fmt, arg...) do {\
 	if (tda9887_debug) \
-		printk(KERN_INFO "%s %d-%04x: " fmt, priv->t->i2c->name, \
-			i2c_adapter_id(priv->t->i2c->adapter), \
-			priv->t->i2c->addr, ##arg); } while (0)
+		printk(KERN_INFO "tda9887 %d-%04x: " fmt, \
+			i2c_adapter_id(priv->i2c_props.adap), \
+			priv->i2c_props.addr, ##arg); } while (0)
 
 struct tda9887_priv {
 	struct tuner_i2c_props i2c_props;