From a3069a3081e67c2af85dc7d055419b09f238de86 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 7 Oct 2008 11:38:09 +0200
Subject: [PATCH] --- yaml --- r: 111082 b: refs/heads/master c:
 ff33f2303b0ea8e5ac15af91de8d8538a5d58db1 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/sound/asound.h | 5 ++---
 trunk/include/sound/core.h   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ba6af04de3ff..bd1268c4f78c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae23ec3ab305b58140462234bddf2257af57bae
+refs/heads/master: ff33f2303b0ea8e5ac15af91de8d8538a5d58db1
diff --git a/trunk/include/sound/asound.h b/trunk/include/sound/asound.h
index 1196e3d51946..2c4dc908a54a 100644
--- a/trunk/include/sound/asound.h
+++ b/trunk/include/sound/asound.h
@@ -707,7 +707,7 @@ struct snd_timer_tread {
  *                                                                          *
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 5)
+#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)
 
 struct snd_ctl_card_info {
 	int card;			/* card number */
@@ -718,8 +718,7 @@ struct snd_ctl_card_info {
 	unsigned char longname[80];	/* name + info text about soundcard */
 	unsigned char reserved_[16];	/* reserved for future (was ID of mixer) */
 	unsigned char mixername[80];	/* visual mixer identification */
-	unsigned char components[80];	/* card components / fine identification, delimited with one space (AC97 etc..) */
-	unsigned char reserved[48];	/* reserved for future */
+	unsigned char components[128];	/* card components / fine identification, delimited with one space (AC97 etc..) */
 };
 
 typedef int __bitwise snd_ctl_elem_type_t;
diff --git a/trunk/include/sound/core.h b/trunk/include/sound/core.h
index f52ab6f3ca6e..e5eec5f73502 100644
--- a/trunk/include/sound/core.h
+++ b/trunk/include/sound/core.h
@@ -116,7 +116,7 @@ struct snd_card {
 	char shortname[32];		/* short name of this soundcard */
 	char longname[80];		/* name of this soundcard */
 	char mixername[80];		/* mixer name */
-	char components[80];		/* card components delimited with
+	char components[128];		/* card components delimited with
 								space */
 	struct module *module;		/* top-level module */