git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'defconfig-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
mvebu_v7_defconfig
diff --git
a/arch/arm/configs/mvebu_v7_defconfig
b/arch/arm/configs/mvebu_v7_defconfig
index 05edf4622c8defce3b13409f4459da0c45f0cf0f..73673e95f23c6351982ec081533f92acd72fd52f 100644
(file)
--- a/
arch/arm/configs/mvebu_v7_defconfig
+++ b/
arch/arm/configs/mvebu_v7_defconfig
@@
-113,6
+113,7
@@
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S35390A=y
CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_DRV_ARMADA38X=y
CONFIG_DMADEVICES=y
CONFIG_MV_XOR=y
# CONFIG_IOMMU_SUPPORT is not set