Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-08-01 12:03:26 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-08-01 12:03:26 +0200
commitb7c31b31e39772961dd1398fcf4c034b76f62204 (patch)
tree79acbbcef6dc41afe48df0242024373eb5ea762f
parentff215866b1c96a4cb7a4e05a8f924b8a152db69d (diff)
parent0a48518e7cf413122aa32a9613a42da792ecce59 (diff)
Merge branch 'master-vanilla-configs' into linux-next
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/ppc64/vanilla2
-rw-r--r--config/ppc64le/vanilla2
-rw-r--r--config/x86_64/vanilla13
4 files changed, 4 insertions, 15 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla
index d214acdc6c..7d84ac5019 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -2327,7 +2327,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_GLUEBI=m
# CONFIG_MTD_UBI_BLOCK is not set
CONFIG_MTD_HYPERBUS=m
-CONFIG_HBMC_AM654=m
+# CONFIG_HBMC_AM654 is not set
CONFIG_OF=y
# CONFIG_OF_UNITTEST is not set
CONFIG_OF_KOBJ=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 83945d0cb8..f17f01dd4d 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1997,7 +1997,7 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_SPI_MTK_QUADSPI=m
# CONFIG_MTD_UBI is not set
CONFIG_MTD_HYPERBUS=m
-CONFIG_HBMC_AM654=m
+# CONFIG_HBMC_AM654 is not set
CONFIG_DTC=y
CONFIG_OF=y
# CONFIG_OF_UNITTEST is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index e39b8c5e45..6d85ffdcd9 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1899,7 +1899,7 @@ CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_SPI_MTK_QUADSPI=m
# CONFIG_MTD_UBI is not set
CONFIG_MTD_HYPERBUS=m
-CONFIG_HBMC_AM654=m
+# CONFIG_HBMC_AM654 is not set
CONFIG_DTC=y
CONFIG_OF=y
# CONFIG_OF_UNITTEST is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 93be43c001..fb944f5b12 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -2319,7 +2319,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
CONFIG_MTD_UBI_GLUEBI=m
# CONFIG_MTD_UBI_BLOCK is not set
CONFIG_MTD_HYPERBUS=m
-CONFIG_HBMC_AM654=m
+# CONFIG_HBMC_AM654 is not set
# CONFIG_OF is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
@@ -8502,17 +8502,6 @@ CONFIG_FPGA_DFL_FME_BRIDGE=m
CONFIG_FPGA_DFL_FME_REGION=m
CONFIG_FPGA_DFL_AFU=m
CONFIG_FPGA_DFL_PCI=m
-CONFIG_MULTIPLEXER=m
-
-#
-# Multiplexer drivers
-#
-CONFIG_MUX_ADG792A=m
-CONFIG_MUX_ADGS1408=m
-CONFIG_MUX_GPIO=m
-CONFIG_MUX_MMIO=m
-# end of Multiplexer drivers
-
CONFIG_PM_OPP=y
CONFIG_UNISYS_VISORBUS=m
# CONFIG_SIOX is not set