summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2014-04-22 15:35:43 +0200
committerEgbert Eich <eich@freedesktop.org>2014-04-30 17:27:29 +0200
commit5bdd2cac0b8db58ab442375f5c9e9b4349f39c02 (patch)
tree76314343881faf7c912088968dff1365922d9bf9
parent06245e228319c63a48ddd0313cf39d9c8e93cfc7 (diff)
Fix ABI version conflict in xf86UnclaimPciSlot()
xf86UnclaimPciSlot() received a GDevPtr as 2nd argument with ABI_VIDEODRV_VERSION 13. Signed-off-by: Egbert Eich <eich@suse.de> Acked-by: Y.C. Chen <yc_chen@aspeedtech.com>
-rw-r--r--src/ast_driver.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ast_driver.c b/src/ast_driver.c
index b6accbf..be1ac0f 100644
--- a/src/ast_driver.c
+++ b/src/ast_driver.c
@@ -281,7 +281,11 @@ ASTProbe(DriverPtr drv, int flags)
pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func);
xf86DrvMsg(0, X_ERROR,
"ast: This driver cannot operate until it has been unloaded.\n");
- xf86UnclaimPciSlot(pPci, devSections[0]);
+ xf86UnclaimPciSlot(pPci
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 13
+ , devSections[0]
+#endif
+ );
free(devSections);
return FALSE;
}