Merge branch 'topic/asoc' into for-linus

Conflicts: arch/powerpc/platforms/85xx/p1022_ds.c
2010-10-25 10:00:30 +02:00
parent 79fc84c7e0 b11bdb5254
commit aa5c14d5c0
380 changed files with 31740 additions and 16402 deletions
@@ -295,6 +295,18 @@ static void davinci_init_wdt(void)

 /*-------------------------------------------------------------------------*/

+struct platform_device davinci_pcm_device = {
+	.name		= "davinci-pcm-audio",
+	.id		= -1,
+};
+
+static void davinci_init_pcm(void)
+{
+	platform_device_register(&davinci_pcm_device);
+}
+
+/*-------------------------------------------------------------------------*/
+
 struct davinci_timer_instance davinci_timer_instance[2] = {
 	{
 		.base		= DAVINCI_TIMER0_BASE,
@@ -315,6 +327,7 @@ static int __init davinci_init_devices(void)
 	/* please keep these calls, and their implementations above,
 	 * in alphabetical order so they're easier to sort through.
 	 */
+	davinci_init_pcm();
 	davinci_init_wdt();

 	return 0;