From 48b07d1ffe67304257b1cb47bdbc28bae22efa03 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Fri, 28 Sep 2018 13:26:22 -0400 Subject: Change CONFIG_SSB back to a module (rhbz #1572349) --- configs/fedora/generic/CONFIG_SSB | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configs/fedora/generic/CONFIG_SSB b/configs/fedora/generic/CONFIG_SSB index 3313a71ad..4a239c413 100644 --- a/configs/fedora/generic/CONFIG_SSB +++ b/configs/fedora/generic/CONFIG_SSB @@ -1 +1 @@ -CONFIG_SSB=y +CONFIG_SSB=m diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 4c65c40fa..cfce2f7c2 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -5992,11 +5992,11 @@ CONFIG_SRAM=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index a179fc432..8b91cfe3a 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -5968,11 +5968,11 @@ CONFIG_SRAM=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 4cd02b564..7fc64c906 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -6409,11 +6409,11 @@ CONFIG_SRAM=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 5ea31b3d2..a29c7a237 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -6019,11 +6019,11 @@ CONFIG_SRAM=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 7dc27a81d..d2014df7d 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -5995,11 +5995,11 @@ CONFIG_SRAM=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index de4343677..090967f85 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -6385,11 +6385,11 @@ CONFIG_SRAM=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR is not set # CONFIG_STACKPROTECTOR_STRONG is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d9e1fba7d..0921b026b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -5669,11 +5669,11 @@ CONFIG_SQUASHFS_ZSTD=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STA2X11 is not set CONFIG_STACKPROTECTOR_STRONG=y diff --git a/kernel-i686.config b/kernel-i686.config index fcb748bd4..50ac97086 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -5644,11 +5644,11 @@ CONFIG_SQUASHFS_ZSTD=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STA2X11 is not set CONFIG_STACKPROTECTOR_STRONG=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 6cb39c913..4a2159062 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -5355,11 +5355,11 @@ CONFIG_SQUASHFS_ZSTD=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 431de1ac1..874b14338 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -5328,11 +5328,11 @@ CONFIG_SQUASHFS_ZSTD=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set # CONFIG_STACKPROTECTOR_STRONG is not set CONFIG_STACK_TRACER=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 02472e2af..bc57123c7 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -5720,11 +5720,11 @@ CONFIG_SQUASHFS_ZSTD=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index f1bc71c0c..d64de5b82 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -5695,11 +5695,11 @@ CONFIG_SQUASHFS_ZSTD=y CONFIG_SSB_DRIVER_GPIO=y CONFIG_SSB_DRIVER_PCICORE=y CONFIG_SSB_HOST_SOC=y +CONFIG_SSB=m CONFIG_SSB_PCIHOST=y CONFIG_SSB_PCMCIAHOST=y CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set -CONFIG_SSB=y # CONFIG_SSFDC is not set CONFIG_STACKPROTECTOR_STRONG=y CONFIG_STACKPROTECTOR=y -- cgit