diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 03:32:12 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 03:32:12 -0400 |
commit | 019e2574f965b800ba76f319d817eae9405ae064 (patch) | |
tree | fbcf7ade183a8dd4a6c55a2596cf5cf47bbb76d4 /arch/sh/boards | |
parent | 4705b2e8047221142af2ed5e37f54ac4c7f80a7d (diff) | |
parent | 861160bfd097de7dbf3195bbef210e4f787327ab (diff) |
Merge branch 'sh/iomap'
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index 938e87d51482..07b35ca2f644 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig | |||
@@ -154,6 +154,7 @@ config SH_SDK7786 | |||
154 | bool "SDK7786" | 154 | bool "SDK7786" |
155 | depends on CPU_SUBTYPE_SH7786 | 155 | depends on CPU_SUBTYPE_SH7786 |
156 | select SYS_SUPPORTS_PCI | 156 | select SYS_SUPPORTS_PCI |
157 | select NO_IOPORT if !PCI | ||
157 | help | 158 | help |
158 | Select SDK7786 if configuring for a Renesas Technology Europe | 159 | Select SDK7786 if configuring for a Renesas Technology Europe |
159 | SH7786-65nm board. | 160 | SH7786-65nm board. |
@@ -190,6 +191,7 @@ config SH_URQUELL | |||
190 | depends on CPU_SUBTYPE_SH7786 | 191 | depends on CPU_SUBTYPE_SH7786 |
191 | select ARCH_REQUIRE_GPIOLIB | 192 | select ARCH_REQUIRE_GPIOLIB |
192 | select SYS_SUPPORTS_PCI | 193 | select SYS_SUPPORTS_PCI |
194 | select NO_IOPORT if !PCI | ||
193 | 195 | ||
194 | config SH_MIGOR | 196 | config SH_MIGOR |
195 | bool "Migo-R" | 197 | bool "Migo-R" |
@@ -286,6 +288,7 @@ config SH_LBOX_RE2 | |||
286 | config SH_X3PROTO | 288 | config SH_X3PROTO |
287 | bool "SH-X3 Prototype board" | 289 | bool "SH-X3 Prototype board" |
288 | depends on CPU_SUBTYPE_SHX3 | 290 | depends on CPU_SUBTYPE_SHX3 |
291 | select NO_IOPORT if !PCI | ||
289 | 292 | ||
290 | config SH_MAGIC_PANEL_R2 | 293 | config SH_MAGIC_PANEL_R2 |
291 | bool "Magic Panel R2" | 294 | bool "Magic Panel R2" |