diff options
| author | Ian Romanick <idr@us.ibm.com> | 2006-12-08 17:24:15 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2006-12-08 17:24:15 -0800 |
| commit | e1f73d220873fa091695e46b7fcd008663a95a6f (patch) | |
| tree | e6e58038b6aea53eca32326a903de4074600df54 /hw/xfree86/loader/xf86sym.c | |
| parent | 27d682fa030501611a5b52f41f29738134b45c0b (diff) | |
| parent | d56249a15ead51ad4d2117d5538ada24af05b693 (diff) | |
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/common/xf86Configure.c
hw/xfree86/common/xf86Helper.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/lnx_pci.c
hw/xfree86/scanpci/Makefile.am
hw/xfree86/utils/pcitweak/Makefile.am
hw/xfree86/utils/scanpci/Makefile.am
Diffstat (limited to 'hw/xfree86/loader/xf86sym.c')
| -rw-r--r-- | hw/xfree86/loader/xf86sym.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 1c3384d9d..5e7a288b6 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -68,7 +68,6 @@ # include "xf86Xinput.h" #endif #include "xf86OSmouse.h" -#include "xf86OSKbd.h" #include "xf86xv.h" #include "xf86xvmc.h" #include "xf86cmap.h" @@ -277,7 +276,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86SerialModemClearBits) SYMFUNC(xf86LoadKernelModule) SYMFUNC(xf86OSMouseInit) - SYMFUNC(xf86OSKbdPreInit) SYMFUNC(xf86AgpGARTSupported) SYMFUNC(xf86GetAGPInfo) SYMFUNC(xf86AcquireGART) @@ -287,10 +285,8 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86BindGARTMemory) SYMFUNC(xf86UnbindGARTMemory) SYMFUNC(xf86EnableAGP) - SYMFUNC(xf86SoundKbdBell) SYMFUNC(xf86GARTCloseScreen) #ifdef XINPUT - /* XISB routines (Merged from Metrolink tree) */ SYMFUNC(XisbNew) SYMFUNC(XisbFree) SYMFUNC(XisbRead) @@ -489,7 +485,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86AddModuleInfo) SYMFUNC(xf86DeleteModuleInfo) -#if defined(__sparc__) && !defined(__OpenBSD__) +#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__) /* xf86sbusBus.c */ SYMFUNC(xf86MatchSbusInstances) SYMFUNC(xf86GetSbusInfoForEntity) @@ -682,22 +678,15 @@ _X_HIDDEN void *xfree86LookupTab[] = { /* xf86Xinput.c */ #ifdef XINPUT SYMFUNC(xf86ProcessCommonOptions) - SYMFUNC(xf86IsCorePointer) SYMFUNC(xf86PostMotionEvent) SYMFUNC(xf86PostProximityEvent) SYMFUNC(xf86PostButtonEvent) SYMFUNC(xf86PostKeyEvent) SYMFUNC(xf86PostKeyboardEvent) - SYMFUNC(xf86GetMotionEvents) - SYMFUNC(xf86MotionHistoryAllocate) SYMFUNC(xf86FirstLocalDevice) - SYMFUNC(xf86eqEnqueue) SYMFUNC(xf86ActivateDevice) -/* The following segment merged from Metrolink tree */ SYMFUNC(xf86XInputSetScreen) SYMFUNC(xf86ScaleAxis) - SYMFUNC(xf86XInputSetSendCoreEvents) -/* End merged segment */ #endif #ifdef DPMSExtension SYMFUNC(DPMSGet) |