diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-26 15:30:35 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-26 15:30:35 +1100 |
| commit | 75e06e2d7dd48ba655789e143e81c73617737890 (patch) | |
| tree | 21d4df5ab24703b95e43c504512fbccfb773ffea /arch/powerpc/platforms/44x/Kconfig | |
| parent | 5bc977867f36fc36cde43b309b891b2f7b714f52 (diff) | |
| parent | e08029675181a16d435431ad51255aa730fd6772 (diff) | |
| download | kernel-crypto-75e06e2d7dd48ba655789e143e81c73617737890.tar.gz kernel-crypto-75e06e2d7dd48ba655789e143e81c73617737890.tar.xz kernel-crypto-75e06e2d7dd48ba655789e143e81c73617737890.zip | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
Diffstat (limited to 'arch/powerpc/platforms/44x/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index d2480130534..c062c4cbbed 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -13,6 +13,7 @@ config EBONY default y select 440GP select PCI + select OF_RTC help This option enables support for the IBM PPC440GP evaluation board. @@ -53,6 +54,19 @@ config RAINIER help This option enables support for the AMCC PPC440GRX evaluation board. +config WARP + bool "PIKA Warp" + depends on 44x + default n + select 440EP + help + This option enables support for the PIKA Warp(tm) Appliance. The Warp + is a small computer replacement with up to 9 ports of FXO/FXS plus VOIP + stations and trunks. + + See http://www.pikatechnologies.com/ and follow the "PIKA for Computer + Telephony Developers" link for more information. + #config LUAN # bool "Luan" # depends on 44x @@ -75,6 +89,7 @@ config 440EP select PPC_FPU select IBM440EP_ERR42 select IBM_NEW_EMAC_ZMII + select USB_ARCH_HAS_OHCI config 440EPX bool |