From: Paolo Pisati Date: Wed, 28 Sep 2016 11:22:25 +0000 (+0200) Subject: UBUNTU: [Config] armhf: disable ARCH_ZX X-Git-Tag: Ubuntu-4.10.0-9.11~291 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=4f3c9280ec4de7bcbd2b26b2cda630aea3c2af88;p=mirror_ubuntu-zesty-kernel.git UBUNTU: [Config] armhf: disable ARCH_ZX BugLink: http://bugs.launchpad.net/bugs/1628503 Signed-off-by: Paolo Pisati Signed-off-by: Tim Gardner --- diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 885faac88083..6fe51a13b953 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -474,7 +474,7 @@ CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_ARCH_WM8850 is not set CONFIG_ARCH_XGENE=y -CONFIG_ARCH_ZX=y +# CONFIG_ARCH_ZX is not set # CONFIG_ARCH_ZYNQ is not set CONFIG_ARCH_ZYNQMP=y CONFIG_ARCNET_1051=m @@ -6072,7 +6072,6 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y CONFIG_POWER_RESET_VERSATILE=y CONFIG_POWER_RESET_VEXPRESS=y # CONFIG_POWER_RESET_XGENE is not set -CONFIG_POWER_RESET_ZX=m # CONFIG_POWER_SUPPLY_DEBUG is not set CONFIG_PPA8548=y CONFIG_PPC=y @@ -7780,7 +7779,6 @@ CONFIG_SOC_OMAP3430=y CONFIG_SOC_SAMSUNG=y CONFIG_SOC_TI81XX=y CONFIG_SOC_VF610=y -CONFIG_SOC_ZX296702=y CONFIG_SOFT_WATCHDOG=m CONFIG_SONYPI=m CONFIG_SONYPI_COMPAT=y @@ -9388,6 +9386,3 @@ CONFIG_ZPOOL=y CONFIG_ZRAM=m # CONFIG_ZSMALLOC_STAT is not set CONFIG_ZSWAP=y -CONFIG_ZX296702_I2S=m -CONFIG_ZX296702_SPDIF=m -CONFIG_ZX_DMA=m