From: Hauke Mehrtens Date: Mon, 23 Dec 2019 14:23:09 +0000 (+0100) Subject: kernel: Deactivate CONFIG_SFP in generic config X-Git-Tag: v21.02.0-rc1~4264 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=729d7bc7517288c2c8c5a00f918878d3828594b2;p=openwrt%2Fstaging%2Fchunkeey.git kernel: Deactivate CONFIG_SFP in generic config Deactivate CONFIG_SFP for kernel 4.19 in the generic configuration. The CONFIG_SFP configuration option was not set to anything in the ath79 build for me, set it to deactivated by default. Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/gemini/config-4.19 b/target/linux/gemini/config-4.19 index ac295f0857..b23e6a56d4 100644 --- a/target/linux/gemini/config-4.19 +++ b/target/linux/gemini/config-4.19 @@ -431,7 +431,6 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIO=y CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_SERPORT=y -# CONFIG_SFP is not set CONFIG_SG_POOL=y CONFIG_SLUB_DEBUG=y CONFIG_SPARSE_IRQ=y diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index eb6cf46e95..4cbef51ee1 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -4548,6 +4548,7 @@ CONFIG_SERIAL_EARLYCON=y # CONFIG_SFC is not set # CONFIG_SFC_FALCON is not set # CONFIG_SFI is not set +# CONFIG_SFP is not set # CONFIG_SGETMASK_SYSCALL is not set # CONFIG_SGI_IOC4 is not set # CONFIG_SGI_IP22 is not set diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19 index 94865f96e2..9ba1d02b93 100644 --- a/target/linux/imx6/config-4.19 +++ b/target/linux/imx6/config-4.19 @@ -462,7 +462,6 @@ CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_SERIAL_MCTRL_GPIO=y -# CONFIG_SFP is not set CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SMP=y diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19 index 8948b73ff7..e9c1bcd199 100644 --- a/target/linux/ipq40xx/config-4.19 +++ b/target/linux/ipq40xx/config-4.19 @@ -441,7 +441,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SFP is not set CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19 index 68de994370..7a06ab9081 100644 --- a/target/linux/ipq806x/config-4.19 +++ b/target/linux/ipq806x/config-4.19 @@ -454,7 +454,6 @@ CONFIG_SERIAL_8250_FSL=y # CONFIG_SERIAL_AMBA_PL011 is not set CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y -# CONFIG_SFP is not set CONFIG_SGL_ALLOC=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y