diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /sound/usb/mixer.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'sound/usb/mixer.c')
| -rw-r--r-- | sound/usb/mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 5e477571660..6ec33b62e6c 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
| @@ -1182,7 +1182,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
| 1182 | /* | 1182 | /* |
| 1183 | * parse a feature unit | 1183 | * parse a feature unit |
| 1184 | * | 1184 | * |
| 1185 | * most of controlls are defined here. | 1185 | * most of controls are defined here. |
| 1186 | */ | 1186 | */ |
| 1187 | static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void *_ftr) | 1187 | static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void *_ftr) |
| 1188 | { | 1188 | { |