From 2fbd4bf0189cf6d421000c7eea85fee3b9c79ed0 Mon Sep 17 00:00:00 2001
From: Rik Faith <faith@alephnull.com>
Date: Tue, 13 Jun 2000 14:34:13 +0000
Subject: Unify code with kernel: Change some spacing in comments Add #include 
    <linux/config.h> to all *_drv.c files

---
 linux-core/drmP.h     | 6 +-----
 linux-core/i810_drv.c | 1 +
 linux-core/mga_drv.c  | 1 +
 linux-core/r128_drv.c | 1 +
 linux-core/tdfx_drv.c | 1 +
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'linux-core')

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index 350d1ef9..9ad83bde 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. */
@@ -163,10 +163,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 #define cmpxchg(ptr,o,n)						\
   ((__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 */
diff --git a/linux-core/i810_drv.c b/linux-core/i810_drv.c
index b523db90..6f78fbc9 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 4b2c835f..e77d827b 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 0c1e6fe5..8b669888 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 d8fef953..582832b5 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"
-- 
cgit v1.2.3