[linux] 07/07: [armhf] mm: Enable CMA, DMA_CMA

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 76d0845dce198a77d063aac386886c0bc8c3330b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Apr 27 23:53:53 2016 +0200

    [armhf] mm: Enable CMA, DMA_CMA
---
 debian/changelog                 |  1 +
 debian/config/armhf/config.armmp | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2fcb309..6e20236 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 5549b69..6ddf384 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -151,6 +151,11 @@ CONFIG_PATA_PLATFORM=m
 CONFIG_PATA_OF_PLATFORM=m
 
 ##
+## file: drivers/base/Kconfig
+##
+CONFIG_DMA_CMA=y
+
+##
 ## file: drivers/bluetooth/Kconfig
 ##
 CONFIG_BT_WILINK=m
@@ -1100,6 +1105,11 @@ CONFIG_SUSPEND=y
 CONFIG_APM_EMULATION=y
 
 ##
+## file: mm/Kconfig
+##
+CONFIG_CMA=y
+
+##
 ## file: net/phonet/Kconfig
 ##
 CONFIG_PHONET=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git