Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus

[linux-2.6-omap-h63xx.git] / include / video / neomagic.h

diff --git a/include/video/neomagic.h b/include/video/neomagic.h
index 38910da0ae59f083c27312674413c73e4a32034b..08b663782956a3aa3f295acc17c7bf581173ca83 100644 (file)
--- a/include/video/neomagic.h
+++ b/include/video/neomagic.h
@@ -123,7 +123,6 @@ typedef volatile struct {
 
 struct neofb_par {
        struct vgastate state;
-       struct mutex open_lock;
        unsigned int ref_count;
 
        unsigned char MiscOutReg;       /* Misc */