summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/osdef.h
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-11-19 21:58:45 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-11-24 16:02:46 +0900
commite7d828ab91c95e9fdc85f5167f236a8c85fb2445 (patch)
treef6917b7bc121fa1b2f0ddf4fd013ec60bde79ca2 /drivers/video/sis/osdef.h
parentf3fff7359415f3e6331fa727ab27e9a1556ee7e7 (diff)
downloadop-kernel-dev-e7d828ab91c95e9fdc85f5167f236a8c85fb2445.zip
op-kernel-dev-e7d828ab91c95e9fdc85f5167f236a8c85fb2445.tar.gz
sisfb: delete dead SIS_XORG_XF86 code
Delete code for compiling the driver for X.org/XFree86. The development has forked, so there is no point keeping this code in the tree. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Thomas Winischhofer <thomas@winischhofer.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sis/osdef.h')
-rw-r--r--drivers/video/sis/osdef.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h
index 6ff8f98..e24d21a 100644
--- a/drivers/video/sis/osdef.h
+++ b/drivers/video/sis/osdef.h
@@ -56,7 +56,6 @@
/* The choices are: */
#define SIS_LINUX_KERNEL /* Linux kernel framebuffer */
-#undef SIS_XORG_XF86 /* XFree86/X.org */
#ifdef OutPortByte
#undef OutPortByte
@@ -111,23 +110,4 @@
#endif /* LINUX_KERNEL */
-/**********************************************************************/
-/* XFree86/X.org */
-/**********************************************************************/
-
-#ifdef SIS_XORG_XF86
-
-#define SIS300
-#define SIS315H
-
-#define OutPortByte(p,v) outSISREG((IOADDRESS)(p),(CARD8)(v))
-#define OutPortWord(p,v) outSISREGW((IOADDRESS)(p),(CARD16)(v))
-#define OutPortLong(p,v) outSISREGL((IOADDRESS)(p),(CARD32)(v))
-#define InPortByte(p) inSISREG((IOADDRESS)(p))
-#define InPortWord(p) inSISREGW((IOADDRESS)(p))
-#define InPortLong(p) inSISREGL((IOADDRESS)(p))
-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
-
-#endif /* XF86 */
-
#endif /* _OSDEF_H_ */
OpenPOWER on IntegriCloud