diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-08-15 14:04:11 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-08-15 14:04:11 -0400 |
| commit | 328be647a21f0da7b7beacd56398d78072eeee6b (patch) | |
| tree | 1e4c3c6a1fc2abec0b0ec47e39d064a93c3eeeca | |
| parent | fe599dbf5178a10b0021c1f33bed528ce3199af9 (diff) | |
Uninclude xf86Version.h, remove some dead code.
| -rw-r--r-- | src/ct_driver.c | 7 | ||||
| -rw-r--r-- | src/ct_driver.h | 6 | ||||
| -rw-r--r-- | src/ct_regs.c | 3 |
3 files changed, 1 insertions, 15 deletions
diff --git a/src/ct_driver.c b/src/ct_driver.c index f88bef2..1c791c8 100644 --- a/src/ct_driver.c +++ b/src/ct_driver.c @@ -86,9 +86,6 @@ /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" -/* This is used for module versioning */ -#include "xf86Version.h" - /* Standard resources are defined here */ #include "xf86Resources.h" @@ -1542,11 +1539,7 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) hwp = VGAHWPTR(pScrn); vgaHWGetIOBase(hwp); -#if XF86_VERSION_CURRENT > XF86_VERSION_NUMERIC(4,1,0,0,0) cPtr->PIOBase = hwp->PIOOffset; -#else - cPtr->PIOBase = 0 ; /* for old version the IO offset is global */ -#endif /* * Must allow ensure that storage for the 2nd set of vga registers is * allocated for dual channel cards diff --git a/src/ct_driver.h b/src/ct_driver.h index d2fa6f7..d8ce228 100644 --- a/src/ct_driver.h +++ b/src/ct_driver.h @@ -275,11 +275,7 @@ typedef struct _CHIPSRec { PCITAG PciTag; int Chipset; EntityInfoPtr pEnt; -#if XF86_VERSION_CURRENT > XF86_VERSION_NUMERIC(4,1,0,0,0) - IOADDRESS PIOBase; -#else - int PIOBase; /* unused variable : here for compatibility reason with newer version */ -#endif + IOADDRESS PIOBase; CARD32 IOAddress; unsigned long FbAddress; unsigned int IOBase; diff --git a/src/ct_regs.c b/src/ct_regs.c index e2f62df..e9a4c20 100644 --- a/src/ct_regs.c +++ b/src/ct_regs.c @@ -64,9 +64,6 @@ /* Drivers that need to access the PCI config space directly need this */ #include "xf86Pci.h" -/* This is used for module versioning */ -#include "xf86Version.h" - /* Driver specific headers */ #include "ct_driver.h" |