diff options
| author | Markus Grabner <grabner@icg.tugraz.at> | 2010-08-23 01:08:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 15:28:16 -0700 |
| commit | e1a164d7a3e05aae15eb603ee8f1b77446480a3b (patch) | |
| tree | 829d6ed586e9fe3680be24faab8c61d5c596443e /drivers/staging/line6/audio.c | |
| parent | 1027f476f507ef7ed9919cd3e3d32310f3985da1 (diff) | |
Staging: line6: another upstream sync
Everything should be in sync now.
Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/audio.c')
| -rw-r--r-- | drivers/staging/line6/audio.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/line6/audio.c b/drivers/staging/line6/audio.c index 7b58b8b4a7d..b1488d321c7 100644 --- a/drivers/staging/line6/audio.c +++ b/drivers/staging/line6/audio.c @@ -1,5 +1,5 @@ /* - * Line6 Linux USB driver - 0.9.0 + * Line6 Linux USB driver - 0.9.1beta * * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * @@ -15,11 +15,9 @@ #include "driver.h" #include "audio.h" - static int line6_index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; static char *line6_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; - /* Initialize the Line6 USB audio system. */ @@ -39,8 +37,7 @@ int line6_init_audio(struct usb_line6 *line6) strcpy(card->id, line6->properties->id); strcpy(card->driver, DRIVER_NAME); strcpy(card->shortname, line6->properties->name); - sprintf(card->longname, "Line6 %s at USB %s", line6->properties->name, - dev_name(line6->ifcdev)); /* 80 chars - see asound.h */ + sprintf(card->longname, "Line6 %s at USB %s", line6->properties->name, dev_name(line6->ifcdev)); /* 80 chars - see asound.h */ return 0; } |