- added linux-wistron-amilo8210 patch (support for F-S Amilo Pro 8210 keys and RFKILL)

  (for testing before submitting upstream)

Changed files:
    kernel.spec -> 1.879
    linux-wistron-amilo8210.patch -> 1.1

diff --git a/kernel.spec b/kernel.spec
index 565351f165d75d22604ed8be321ab5ded3b13da0..9867574ddf189f1c9d5dd7ef178692574b2f9135 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -168,6 +168,7 @@ Source59:   kernel-bzip2-lzma.config
 # http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
 Patch3:                kernel-fbcondecor.patch
 Patch4:                kernel-fbcon-margins.patch
+Patch5:                linux-wistron-amilo8210.patch
 
 # netfilter related stuff mostly based on patch-o-matic-ng
 # snapshot 20070806 with some fixes. Some modules
@@ -681,6 +682,7 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
 
 ## netfilter
 #

diff --git a/linux-wistron-amilo8210.patch b/linux-wistron-amilo8210.patch
new file mode 100644 (file)
index 0000000..fc9ccb3
--- /dev/null
+++ b/linux-wistron-amilo8210.patch
@@ -0,0 +1,35 @@
+--- linux-2.6.37/drivers/input/misc/wistron_btns.c.orig        2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/input/misc/wistron_btns.c     2011-02-19 07:51:36.000000000 +0100
+@@ -278,6 +278,16 @@
+       { KE_END,       0 }
+ };
+ 
++static struct key_entry keymap_fs_amilo_pro_v8210[] __initdata = {
++      { KE_KEY,       0x01, {KEY_HELP} },          /* Fn+F1 */
++      { KE_KEY,       0x06, {KEY_DISPLAYTOGGLE} }, /* Fn+F4 */
++      { KE_BLUETOOTH, 0x30 },                      /* Fn+F10 */
++      { KE_KEY,       0x31, {KEY_MAIL} },          /* mail button */
++      { KE_KEY,       0x36, {KEY_WWW} },           /* www button */
++      { KE_WIFI,      0x78 },                      /* satelite dish button */
++      { KE_END,       FE_WIFI_LED }
++};
++
+ static struct key_entry keymap_fujitsu_n3510[] __initdata = {
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+@@ -655,6 +665,15 @@
+               .driver_data = keymap_fs_amilo_pro_v3505
+       },
+       {
++              /* Fujitsu-Siemens Amilo Pro Edition V8210 */
++              .callback = dmi_matched,
++              .matches = {
++                      DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
++                      DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V8210"),
++              },
++              .driver_data = keymap_fs_amilo_pro_v8210
++      },
++      {
+               /* Fujitsu-Siemens Amilo M7400 */
+               .callback = dmi_matched,
+               .matches = {