diff --git a/debian/changelog b/debian/changelog index 2fcb30944..6e2023681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -135,6 +135,7 @@ linux (4.5.2-1) UNRELEASED; urgency=medium * tools/build: Fix bpf(2) feature test (fixes FTBFS on alpha, sh4; closes: #822364) * [armhf] Disable FB_OMAP2; it is redundant and conflicting with DRM_OMAP + * [armhf] mm: Enable CMA, DMA_CMA [ Aurelien Jarno ] * [mips*] Emulate unaligned LDXC1 and SDXC1 instructions. diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp index 5549b6959..6ddf38489 100644 --- a/debian/config/armhf/config.armmp +++ b/debian/config/armhf/config.armmp @@ -150,6 +150,11 @@ CONFIG_PATA_IMX=m CONFIG_PATA_PLATFORM=m CONFIG_PATA_OF_PLATFORM=m +## +## file: drivers/base/Kconfig +## +CONFIG_DMA_CMA=y + ## ## file: drivers/bluetooth/Kconfig ## @@ -1099,6 +1104,11 @@ CONFIG_BCM2835_WDT=m CONFIG_SUSPEND=y CONFIG_APM_EMULATION=y +## +## file: mm/Kconfig +## +CONFIG_CMA=y + ## ## file: net/phonet/Kconfig ##