diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 11:01:27 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-10-06 11:01:27 -0400 |
| commit | 907bc6c7fc7071b00083fc11e510e47dd93df45d (patch) | |
| tree | 0697a608561522c00da9e1814974a2eb051bb96d /sound/pci/Kconfig | |
| parent | d2b247a8be57647d1745535acd58169fbcbe431a (diff) | |
| parent | 2a0f5cb32772e9a9560209e241a80bfbbc31dbc3 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'sound/pci/Kconfig')
| -rw-r--r-- | sound/pci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 748f6b7d90b7..fb5ee3cc3968 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -135,11 +135,11 @@ config SND_AW2 | |||
| 135 | 135 | ||
| 136 | 136 | ||
| 137 | config SND_AZT3328 | 137 | config SND_AZT3328 |
| 138 | tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)" | 138 | tristate "Aztech AZF3328 / PCI168" |
| 139 | depends on EXPERIMENTAL | ||
| 140 | select SND_OPL3_LIB | 139 | select SND_OPL3_LIB |
| 141 | select SND_MPU401_UART | 140 | select SND_MPU401_UART |
| 142 | select SND_PCM | 141 | select SND_PCM |
| 142 | select SND_RAWMIDI | ||
| 143 | help | 143 | help |
| 144 | Say Y here to include support for Aztech AZF3328 (PCI168) | 144 | Say Y here to include support for Aztech AZF3328 (PCI168) |
| 145 | soundcards. | 145 | soundcards. |