diff options
| -rw-r--r-- | include/sound/omap-pcm.h (renamed from sound/soc/omap/omap-pcm.h) | 0 | ||||
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-dmic.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-hdmi.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/omap/omap-pcm.h b/include/sound/omap-pcm.h index c1d2f31d71e9..c1d2f31d71e9 100644 --- a/sound/soc/omap/omap-pcm.h +++ b/include/sound/omap-pcm.h | |||
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 14058dc6eaf8..9afb14629a17 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
| @@ -33,10 +33,10 @@ | |||
| 33 | #include <sound/initval.h> | 33 | #include <sound/initval.h> |
| 34 | #include <sound/soc.h> | 34 | #include <sound/soc.h> |
| 35 | #include <sound/dmaengine_pcm.h> | 35 | #include <sound/dmaengine_pcm.h> |
| 36 | #include <sound/omap-pcm.h> | ||
| 36 | 37 | ||
| 37 | #include "davinci-pcm.h" | 38 | #include "davinci-pcm.h" |
| 38 | #include "davinci-mcasp.h" | 39 | #include "davinci-mcasp.h" |
| 39 | #include "../omap/omap-pcm.h" | ||
| 40 | 40 | ||
| 41 | #define MCASP_MAX_AFIFO_DEPTH 64 | 41 | #define MCASP_MAX_AFIFO_DEPTH 64 |
| 42 | 42 | ||
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c index 53da041896c4..6925d7141215 100644 --- a/sound/soc/omap/omap-dmic.c +++ b/sound/soc/omap/omap-dmic.c | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #include <sound/initval.h> | 40 | #include <sound/initval.h> |
| 41 | #include <sound/soc.h> | 41 | #include <sound/soc.h> |
| 42 | #include <sound/dmaengine_pcm.h> | 42 | #include <sound/dmaengine_pcm.h> |
| 43 | #include <sound/omap-pcm.h> | ||
| 43 | 44 | ||
| 44 | #include "omap-dmic.h" | 45 | #include "omap-dmic.h" |
| 45 | #include "omap-pcm.h" | ||
| 46 | 46 | ||
| 47 | struct omap_dmic { | 47 | struct omap_dmic { |
| 48 | struct device *dev; | 48 | struct device *dev; |
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index 537a1ec8ad61..eb9c39299f81 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c | |||
| @@ -34,9 +34,9 @@ | |||
| 34 | #include <sound/asoundef.h> | 34 | #include <sound/asoundef.h> |
| 35 | #include <sound/dmaengine_pcm.h> | 35 | #include <sound/dmaengine_pcm.h> |
| 36 | #include <video/omapdss.h> | 36 | #include <video/omapdss.h> |
| 37 | #include <sound/omap-pcm.h> | ||
| 37 | 38 | ||
| 38 | #include "omap-hdmi.h" | 39 | #include "omap-hdmi.h" |
| 39 | #include "omap-pcm.h" | ||
| 40 | 40 | ||
| 41 | #define DRV_NAME "omap-hdmi-audio-dai" | 41 | #define DRV_NAME "omap-hdmi-audio-dai" |
| 42 | 42 | ||
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 71d226626f7c..efe2cd699b77 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
| @@ -34,11 +34,11 @@ | |||
| 34 | #include <sound/initval.h> | 34 | #include <sound/initval.h> |
| 35 | #include <sound/soc.h> | 35 | #include <sound/soc.h> |
| 36 | #include <sound/dmaengine_pcm.h> | 36 | #include <sound/dmaengine_pcm.h> |
| 37 | #include <sound/omap-pcm.h> | ||
| 37 | 38 | ||
| 38 | #include <linux/platform_data/asoc-ti-mcbsp.h> | 39 | #include <linux/platform_data/asoc-ti-mcbsp.h> |
| 39 | #include "mcbsp.h" | 40 | #include "mcbsp.h" |
| 40 | #include "omap-mcbsp.h" | 41 | #include "omap-mcbsp.h" |
| 41 | #include "omap-pcm.h" | ||
| 42 | 42 | ||
| 43 | #define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000) | 43 | #define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000) |
| 44 | 44 | ||
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index d8ebb52645a9..f0e2ebeab02b 100644 --- a/sound/soc/omap/omap-mcpdm.c +++ b/sound/soc/omap/omap-mcpdm.c | |||
| @@ -40,9 +40,9 @@ | |||
| 40 | #include <sound/pcm_params.h> | 40 | #include <sound/pcm_params.h> |
| 41 | #include <sound/soc.h> | 41 | #include <sound/soc.h> |
| 42 | #include <sound/dmaengine_pcm.h> | 42 | #include <sound/dmaengine_pcm.h> |
| 43 | #include <sound/omap-pcm.h> | ||
| 43 | 44 | ||
| 44 | #include "omap-mcpdm.h" | 45 | #include "omap-mcpdm.h" |
| 45 | #include "omap-pcm.h" | ||
| 46 | 46 | ||
| 47 | struct mcpdm_link_config { | 47 | struct mcpdm_link_config { |
| 48 | u32 link_mask; /* channel mask for the direction */ | 48 | u32 link_mask; /* channel mask for the direction */ |
