merge 2.6.13-rc4 with ACPI's to-linus tree

[linux-2.6] / drivers / media / video / adv7175.c

diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 2d5fa44fcd4d7c49c5b57b2ade9f7a783cc9c305..f898b65863741162d6269cf062d625e51660d3be 100644 (file)
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -435,15 +435,13 @@ static unsigned short normal_i2c[] =
        I2C_CLIENT_END
 };
 
-static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END , I2C_CLIENT_END };
+static unsigned short ignore = I2C_CLIENT_END;
                                                                                 
 static struct i2c_client_address_data addr_data = {
        .normal_i2c             = normal_i2c,
-       .probe                  = probe,
-       .ignore                 = ignore,
-       .force                  = force
+       .probe                  = &ignore,
+       .ignore                 = &ignore,
+       .force                  = &ignore,
 };
 
 static struct i2c_driver i2c_driver_adv7175;