Merge branch 'origin'

[pandora-kernel.git] / include / linux / dvb / video.h

diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h
index 1f7fa03..faebfda 100644 (file)
--- a/include/linux/dvb/video.h
+++ b/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;