diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 14:15:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 14:15:23 -0500 |
| commit | 3f00d3e8fb963968a922d821a9a53b503b687e81 (patch) | |
| tree | dfac1c73ae63f8d48340f3bbb77ee53b322c59e9 /arch/mips/Kconfig | |
| parent | 407cf84f956ee4b52da5508d5357b8ae212ff77c (diff) | |
| parent | a637a114f36b94a1ad8b9867f43bac0414958420 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
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 0097a0d53b3b..e380a8322a94 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -958,7 +958,7 @@ config SOC_PNX8550 | |||
| 958 | bool | 958 | bool |
| 959 | select DMA_NONCOHERENT | 959 | select DMA_NONCOHERENT |
| 960 | select HW_HAS_PCI | 960 | select HW_HAS_PCI |
| 961 | select SYS_HAS_CPU_R4X00 | 961 | select SYS_HAS_CPU_MIPS32_R1 |
| 962 | select SYS_SUPPORTS_32BIT_KERNEL | 962 | select SYS_SUPPORTS_32BIT_KERNEL |
| 963 | 963 | ||
| 964 | config SWAP_IO_SPACE | 964 | config SWAP_IO_SPACE |