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/quirks.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/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 355759bad58..ec07e62e53f 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
| @@ -266,7 +266,7 @@ static int create_uaxx_quirk(struct snd_usb_audio *chip, | |||
| 266 | * audio-interface quirks | 266 | * audio-interface quirks |
| 267 | * | 267 | * |
| 268 | * returns zero if no standard audio/MIDI parsing is needed. | 268 | * returns zero if no standard audio/MIDI parsing is needed. |
| 269 | * returns a postive value if standard audio/midi interfaces are parsed | 269 | * returns a positive value if standard audio/midi interfaces are parsed |
| 270 | * after this. | 270 | * after this. |
| 271 | * returns a negative value at error. | 271 | * returns a negative value at error. |
| 272 | */ | 272 | */ |