From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 May 2012 16:00:40 +0000 (-0700)
Subject: Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
X-Git-Tag: v3.5-rc1~134
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=1d767cae4dbd4116fc3b2cc3251a20760f98339f;p=cascardo%2Flinux.git

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH updates from Paul Mundt:
 - New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A)
 - New boards: RSK2+SH7264, RSK2+SH7269
 - Unbreaking kgdb for SMP
 - Consolidation of _32/_64 page fault handling.
 - watchdog and legacy DMA chainsawing, part 1
 - Conversion to evt2irq() hwirq lookup, to support relocation of
   vectored IRQs for irqdomains.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (98 commits)
  sh: intc: Kill off special reservation interface.
  sh: Enable PIO API for hp6xx and se770x.
  sh: Kill off machvec IRQ hinting.
  sh: dma: More legacy cpu dma chainsawing.
  sh: Kill off MAX_DMA_ADDRESS leftovers.
  sh: Tidy up some of the cpu legacy dma header mess.
  sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.
  sh64: Fix up vmalloc fault range check.
  Revert "sh: Ensure fixmap and store queue space can co-exist."
  serial: sh-sci: Fix for port types without BRI interrupts.
  sh: legacy PCI evt2irq migration.
  sh: cpu dma evt2irq migration.
  sh: sh7763rdp evt2irq migration.
  sh: sdk7780 evt2irq migration.
  sh: migor evt2irq migration.
  sh: landisk evt2irq migration.
  sh: kfr2r09 evt2irq migration.
  sh: ecovec24 evt2irq migration.
  sh: ap325rxa evt2irq migration.
  sh: urquell evt2irq migration.
  ...
---

1d767cae4dbd4116fc3b2cc3251a20760f98339f
diff --cc arch/sh/Kconfig
index 04a8cb4700af,536e058fe8a2..3e723aaa5e18
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -153,9 -152,13 +153,10 @@@ config ARCH_NO_VIRT_TO_BU
  config ARCH_HAS_DEFAULT_IDLE
  	def_bool y
  
 -config ARCH_HAS_CPU_IDLE_WAIT
 -	def_bool y
 -
  config NO_IOPORT
  	def_bool !PCI
- 	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN
+ 	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
+ 		   !SH_HP6XX && !SH_SOLUTION_ENGINE
  
  config IO_TRAPPED
  	bool