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

Commit 65fdd5c0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1 

Trival fixup for move of I/O code into separate file.

Conflicts:
	sound/soc/soc-cache.c
parents 22315712 e9c03905

include/sound/soc.h

+1 −2
Original line number Diff line number Diff line
@@ -258,8 +258,7 @@ typedef int (*hw_write_t)(void *,const char* ,int); 
extern struct snd_ac97_bus_ops soc_ac97_ops;



enum snd_soc_control_type {

	SND_SOC_CUSTOM = 1,

	SND_SOC_I2C,

	SND_SOC_I2C = 1,

	SND_SOC_SPI,

};

sound/soc/soc-io.c

+0 −3
Original line number Diff line number Diff line
@@ -367,9 +367,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, 
	codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;



	switch (control) {

	case SND_SOC_CUSTOM:

		break;



	case SND_SOC_I2C:

#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))

		codec->hw_write = (hw_write_t)i2c_master_send;