If we have pciaccess and not ISA support VESAProbe is effectively return FALSE, and the server will issue a potentially confusing fallback message if VESAPciProbe failed and ->Probe is non-NULL.
Signed-off-by: Adam Jackson <[email protected]> --- src/vesa.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vesa.c b/src/vesa.c index e51effe..cbf6773 100644 --- a/src/vesa.c +++ b/src/vesa.c @@ -66,7 +66,11 @@ /* Mandatory functions */ static const OptionInfoRec * VESAAvailableOptions(int chipid, int busid); static void VESAIdentify(int flags); +#if defined(XSERVER_LIBPCIACCESS) && !defined(HAVE_ISA) +#define VESAProbe NULL +#else static Bool VESAProbe(DriverPtr drv, int flags); +#endif #ifdef XSERVER_LIBPCIACCESS static Bool VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, intptr_t match_data); @@ -466,6 +470,7 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, } #endif +#ifndef VESAProbe static Bool VESAProbe(DriverPtr drv, int flags) { @@ -536,6 +541,7 @@ VESAProbe(DriverPtr drv, int flags) return (foundScreen); } +#endif #ifdef HAVE_ISA static int -- 2.14.3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
