Merge branch 'next' into for-linus

[linux-2.6-block.git] / drivers / input / touchscreen / iqs5xx.c

diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c
index 4f6fe8cc8efaefeb8cce55f52251c35f1963f4d5..5875bb1099a84e1741e0a70ce6cae78662577aa6 100644 (file)
--- a/drivers/input/touchscreen/iqs5xx.c
+++ b/drivers/input/touchscreen/iqs5xx.c
@@ -1056,8 +1056,6 @@ static int iqs5xx_probe(struct i2c_client *client,
        if (!iqs5xx)
                return -ENOMEM;
 
-       dev_set_drvdata(&client->dev, iqs5xx);
-
        i2c_set_clientdata(client, iqs5xx);
        iqs5xx->client = client;