diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:47:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:47:44 -0400 |
commit | 8762541f067d371320731510669e27f5cc40af38 (patch) | |
tree | fa2890094858614a947ba70612854acde9888940 /include/sound | |
parent | 6dbb35b0a74b44b2a48a5373d48074c5aa69fdf5 (diff) | |
parent | adfe1560de1c696324554fba70c92f2d7c947ff7 (diff) |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull second set of media updates from Mauro Carvalho Chehab:
- radio API: add support to work with radio frequency bands
- new AM/FM radio drivers: radio-shark, radio-shark2
- new Remote Controller USB driver: iguanair
- conversion of several drivers to the v4l2 core control framework
- new board additions at existing drivers
- the remaining (and vast majority of the patches) are due to
drivers/DocBook fixes/cleanups.
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (154 commits)
[media] radio-tea5777: use library for 64bits div
[media] tlg2300: Declare MODULE_FIRMWARE usage
[media] lgs8gxx: Declare MODULE_FIRMWARE usage
[media] xc5000: Add MODULE_FIRMWARE statements
[media] s2255drv: Add MODULE_FIRMWARE statement
[media] dib8000: move dereference after check for NULL
[media] Documentation: Update cardlists
[media] bttv: add support for Aposonic W-DVR
[media] cx25821: Remove bad strcpy to read-only char*
[media] pms.c: remove duplicated include
[media] smiapp-core.c: remove duplicated include
[media] via-camera: pass correct format settings to sensor
[media] rtl2832.c: minor cleanup
[media] Add support for the IguanaWorks USB IR Transceiver
[media] Minor cleanups for MCE USB
[media] drivers/media/dvb/siano/smscoreapi.c: use list_for_each_entry
[media] Use a named union in struct v4l2_ioctl_info
[media] mceusb: Add Twisted Melon USB IDs
[media] staging/media/solo6x10: use module_pci_driver macro
[media] staging/media/dt3155v4l: use module_pci_driver macro
...
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/tea575x-tuner.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h index 0c3c2fb0f93..fe8590cac5c 100644 --- a/include/sound/tea575x-tuner.h +++ b/include/sound/tea575x-tuner.h | |||
@@ -37,6 +37,10 @@ | |||
37 | struct snd_tea575x; | 37 | struct snd_tea575x; |
38 | 38 | ||
39 | struct snd_tea575x_ops { | 39 | struct snd_tea575x_ops { |
40 | /* Drivers using snd_tea575x must either define read_ and write_val */ | ||
41 | void (*write_val)(struct snd_tea575x *tea, u32 val); | ||
42 | u32 (*read_val)(struct snd_tea575x *tea); | ||
43 | /* Or define the 3 pin functions */ | ||
40 | void (*set_pins)(struct snd_tea575x *tea, u8 pins); | 44 | void (*set_pins)(struct snd_tea575x *tea, u8 pins); |
41 | u8 (*get_pins)(struct snd_tea575x *tea); | 45 | u8 (*get_pins)(struct snd_tea575x *tea); |
42 | void (*set_direction)(struct snd_tea575x *tea, bool output); | 46 | void (*set_direction)(struct snd_tea575x *tea, bool output); |
@@ -49,6 +53,7 @@ struct snd_tea575x { | |||
49 | int radio_nr; /* radio_nr */ | 53 | int radio_nr; /* radio_nr */ |
50 | bool tea5759; /* 5759 chip is present */ | 54 | bool tea5759; /* 5759 chip is present */ |
51 | bool cannot_read_data; /* Device cannot read the data pin */ | 55 | bool cannot_read_data; /* Device cannot read the data pin */ |
56 | bool cannot_mute; /* Device cannot mute */ | ||
52 | bool mute; /* Device is muted? */ | 57 | bool mute; /* Device is muted? */ |
53 | bool stereo; /* receiving stereo */ | 58 | bool stereo; /* receiving stereo */ |
54 | bool tuned; /* tuned to a station */ | 59 | bool tuned; /* tuned to a station */ |