diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:06:58 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:06:58 -0400 |
commit | 5d7ee52f1c3dbe0e06d9bfad4912562fd1b6eb03 (patch) | |
tree | a7c9171b0c8a0cecbd54c0349673574d13bac9d9 /sound | |
parent | dea6a9d306f75004c202a843e5a578e595e56c09 (diff) | |
parent | 3f68165e234233255a789c827c5d3d6fa965ddce (diff) |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: indigo-express: add missing 64KHz flags
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/echoaudio/indigodjx.c | 1 | ||||
-rw-r--r-- | sound/pci/echoaudio/indigoiox.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c index 3482ef69f491..2e44316530a2 100644 --- a/sound/pci/echoaudio/indigodjx.c +++ b/sound/pci/echoaudio/indigodjx.c | |||
@@ -88,6 +88,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = { | |||
88 | .rates = SNDRV_PCM_RATE_32000 | | 88 | .rates = SNDRV_PCM_RATE_32000 | |
89 | SNDRV_PCM_RATE_44100 | | 89 | SNDRV_PCM_RATE_44100 | |
90 | SNDRV_PCM_RATE_48000 | | 90 | SNDRV_PCM_RATE_48000 | |
91 | SNDRV_PCM_RATE_64000 | | ||
91 | SNDRV_PCM_RATE_88200 | | 92 | SNDRV_PCM_RATE_88200 | |
92 | SNDRV_PCM_RATE_96000, | 93 | SNDRV_PCM_RATE_96000, |
93 | .rate_min = 32000, | 94 | .rate_min = 32000, |
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c index aebee27a40ff..eb3819f9654a 100644 --- a/sound/pci/echoaudio/indigoiox.c +++ b/sound/pci/echoaudio/indigoiox.c | |||
@@ -89,6 +89,7 @@ static struct snd_pcm_hardware pcm_hardware_skel = { | |||
89 | .rates = SNDRV_PCM_RATE_32000 | | 89 | .rates = SNDRV_PCM_RATE_32000 | |
90 | SNDRV_PCM_RATE_44100 | | 90 | SNDRV_PCM_RATE_44100 | |
91 | SNDRV_PCM_RATE_48000 | | 91 | SNDRV_PCM_RATE_48000 | |
92 | SNDRV_PCM_RATE_64000 | | ||
92 | SNDRV_PCM_RATE_88200 | | 93 | SNDRV_PCM_RATE_88200 | |
93 | SNDRV_PCM_RATE_96000, | 94 | SNDRV_PCM_RATE_96000, |
94 | .rate_min = 32000, | 95 | .rate_min = 32000, |