diff options
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/pcm.h | 5 | ||||
| -rw-r--r-- | include/sound/tea575x-tuner.h | 2 |
2 files changed, 2 insertions, 5 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 */ |
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h index ad3c3be33c03..b82e408e758f 100644 --- a/include/sound/tea575x-tuner.h +++ b/include/sound/tea575x-tuner.h | |||
| @@ -34,9 +34,7 @@ struct snd_tea575x_ops { | |||
| 34 | struct snd_tea575x { | 34 | struct snd_tea575x { |
| 35 | snd_card_t *card; | 35 | snd_card_t *card; |
| 36 | struct video_device vd; /* video device */ | 36 | struct video_device vd; /* video device */ |
| 37 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0) | ||
| 38 | struct file_operations fops; | 37 | struct file_operations fops; |
| 39 | #endif | ||
| 40 | int dev_nr; /* requested device number + 1 */ | 38 | int dev_nr; /* requested device number + 1 */ |
| 41 | int vd_registered; /* video device is registered */ | 39 | int vd_registered; /* video device is registered */ |
| 42 | int tea5759; /* 5759 chip is present */ | 40 | int tea5759; /* 5759 chip is present */ |
