X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fvideo%2Fi810%2Fi810.h;h=328ae6c673ec85fa0e85c79a931055b23e85ae16;hb=efffbeee5bc4168059683714b300d307f5193d69;hp=579195c2bea3030bbd2922158cd3289c683d67cf;hpb=2ade43618b0aee83a50b344171d33d85c73d01b1;p=linux-2.6 diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h index 579195c2be..328ae6c673 100644 --- a/drivers/video/i810/i810.h +++ b/drivers/video/i810/i810.h @@ -133,7 +133,7 @@ /* Masks (AND ops) and OR's */ #define FB_START_MASK (0x3f << (32 - 6)) #define MMIO_ADDR_MASK (0x1FFF << (32 - 13)) -#define FREQ_MASK 0x1EF +#define FREQ_MASK (1 << 4) #define SCR_OFF 0x20 #define DRAM_ON 0x08 #define DRAM_OFF 0xE7 @@ -264,8 +264,9 @@ struct i810fb_par { struct heap_data cursor_heap; struct vgastate state; struct i810fb_i2c_chan chan[3]; - atomic_t use_count; - u32 pseudo_palette[17]; + struct mutex open_lock; + unsigned int use_count; + u32 pseudo_palette[16]; unsigned long mmio_start_phys; u8 __iomem *mmio_start_virtual; u8 *edid;