From 5c764c7db1c1ec32b4ebaa0320148f2bdf611bba Mon Sep 17 00:00:00 2001
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Tue, 3 Oct 2006 01:15:01 -0700
Subject: [PATCH] --- yaml --- r: 38068 b: refs/heads/master c:
 86702ad483fa50e09f9535a0e5d2ecad2202facc h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/video/sis/vgatypes.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 18a534e2509a..f43c97a07fdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4370409a924b5e065f9f0905d243ab69a95b52f4
+refs/heads/master: 86702ad483fa50e09f9535a0e5d2ecad2202facc
diff --git a/trunk/drivers/video/sis/vgatypes.h b/trunk/drivers/video/sis/vgatypes.h
index 831b9f42264b..05d08b7889a1 100644
--- a/trunk/drivers/video/sis/vgatypes.h
+++ b/trunk/drivers/video/sis/vgatypes.h
@@ -73,12 +73,10 @@ typedef unsigned int BOOLEAN;
 
 #ifdef SIS_LINUX_KERNEL
 typedef unsigned long SISIOADDRESS;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 #include <linux/types.h>  /* Need __iomem */
 #undef SISIOMEMTYPE
 #define SISIOMEMTYPE __iomem
 #endif
-#endif
 
 #ifdef SIS_XORG_XF86
 #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)