diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:52:18 -0500 |
| commit | b05005772f34497eb2b7415a651fe785cbe70e16 (patch) | |
| tree | b176aeb7fa9baf69e77ddd83e844727490bfcf28 /include/linux/dvb/video.h | |
| parent | 044f324f6ea5d55391db62fca6a295b2651cb946 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'origin'
Conflicts:
Documentation/video4linux/CARDLIST.cx88
drivers/media/video/cx88/Kconfig
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/saa7134/saa7134-dvb.c
Resolved as in the original merge by Mauro Carvalho Chehab
Diffstat (limited to 'include/linux/dvb/video.h')
| -rw-r--r-- | include/linux/dvb/video.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index 1f7fa0351daf..faebfda397ff 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h | |||
| @@ -135,7 +135,7 @@ typedef struct video_spu { | |||
| 135 | 135 | ||
| 136 | typedef struct video_spu_palette { /* SPU Palette information */ | 136 | typedef struct video_spu_palette { /* SPU Palette information */ |
| 137 | int length; | 137 | int length; |
| 138 | uint8_t *palette; | 138 | uint8_t __user *palette; |
| 139 | } video_spu_palette_t; | 139 | } video_spu_palette_t; |
| 140 | 140 | ||
| 141 | 141 | ||