diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 15:41:34 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 15:41:34 -0500 |
| commit | 2a2d10f386c1bacabe1a530c06dc8488eac419e5 (patch) | |
| tree | 4606a4a3bafa42a8aa70e001d35883956a0f0589 /arch/arm/mach-kirkwood/Kconfig | |
| parent | 2f68ffd11aa76b251921976c982b814df9ebe890 (diff) | |
| parent | c499546f43f2c31b681271ef7db922839fcde5fe (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/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index edc9aeb6e6b2..17879a876be6 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig | |||
| @@ -32,6 +32,12 @@ config MACH_SHEEVAPLUG | |||
| 32 | Say 'Y' here if you want your kernel to support the | 32 | Say 'Y' here if you want your kernel to support the |
| 33 | Marvell SheevaPlug Reference Board. | 33 | Marvell SheevaPlug Reference Board. |
| 34 | 34 | ||
| 35 | config MACH_ESATA_SHEEVAPLUG | ||
| 36 | bool "Marvell eSATA SheevaPlug Reference Board" | ||
| 37 | help | ||
| 38 | Say 'Y' here if you want your kernel to support the | ||
| 39 | Marvell eSATA SheevaPlug Reference Board. | ||
| 40 | |||
| 35 | config MACH_TS219 | 41 | config MACH_TS219 |
| 36 | bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" | 42 | bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" |
| 37 | help | 43 | help |