Merge tag 'v4.10-rc5' into next

[karo-tx-linux.git] / drivers / input / misc / tps65218-pwrbutton.c

diff --git a/drivers/input/misc/tps65218-pwrbutton.c b/drivers/input/misc/tps65218-pwrbutton.c
index 65384754714d41b41025758705bb1e1d99acf5d5..a4455bb12ae0c1896a08aaa9bd198b2aafed19d9 100644 (file)
--- 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);