Changeset 98

Timestamp:

May 7, 2007, 1:23:04 AM (18 years ago)

Author:

Brendan Oakley

Message:

Re-merged sound.c to beta12 to fix some errors, added adriver.h from beta12

Location:

GPL/branches/alsa-resync1/alsa-kernel

Files:

• core/sound.c (modified) (4 diffs)
• include/sound/adriver.h (added)

GPL/branches/alsa-resync1/alsa-kernel/core/sound.c

@@ -20 +20 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
@@ -27 +30 @@
 #include <sound/control.h>
 #include <sound/initval.h>
-#ifdef CONFIG_KMOD
 #include <linux/kmod.h>
-#endif
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
@@ -126 +127 @@
 static int snd_open(struct inode *inode, struct file *file)
 {
-    int minor = MINOR(inode->i_rdev);
+        int minor = minor(inode->i_rdev);
     int card = SNDRV_MINOR_CARD(minor);
     int dev = SNDRV_MINOR_DEVICE(minor);
@@ -171 +172 @@
 struct file_operations snd_fops =
 {
-#ifdef LINUX_2_3
+#ifndef LINUX_2_2
 owner:          THIS_MODULE,
 #endif