summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/fedora/generic/CONFIG_FMC1
-rw-r--r--configs/fedora/generic/CONFIG_FMC_CHARDEV1
-rw-r--r--configs/fedora/generic/CONFIG_FMC_FAKEDEV1
-rw-r--r--configs/fedora/generic/CONFIG_FMC_TRIVIAL1
-rw-r--r--configs/fedora/generic/CONFIG_FMC_WRITE_EEPROM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_SND_SOC_WM8960 (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8960)0
-rw-r--r--configs/fedora/generic/s390x/CONFIG_FMC1
-rw-r--r--kernel-aarch64-debug.config7
-rw-r--r--kernel-aarch64.config7
-rw-r--r--kernel-armv7hl-debug.config5
-rw-r--r--kernel-armv7hl-lpae-debug.config7
-rw-r--r--kernel-armv7hl-lpae.config7
-rw-r--r--kernel-armv7hl.config5
-rw-r--r--kernel-i686-debug.config5
-rw-r--r--kernel-i686.config5
-rw-r--r--kernel-ppc64le-debug.config5
-rw-r--r--kernel-ppc64le.config5
-rw-r--r--kernel-s390x-debug.config5
-rw-r--r--kernel-s390x.config5
-rw-r--r--kernel-x86_64-debug.config5
-rw-r--r--kernel-x86_64.config5
21 files changed, 4 insertions, 80 deletions
diff --git a/configs/fedora/generic/CONFIG_FMC b/configs/fedora/generic/CONFIG_FMC
deleted file mode 100644
index 9e4990f41..000000000
--- a/configs/fedora/generic/CONFIG_FMC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FMC=m
diff --git a/configs/fedora/generic/CONFIG_FMC_CHARDEV b/configs/fedora/generic/CONFIG_FMC_CHARDEV
deleted file mode 100644
index ea0267e43..000000000
--- a/configs/fedora/generic/CONFIG_FMC_CHARDEV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FMC_CHARDEV=m
diff --git a/configs/fedora/generic/CONFIG_FMC_FAKEDEV b/configs/fedora/generic/CONFIG_FMC_FAKEDEV
deleted file mode 100644
index ca98e45dd..000000000
--- a/configs/fedora/generic/CONFIG_FMC_FAKEDEV
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FMC_FAKEDEV=m
diff --git a/configs/fedora/generic/CONFIG_FMC_TRIVIAL b/configs/fedora/generic/CONFIG_FMC_TRIVIAL
deleted file mode 100644
index cd8c36bdb..000000000
--- a/configs/fedora/generic/CONFIG_FMC_TRIVIAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FMC_TRIVIAL=m
diff --git a/configs/fedora/generic/CONFIG_FMC_WRITE_EEPROM b/configs/fedora/generic/CONFIG_FMC_WRITE_EEPROM
deleted file mode 100644
index a2a65354e..000000000
--- a/configs/fedora/generic/CONFIG_FMC_WRITE_EEPROM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FMC_WRITE_EEPROM=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8960 b/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8960
index 8a053dc4d..8a053dc4d 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_WM8960
+++ b/configs/fedora/generic/arm/CONFIG_SND_SOC_WM8960
diff --git a/configs/fedora/generic/s390x/CONFIG_FMC b/configs/fedora/generic/s390x/CONFIG_FMC
deleted file mode 100644
index 674cd4432..000000000
--- a/configs/fedora/generic/s390x/CONFIG_FMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FMC is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0f0514fe3..467cffc1c 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1847,11 +1847,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=13
@@ -6017,7 +6012,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
# CONFIG_SND_SOC_WM8962 is not set
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 081d90935..eb80d4f3a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1831,11 +1831,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=13
@@ -5995,7 +5990,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
# CONFIG_SND_SOC_WM8962 is not set
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 6fdd374c3..7c21f0ea1 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1891,11 +1891,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=11
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 72ca86a9c..adab5f85e 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1825,11 +1825,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=11
@@ -5931,7 +5926,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
# CONFIG_SND_SOC_WM8962 is not set
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index b8f176bae..df5049107 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1810,11 +1810,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=11
@@ -5910,7 +5905,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_SPI=m
# CONFIG_SND_SOC_WM8903 is not set
# CONFIG_SND_SOC_WM8904 is not set
-# CONFIG_SND_SOC_WM8960 is not set
+CONFIG_SND_SOC_WM8960=m
# CONFIG_SND_SOC_WM8962 is not set
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5b11c676e..dd8e2b837 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1876,11 +1876,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=11
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 4fca45dc6..71da1ba8c 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1619,11 +1619,6 @@ CONFIG_FIREWIRE_SBP2=m
CONFIG_FIXED_PHY=y
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORTIFY_SOURCE=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 25540cda5..ec3648d62 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1602,11 +1602,6 @@ CONFIG_FIREWIRE_SBP2=m
CONFIG_FIXED_PHY=y
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORTIFY_SOURCE=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 371eee80a..9e83ef141 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1469,11 +1469,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=9
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index da5d046d5..0158a8e5b 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1452,11 +1452,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORCE_MAX_ZONEORDER=9
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 03174bed3..17556055e 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1470,11 +1470,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-# CONFIG_FMC is not set
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORTIFY_SOURCE=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e3e6af3f4..c871e259c 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1453,11 +1453,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-# CONFIG_FMC is not set
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORTIFY_SOURCE=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index ca4a8edf7..24c8fee17 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1661,11 +1661,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORTIFY_SOURCE=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 03cc8d576..3a6a6700a 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1644,11 +1644,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y
CONFIG_FM10K=m
-CONFIG_FMC_CHARDEV=m
-CONFIG_FMC_FAKEDEV=m
-CONFIG_FMC=m
-CONFIG_FMC_TRIVIAL=m
-CONFIG_FMC_WRITE_EEPROM=m
# CONFIG_FONTS is not set
CONFIG_FORCEDETH=m
CONFIG_FORTIFY_SOURCE=y