diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:37:44 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-11 13:37:44 +1100 |
commit | edbc29d76ddbc9bd56e1cbc772188f70c616ffe1 (patch) | |
tree | 71b994ba493c46e10189c090fd17fe2da80281ec /arch/powerpc/platforms/86xx/Kconfig | |
parent | 1db8508cf483dc1ecf66141f90a7c03659d69512 (diff) | |
parent | a0e8618c71b9b685977c1407dee928d86c5bdc2c (diff) |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/86xx/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/86xx/Kconfig | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig index 8e569393597..fa276c689cf 100644 --- a/arch/powerpc/platforms/86xx/Kconfig +++ b/arch/powerpc/platforms/86xx/Kconfig @@ -31,6 +31,14 @@ config MPC8610_HPCD help This option enables support for the MPC8610 HPCD board. +config GEF_SBC310 + bool "GE Fanuc SBC310" + select DEFAULT_UIMAGE + select GENERIC_GPIO + select ARCH_REQUIRE_GPIOLIB + help + This option enables support for GE Fanuc's SBC310. + config GEF_SBC610 bool "GE Fanuc SBC610" select DEFAULT_UIMAGE @@ -48,7 +56,7 @@ config MPC8641 select FSL_PCI if PCI select PPC_UDBG_16550 select MPIC - default y if MPC8641_HPCN || SBC8641D || GEF_SBC610 + default y if MPC8641_HPCN || SBC8641D || GEF_SBC610 || GEF_SBC310 config MPC8610 bool |