Commit b9574a15 authored by Kleber Sacilotto de Souza's avatar Kleber Sacilotto de Souza Committed by Stefan Bader

UBUNTU: [Config]: remove CONFIG_R3964

BugLink: https://bugs.launchpad.net/bugs/1828420

Upstream commit c7084edc ("tty: mark
Siemens R3964 line discipline as BROKEN") backport applied as part of
upstream stable update to Linux 4.4.179 disables the n_r3964 module.
Update the Ubuntu configs to remove the broken module.
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 406f51fa
...@@ -311,7 +311,6 @@ CONFIG_PTP_1588_CLOCK=m ...@@ -311,7 +311,6 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_QNX4FS_FS=m CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_R3964=m
CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x40000000
CONFIG_RAW_DRIVER=m CONFIG_RAW_DRIVER=m
CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_CPU_STALL_TIMEOUT=60
......
...@@ -569,7 +569,7 @@ CONFIG_VIRTIO_CONSOLE policy<{'amd64': 'y', 'arm64': ' ...@@ -569,7 +569,7 @@ CONFIG_VIRTIO_CONSOLE policy<{'amd64': 'y', 'arm64': '
CONFIG_IBM_BSR policy<{'powerpc-powerpc64-smp': 'm', 'ppc64el': 'm'}> CONFIG_IBM_BSR policy<{'powerpc-powerpc64-smp': 'm', 'ppc64el': 'm'}>
CONFIG_NVRAM policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'y'}> CONFIG_NVRAM policy<{'amd64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-powerpc-e500mc': 'y', 'powerpc-powerpc-smp': 'y'}>
CONFIG_DTLK policy<{'i386': 'm'}> CONFIG_DTLK policy<{'i386': 'm'}>
CONFIG_R3964 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}> CONFIG_R3964 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
CONFIG_APPLICOM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}> CONFIG_APPLICOM policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm', 's390x': 'n'}>
CONFIG_SONYPI policy<{'i386': 'm'}> CONFIG_SONYPI policy<{'i386': 'm'}>
CONFIG_MWAVE policy<{'amd64': 'm', 'i386': 'm'}> CONFIG_MWAVE policy<{'amd64': 'm', 'i386': 'm'}>
...@@ -317,7 +317,6 @@ CONFIG_PTP_1588_CLOCK=m ...@@ -317,7 +317,6 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_QNX4FS_FS=m CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_R3964=m
CONFIG_RAW_DRIVER=m CONFIG_RAW_DRIVER=m
CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_CPU_STALL_TIMEOUT=60
CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON=m
......
...@@ -306,7 +306,6 @@ CONFIG_PTP_1588_CLOCK=y ...@@ -306,7 +306,6 @@ CONFIG_PTP_1588_CLOCK=y
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_QNX4FS_FS=m CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_R3964=m
CONFIG_RAW_DRIVER=m CONFIG_RAW_DRIVER=m
CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_CPU_STALL_TIMEOUT=60
CONFIG_REED_SOLOMON=y CONFIG_REED_SOLOMON=y
......
...@@ -307,7 +307,6 @@ CONFIG_PTP_1588_CLOCK=m ...@@ -307,7 +307,6 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_QNX4FS_FS=m CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_R3964=m
CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000 CONFIG_RANDOMIZE_BASE_MAX_OFFSET=0x20000000
CONFIG_RAW_DRIVER=m CONFIG_RAW_DRIVER=m
CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_CPU_STALL_TIMEOUT=60
......
...@@ -306,7 +306,6 @@ CONFIG_PTP_1588_CLOCK=m ...@@ -306,7 +306,6 @@ CONFIG_PTP_1588_CLOCK=m
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_QNX4FS_FS=m CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_R3964=m
CONFIG_RAW_DRIVER=m CONFIG_RAW_DRIVER=m
CONFIG_RCU_CPU_STALL_TIMEOUT=21 CONFIG_RCU_CPU_STALL_TIMEOUT=21
CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON=m
......
...@@ -353,7 +353,6 @@ CONFIG_PTP_1588_CLOCK=y ...@@ -353,7 +353,6 @@ CONFIG_PTP_1588_CLOCK=y
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_QNX4FS_FS=m CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_R3964=m
CONFIG_RAW_DRIVER=m CONFIG_RAW_DRIVER=m
CONFIG_RCU_CPU_STALL_TIMEOUT=21 CONFIG_RCU_CPU_STALL_TIMEOUT=21
CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON=m
......
...@@ -266,7 +266,6 @@ CONFIG_PTP_1588_CLOCK=m ...@@ -266,7 +266,6 @@ CONFIG_PTP_1588_CLOCK=m
# CONFIG_PWM is not set # CONFIG_PWM is not set
# CONFIG_QNX4FS_FS is not set # CONFIG_QNX4FS_FS is not set
# CONFIG_QNX6FS_FS is not set # CONFIG_QNX6FS_FS is not set
# CONFIG_R3964 is not set
# CONFIG_RAW_DRIVER is not set # CONFIG_RAW_DRIVER is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=21 CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_REGULATOR is not set # CONFIG_REGULATOR is not set
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment