diff options
author | marha <marha@users.sourceforge.net> | 2010-09-30 09:49:59 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-09-30 09:49:59 +0000 |
commit | f952d0d771de6d9b8ecc3cbbe3624203723bbb25 (patch) | |
tree | 6dd2d11e017529c66f2489000136201829dc3b9d /xorg-server/hw/xfree86/vbe | |
parent | f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8 (diff) | |
download | vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.tar.gz vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.tar.bz2 vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.zip |
xserver libX11 xkeyboard-config git update 30/9/2010
Diffstat (limited to 'xorg-server/hw/xfree86/vbe')
-rw-r--r-- | xorg-server/hw/xfree86/vbe/vbe_module.c | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/xorg-server/hw/xfree86/vbe/vbe_module.c b/xorg-server/hw/xfree86/vbe/vbe_module.c index cf37ef951..5aba16f51 100644 --- a/xorg-server/hw/xfree86/vbe/vbe_module.c +++ b/xorg-server/hw/xfree86/vbe/vbe_module.c @@ -1,31 +1,23 @@ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86.h" -#include "xf86str.h" -#include "vbe.h" - -static MODULESETUPPROTO(vbeSetup); - -static XF86ModuleVersionInfo vbeVersRec = -{ - "vbe", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 1, 0, - ABI_CLASS_VIDEODRV, /* needs the video driver ABI */ - ABI_VIDEODRV_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} -}; - -_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL }; - -static pointer -vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin) -{ - return (pointer)1; -} +#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86str.h"
+#include "vbe.h"
+
+static XF86ModuleVersionInfo vbeVersRec =
+{
+ "vbe",
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+ XORG_VERSION_CURRENT,
+ 1, 1, 0,
+ ABI_CLASS_VIDEODRV, /* needs the video driver ABI */
+ ABI_VIDEODRV_VERSION,
+ MOD_CLASS_NONE,
+ {0,0,0,0}
+};
+
+_X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, NULL, NULL };
|