git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
tegra_defconfig
diff --git
a/arch/arm/configs/tegra_defconfig
b/arch/arm/configs/tegra_defconfig
index
1effb43
..
92d0a14
100644
(file)
--- a/
arch/arm/configs/tegra_defconfig
+++ b/
arch/arm/configs/tegra_defconfig
@@
-79,6
+79,7
@@
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_CMA=y
+CONFIG_DMA_CMA=y
CONFIG_MTD=y
CONFIG_MTD_M25P80=y
CONFIG_PROC_DEVICETREE=y