--- linux/drivers/video/matrox/matroxfb_base.h	Mon Aug  5 02:12:55 2002
+++ linux/drivers/video/matrox/matroxfb_base.h	Fri Sep 20 01:13:54 2002
@@ -10,10 +10,12 @@
 
 /* general, but fairly heavy, debugging */
 #undef MATROXFB_DEBUG
+#define MATROXFB_DEBUG
 
 /* heavy debugging: */
 /* -- logs putc[s], so everytime a char is displayed, it's logged */
 #undef MATROXFB_DEBUG_HEAVY
+#define MATROXFB_DEBUG_HEAVY
 
 /* This one _could_ cause infinite loops */
 /* It _does_ cause lots and lots of messages during idle loops */
@@ -21,9 +23,11 @@
 
 /* Debug register calls, too? */
 #undef MATROXFB_DEBUG_REG
+#define MATROXFB_DEBUG_REG
 
 /* Guard accelerator accesses with spin_lock_irqsave... */
 #undef MATROXFB_USE_SPINLOCKS
+#define MATROXFB_USE_SPINLOCKS
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -108,7 +112,7 @@
 #endif
 #endif
 
-#if defined(__alpha__) || defined(__m68k__)
+#if defined(__alpha__) || defined(__m68k__) || defined(__hppa__)
 #define READx_WORKS
 #define MEMCPYTOIO_WORKS
 #else
@@ -174,27 +178,33 @@
 
 #ifdef READx_WORKS
 static inline unsigned int mga_readb(vaddr_t va, unsigned int offs) {
+	return __raw_readb(va.vaddr + offs);
 	return readb(va.vaddr + offs);
 }
 
 static inline unsigned int mga_readw(vaddr_t va, unsigned int offs) {
+	return __raw_readw(va.vaddr + offs);
 	return readw(va.vaddr + offs);
 }
 
 static inline u_int32_t mga_readl(vaddr_t va, unsigned int offs) {
+	return __raw_readl(va.vaddr + offs);
 	return readl(va.vaddr + offs);
 }
 
 static inline void mga_writeb(vaddr_t va, unsigned int offs, u_int8_t value) {
-	writeb(value, va.vaddr + offs);
+//	writeb(value, va.vaddr + offs);
+	__raw_writeb(value, va.vaddr + offs);
 }
 
 static inline void mga_writew(vaddr_t va, unsigned int offs, u_int16_t value) {
-	writew(value, va.vaddr + offs);
+//	writew(value, va.vaddr + offs);	
+	__raw_writew(value, va.vaddr + offs);
 }
 
 static inline void mga_writel(vaddr_t va, unsigned int offs, u_int32_t value) {
-	writel(value, va.vaddr + offs);
+//	writel(value, va.vaddr + offs);	
+	__raw_writel(value, va.vaddr + offs);
 }
 #else
 static inline unsigned int mga_readb(vaddr_t va, unsigned int offs) {