diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 4ca7dfcd3..bac4be031 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -100,7 +100,6 @@ Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func); Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func); void xf86FormatPciBusNumber(int busnum, char *buffer); -void xf86PrintResList(int verb, resPtr list); resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex); int xf86ClaimIsaSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); int xf86GetIsaInfoForScreen(int scrnIndex); @@ -114,8 +113,6 @@ Bool xf86IsPrimaryPci(struct pci_device * pPci); Bool xf86IsPrimaryIsa(void); /* new RAC */ resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex); -resPtr xf86JoinResLists(resPtr rlist1, resPtr rlist2); -resPtr xf86DupResList(const resPtr rlist); void xf86FreeResList(resPtr rlist); void xf86ClaimFixedResources(resList list, int entityIndex); Bool xf86DriverHasEntities(DriverPtr drvp); diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 88c75199a..4f7b36bd3 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -1129,7 +1129,7 @@ xf86ChkConflict(resRange *rgp, int entityIndex) * Resources List handling */ -_X_EXPORT resPtr +static resPtr xf86JoinResLists(resPtr rlist1, resPtr rlist2) { resPtr pRes; @@ -1146,7 +1146,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2) return rlist1; } -_X_EXPORT resPtr +resPtr xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) { resPtr new; @@ -1196,7 +1196,7 @@ xf86FreeResList(resPtr rlist) xfree(rlist); } -_X_EXPORT resPtr +static resPtr xf86DupResList(const resPtr rlist) { resPtr pRes, ret, prev, new; @@ -1216,7 +1216,7 @@ xf86DupResList(const resPtr rlist) return ret; } -_X_EXPORT void +static void xf86PrintResList(int verb, resPtr list) { int i = 0; diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 7047ff388..daeafd2c4 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -307,10 +307,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86SetCurrentAccess) SYMFUNC(xf86IsPrimaryPci) SYMFUNC(xf86IsPrimaryIsa) - SYMFUNC(xf86PrintResList) - SYMFUNC(xf86AddResToList) - SYMFUNC(xf86JoinResLists) - SYMFUNC(xf86DupResList) SYMFUNC(xf86FreeResList) SYMFUNC(xf86ClaimFixedResources) SYMFUNC(xf86AddEntityToScreen)