Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / arch / sh / drivers / dma / Kconfig

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index f13a05285a9debead65c8a6911e5bc4cb291b7dc..666713ac5fcff14b8f0ba667dba73482e282825a 100644 (file)
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -12,21 +12,25 @@ config SH_DMA
 config SH_DMA_IRQ_MULTI
        bool
        depends on SH_DMA
-       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
+       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
 
 config NR_ONCHIP_DMA_CHANNELS
        int
        depends on SH_DMA
-       default "4" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7750S
-       default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || CPU_SUBTYPE_SH7760
-       default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
+       default "4" if CPU_SUBTYPE_SH7750  || CPU_SUBTYPE_SH7751  || \
+                      CPU_SUBTYPE_SH7750S || CPU_SUBTYPE_SH7091
+       default "8" if CPU_SUBTYPE_SH7750R || CPU_SUBTYPE_SH7751R || \
+                      CPU_SUBTYPE_SH7760
+       default "12" if CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7780  || \
+                       CPU_SUBTYPE_SH7785
        default "6"
        help
          This allows you to specify the number of channels that the on-chip
-         DMAC supports. This will be 4 for SH7750/SH7751 and 8 for the
+         DMAC supports. This will be 4 for SH7091/SH7750/SH7751 and 8 for the
          SH7750R/SH7751R.
 
 config NR_DMA_CHANNELS_BOOL