From f793870dc5e066fa3ab31b31e0af38f0cf77bc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <anton@sijanec.eu>
Date: Sun, 19 Feb 2023 01:43:27 +0100
Subject: linux 5->6 upgrade

---
 root/linux/i8042-acpipnpio.h.patch | 21 +++++++++++++++++++++
 root/linux/i8042-x86ia64io.h.patch | 21 ---------------------
 root/linux/upgrade.sh              |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 root/linux/i8042-acpipnpio.h.patch
 delete mode 100644 root/linux/i8042-x86ia64io.h.patch

(limited to 'root/linux')

diff --git a/root/linux/i8042-acpipnpio.h.patch b/root/linux/i8042-acpipnpio.h.patch
new file mode 100644
index 0000000..433812e
--- /dev/null
+++ b/root/linux/i8042-acpipnpio.h.patch
@@ -0,0 +1,21 @@
+diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
+index 4b0201c..b5240b1 100644
+--- a/drivers/input/serio/i8042-acpipnpio.h
++++ b/drivers/input/serio/i8042-acpipnpio.h
+@@ -146,6 +146,16 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
+ 		},
+ 		.driver_data = (void *)(SERIO_QUIRK_RESET_NEVER)
+ 	},
++	/*
++	 * Above issue also appears on Dell Latitude D630
++	 */
++	{
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
++			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D630"),
++		},
++		.driver_data = (void *)(SERIO_QUIRK_RESET_NEVER)
++	},
+ 	{
+ 		/* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */
+ 		.matches = {
diff --git a/root/linux/i8042-x86ia64io.h.patch b/root/linux/i8042-x86ia64io.h.patch
deleted file mode 100644
index 350172f..0000000
--- a/root/linux/i8042-x86ia64io.h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
-index 4b0201c..b5240b1 100644
---- a/drivers/input/serio/i8042-x86ia64io.h
-+++ b/drivers/input/serio/i8042-x86ia64io.h
-@@ -146,6 +146,16 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
- 		},
- 		.driver_data = (void *)(SERIO_QUIRK_RESET_NEVER)
- 	},
-+	/*
-+	 * Above issue also appears on Dell Latitude D630
-+	 */
-+	{
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "Latitude D630"),
-+		},
-+		.driver_data = (void *)(SERIO_QUIRK_RESET_NEVER)
-+	},
- 	{
- 		/* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */
- 		.matches = {
diff --git a/root/linux/upgrade.sh b/root/linux/upgrade.sh
index 37408ec..84a5354 100755
--- a/root/linux/upgrade.sh
+++ b/root/linux/upgrade.sh
@@ -4,7 +4,7 @@ d=`pwd`
 k=`eselect kernel list | tail -n1 | cut -d\  -f6`
 eselect kernel set $k
 cd /usr/src/linux
-patch -p1 < $d/i8042-x86ia64io.h.patch
+patch -p1 < $d/i8042-acpipnpio.h.patch
 cp $d/config .config
 make
 make modules
-- 
cgit v1.2.3