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

[karo-tx-linux.git] / drivers / staging / sm750fb / sm750.h

diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h
index b0a93cdc7292a27137da5869d83b7517f51876de..8e70ce0d6da40cd7c7bf443d9dbc780d0737b17c 100644 (file)
--- a/drivers/staging/sm750fb/sm750.h
+++ b/drivers/staging/sm750fb/sm750.h
@@ -53,7 +53,7 @@ struct lynx_accel {
        /* base virtual address of de data port */
        volatile unsigned char __iomem *dpPortBase;
 
-       /* function fointers */
+       /* function pointers */
        void (*de_init)(struct lynx_accel *);
 
        int (*de_wait)(void);/* see if hardware ready to work */
@@ -79,7 +79,7 @@ struct sm750_dev {
        struct fb_info *fbinfo[2];
        struct lynx_accel accel;
        int accel_off;
-       int dual;
+       int fb_count;
        int mtrr_off;
        struct{
                int vram;