From: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Wed, 21 Dec 2005 04:03:50 +0000 (-0500)
Subject: Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
X-Git-Tag: v2.6.16-rc1~928^2~20
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041387d98460b3947587929ef3a4773b8c48538f;p=linux-2.6

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

041387d98460b3947587929ef3a4773b8c48538f
diff --cc drivers/input/misc/wistron_btns.c
index ef7ee924ec,bac3085185..b77e2692ba
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@@ -330,16 -320,7 +330,16 @@@ static struct dmi_system_id dmi_ids[] 
  		},
  		.driver_data = keymap_acer_aspire_1500
  	},
 +	{
 +		.callback = dmi_matched,
 +		.ident = "Acer TravelMate 240",
 +		.matches = {
 +			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
 +			DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 240"),
 +		},
 +		.driver_data = keymap_acer_travelmate_240
 +	},
- 	{ 0, }
+ 	{ NULL, }
  };
  
  static int __init select_keymap(void)