diff options
author | Adrian Bunk <bunk@stusta.de> | 2005-06-25 17:58:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 19:25:01 -0400 |
commit | f040ffab7488c02c0806ec8808fa619d463560f9 (patch) | |
tree | 01414de1e3abf227b165cc34a0b5ebb911a956e2 /sound/oss | |
parent | 4f00945a8e35e46b98f3ec4adae747397393e3ee (diff) |
[PATCH] sound/oss/rme96xx.c: remove kernel 2.2 #if's
This patch removes #if's for kernel 2.2 .
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/rme96xx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c index b4278eecc917..7609c68a89f4 100644 --- a/sound/oss/rme96xx.c +++ b/sound/oss/rme96xx.c | |||
@@ -1750,9 +1750,7 @@ static unsigned int rme96xx_poll(struct file *file, struct poll_table_struct *wa | |||
1750 | 1750 | ||
1751 | 1751 | ||
1752 | static struct file_operations rme96xx_audio_fops = { | 1752 | static struct file_operations rme96xx_audio_fops = { |
1753 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) | ||
1754 | .owner = THIS_MODULE, | 1753 | .owner = THIS_MODULE, |
1755 | #endif | ||
1756 | .read = rme96xx_read, | 1754 | .read = rme96xx_read, |
1757 | .write = rme96xx_write, | 1755 | .write = rme96xx_write, |
1758 | .poll = rme96xx_poll, | 1756 | .poll = rme96xx_poll, |
@@ -1852,9 +1850,7 @@ static int rme96xx_mixer_release(struct inode *inode, struct file *file) | |||
1852 | } | 1850 | } |
1853 | 1851 | ||
1854 | static /*const*/ struct file_operations rme96xx_mixer_fops = { | 1852 | static /*const*/ struct file_operations rme96xx_mixer_fops = { |
1855 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) | ||
1856 | .owner = THIS_MODULE, | 1853 | .owner = THIS_MODULE, |
1857 | #endif | ||
1858 | .ioctl = rme96xx_mixer_ioctl, | 1854 | .ioctl = rme96xx_mixer_ioctl, |
1859 | .open = rme96xx_mixer_open, | 1855 | .open = rme96xx_mixer_open, |
1860 | .release = rme96xx_mixer_release, | 1856 | .release = rme96xx_mixer_release, |