From cd58517c962c0c656d59fdc3968ff4df14fa988f Mon Sep 17 00:00:00 2001 From: merge Date: Tue, 13 Jan 2009 08:42:36 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-add-id_table-in-the-i2c-driver-1231835937 pending-tracking-hist top was MERGE-via-stable-tracking-add-id_table-in-the-i2c-driver-1231835937 / cf8dd84d83700bf038b2de4376ce238f09499a15 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-add-id_table-in-the-i2c-driver stable-tracking-hist top was add-id_table-in-the-i2c-driver / 6c0bc11ccbb35c7477cc1208ab454ba5b6bf08b1 ... parent commitmessage: From: Matt Hsu Add id_table in the i2c driver struct of lp5521. In new style i2c client, i2c driver should have id_table to match its device id. Otherwise, the attachment of i2c driver would be failed. Signed-off-by: Matt Hsu --- drivers/leds/leds-lp5521.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers') diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c index 62d68fd5258..7bbf79a6f3a 100644 --- a/drivers/leds/leds-lp5521.c +++ b/drivers/leds/leds-lp5521.c @@ -582,12 +582,17 @@ static int lp5521_remove(struct i2c_client *client) } #endif +static struct i2c_device_id lp5521_id[] = { + {LP5521_DRIVER_NAME, }, +}; + static struct i2c_driver lp5521_driver = { .driver = { .name = LP5521_DRIVER_NAME, .suspend = lp5521_suspend, .resume = lp5521_resume, }, + .id_table = lp5521_id, .probe = lp5521_probe, .remove = __exit_p(lp5521_remove), }; -- cgit v1.2.3