diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:31 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:33 +1100 |
commit | 518619f74df435d43ea476d5bdecbd1a5d113149 (patch) | |
tree | 992ccb3a0626fdd1ff3ae6ec1068d0b7da8335e0 /arch/sh/Kconfig | |
parent | d7eaf400f583154283e26244ee671585cd413156 (diff) | |
parent | c6294af3fa2f5b352c2de9ff1086cb236796a54c (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r-- | arch/sh/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index ec1eb2630215..834b67c4db5a 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -3,7 +3,7 @@ config SUPERH select ARCH_MIGHT_HAVE_PC_PARPORT select EXPERT select CLKDEV_LOOKUP - select HAVE_IDE if HAS_IOPORT + select HAVE_IDE if HAS_IOPORT_MAP select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select ARCH_DISCARD_MEMBLOCK @@ -139,7 +139,7 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 def_bool n -config NO_IOPORT +config NO_IOPORT_MAP def_bool !PCI depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \ !SH_HP6XX && !SH_SOLUTION_ENGINE |