diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-20 03:23:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-20 03:23:28 -0500 |
| commit | 0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch) | |
| tree | 75aa590c636feed7d110c03eddb56cc518fc034c /arch/mips/alchemy/Kconfig | |
| parent | 0a2a18b721abc960fbcada406746877d22340a60 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'arch/mips/alchemy/Kconfig')
| -rw-r--r-- | arch/mips/alchemy/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig index e4a057d80ab6..7f8ef13d0014 100644 --- a/arch/mips/alchemy/Kconfig +++ b/arch/mips/alchemy/Kconfig | |||
| @@ -128,9 +128,10 @@ config SOC_AU1200 | |||
| 128 | config SOC_AU1X00 | 128 | config SOC_AU1X00 |
| 129 | bool | 129 | bool |
| 130 | select 64BIT_PHYS_ADDR | 130 | select 64BIT_PHYS_ADDR |
| 131 | select CEVT_R4K | 131 | select CEVT_R4K_LIB |
| 132 | select CSRC_R4K | 132 | select CSRC_R4K_LIB |
| 133 | select IRQ_CPU | 133 | select IRQ_CPU |
| 134 | select SYS_HAS_CPU_MIPS32_R1 | 134 | select SYS_HAS_CPU_MIPS32_R1 |
| 135 | select SYS_SUPPORTS_32BIT_KERNEL | 135 | select SYS_SUPPORTS_32BIT_KERNEL |
| 136 | select SYS_SUPPORTS_APM_EMULATION | 136 | select SYS_SUPPORTS_APM_EMULATION |
| 137 | select GENERIC_HARDIRQS_NO__DO_IRQ | ||