Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / drivers / gpio / pca953x.c

diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 5a99e81d27843c8ce9e376684196b5daa253f90a..a380730b61abe49800af8e655eaf5735d0524ad0 100644 (file)
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -30,7 +30,10 @@ static const struct i2c_device_id pca953x_id[] = {
        { "pca9537", 4, },
        { "pca9538", 8, },
        { "pca9539", 16, },
-       /* REVISIT several pca955x parts should work here too */
+       { "pca9554", 8, },
+       { "pca9555", 16, },
+       { "pca9557", 8, },
+       { "max7310", 8, },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, pca953x_id);
@@ -193,7 +196,7 @@ static int __devinit pca953x_probe(struct i2c_client *client,
 {
        struct pca953x_platform_data *pdata;
        struct pca953x_chip *chip;
-       int ret, i;
+       int ret;
 
        pdata = client->dev.platform_data;
        if (pdata == NULL)