aboutsummaryrefslogtreecommitdiff
path: root/drivers/leds
diff options
context:
space:
mode:
authormerge <null@invalid>2009-01-13 08:42:36 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2009-01-13 08:42:36 +0000
commitcd58517c962c0c656d59fdc3968ff4df14fa988f (patch)
tree6ca0838e9e344b6ed7d6626ff049769f77751da7 /drivers/leds
parent5fed74bd2a6116f78bf70eeb6831d6a689b87289 (diff)
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 <null@invalid> 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 <matt_hsu@openmoko.org> 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 <matt_hsu@openmoko.org>
Diffstat (limited to 'drivers/leds')
-rw-r--r--drivers/leds/leds-lp5521.c5
1 files changed, 5 insertions, 0 deletions
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),
};