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

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
Mark Brown
2 parents 2231571214 e9c039052b
Showing 2 changed files Side-by-side Diff
include/sound/soc.h
sound/soc/soc-io.c
@@ -258,8 +258,7 @@
 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,
 };
  
@@ -367,9 +367,6 @@
 	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;
...	...	@@ -258,8 +258,7 @@
258	258	extern struct snd_ac97_bus_ops soc_ac97_ops;
259	259
260	260	enum snd_soc_control_type {
261		- SND_SOC_CUSTOM = 1,
262		- SND_SOC_I2C,
	261	+ SND_SOC_I2C = 1,
263	262	SND_SOC_SPI,
264	263	};
265	264
...	...	@@ -367,9 +367,6 @@
367	367	codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
368	368
369	369	switch (control) {
370		- case SND_SOC_CUSTOM:
371		- break;
372		-
373	370	case SND_SOC_I2C:
374	371	#if defined(CONFIG_I2C) \|\| (defined(CONFIG_I2C_MODULE) && defined(MODULE))
375	372	codec->hw_write = (hw_write_t)i2c_master_send;