From: Peter Robinson <pbrobinson(a)gmail.com>
PS2 mice aren't supported on all current architectures other than x86
so move the generic option to x86 and the ark aarch64 options that
disabled them to generic so it applies to all non x86 architectures.
Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com>
---
redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2 | 1 -
.../configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH | 1 -
.../configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC | 1 -
redhat/configs/common/generic/CONFIG_MOUSE_PS2 | 2 +-
redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH | 2 +-
redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC | 2 +-
redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2 | 1 +
redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH | 1 +
redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC | 1 +
.../x86/x86_64 => common/generic/x86}/CONFIG_MOUSE_PS2_VMMOUSE | 0
redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE | 1 -
11 files changed, 6 insertions(+), 7 deletions(-)
delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2
delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH
delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC
create mode 100644 redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2
create mode 100644 redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH
create mode 100644 redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC
rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_MOUSE_PS2_VMMOUSE (100%)
delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2
deleted file mode 100644
index bd4390f41ebb..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MOUSE_PS2 is not set
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH
deleted file mode 100644
index b84ff05dc82b..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_ELANTECH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MOUSE_PS2_ELANTECH is not set
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC
deleted file mode 100644
index 1ecdbe98e5ef..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_MOUSE_PS2_SENTELIC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MOUSE_PS2_SENTELIC is not set
diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_PS2
b/redhat/configs/common/generic/CONFIG_MOUSE_PS2
index ed68613bee8b..bd4390f41ebb 100644
--- a/redhat/configs/common/generic/CONFIG_MOUSE_PS2
+++ b/redhat/configs/common/generic/CONFIG_MOUSE_PS2
@@ -1 +1 @@
-CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2 is not set
diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH
b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH
index 15c77ec5c901..b84ff05dc82b 100644
--- a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH
+++ b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_ELANTECH
@@ -1 +1 @@
-CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_ELANTECH is not set
diff --git a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC
b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC
index 14079ba62504..1ecdbe98e5ef 100644
--- a/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC
+++ b/redhat/configs/common/generic/CONFIG_MOUSE_PS2_SENTELIC
@@ -1 +1 @@
-CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_SENTELIC is not set
diff --git a/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2
b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2
new file mode 100644
index 000000000000..ed68613bee8b
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2
@@ -0,0 +1 @@
+CONFIG_MOUSE_PS2=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH
b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH
new file mode 100644
index 000000000000..15c77ec5c901
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_ELANTECH
@@ -0,0 +1 @@
+CONFIG_MOUSE_PS2_ELANTECH=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC
b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC
new file mode 100644
index 000000000000..14079ba62504
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_SENTELIC
@@ -0,0 +1 @@
+CONFIG_MOUSE_PS2_SENTELIC=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_MOUSE_PS2_VMMOUSE
b/redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_MOUSE_PS2_VMMOUSE
rename to redhat/configs/common/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
b/redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
deleted file mode 100644
index d3f895d3b629..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_MOUSE_PS2_VMMOUSE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MOUSE_PS2_VMMOUSE=y
--
GitLab