diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-03-16 04:56:38 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-01 06:28:26 -0400 |
| commit | a23dc694828e3de96bf18e20459ba885ba91cb29 (patch) | |
| tree | 26863bf2c6bdac975a369a20fcf6f47176c5cd55 /sound/soc/Kconfig | |
| parent | d61e11260016f3589d60f94286c89ef823a26605 (diff) | |
ASoC: imx: merge sound/soc/imx into sound/soc/fsl
Freescale PowerPC and ARM/IMX families share the same SSI IP block.
The patch merges sound/soc/imx into sound/soc/fsl, so that the possible
code sharing and consolidation can happen.
This is a plain merge, except that menuconfig SND_POWERPC_SOC is added
in Kconfig for PowerPC platform as a correspondence to SND_IMX_SOC for
IMX platform.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/Kconfig')
| -rw-r--r-- | sound/soc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 91c985599d32..0f85f6d526e0 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig | |||
| @@ -35,7 +35,6 @@ source "sound/soc/blackfin/Kconfig" | |||
| 35 | source "sound/soc/davinci/Kconfig" | 35 | source "sound/soc/davinci/Kconfig" |
| 36 | source "sound/soc/ep93xx/Kconfig" | 36 | source "sound/soc/ep93xx/Kconfig" |
| 37 | source "sound/soc/fsl/Kconfig" | 37 | source "sound/soc/fsl/Kconfig" |
| 38 | source "sound/soc/imx/Kconfig" | ||
| 39 | source "sound/soc/jz4740/Kconfig" | 38 | source "sound/soc/jz4740/Kconfig" |
| 40 | source "sound/soc/nuc900/Kconfig" | 39 | source "sound/soc/nuc900/Kconfig" |
| 41 | source "sound/soc/omap/Kconfig" | 40 | source "sound/soc/omap/Kconfig" |