Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / video / riva / rivafb.h

diff --git a/drivers/video/riva/rivafb.h b/drivers/video/riva/rivafb.h
index 7fa13fc9c4135837fdef1a7b94e18ef41a2a71ac..d9f107b704c6296feb52ee2ea83aa2aa11a1b9a4 100644 (file)
--- a/drivers/video/riva/rivafb.h
+++ b/drivers/video/riva/rivafb.h
@@ -4,7 +4,6 @@
 #include <linux/fb.h>
 #include <video/vga.h>
 #include <linux/i2c.h>
-#include <linux/i2c-id.h>
 #include <linux/i2c-algo-bit.h>
 
 #include "riva_hw.h"
@@ -53,14 +52,14 @@ struct riva_par {
 #ifdef CONFIG_X86
        struct vgastate state;
 #endif
-       atomic_t ref_count;
+       struct mutex open_lock;
+       unsigned int ref_count;
        unsigned char *EDID;
        unsigned int Chipset;
        int forceCRTC;
        Bool SecondCRTC;
        int FlatPanel;
        struct pci_dev *pdev;
-       int bus;
        int cursor_reset;
 #ifdef CONFIG_MTRR
        struct { int vram; int vram_valid; } mtrr;