summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-12 23:11:18 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-12 23:11:18 +0400
commit4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (patch)
tree4a91a11bcfb7df4bf2344240ac4fb958515f1ac0 /arch/arm/configs
parentc9ee46a910f6edb40ddb7fb9aeac0030057c6fdb (diff)
parentaf9a2d006611124eb1de9d7fee160b25b252ad98 (diff)
downloadlinux-4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/kirkwood_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index ccc9c9959b82..2f7042813765 100644
--- 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