* [2.6 patch] OSS: remove #ifdef's for kernel 2.0
@ 2004-02-07 19:20 Adrian Bunk
0 siblings, 0 replies; only message in thread
From: Adrian Bunk @ 2004-02-07 19:20 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-kernel
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>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-02-07 19:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-02-07 19:20 [2.6 patch] OSS: remove #ifdef's for kernel 2.0 Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox