From 5000c5e2abd460c490d9ab3e9e6d7fd3a686d562 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Thu, 17 Jul 2008 13:22:51 -0300
Subject: [PATCH] --- yaml --- r: 104047 b: refs/heads/master c:
 9edd350f51a1e81f7f01308a99800cad7770e5cd h: refs/heads/master i:   104045:
 47e16d0b44fd025034b4f3694d9a76aab087ddaf   104043:
 ae15a7c6c8e4fca6464c439f01f8be42df288d14   104039:
 1a7eafdd3b9d892a7aa851eff706e35ce95ffbd4   104031:
 384a0618ca8b5d5e92bee9f3218558615332193d v: v3

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

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 },