diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /drivers/video/sis/osdef.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/video/sis/osdef.h')
| -rw-r--r-- | drivers/video/sis/osdef.h | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h index 15939b05771..841ca3190cd 100644 --- a/drivers/video/sis/osdef.h +++ b/drivers/video/sis/osdef.h @@ -3,7 +3,7 @@ /* * OS depending defines * - * Copyright (C) 2001-2004 by Thomas Winischhofer, Vienna, Austria + * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria * * If distributed as part of the Linux kernel, the following license terms * apply: @@ -55,8 +55,11 @@ #define _SIS_OSDEF_H_ /* The choices are: */ -#define LINUX_KERNEL /* Linux kernel framebuffer */ -/* #define LINUX_XF86 */ /* XFree86/X.org */ +#define SIS_LINUX_KERNEL /* Linux kernel framebuffer */ +#undef SIS_XORG_XF86 /* XFree86/X.org */ + +#undef SIS_LINUX_KERNEL_24 +#undef SIS_LINUX_KERNEL_26 #ifdef OutPortByte #undef OutPortByte @@ -86,8 +89,9 @@ /* LINUX KERNEL */ /**********************************************************************/ -#ifdef LINUX_KERNEL +#ifdef SIS_LINUX_KERNEL #include <linux/config.h> +#include <linux/version.h> #ifdef CONFIG_FB_SIS_300 #define SIS300 @@ -97,6 +101,12 @@ #define SIS315H #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +#define SIS_LINUX_KERNEL_26 +#else +#define SIS_LINUX_KERNEL_24 +#endif + #if !defined(SIS300) && !defined(SIS315H) #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set #warning sisfb will not work! @@ -109,13 +119,15 @@ #define InPortWord(p) inw((SISIOADDRESS)(p)) #define InPortLong(p) inl((SISIOADDRESS)(p)) #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset_io(MemoryAddress, value, MemorySize) -#endif + +#endif /* LINUX_KERNEL */ /**********************************************************************/ /* XFree86/X.org */ /**********************************************************************/ -#ifdef LINUX_XF86 +#ifdef SIS_XORG_XF86 + #define SIS300 #define SIS315H @@ -126,6 +138,7 @@ #define InPortWord(p) inSISREGW((IOADDRESS)(p)) #define InPortLong(p) inSISREGL((IOADDRESS)(p)) #define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize) -#endif + +#endif /* XF86 */ #endif /* _OSDEF_H_ */ |