Always support G80.

5 files changed, 2 insertions, 35 deletions

diff --git a/configure.ac b/configure.ac
index 6b1f98e..9bb243a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,17 +63,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
 PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
-# Check for optional compile-time support
-AC_ARG_ENABLE(g80, AC_HELP_STRING([--disable-g80],
-                                  [Disable G80 support [[default=no]]]),
-              [SUPPORT_G80="$enableval"],
-              [SUPPORT_G80=yes])
-AM_CONDITIONAL(SUPPORT_G80, test x$SUPPORT_G80 = xyes)
-if test "$SUPPORT_G80" = yes; then
-        AC_DEFINE(SUPPORT_G80,1,[Enable G80 support])
-        echo "Enabling G80 support"
-fi
-
 # Checks for libraries.
 
 # Checks for header files.
diff --git a/man/Makefile.am b/man/Makefile.am
index 036545c..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -41,12 +41,6 @@ SED = sed
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
 
-if SUPPORT_G80
-MAN_SUPPORT_G80 := 1
-else
-MAN_SUPPORT_G80 := 0
-endif
-
 MAN_SUBSTS = \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@@ -57,8 +51,7 @@ MAN_SUBSTS = \
 	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
-	-e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
 
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
diff --git a/man/nv.man b/man/nv.man
index e892ecf..c8d2fcb 100644
--- a/man/nv.man
+++ b/man/nv.man
@@ -58,12 +58,9 @@ NV40, NV41, NV43, NV44, NV45, C51
 .TP 22
 .B GeForce 7XXX
 G70, G71, G72, G73
-.de G8
 .TP 22
 .B GeForce 8XXX
 G80
-..
-.if __support_g80__ .G8
 
 .SH CONFIGURATION DETAILS
 Please refer to __xconfigfile__(__filemansuffix__) for general configuration
@@ -136,7 +133,6 @@ Default: no rotation support.
 Enable or disable use of the shadow framebuffer layer.  Default: off.
 .
 .\" ******************** begin G80 section ********************
-.de G8
 .PP
 The following driver
 .B Options
@@ -147,8 +143,6 @@ Enable or disable the hardware cursor.  Default: on.
 .TP
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
-..
-.if __support_g80__ .G8
 .\" ******************** end G80 section ********************
 .
 .SH "SEE ALSO"
diff --git a/src/Makefile.am b/src/Makefile.am
index d024283..b31ebea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,6 @@ riva_sources = \
          riva_type.h \
          riva_xaa.c
 
-if SUPPORT_G80
 g80_sources = \
          g80_cursor.c \
          g80_cursor.h \
@@ -82,4 +81,3 @@ g80_sources = \
          g80_type.h \
          g80_xaa.c \
          g80_xaa.h
-endif
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 64d45c5..f9fdc7e 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -333,12 +333,11 @@ static SymTabRec NVKnownChipsets[] =
   { 0x10DE0244, "GeForce Go 6150" },
   { 0x10DE0247, "GeForce Go 6100" },
 
-#if SUPPORT_G80
+/*************** G8x ***************/
   { 0x10DE0191, "GeForce 8800 GTX" },
   { 0x10DE0193, "GeForce 8800 GTS" },
   { 0x10DE019D, "Quadro FX 5600" },
   { 0x10DE019E, "Quadro FX 4600" },
-#endif
 
   {-1, NULL}
 };
@@ -655,7 +654,6 @@ NVGetPCIXpressChip (pciVideoPtr pVideo)
     return pciid;
 }
 
-#if SUPPORT_G80
 static Bool
 NVIsG80(int chipType)
 {
@@ -668,7 +666,6 @@ NVIsG80(int chipType)
 
     return FALSE;
 }
-#endif
 
 /* Mandatory */
 static Bool
@@ -754,10 +751,8 @@ NVProbe(DriverPtr drv, int flags)
                default:  break;  /* we don't recognize it */
                }
 
-#if SUPPORT_G80
                if(NVIsG80((*ppPci)->chipType))
                    canHandle = TRUE;
-#endif
 
                if(canHandle) {
                    NVChipsets[numUsed].token = pciid;
@@ -795,11 +790,9 @@ NVProbe(DriverPtr drv, int flags)
         if(pPci->vendor == PCI_VENDOR_NVIDIA_SGS) {
             if(RivaGetScrnInfoRec(NVPciChipsets, usedChips[i]))
                 foundScreen = TRUE;
-#if SUPPORT_G80
         } else if (NVIsG80(pPci->chipType)) {
             if(G80GetScrnInfoRec(NVPciChipsets, usedChips[i]))
                 foundScreen = TRUE;
-#endif
         } else {
             if(NVGetScrnInfoRec(NVPciChipsets, usedChips[i])) 
 	        foundScreen = TRUE;