diff options
-rw-r--r-- | arch/sh/drivers/dma/Kconfig | 11 | ||||
-rw-r--r-- | arch/sh/drivers/dma/Makefile | 2 | ||||
-rw-r--r-- | 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 ae26610837b2..f13a05285a9d 100644 --- a/arch/sh/drivers/dma/Kconfig +++ b/arch/sh/drivers/dma/Kconfig | |||
@@ -67,4 +67,15 @@ config PVR2_DMA | |||
67 | 67 | ||
68 | If in doubt, say N. | 68 | If in doubt, say N. |
69 | 69 | ||
70 | config G2_DMA | ||
71 | tristate "G2 Bus DMA support" | ||
72 | depends on SH_DREAMCAST | ||
73 | select SH_DMA_API | ||
74 | help | ||
75 | This enables support for the DMA controller for the Dreamcast's | ||
76 | G2 bus. Drivers that want this will generally enable this on | ||
77 | their own. | ||
78 | |||
79 | If in doubt, say N. | ||
80 | |||
70 | endmenu | 81 | endmenu |
diff --git a/arch/sh/drivers/dma/Makefile b/arch/sh/drivers/dma/Makefile index cff52cb6ac71..c6068137b46f 100644 --- a/arch/sh/drivers/dma/Makefile +++ b/arch/sh/drivers/dma/Makefile | |||
@@ -4,6 +4,6 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_SH_DMA_API) += dma-api.o dma-sysfs.o | 5 | obj-$(CONFIG_SH_DMA_API) += dma-api.o dma-sysfs.o |
6 | obj-$(CONFIG_SH_DMA) += dma-sh.o | 6 | obj-$(CONFIG_SH_DMA) += dma-sh.o |
7 | obj-$(CONFIG_SH_DREAMCAST) += dma-g2.o | ||
8 | obj-$(CONFIG_PVR2_DMA) += dma-pvr2.o | 7 | obj-$(CONFIG_PVR2_DMA) += dma-pvr2.o |
8 | obj-$(CONFIG_G2_DMA) += dma-g2.o | ||
9 | obj-$(CONFIG_SH_DMABRG) += dmabrg.o | 9 | obj-$(CONFIG_SH_DMABRG) += dmabrg.o |
diff --git a/sound/sh/Kconfig b/sound/sh/Kconfig index cfc143985802..aed0f90c3919 100644 --- a/sound/sh/Kconfig +++ b/sound/sh/Kconfig | |||
@@ -15,6 +15,7 @@ config SND_AICA | |||
15 | tristate "Dreamcast Yamaha AICA sound" | 15 | tristate "Dreamcast Yamaha AICA sound" |
16 | depends on SH_DREAMCAST | 16 | depends on SH_DREAMCAST |
17 | select SND_PCM | 17 | select SND_PCM |
18 | select G2_DMA | ||
18 | help | 19 | help |
19 | ALSA Sound driver for the SEGA Dreamcast console. | 20 | ALSA Sound driver for the SEGA Dreamcast console. |
20 | 21 | ||