diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:18:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-21 16:18:05 -0800 |
commit | 0f151e8b214c1df3f571020b849382933f2cdce7 (patch) | |
tree | 9ae4bb3361e9d7e286674b1d59b9dc931c74caf1 /arch/powerpc/platforms/44x/Kconfig | |
parent | e80af3a8dbbbf431b2070cc760699f01c5a6ac69 (diff) | |
parent | a8b87f609d1332216e683b473d33342c86f21ac3 (diff) | |
download | kernel-crypto-0f151e8b214c1df3f571020b849382933f2cdce7.tar.gz kernel-crypto-0f151e8b214c1df3f571020b849382933f2cdce7.tar.xz kernel-crypto-0f151e8b214c1df3f571020b849382933f2cdce7.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] pasemi: Remove warning in mpic_pasemi_msi.c
[POWERPC] pasemi: Register i2c devices at boot
[POWERPC] cell: fix spurious false return from spu_trap_data_{map,seg}
[POWERPC] Fix warning in pseries/power.c
[POWERPC] Fix bootwrapper builds with older gcc versions
[POWERPC] Fix dt_mem_next_cell() to read the full address
[POWERPC] Kill sparse warnings in kprobes
[POWERPC] spufs: fix scheduler starvation by idle contexts
[POWERPC] 44x: Add multiplatform defconfig
[POWERPC] 44x: Fix Kconfig formatting
[POWERPC] 4xx: Update defconfigs for 2.6.25
[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts
[POWERPC] PPC440EP Interrupt Triggering and Level Settings
[POWERPC] net: NEWEMAC: Remove "rgmii-interface" from rgmii matching table
Diffstat (limited to 'arch/powerpc/platforms/44x/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index c062c4cbbed..1bfb2191010 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig @@ -61,7 +61,7 @@ config WARP 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 + 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 @@ -110,17 +110,17 @@ config 440GP config 440GX bool - select IBM_NEW_EMAC_EMAC4 + select IBM_NEW_EMAC_EMAC4 select IBM_NEW_EMAC_RGMII - select IBM_NEW_EMAC_ZMII #test only - select IBM_NEW_EMAC_TAH #test only + select IBM_NEW_EMAC_ZMII #test only + select IBM_NEW_EMAC_TAH #test only config 440SP bool config 440SPe - select IBM_NEW_EMAC_EMAC4 bool + select IBM_NEW_EMAC_EMAC4 # 44x errata/workaround config symbols, selected by the CPU models above config IBM440EP_ERR42 |