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/sh/boards | |
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/sh/boards')
-rw-r--r-- | arch/sh/boards/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index eb1cf84231a2..e331e5373b8e 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig | |||
@@ -158,7 +158,7 @@ config SH_SDK7786 | |||
158 | bool "SDK7786" | 158 | bool "SDK7786" |
159 | depends on CPU_SUBTYPE_SH7786 | 159 | depends on CPU_SUBTYPE_SH7786 |
160 | select SYS_SUPPORTS_PCI | 160 | select SYS_SUPPORTS_PCI |
161 | select NO_IOPORT if !PCI | 161 | select NO_IOPORT_MAP if !PCI |
162 | select ARCH_WANT_OPTIONAL_GPIOLIB | 162 | select ARCH_WANT_OPTIONAL_GPIOLIB |
163 | select HAVE_SRAM_POOL | 163 | select HAVE_SRAM_POOL |
164 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 164 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
@@ -204,7 +204,7 @@ config SH_URQUELL | |||
204 | depends on CPU_SUBTYPE_SH7786 | 204 | depends on CPU_SUBTYPE_SH7786 |
205 | select ARCH_REQUIRE_GPIOLIB | 205 | select ARCH_REQUIRE_GPIOLIB |
206 | select SYS_SUPPORTS_PCI | 206 | select SYS_SUPPORTS_PCI |
207 | select NO_IOPORT if !PCI | 207 | select NO_IOPORT_MAP if !PCI |
208 | 208 | ||
209 | config SH_MIGOR | 209 | config SH_MIGOR |
210 | bool "Migo-R" | 210 | bool "Migo-R" |
@@ -306,7 +306,7 @@ config SH_LBOX_RE2 | |||
306 | config SH_X3PROTO | 306 | config SH_X3PROTO |
307 | bool "SH-X3 Prototype board" | 307 | bool "SH-X3 Prototype board" |
308 | depends on CPU_SUBTYPE_SHX3 | 308 | depends on CPU_SUBTYPE_SHX3 |
309 | select NO_IOPORT if !PCI | 309 | select NO_IOPORT_MAP if !PCI |
310 | select IRQ_DOMAIN | 310 | select IRQ_DOMAIN |
311 | 311 | ||
312 | config SH_MAGIC_PANEL_R2 | 312 | config SH_MAGIC_PANEL_R2 |
@@ -333,7 +333,7 @@ config SH_POLARIS | |||
333 | 333 | ||
334 | config SH_SH2007 | 334 | config SH_SH2007 |
335 | bool "SH-2007 board" | 335 | bool "SH-2007 board" |
336 | select NO_IOPORT | 336 | select NO_IOPORT_MAP |
337 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | 337 | select REGULATOR_FIXED_VOLTAGE if REGULATOR |
338 | depends on CPU_SUBTYPE_SH7780 | 338 | depends on CPU_SUBTYPE_SH7780 |
339 | help | 339 | help |