diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
| commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
| tree | 1d290d28d42d42f9e693457762c4008988628060 /arch/mips/alchemy/Kconfig | |
| parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
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 | ||