diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 14:50:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 14:50:26 -0500 |
| commit | 4c37a4b53de2d08c469a6e4304cf2a17178200aa (patch) | |
| tree | 6e69ca7a15b14c8acfaa61440d46655bd1060190 /include | |
| parent | d45fa563a62c908d0e9a581d4f091fed6371ebd0 (diff) | |
| parent | 8fd0bda511406ef0e9dcce9be055d7ab931e92ba (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
[media] em28xx: radio_fops should also use unlocked_ioctl
[media] wm8775: Revert changeset fcb9757333 to avoid a regression
[media] cx25840: Prevent device probe failure due to volume control ERANGE error
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/wm8775.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/media/wm8775.h b/include/media/wm8775.h index a1c4d417dfa2..60739c5a23ae 100644 --- a/include/media/wm8775.h +++ b/include/media/wm8775.h | |||
| @@ -32,7 +32,4 @@ | |||
| 32 | #define WM8775_AIN3 4 | 32 | #define WM8775_AIN3 4 |
| 33 | #define WM8775_AIN4 8 | 33 | #define WM8775_AIN4 8 |
| 34 | 34 | ||
| 35 | /* subdev group ID */ | ||
| 36 | #define WM8775_GID (1 << 0) | ||
| 37 | |||
| 38 | #endif | 35 | #endif |