diff options
Diffstat (limited to 'drivers/input/misc/wistron_btns.c')
-rw-r--r-- | drivers/input/misc/wistron_btns.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index de0f46dd9692..4639537336fc 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
@@ -248,13 +248,10 @@ static int __init dmi_matched(struct dmi_system_id *dmi) | |||
248 | 248 | ||
249 | keymap = dmi->driver_data; | 249 | keymap = dmi->driver_data; |
250 | for (key = keymap; key->type != KE_END; key++) { | 250 | for (key = keymap; key->type != KE_END; key++) { |
251 | if (key->type == KE_WIFI) { | 251 | if (key->type == KE_WIFI) |
252 | have_wifi = 1; | 252 | have_wifi = 1; |
253 | break; | 253 | else if (key->type == KE_BLUETOOTH) |
254 | } else if (key->type == KE_BLUETOOTH) { | ||
255 | have_bluetooth = 1; | 254 | have_bluetooth = 1; |
256 | break; | ||
257 | } | ||
258 | } | 255 | } |
259 | return 1; | 256 | return 1; |
260 | } | 257 | } |
@@ -389,7 +386,16 @@ static struct dmi_system_id dmi_ids[] __initdata = { | |||
389 | }, | 386 | }, |
390 | .driver_data = keymap_acer_travelmate_240 | 387 | .driver_data = keymap_acer_travelmate_240 |
391 | }, | 388 | }, |
392 | { | 389 | { |
390 | .callback = dmi_matched, | ||
391 | .ident = "Acer TravelMate 2424NWXCi", | ||
392 | .matches = { | ||
393 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
394 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2420"), | ||
395 | }, | ||
396 | .driver_data = keymap_acer_travelmate_240 | ||
397 | }, | ||
398 | { | ||
393 | .callback = dmi_matched, | 399 | .callback = dmi_matched, |
394 | .ident = "AOpen 1559AS", | 400 | .ident = "AOpen 1559AS", |
395 | .matches = { | 401 | .matches = { |