lkml.org 
[lkml]   [2004]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[2.6 patch] OSS: remove #ifdef's for kernel 2.0
The patch below removes two #ifdef's for kernel 2.0 from OSS.

Please apply
Adrian

--- linux-2.6.2-mm1/sound/oss/msnd.c.old 2004-02-07 20:07:00.000000000 +0100
+++ linux-2.6.2-mm1/sound/oss/msnd.c 2004-02-07 20:07:16.000000000 +0100
@@ -25,9 +25,6 @@
********************************************************************/

#include <linux/version.h>
-#if LINUX_VERSION_CODE < 0x020101
-# define LINUX20
-#endif
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -35,18 +32,10 @@
#include <linux/types.h>
#include <linux/delay.h>
#include <linux/mm.h>
-#ifdef LINUX20
-# include <linux/major.h>
-# include <linux/fs.h>
-# include <linux/sound.h>
-# include <asm/segment.h>
-# include "sound_config.h"
-#else
-# include <linux/init.h>
-# include <asm/io.h>
-# include <asm/uaccess.h>
-# include <linux/spinlock.h>
-#endif
+#include <linux/init.h>
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <linux/spinlock.h>
#include <asm/irq.h>
#include "msnd.h"

--- linux-2.6.2-mm1/sound/oss/os.h.old 2004-02-07 20:09:31.000000000 +0100
+++ linux-2.6.2-mm1/sound/oss/os.h 2004-02-07 20:09:38.000000000 +0100
@@ -7,10 +7,6 @@
#include <linux/module.h>
#include <linux/version.h>

-#if LINUX_VERSION_CODE > 131328
-#define LINUX21X
-#endif
-
#ifdef __KERNEL__
#include <linux/utsname.h>
#include <linux/string.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:00    [W:5.070 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site