Changeset 598 for GPL/trunk/alsa-kernel/drivers/virmidi.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/drivers/virmidi.c (modified) (2 diffs)

GPL/trunk/alsa-kernel/drivers/virmidi.c

@@ -46 +46 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/seq_kernel.h>
@@ -64 +64 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
 static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};