aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/osdef.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/sis/osdef.h')
-rw-r--r--drivers/video/sis/osdef.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index e24d21a7ae4b..bc185a9a4d84 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -54,9 +54,6 @@
54#ifndef _SIS_OSDEF_H_ 54#ifndef _SIS_OSDEF_H_
55#define _SIS_OSDEF_H_ 55#define _SIS_OSDEF_H_
56 56
57/* The choices are: */
58#define SIS_LINUX_KERNEL /* Linux kernel framebuffer */
59
60#ifdef OutPortByte 57#ifdef OutPortByte
61#undef OutPortByte 58#undef OutPortByte
62#endif 59#endif
@@ -85,8 +82,6 @@
85/* LINUX KERNEL */ 82/* LINUX KERNEL */
86/**********************************************************************/ 83/**********************************************************************/
87 84
88#ifdef SIS_LINUX_KERNEL
89
90#ifdef CONFIG_FB_SIS_300 85#ifdef CONFIG_FB_SIS_300
91#define SIS300 86#define SIS300
92#endif 87#endif
@@ -108,6 +103,4 @@
108#define InPortLong(p) inl((SISIOADDRESS)(p)) 103#define InPortLong(p) inl((SISIOADDRESS)(p))
109#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize) 104#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize)
110 105
111#endif /* LINUX_KERNEL */
112
113#endif /* _OSDEF_H_ */ 106#endif /* _OSDEF_H_ */