linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index de0f46d..4b415d9 100644 (file)
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -94,7 +94,7 @@ static void call_bios(struct regs *regs)
 
 static ssize_t __init locate_wistron_bios(void __iomem *base)
 {
-       static unsigned char __initdata signature[] =
+       static const unsigned char __initdata signature[] =
                { 0x42, 0x21, 0x55, 0x30 };
        ssize_t offset;
 
@@ -273,27 +273,6 @@ static struct key_entry keymap_fs_amilo_pro_v2000[] = {
        { KE_END,  0 }
 };
 
-static struct key_entry keymap_fujitsu_n3510[] = {
-       { KE_KEY, 0x11, KEY_PROG1 },
-       { KE_KEY, 0x12, KEY_PROG2 },
-       { KE_KEY, 0x36, KEY_WWW },
-       { KE_KEY, 0x31, KEY_MAIL },
-       { KE_KEY, 0x71, KEY_STOPCD },
-       { KE_KEY, 0x72, KEY_PLAYPAUSE },
-       { KE_KEY, 0x74, KEY_REWIND },
-       { KE_KEY, 0x78, KEY_FORWARD },
-       { KE_END, 0 }
-};
-
-static struct key_entry keymap_wistron_ms2111[] = {
-       { KE_KEY,  0x11, KEY_PROG1 },
-       { KE_KEY,  0x12, KEY_PROG2 },
-       { KE_KEY,  0x13, KEY_PROG3 },
-       { KE_KEY,  0x31, KEY_MAIL },
-       { KE_KEY,  0x36, KEY_WWW },
-       { KE_END,  0 }
-};
-
 static struct key_entry keymap_wistron_ms2141[] = {
        { KE_KEY,  0x11, KEY_PROG1 },
        { KE_KEY,  0x12, KEY_PROG2 },
@@ -327,23 +306,12 @@ static struct key_entry keymap_acer_travelmate_240[] = {
        { KE_END, 0 }
 };
 
-static struct key_entry keymap_aopen_1559as[] = {
-       { KE_KEY,  0x01, KEY_HELP },
-       { KE_KEY,  0x06, KEY_PROG3 },
-       { KE_KEY,  0x11, KEY_PROG1 },
-       { KE_KEY,  0x12, KEY_PROG2 },
-       { KE_WIFI, 0x30, 0 },
-       { KE_KEY,  0x31, KEY_MAIL },
-       { KE_KEY,  0x36, KEY_WWW },
-       { KE_END,  0 },
-};
-
 /*
  * If your machine is not here (which is currently rather likely), please send
  * 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[] __initdata = {
+static struct dmi_system_id dmi_ids[] = {
        {
                .callback = dmi_matched,
                .ident = "Fujitsu-Siemens Amilo Pro V2000",
@@ -353,24 +321,6 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                },
                .driver_data = keymap_fs_amilo_pro_v2000
        },
-       {
-               .callback = dmi_matched,
-               .ident = "Fujitsu-Siemens Amilo M7400",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO M        "),
-               },
-               .driver_data = keymap_fs_amilo_pro_v2000
-       },
-       {
-               .callback = dmi_matched,
-               .ident = "Fujitsu N3510",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "N3510"),
-               },
-               .driver_data = keymap_fujitsu_n3510
-       },
        {
                .callback = dmi_matched,
                .ident = "Acer Aspire 1500",
@@ -389,24 +339,6 @@ static struct dmi_system_id dmi_ids[] __initdata = {
                },
                .driver_data = keymap_acer_travelmate_240
        },
-        {
-               .callback = dmi_matched,
-               .ident = "AOpen 1559AS",
-               .matches = {
-                       DMI_MATCH(DMI_PRODUCT_NAME, "E2U"),
-                       DMI_MATCH(DMI_BOARD_NAME, "E2U"),
-               },
-               .driver_data = keymap_aopen_1559as
-       },
-       {
-               .callback = dmi_matched,
-               .ident = "Medion MD 9783",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "MD 9783"),
-               },
-               .driver_data = keymap_wistron_ms2111
-       },
        { NULL, }
 };