diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2011-06-22 00:28:18 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:00:58 -0700 |
| commit | 6e74fdda42fb4bd80fd48e1ae6471bffbb837804 (patch) | |
| tree | 378da0350ea825bcaaec2e2e01e44936040ef72b /hw/xfree86/common/xf86Extensions.c | |
| parent | 60f53e3012be795eee741ecd4be858552c5e86c8 (diff) | |
Move XFree86-VidMode from extmod to built-in
As with DGA, move VidMode from being part of extmod to a built-in part
of the server, if compiled as such. This is initialised from
xf86ExtensionInit rather than miinitext because it's wholly dependent on
the Xorg DDX.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/xfree86/common/xf86Extensions.c')
| -rw-r--r-- | hw/xfree86/common/xf86Extensions.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c index 5ee6be88f..63950e6a3 100644 --- a/hw/xfree86/common/xf86Extensions.c +++ b/hw/xfree86/common/xf86Extensions.c @@ -45,10 +45,24 @@ #include <X11/extensions/xf86dgaproto.h> #endif +#ifdef XF86VIDMODE +#include <X11/extensions/xf86vmproto.h> +#include "vidmodeproc.h" +#endif + /* * DDX-specific extensions. */ static ExtensionModule extensionModules[] = { +#ifdef XF86VIDMODE + { + XFree86VidModeExtensionInit, + XF86VIDMODENAME, + &noXFree86VidModeExtension, + NULL, + NULL + }, +#endif #ifdef XFreeXDGA { XFree86DGAExtensionInit, |