Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)

[linux-beck.git] / drivers / input / misc / wistron_btns.c

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index ef7ee924ecc6795f023d4ac7747f9cf938c3760b..b77e2692ba3aa8abaada92dc15d9c53d35e0b159 100644 (file)
--- 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[] = {
                },
                .driver_data = keymap_acer_travelmate_240
        },
-       { 0, }
+       { NULL, }
 };
 
 static int __init select_keymap(void)