diff options
| author | Jyri Sarha <jsarha@ti.com> | 2014-05-26 10:51:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-26 16:32:32 +0200 |
| commit | 87c1936426d13d4f0dba29430c792e6d3562f2be (patch) | |
| tree | 5818431abd9416bd6b92dda0bb1ee6e882a93813 | |
| parent | Merge branch 'topic/davinci' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-87c1936426d13d4f0dba29430c792e6d3562f2be.tar.xz linux-87c1936426d13d4f0dba29430c792e6d3562f2be.zip | |
ASoC: omap-pcm: Move omap-pcm under include/sound
Make including the omap-pcm.h outside sound/soc/omap more convenient.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -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 @@ #include <sound/initval.h> #include <sound/soc.h> #include <sound/dmaengine_pcm.h> +#include <sound/omap-pcm.h> #include "davinci-pcm.h" #include "davinci-mcasp.h" -#include "../omap/omap-pcm.h" #define MCASP_MAX_AFIFO_DEPTH 64 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 @@ #include <sound/initval.h> #include <sound/soc.h> #include <sound/dmaengine_pcm.h> +#include <sound/omap-pcm.h> #include "omap-dmic.h" -#include "omap-pcm.h" struct omap_dmic { 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 @@ #include <sound/asoundef.h> #include <sound/dmaengine_pcm.h> #include <video/omapdss.h> +#include <sound/omap-pcm.h> #include "omap-hdmi.h" -#include "omap-pcm.h" #define DRV_NAME "omap-hdmi-audio-dai" 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 @@ #include <sound/initval.h> #include <sound/soc.h> #include <sound/dmaengine_pcm.h> +#include <sound/omap-pcm.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "mcbsp.h" #include "omap-mcbsp.h" -#include "omap-pcm.h" #define OMAP_MCBSP_RATES (SNDRV_PCM_RATE_8000_96000) 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 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/dmaengine_pcm.h> +#include <sound/omap-pcm.h> #include "omap-mcpdm.h" -#include "omap-pcm.h" struct mcpdm_link_config { u32 link_mask; /* channel mask for the direction */ |