diff options
| author | Ian Romanick <idr@umwelt.(none)> | 2006-07-31 09:26:04 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@umwelt.(none)> | 2006-07-31 09:26:04 -0700 |
| commit | 69533fc04f38c67fd424776c5191a4ba57ba8c8f (patch) | |
| tree | b260e1e2a35c02fee21d93e1dcd119cde15589f0 /hw/xfree86/loader/xf86sym.c | |
| parent | ef1aecaaf6cd7e9e4f9d0c6373664e774500bc13 (diff) | |
| parent | 24051ef97406f28c102cf46a78223400b61fdae2 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86AutoConfig.c
Diffstat (limited to 'hw/xfree86/loader/xf86sym.c')
| -rw-r--r-- | hw/xfree86/loader/xf86sym.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 06f787ccb..e6ec153b5 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -357,6 +357,9 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86AllocateEntityPrivateIndex) SYMFUNC(xf86GetEntityPrivate) + /* xf86cvt.c */ + SYMFUNC(xf86CVTMode) + /* xf86Configure.c */ SYMFUNC(xf86AddDeviceToConfigure) |