diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-02-23 06:21:03 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-02-23 06:21:03 +0100 |
commit | 415e915fdfc775ad0c6675fde1008f6f43dd6251 (patch) | |
tree | 429851187c0e85daa78f5d2bb6853959a1f5545b /drivers/input/misc/ariel-pwrbutton.c | |
parent | Input: applespi - fix occasional crc errors under load. (diff) | |
parent | Linux 5.11 (diff) | |
download | linux-415e915fdfc775ad0c6675fde1008f6f43dd6251.tar.xz linux-415e915fdfc775ad0c6675fde1008f6f43dd6251.zip |
Merge tag 'v5.11' into next
Merge with mainline to get latest APIs and device tree bindings.
Diffstat (limited to 'drivers/input/misc/ariel-pwrbutton.c')
-rw-r--r-- | drivers/input/misc/ariel-pwrbutton.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/input/misc/ariel-pwrbutton.c b/drivers/input/misc/ariel-pwrbutton.c index eda86ab552b9..17bbaac8b80c 100644 --- a/drivers/input/misc/ariel-pwrbutton.c +++ b/drivers/input/misc/ariel-pwrbutton.c @@ -149,12 +149,6 @@ static const struct of_device_id ariel_pwrbutton_of_match[] = { }; MODULE_DEVICE_TABLE(of, ariel_pwrbutton_of_match); -static const struct spi_device_id ariel_pwrbutton_id_table[] = { - { "wyse-ariel-ec-input", 0 }, - {} -}; -MODULE_DEVICE_TABLE(spi, ariel_pwrbutton_id_table); - static struct spi_driver ariel_pwrbutton_driver = { .driver = { .name = "dell-wyse-ariel-ec-input", |