Skip to contentSkip to conversation

OSS: remove #ifdef's for kernel 2.0

PATCH New Adrian Bunk 1 participant 1 message Feb 7, 2004 Sound

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 OSS: remove #ifdef's for kernel 2.0

The patch below removes two #ifdef's for kernel 2.0 from OSS.

Please apply
Adrian

sound/oss/msnd.c renamed from sound/oss/msnd.c.old +4 -15
@@ -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"
sound/oss/os.h renamed from sound/oss/os.h.old +0 -4
@@ -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>