diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-05 08:23:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-05 08:23:32 +0100 |
| commit | 36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207 (patch) | |
| tree | 1dd1a6cd08f50c284588400c9e426aa8eba07c5e | |
| parent | 767d75ad1c08c31646498a13837a5c59db90ccad (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
| download | linux-36e632d61ae2febf55d5cd93b9e5ae0f5a5c6207.tar.bz2 | |
Merge branch 'topic/misc' into topic/usb
| -rw-r--r-- | include/linux/usb/audio.h | 2 | ||||
| -rw-r--r-- | sound/isa/sb/jazz16.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index 6bb293684eb8..4d3e450e2b03 100644 --- 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; diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c index 8d21a3feda3a..8ccbcddf08e1 100644 --- 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> |