Merge branch 'next' into for-linus

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

diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c
index ac28019ba4c33cf4361b395164ce6b0ed4391d3f..5aff8dcda0dc34d58bd5dba260ea58a9628b0b51 100644 (file)
--- a/drivers/input/touchscreen/mcs5000_ts.c
+++ b/drivers/input/touchscreen/mcs5000_ts.c
@@ -266,7 +266,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(mcs5000_ts_pm,
                                mcs5000_ts_suspend, mcs5000_ts_resume);
 
 static const struct i2c_device_id mcs5000_ts_id[] = {
-       { "mcs5000_ts", 0 },
+       { "mcs5000_ts" },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id);