This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / video / sstfb.h

diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index 0d77b52..8dade38 100644 (file)
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h
@@ -18,14 +18,11 @@
 
 #ifdef SST_DEBUG
 #  define dprintk(X...)                printk("sstfb: " X)
-#  define SST_DEBUG_REG  1
-#  define SST_DEBUG_FUNC 1
-#  define SST_DEBUG_VAR  1
 #else
 #  define dprintk(X...)
-#  define SST_DEBUG_REG  0
-#  define SST_DEBUG_FUNC 0
-#  define SST_DEBUG_VAR  0
+#  undef SST_DEBUG_REG
+#  undef SST_DEBUG_FUNC
+#  undef SST_DEBUG_VAR
 #endif
 
 #if (SST_DEBUG_REG > 0)
@@ -343,7 +340,7 @@ struct sstfb_par {
        unsigned int vBackPorch;
        struct pll_timing pll;
        unsigned int tiles_in_X;/* num of tiles in X res */
-       u8 __iomem *mmio_vbase;
+       unsigned long mmio_vbase;
        struct dac_switch       dac_sw; /* dac specific functions */
        struct pci_dev          *dev;
        int     type;