From b6a4d61f841173846125f140d6c64744b95b63e1 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Wed, 23 Nov 2005 13:14:50 +0100
Subject: [PATCH] --- yaml --- r: 16127 b: refs/heads/master c:
 18612048b3e951f7e0ae9be65efe9e8cfde868a6 h: refs/heads/master i:   16125:
 5100d595a20ff1e1f7da8fb71bc9ab0057a42890   16123:
 b1fb92bbcf91a7327bcf22021322ad7c3e6b773f   16119:
 9523647a586d385d357a2f8fe6965fb06b3ea6cb   16111:
 7065e8df0a4fadac14d268eba73825adc1a383bc   16095:
 1e34f015805adc66e6581a1e52bda2ba09120ab2   16063:
 d310b31a8a70d4055d706b996f047048a59ce6e0   15999:
 a0e5f15a9d6f0e257ac7b7fa8c25698654b318e7   15871:
 96b097471a5efccf41a91bd7ac0dc96c72b4d8c2 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/core/rawmidi.c     | 5 ++---
 trunk/sound/pci/hda/hda_proc.c | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d9d46d2981c2..a420a1d3276c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a1a2a1d4eeda00df45ccf7a3a375d1887f1efb3
+refs/heads/master: 18612048b3e951f7e0ae9be65efe9e8cfde868a6
diff --git a/trunk/sound/core/rawmidi.c b/trunk/sound/core/rawmidi.c
index 587ea1eb3197..d4d124e21924 100644
--- a/trunk/sound/core/rawmidi.c
+++ b/trunk/sound/core/rawmidi.c
@@ -534,8 +534,8 @@ static int snd_rawmidi_release(struct inode *inode, struct file *file)
 	return err;
 }
 
-int snd_rawmidi_info(struct snd_rawmidi_substream *substream,
-		     struct snd_rawmidi_info *info)
+static int snd_rawmidi_info(struct snd_rawmidi_substream *substream,
+			    struct snd_rawmidi_info *info)
 {
 	struct snd_rawmidi *rmidi;
 	
@@ -1694,7 +1694,6 @@ EXPORT_SYMBOL(snd_rawmidi_transmit_ack);
 EXPORT_SYMBOL(snd_rawmidi_transmit);
 EXPORT_SYMBOL(snd_rawmidi_new);
 EXPORT_SYMBOL(snd_rawmidi_set_ops);
-EXPORT_SYMBOL(snd_rawmidi_info);
 EXPORT_SYMBOL(snd_rawmidi_info_select);
 EXPORT_SYMBOL(snd_rawmidi_kernel_open);
 EXPORT_SYMBOL(snd_rawmidi_kernel_release);
diff --git a/trunk/sound/pci/hda/hda_proc.c b/trunk/sound/pci/hda/hda_proc.c
index 8cc5773958f6..ca514a6a5875 100644
--- a/trunk/sound/pci/hda/hda_proc.c
+++ b/trunk/sound/pci/hda/hda_proc.c
@@ -26,6 +26,7 @@
 #include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
+#include "hda_local.h"
 
 static const char *get_wid_type_name(unsigned int wid_value)
 {