diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 12:38:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 12:38:57 -0700 |
| commit | 3a3485be68c3b44dd7e3790472976fdc2467bb40 (patch) | |
| tree | d66cbd2406ee68c500c5a6b5b2c1f07e9568b0bf /include/linux | |
| parent | 80ba80a9bf25d251237694c3fcee850a73324532 (diff) | |
| parent | 0a0f2c87cd689857f2b0b82c5322650f7d9b5923 (diff) | |
| download | linux-3.10-3a3485be68c3b44dd7e3790472976fdc2467bb40.tar.gz linux-3.10-3a3485be68c3b44dd7e3790472976fdc2467bb40.tar.bz2 linux-3.10-3a3485be68c3b44dd7e3790472976fdc2467bb40.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (5939): dvb-pll: make struct dvb_pll_fcv1236d static
V4L/DVB (5933): Dvb-usb/af9005-fe.c: error check fixes
V4L/DVB (5932): Af9005 fix tuner module unload
V4L/DVB (5920): ivtv: fix incorrect fw size report.
V4L/DVB (5918): ivtv: fix TV-out VBI handling, only reset on last close.
V4L/DVB (5917): ivtv: improve mailbox responsiveness.
V4L/DVB (5916): ivtv: fix pause/continue/play handling
V4L/DVB (5900): usbvision: fix bugs [sg]_register functions
V4L/DVB (5899): bttv: Fix Viewcast Osprey 440 support
V4L/DVB (5893): DVB: fix includes of video.h when __KERNEL__ is undefined
V4L/DVB (5891): zr36067: Turn off raw capture properly
V4L/DVB (5890): zr36067: Add UYVY, RGB555X, RGB565X, and RGB32 formats
V4L/DVB (5888): zr36067: Driver was not returning correct image size
V4L/DVB (5887): zr36067: Fix poll() operation
V4L/DVB (5886): zr36067: Fix problem setting norms
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dvb/video.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index 93e4c3a6d19..50839fe9e39 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h @@ -29,6 +29,7 @@ #ifdef __KERNEL__ #include <linux/types.h> #else +#include <asm/types.h> #include <stdint.h> #include <time.h> #endif |