diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/input/misc | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/wistron_btns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index ef7ee924ecc6..b77e2692ba3a 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
| @@ -339,7 +339,7 @@ static struct dmi_system_id dmi_ids[] = { | |||
| 339 | }, | 339 | }, |
| 340 | .driver_data = keymap_acer_travelmate_240 | 340 | .driver_data = keymap_acer_travelmate_240 |
| 341 | }, | 341 | }, |
| 342 | { 0, } | 342 | { NULL, } |
| 343 | }; | 343 | }; |
| 344 | 344 | ||
| 345 | static int __init select_keymap(void) | 345 | static int __init select_keymap(void) |