diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /sound/usb/format.c | |
parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/format.c')
-rw-r--r-- | sound/usb/format.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index f079b5e2ab28..8d042dce0d16 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "helper.h" | 30 | #include "helper.h" |
31 | #include "debug.h" | 31 | #include "debug.h" |
32 | #include "clock.h" | 32 | #include "clock.h" |
33 | #include "format.h" | ||
33 | 34 | ||
34 | /* | 35 | /* |
35 | * parse the audio format type I descriptor | 36 | * parse the audio format type I descriptor |