Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / include / linux / dvb / osd.h

diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h
index 0d81439..5ccf274 100644 (file)
--- a/include/linux/dvb/osd.h
+++ b/include/linux/dvb/osd.h
@@ -101,7 +101,7 @@ typedef struct osd_cmd_s {
         int x1;
         int y1;
         int color;
-        void *data;
+        void __user *data;
 } osd_cmd_t;