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

2005-12-20 23:03:50 -05:00
parent 56f0356321 b05948d9b7
commit 041387d984
390 changed files with 5999 additions and 5553 deletions
--- 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)