summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-04-02 23:46:37 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-04-02 23:46:37 +0100
commitf34cd3b90143f602043a26492cb82799f9eaa404 (patch)
tree3b4ab8be155fab2533b65606a83de867ad89b55c
parent005a90487824b7107585903017e3f53280e39389 (diff)
downloadkernel-f34cd3b90143f602043a26492cb82799f9eaa404.tar.gz
kernel-f34cd3b90143f602043a26492cb82799f9eaa404.tar.xz
kernel-f34cd3b90143f602043a26492cb82799f9eaa404.zip
minor config cleanups (NFC)
-rw-r--r--baseconfig/CONFIG_BATTERY_GOLDFISH1
-rw-r--r--baseconfig/CONFIG_FB_GOLDFISH1
-rw-r--r--baseconfig/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/CONFIG_SUN50I_A64_CCU1
-rw-r--r--baseconfig/CONFIG_SUN6I_A31_CCU1
-rw-r--r--baseconfig/CONFIG_SUN8I_A23_CCU1
-rw-r--r--baseconfig/CONFIG_SUN8I_A33_CCU1
-rw-r--r--baseconfig/CONFIG_SUNXI_CCU1
-rw-r--r--baseconfig/arm/CONFIG_MFD_SUN4I_GPADC1
-rw-r--r--baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG1
-rw-r--r--baseconfig/x86/CONFIG_FB_ARC (renamed from baseconfig/CONFIG_FB_ARC)0
-rw-r--r--baseconfig/x86/CONFIG_FB_GEODE (renamed from baseconfig/CONFIG_FB_GEODE)0
-rw-r--r--baseconfig/x86/CONFIG_FB_HGA (renamed from baseconfig/CONFIG_FB_HGA)0
-rw-r--r--baseconfig/x86/CONFIG_FB_I810 (renamed from baseconfig/CONFIG_FB_I810)0
-rw-r--r--baseconfig/x86/CONFIG_FB_I810_GTF (renamed from baseconfig/CONFIG_FB_I810_GTF)0
-rw-r--r--baseconfig/x86/CONFIG_FB_I810_I2C (renamed from baseconfig/CONFIG_FB_I810_I2C)0
-rw-r--r--baseconfig/x86/CONFIG_FB_LE80578 (renamed from baseconfig/CONFIG_FB_LE80578)0
-rw-r--r--baseconfig/x86/CONFIG_FB_VGA16 (renamed from baseconfig/CONFIG_FB_VGA16)0
-rw-r--r--baseconfig/x86/CONFIG_FB_VIA (renamed from baseconfig/CONFIG_FB_VIA)0
-rw-r--r--baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS (renamed from baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS)0
-rw-r--r--kernel-aarch64-debug.config12
-rw-r--r--kernel-aarch64.config12
-rw-r--r--kernel-armv7hl-debug.config12
-rw-r--r--kernel-armv7hl-lpae-debug.config12
-rw-r--r--kernel-armv7hl-lpae.config12
-rw-r--r--kernel-armv7hl.config12
-rw-r--r--kernel-i686-PAE.config9
-rw-r--r--kernel-i686-PAEdebug.config9
-rw-r--r--kernel-i686-debug.config9
-rw-r--r--kernel-i686.config9
-rw-r--r--kernel-ppc64-debug.config18
-rw-r--r--kernel-ppc64.config18
-rw-r--r--kernel-ppc64le-debug.config18
-rw-r--r--kernel-ppc64le.config18
-rw-r--r--kernel-ppc64p7-debug.config18
-rw-r--r--kernel-ppc64p7.config18
-rw-r--r--kernel-s390x-debug.config19
-rw-r--r--kernel-s390x.config19
-rw-r--r--kernel-x86_64-debug.config9
-rw-r--r--kernel-x86_64.config9
41 files changed, 0 insertions, 283 deletions
diff --git a/baseconfig/CONFIG_BATTERY_GOLDFISH b/baseconfig/CONFIG_BATTERY_GOLDFISH
deleted file mode 100644
index 75b9c00e9..000000000
--- a/baseconfig/CONFIG_BATTERY_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BATTERY_GOLDFISH is not set
diff --git a/baseconfig/CONFIG_FB_GOLDFISH b/baseconfig/CONFIG_FB_GOLDFISH
deleted file mode 100644
index 522a715d1..000000000
--- a/baseconfig/CONFIG_FB_GOLDFISH
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_GOLDFISH is not set
diff --git a/baseconfig/CONFIG_MFD_SUN4I_GPADC b/baseconfig/CONFIG_MFD_SUN4I_GPADC
deleted file mode 100644
index d156cb188..000000000
--- a/baseconfig/CONFIG_MFD_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG
deleted file mode 100644
index 28ea30190..000000000
--- a/baseconfig/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/CONFIG_SUN50I_A64_CCU b/baseconfig/CONFIG_SUN50I_A64_CCU
deleted file mode 100644
index 9ce6c792a..000000000
--- a/baseconfig/CONFIG_SUN50I_A64_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN50I_A64_CCU is not set
diff --git a/baseconfig/CONFIG_SUN6I_A31_CCU b/baseconfig/CONFIG_SUN6I_A31_CCU
deleted file mode 100644
index 5ce1bb3f7..000000000
--- a/baseconfig/CONFIG_SUN6I_A31_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN6I_A31_CCU is not set
diff --git a/baseconfig/CONFIG_SUN8I_A23_CCU b/baseconfig/CONFIG_SUN8I_A23_CCU
deleted file mode 100644
index 26ae1100c..000000000
--- a/baseconfig/CONFIG_SUN8I_A23_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_A23_CCU is not set
diff --git a/baseconfig/CONFIG_SUN8I_A33_CCU b/baseconfig/CONFIG_SUN8I_A33_CCU
deleted file mode 100644
index e1a357ee8..000000000
--- a/baseconfig/CONFIG_SUN8I_A33_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUN8I_A33_CCU is not set
diff --git a/baseconfig/CONFIG_SUNXI_CCU b/baseconfig/CONFIG_SUNXI_CCU
deleted file mode 100644
index a383113ef..000000000
--- a/baseconfig/CONFIG_SUNXI_CCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SUNXI_CCU is not set
diff --git a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC b/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
deleted file mode 100644
index d156cb188..000000000
--- a/baseconfig/arm/CONFIG_MFD_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SUN4I_GPADC=m
diff --git a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG b/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
deleted file mode 100644
index 28ea30190..000000000
--- a/baseconfig/arm/CONFIG_SND_SUN8I_CODEC_ANALOG
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
diff --git a/baseconfig/CONFIG_FB_ARC b/baseconfig/x86/CONFIG_FB_ARC
index 1d66b92f4..1d66b92f4 100644
--- a/baseconfig/CONFIG_FB_ARC
+++ b/baseconfig/x86/CONFIG_FB_ARC
diff --git a/baseconfig/CONFIG_FB_GEODE b/baseconfig/x86/CONFIG_FB_GEODE
index 3c78c584d..3c78c584d 100644
--- a/baseconfig/CONFIG_FB_GEODE
+++ b/baseconfig/x86/CONFIG_FB_GEODE
diff --git a/baseconfig/CONFIG_FB_HGA b/baseconfig/x86/CONFIG_FB_HGA
index 3c3142a1e..3c3142a1e 100644
--- a/baseconfig/CONFIG_FB_HGA
+++ b/baseconfig/x86/CONFIG_FB_HGA
diff --git a/baseconfig/CONFIG_FB_I810 b/baseconfig/x86/CONFIG_FB_I810
index 9ef6eca18..9ef6eca18 100644
--- a/baseconfig/CONFIG_FB_I810
+++ b/baseconfig/x86/CONFIG_FB_I810
diff --git a/baseconfig/CONFIG_FB_I810_GTF b/baseconfig/x86/CONFIG_FB_I810_GTF
index 71eee1202..71eee1202 100644
--- a/baseconfig/CONFIG_FB_I810_GTF
+++ b/baseconfig/x86/CONFIG_FB_I810_GTF
diff --git a/baseconfig/CONFIG_FB_I810_I2C b/baseconfig/x86/CONFIG_FB_I810_I2C
index 7cfe05740..7cfe05740 100644
--- a/baseconfig/CONFIG_FB_I810_I2C
+++ b/baseconfig/x86/CONFIG_FB_I810_I2C
diff --git a/baseconfig/CONFIG_FB_LE80578 b/baseconfig/x86/CONFIG_FB_LE80578
index 327044a84..327044a84 100644
--- a/baseconfig/CONFIG_FB_LE80578
+++ b/baseconfig/x86/CONFIG_FB_LE80578
diff --git a/baseconfig/CONFIG_FB_VGA16 b/baseconfig/x86/CONFIG_FB_VGA16
index 4fa33dfdc..4fa33dfdc 100644
--- a/baseconfig/CONFIG_FB_VGA16
+++ b/baseconfig/x86/CONFIG_FB_VGA16
diff --git a/baseconfig/CONFIG_FB_VIA b/baseconfig/x86/CONFIG_FB_VIA
index d34242c33..d34242c33 100644
--- a/baseconfig/CONFIG_FB_VIA
+++ b/baseconfig/x86/CONFIG_FB_VIA
diff --git a/baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS b/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
index d2ff4278d..d2ff4278d 100644
--- a/baseconfig/CONFIG_FB_VIA_DIRECT_PROCFS
+++ b/baseconfig/x86/CONFIG_FB_VIA_DIRECT_PROCFS
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 4313d4c15..326dff36e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -454,7 +454,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1497,7 +1496,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ARMCLCD=y
# CONFIG_FB_ASILIANT is not set
@@ -1515,18 +1513,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_DA8XX is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1570,9 +1561,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ead8d4905..5ef00d93a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -454,7 +454,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1480,7 +1479,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ARMCLCD=y
# CONFIG_FB_ASILIANT is not set
@@ -1498,18 +1496,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_DA8XX is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1553,9 +1544,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5ce611660..212fd1cb3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -499,7 +499,6 @@ CONFIG_BATTERY_DA9052=m
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_RX51=m
@@ -1634,7 +1633,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ARMCLCD=y
# CONFIG_FB_ASILIANT is not set
@@ -1652,19 +1650,12 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_DA8XX is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_IMX is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1711,9 +1702,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 12cfa68a1..96803968f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -479,7 +479,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_SBS=m
@@ -1554,7 +1553,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ARMCLCD=y
# CONFIG_FB_ASILIANT is not set
@@ -1572,18 +1570,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_DA8XX is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1628,9 +1619,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0324b0036..e1bee0da3 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -478,7 +478,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_SBS=m
@@ -1537,7 +1536,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ARMCLCD=y
# CONFIG_FB_ASILIANT is not set
@@ -1555,18 +1553,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_DA8XX is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1611,9 +1602,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 0484059b5..e7d7586d1 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -498,7 +498,6 @@ CONFIG_BATTERY_DA9052=m
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_RX51=m
@@ -1617,7 +1616,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
CONFIG_FB_ARMCLCD=y
# CONFIG_FB_ASILIANT is not set
@@ -1635,19 +1633,12 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_DA8XX is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_IMX is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1694,9 +1685,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index a4de0f1c0..f8eca8a22 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -381,7 +381,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_OLPC=y
@@ -1390,7 +1389,6 @@ CONFIG_FB_EFI=y
CONFIG_FB_GEODE_GX=y
CONFIG_FB_GEODE_LX=y
CONFIG_FB_GEODE=y
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
CONFIG_FB_HYPERV=m
@@ -2841,7 +2839,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4898,7 +4895,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -5008,10 +5004,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5020,7 +5012,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 128e7035c..050de6842 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -382,7 +382,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_OLPC=y
@@ -1408,7 +1407,6 @@ CONFIG_FB_EFI=y
CONFIG_FB_GEODE_GX=y
CONFIG_FB_GEODE_LX=y
CONFIG_FB_GEODE=y
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
CONFIG_FB_HYPERV=m
@@ -2861,7 +2859,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4920,7 +4917,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -5030,10 +5026,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5042,7 +5034,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 094d8e01a..c73211bac 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -382,7 +382,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_OLPC=y
@@ -1408,7 +1407,6 @@ CONFIG_FB_EFI=y
CONFIG_FB_GEODE_GX=y
CONFIG_FB_GEODE_LX=y
CONFIG_FB_GEODE=y
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
CONFIG_FB_HYPERV=m
@@ -2861,7 +2859,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4920,7 +4917,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -5030,10 +5026,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5042,7 +5034,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 329784839..04852c4be 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -381,7 +381,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
CONFIG_BATTERY_OLPC=y
@@ -1390,7 +1389,6 @@ CONFIG_FB_EFI=y
CONFIG_FB_GEODE_GX=y
CONFIG_FB_GEODE_LX=y
CONFIG_FB_GEODE=y
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
CONFIG_FB_HYPERV=m
@@ -2841,7 +2839,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4898,7 +4895,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -5008,10 +5004,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5020,7 +5012,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3ba077273..2a6cec8c4 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -330,7 +330,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1316,7 +1315,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1334,18 +1332,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
@@ -1396,8 +1387,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_VALKYRIE is not set
CONFIG_FB_VESA=y
# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2731,7 +2720,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4746,7 +4734,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4849,10 +4836,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4861,7 +4844,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SUSPEND_FREEZER=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index dfb86ac9d..b98c1e749 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -329,7 +329,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1298,7 +1297,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1316,18 +1314,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
@@ -1378,8 +1369,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_VALKYRIE is not set
CONFIG_FB_VESA=y
# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2710,7 +2699,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4722,7 +4710,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4825,10 +4812,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4837,7 +4820,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SUSPEND_FREEZER=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 783c7824d..b09390184 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -324,7 +324,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1270,7 +1269,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1288,18 +1286,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
@@ -1350,8 +1341,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_VALKYRIE is not set
CONFIG_FB_VESA=y
# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2677,7 +2666,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4675,7 +4663,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4778,10 +4765,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4790,7 +4773,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SUSPEND_FREEZER=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 2d23fab1a..0a00d0798 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -323,7 +323,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1252,7 +1251,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1270,18 +1268,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
@@ -1332,8 +1323,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_VALKYRIE is not set
CONFIG_FB_VESA=y
# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2656,7 +2645,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4651,7 +4639,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4754,10 +4741,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4766,7 +4749,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SUSPEND_FREEZER=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 03a216c2c..8eac87e07 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -324,7 +324,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1269,7 +1268,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1287,18 +1285,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
@@ -1349,8 +1340,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_VALKYRIE is not set
CONFIG_FB_VESA=y
# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2676,7 +2665,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4674,7 +4662,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4777,10 +4764,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4789,7 +4772,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SUSPEND_FREEZER=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 2821682a3..0a26a33d8 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -323,7 +323,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1251,7 +1250,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1269,18 +1267,11 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
CONFIG_FB_IBM_GXT4500=y
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
CONFIG_FB_MATROX_G=y
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX_MILLENIUM is not set
@@ -1331,8 +1322,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_VALKYRIE is not set
CONFIG_FB_VESA=y
# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2655,7 +2644,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4650,7 +4638,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4753,10 +4740,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4765,7 +4748,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SUSPEND_FREEZER=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9b6e68bb8..1e8740466 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -324,7 +324,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1260,7 +1259,6 @@ CONFIG_FAULT_INJECTION_DEBUG_FS=y
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
CONFIG_FAULT_INJECTION=y
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1276,19 +1274,12 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1331,9 +1322,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2613,7 +2601,6 @@ CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4569,7 +4556,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4670,10 +4656,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4682,7 +4664,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
# CONFIG_SUSPEND is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 176b160ed..639889b55 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -323,7 +323,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1242,7 +1241,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_ASILIANT is not set
CONFIG_FB_ATY128_BACKLIGHT=y
@@ -1258,19 +1256,12 @@ CONFIG_FB_ATY_BACKLIGHT=y
# CONFIG_FB_CYBER2000 is not set
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
-# CONFIG_FB_HGA is not set
# CONFIG_FB_I740 is not set
-CONFIG_FB_I810_GTF=y
-CONFIG_FB_I810_I2C=y
-CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB is not set
# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1313,9 +1304,6 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-# CONFIG_FB_VIA_DIRECT_PROCFS is not set
-# CONFIG_FB_VIA is not set
CONFIG_FB_VIRTUAL=m
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
@@ -2592,7 +2580,6 @@ CONFIG_MFD_SM501_GPIO=y
# CONFIG_MFD_SM501 is not set
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4545,7 +4532,6 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -4646,10 +4632,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -4658,7 +4640,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
# CONFIG_SUSPEND is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5cbc52f62..2488ea90a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -380,7 +380,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1439,7 +1438,6 @@ CONFIG_FB_ATY_BACKLIGHT=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
CONFIG_FB_HYPERV=m
@@ -2894,7 +2892,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4950,7 +4947,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -5063,10 +5059,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5075,7 +5067,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SURFACE_PRO3_BUTTON=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 8ecda716c..d70b202f0 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -379,7 +379,6 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_SBS is not set
@@ -1421,7 +1420,6 @@ CONFIG_FB_ATY_BACKLIGHT=y
CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
-# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HECUBA is not set
# CONFIG_FB_HGA is not set
CONFIG_FB_HYPERV=m
@@ -2874,7 +2872,6 @@ CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SM501=m
# CONFIG_MFD_SMSC is not set
# CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
# CONFIG_MFD_SYSCON is not set
# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TC6393XB is not set
@@ -4928,7 +4925,6 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SONICVIBES=m
# CONFIG_SND_SPI is not set
-CONFIG_SND_SUN8I_CODEC_ANALOG=m
# CONFIG_SND_SUPPORT_OLD_API is not set
CONFIG_SND_TRIDENT=m
CONFIG_SND_USB_6FIRE=m
@@ -5041,10 +5037,6 @@ CONFIG_STMMAC_ETH=m
CONFIG_STRICT_DEVMEM=y
CONFIG_STRIP_ASM_SYMS=y
# CONFIG_STRIP is not set
-# CONFIG_SUN50I_A64_CCU is not set
-# CONFIG_SUN6I_A31_CCU is not set
-# CONFIG_SUN8I_A23_CCU is not set
-# CONFIG_SUN8I_A33_CCU is not set
CONFIG_SUNDANCE=m
# CONFIG_SUNDANCE_MMIO is not set
CONFIG_SUNGEM=m
@@ -5053,7 +5045,6 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-# CONFIG_SUNXI_CCU is not set
CONFIG_SURFACE_3_BUTTON=m
CONFIG_SURFACE3_WMI=m
CONFIG_SURFACE_PRO3_BUTTON=m