diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:32 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:32 +0200 |
| commit | 3c2fcf36d78d75eef46c2e39483ff8c3230ae335 (patch) | |
| tree | bfdc9aa500a97c30789742299597f689f0e55ef3 /sound/pci | |
| parent | 81ad969dbf8b10c3e79c5811b8328c054c21ef39 (diff) | |
| parent | 511b4c171a8054506e8898c40833e31270689b8b (diff) | |
| download | linux-3.10-3c2fcf36d78d75eef46c2e39483ff8c3230ae335.tar.gz linux-3.10-3c2fcf36d78d75eef46c2e39483ff8c3230ae335.tar.bz2 linux-3.10-3c2fcf36d78d75eef46c2e39483ff8c3230ae335.zip | |
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')
| -rw-r--r-- | sound/pci/Kconfig | 3 | ||||
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 3a7640feaf9..feba076b366 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -542,6 +542,9 @@ config SND_HDSP To compile this driver as a module, choose M here: the module will be called snd-hdsp. +comment "Don't forget to add built-in firmwares for HDSP driver" + depends on SND_HDSP=y + config SND_HDSPM tristate "RME Hammerfall DSP MADI" select SND_HWDEP diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index bcfdbb5ebc4..3da5c029f93 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -403,9 +403,9 @@ MODULE_FIRMWARE("digiface_firmware_rev11.bin"); #define HDSP_DMA_AREA_BYTES ((HDSP_MAX_CHANNELS+1) * HDSP_CHANNEL_BUFFER_BYTES) #define HDSP_DMA_AREA_KILOBYTES (HDSP_DMA_AREA_BYTES/1024) -/* use hotplug firmeare loader? */ +/* use hotplug firmware loader? */ #if defined(CONFIG_FW_LOADER) || defined(CONFIG_FW_LOADER_MODULE) -#if !defined(HDSP_USE_HWDEP_LOADER) && !defined(CONFIG_SND_HDSP) +#if !defined(HDSP_USE_HWDEP_LOADER) #define HDSP_FW_LOADER #endif #endif |