Revert "UBUNTU: SAUCE: hotkey quirks for various Zeptro Znote and Fujitsu Amilo laptops"
authorAndy Whitcroft <apw@canonical.com>
Fri, 30 Mar 2012 15:38:51 +0000 (16:38 +0100)
committerLeann Ogasawara <leann.ogasawara@canonical.com>
Mon, 2 Apr 2012 20:24:42 +0000 (13:24 -0700)
This reverts commit f5931d1fc7c699a650ca14a31f4b4bc620977389.

These have already been converted to udev rules so we no longer need
these to be quirked in the kernel.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

drivers/input/keyboard/atkbd.c

index c6422c9..19cfc0c 100644 (file)
@@ -936,14 +936,6 @@ static unsigned int atkbd_amilo_xi3650_forced_release_keys[] = {
 };
 
 /*
- * Fujitsu Siemens system with broken key release on volume keys and mute key
- */
-
-static unsigned int atkbd_amilo_xi_2428_forced_release_keys[] = {
-       0xa0, 0xae, 0xb0, -1U
-};
-
-/*
  * Soltech TA12 system with broken key release on volume keys and mute key
  */
 static unsigned int atkdb_soltech_ta12_forced_release_keys[] = {
@@ -1717,35 +1709,6 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = {
                .driver_data = atkbd_amilo_xi3650_forced_release_keys,
        },
        {
-               .ident = "Znote 6615WD",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Zepto"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Znote 6615WD"),
-               },
-               .callback = atkbd_setup_forced_release,
-               .driver_data = atkbd_volume_forced_release_keys,
-       },
-       {
-               .ident = "Znote 6625WD",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Zepto"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Znote"),
-                       DMI_MATCH(DMI_PRODUCT_VERSION, "6625WD"),
-               },
-               .callback = atkbd_setup_forced_release,
-               .driver_data = atkbd_volume_forced_release_keys,
-       },
-       {
-               .ident = "AMILO Xi 2428",
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2428"),
-               },
-               .callback = atkbd_setup_forced_release,
-               .driver_data = atkbd_amilo_xi_2428_forced_release_keys,
-       },
-       {
-               .ident = "Soltech Corporation TA12",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Soltech Corporation"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "TA12"),