diff options
author | Alexander Clouter <alex@digriz.org.uk> | 2010-01-18 18:38:19 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2010-02-05 00:27:04 -0500 |
commit | b2fdb5660fccc060e47658baad8911a963397ced (patch) | |
tree | 37988afbb7b8b58e8594de21bcf507ba6062fce7 /arch/arm/mach-kirkwood/Kconfig | |
parent | 639b9be60ec2045a0a59b2ea33479937c4b5acef (diff) |
[ARM] kirkwood: combine support for openrd base/client support
Inspired by the mach-ep93xx flattening work, there is really not
much difference between the OpenRD base and client board support
so they should be merged together.
Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
Acked-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/Kconfig')
-rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index f6c6196a51fa..4ac6f463eb03 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig | |||
@@ -46,12 +46,23 @@ config MACH_TS41X | |||
46 | QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS | 46 | QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS |
47 | devices. | 47 | devices. |
48 | 48 | ||
49 | config MACH_OPENRD | ||
50 | bool | ||
51 | |||
49 | config MACH_OPENRD_BASE | 52 | config MACH_OPENRD_BASE |
50 | bool "Marvell OpenRD Base Board" | 53 | bool "Marvell OpenRD Base Board" |
54 | select MACH_OPENRD | ||
51 | help | 55 | help |
52 | Say 'Y' here if you want your kernel to support the | 56 | Say 'Y' here if you want your kernel to support the |
53 | Marvell OpenRD Base Board. | 57 | Marvell OpenRD Base Board. |
54 | 58 | ||
59 | config MACH_OPENRD_CLIENT | ||
60 | bool "Marvell OpenRD Client Board" | ||
61 | select MACH_OPENRD | ||
62 | help | ||
63 | Say 'Y' here if you want your kernel to support the | ||
64 | Marvell OpenRD Client Board. | ||
65 | |||
55 | config MACH_NETSPACE_V2 | 66 | config MACH_NETSPACE_V2 |
56 | bool "LaCie Network Space v2 NAS Board" | 67 | bool "LaCie Network Space v2 NAS Board" |
57 | help | 68 | help |