drivers/video/: Spelling fixes

[sfrench/cifs-2.6.git] / drivers / video / intelfb / intelfb.h

diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h
index abdadc2a1b4796fa71b105f04fb9010a0b97277e..8367961779420c275b0b5e2f0a693b2f702fa73c 100644 (file)
--- a/drivers/video/intelfb/intelfb.h
+++ b/drivers/video/intelfb/intelfb.h
@@ -111,7 +111,7 @@
 
 #define FIXED_MODE(d) ((d)->fixed_mode)
 
-/*** Driver paramters ***/
+/*** Driver parameters ***/
 
 #define RINGBUFFER_SIZE                KB(64)
 #define HW_CURSOR_SIZE         KB(4)
@@ -231,8 +231,8 @@ struct intelfb_hwstate {
 struct intelfb_heap_data {
        u32 physical;
        u8 __iomem *virtual;
-       u32 offset;  // in GATT pages
-       u32 size;    // in bytes
+       u32 offset;             /* in GATT pages */
+       u32 size;               /* in bytes */
 };
 
 #ifdef CONFIG_FB_INTEL_I2C
@@ -270,15 +270,15 @@ struct intelfb_info {
        struct intelfb_hwstate save_state;
 
        /* agpgart structs */
-       struct agp_memory *gtt_fb_mem;     // use all stolen memory or vram
-       struct agp_memory *gtt_ring_mem;   // ring buffer
-       struct agp_memory *gtt_cursor_mem; // hw cursor
+       struct agp_memory *gtt_fb_mem;     /* use all stolen memory or vram */
+       struct agp_memory *gtt_ring_mem;   /* ring buffer */
+       struct agp_memory *gtt_cursor_mem; /* hw cursor */
 
        /* use a gart reserved fb mem */
        u8 fbmem_gart;
 
        /* mtrr support */
-       u32 mtrr_reg;
+       int mtrr_reg;
        u32 has_mtrr;
 
        /* heap data */
@@ -302,7 +302,7 @@ struct intelfb_info {
        u32 ring_lockup;
 
        /* palette */
-       u32 pseudo_palette[17];
+       u32 pseudo_palette[16];
 
        /* chip info */
        int pci_chipset;
@@ -346,7 +346,7 @@ struct intelfb_info {
 
        /* driver registered */
        int registered;
-       
+
        /* index into plls */
        int pll_index;
 
@@ -355,7 +355,10 @@ struct intelfb_info {
        struct intelfb_output_rec output[MAX_OUTPUTS];
 };
 
-#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G)||(dinfo->chipset == INTEL_915GM)||((dinfo)->chipset == INTEL_945G)||(dinfo->chipset==INTEL_945GM))
+#define IS_I9XX(dinfo) (((dinfo)->chipset == INTEL_915G) ||    \
+                       ((dinfo)->chipset == INTEL_915GM) ||    \
+                       ((dinfo)->chipset == INTEL_945G) ||     \
+                       ((dinfo)->chipset==INTEL_945GM))
 
 #ifndef FBIO_WAITFORVSYNC
 #define FBIO_WAITFORVSYNC      _IOW('F', 0x20, __u32)