patch-2.3.16 linux/include/video/fbcon.h

Next file: linux/include/video/sbusfb.h
Previous file: linux/include/net/ndisc.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/include/video/fbcon.h linux/include/video/fbcon.h
@@ -12,6 +12,7 @@
 #define _VIDEO_FBCON_H
 
 #include <linux/config.h>
+#include <linux/types.h>
 #include <linux/console_struct.h>
 #include <linux/vt_buffer.h>
 
@@ -522,12 +523,12 @@
 
 #else
 
-#define fb_readb(addr) (*(volatile unsigned char *) __io_virt(addr))
-#define fb_readw(addr) (*(volatile unsigned short *) __io_virt(addr))
-#define fb_readl(addr) (*(volatile unsigned int *) __io_virt(addr))
-#define fb_writeb(b,addr) (*(volatile unsigned char *) __io_virt(addr) = (b))
-#define fb_writew(b,addr) (*(volatile unsigned short *) __io_virt(addr) = (b))
-#define fb_writel(b,addr) (*(volatile unsigned int *) __io_virt(addr) = (b))
+#define fb_readb(addr) (*(volatile u8 *) (addr))
+#define fb_readw(addr) (*(volatile u16 *) (addr))
+#define fb_readl(addr) (*(volatile u32 *) (addr))
+#define fb_writeb(b,addr) (*(volatile u8 *) (addr) = (b))
+#define fb_writew(b,addr) (*(volatile u16 *) (addr) = (b))
+#define fb_writel(b,addr) (*(volatile u32 *) (addr) = (b))
 
 #endif
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)