diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 13:22:37 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 13:22:37 -0400 |
commit | cb3f2adc03ab055b19c677a6283523861fafebdd (patch) | |
tree | 59cfb6800f0635a4aec16c8e0da619f27e51ee79 /include/sound/control.h | |
parent | 44c76a960a62fcc46cbcaa0a22a34e666a729329 (diff) | |
parent | 828006de1bddf83b6ecf03ec459c15f7c7c22db7 (diff) |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'include/sound/control.h')
-rw-r--r-- | include/sound/control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index eff96dc7a278..8332e865c759 100644 --- a/include/sound/control.h +++ b/include/sound/control.h | |||
@@ -40,7 +40,7 @@ struct snd_kcontrol_new { | |||
40 | snd_ctl_elem_iface_t iface; /* interface identifier */ | 40 | snd_ctl_elem_iface_t iface; /* interface identifier */ |
41 | unsigned int device; /* device/client number */ | 41 | unsigned int device; /* device/client number */ |
42 | unsigned int subdevice; /* subdevice (substream) number */ | 42 | unsigned int subdevice; /* subdevice (substream) number */ |
43 | unsigned char *name; /* ASCII name of item */ | 43 | const unsigned char *name; /* ASCII name of item */ |
44 | unsigned int index; /* index of item */ | 44 | unsigned int index; /* index of item */ |
45 | unsigned int access; /* access rights */ | 45 | unsigned int access; /* access rights */ |
46 | unsigned int count; /* count of same elements */ | 46 | unsigned int count; /* count of same elements */ |