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/rme32.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'sound/pci/rme32.c')
-rw-r--r-- | sound/pci/rme32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index 0cbef5fe6c63..ab78544bf042 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c | |||
@@ -313,7 +313,7 @@ static int snd_rme32_capture_copy(struct snd_pcm_substream *substream, int chann | |||
313 | } | 313 | } |
314 | 314 | ||
315 | /* | 315 | /* |
316 | * SPDIF I/O capabilites (half-duplex mode) | 316 | * SPDIF I/O capabilities (half-duplex mode) |
317 | */ | 317 | */ |
318 | static struct snd_pcm_hardware snd_rme32_spdif_info = { | 318 | static struct snd_pcm_hardware snd_rme32_spdif_info = { |
319 | .info = (SNDRV_PCM_INFO_MMAP_IOMEM | | 319 | .info = (SNDRV_PCM_INFO_MMAP_IOMEM | |
@@ -339,7 +339,7 @@ static struct snd_pcm_hardware snd_rme32_spdif_info = { | |||
339 | }; | 339 | }; |
340 | 340 | ||
341 | /* | 341 | /* |
342 | * ADAT I/O capabilites (half-duplex mode) | 342 | * ADAT I/O capabilities (half-duplex mode) |
343 | */ | 343 | */ |
344 | static struct snd_pcm_hardware snd_rme32_adat_info = | 344 | static struct snd_pcm_hardware snd_rme32_adat_info = |
345 | { | 345 | { |
@@ -364,7 +364,7 @@ static struct snd_pcm_hardware snd_rme32_adat_info = | |||
364 | }; | 364 | }; |
365 | 365 | ||
366 | /* | 366 | /* |
367 | * SPDIF I/O capabilites (full-duplex mode) | 367 | * SPDIF I/O capabilities (full-duplex mode) |
368 | */ | 368 | */ |
369 | static struct snd_pcm_hardware snd_rme32_spdif_fd_info = { | 369 | static struct snd_pcm_hardware snd_rme32_spdif_fd_info = { |
370 | .info = (SNDRV_PCM_INFO_MMAP | | 370 | .info = (SNDRV_PCM_INFO_MMAP | |
@@ -390,7 +390,7 @@ static struct snd_pcm_hardware snd_rme32_spdif_fd_info = { | |||
390 | }; | 390 | }; |
391 | 391 | ||
392 | /* | 392 | /* |
393 | * ADAT I/O capabilites (full-duplex mode) | 393 | * ADAT I/O capabilities (full-duplex mode) |
394 | */ | 394 | */ |
395 | static struct snd_pcm_hardware snd_rme32_adat_fd_info = | 395 | static struct snd_pcm_hardware snd_rme32_adat_fd_info = |
396 | { | 396 | { |