aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common/xf86Priv.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-25 08:57:48 +0000
committermarha <marha@users.sourceforge.net>2010-05-25 08:57:48 +0000
commit4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f (patch)
tree456b739c6aed0350fa1f1faa5e48c00d6aa8c186 /xorg-server/hw/xfree86/common/xf86Priv.h
parent33b487abbf3fa5c2798f7a753607fb227878e119 (diff)
parent74fa9a70a4817660f1c2ec3b3cc2bbe56db4fc58 (diff)
downloadvcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.tar.gz
vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.tar.bz2
vcxsrv-4d1b98ace5efb02c14c7a4e36fc2698a1e00b66f.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Priv.h')
-rw-r--r--xorg-server/hw/xfree86/common/xf86Priv.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index b0a0f44cc..17fd5aaa9 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -110,14 +110,10 @@ extern _X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable;
#ifndef _NO_XF86_PROTOTYPES
/* xf86Bus.c */
-
extern _X_EXPORT Bool xf86BusConfig(void);
extern _X_EXPORT void xf86BusProbe(void);
extern _X_EXPORT void xf86AccessEnter(void);
extern _X_EXPORT void xf86AccessLeave(void);
-
-extern _X_EXPORT void xf86FindPrimaryDevice(void);
-/* new RAC */
extern _X_EXPORT void xf86PostProbe(void);
extern _X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex);
extern _X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev);