aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-03-27 14:51:41 -0400
committerNicolas Pitre <nico@marvell.com>2008-03-27 14:51:41 -0400
commit9dd0b194bf6804b1998f0fe261b2606ec7b58d72 (patch)
treec9fd5ab51dc256818c24a8a771dc068d021039e2 /arch/arm/Kconfig
parent159ffb3a04f6bc619643af680df406faafd0199d (diff)
Orion: orion -> orion5x rename
Do a global s/orion/orion5x/ of the Orion 5x-specific bits (i.e. not the plat-orion bits.) Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Reviewed-by: Tzachi Perelstein <tzachi@marvell.com> Acked-by: Saeed Bishara <saeed@marvell.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 845f96e9f0d0..2f4fb773f3e8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -377,7 +377,7 @@ config ARCH_MXC
377 help 377 help
378 Support for Freescale MXC/iMX-based family of processors 378 Support for Freescale MXC/iMX-based family of processors
379 379
380config ARCH_ORION 380config ARCH_ORION5X
381 bool "Marvell Orion" 381 bool "Marvell Orion"
382 depends on MMU 382 depends on MMU
383 select PCI 383 select PCI
@@ -386,7 +386,8 @@ config ARCH_ORION
386 select GENERIC_CLOCKEVENTS 386 select GENERIC_CLOCKEVENTS
387 select PLAT_ORION 387 select PLAT_ORION
388 help 388 help
389 Support for Marvell Orion System on Chip family. 389 Support for the following Marvell Orion 5x series SoCs:
390 Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.)
390 391
391config ARCH_PNX4008 392config ARCH_PNX4008
392 bool "Philips Nexperia PNX4008 Mobile" 393 bool "Philips Nexperia PNX4008 Mobile"
@@ -517,7 +518,7 @@ source "arch/arm/mach-omap1/Kconfig"
517 518
518source "arch/arm/mach-omap2/Kconfig" 519source "arch/arm/mach-omap2/Kconfig"
519 520
520source "arch/arm/mach-orion/Kconfig" 521source "arch/arm/mach-orion5x/Kconfig"
521 522
522source "arch/arm/plat-s3c24xx/Kconfig" 523source "arch/arm/plat-s3c24xx/Kconfig"
523source "arch/arm/plat-s3c/Kconfig" 524source "arch/arm/plat-s3c/Kconfig"