printk: Ensure that "console enabled" messages are printed on the console

[safe/jmp/linux-2.6] / drivers / video / sis / sis.h

diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index d53bf69..7c5710e 100644 (file)
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -24,8 +24,6 @@
 #ifndef _SIS_H_
 #define _SIS_H_
 
-#include <linux/version.h>
-
 #include "osdef.h"
 #include <video/sisfb.h>
 
@@ -39,28 +37,13 @@
 #include <linux/spinlock.h>
 
 #ifdef CONFIG_COMPAT
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
-#include <linux/ioctl32.h>
-#define SIS_OLD_CONFIG_COMPAT
-#else
 #define SIS_NEW_CONFIG_COMPAT
-#endif
 #endif /* CONFIG_COMPAT */
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
-#define SIS_IOTYPE1 void __iomem
-#define SIS_IOTYPE2 __iomem
-#define SISINITSTATIC static
-#else
-#define SIS_IOTYPE1 unsigned char
-#define SIS_IOTYPE2
-#define SISINITSTATIC
-#endif
-
 #undef SISFBDEBUG
 
 #ifdef SISFBDEBUG
-#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #define TWDEBUG(x) printk(KERN_INFO x "\n");
 #else
 #define DPRINTK(fmt, args...)
@@ -510,8 +493,8 @@ struct sis_video_info {
 
        unsigned long   UMAsize, LFBsize;
 
-       SIS_IOTYPE1     *video_vbase;
-       SIS_IOTYPE1     *mmio_vbase;
+       void __iomem    *video_vbase;
+       void __iomem    *mmio_vbase;
 
        unsigned char   *bios_abase;
 
@@ -538,8 +521,8 @@ struct sis_video_info {
        int             sisfb_nocrt2rate;
 
        u32             heapstart;              /* offset  */
-       SIS_IOTYPE1     *sisfb_heap_start;      /* address */
-       SIS_IOTYPE1     *sisfb_heap_end;        /* address */
+       void __iomem    *sisfb_heap_start;      /* address */
+       void __iomem    *sisfb_heap_end;        /* address */
        u32             sisfb_heap_size;
        int             havenoheap;
 
@@ -607,9 +590,6 @@ struct sis_video_info {
        int             haveXGIROM;
        int             registered;
        int             warncount;
-#ifdef SIS_OLD_CONFIG_COMPAT
-       int             ioctl32registered;
-#endif
 
        int             sisvga_engine;
        int             hwcursor_size;
@@ -620,7 +600,7 @@ struct sis_video_info {
        u8              detectedpdca;
        u8              detectedlcda;
 
-       SIS_IOTYPE1     *hwcursor_vbase;
+       void __iomem    *hwcursor_vbase;
 
        int             chronteltype;
        int             tvxpos, tvypos;