diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-18 09:39:08 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-18 09:39:08 +0300 |
| commit | d351cf4603edb2a5bfa9a48d06c425511c63f2a3 (patch) | |
| tree | b03ea3cfd3ca3974237563cf87328386c3d49ff1 /sound/core/vmaster.c | |
| parent | 433e8327caf9f7c0432b2f2f6684a5b79cfe18e9 (diff) | |
| parent | 4a122c10fbfe9020df469f0f669da129c5757671 (diff) | |
| download | linux-d351cf4603edb2a5bfa9a48d06c425511c63f2a3.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/core/vmaster.c')
| -rw-r--r-- | sound/core/vmaster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/vmaster.c b/sound/core/vmaster.c index 3b9b550109cb..a89948ae9e8d 100644 --- a/sound/core/vmaster.c +++ b/sound/core/vmaster.c @@ -18,7 +18,7 @@ * a subset of information returned via ctl info callback */ struct link_ctl_info { - int type; /* value type */ + snd_ctl_elem_type_t type; /* value type */ int count; /* item count */ int min_val, max_val; /* min, max values */ }; |