summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2018-09-28 13:26:22 -0400
committerJeremy Cline <jcline@redhat.com>2018-09-28 13:32:33 -0400
commitbbc0bbcd2e7f1dc15d4923423c038fea49c25e1a (patch)
tree4e2c15fb659d709949093472b90ec43345595bdd
parent82aeae7d94d696a48f0a5248fb69f5dd3c73dce3 (diff)
downloadkernel-bbc0bbcd2e7f1dc15d4923423c038fea49c25e1a.tar.gz
kernel-bbc0bbcd2e7f1dc15d4923423c038fea49c25e1a.tar.xz
kernel-bbc0bbcd2e7f1dc15d4923423c038fea49c25e1a.zip
Change CONFIG_SSB back to a module (rhbz #1572349)
-rw-r--r--configs/fedora/generic/CONFIG_SSB2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
17 files changed, 17 insertions, 17 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 12f8271d2..e78472aae 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -5897,11 +5897,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 9c01708e5..36140041b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5873,11 +5873,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 90a245a15..f2aac1cb0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -6323,11 +6323,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 b80b756ef..7a1907d18 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -5930,11 +5930,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 56aa1f6bb..9208d26a2 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -5906,11 +5906,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 3717f07f2..74d0cdd41 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6299,11 +6299,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-PAE.config b/kernel-i686-PAE.config
index 00f6f0303..6d05e086b 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -5518,11 +5518,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-PAEdebug.config b/kernel-i686-PAEdebug.config
index 27702813c..90c65c86f 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -5543,11 +5543,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-debug.config b/kernel-i686-debug.config
index 62ae9c99f..eec6d3816 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5543,11 +5543,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 f68101008..60a156425 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5518,11 +5518,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-ppc64-debug.config b/kernel-ppc64-debug.config
index ef133f74f..191f9c969 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -5311,11 +5311,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-ppc64.config b/kernel-ppc64.config
index 09a555f97..5196fb5ef 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -5284,11 +5284,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-debug.config b/kernel-ppc64le-debug.config
index bdd65239d..a1782a32b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5238,11 +5238,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 81fbfa2be..391bde87c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5211,11 +5211,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 acf81070e..a3c92fb47 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5630,11 +5630,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 1850adf3e..8524bbd3d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5605,11 +5605,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