Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / include / linux / fb.h

diff --git a/include/linux/fb.h b/include/linux/fb.h
index dd68358996b716da2b1be8e1ab9069b282ab9902..f847df9e99b6f4fcd44991e757c1d5b7ca50681a 100644 (file)
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -819,6 +819,7 @@ struct fb_info {
        int node;
        int flags;
        struct mutex lock;              /* Lock for open/release/ioctl funcs */
+       struct mutex mm_lock;           /* Lock for fb_mmap and smem_* fields */
        struct fb_var_screeninfo var;   /* Current var */
        struct fb_fix_screeninfo fix;   /* Current fix */
        struct fb_monspecs monspecs;    /* Current Monitor specs */