summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-23 14:03:10 +0100
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2007-05-23 14:03:10 +0100
commit7cd2ad857a937656123acde01e30e6ec883b35e0 (patch)
tree32eee9ef498bb3b0984c0e90013daad6455d1247
parent362e03a38682bfcf366242c53444fa36b6052794 (diff)
Remove obsolete pci_burst & pci_retry options
-rw-r--r--src/via_driver.c22
-rw-r--r--src/via_driver.h2
2 files changed, 0 insertions, 24 deletions
diff --git a/src/via_driver.c b/src/via_driver.c
index 3cf5976..c2312a8 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -121,8 +121,6 @@ typedef enum {
OPTION_I2CSCAN,
#endif /* HAVE_DEBUG */
OPTION_VBEMODES,
- OPTION_PCI_BURST,
- OPTION_PCI_RETRY,
OPTION_NOACCEL,
#ifdef VIA_HAVE_EXA
OPTION_ACCELMETHOD,
@@ -808,26 +806,6 @@ static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Option: drixinerama ignored, no DRI support compiled into driver.\n");
#endif
- if (xf86ReturnOptValBool(VIAOptions, OPTION_PCI_BURST, FALSE)) {
- pVia->pci_burst = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Option: pci_burst - PCI burst read enabled\n");
- }
- else {
- pVia->pci_burst = FALSE;
- }
-
- pVia->NoPCIRetry = 1; /* default */
- if (xf86ReturnOptValBool(VIAOptions, OPTION_PCI_RETRY, FALSE)) {
- if (xf86ReturnOptValBool(VIAOptions, OPTION_PCI_BURST, FALSE)) {
- pVia->NoPCIRetry = 0;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Option: pci_retry\n");
- }
- else {
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "\"pci_retry\" option requires \"pci_burst\"\n");
- }
- }
if (xf86IsOptionSet(VIAOptions, OPTION_SHADOW_FB)) {
pVia->shadowFB = TRUE;
diff --git a/src/via_driver.h b/src/via_driver.h
index c9f612c..17a6d18 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -205,8 +205,6 @@ typedef struct _VIA {
/* Here are all the Options */
Bool VQEnable;
- Bool pci_burst;
- Bool NoPCIRetry;
Bool hwcursor;
Bool NoAccel;
Bool shadowFB;