diff options
author | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-09 08:17:19 +0200 |
commit | 98fa64178af8ad608e19391053b40b0772466c64 (patch) | |
tree | 841e3eebe0277bdf98441dd45224c039e069d3b8 /xorg-server/hw/xfree86/os-support/xf86_OSproc.h | |
parent | 405ae9defaaa03d4d305b6264a744107c3dd460d (diff) | |
parent | c29d91cfd8df084f16d0d2dfa82c3a86f7719a73 (diff) | |
download | vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.gz vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.tar.bz2 vcxsrv-98fa64178af8ad608e19391053b40b0772466c64.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/include/misc.h
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/xf86_OSproc.h')
-rw-r--r-- | xorg-server/hw/xfree86/os-support/xf86_OSproc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h index e171146dd..2f0172e15 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h @@ -221,6 +221,12 @@ extern _X_EXPORT void xf86InitVidMem(void); #endif /* XF86_OS_PRIVS */ +#ifdef XSERVER_PLATFORM_BUS +#include "hotplug.h" +void +xf86PlatformDeviceProbe(struct OdevAttributes *attribs); +#endif + _XFUNCPROTOEND #endif /* NO_OSLIB_PROTOTYPES */ #endif /* _XF86_OSPROC_H */ |