Merge linux-2.6 with linux-acpi-2.6

[~andy/linux] / drivers / media / video / tea6415c.c

diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 8334d6ccd0a0e37eb7e2f78e375122a5825fc4d2..ee3688348b662bac1dc06dc7be1893cd537f185d 100644 (file)
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -200,7 +200,7 @@ static struct i2c_driver driver = {
 };
 
 static struct i2c_client client_template = {
-       I2C_DEVNAME("tea6415c"),
+       .name = "tea6415c",
        .driver = &driver,
 };