diff options
| author | Richard Weinberger <richard@nod.at> | 2014-08-06 19:03:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:12 -0400 |
| commit | 455f9726244cb5de2b6a99f540743ba155633cc8 (patch) | |
| tree | 4d33b041419b93a477e712d86381b2eaeaf21743 /arch/sh | |
| parent | 8cdea0602c0df194dc52af0bb47bd8791db681f7 (diff) | |
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".
[pebolle@tiscali.nl: re-added dropped ||]
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/drivers/dma/Kconfig | 5 | ||||
| -rw-r--r-- | arch/sh/include/cpu-sh4/cpu/dma-register.h | 1 | ||||
| -rw-r--r-- | arch/sh/include/cpu-sh4a/cpu/dma.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig index cfd5b90a8628..78bc97b1d027 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/arch/sh/drivers/dma/Kconfig | |||
| @@ -12,9 +12,8 @@ config SH_DMA_IRQ_MULTI | |||
| 12 | default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ | 12 | default y if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || \ |
| 13 | CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \ | 13 | CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7750R || \ |
| 14 | CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091 || \ | 14 | CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7091 || \ |
| 15 | CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7764 || \ | 15 | CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7780 || \ |
| 16 | CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || \ | 16 | CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7760 |
| 17 | CPU_SUBTYPE_SH7760 | ||
| 18 | 17 | ||
| 19 | config SH_DMA_API | 18 | config SH_DMA_API |
| 20 | depends on SH_DMA | 19 | 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 02788b6a03b7..9cd81e54056a 100644 --- a/arch/sh/include/cpu-sh4/cpu/dma-register.h +++ b/arch/sh/include/cpu-sh4/cpu/dma-register.h | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #define CHCR_TS_HIGH_SHIFT (20 - 2) /* 2 bits for shifted low TS */ | 32 | #define CHCR_TS_HIGH_SHIFT (20 - 2) /* 2 bits for shifted low TS */ |
| 33 | #elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \ | 33 | #elif defined(CONFIG_CPU_SUBTYPE_SH7757) || \ |
| 34 | defined(CONFIG_CPU_SUBTYPE_SH7763) || \ | 34 | defined(CONFIG_CPU_SUBTYPE_SH7763) || \ |
| 35 | defined(CONFIG_CPU_SUBTYPE_SH7764) || \ | ||
| 36 | defined(CONFIG_CPU_SUBTYPE_SH7780) || \ | 35 | defined(CONFIG_CPU_SUBTYPE_SH7780) || \ |
| 37 | defined(CONFIG_CPU_SUBTYPE_SH7785) | 36 | defined(CONFIG_CPU_SUBTYPE_SH7785) |
| 38 | #define CHCR_TS_LOW_MASK 0x00000018 | 37 | #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 89afb650ce25..8ceccceae844 100644 --- a/arch/sh/include/cpu-sh4a/cpu/dma.h +++ b/arch/sh/include/cpu-sh4a/cpu/dma.h | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | #define DMTE4_IRQ evt2irq(0xb80) | 14 | #define DMTE4_IRQ evt2irq(0xb80) |
| 15 | #define DMAE0_IRQ evt2irq(0xbc0) /* DMA Error IRQ*/ | 15 | #define DMAE0_IRQ evt2irq(0xbc0) /* DMA Error IRQ*/ |
| 16 | #define SH_DMAC_BASE0 0xFE008020 | 16 | #define SH_DMAC_BASE0 0xFE008020 |
| 17 | #elif defined(CONFIG_CPU_SUBTYPE_SH7763) || \ | 17 | #elif defined(CONFIG_CPU_SUBTYPE_SH7763) |
| 18 | defined(CONFIG_CPU_SUBTYPE_SH7764) | ||
| 19 | #define DMTE0_IRQ evt2irq(0x640) | 18 | #define DMTE0_IRQ evt2irq(0x640) |
| 20 | #define DMTE4_IRQ evt2irq(0x780) | 19 | #define DMTE4_IRQ evt2irq(0x780) |
| 21 | #define DMAE0_IRQ evt2irq(0x6c0) | 20 | #define DMAE0_IRQ evt2irq(0x6c0) |