Merge branch 'topic/asoc' into for-linus

Conflicts:
	arch/powerpc/platforms/85xx/p1022_ds.c

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 1c82d4290dad..51ff23b72d3a 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -903,10 +903,16 @@ static struct platform_device kirkwood_i2s_device = {
         },
 };
 
+static struct platform_device kirkwood_pcm_device = {
+        .name           = "kirkwood-pcm-audio",
+        .id             = -1,
+};
+
 void __init kirkwood_audio_init(void)
 {
         kirkwood_clk_ctrl |= CGC_AUDIO;
         platform_device_register(&kirkwood_i2s_device);
+        platform_device_register(&kirkwood_pcm_device);
 }
 
 /*****************************************************************************