Home » Mailing list archives » git-commits-head » 2009 » March » 26

sh: dma: Make G2 DMA configurable.

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Linux Kernel Mailing List
Subject: sh: dma: Make G2 DMA configurable.
Date: Thursday, March 26, 2009 - 12:23 pm

Gitweb:     http://git.kernel.org/linus/40f49e7ed77f1b753a7243c0137e4767a50ea8bd
Commit:     40f49e7ed77f1b753a7243c0137e4767a50ea8bd
Parent:     da62e71d13ad0b76011491e36cb58999c464516a
Author:     Paul Mundt <lethal@linux-sh.org>
AuthorDate: Tue Mar 17 12:47:56 2009 +0900
Committer:  Paul Mundt <lethal@linux-sh.org>
CommitDate: Tue Mar 17 12:47:56 2009 +0900

    sh: dma: Make G2 DMA configurable.
    
    Follow the PVR2 DMAC change for G2 DMA.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---
 arch/sh/drivers/dma/Kconfig  |   11 +++++++++++
 arch/sh/drivers/dma/Makefile |    2 +-
 sound/sh/Kconfig             |    1 +
 3 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/arch/sh/drivers/dma/Kconfig b/arch/sh/drivers/dma/Kconfig
index ae26610..f13a052 100644
--- 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 cff52cb..c606813 100644
--- 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 cfc1439..aed0f90 100644
--- 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.
 
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
sh: dma: Make G2 DMA configurable., Linux Kernel Mailing ..., (Thu Mar 26, 12:23 pm)