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 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
kirkwood_defconfig
diff --git
a/arch/arm/configs/kirkwood_defconfig
b/arch/arm/configs/kirkwood_defconfig
index
ccc9c99
..
2f70428
100644
(file)
--- a/
arch/arm/configs/kirkwood_defconfig
+++ b/
arch/arm/configs/kirkwood_defconfig
@@
-15,6
+15,7
@@
CONFIG_MACH_MV88F6281GTW_GE=y
CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_ESATA_SHEEVAPLUG=y
CONFIG_MACH_GURUPLUG=y
+CONFIG_MACH_DOCKSTAR=y
CONFIG_MACH_TS219=y
CONFIG_MACH_TS41X=y
CONFIG_MACH_OPENRD_BASE=y