diff --git a/[refs] b/[refs]
index 801372ed5e15..ff117488b339 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b07d650833f832f30bbfa259fa56675fb35adbd3
+refs/heads/master: b3ccce3831196d2a7d745879124a8bf2de5db5bf
diff --git a/trunk/drivers/staging/media/go7007/wis-ov7640.c b/trunk/drivers/staging/media/go7007/wis-ov7640.c
index cef1a6259d70..9f01657f884a 100644
--- a/trunk/drivers/staging/media/go7007/wis-ov7640.c
+++ b/trunk/drivers/staging/media/go7007/wis-ov7640.c
@@ -59,12 +59,12 @@ static int wis_ov7640_probe(struct i2c_client *client,
 
 	client->flags = I2C_CLIENT_SCCB;
 
-	printk(KERN_DEBUG
+	dev_dbg(&client->dev,
 		"wis-ov7640: initializing OV7640 at address %d on %s\n",
 		client->addr, adapter->name);
 
 	if (write_regs(client, initial_registers) < 0) {
-		printk(KERN_ERR "wis-ov7640: error initializing OV7640\n");
+		dev_err(&client->dev, "wis-ov7640: error initializing OV7640\n");
 		return -ENODEV;
 	}