Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36e632d6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into topic/usb

parents 767d75ad 2b9ddcb8

include/linux/usb/audio.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

sound/isa/sb/jazz16.c

+1 −0
Original line number Diff line number Diff line
@@ -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>