diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index e5641ca1c..3f0ddd3d3 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -37,7 +37,7 @@ #include "xf86Bus.h" -#include "xf86sbusBus.h" +#include "xf86sbusBus_priv.h" #include "xf86Sbus.h" Bool sbusSlotClaimed = FALSE; diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 9375605fc..04c928aee 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -95,8 +95,6 @@ extern _X_EXPORT int promGetBool(const char *prop); extern _X_EXPORT int sparcPromInit(void); extern _X_EXPORT void sparcPromClose(void); -extern _X_EXPORT char *sparcPromGetProperty(sbusPromNodePtr pnode, - const char *prop, int *lenp); extern _X_EXPORT int sparcPromGetBool(sbusPromNodePtr pnode, const char *prop); extern _X_EXPORT void sparcPromAssignNodes(void); extern _X_EXPORT char *sparcPromNode2Pathname(sbusPromNodePtr pnode); diff --git a/hw/xfree86/common/xf86sbusBus_priv.h b/hw/xfree86/common/xf86sbusBus_priv.h index da4bf0a6c..9fee02f20 100644 --- a/hw/xfree86/common/xf86sbusBus_priv.h +++ b/hw/xfree86/common/xf86sbusBus_priv.h @@ -14,4 +14,6 @@ Bool xf86SbusConfigure(void *busData, sbusDevicePtr sBus); void xf86SbusConfigureNewDev(void *busData, sbusDevicePtr sBus, GDevRec* GDev); void xf86SbusProbe(void); +char *sparcPromGetProperty(sbusPromNodePtr pnode, const char *prop, int *lenp); + #endif /* _XSERVER_XF86_SBUSBUS_H */ diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index e27a13dfa..e0e6bdc47 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -38,7 +38,7 @@ #include "xf86Priv.h" #include "xf86_OSlib.h" -#include "xf86sbusBus.h" +#include "xf86sbusBus_priv.h" #include "xf86Sbus.h" int promRootNode;