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/xtensa/Kconfig | |
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/xtensa/Kconfig')
-rw-r--r-- | arch/xtensa/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index c87ae7c6e5f9..02d6d29a63c1 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -41,7 +41,7 @@ config ARCH_HAS_ILOG2_U32 | |||
41 | config ARCH_HAS_ILOG2_U64 | 41 | config ARCH_HAS_ILOG2_U64 |
42 | def_bool n | 42 | def_bool n |
43 | 43 | ||
44 | config NO_IOPORT | 44 | config NO_IOPORT_MAP |
45 | def_bool n | 45 | def_bool n |
46 | 46 | ||
47 | config HZ | 47 | config HZ |
@@ -239,7 +239,7 @@ config XTENSA_PLATFORM_XT2000 | |||
239 | config XTENSA_PLATFORM_S6105 | 239 | config XTENSA_PLATFORM_S6105 |
240 | bool "S6105" | 240 | bool "S6105" |
241 | select SERIAL_CONSOLE | 241 | select SERIAL_CONSOLE |
242 | select NO_IOPORT | 242 | select NO_IOPORT_MAP |
243 | 243 | ||
244 | config XTENSA_PLATFORM_XTFPGA | 244 | config XTENSA_PLATFORM_XTFPGA |
245 | bool "XTFPGA" | 245 | bool "XTFPGA" |