diff --git a/[refs] b/[refs] index 83fd0d4b5e6a..9e6f204ee646 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd42b1518666132c21e7348c4b599c501f0021a1 +refs/heads/master: bee14e1f8ae2d5fd3f324e0c8562f791537160b2 diff --git a/trunk/include/linux/dvb/video.h b/trunk/include/linux/dvb/video.h index b1999bfeaa56..b81e58b2ebf8 100644 --- a/trunk/include/linux/dvb/video.h +++ b/trunk/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;