diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-28 17:25:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-28 17:25:11 +1100 |
| commit | 1c06b25346891b03249afb0c5c1dcf2d4af10442 (patch) | |
| tree | 9c32b7b545d998c57a8c9b70b09d8e4ecf942eb6 /arch/mips/Kconfig | |
| parent | 657af6b501a2511fb6bebcca0de3e4c1685186b6 (diff) | |
| parent | dd2d4c7c315f7f6ef2ecff7ef4a646a7ae19d582 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/mips/Kconfig')
| -rw-r--r-- | arch/mips/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 71a925eb8a03..606359bfa458 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -175,7 +175,7 @@ config MACH_DECSTATION select CPU_R4000_WORKAROUNDS if 64BIT select CPU_R4400_WORKAROUNDS if 64BIT select DMA_NONCOHERENT - select NO_IOPORT + select NO_IOPORT_MAP select IRQ_CPU select SYS_HAS_CPU_R3000 select SYS_HAS_CPU_R4X00 @@ -947,7 +947,7 @@ config SYNC_R4K config MIPS_MACHINE def_bool n -config NO_IOPORT +config NO_IOPORT_MAP def_bool n config GENERIC_ISA_DMA |