summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-10-01 19:33:34 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-10-01 19:34:04 +0100
commit851373223ac3f1f6ee732326fd6840bfd9baa440 (patch)
treefe62df0a12eb6ae547fbb0d6c4f87f60d308c066
parentb474ff0cdcd4ed3282d115b4dc88ecd341d54bd7 (diff)
downloadkernel-851373223ac3f1f6ee732326fd6840bfd9baa440.tar.gz
kernel-851373223ac3f1f6ee732326fd6840bfd9baa440.tar.xz
kernel-851373223ac3f1f6ee732326fd6840bfd9baa440.zip
disable a number of unused PATA/SATA drivers on ARM, don't build x86 specific
drivers on other arches, minor tweaks to other arch specific configs
-rw-r--r--baseconfig/CONFIG_HID_ASUS2
-rw-r--r--baseconfig/CONFIG_MMC_TOSHIBA_PCI2
-rw-r--r--baseconfig/CONFIG_PATA_ARASAN_CF2
-rw-r--r--baseconfig/CONFIG_PATA_ATIIXP2
-rw-r--r--baseconfig/CONFIG_PATA_CYPRESS2
-rw-r--r--baseconfig/CONFIG_PATA_MPIIX2
-rw-r--r--baseconfig/CONFIG_PATA_OLDPIIX2
-rw-r--r--baseconfig/CONFIG_PATA_RDC2
-rw-r--r--baseconfig/CONFIG_PATA_SCH2
-rw-r--r--baseconfig/CONFIG_PATA_TOSHIBA2
-rw-r--r--baseconfig/CONFIG_PATA_TRIFLEX2
-rw-r--r--baseconfig/CONFIG_SURFACE3_WMI1
-rw-r--r--baseconfig/CONFIG_SURFACE_3_BUTTON2
-rw-r--r--baseconfig/arm/CONFIG_BLK_DEV_SX81
-rw-r--r--baseconfig/arm/CONFIG_PATA_ALI1
-rw-r--r--baseconfig/arm/CONFIG_PATA_AMD1
-rw-r--r--baseconfig/arm/CONFIG_PATA_ARTOP1
-rw-r--r--baseconfig/arm/CONFIG_PATA_ATP867X1
-rw-r--r--baseconfig/arm/CONFIG_PATA_CMD640_PCI1
-rw-r--r--baseconfig/arm/CONFIG_PATA_CMD64X1
-rw-r--r--baseconfig/arm/CONFIG_PATA_CS55201
-rw-r--r--baseconfig/arm/CONFIG_PATA_CS55301
-rw-r--r--baseconfig/arm/CONFIG_PATA_CS55351
-rw-r--r--baseconfig/arm/CONFIG_PATA_CS55361
-rw-r--r--baseconfig/arm/CONFIG_PATA_EFAR1
-rw-r--r--baseconfig/arm/CONFIG_PATA_HPT3661
-rw-r--r--baseconfig/arm/CONFIG_PATA_HPT37X1
-rw-r--r--baseconfig/arm/CONFIG_PATA_HPT3X2N1
-rw-r--r--baseconfig/arm/CONFIG_PATA_HPT3X31
-rw-r--r--baseconfig/arm/CONFIG_PATA_IT82131
-rw-r--r--baseconfig/arm/CONFIG_PATA_IT821X1
-rw-r--r--baseconfig/arm/CONFIG_PATA_JMICRON1
-rw-r--r--baseconfig/arm/CONFIG_PATA_NETCELL1
-rw-r--r--baseconfig/arm/CONFIG_PATA_NINJA321
-rw-r--r--baseconfig/arm/CONFIG_PATA_NS874101
-rw-r--r--baseconfig/arm/CONFIG_PATA_NS874151
-rw-r--r--baseconfig/arm/CONFIG_PATA_OPTI1
-rw-r--r--baseconfig/arm/CONFIG_PATA_OPTIDMA1
-rw-r--r--baseconfig/arm/CONFIG_PATA_PDC2027X1
-rw-r--r--baseconfig/arm/CONFIG_PATA_PDC_OLD1
-rw-r--r--baseconfig/arm/CONFIG_PATA_SERVERWORKS1
-rw-r--r--baseconfig/arm/CONFIG_PATA_SIL6801
-rw-r--r--baseconfig/arm/CONFIG_PATA_SIS1
-rw-r--r--baseconfig/arm/CONFIG_PATA_VIA1
-rw-r--r--baseconfig/arm/CONFIG_PATA_WINBOND1
-rw-r--r--baseconfig/arm/CONFIG_SATA_INIC162X1
-rw-r--r--baseconfig/arm/CONFIG_SATA_NV1
-rw-r--r--baseconfig/arm/CONFIG_SATA_PROMISE1
-rw-r--r--baseconfig/arm/CONFIG_SATA_QSTOR1
-rw-r--r--baseconfig/arm/CONFIG_SATA_SIL1
-rw-r--r--baseconfig/arm/CONFIG_SATA_SIL241
-rw-r--r--baseconfig/arm/CONFIG_SATA_SIS1
-rw-r--r--baseconfig/arm/CONFIG_SATA_SVW1
-rw-r--r--baseconfig/arm/CONFIG_SATA_SX41
-rw-r--r--baseconfig/arm/CONFIG_SATA_ULI1
-rw-r--r--baseconfig/arm/CONFIG_SATA_VIA1
-rw-r--r--baseconfig/arm/CONFIG_SATA_VITESSE1
-rw-r--r--baseconfig/arm/arm64/CONFIG_ATA_ACPI (renamed from baseconfig/CONFIG_ATA_ACPI)0
-rw-r--r--baseconfig/arm/arm64/CONFIG_PATA_ACPI (renamed from baseconfig/CONFIG_PATA_ACPI)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_PATA_FTIDE0101
-rw-r--r--baseconfig/x86/CONFIG_ATA_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_HID_ASUS1
-rw-r--r--baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI1
-rw-r--r--baseconfig/x86/CONFIG_PATA_ACPI1
-rw-r--r--baseconfig/x86/CONFIG_PATA_ATIIXP1
-rw-r--r--baseconfig/x86/CONFIG_PATA_MPIIX1
-rw-r--r--baseconfig/x86/CONFIG_PATA_OLDPIIX1
-rw-r--r--baseconfig/x86/CONFIG_PATA_SCH1
-rw-r--r--baseconfig/x86/CONFIG_PATA_TOSHIBA1
-rw-r--r--baseconfig/x86/CONFIG_PATA_TRIFLEX1
-rw-r--r--baseconfig/x86/CONFIG_SENSORS_HDAPS (renamed from baseconfig/CONFIG_SENSORS_HDAPS)0
-rw-r--r--kernel-aarch64-debug.config114
-rw-r--r--kernel-aarch64.config114
-rw-r--r--kernel-armv7hl-debug.config117
-rw-r--r--kernel-armv7hl-lpae-debug.config117
-rw-r--r--kernel-armv7hl-lpae.config117
-rw-r--r--kernel-armv7hl.config117
-rw-r--r--kernel-i686-PAE.config6
-rw-r--r--kernel-i686-PAEdebug.config6
-rw-r--r--kernel-i686-debug.config6
-rw-r--r--kernel-i686.config6
-rw-r--r--kernel-ppc64-debug.config28
-rw-r--r--kernel-ppc64.config28
-rw-r--r--kernel-ppc64le-debug.config28
-rw-r--r--kernel-ppc64le.config28
-rw-r--r--kernel-ppc64p7-debug.config28
-rw-r--r--kernel-ppc64p7.config28
-rw-r--r--kernel-s390x-debug.config28
-rw-r--r--kernel-s390x.config28
-rw-r--r--kernel-x86_64-debug.config6
-rw-r--r--kernel-x86_64.config6
91 files changed, 516 insertions, 520 deletions
diff --git a/baseconfig/CONFIG_HID_ASUS b/baseconfig/CONFIG_HID_ASUS
index efc1ef4f8..b5df524a7 100644
--- a/baseconfig/CONFIG_HID_ASUS
+++ b/baseconfig/CONFIG_HID_ASUS
@@ -1 +1 @@
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
diff --git a/baseconfig/CONFIG_MMC_TOSHIBA_PCI b/baseconfig/CONFIG_MMC_TOSHIBA_PCI
index 9372cd4fe..2ae27a7ef 100644
--- a/baseconfig/CONFIG_MMC_TOSHIBA_PCI
+++ b/baseconfig/CONFIG_MMC_TOSHIBA_PCI
@@ -1 +1 @@
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
diff --git a/baseconfig/CONFIG_PATA_ARASAN_CF b/baseconfig/CONFIG_PATA_ARASAN_CF
index b6c8b16ae..edd438e6c 100644
--- a/baseconfig/CONFIG_PATA_ARASAN_CF
+++ b/baseconfig/CONFIG_PATA_ARASAN_CF
@@ -1 +1 @@
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
diff --git a/baseconfig/CONFIG_PATA_ATIIXP b/baseconfig/CONFIG_PATA_ATIIXP
index 0089d45c9..2730e0e76 100644
--- a/baseconfig/CONFIG_PATA_ATIIXP
+++ b/baseconfig/CONFIG_PATA_ATIIXP
@@ -1 +1 @@
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
diff --git a/baseconfig/CONFIG_PATA_CYPRESS b/baseconfig/CONFIG_PATA_CYPRESS
index 3ad2c2cec..901fb21a9 100644
--- a/baseconfig/CONFIG_PATA_CYPRESS
+++ b/baseconfig/CONFIG_PATA_CYPRESS
@@ -1 +1 @@
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
diff --git a/baseconfig/CONFIG_PATA_MPIIX b/baseconfig/CONFIG_PATA_MPIIX
index a29c081f6..241149b47 100644
--- a/baseconfig/CONFIG_PATA_MPIIX
+++ b/baseconfig/CONFIG_PATA_MPIIX
@@ -1 +1 @@
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
diff --git a/baseconfig/CONFIG_PATA_OLDPIIX b/baseconfig/CONFIG_PATA_OLDPIIX
index a3a6f6f6f..b35bb81d0 100644
--- a/baseconfig/CONFIG_PATA_OLDPIIX
+++ b/baseconfig/CONFIG_PATA_OLDPIIX
@@ -1 +1 @@
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
diff --git a/baseconfig/CONFIG_PATA_RDC b/baseconfig/CONFIG_PATA_RDC
index 011a98d5a..48afa962b 100644
--- a/baseconfig/CONFIG_PATA_RDC
+++ b/baseconfig/CONFIG_PATA_RDC
@@ -1 +1 @@
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
diff --git a/baseconfig/CONFIG_PATA_SCH b/baseconfig/CONFIG_PATA_SCH
index 2b0924997..52035bf53 100644
--- a/baseconfig/CONFIG_PATA_SCH
+++ b/baseconfig/CONFIG_PATA_SCH
@@ -1 +1 @@
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
diff --git a/baseconfig/CONFIG_PATA_TOSHIBA b/baseconfig/CONFIG_PATA_TOSHIBA
index 1fe4524d6..ffe9957f1 100644
--- a/baseconfig/CONFIG_PATA_TOSHIBA
+++ b/baseconfig/CONFIG_PATA_TOSHIBA
@@ -1 +1 @@
-CONFIG_PATA_TOSHIBA=m
+# CONFIG_PATA_TOSHIBA is not set
diff --git a/baseconfig/CONFIG_PATA_TRIFLEX b/baseconfig/CONFIG_PATA_TRIFLEX
index 09a247f65..5da0e57c4 100644
--- a/baseconfig/CONFIG_PATA_TRIFLEX
+++ b/baseconfig/CONFIG_PATA_TRIFLEX
@@ -1 +1 @@
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TRIFLEX is not set
diff --git a/baseconfig/CONFIG_SURFACE3_WMI b/baseconfig/CONFIG_SURFACE3_WMI
deleted file mode 100644
index d2fbd9c7b..000000000
--- a/baseconfig/CONFIG_SURFACE3_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SURFACE3_WMI=m
diff --git a/baseconfig/CONFIG_SURFACE_3_BUTTON b/baseconfig/CONFIG_SURFACE_3_BUTTON
index 8ba50033b..5b0621446 100644
--- a/baseconfig/CONFIG_SURFACE_3_BUTTON
+++ b/baseconfig/CONFIG_SURFACE_3_BUTTON
@@ -1 +1 @@
-CONFIG_SURFACE_3_BUTTON=m
+# CONFIG_SURFACE_3_BUTTON is not set
diff --git a/baseconfig/arm/CONFIG_BLK_DEV_SX8 b/baseconfig/arm/CONFIG_BLK_DEV_SX8
new file mode 100644
index 000000000..76e0342ed
--- /dev/null
+++ b/baseconfig/arm/CONFIG_BLK_DEV_SX8
@@ -0,0 +1 @@
+# CONFIG_BLK_DEV_SX8 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_ALI b/baseconfig/arm/CONFIG_PATA_ALI
new file mode 100644
index 000000000..15c814454
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_ALI
@@ -0,0 +1 @@
+# CONFIG_PATA_ALI is not set
diff --git a/baseconfig/arm/CONFIG_PATA_AMD b/baseconfig/arm/CONFIG_PATA_AMD
new file mode 100644
index 000000000..33a58facc
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_AMD
@@ -0,0 +1 @@
+# CONFIG_PATA_AMD is not set
diff --git a/baseconfig/arm/CONFIG_PATA_ARTOP b/baseconfig/arm/CONFIG_PATA_ARTOP
new file mode 100644
index 000000000..a4e7eb3b0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_ARTOP
@@ -0,0 +1 @@
+# CONFIG_PATA_ARTOP is not set
diff --git a/baseconfig/arm/CONFIG_PATA_ATP867X b/baseconfig/arm/CONFIG_PATA_ATP867X
new file mode 100644
index 000000000..5e66402b8
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_ATP867X
@@ -0,0 +1 @@
+# CONFIG_PATA_ATP867X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CMD640_PCI b/baseconfig/arm/CONFIG_PATA_CMD640_PCI
new file mode 100644
index 000000000..9244705d2
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CMD640_PCI
@@ -0,0 +1 @@
+# CONFIG_PATA_CMD640_PCI is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CMD64X b/baseconfig/arm/CONFIG_PATA_CMD64X
new file mode 100644
index 000000000..eb4773083
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CMD64X
@@ -0,0 +1 @@
+# CONFIG_PATA_CMD64X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5520 b/baseconfig/arm/CONFIG_PATA_CS5520
new file mode 100644
index 000000000..2328c0724
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5520
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5520 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5530 b/baseconfig/arm/CONFIG_PATA_CS5530
new file mode 100644
index 000000000..106b33a1a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5530
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5530 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5535 b/baseconfig/arm/CONFIG_PATA_CS5535
new file mode 100644
index 000000000..331016055
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5535
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5535 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_CS5536 b/baseconfig/arm/CONFIG_PATA_CS5536
new file mode 100644
index 000000000..e82dab7f2
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_CS5536
@@ -0,0 +1 @@
+# CONFIG_PATA_CS5536 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_EFAR b/baseconfig/arm/CONFIG_PATA_EFAR
new file mode 100644
index 000000000..d1957bf57
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_EFAR
@@ -0,0 +1 @@
+# CONFIG_PATA_EFAR is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT366 b/baseconfig/arm/CONFIG_PATA_HPT366
new file mode 100644
index 000000000..b67ac339d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT366
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT366 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT37X b/baseconfig/arm/CONFIG_PATA_HPT37X
new file mode 100644
index 000000000..990af0509
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT37X
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT37X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT3X2N b/baseconfig/arm/CONFIG_PATA_HPT3X2N
new file mode 100644
index 000000000..471fcff45
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT3X2N
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT3X2N is not set
diff --git a/baseconfig/arm/CONFIG_PATA_HPT3X3 b/baseconfig/arm/CONFIG_PATA_HPT3X3
new file mode 100644
index 000000000..9fc36a00b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_HPT3X3
@@ -0,0 +1 @@
+# CONFIG_PATA_HPT3X3 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_IT8213 b/baseconfig/arm/CONFIG_PATA_IT8213
new file mode 100644
index 000000000..47fbeb7f5
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_IT8213
@@ -0,0 +1 @@
+# CONFIG_PATA_IT8213 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_IT821X b/baseconfig/arm/CONFIG_PATA_IT821X
new file mode 100644
index 000000000..c29d7f7cb
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_IT821X
@@ -0,0 +1 @@
+# CONFIG_PATA_IT821X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_JMICRON b/baseconfig/arm/CONFIG_PATA_JMICRON
new file mode 100644
index 000000000..55695c65f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_JMICRON
@@ -0,0 +1 @@
+# CONFIG_PATA_JMICRON is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NETCELL b/baseconfig/arm/CONFIG_PATA_NETCELL
new file mode 100644
index 000000000..e598ae303
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NETCELL
@@ -0,0 +1 @@
+# CONFIG_PATA_NETCELL is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NINJA32 b/baseconfig/arm/CONFIG_PATA_NINJA32
new file mode 100644
index 000000000..9deb5dff7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NINJA32
@@ -0,0 +1 @@
+# CONFIG_PATA_NINJA32 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NS87410 b/baseconfig/arm/CONFIG_PATA_NS87410
new file mode 100644
index 000000000..32f9c72e0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NS87410
@@ -0,0 +1 @@
+# CONFIG_PATA_NS87410 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_NS87415 b/baseconfig/arm/CONFIG_PATA_NS87415
new file mode 100644
index 000000000..d12f9010d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_NS87415
@@ -0,0 +1 @@
+# CONFIG_PATA_NS87415 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_OPTI b/baseconfig/arm/CONFIG_PATA_OPTI
new file mode 100644
index 000000000..f95b6c966
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_OPTI
@@ -0,0 +1 @@
+# CONFIG_PATA_OPTI is not set
diff --git a/baseconfig/arm/CONFIG_PATA_OPTIDMA b/baseconfig/arm/CONFIG_PATA_OPTIDMA
new file mode 100644
index 000000000..6bf1d2e8a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_OPTIDMA
@@ -0,0 +1 @@
+# CONFIG_PATA_OPTIDMA is not set
diff --git a/baseconfig/arm/CONFIG_PATA_PDC2027X b/baseconfig/arm/CONFIG_PATA_PDC2027X
new file mode 100644
index 000000000..c8ad0b826
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_PDC2027X
@@ -0,0 +1 @@
+# CONFIG_PATA_PDC2027X is not set
diff --git a/baseconfig/arm/CONFIG_PATA_PDC_OLD b/baseconfig/arm/CONFIG_PATA_PDC_OLD
new file mode 100644
index 000000000..d77240fcf
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_PDC_OLD
@@ -0,0 +1 @@
+# CONFIG_PATA_PDC_OLD is not set
diff --git a/baseconfig/arm/CONFIG_PATA_SERVERWORKS b/baseconfig/arm/CONFIG_PATA_SERVERWORKS
new file mode 100644
index 000000000..5cacac7a6
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_SERVERWORKS
@@ -0,0 +1 @@
+# CONFIG_PATA_SERVERWORKS is not set
diff --git a/baseconfig/arm/CONFIG_PATA_SIL680 b/baseconfig/arm/CONFIG_PATA_SIL680
new file mode 100644
index 000000000..75224a38b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_SIL680
@@ -0,0 +1 @@
+# CONFIG_PATA_SIL680 is not set
diff --git a/baseconfig/arm/CONFIG_PATA_SIS b/baseconfig/arm/CONFIG_PATA_SIS
new file mode 100644
index 000000000..8c547495a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_SIS
@@ -0,0 +1 @@
+# CONFIG_PATA_SIS is not set
diff --git a/baseconfig/arm/CONFIG_PATA_VIA b/baseconfig/arm/CONFIG_PATA_VIA
new file mode 100644
index 000000000..9deaa6c3c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_VIA
@@ -0,0 +1 @@
+# CONFIG_PATA_VIA is not set
diff --git a/baseconfig/arm/CONFIG_PATA_WINBOND b/baseconfig/arm/CONFIG_PATA_WINBOND
new file mode 100644
index 000000000..9b3eb6289
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PATA_WINBOND
@@ -0,0 +1 @@
+# CONFIG_PATA_WINBOND is not set
diff --git a/baseconfig/arm/CONFIG_SATA_INIC162X b/baseconfig/arm/CONFIG_SATA_INIC162X
new file mode 100644
index 000000000..6abf495a0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_INIC162X
@@ -0,0 +1 @@
+# CONFIG_SATA_INIC162X is not set
diff --git a/baseconfig/arm/CONFIG_SATA_NV b/baseconfig/arm/CONFIG_SATA_NV
new file mode 100644
index 000000000..c8419327a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_NV
@@ -0,0 +1 @@
+# CONFIG_SATA_NV is not set
diff --git a/baseconfig/arm/CONFIG_SATA_PROMISE b/baseconfig/arm/CONFIG_SATA_PROMISE
new file mode 100644
index 000000000..2af59fe8e
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_PROMISE
@@ -0,0 +1 @@
+# CONFIG_SATA_PROMISE is not set
diff --git a/baseconfig/arm/CONFIG_SATA_QSTOR b/baseconfig/arm/CONFIG_SATA_QSTOR
new file mode 100644
index 000000000..8b3cce9ab
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_QSTOR
@@ -0,0 +1 @@
+# CONFIG_SATA_QSTOR is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SIL b/baseconfig/arm/CONFIG_SATA_SIL
new file mode 100644
index 000000000..5d551ee6a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SIL
@@ -0,0 +1 @@
+# CONFIG_SATA_SIL is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SIL24 b/baseconfig/arm/CONFIG_SATA_SIL24
new file mode 100644
index 000000000..7526a06a0
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SIL24
@@ -0,0 +1 @@
+# CONFIG_SATA_SIL24 is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SIS b/baseconfig/arm/CONFIG_SATA_SIS
new file mode 100644
index 000000000..1cd4ae75f
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SIS
@@ -0,0 +1 @@
+# CONFIG_SATA_SIS is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SVW b/baseconfig/arm/CONFIG_SATA_SVW
new file mode 100644
index 000000000..625275c8d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SVW
@@ -0,0 +1 @@
+# CONFIG_SATA_SVW is not set
diff --git a/baseconfig/arm/CONFIG_SATA_SX4 b/baseconfig/arm/CONFIG_SATA_SX4
new file mode 100644
index 000000000..abbd89112
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_SX4
@@ -0,0 +1 @@
+# CONFIG_SATA_SX4 is not set
diff --git a/baseconfig/arm/CONFIG_SATA_ULI b/baseconfig/arm/CONFIG_SATA_ULI
new file mode 100644
index 000000000..b50271fc3
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_ULI
@@ -0,0 +1 @@
+# CONFIG_SATA_ULI is not set
diff --git a/baseconfig/arm/CONFIG_SATA_VIA b/baseconfig/arm/CONFIG_SATA_VIA
new file mode 100644
index 000000000..f5754463a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_VIA
@@ -0,0 +1 @@
+# CONFIG_SATA_VIA is not set
diff --git a/baseconfig/arm/CONFIG_SATA_VITESSE b/baseconfig/arm/CONFIG_SATA_VITESSE
new file mode 100644
index 000000000..59856ec7b
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SATA_VITESSE
@@ -0,0 +1 @@
+# CONFIG_SATA_VITESSE is not set
diff --git a/baseconfig/CONFIG_ATA_ACPI b/baseconfig/arm/arm64/CONFIG_ATA_ACPI
index a0be76e56..a0be76e56 100644
--- a/baseconfig/CONFIG_ATA_ACPI
+++ b/baseconfig/arm/arm64/CONFIG_ATA_ACPI
diff --git a/baseconfig/CONFIG_PATA_ACPI b/baseconfig/arm/arm64/CONFIG_PATA_ACPI
index c3bc7866f..c3bc7866f 100644
--- a/baseconfig/CONFIG_PATA_ACPI
+++ b/baseconfig/arm/arm64/CONFIG_PATA_ACPI
diff --git a/baseconfig/arm/armv7/CONFIG_PATA_FTIDE010 b/baseconfig/arm/armv7/CONFIG_PATA_FTIDE010
deleted file mode 100644
index c20fa4d0f..000000000
--- a/baseconfig/arm/armv7/CONFIG_PATA_FTIDE010
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PATA_FTIDE010 is not set
diff --git a/baseconfig/x86/CONFIG_ATA_ACPI b/baseconfig/x86/CONFIG_ATA_ACPI
new file mode 100644
index 000000000..a0be76e56
--- /dev/null
+++ b/baseconfig/x86/CONFIG_ATA_ACPI
@@ -0,0 +1 @@
+CONFIG_ATA_ACPI=y
diff --git a/baseconfig/x86/CONFIG_HID_ASUS b/baseconfig/x86/CONFIG_HID_ASUS
new file mode 100644
index 000000000..efc1ef4f8
--- /dev/null
+++ b/baseconfig/x86/CONFIG_HID_ASUS
@@ -0,0 +1 @@
+CONFIG_HID_ASUS=m
diff --git a/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI b/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI
new file mode 100644
index 000000000..9372cd4fe
--- /dev/null
+++ b/baseconfig/x86/CONFIG_MMC_TOSHIBA_PCI
@@ -0,0 +1 @@
+CONFIG_MMC_TOSHIBA_PCI=m
diff --git a/baseconfig/x86/CONFIG_PATA_ACPI b/baseconfig/x86/CONFIG_PATA_ACPI
new file mode 100644
index 000000000..c3bc7866f
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_ACPI
@@ -0,0 +1 @@
+CONFIG_PATA_ACPI=m
diff --git a/baseconfig/x86/CONFIG_PATA_ATIIXP b/baseconfig/x86/CONFIG_PATA_ATIIXP
new file mode 100644
index 000000000..0089d45c9
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_ATIIXP
@@ -0,0 +1 @@
+CONFIG_PATA_ATIIXP=m
diff --git a/baseconfig/x86/CONFIG_PATA_MPIIX b/baseconfig/x86/CONFIG_PATA_MPIIX
new file mode 100644
index 000000000..a29c081f6
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_MPIIX
@@ -0,0 +1 @@
+CONFIG_PATA_MPIIX=m
diff --git a/baseconfig/x86/CONFIG_PATA_OLDPIIX b/baseconfig/x86/CONFIG_PATA_OLDPIIX
new file mode 100644
index 000000000..a3a6f6f6f
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_OLDPIIX
@@ -0,0 +1 @@
+CONFIG_PATA_OLDPIIX=m
diff --git a/baseconfig/x86/CONFIG_PATA_SCH b/baseconfig/x86/CONFIG_PATA_SCH
new file mode 100644
index 000000000..2b0924997
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_SCH
@@ -0,0 +1 @@
+CONFIG_PATA_SCH=m
diff --git a/baseconfig/x86/CONFIG_PATA_TOSHIBA b/baseconfig/x86/CONFIG_PATA_TOSHIBA
new file mode 100644
index 000000000..1fe4524d6
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_TOSHIBA
@@ -0,0 +1 @@
+CONFIG_PATA_TOSHIBA=m
diff --git a/baseconfig/x86/CONFIG_PATA_TRIFLEX b/baseconfig/x86/CONFIG_PATA_TRIFLEX
new file mode 100644
index 000000000..09a247f65
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PATA_TRIFLEX
@@ -0,0 +1 @@
+CONFIG_PATA_TRIFLEX=m
diff --git a/baseconfig/CONFIG_SENSORS_HDAPS b/baseconfig/x86/CONFIG_SENSORS_HDAPS
index d2dba2ab1..d2dba2ab1 100644
--- a/baseconfig/CONFIG_SENSORS_HDAPS
+++ b/baseconfig/x86/CONFIG_SENSORS_HDAPS
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ec2501a96..5467a4cae 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -556,7 +556,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_UMEM=m
@@ -1813,7 +1813,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -3158,7 +3158,7 @@ CONFIG_MMC_SPI=m
CONFIG_MMC_SUNXI=m
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3915,54 +3915,54 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
# CONFIG_PC104 is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
@@ -4619,20 +4619,20 @@ CONFIG_SATA_AHCI_SEATTLE=m
CONFIG_SATA_AHCI=y
# CONFIG_SATA_DWC is not set
# CONFIG_SATA_HIGHBANK is not set
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_ZPODD is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
@@ -4825,7 +4825,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -5517,8 +5516,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUNXI_CCU=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 88020bd4a..7c2905482 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -556,7 +556,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_UMEM=m
@@ -1796,7 +1796,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -3138,7 +3138,7 @@ CONFIG_MMC_SPI=m
CONFIG_MMC_SUNXI=m
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3894,54 +3894,54 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
# CONFIG_PC104 is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
@@ -4597,20 +4597,20 @@ CONFIG_SATA_AHCI_SEATTLE=m
CONFIG_SATA_AHCI=y
# CONFIG_SATA_DWC is not set
# CONFIG_SATA_HIGHBANK is not set
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_ZPODD is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
@@ -4803,7 +4803,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -5494,8 +5493,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SUNXI_CCU=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 83e61e8fd..849b405c0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -344,7 +344,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATAGS_PROC=y
@@ -598,7 +597,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_UMEM=m
@@ -1951,7 +1950,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -3371,7 +3370,7 @@ CONFIG_MMC_SUNXI=m
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_TMIO is not set
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -4202,57 +4201,55 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-# CONFIG_PATA_FTIDE010 is not set
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3 is not set
CONFIG_PATA_IMX=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
# CONFIG_PC104 is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
@@ -4980,20 +4977,20 @@ CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_AHCI=y
# CONFIG_SATA_DWC is not set
CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_ZPODD is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
@@ -5187,7 +5184,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -6006,8 +6002,7 @@ CONFIG_SUNXI_CCU=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_SRAM=y
CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 6d6f3172a..26a4b403b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -330,7 +330,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATAGS_PROC=y
@@ -574,7 +573,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_UMEM=m
@@ -1845,7 +1844,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -3214,7 +3213,7 @@ CONFIG_MMC_SUNXI=m
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_TMIO is not set
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3984,56 +3983,54 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-# CONFIG_PATA_FTIDE010 is not set
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
# CONFIG_PC104 is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
@@ -4674,20 +4671,20 @@ CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_AHCI=y
# CONFIG_SATA_DWC is not set
CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_ZPODD is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
@@ -4879,7 +4876,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -5605,8 +5601,7 @@ CONFIG_SUNXI_CCU=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_SRAM=y
CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 45a7786c0..a07d7d895 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -329,7 +329,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATAGS_PROC=y
@@ -573,7 +572,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_UMEM=m
@@ -1828,7 +1827,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -3194,7 +3193,7 @@ CONFIG_MMC_SUNXI=m
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_TMIO is not set
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3963,56 +3962,54 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-# CONFIG_PATA_FTIDE010 is not set
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
# CONFIG_PC104 is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
@@ -4652,20 +4649,20 @@ CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_AHCI=y
# CONFIG_SATA_DWC is not set
CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_ZPODD is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
@@ -4857,7 +4854,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -5582,8 +5578,7 @@ CONFIG_SUNXI_CCU=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_SRAM=y
CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index f5ce570a7..1bb1eb13e 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -343,7 +343,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATAGS_PROC=y
@@ -597,7 +596,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_THROTTLING_LOW is not set
CONFIG_BLK_DEV_THROTTLING=y
CONFIG_BLK_DEV_UMEM=m
@@ -1934,7 +1933,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -3351,7 +3350,7 @@ CONFIG_MMC_SUNXI=m
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
# CONFIG_MMC_TMIO is not set
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -4181,57 +4180,55 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-# CONFIG_PATA_FTIDE010 is not set
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5535 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3 is not set
CONFIG_PATA_IMX=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_OPTI=m
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_OPTI is not set
CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
# CONFIG_PC104 is not set
# CONFIG_PC87413_WDT is not set
CONFIG_PCCARD=y
@@ -4958,20 +4955,20 @@ CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_AHCI=y
# CONFIG_SATA_DWC is not set
CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_INIC162X=m
+# CONFIG_SATA_INIC162X is not set
CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+# CONFIG_SATA_NV is not set
CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
# CONFIG_SATA_ZPODD is not set
# CONFIG_SBC7240_WDT is not set
# CONFIG_SBC8360_WDT is not set
@@ -5165,7 +5162,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -5983,8 +5979,7 @@ CONFIG_SUNXI_CCU=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_SRAM=y
CONFIG_SUNXI_WATCHDOG=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND=y
CONFIG_SWAP=y
CONFIG_SWIOTLB=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index e008c0ee9..448e50b95 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3780,7 +3780,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -3790,7 +3790,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3814,7 +3814,7 @@ CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 7e61aa61c..05f6fbb92 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3800,7 +3800,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -3810,7 +3810,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3834,7 +3834,7 @@ CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index f4e4e6aa6..3f4f97aae 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3800,7 +3800,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -3810,7 +3810,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3834,7 +3834,7 @@ CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 406b38eb8..60c44d775 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3780,7 +3780,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -3790,7 +3790,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3814,7 +3814,7 @@ CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 6808066ac..3cba55ab3 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -186,7 +186,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1603,7 +1602,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2893,7 +2892,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3604,12 +3603,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3617,7 +3615,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3630,13 +3628,13 @@ CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MACIO=y
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OF_PLATFORM=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
@@ -3644,15 +3642,15 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_PLATFORM=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4384,7 +4382,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -5001,8 +4998,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 8f0828e45..ca6e6ad34 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -185,7 +185,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1585,7 +1584,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2872,7 +2871,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3582,12 +3581,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3595,7 +3593,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3608,13 +3606,13 @@ CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MACIO=y
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_OF_PLATFORM=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
@@ -3622,15 +3620,15 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_PLATFORM=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4361,7 +4359,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4977,8 +4974,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index f6eab4842..a1a713ba9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -179,7 +179,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1556,7 +1555,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2838,7 +2837,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3548,12 +3547,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3561,7 +3559,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3573,12 +3571,12 @@ CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
@@ -3586,15 +3584,15 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4323,7 +4321,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4929,8 +4926,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 43df9a5d0..e1c1532a3 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -178,7 +178,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1538,7 +1537,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2817,7 +2816,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3526,12 +3525,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3539,7 +3537,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3551,12 +3549,12 @@ CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
@@ -3564,15 +3562,15 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4300,7 +4298,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4905,8 +4902,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index b30d3e097..1a42694a5 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -179,7 +179,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1555,7 +1554,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2837,7 +2836,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3547,12 +3546,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3560,7 +3558,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3572,12 +3570,12 @@ CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
@@ -3585,15 +3583,15 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4322,7 +4320,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4928,8 +4925,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index ba010db2f..179276227 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -178,7 +178,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1537,7 +1536,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2816,7 +2815,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3525,12 +3524,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3538,7 +3536,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3550,12 +3548,12 @@ CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
@@ -3563,15 +3561,15 @@ CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_PLATFORM is not set
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4299,7 +4297,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4904,8 +4901,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_SUSPEND=y
CONFIG_SWAP=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9b5f0cc46..a4908320b 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -182,7 +182,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1525,7 +1524,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2778,7 +2777,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3480,12 +3479,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3493,7 +3491,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3505,27 +3503,27 @@ CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4227,7 +4225,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4826,8 +4823,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
# CONFIG_SUSPEND is not set
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 21532691a..1b3156a08 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -181,7 +181,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_ASYNC_TX_DMA=y
CONFIG_AT76C50X_USB=m
CONFIG_AT803X_PHY=m
-CONFIG_ATA_ACPI=y
CONFIG_ATA_BMDMA=y
CONFIG_ATA_GENERIC=m
CONFIG_ATALK=m
@@ -1507,7 +1506,7 @@ CONFIG_HID_ACRUX=m
CONFIG_HID_ALPS=m
CONFIG_HID_APPLEIR=m
CONFIG_HID_APPLE=m
-CONFIG_HID_ASUS=m
+# CONFIG_HID_ASUS is not set
CONFIG_HID_AUREAL=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_BELKIN=m
@@ -2757,7 +2756,7 @@ CONFIG_MMC_SDRICOH_CS=m
# CONFIG_MMC_SPI is not set
# CONFIG_MMC_TEST is not set
CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_TOSHIBA_PCI=m
+# CONFIG_MMC_TOSHIBA_PCI is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
@@ -3458,12 +3457,11 @@ CONFIG_PARMAN=m
# CONFIG_PARPORT is not set
# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
+# CONFIG_PATA_ATIIXP is not set
CONFIG_PATA_ATP867X=m
CONFIG_PATA_CMD640_PCI=m
CONFIG_PATA_CMD64X=m
@@ -3471,7 +3469,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3483,27 +3481,27 @@ CONFIG_PATA_IT821X=m
CONFIG_PATA_JMICRON=m
# CONFIG_PATA_LEGACY is not set
CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_MPIIX is not set
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NINJA32=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_OPTI=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
+# CONFIG_PATA_SCH is not set
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_SIS=m
-CONFIG_PATA_TOSHIBA=m
-CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
CONFIG_PATA_VIA=m
CONFIG_PATA_WINBOND=m
# CONFIG_PC104 is not set
@@ -4204,7 +4202,6 @@ CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
-CONFIG_SENSORS_HDAPS=m
# CONFIG_SENSORS_HIH6130 is not set
# CONFIG_SENSORS_HMC5843_I2C is not set
# CONFIG_SENSORS_HMC5843 is not set
@@ -4802,8 +4799,7 @@ CONFIG_SUNRPC_DEBUG=y
CONFIG_SUNRPC_GSS=m
CONFIG_SUNRPC=m
CONFIG_SUNRPC_XPRT_RDMA=m
-CONFIG_SURFACE_3_BUTTON=m
-CONFIG_SURFACE3_WMI=m
+# CONFIG_SURFACE_3_BUTTON is not set
# CONFIG_SUSPEND is not set
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 541508c47..f8f785360 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3849,7 +3849,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -3859,7 +3859,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3883,7 +3883,7 @@ CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5602cefce..e26090f5b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3829,7 +3829,7 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
-CONFIG_PATA_ARASAN_CF=m
+# CONFIG_PATA_ARASAN_CF is not set
CONFIG_PATA_ARTOP=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_ATP867X=m
@@ -3839,7 +3839,7 @@ CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
+# CONFIG_PATA_CYPRESS is not set
CONFIG_PATA_EFAR=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
@@ -3863,7 +3863,7 @@ CONFIG_PATA_PCMCIA=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_PDC_OLD=m
# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RDC=m
+# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
CONFIG_PATA_SCH=m