Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / input / misc / wistron_btns.c

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index ccf0faeee5c18390ea7ee3f84eb4c1617b00db62..7b9d1c1da41a7d676737e7adc92c1f1700e1d6a1 100644 (file)
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -17,7 +17,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/dmi.h>
 #include <linux/init.h>
 #include <linux/input.h>
@@ -94,7 +94,7 @@ static void call_bios(struct regs *regs)
 
 static ssize_t __init locate_wistron_bios(void __iomem *base)
 {
-       static const unsigned char __initdata signature[] =
+       static unsigned char __initdata signature[] =
                { 0x42, 0x21, 0x55, 0x30 };
        ssize_t offset;
 
@@ -248,13 +248,10 @@ static int __init dmi_matched(struct dmi_system_id *dmi)
 
        keymap = dmi->driver_data;
        for (key = keymap; key->type != KE_END; key++) {
-               if (key->type == KE_WIFI) {
+               if (key->type == KE_WIFI)
                        have_wifi = 1;
-                       break;
-               } else if (key->type == KE_BLUETOOTH) {
+               else if (key->type == KE_BLUETOOTH)
                        have_bluetooth = 1;
-                       break;
-               }
        }
        return 1;
 }
@@ -343,7 +340,7 @@ static struct key_entry keymap_aopen_1559as[] = {
  * a list of buttons and their key codes (reported when loading this module
  * with force=1) and the output of dmidecode to $MODULE_AUTHOR.
  */
-static struct dmi_system_id dmi_ids[] = {
+static struct dmi_system_id dmi_ids[] __initdata = {
        {
                .callback = dmi_matched,
                .ident = "Fujitsu-Siemens Amilo Pro V2000",
@@ -389,7 +386,16 @@ static struct dmi_system_id dmi_ids[] = {
                },
                .driver_data = keymap_acer_travelmate_240
        },
-        {
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 2424NWXCi",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2420"),
+               },
+               .driver_data = keymap_acer_travelmate_240
+       },
+       {
                .callback = dmi_matched,
                .ident = "AOpen 1559AS",
                .matches = {