Преглед изворни кода

ASoC: Do not include soc-dai.h

There is no need to include soc-dai.h since soc.h includes it. Convert
drivers to include only soc.h.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Jarkko Nikula пре 14 година
родитељ
комит
0d911baebf
5 измењених фајлова са 4 додато и 5 уклоњено
  1. 0 1
      sound/soc/codecs/cq93vc.c
  2. 1 1
      sound/soc/codecs/wl1273.c
  3. 1 1
      sound/soc/sh/siu.h
  4. 1 1
      sound/soc/sh/siu_dai.c
  5. 1 1
      sound/soc/sh/siu_pcm.c

+ 0 - 1
sound/soc/codecs/cq93vc.c

@@ -36,7 +36,6 @@
 #include <sound/pcm.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc.h>
-#include <sound/soc-dai.h>
 #include <sound/initval.h>
 #include <sound/initval.h>
 
 
 #include <mach/dm365.h>
 #include <mach/dm365.h>

+ 1 - 1
sound/soc/codecs/wl1273.c

@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/slab.h>
 #include <sound/pcm.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/pcm_params.h>
-#include <sound/soc-dai.h>
+#include <sound/soc.h>
 #include <sound/initval.h>
 #include <sound/initval.h>
 
 
 #include "wl1273.h"
 #include "wl1273.h"

+ 1 - 1
sound/soc/sh/siu.h

@@ -75,7 +75,7 @@ struct siu_firmware {
 
 
 #include <sound/core.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm.h>
-#include <sound/soc-dai.h>
+#include <sound/soc.h>
 
 
 #define SIU_PERIOD_BYTES_MAX	8192		/* DMA transfer/period size */
 #define SIU_PERIOD_BYTES_MAX	8192		/* DMA transfer/period size */
 #define SIU_PERIOD_BYTES_MIN	256		/* DMA transfer/period size */
 #define SIU_PERIOD_BYTES_MIN	256		/* DMA transfer/period size */

+ 1 - 1
sound/soc/sh/siu_dai.c

@@ -28,7 +28,7 @@
 #include <asm/siu.h>
 #include <asm/siu.h>
 
 
 #include <sound/control.h>
 #include <sound/control.h>
-#include <sound/soc-dai.h>
+#include <sound/soc.h>
 
 
 #include "siu.h"
 #include "siu.h"
 
 

+ 1 - 1
sound/soc/sh/siu_pcm.c

@@ -29,7 +29,7 @@
 #include <sound/core.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/pcm_params.h>
-#include <sound/soc-dai.h>
+#include <sound/soc.h>
 
 
 #include <asm/siu.h>
 #include <asm/siu.h>