From c235a138ade9336b9222840e5e4f8c493820f025 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 3 Jun 2010 13:45:41 -0300
Subject: [PATCH] --- yaml --- r: 201938 b: refs/heads/master c:
 0e57ff8d5c3d98abbd2137872a8e663e553a7245 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/tm6000/tm6000-alsa.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0dbcd4e4b13b..cfc50647fc8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66e89522aff70fb2701ba8f6845fdcd365dd2ade
+refs/heads/master: 0e57ff8d5c3d98abbd2137872a8e663e553a7245
diff --git a/trunk/drivers/staging/tm6000/tm6000-alsa.c b/trunk/drivers/staging/tm6000/tm6000-alsa.c
index da221e22e27f..04e6f7a3b9f1 100644
--- a/trunk/drivers/staging/tm6000/tm6000-alsa.c
+++ b/trunk/drivers/staging/tm6000/tm6000-alsa.c
@@ -40,7 +40,7 @@
  ****************************************************************************/
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;	/* Index 0-MAX */
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
+
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
 
 module_param_array(enable, bool, NULL, 0444);
@@ -317,7 +317,7 @@ int tm6000_audio_init(struct tm6000_core *dev)
 	if (!enable[devnr])
 		return -ENOENT;
 
-	rc = snd_card_create(index[devnr], id[devnr], THIS_MODULE, 0, &card);
+	rc = snd_card_create(index[devnr], "tm6000", THIS_MODULE, 0, &card);
 	if (rc < 0) {
 		snd_printk(KERN_ERR "cannot create card instance %d\n", devnr);
 		return rc;