From: Adrian Bunk <bunk@fs.tum.de>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [2.6 patch] OSS: remove #ifdef's for kernel 2.0
Date: Sat, 7 Feb 2004 20:20:13 +0100 [thread overview]
Message-ID: <20040207192013.GP26093@fs.tum.de> (raw)
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>
reply other threads:[~2004-02-07 19:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040207192013.GP26093@fs.tum.de \
--to=bunk@fs.tum.de \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox