Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.23:
  sh: Fix fs.h removal from mm.h regressions.
  sh: fix get_wchan() for SH kernels without framepointers
  sh: arch/sh/boot - fix shell usage
  rtc: rtc-sh: Correct sh_rtc_set_time() for some SH-3 parts.
  sh: remove support for sh7300 and solution engine 7300
  sh: Add sh to the CC_OPTIMIZE_FOR_SIZE dependencies.
  sh: Kill off virt_to_bus()/bus_to_virt().
  sh: sh-sci - fix SH7708 support
  sh: Restrict DSP support to specific CPUs.
  sh: Silence sq compile warning on sh4 nommu.
  sh: Kill the rest of the SE73180 cruft.
  sh: remove support for sh73180 and solution engine 73180
  sh: remove old broken pint code
  sh: Reclaim beginning of P3 space for vmalloc area.
  sh: Fix Dreamcast DMA issues.
  sh: Add kmap_coherent()/kunmap_coherent() interface for SH-4.

1 files changed, 3 insertions, 11 deletions

diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig
index 70da1c8d407e..43f3972a5fb9 100644
--- a/arch/sh/mm/Kconfig
+++ b/arch/sh/mm/Kconfig
@@ -27,6 +27,7 @@ config CPU_SH4A
 config CPU_SH4AL_DSP
         bool
         select CPU_SH4A
+        select CPU_HAS_DSP
 
 config CPU_SUBTYPE_ST40
         bool
@@ -62,15 +63,10 @@ config CPU_SUBTYPE_SH7206
 
 # SH-3 Processor Support
 
-config CPU_SUBTYPE_SH7300
-        bool "Support SH7300 processor"
-        select CPU_SH3
-
 config CPU_SUBTYPE_SH7705
         bool "Support SH7705 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
-        select CPU_HAS_PINT_IRQ
 
 config CPU_SUBTYPE_SH7706
         bool "Support SH7706 processor"
@@ -82,7 +78,6 @@ config CPU_SUBTYPE_SH7706
 config CPU_SUBTYPE_SH7707
         bool "Support SH7707 processor"
         select CPU_SH3
-        select CPU_HAS_PINT_IRQ
         help
           Select SH7707 if you have a  60 Mhz SH-3 HD6417707 CPU.
 
@@ -97,7 +92,6 @@ config CPU_SUBTYPE_SH7709
         bool "Support SH7709 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
-        select CPU_HAS_PINT_IRQ
         help
           Select SH7709 if you have a  80 Mhz SH-3 HD6417709 CPU.
 
@@ -105,6 +99,7 @@ config CPU_SUBTYPE_SH7710
         bool "Support SH7710 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
+        select CPU_HAS_DSP
         help
           Select SH7710 if you have a SH3-DSP SH7710 CPU.
 
@@ -112,6 +107,7 @@ config CPU_SUBTYPE_SH7712
         bool "Support SH7712 processor"
         select CPU_SH3
         select CPU_HAS_IPR_IRQ
+        select CPU_HAS_DSP
         help
           Select SH7712 if you have a SH3-DSP SH7712 CPU.
 
@@ -205,10 +201,6 @@ config CPU_SUBTYPE_SHX3
 
 # SH4AL-DSP Processor Support
 
-config CPU_SUBTYPE_SH73180
-        bool "Support SH73180 processor"
-        select CPU_SH4AL_DSP
-
 config CPU_SUBTYPE_SH7343
         bool "Support SH7343 processor"
         select CPU_SH4AL_DSP