diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-04-07 18:39:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:36:11 -0400 |
commit | ce816fa88cca083c47ab9000b2138a83043a78be (patch) | |
tree | fcdd6e68adb239187eb833722261ff348610809b /arch/mips | |
parent | 6d08a2567c0b9103c3ff946df17ad4be9a917e2f (diff) |
Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP
If the renamed symbol is defined lib/iomap.c implements ioport_map and
ioport_unmap and currently (nearly) all platforms define the port
accessor functions outb/inb and friend unconditionally. So
HAS_IOPORT_MAP is the better name for this.
Consequently NO_IOPORT is renamed to NO_IOPORT_MAP.
The motivation for this change is to reintroduce a symbol HAS_IOPORT
that signals if outb/int et al are available. I will address that at
least one merge window later though to keep surprises to a minimum and
catch new introductions of (HAS|NO)_IOPORT.
The changes in this commit were done using:
$ git grep -l -E '(NO|HAS)_IOPORT' | xargs perl -p -i -e 's/\b((?:CONFIG_)?(?:NO|HAS)_IOPORT)\b/$1_MAP/'
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips')
-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 16d5ab1615b1..5cd695f905a1 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -175,7 +175,7 @@ config MACH_DECSTATION | |||
175 | select CPU_R4000_WORKAROUNDS if 64BIT | 175 | select CPU_R4000_WORKAROUNDS if 64BIT |
176 | select CPU_R4400_WORKAROUNDS if 64BIT | 176 | select CPU_R4400_WORKAROUNDS if 64BIT |
177 | select DMA_NONCOHERENT | 177 | select DMA_NONCOHERENT |
178 | select NO_IOPORT | 178 | select NO_IOPORT_MAP |
179 | select IRQ_CPU | 179 | select IRQ_CPU |
180 | select SYS_HAS_CPU_R3000 | 180 | select SYS_HAS_CPU_R3000 |
181 | select SYS_HAS_CPU_R4X00 | 181 | select SYS_HAS_CPU_R4X00 |
@@ -947,7 +947,7 @@ config SYNC_R4K | |||
947 | config MIPS_MACHINE | 947 | config MIPS_MACHINE |
948 | def_bool n | 948 | def_bool n |
949 | 949 | ||
950 | config NO_IOPORT | 950 | config NO_IOPORT_MAP |
951 | def_bool n | 951 | def_bool n |
952 | 952 | ||
953 | config GENERIC_ISA_DMA | 953 | config GENERIC_ISA_DMA |