diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /include/sound/pcm.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/sound/pcm.h')
| -rw-r--r-- | include/sound/pcm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 389e8ebe9c19..d6361dab0370 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h | |||
| @@ -910,11 +910,10 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format); | |||
| 910 | * Returns 1 if the given PCM format is CPU-endian, 0 if | 910 | * Returns 1 if the given PCM format is CPU-endian, 0 if |
| 911 | * opposite, or a negative error code if endian not specified. | 911 | * opposite, or a negative error code if endian not specified. |
| 912 | */ | 912 | */ |
| 913 | /* int snd_pcm_format_cpu_endian(snd_pcm_format_t format); */ | ||
| 914 | #ifdef SNDRV_LITTLE_ENDIAN | 913 | #ifdef SNDRV_LITTLE_ENDIAN |
| 915 | #define snd_pcm_format_cpu_endian snd_pcm_format_little_endian | 914 | #define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format) |
| 916 | #else | 915 | #else |
| 917 | #define snd_pcm_format_cpu_endian snd_pcm_format_big_endian | 916 | #define snd_pcm_format_cpu_endian(format) snd_pcm_format_big_endian(format) |
| 918 | #endif | 917 | #endif |
| 919 | int snd_pcm_format_width(snd_pcm_format_t format); /* in bits */ | 918 | int snd_pcm_format_width(snd_pcm_format_t format); /* in bits */ |
| 920 | int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ | 919 | int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ |