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

Commit 21abbb02 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 6664ee11 f8f626f5

sound/soc/codecs/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_CX20442

	select SND_SOC_CX20442

	select SND_SOC_DA7210 if I2C

	select SND_SOC_DA7210 if I2C

	select SND_SOC_DFBMCS320

	select SND_SOC_DFBMCS320

	select SND_SOC_JZ4740_CODEC if SOC_JZ4740

	select SND_SOC_JZ4740_CODEC

	select SND_SOC_LM4857 if I2C

	select SND_SOC_LM4857 if I2C

	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX98095 if I2C

	select SND_SOC_MAX98095 if I2C

sound/soc/codecs/jz4740.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/io.h>





#include <linux/delay.h>

#include <linux/delay.h>