| Message ID | 1375521048-19178-6-git-send-email-paolo.pisati@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e565a88..c722d12 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -11,6 +11,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_STI=y CONFIG_ARCH_WM8850=y # CONFIG_ASYNC_TX_DMA is not set CONFIG_AUDIT_ARCH=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 72f48ab..759c29b 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -5,6 +5,7 @@ CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y # CONFIG_ARCH_ROCKCHIP is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_STI is not set # CONFIG_ARCH_WM8850 is not set CONFIG_ASYNC_TX_DMA=y CONFIG_BCH=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 323c212..cd3c7cf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -304,7 +304,6 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARCH_SIRF is not set # CONFIG_ARCH_SOCFPGA is not set CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_STI=y # CONFIG_ARCH_SUNXI is not set CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 0fff155..bccefae 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -10,6 +10,7 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx" CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_ROCKCHIP=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_STI=y CONFIG_ARCH_WM8850=y CONFIG_ASYNC_TX_DMA=y # CONFIG_AUDIT_ARCH is not set
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + 4 files changed, 3 insertions(+), 1 deletion(-)