Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

This commit is contained in:
Daniel Stone 2006-07-22 12:07:22 -04:00 • committed by Daniel Stone
commit a73cef1f00
9 changed files with 20 additions and 357 deletions

View file

@ -354,9 +354,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86RegisterStateChangeNotificationCallback)
SYMFUNC(xf86DeregisterStateChangeNotificationCallback)
SYMFUNC(xf86NoSharedResources)
#ifdef async
SYMFUNC(xf86QueueAsyncEvent)
#endif
/* Shared Accel Accessor Functions */
SYMFUNC(xf86GetLastScrnFlag)
SYMFUNC(xf86SetLastScrnFlag)
@ -1139,9 +1136,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMVAR(xf86DummyVar3)
#endif
#ifdef async
SYMVAR(xf86CurrentScreen)
#endif
/* predefined resource lists from xf86Bus.h */
SYMVAR(resVgaExclusive)
SYMVAR(resVgaShared)