diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 21:14:47 -0400 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/sound/tea575x-tuner.h | |
| parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
| parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
Manual merge with Linus
Diffstat (limited to 'include/sound/tea575x-tuner.h')
| -rw-r--r-- | include/sound/tea575x-tuner.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 */ |