diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/nv_driver.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 6b90720..9b47291 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,7 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no], [#include "xorg-server.h"]) if test "x$XSERVER_LIBPCIACCESS" = "xyes"; then - PKG_CHECK_MODULES(PCIACCES, [pciaccess >= 0.8.0]) + PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.8.0]) fi CFLAGS="$save_CFLAGS" diff --git a/src/nv_driver.c b/src/nv_driver.c index 69d61d2..5141570 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -98,10 +98,10 @@ _X_EXPORT DriverRec NV = { NV_VERSION, NV_DRIVER_NAME, NVIdentify, -#if XSERVER_PCIACCESS - NVProbe, -#else +#if XSERVER_LIBPCIACCESS NULL, +#else + NVProbe, #endif NVAvailableOptions, NULL, @@ -822,7 +822,7 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_device *dev, intptr_t data) NV_NAME ": Found NVIDIA %s at %2.2x@%2.2x:%2.2x:%1.1x\n", name, dev->bus, dev->domain, dev->dev, dev->func); - if(NVIsG80(dev->device_id)) + if(NVIsG80(id)) return G80GetScrnInfoRec(NULL, entity); else if(dev->vendor_id == PCI_VENDOR_NVIDIA_SGS) return RivaGetScrnInfoRec(NULL, entity); |