summaryrefslogtreecommitdiff
path: root/drivers/video/sis/vstruct.h
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2010-11-20 00:58:46 +0300
committerPaul Mundt <lethal@linux-sh.org>2010-11-24 10:02:51 +0300
commitb6c30ca6136c6c6900a086b6b843f738a588a2f3 (patch)
treef8f405758c94f330393cff45d679d48f1132c229 /drivers/video/sis/vstruct.h
parente7d828ab91c95e9fdc85f5167f236a8c85fb2445 (diff)
downloadlinux-b6c30ca6136c6c6900a086b6b843f738a588a2f3.tar.xz
sisfb: delete redudant #define SIS_LINUX_KERNEL
It's not needed anymore with SIS_XORG_XF86 gone. 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/vstruct.h')
-rw-r--r--drivers/video/sis/vstruct.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/video/sis/vstruct.h b/drivers/video/sis/vstruct.h
index a860039c1122..ea94d214dcff 100644
--- a/drivers/video/sis/vstruct.h
+++ b/drivers/video/sis/vstruct.h
@@ -233,21 +233,15 @@ struct SiS_Private
{
unsigned char ChipType;
unsigned char ChipRevision;
-#ifdef SIS_LINUX_KERNEL
void *ivideo;
-#endif
unsigned char *VirtualRomBase;
bool UseROM;
-#ifdef SIS_LINUX_KERNEL
unsigned char SISIOMEMTYPE *VideoMemoryAddress;
unsigned int VideoMemorySize;
-#endif
SISIOADDRESS IOAddress;
SISIOADDRESS IOAddress2; /* For dual chip XGI volari */
-#ifdef SIS_LINUX_KERNEL
SISIOADDRESS RelIO;
-#endif
SISIOADDRESS SiS_P3c4;
SISIOADDRESS SiS_P3d4;
SISIOADDRESS SiS_P3c0;