Merge branch 'sh/iomap'

diff --combined arch/sh/Kconfig
index 22d25113d76aabbbea642eeb4e7a6b41a097544d,1eef24d04bbf53558704e5ee57d2f5c15f0a857b..573fca1fbd9b699d7beff90a4d162af8a01652cd
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -9,7 -9,7 +9,7 @@@ config SUPER
        def_bool y
        select EMBEDDED
        select HAVE_CLK
-       select HAVE_IDE
+       select HAVE_IDE if HAS_IOPORT
        select HAVE_LMB
        select HAVE_OPROFILE
        select HAVE_GENERIC_DMA_COHERENT
@@@ -174,6 -174,9 +174,9 @@@ config ARCH_HAS_DEFAULT_IDL
  config ARCH_HAS_CPU_IDLE_WAIT
        def_bool y
  
+ config NO_IOPORT
+       bool
+ 
  config IO_TRAPPED
        bool
  
@@@ -186,9 -189,6 +189,9 @@@ config DMA_NONCOHEREN
  config NEED_DMA_MAP_STATE
        def_bool DMA_NONCOHERENT
  
 +config NEED_SG_DMA_LENGTH
 +      def_bool y
 +
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -776,17 -776,6 +779,17 @@@ config ENTRY_OFFSE
        default "0x00010000" if PAGE_SIZE_64KB
        default "0x00000000"
  
 +config ROMIMAGE_MMCIF
 +      bool "Include MMCIF loader in romImage (EXPERIMENTAL)"
 +      depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL
 +      help
 +        Say Y here to include experimental MMCIF loading code in
 +        romImage. With this enabled it is possible to write the romImage
 +        kernel image to an MMC card and boot the kernel straight from
 +        the reset vector. At reset the processor Mask ROM will load the
 +        first part of the romImage which in turn loads the rest the kernel
 +        image to RAM using the MMCIF hardware block.
 +
  choice
        prompt "Kernel command line"
        optional