From 0292cbac7b64aebe70bb9002e2a20a4b66fd457e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= <marcin.slusarz@gmail.com>
Date: Fri, 14 Dec 2007 12:58:45 +0100
Subject: [PATCH] --- yaml --- r: 81555 b: refs/heads/master c:
 36b9cdfea64650069d985c5999cb5c2b6f8b85fb h: refs/heads/master i:   81553:
 26f81a16871cf28efb9d6d8ac38fe3076938bbdd   81551:
 548ad45bee7f2cdeb65d5f14aa6b5380c972bfcb v: v3

---
 [refs]                      | 2 +-
 trunk/include/sound/info.h  | 2 ++
 trunk/sound/core/info_oss.c | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 53e7c8ffb10d..0a0d6be0d3f5 100644
--- 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
index fecbb1ffd540..8ae72e74f898 100644
--- 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
index 435c9399f7a9..9e8b8163bdd4 100644
--- 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;