Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...

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

diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index 8dade38..3570f9c 100644 (file)
--- a/include/video/sstfb.h
+++ b/include/video/sstfb.h
@@ -18,11 +18,14 @@
 
 #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...)
-#  undef SST_DEBUG_REG
-#  undef SST_DEBUG_FUNC
-#  undef SST_DEBUG_VAR
+#  define SST_DEBUG_REG  0
+#  define SST_DEBUG_FUNC 0
+#  define SST_DEBUG_VAR  0
 #endif
 
 #if (SST_DEBUG_REG > 0)
@@ -331,6 +334,7 @@ struct sst_spec {
 };
 
 struct sstfb_par {
+       u32 palette[16];
        unsigned int yDim;
        unsigned int hSyncOn;   /* hsync_len */
        unsigned int hSyncOff;  /* left_margin + xres + right_margin */
@@ -340,7 +344,7 @@ struct sstfb_par {
        unsigned int vBackPorch;
        struct pll_timing pll;
        unsigned int tiles_in_X;/* num of tiles in X res */
-       unsigned long mmio_vbase;
+       u8 __iomem *mmio_vbase;
        struct dac_switch       dac_sw; /* dac specific functions */
        struct pci_dev          *dev;
        int     type;