Update of /cvsroot/alsa/alsa-kernel/core/oss
In directory sc8-pr-cvs1:/tmp/cvs-serv28257
Modified Files:
mixer_oss.c pcm_oss.c
Log Message:
2.5 cleanups
Index: mixer_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/mixer_oss.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mixer_oss.c 30 May 2003 12:28:33 -0000 1.22
+++ mixer_oss.c 31 May 2003 11:21:09 -0000 1.23
@@ -376,9 +376,7 @@
static struct file_operations snd_mixer_oss_f_ops =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.open = snd_mixer_oss_open,
.release = snd_mixer_oss_release,
.ioctl = snd_mixer_oss_ioctl,
Index: pcm_oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/oss/pcm_oss.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- pcm_oss.c 24 Apr 2003 18:00:03 -0000 1.35
+++ pcm_oss.c 31 May 2003 11:21:09 -0000 1.36
@@ -1981,11 +1981,7 @@
if (runtime->oss.plugin_first != NULL)
return -EIO;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 3, 25)
if (area->vm_pgoff != 0)
-#else
- if (area->vm_offset != 0)
-#endif
return -EINVAL;
err = snd_pcm_mmap_data(substream, file, area);
@@ -2148,9 +2144,7 @@
static struct file_operations snd_pcm_oss_f_reg =
{
-#ifndef LINUX_2_2
.owner = THIS_MODULE,
-#endif
.read = snd_pcm_oss_read,
.write = snd_pcm_oss_write,
.open = snd_pcm_oss_open,
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
