diff options
| author | Michal Piotrowski <michal.k.k.piotrowski@gmail.com> | 2006-10-03 04:15:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:12 -0400 |
| commit | 86702ad483fa50e09f9535a0e5d2ecad2202facc (patch) | |
| tree | df75e7fbbffb8454262d20dc7a4e86ed46bd9c47 /drivers/video/sis | |
| parent | 4370409a924b5e065f9f0905d243ab69a95b52f4 (diff) | |
[PATCH] drivers/video/sis/vgatypes.h: removal of old code
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/sis')
| -rw-r--r-- | drivers/video/sis/vgatypes.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/sis/vgatypes.h b/drivers/video/sis/vgatypes.h index 831b9f42264b..05d08b7889a1 100644 --- a/drivers/video/sis/vgatypes.h +++ b/drivers/video/sis/vgatypes.h | |||
| @@ -73,12 +73,10 @@ typedef unsigned int BOOLEAN; | |||
| 73 | 73 | ||
| 74 | #ifdef SIS_LINUX_KERNEL | 74 | #ifdef SIS_LINUX_KERNEL |
| 75 | typedef unsigned long SISIOADDRESS; | 75 | typedef unsigned long SISIOADDRESS; |
| 76 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8) | ||
| 77 | #include <linux/types.h> /* Need __iomem */ | 76 | #include <linux/types.h> /* Need __iomem */ |
| 78 | #undef SISIOMEMTYPE | 77 | #undef SISIOMEMTYPE |
| 79 | #define SISIOMEMTYPE __iomem | 78 | #define SISIOMEMTYPE __iomem |
| 80 | #endif | 79 | #endif |
| 81 | #endif | ||
| 82 | 80 | ||
| 83 | #ifdef SIS_XORG_XF86 | 81 | #ifdef SIS_XORG_XF86 |
| 84 | #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0) | 82 | #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0) |