diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-10 12:13:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-10 12:13:37 -0500 |
| commit | 3ad4f597058301c97f362e500a32f63f5c950a45 (patch) | |
| tree | db292345240916f4160d5bb8300473d21f786e82 /sound/isa/Kconfig | |
| parent | 8a8bc22332ee6ea49137508467a76aa7f4367719 (diff) | |
| parent | 6b425660f45cdea177fe95388e081afa947b1506 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop
ALSA: gusextreme: Fix build errors
ALSA: hdsp: check for iobox and upload firmware during ioctl
ALSA: HDSP: check for io box before uploading firmware
ALSA: hda - Add another HP model (6730s) for AD1884A
alsa: fix snd_BUG_on() and friends
ALSA: hda - Add a quirk for MEDION MD96630
ALSA: hda - Limit the number of GPIOs show in proc
Diffstat (limited to 'sound/isa/Kconfig')
| -rw-r--r-- | sound/isa/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 660beb41f767..ce0aa044e274 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
| @@ -211,7 +211,7 @@ config SND_GUSCLASSIC | |||
| 211 | 211 | ||
| 212 | config SND_GUSEXTREME | 212 | config SND_GUSEXTREME |
| 213 | tristate "Gravis UltraSound Extreme" | 213 | tristate "Gravis UltraSound Extreme" |
| 214 | select SND_HWDEP | 214 | select SND_OPL3_LIB |
| 215 | select SND_MPU401_UART | 215 | select SND_MPU401_UART |
| 216 | select SND_PCM | 216 | select SND_PCM |
| 217 | help | 217 | help |