diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:32 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:32 -0400 |
| commit | 3c2fcf36d78d75eef46c2e39483ff8c3230ae335 (patch) | |
| tree | bfdc9aa500a97c30789742299597f689f0e55ef3 /sound/pci/Kconfig | |
| parent | 81ad969dbf8b10c3e79c5811b8328c054c21ef39 (diff) | |
| parent | 511b4c171a8054506e8898c40833e31270689b8b (diff) | |
Merge branch 'topic/hdsp' into for-linus
* topic/hdsp:
ALSA: hdsp - Add a comment about external firmwares for hdsp
ALSA: hdsp: allow firmware loading from inside the kernel
Diffstat (limited to 'sound/pci/Kconfig')
| -rw-r--r-- | sound/pci/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 3a7640feaf92..feba076b3666 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -542,6 +542,9 @@ config SND_HDSP | |||
| 542 | To compile this driver as a module, choose M here: the module | 542 | To compile this driver as a module, choose M here: the module |
| 543 | will be called snd-hdsp. | 543 | will be called snd-hdsp. |
| 544 | 544 | ||
| 545 | comment "Don't forget to add built-in firmwares for HDSP driver" | ||
| 546 | depends on SND_HDSP=y | ||
| 547 | |||
| 545 | config SND_HDSPM | 548 | config SND_HDSPM |
| 546 | tristate "RME Hammerfall DSP MADI" | 549 | tristate "RME Hammerfall DSP MADI" |
| 547 | select SND_HWDEP | 550 | select SND_HWDEP |