[SCSI] lpfc 8.1.2: Allow turning on internal loop-back mode

[powerpc.git] / sound / core / info_oss.c

diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index f9e4ce4..820f477 100644 (file)
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -22,6 +22,7 @@
 #include <sound/driver.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/string.h>
 #include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/info.h>
@@ -36,7 +37,7 @@
 
 static DECLARE_MUTEX(strings);
 static char *snd_sndstat_strings[SNDRV_CARDS][SNDRV_OSS_INFO_DEV_COUNT];
-static snd_info_entry_t *snd_sndstat_proc_entry;
+static struct snd_info_entry *snd_sndstat_proc_entry;
 
 int snd_oss_info_register(int dev, int num, char *string)
 {
@@ -51,7 +52,7 @@ int snd_oss_info_register(int dev, int num, char *string)
                        x = NULL;
                }
        } else {
-               x = snd_kmalloc_strdup(string, GFP_KERNEL);
+               x = kstrdup(string, GFP_KERNEL);
                if (x == NULL) {
                        up(&strings);
                        return -ENOMEM;
@@ -62,9 +63,9 @@ int snd_oss_info_register(int dev, int num, char *string)
        return 0;
 }
 
-extern void snd_card_info_read_oss(snd_info_buffer_t * buffer);
+extern void snd_card_info_read_oss(struct snd_info_buffer *buffer);
 
-static int snd_sndstat_show_strings(snd_info_buffer_t * buf, char *id, int dev)
+static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev)
 {
        int idx, ok = -1;
        char *str;
@@ -87,7 +88,8 @@ static int snd_sndstat_show_strings(snd_info_buffer_t * buf, char *id, int dev)
        return ok;
 }
 
-static void snd_sndstat_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer)
+static void snd_sndstat_proc_read(struct snd_info_entry *entry,
+                                 struct snd_info_buffer *buffer)
 {
        snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");
        snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",
@@ -110,7 +112,7 @@ static void snd_sndstat_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * b
 
 int snd_info_minor_register(void)
 {
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
 
        memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));
        if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) {