Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'topic/misc' into topic/usb

Takashi Iwai 15 years ago
parent
767d75ad1c 2b9ddcb8b2
commit
36e632d61a
2 changed files with 2 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      include/linux/usb/audio.h
  2. 1 0
      sound/isa/sb/jazz16.c

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

@@ -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;

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

@@ -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>