From f952d0d771de6d9b8ecc3cbbe3624203723bbb25 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 30 Sep 2010 09:49:59 +0000
Subject: xserver libX11 xkeyboard-config git update 30/9/2010

---
 xorg-server/hw/xfree86/i2c/msp3430_module.c | 57 +++++++++++++----------------
 1 file changed, 25 insertions(+), 32 deletions(-)

(limited to 'xorg-server/hw/xfree86/i2c/msp3430_module.c')

diff --git a/xorg-server/hw/xfree86/i2c/msp3430_module.c b/xorg-server/hw/xfree86/i2c/msp3430_module.c
index 66b14a277..c5c24635f 100644
--- a/xorg-server/hw/xfree86/i2c/msp3430_module.c
+++ b/xorg-server/hw/xfree86/i2c/msp3430_module.c
@@ -1,32 +1,25 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(msp3430Setup);
-
-static XF86ModuleVersionInfo msp3430VersRec =
-{
-        "msp3430",
-        MODULEVENDORSTRING,
-        MODINFOSTRING1,
-        MODINFOSTRING2,
-        XORG_VERSION_CURRENT,
-        1, 0, 0,
-        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */
-        ABI_VIDEODRV_VERSION,
-        MOD_CLASS_NONE,
-        {0,0,0,0}
-};
- 
-_X_EXPORT XF86ModuleData msp3430ModuleData = {
-        &msp3430VersRec,
-        msp3430Setup,
-        NULL
-}; 
-
-static pointer
-msp3430Setup(pointer module, pointer opts, int *errmaj, int *errmin) {
-   return (pointer)1;
-}
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Module.h"
+
+static XF86ModuleVersionInfo msp3430VersRec =
+{
+        "msp3430",
+        MODULEVENDORSTRING,
+        MODINFOSTRING1,
+        MODINFOSTRING2,
+        XORG_VERSION_CURRENT,
+        1, 0, 0,
+        ABI_CLASS_VIDEODRV,             /* This needs the video driver ABI */
+        ABI_VIDEODRV_VERSION,
+        MOD_CLASS_NONE,
+        {0,0,0,0}
+};
+ 
+_X_EXPORT XF86ModuleData msp3430ModuleData = {
+        &msp3430VersRec,
+        NULL,
+        NULL
+}; 
-- 
cgit v1.2.3