Message ID | 1375521048-19178-3-git-send-email-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic index 9543ab9..ddcf546 100644 --- a/debian.master/config/armhf/config.flavour.generic +++ b/debian.master/config/armhf/config.flavour.generic @@ -5,7 +5,6 @@ CONFIG_AC97_BUS=y CONFIG_ARCH_MXC=y CONFIG_ARCH_NR_GPIO=1024 # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_SUNXI=y CONFIG_ARCH_TEGRA=y # CONFIG_ARM_LPAE is not set # CONFIG_COMPACTION is not set diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae index 5da7ccd..7446090c 100644 --- a/debian.master/config/armhf/config.flavour.generic-lpae +++ b/debian.master/config/armhf/config.flavour.generic-lpae @@ -5,7 +5,6 @@ CONFIG_AC97_BUS=m # CONFIG_ARCH_MXC is not set CONFIG_ARCH_NR_GPIO=512 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -# CONFIG_ARCH_SUNXI is not set # CONFIG_ARCH_TEGRA is not set CONFIG_ARM_LPAE=y CONFIG_COMPACTION=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 7559e53..1d0e9e1 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -306,6 +306,7 @@ CONFIG_ARCH_ROCKCHIP=y # 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 CONFIG_ARCH_SUPPORTS_MSI=y
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/armhf/config.flavour.generic | 1 - debian.master/config/armhf/config.flavour.generic-lpae | 1 - debian.master/config/config.common.ubuntu | 1 + 3 files changed, 1 insertion(+), 2 deletions(-)