sh: remove CPU_SUBTYPE_SH7764

The symbol is an orphan, get rid of it.

Submitted by Richard a few months ago as "[PATCH 21/28] Remove
CPU_SUBTYPE_SH7764".

[[email protected]: re-added dropped ||]
Signed-off-by: Richard Weinberger <[email protected]>
Signed-off-by: Paul Bolle <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index cfd5b90a862820c5a55cf69e2f9612ed1ba765b5..78bc97b1d0270d8e5aabe0e22d49d58041e68abd 100644 (file)
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,9 +12,8 @@ config SH_DMA_IRQ_MULTI
        default y if CPU_SUBTYPE_SH7750  || CPU_SUBTYPE_SH7751  || \
                     CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \
                     CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091  || \
-                    CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7764  || \
-                    CPU_SUBTYPE_SH7780  || CPU_SUBTYPE_SH7785  || \
-                    CPU_SUBTYPE_SH7760
+                    CPU_SUBTYPE_SH7763  || CPU_SUBTYPE_SH7780  || \
+                    CPU_SUBTYPE_SH7785  || CPU_SUBTYPE_SH7760
 
 config SH_DMA_API
        depends on SH_DMA

diff --git a/arch/sh/include/cpu-sh4/cpu/dma-register.h b/arch/sh/include/cpu-sh4/cpu/dma-register.h
index 02788b6a03b7c9654711b9010ec6cedc1a5edc65..9cd81e54056ac477f1a8091dafd5b736605f7578 100644 (file)
--- a/arch/sh/include/cpu-sh4/cpu/dma-register.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h
@@ -32,7 +32,6 @@
 #define CHCR_TS_HIGH_SHIFT     (20 - 2)        /* 2 bits for shifted low TS */
 #elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \
        defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-       defined(CONFIG_CPU_SUBTYPE_SH7764) || \
        defined(CONFIG_CPU_SUBTYPE_SH7780) || \
        defined(CONFIG_CPU_SUBTYPE_SH7785)
 #define CHCR_TS_LOW_MASK       0x00000018

diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h
index 89afb650ce2524b94fa292fbea1bd59b17f6fb22..8ceccceae84419d3a3733128d13e7321a4908266 100644 (file)
--- a/arch/sh/include/cpu-sh4a/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -14,8 +14,7 @@
 #define DMTE4_IRQ      evt2irq(0xb80)
 #define DMAE0_IRQ      evt2irq(0xbc0)  /* DMA Error IRQ*/
 #define SH_DMAC_BASE0  0xFE008020
-#elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \
-       defined(CONFIG_CPU_SUBTYPE_SH7764)
+#elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 #define DMTE0_IRQ      evt2irq(0x640)
 #define DMTE4_IRQ      evt2irq(0x780)
 #define DMAE0_IRQ      evt2irq(0x6c0)