diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-12 22:29:43 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-12 22:29:43 -0600 |
| commit | bb379778f6c9c6aa4dc340c342d5e81a0b9026dd (patch) | |
| tree | 3049a3bbf0ba48fd24b62aaff07ab2925dcb3743 /linux/include | |
| parent | f9533819a70608d97d03abd7766ffc3f1e3ea655 (diff) | |
| parent | 3d611f80a1b8888b9001e1738f24194c694a8bf4 (diff) | |
| download | mediapointer-dvb-s2-bb379778f6c9c6aa4dc340c342d5e81a0b9026dd.tar.gz mediapointer-dvb-s2-bb379778f6c9c6aa4dc340c342d5e81a0b9026dd.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/dvb/video.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/linux/include/linux/dvb/video.h b/linux/include/linux/dvb/video.h index 1f7fa0351..faebfda39 100644 --- a/linux/include/linux/dvb/video.h +++ b/linux/include/linux/dvb/video.h @@ -135,7 +135,7 @@ typedef struct video_spu { typedef struct video_spu_palette { /* SPU Palette information */ int length; - uint8_t *palette; + uint8_t __user *palette; } video_spu_palette_t; diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 1b76d3e9a..2995bf836 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -592,7 +592,7 @@ struct v4l2_framebuffer struct v4l2_clip { struct v4l2_rect c; - struct v4l2_clip *next; + struct v4l2_clip __user *next; }; struct v4l2_window diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 2e5e8c25c..a5471fa67 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -111,15 +111,16 @@ #define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */ #define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */ -#define TUNER_LG_NTSC_TALN_MINI 66 +#define TUNER_LG_TALN 66 #define TUNER_PHILIPS_TD1316 67 #define TUNER_PHILIPS_TUV1236D 68 /* ATI HDTV Wonder */ #define TUNER_TNF_5335MF 69 /* Sabrent Bt848 */ #define TUNER_SAMSUNG_TCPN_2121P30A 70 /* Hauppauge PVR-500MCE NTSC */ - #define TUNER_XCEIVE_XC3028 71 +#define TUNER_THOMSON_FE6600 72 /* DViCO FusionHDTV DVB-T Hybrid */ + /* tv card specific */ #define TDA9887_PRESENT (1<<0) #define TDA9887_PORT1_INACTIVE (1<<1) |