aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-kirkwood/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-01 18:22:54 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-01 18:22:54 +0000
commitd7931d9f7ab9de9158c6905caae979999134ad4d (patch)
tree3903d96bfea61a4c66b11f95535928b4cb991327 /arch/arm/mach-kirkwood/Kconfig
parentfb3704663058ebb8ec05236f9c984b702550bac5 (diff)
parentda43243e765908d2ce6d22b2be995edf3218457d (diff)
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Diffstat (limited to 'arch/arm/mach-kirkwood/Kconfig')
-rw-r--r--arch/arm/mach-kirkwood/Kconfig12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 0aca451b216..8bf09ae5b34 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -33,10 +33,18 @@ config MACH_SHEEVAPLUG
Marvell SheevaPlug Reference Board.
config MACH_TS219
- bool "QNAP TS-119 and TS-219 Turbo NAS"
+ bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS"
help
Say 'Y' here if you want your kernel to support the
- QNAP TS-119 and TS-219 Turbo NAS devices.
+ QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS
+ devices.
+
+config MACH_TS41X
+ bool "QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS"
+ help
+ Say 'Y' here if you want your kernel to support the
+ QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS
+ devices.
config MACH_OPENRD_BASE
bool "Marvell OpenRD Base Board"