diff options
-rw-r--r-- | include/sound/asound.h | 5 | ||||
-rw-r--r-- | include/sound/core.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h index 1196e3d51946..2c4dc908a54a 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h | |||
@@ -707,7 +707,7 @@ struct snd_timer_tread { | |||
707 | * * | 707 | * * |
708 | ****************************************************************************/ | 708 | ****************************************************************************/ |
709 | 709 | ||
710 | #define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 5) | 710 | #define SNDRV_CTL_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 6) |
711 | 711 | ||
712 | struct snd_ctl_card_info { | 712 | struct snd_ctl_card_info { |
713 | int card; /* card number */ | 713 | int card; /* card number */ |
@@ -718,8 +718,7 @@ struct snd_ctl_card_info { | |||
718 | unsigned char longname[80]; /* name + info text about soundcard */ | 718 | unsigned char longname[80]; /* name + info text about soundcard */ |
719 | unsigned char reserved_[16]; /* reserved for future (was ID of mixer) */ | 719 | unsigned char reserved_[16]; /* reserved for future (was ID of mixer) */ |
720 | unsigned char mixername[80]; /* visual mixer identification */ | 720 | unsigned char mixername[80]; /* visual mixer identification */ |
721 | unsigned char components[80]; /* card components / fine identification, delimited with one space (AC97 etc..) */ | 721 | unsigned char components[128]; /* card components / fine identification, delimited with one space (AC97 etc..) */ |
722 | unsigned char reserved[48]; /* reserved for future */ | ||
723 | }; | 722 | }; |
724 | 723 | ||
725 | typedef int __bitwise snd_ctl_elem_type_t; | 724 | typedef int __bitwise snd_ctl_elem_type_t; |
diff --git a/include/sound/core.h b/include/sound/core.h index f52ab6f3ca6e..e5eec5f73502 100644 --- a/include/sound/core.h +++ b/include/sound/core.h | |||
@@ -116,7 +116,7 @@ struct snd_card { | |||
116 | char shortname[32]; /* short name of this soundcard */ | 116 | char shortname[32]; /* short name of this soundcard */ |
117 | char longname[80]; /* name of this soundcard */ | 117 | char longname[80]; /* name of this soundcard */ |
118 | char mixername[80]; /* mixer name */ | 118 | char mixername[80]; /* mixer name */ |
119 | char components[80]; /* card components delimited with | 119 | char components[128]; /* card components delimited with |
120 | space */ | 120 | space */ |
121 | struct module *module; /* top-level module */ | 121 | struct module *module; /* top-level module */ |
122 | 122 | ||