sh: dma: Make G2 DMA configurable.

Follow the PVR2 DMAC change for G2 DMA.

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

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index ae26610837b2b14839ec8bc9262b72ac1af4b8cc..f13a05285a9debead65c8a6911e5bc4cb291b7dc 100644 (file)
--- a/arch/sh/drivers/dma/Kconfig
+++ b/arch/sh/drivers/dma/Kconfig
@@ -67,4 +67,15 @@ config PVR2_DMA
 
          If in doubt, say N.
 
+config G2_DMA
+       tristate "G2 Bus DMA support"
+       depends on SH_DREAMCAST
+       select SH_DMA_API
+       help
+         This enables support for the DMA controller for the Dreamcast's
+         G2 bus. Drivers that want this will generally enable this on
+         their own.
+
+         If in doubt, say N.
+
 endmenu

diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile
index cff52cb6ac71c672324a63b07788deaab8cbfa35..c6068137b46f42aa13f8491a3a8a298a4514d01b 100644 (file)
--- a/arch/sh/drivers/dma/Makefile
+++ b/arch/sh/drivers/dma/Makefile
@@ -4,6 +4,6 @@
 
 obj-$(CONFIG_SH_DMA_API)       += dma-api.o dma-sysfs.o
 obj-$(CONFIG_SH_DMA)           += dma-sh.o
-obj-$(CONFIG_SH_DREAMCAST)     += dma-g2.o
 obj-$(CONFIG_PVR2_DMA)         += dma-pvr2.o
+obj-$(CONFIG_G2_DMA)           += dma-g2.o
 obj-$(CONFIG_SH_DMABRG)                += dmabrg.o

diff --git a/sound/sh/Kconfig b/sound/sh/Kconfig
index cfc1439858029e32956906947ecdf2755299059d..aed0f90c39190c92311e38d611e1e65af92bf412 100644 (file)
--- a/sound/sh/Kconfig
+++ b/sound/sh/Kconfig
@@ -15,6 +15,7 @@ config SND_AICA
        tristate "Dreamcast Yamaha AICA sound"
        depends on SH_DREAMCAST
        select SND_PCM
+       select G2_DMA
        help
          ALSA Sound driver for the SEGA Dreamcast console.