Changeset 250 for GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

Timestamp:

Aug 27, 2007, 7:41:50 PM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to ALSA 0.9.5

File:

• GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c (modified) (2 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

@@ -22 +22 @@
 #include <linux/version.h>
 #include <linux/init.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)
+#ifndef TARGET_OS2 //TODO: Implement linux/jiffies.h
 #include <linux/jiffies.h>
-#else
-#include <linux/sched.h>
-#endif
+#endif /* !TARGET_OS2 */
 #include <linux/slab.h>
 #include <linux/time.h>
@@ -60 +58 @@
 #define MAX_BUFFER_SIZE         (256 * 1024)
 #define USE_FORMATS             SNDRV_PCM_FMTBIT_S32_LE
-#define USE_CHANNELS_MIN        12
-#define USE_CHANNELS_MAX        12
+#define USE_CHANNELS_MIN        10
+#define USE_CHANNELS_MAX        10
 #define USE_PERIODS_MIN         1
 #define USE_PERIODS_MAX         1024