Merge branch 'mxc-audio' into for-2.6.34
Conflicts: arch/arm/plat-mxc/Makefile (dual add) sound/soc/imx/mx27vis_wm8974.c (API updates & removal)
Showing
arch/arm/plat-mxc/ssi-fiq-ksym.c
0 → 100644
arch/arm/plat-mxc/ssi-fiq.S
0 → 100644
sound/soc/imx/imx-pcm-dma-mx2.c
0 → 100644
sound/soc/imx/imx-pcm-fiq.c
0 → 100644
sound/soc/imx/imx-ssi.c
0 → 100644
sound/soc/imx/imx-ssi.h
0 → 100644
sound/soc/imx/mx1_mx2-pcm.c
已删除
100644 → 0
sound/soc/imx/mx1_mx2-pcm.h
已删除
100644 → 0
sound/soc/imx/mxc-ssi.c
已删除
100644 → 0
此差异已折叠。
sound/soc/imx/mxc-ssi.h
已删除
100644 → 0
想要评论请 注册 或 登录