svn merge ^/branches/released .

7 files changed, 171 insertions, 220 deletions

diff --git a/xorg-server/hw/xfree86/i2c/bt829_module.c b/xorg-server/hw/xfree86/i2c/bt829_module.c
index c885b8e10..12801fbf3 100644
--- a/xorg-server/hw/xfree86/i2c/bt829_module.c
+++ b/xorg-server/hw/xfree86/i2c/bt829_module.c
@@ -1,28 +1,21 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(bt829Setup);
-
-static XF86ModuleVersionInfo bt829VersRec =
-{
-        "bt829",
-        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 bt829ModuleData = { &bt829VersRec, bt829Setup, NULL }; 
-
-static pointer
-bt829Setup(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 bt829VersRec =

+{

+        "bt829",

+        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 bt829ModuleData = { &bt829VersRec, NULL, NULL }; 

diff --git a/xorg-server/hw/xfree86/i2c/fi1236_module.c b/xorg-server/hw/xfree86/i2c/fi1236_module.c
index 4016ad0d4..7375e0fb9 100644
--- a/xorg-server/hw/xfree86/i2c/fi1236_module.c
+++ b/xorg-server/hw/xfree86/i2c/fi1236_module.c
@@ -1,32 +1,25 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(fi1236Setup);
-
-static XF86ModuleVersionInfo fi1236VersRec =
-{
-        "fi1236",
-        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 fi1236ModuleData = {
-        &fi1236VersRec,
-        fi1236Setup,
-        NULL
-}; 
-
-static pointer
-fi1236Setup(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 fi1236VersRec =

+{

+        "fi1236",

+        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 fi1236ModuleData = {

+        &fi1236VersRec,

+        NULL,

+        NULL

+}; 

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

+}; 

diff --git a/xorg-server/hw/xfree86/i2c/tda8425_module.c b/xorg-server/hw/xfree86/i2c/tda8425_module.c
index 7906e5ea5..936281460 100644
--- a/xorg-server/hw/xfree86/i2c/tda8425_module.c
+++ b/xorg-server/hw/xfree86/i2c/tda8425_module.c
@@ -1,32 +1,25 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(tda8425Setup);
-
-static XF86ModuleVersionInfo tda8425VersRec =
-{
-        "tda8425",
-        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 tda8425ModuleData = {
-        &tda8425VersRec,
-        tda8425Setup,
-        NULL
-}; 
-
-static pointer
-tda8425Setup(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 tda8425VersRec =

+{

+        "tda8425",

+        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 tda8425ModuleData = {

+        &tda8425VersRec,

+        NULL,

+        NULL

+}; 

diff --git a/xorg-server/hw/xfree86/i2c/tda9850_module.c b/xorg-server/hw/xfree86/i2c/tda9850_module.c
index 84f7e861e..239cff4fd 100644
--- a/xorg-server/hw/xfree86/i2c/tda9850_module.c
+++ b/xorg-server/hw/xfree86/i2c/tda9850_module.c
@@ -1,32 +1,25 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(tda9850Setup);
-
-static XF86ModuleVersionInfo tda9850VersRec =
-{
-        "tda9850",
-        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 tda9850ModuleData = {
-        &tda9850VersRec,
-        tda9850Setup,
-        NULL
-}; 
-
-static pointer
-tda9850Setup(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 tda9850VersRec =

+{

+        "tda9850",

+        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 tda9850ModuleData = {

+        &tda9850VersRec,

+        NULL,

+        NULL

+}; 

diff --git a/xorg-server/hw/xfree86/i2c/tda9885_module.c b/xorg-server/hw/xfree86/i2c/tda9885_module.c
index 0ce85bba3..51eaca7e8 100644
--- a/xorg-server/hw/xfree86/i2c/tda9885_module.c
+++ b/xorg-server/hw/xfree86/i2c/tda9885_module.c
@@ -1,32 +1,25 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(tda9885Setup);
-
-static XF86ModuleVersionInfo tda9885VersRec =
-{
-        "tda9885",
-        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 tda9885ModuleData = {
-        &tda9885VersRec,
-        tda9885Setup,
-        NULL
-}; 
-
-static pointer
-tda9885Setup(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 tda9885VersRec =

+{

+        "tda9885",

+        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 tda9885ModuleData = {

+        &tda9885VersRec,

+        NULL,

+        NULL

+}; 

diff --git a/xorg-server/hw/xfree86/i2c/uda1380_module.c b/xorg-server/hw/xfree86/i2c/uda1380_module.c
index 895f8c6f2..203055d46 100644
--- a/xorg-server/hw/xfree86/i2c/uda1380_module.c
+++ b/xorg-server/hw/xfree86/i2c/uda1380_module.c
@@ -1,32 +1,25 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static MODULESETUPPROTO(uda1380Setup);
-
-static XF86ModuleVersionInfo uda1380VersRec =
-{
-        "uda1380",
-        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 uda1380ModuleData = {
-        &uda1380VersRec,
-        uda1380Setup,
-        NULL
-}; 
-
-static pointer
-uda1380Setup(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 uda1380VersRec =

+{

+        "uda1380",

+        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 uda1380ModuleData = {

+        &uda1380VersRec,

+        NULL,

+        NULL

+};