diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/sh/Kconfig | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'sound/sh/Kconfig')
| -rw-r--r-- | sound/sh/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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 | ||