diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:07 -0400 |
| commit | 6defd90433729c2d795865165cb34d938d8ff07c (patch) | |
| tree | ebb963c6db463296b8f926d79d7ddc8c1251ca24 /arch/arm/Kconfig | |
| parent | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (diff) | |
| parent | 99c6bb390cf599b9e0aa6e69beacc4e5d875bf77 (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Merge branch 'orion-devel' into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5f6e34925a32..efeed65b4a66 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -441,7 +441,7 @@ config ARCH_ORION5X | |||
| 441 | help | 441 | help |
| 442 | Support for the following Marvell Orion 5x series SoCs: | 442 | Support for the following Marvell Orion 5x series SoCs: |
| 443 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), | 443 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), |
| 444 | Orion-2 (5281). | 444 | Orion-2 (5281), Orion-1-90 (6183). |
| 445 | 445 | ||
| 446 | config ARCH_PNX4008 | 446 | config ARCH_PNX4008 |
| 447 | bool "Philips Nexperia PNX4008 Mobile" | 447 | bool "Philips Nexperia PNX4008 Mobile" |