diff --git a/[refs] b/[refs]
index 241789daa5b5..e1d58eb133db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5daed07401ed27bb2684e803f3f01e3a424ea282
+refs/heads/master: 9edd350f51a1e81f7f01308a99800cad7770e5cd
diff --git a/trunk/drivers/media/video/saa7115.c b/trunk/drivers/media/video/saa7115.c
index f0baca71dd3e..bcd1c8f6cf6b 100644
--- a/trunk/drivers/media/video/saa7115.c
+++ b/trunk/drivers/media/video/saa7115.c
@@ -1557,7 +1557,7 @@ static int saa7115_remove(struct i2c_client *client)
 }
 
 static const struct i2c_device_id saa7115_id[] = {
-	{ "saa711x", 1 }, /* autodetect */
+	{ "saa7115_auto", 1 }, /* autodetect */
 	{ "saa7111", 0 },
 	{ "saa7113", 0 },
 	{ "saa7114", 0 },