---

yaml --- r: 81555 b: refs/heads/master c: 36b9cdf h: refs/heads/master i: 81553: 26f81a1 81551: 548ad45 v: v3
git-mirror · Jan 31, 2008 · 0292cba · 0292cba
1 parent e0e333d
commit 0292cba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67c393172c00a710121d61bb7aff31b1e4f44b8d
+refs/heads/master: 36b9cdfea64650069d985c5999cb5c2b6f8b85fb
diff --git a/trunk/include/sound/info.h b/trunk/include/sound/info.h
@@ -100,8 +100,10 @@ int snd_info_minor_unregister(void);
 extern struct snd_info_entry *snd_seq_root;
 #ifdef CONFIG_SND_OSSEMUL
 extern struct snd_info_entry *snd_oss_root;
+void snd_card_info_read_oss(struct snd_info_buffer *buffer);
 #else
 #define snd_oss_root NULL
+static inline void snd_card_info_read_oss(struct snd_info_buffer *buffer) {}
 #endif
 
 int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3)));

diff --git a/trunk/sound/core/info_oss.c b/trunk/sound/core/info_oss.c
@@ -66,8 +66,6 @@ int snd_oss_info_register(int dev, int num, char *string)
 
 EXPORT_SYMBOL(snd_oss_info_register);
 
-extern void snd_card_info_read_oss(struct snd_info_buffer *buffer);
-
 static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev)
 {
 	int idx, ok = -1;