Merge branch 'topic/misc' into topic/usb

36e632d6 · Takashi Iwai · 767d75ad · 2b9ddcb8 · 36e632d6 · 36e632d6
Commit 36e632d6 authored Mar 05, 2010 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

include/linux/usb/audio.h include/linux/usb/audio.h +1 -1

sound/isa/sb/jazz16.c sound/isa/sb/jazz16.c +1 -0

No files found.
--- a/include/linux/usb/audio.h
+++ b/include/linux/usb/audio.h
@@ -269,8 +269,8 @@ struct uac_format_type_i_ext_descriptor {
 	__u8 bLength;
 	__u8 bDescriptorType;
 	__u8 bDescriptorSubtype;
-	__u8 bSubslotSize;
 	__u8 bFormatType;
+	__u8 bSubslotSize;
 	__u8 bBitResolution;
 	__u8 bHeaderLength;
 	__u8 bControlSize;

--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/io.h>
+#include <linux/delay.h>
 #include <asm/dma.h>
 #include <linux/isa.h>
 #include <sound/core.h>