| Message ID | 1366204141-16404-2-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 815f1e7..611283f 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -56,6 +56,7 @@ CONFIG_NR_CPUS=256 CONFIG_OUTPUT_FORMAT="elf64-x86-64" CONFIG_PCCARD=m CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PL330_DMA=m CONFIG_RCU_FANOUT=64 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index be7ca03..ca2d614 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -49,6 +49,7 @@ CONFIG_NOP_USB_XCEIV=y CONFIG_NR_CPUS=4 # CONFIG_PCCARD is not set # CONFIG_PHYS_ADDR_T_64BIT is not set +# CONFIG_PL330_DMA is not set CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=y CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8df3b86..d98c02c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4346,7 +4346,6 @@ CONFIG_PL310_ERRATA_727915=y CONFIG_PL310_ERRATA_753970=y CONFIG_PL310_ERRATA_769419=y CONFIG_PL320_MBOX=y -CONFIG_PL330_DMA=m # CONFIG_PLAT_SPEAR is not set CONFIG_PLAT_VERSATILE=y CONFIG_PLAT_VERSATILE_CLCD=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 1b08238..9722a09 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -55,6 +55,7 @@ CONFIG_NR_CPUS=8 CONFIG_OUTPUT_FORMAT="elf32-i386" CONFIG_PCCARD=m CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_PL330_DMA=m CONFIG_RCU_FANOUT=32 CONFIG_REGMAP_MMIO=m CONFIG_REGULATOR_FIXED_VOLTAGE=m
BugLink: http://bugs.launchpad.net/bugs/1168039 BugLink: http://bugs.launchpad.net/bugs/1166956 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(-)