aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/86xx/Kconfig
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@ge.com>2010-03-01 14:41:59 +0000
committerKumar Gala <galak@kernel.crashing.org>2010-03-04 10:43:44 -0600
commit948e78c3fc9c799b3f9b6c683b83c665942e6bbe (patch)
tree7255027af3024f6524ed3adc2386935795d40d2f /arch/powerpc/platforms/86xx/Kconfig
parentpowerpc/86xx: Convert gef_pic_lock to raw_spinlock (diff)
downloadlinux-dev-948e78c3fc9c799b3f9b6c683b83c665942e6bbe.tar.xz
linux-dev-948e78c3fc9c799b3f9b6c683b83c665942e6bbe.zip
powerpc/86xx: Renaming following split of GE Fanuc joint venture
This patch renames GE Fanuc boards following the split-up of the GE Fanuc joint venture. These boards are now made by GE Intelligent platorms. Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/86xx/Kconfig')
-rw-r--r--arch/powerpc/platforms/86xx/Kconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 2bbfd530d6d8..fbe9f3621424 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -33,32 +33,32 @@ config MPC8610_HPCD
This option enables support for the MPC8610 HPCD board.
config GEF_PPC9A
- bool "GE Fanuc PPC9A"
+ bool "GE PPC9A"
select DEFAULT_UIMAGE
select MMIO_NVRAM
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
help
- This option enables support for GE Fanuc's PPC9A.
+ This option enables support for the GE PPC9A.
config GEF_SBC310
- bool "GE Fanuc SBC310"
+ bool "GE SBC310"
select DEFAULT_UIMAGE
select MMIO_NVRAM
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
help
- This option enables support for GE Fanuc's SBC310.
+ This option enables support for the GE SBC310.
config GEF_SBC610
- bool "GE Fanuc SBC610"
+ bool "GE SBC610"
select DEFAULT_UIMAGE
select MMIO_NVRAM
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
select HAS_RAPIDIO
help
- This option enables support for GE Fanuc's SBC610.
+ This option enables support for the GE SBC610.
endif