summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86fbBus.c
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2010-06-01 13:05:47 +0300
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-15 21:18:47 -0700
commit6817050f3196d460ba03a62da23fb46ffd5a0f97 (patch)
tree9c710b525c99bc5efd3c5f0c7c128ee26918a858 /hw/xfree86/common/xf86fbBus.c
parent5c12399b6c3a8def2df1bdde1d5d4d8d9e31fd84 (diff)
configure: wrap PCI code with macro and set it at build time
--disable-pciaccess, used together with --disable-module-int10, can be used to disable all pci code inside the server. Note that XSERVER_LIBPCIACCESS was previously used only in the driver side and now it defines also whether the library is used inside the server. Also, XORG_BUS_PCI automake variable is introduced to track PCI code needs. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'hw/xfree86/common/xf86fbBus.c')
-rw-r--r--hw/xfree86/common/xf86fbBus.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c
index 059e378e3..45929804f 100644
--- a/hw/xfree86/common/xf86fbBus.c
+++ b/hw/xfree86/common/xf86fbBus.c
@@ -54,8 +54,10 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
EntityPtr p;
int num;
+#ifdef XSERVER_LIBPCIACCESS
if (pciSlotClaimed)
return -1;
+#endif
#if defined(__sparc__) || defined (__sparc64__)
if (sbusSlotClaimed)
return -1;