patch-2.3.99-pre6 linux/drivers/char/msp3400.c

• Lines: 61
• Date: Fri Apr 21 16:08:45 2000
• Orig file: v2.3.99-pre5/linux/drivers/char/msp3400.c
• Orig date: Tue Mar 7 14:32:25 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/drivers/char/msp3400.c linux/drivers/char/msp3400.c
@@ -34,6 +34,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -46,7 +47,7 @@
 #include <linux/videodev.h>
 #include <asm/semaphore.h>
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 #include <asm/pgtable.h>
 #include <linux/smp_lock.h>
 #endif
@@ -59,7 +60,6 @@
 #define WAIT_QUEUE                 wait_queue_head_t
 
 /* sound mixer stuff */ 
-#include <linux/config.h>
 #if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
 # define REGISTER_MIXER 1
 #endif
@@ -678,7 +678,7 @@
 	struct CARRIER_DETECT *cd;
 	int                   count, max1,max2,val1,val2, val,this;
     
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	lock_kernel();
 #endif
     
@@ -691,7 +691,7 @@
 
 	msp->thread = current;
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	unlock_kernel();
 #endif
 
@@ -933,7 +933,7 @@
 	struct msp3400c *msp = client->data;
 	int mode,val,i,std;
     
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	lock_kernel();
 #endif
     
@@ -946,7 +946,7 @@
 
 	msp->thread = current;
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	unlock_kernel();
 #endif