diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-29 13:06:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-29 13:06:41 -0500 |
| commit | 4945b8a553ec735f416596cbf5789c439d16fb38 (patch) | |
| tree | c159093b9d7ae9395dcca30ebda0e8dc8284e4a6 /include | |
| parent | 6c722e90d7ede7db2d2b28a3cc69a8545db67ea1 (diff) | |
| parent | 69f7e75a9d45e5eaca16917a8d0dedf76149f13f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging
V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&"
V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1
V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch
V4L/DVB (4997): Bttv: delete duplicated ioremap()
V4L/DVB (4996): Msp3400: fix kthread_run error check
V4L/DVB (4995): Vivi: fix kthread_run() error check
V4L/DVB (4994): Vivi: fix use after free in list_for_each()
V4L/DVB (4992): Fix typo in saa7134-dvb.c
V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference
V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak
V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8
V4L/DVB (4984): LOG_STATUS should show the real temporal filter value.
V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting.
V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400.
V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working
V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected
V4L/DVB (4973): Dvb-core: fix printk type warning
V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems
V4L/DVB (4970): Usbvision memory fixes
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/cx2341x.h | 2 | ||||
| -rw-r--r-- | include/media/ir-common.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h index d91d88f93c8b..ecad55bf0162 100644 --- a/include/media/cx2341x.h +++ b/include/media/cx2341x.h | |||
| @@ -49,7 +49,7 @@ struct cx2341x_mpeg_params { | |||
| 49 | enum v4l2_mpeg_audio_mode_extension audio_mode_extension; | 49 | enum v4l2_mpeg_audio_mode_extension audio_mode_extension; |
| 50 | enum v4l2_mpeg_audio_emphasis audio_emphasis; | 50 | enum v4l2_mpeg_audio_emphasis audio_emphasis; |
| 51 | enum v4l2_mpeg_audio_crc audio_crc; | 51 | enum v4l2_mpeg_audio_crc audio_crc; |
| 52 | u8 audio_properties; | 52 | u16 audio_properties; |
| 53 | 53 | ||
| 54 | /* video */ | 54 | /* video */ |
| 55 | enum v4l2_mpeg_video_encoding video_encoding; | 55 | enum v4l2_mpeg_video_encoding video_encoding; |
diff --git a/include/media/ir-common.h b/include/media/ir-common.h index 2b25f5c95006..4bb0ad810179 100644 --- a/include/media/ir-common.h +++ b/include/media/ir-common.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #define _IR_COMMON | 24 | #define _IR_COMMON |
| 25 | 25 | ||
| 26 | #include <linux/input.h> | 26 | #include <linux/input.h> |
| 27 | #include <linux/workqueue.h> | ||
| 27 | 28 | ||
| 28 | #define IR_TYPE_RC5 1 | 29 | #define IR_TYPE_RC5 1 |
| 29 | #define IR_TYPE_PD 2 /* Pulse distance encoded IR */ | 30 | #define IR_TYPE_PD 2 /* Pulse distance encoded IR */ |