sh: dma: Make G2 DMA configurable.

Follow the PVR2 DMAC change for G2 DMA. Signed-off-by: Paul Mundt <[email protected]>
zandrey · Mar 17, 2009 · 40f49e7 · 40f49e7
1 parent da62e71
commit 40f49e7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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.