X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fvideo%2Fsstfb.h;h=0d77b5205372b611ed2a289b1330f313a51ef43f;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=dd3db89315d82e741f26e291a21891033e752536;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/video/sstfb.h b/include/video/sstfb.h
index dd3db8931..0d77b5205 100644
--- 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)
@@ -72,10 +75,6 @@
 #define BIT(x)		(1ul<<(x))
 #define POW2(x)		(1ul<<(x))
 
-#ifndef ABS
-# define ABS(x)		(((x)<0)?-(x):(x))
-#endif
-
 /*
  *
  *  Const
@@ -344,7 +343,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;