diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 16:24:37 -0500 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /include/media/cx25840.h | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'include/media/cx25840.h')
| -rw-r--r-- | include/media/cx25840.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/cx25840.h b/include/media/cx25840.h index 46d1a141208e..783c5bdd63eb 100644 --- a/include/media/cx25840.h +++ b/include/media/cx25840.h | |||
| @@ -85,6 +85,7 @@ enum cx25840_video_input { | |||
| 85 | CX25840_NONE1_CH3 = 0x800000c0, | 85 | CX25840_NONE1_CH3 = 0x800000c0, |
| 86 | CX25840_SVIDEO_ON = 0x80000100, | 86 | CX25840_SVIDEO_ON = 0x80000100, |
| 87 | CX25840_COMPONENT_ON = 0x80000200, | 87 | CX25840_COMPONENT_ON = 0x80000200, |
| 88 | CX25840_DIF_ON = 0x80000400, | ||
| 88 | }; | 89 | }; |
| 89 | 90 | ||
| 90 | enum cx25840_audio_input { | 91 | enum cx25840_audio_input { |