sh: Kill off MAX_DMA_ADDRESS leftovers.

We don't support the ISA DMA API, so this is only ever misused. The
dma-sh case inadvertently broke the dreamcast case by testing the wrong
variable for the total number of channels, so this fixes that up too.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2 files changed, 1 insertions, 18 deletions

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index 4d58eb0973d4..cfd5b90a8628 100644
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -40,23 +40,6 @@ config NR_ONCHIP_DMA_CHANNELS
           DMAC supports. This will be 4 for SH7750/SH7751/Sh7750S/SH7091 and 8 for the
           SH7750R/SH7751R/SH7760, 12 for the SH7723/SH7780/SH7785/SH7724, default is 6.
 
-config NR_DMA_CHANNELS_BOOL
-        depends on SH_DMA
-        bool "Override default number of maximum DMA channels"
-        help
-          This allows you to forcibly update the maximum number of supported
-          DMA channels for a given board. If this is unset, this will default
-          to the number of channels that the on-chip DMAC has.
-
-config NR_DMA_CHANNELS
-        int "Maximum number of DMA channels"
-        depends on SH_DMA && NR_DMA_CHANNELS_BOOL
-        default NR_ONCHIP_DMA_CHANNELS
-        help
-          This allows you to specify the maximum number of DMA channels to
-          support. Setting this to a higher value allows for cascading DMACs
-          with additional channels.
-
 config SH_DMABRG
         bool "SH7760 DMABRG support"
         depends on CPU_SUBTYPE_SH7760
diff --git a/arch/sh/drivers/dma/dma-sysfs.c b/arch/sh/drivers/dma/dma-sysfs.c
index 67ee95603813..4b15feda54b0 100644
--- a/arch/sh/drivers/dma/dma-sysfs.c
+++ b/arch/sh/drivers/dma/dma-sysfs.c
@@ -29,7 +29,7 @@ static ssize_t dma_show_devices(struct device *dev,
         ssize_t len = 0;
         int i;
 
-        for (i = 0; i < MAX_DMA_CHANNELS; i++) {
+        for (i = 0; i < 16; i++) {
                 struct dma_info *info = get_dma_info(i);
                 struct dma_channel *channel = get_dma_channel(i);