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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
mv78xx0_defconfig
diff --git
a/arch/arm/configs/mv78xx0_defconfig
b/arch/arm/configs/mv78xx0_defconfig
index
83c817f
..
b069872
100644
(file)
--- a/
arch/arm/configs/mv78xx0_defconfig
+++ b/
arch/arm/configs/mv78xx0_defconfig
@@
-165,6
+165,7
@@
CONFIG_ARCH_MV78XX0=y
# Marvell MV78xx0 Implementations
#
CONFIG_MACH_DB78X00_BP=y
+CONFIG_MACH_RD78X00_MASA=y
#
# Boot options