diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-08 19:51:57 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-03-08 19:51:57 -0500 |
commit | 59603b9ae426e968d452f9325cdcff308573dee7 (patch) | |
tree | f54c52cbf4874a28f88c65fce659daee20b0f41f /arch/powerpc/platforms/86xx/Kconfig | |
parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
parent | a11106544f33c104706ae42d27219a409b67478e (diff) |
Merge commit 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/platforms/86xx/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 12 |
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 | |||
33 | This option enables support for the MPC8610 HPCD board. | 33 | This option enables support for the MPC8610 HPCD board. |
34 | 34 | ||
35 | config GEF_PPC9A | 35 | config GEF_PPC9A |
36 | bool "GE Fanuc PPC9A" | 36 | bool "GE PPC9A" |
37 | select DEFAULT_UIMAGE | 37 | select DEFAULT_UIMAGE |
38 | select MMIO_NVRAM | 38 | select MMIO_NVRAM |
39 | select GENERIC_GPIO | 39 | select GENERIC_GPIO |
40 | select ARCH_REQUIRE_GPIOLIB | 40 | select ARCH_REQUIRE_GPIOLIB |
41 | help | 41 | help |
42 | This option enables support for GE Fanuc's PPC9A. | 42 | This option enables support for the GE PPC9A. |
43 | 43 | ||
44 | config GEF_SBC310 | 44 | config GEF_SBC310 |
45 | bool "GE Fanuc SBC310" | 45 | bool "GE SBC310" |
46 | select DEFAULT_UIMAGE | 46 | select DEFAULT_UIMAGE |
47 | select MMIO_NVRAM | 47 | select MMIO_NVRAM |
48 | select GENERIC_GPIO | 48 | select GENERIC_GPIO |
49 | select ARCH_REQUIRE_GPIOLIB | 49 | select ARCH_REQUIRE_GPIOLIB |
50 | help | 50 | help |
51 | This option enables support for GE Fanuc's SBC310. | 51 | This option enables support for the GE SBC310. |
52 | 52 | ||
53 | config GEF_SBC610 | 53 | config GEF_SBC610 |
54 | bool "GE Fanuc SBC610" | 54 | bool "GE SBC610" |
55 | select DEFAULT_UIMAGE | 55 | select DEFAULT_UIMAGE |
56 | select MMIO_NVRAM | 56 | select MMIO_NVRAM |
57 | select GENERIC_GPIO | 57 | select GENERIC_GPIO |
58 | select ARCH_REQUIRE_GPIOLIB | 58 | select ARCH_REQUIRE_GPIOLIB |
59 | select HAS_RAPIDIO | 59 | select HAS_RAPIDIO |
60 | help | 60 | help |
61 | This option enables support for GE Fanuc's SBC610. | 61 | This option enables support for the GE SBC610. |
62 | 62 | ||
63 | endif | 63 | endif |
64 | 64 | ||