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 commit 'origin/master' into next
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
kirkwood_defconfig
diff --git
a/arch/arm/configs/kirkwood_defconfig
b/arch/arm/configs/kirkwood_defconfig
index
bde56f4
..
0a1abb9
100644
(file)
--- a/
arch/arm/configs/kirkwood_defconfig
+++ b/
arch/arm/configs/kirkwood_defconfig
@@
-182,6
+182,7
@@
CONFIG_ARCH_KIRKWOOD=y
CONFIG_MACH_DB88F6281_BP=y
CONFIG_MACH_RD88F6192_NAS=y
CONFIG_MACH_RD88F6281=y
+CONFIG_MACH_MV88F6281GTW_GE=y
CONFIG_MACH_SHEEVAPLUG=y
CONFIG_MACH_TS219=y
CONFIG_PLAT_ORION=y