projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-cpufreq'
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
multi_v7_defconfig
diff --git
a/arch/arm/configs/multi_v7_defconfig
b/arch/arm/configs/multi_v7_defconfig
index
ab5fea7
..
5845910
100644
(file)
--- a/
arch/arm/configs/multi_v7_defconfig
+++ b/
arch/arm/configs/multi_v7_defconfig
@@
-781,7
+781,7
@@
CONFIG_MXS_DMA=y
CONFIG_DMA_BCM2835=y
CONFIG_DMA_OMAP=y
CONFIG_QCOM_BAM_DMA=y
-CONFIG_XILINX_
V
DMA=y
+CONFIG_XILINX_DMA=y
CONFIG_DMA_SUN6I=y
CONFIG_STAGING=y
CONFIG_SENSORS_ISL29018=y