diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /sound/pci/rme96.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'sound/pci/rme96.c')
-rw-r--r-- | sound/pci/rme96.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index 0e694b011dcc..6c2a9f4a7659 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -359,7 +359,7 @@ snd_rme96_capture_copy(struct snd_pcm_substream *substream, | |||
359 | } | 359 | } |
360 | 360 | ||
361 | /* | 361 | /* |
362 | * Digital output capabilites (S/PDIF) | 362 | * Digital output capabilities (S/PDIF) |
363 | */ | 363 | */ |
364 | static struct snd_pcm_hardware snd_rme96_playback_spdif_info = | 364 | static struct snd_pcm_hardware snd_rme96_playback_spdif_info = |
365 | { | 365 | { |
@@ -388,7 +388,7 @@ static struct snd_pcm_hardware snd_rme96_playback_spdif_info = | |||
388 | }; | 388 | }; |
389 | 389 | ||
390 | /* | 390 | /* |
391 | * Digital input capabilites (S/PDIF) | 391 | * Digital input capabilities (S/PDIF) |
392 | */ | 392 | */ |
393 | static struct snd_pcm_hardware snd_rme96_capture_spdif_info = | 393 | static struct snd_pcm_hardware snd_rme96_capture_spdif_info = |
394 | { | 394 | { |
@@ -417,7 +417,7 @@ static struct snd_pcm_hardware snd_rme96_capture_spdif_info = | |||
417 | }; | 417 | }; |
418 | 418 | ||
419 | /* | 419 | /* |
420 | * Digital output capabilites (ADAT) | 420 | * Digital output capabilities (ADAT) |
421 | */ | 421 | */ |
422 | static struct snd_pcm_hardware snd_rme96_playback_adat_info = | 422 | static struct snd_pcm_hardware snd_rme96_playback_adat_info = |
423 | { | 423 | { |
@@ -442,7 +442,7 @@ static struct snd_pcm_hardware snd_rme96_playback_adat_info = | |||
442 | }; | 442 | }; |
443 | 443 | ||
444 | /* | 444 | /* |
445 | * Digital input capabilites (ADAT) | 445 | * Digital input capabilities (ADAT) |
446 | */ | 446 | */ |
447 | static struct snd_pcm_hardware snd_rme96_capture_adat_info = | 447 | static struct snd_pcm_hardware snd_rme96_capture_adat_info = |
448 | { | 448 | { |