diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 12:37:43 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-24 12:37:43 -0800 |
| commit | 0cce284537fb42d9c28b9b31038ffc9b464555f5 (patch) | |
| tree | e7af3b5fe2d04ef6527b5da50851d498ee13184e /drivers/input/misc/tps65218-pwrbutton.c | |
| parent | cefb26d4b37c329f624eb235a1bdc7b6b8dd9430 (diff) | |
| parent | 7a308bb3016f57e5be11a677d15b821536419d36 (diff) | |
| download | talos-obmc-linux-0cce284537fb42d9c28b9b31038ffc9b464555f5.tar.gz talos-obmc-linux-0cce284537fb42d9c28b9b31038ffc9b464555f5.zip | |
Merge tag 'v4.10-rc5' into next
Sync up with mainline to bring up improvements in various subsystems.
Diffstat (limited to 'drivers/input/misc/tps65218-pwrbutton.c')
| -rw-r--r-- | drivers/input/misc/tps65218-pwrbutton.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/input/misc/tps65218-pwrbutton.c b/drivers/input/misc/tps65218-pwrbutton.c index 65384754714d..a4455bb12ae0 100644 --- a/drivers/input/misc/tps65218-pwrbutton.c +++ b/drivers/input/misc/tps65218-pwrbutton.c @@ -148,12 +148,20 @@ static int tps6521x_pb_probe(struct platform_device *pdev) return 0; } +static const struct platform_device_id tps6521x_pwrbtn_id_table[] = { + { "tps65218-pwrbutton", }, + { "tps65217-pwrbutton", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(platform, tps6521x_pwrbtn_id_table); + static struct platform_driver tps6521x_pb_driver = { .probe = tps6521x_pb_probe, .driver = { .name = "tps6521x_pwrbutton", .of_match_table = of_tps6521x_pb_match, }, + .id_table = tps6521x_pwrbtn_id_table, }; module_platform_driver(tps6521x_pb_driver); |
