diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:20:26 -0500 |
commit | c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83 (patch) | |
tree | 1185ddc2c4cea1c4da09d6b83893f91aefe7cd3d /arch/mips/Kconfig | |
parent | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (diff) | |
parent | 8e8b77dd4846b73f2e0756cf59123ee709246d11 (diff) | |
download | kernel-crypto-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.gz kernel-crypto-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.tar.xz kernel-crypto-c7c6e9494cc9a4a5b1a2ca870ed4531ad2b98a83.zip |
Merge branch 'upstream'
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 0097a0d53b3..e380a8322a9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -958,7 +958,7 @@ config SOC_PNX8550 bool select DMA_NONCOHERENT select HW_HAS_PCI - select SYS_HAS_CPU_R4X00 + select SYS_HAS_CPU_MIPS32_R1 select SYS_SUPPORTS_32BIT_KERNEL config SWAP_IO_SPACE |