diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-05-08 03:39:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:33 -0400 |
commit | 0959f0ca29244ae983b406fba313816a29244be7 (patch) | |
tree | 1dd6c165a9298418eab3965eaec4d5c6727e6b50 /drivers/video/sis/osdef.h | |
parent | c831c338f0ad299fcd1592c6e4f30657480f39af (diff) |
drivers/video/sis/: remove more kernel 2.4 code
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/sis/osdef.h')
-rw-r--r-- | drivers/video/sis/osdef.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h index d048bd39961b..c1492782cb18 100644 --- a/drivers/video/sis/osdef.h +++ b/drivers/video/sis/osdef.h | |||
@@ -58,9 +58,6 @@ | |||
58 | #define SIS_LINUX_KERNEL /* Linux kernel framebuffer */ | 58 | #define SIS_LINUX_KERNEL /* Linux kernel framebuffer */ |
59 | #undef SIS_XORG_XF86 /* XFree86/X.org */ | 59 | #undef SIS_XORG_XF86 /* XFree86/X.org */ |
60 | 60 | ||
61 | #undef SIS_LINUX_KERNEL_24 | ||
62 | #undef SIS_LINUX_KERNEL_26 | ||
63 | |||
64 | #ifdef OutPortByte | 61 | #ifdef OutPortByte |
65 | #undef OutPortByte | 62 | #undef OutPortByte |
66 | #endif | 63 | #endif |
@@ -100,8 +97,6 @@ | |||
100 | #define SIS315H | 97 | #define SIS315H |
101 | #endif | 98 | #endif |
102 | 99 | ||
103 | #define SIS_LINUX_KERNEL_26 | ||
104 | |||
105 | #if !defined(SIS300) && !defined(SIS315H) | 100 | #if !defined(SIS300) && !defined(SIS315H) |
106 | #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set | 101 | #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set |
107 | #warning sisfb will not work! | 102 | #warning sisfb will not work! |