[packages/kernel] - wistron-amilo8210 applied upstream

[baggins]

commit 0375668c6d25ed5a1141da74ec982f2bb289a50c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jun 23 23:08:45 2014 +0200

    - wistron-amilo8210 applied upstream

 kernel.spec                   |  2 --
 linux-wistron-amilo8210.patch | 35 -----------------------------------
 2 files changed, 37 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index c86f82a..0cf9d6a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -146,7 +146,6 @@ Source58:	kernel-inittmpfs.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
 Patch6:		linux-wistron-nx.patch
 
 # netfilter related stuff mostly based on patch-o-matic-ng
@@ -660,7 +659,6 @@ cd linux-%{basever}
 %patch3 -p1
 %endif
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 
 ## netfilter
diff --git a/linux-wistron-amilo8210.patch b/linux-wistron-amilo8210.patch
deleted file mode 100644
index 1565503..0000000
--- a/linux-wistron-amilo8210.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 Series V8210"),
-+		},
-+		.driver_data = keymap_fs_amilo_pro_v8210
-+	},
-+	{
- 		/* Fujitsu-Siemens Amilo M7400 */
- 		.callback = dmi_matched,
- 		.matches = {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/52c5f3093582a20a75c9b2d0f4d103e697992917