diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-22 19:57:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-22 19:57:32 +0200 |
| commit | 6d11fb454b161a4565c57be6f1c5527235741003 (patch) | |
| tree | c238ed3df2f654181c2a0746478a33b32214cc60 /drivers/input/keyboard/atkbd.c | |
| parent | Merge branch 'for-linus' into for-3.18/core (diff) | |
| parent | blk-mq: use blk_mq_start_hw_queues() when running requeue work (diff) | |
| download | linux-6d11fb454b161a4565c57be6f1c5527235741003.tar.xz linux-6d11fb454b161a4565c57be6f1c5527235741003.zip | |
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.
Diffstat (limited to 'drivers/input/keyboard/atkbd.c')
| -rw-r--r-- | drivers/input/keyboard/atkbd.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 2dd1d0dd4f7d..6f5d79569136 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -1791,14 +1791,6 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), - DMI_MATCH(DMI_PRODUCT_NAME, "LW25-B7HV"), - }, - .callback = atkbd_deactivate_fixup, - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), - DMI_MATCH(DMI_PRODUCT_NAME, "P1-J273B"), }, .callback = atkbd_deactivate_fixup, }, |