UBUNTU: [Config] CONFIG_SERIO=n for s390x

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 41b5abcc143b91ec6289e7a1248bf6cc24f004e8..5c19f3de290a6b453678df89ac758a813c8764d5 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -517,7 +517,6 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 49b28f776d2e8d24408bea277900eefb687c4cd9..9ba4c5769c50853333d50c869b1004cc02c27e36 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -517,7 +517,6 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 1d43a6c9f06b68de57b5b8d5ffc8f04e4eca68a1..0aeb6c018a3070963ca6e8a364bcc781ffd6d4fa 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -545,7 +545,6 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d5d80e87d60e6e696c27c7a883e728b7918ae2c2..6ab5f0d4734f81fd1277bf0609a658570e5e7243 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8403,6 +8403,7 @@ CONFIG_SERIO_ARC_PS2=m
 CONFIG_SERIO_CT82C710=m
 CONFIG_SERIO_GPIO_PS2=m
 CONFIG_SERIO_I8042=y
+CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_NVEC_PS2=m
 CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIO_PARKBD=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d63e187acd4caa743b4e23d8db657a15384e4112..d8d1360f4a20ca7739b91de8d6afe9b1ac7bf5ea 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -510,7 +510,6 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index f282cae76677a792acb0c9bc26127ea5010d5ec6..df4edbd15ee91d64e0b1bcaf7977344ab939986f 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -517,7 +517,6 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_SC16IS7XX=m
 CONFIG_SERIAL_SCCNXP=y
 CONFIG_SERIO=y
-CONFIG_SERIO_LIBPS2=y
 CONFIG_SFC=m
 CONFIG_SFC_FALCON=m
 CONFIG_SGI_IOC4=m

diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index b8925497a03a0baa3b5ab168b2d3f55656b848c3..c4a238c67b721ddf2d85b54aee2782302d01ac63 100644 (file)
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -464,8 +464,7 @@ CONFIG_SERIAL_CORE=m
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
-CONFIG_SERIO=m
-CONFIG_SERIO_LIBPS2=m
+# CONFIG_SERIO is not set
 # CONFIG_SFC is not set
 # CONFIG_SFC_FALCON is not set
 # CONFIG_SGI_IOC4 is not set