Unify code with kernel: Change some spacing in comments Add #include

    <linux/config.h> to all *_drv.c files

19 files changed, 29 insertions, 22 deletions

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 350d1ef9b..9ad83bde7 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -33,6 +33,7 @@
 #define _DRM_P_H_
 
 #ifdef __KERNEL__
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -129,7 +130,6 @@ typedef struct wait_queue *wait_queue_head_t;
 #endif
 
 				/* Generic cmpxchg added in 2.3.x */
-#if CPU != 386
 #ifndef __HAVE_ARCH_CMPXCHG
 				/* Include this here so that driver can be
                                    used with older kernels. */
@@ -164,10 +164,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
   ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),		\
 				 (unsigned long)(n),sizeof(*(ptr))))
 #endif
-#else
-				/* Compiling for a 386 proper... */
-#error DRI not supported on Intel 80386
-#endif
 
 				/* Macros to make printk easier */
 #define DRM_ERROR(fmt, arg...) \
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index b523db902..6f78fbc99 100644
--- a/linux-core/i810_drv.c
+++ b/linux-core/i810_drv.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "i810_drv.h"
diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c
index 4b2c835fa..e77d827b0 100644
--- a/linux-core/mga_drv.c
+++ b/linux-core/mga_drv.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "mga_drv.h"
diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 0c1e6fe5a..8b669888a 100644
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "r128_drv.h"
diff --git a/linux-core/tdfx_drv.c b/linux-core/tdfx_drv.c
index d8fef9538..582832b54 100644
--- a/linux-core/tdfx_drv.c
+++ b/linux-core/tdfx_drv.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "tdfx_drv.h"
diff --git a/linux/auth.c b/linux/auth.c
index b133bc506..9f81c5391 100644
--- a/linux/auth.c
+++ b/linux/auth.c
@@ -23,7 +23,7 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- * 
+ *
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
diff --git a/linux/drm.h b/linux/drm.h
index c71af2cc6..381bdbc59 100644
--- a/linux/drm.h
+++ b/linux/drm.h
@@ -11,11 +11,11 @@
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -23,7 +23,7 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
+ * 
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
diff --git a/linux/drmP.h b/linux/drmP.h
index 350d1ef9b..9ad83bde7 100644
--- a/linux/drmP.h
+++ b/linux/drmP.h
@@ -33,6 +33,7 @@
 #define _DRM_P_H_
 
 #ifdef __KERNEL__
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/miscdevice.h>
@@ -129,7 +130,6 @@ typedef struct wait_queue *wait_queue_head_t;
 #endif
 
 				/* Generic cmpxchg added in 2.3.x */
-#if CPU != 386
 #ifndef __HAVE_ARCH_CMPXCHG
 				/* Include this here so that driver can be
                                    used with older kernels. */
@@ -164,10 +164,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
   ((__typeof__(*(ptr)))__cmpxchg((ptr),(unsigned long)(o),		\
 				 (unsigned long)(n),sizeof(*(ptr))))
 #endif
-#else
-				/* Compiling for a 386 proper... */
-#error DRI not supported on Intel 80386
-#endif
 
 				/* Macros to make printk easier */
 #define DRM_ERROR(fmt, arg...) \
diff --git a/linux/fops.c b/linux/fops.c
index 1eb2bdac7..4ade7aa18 100644
--- a/linux/fops.c
+++ b/linux/fops.c
@@ -23,7 +23,7 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
+ * 
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *    Daryll Strauss <daryll@valinux.com>
diff --git a/linux/gamma_dma.c b/linux/gamma_dma.c
index eb78c0374..a99f24cae 100644
--- a/linux/gamma_dma.c
+++ b/linux/gamma_dma.c
@@ -23,7 +23,7 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
+ * 
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
diff --git a/linux/gamma_drv.c b/linux/gamma_drv.c
index a90f09b74..987c903d2 100644
--- a/linux/gamma_drv.c
+++ b/linux/gamma_drv.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "gamma_drv.h"
diff --git a/linux/gamma_drv.h b/linux/gamma_drv.h
index 55dc26bec..d7e70f7fc 100644
--- a/linux/gamma_drv.h
+++ b/linux/gamma_drv.h
@@ -24,6 +24,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@precisioninsight.com>
+ * 
  */
 
 #ifndef _GAMMA_DRV_H_
diff --git a/linux/i810_drv.c b/linux/i810_drv.c
index b523db902..6f78fbc99 100644
--- a/linux/i810_drv.c
+++ b/linux/i810_drv.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "i810_drv.h"
diff --git a/linux/mga_drv.c b/linux/mga_drv.c
index 4b2c835fa..e77d827b0 100644
--- a/linux/mga_drv.c
+++ b/linux/mga_drv.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "mga_drv.h"
diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index 0c1e6fe5a..8b669888a 100644
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -29,6 +29,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "r128_drv.h"
diff --git a/linux/tdfx_drv.c b/linux/tdfx_drv.c
index d8fef9538..582832b54 100644
--- a/linux/tdfx_drv.c
+++ b/linux/tdfx_drv.c
@@ -30,6 +30,7 @@
  *
  */
 
+#include <linux/config.h>
 #define EXPORT_SYMTAB
 #include "drmP.h"
 #include "tdfx_drv.h"
diff --git a/linux/tdfx_drv.h b/linux/tdfx_drv.h
index 6b1c208ef..879e6d37a 100644
--- a/linux/tdfx_drv.h
+++ b/linux/tdfx_drv.h
@@ -24,6 +24,9 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  * 
+ * Authors:
+ *    Rickard E. (Rik) Faith <faith@precisioninsight.com>
+ *    Daryll Strauss <daryll@precisioninsight.com>
  * 
  */
 
diff --git a/shared-core/drm.h b/shared-core/drm.h
index c71af2cc6..381bdbc59 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -11,11 +11,11 @@
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -23,7 +23,7 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
+ * 
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *
diff --git a/shared/drm.h b/shared/drm.h
index c71af2cc6..381bdbc59 100644
--- a/shared/drm.h
+++ b/shared/drm.h
@@ -11,11 +11,11 @@
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- *
+ * 
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- *
+ * 
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -23,7 +23,7 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
- *
+ * 
  * Authors:
  *    Rickard E. (Rik) Faith <faith@valinux.com>
  *