diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 12:27:20 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 12:27:20 -0500 |
| commit | c0106d72b8d71696dbe9dc80e2c77d4ac63f7531 (patch) | |
| tree | ca96d2baecb0555e36219ed6968dc8e306e530ca /include/sound | |
| parent | 5852973c129cf7c7e6c229abb7250673fc2a50c9 (diff) | |
| parent | eff317d0834ad1ff03f747f6bc2d76b9a9c95160 (diff) | |
Merge branch 'topic/asoc' into next/asoc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/tea575x-tuner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h index b6870cbaf2b3..426899e529c5 100644 --- a/include/sound/tea575x-tuner.h +++ b/include/sound/tea575x-tuner.h | |||
| @@ -36,7 +36,7 @@ struct snd_tea575x_ops { | |||
| 36 | struct snd_tea575x { | 36 | struct snd_tea575x { |
| 37 | struct snd_card *card; | 37 | struct snd_card *card; |
| 38 | struct video_device vd; /* video device */ | 38 | struct video_device vd; /* video device */ |
| 39 | struct file_operations fops; | 39 | struct v4l2_file_operations fops; |
| 40 | int dev_nr; /* requested device number + 1 */ | 40 | int dev_nr; /* requested device number + 1 */ |
| 41 | int vd_registered; /* video device is registered */ | 41 | int vd_registered; /* video device is registered */ |
| 42 | int tea5759; /* 5759 chip is present */ | 42 | int tea5759; /* 5759 chip is present */ |