diff --git a/config-armv7-generic b/config-armv7-generic index c41eb2b0a..b3d16473a 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -368,8 +368,8 @@ CONFIG_LEDS_DAC124S085=m CONFIG_LEDS_PWM=m CONFIG_BMP085_SPI=m -# Display - +# Contiguous Memory Allocator +CONFIG_OF_RESERVED_MEM=y CONFIG_CMA=y CONFIG_DMA_CMA=y # CONFIG_CMA_DEBUG is not set diff --git a/kernel.spec b/kernel.spec index ee8fa6cd5..350085568 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2297,6 +2297,9 @@ fi # ||----w | # || || %changelog +* Mon Sep 9 2013 Peter Robinson +- Enable OF option to allocate CMA memory using device tree on ARM + * Mon Sep 09 2013 Josh Boyer - 3.12.0-0.rc0.git17.1 - Linux fscache-fixes-for-ceph-8429-g300893b