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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
kirkwood_defconfig
diff --git
a/arch/arm/configs/kirkwood_defconfig
b/arch/arm/configs/kirkwood_defconfig
index
2f70428
..
aeb3af5
100644
(file)
--- a/
arch/arm/configs/kirkwood_defconfig
+++ b/
arch/arm/configs/kirkwood_defconfig
@@
-24,6
+24,7
@@
CONFIG_MACH_OPENRD_ULTIMATE=y
CONFIG_MACH_NETSPACE_V2=y
CONFIG_MACH_INETSPACE_V2=y
CONFIG_MACH_NETSPACE_MAX_V2=y
+CONFIG_MACH_D2NET_V2=y
CONFIG_MACH_NET2BIG_V2=y
CONFIG_MACH_NET5BIG_V2=y
CONFIG_MACH_T5325=y