Index: linux-2.6.15-rc2/sound/soc/codecs/wm8750.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/codecs/wm8750.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/codecs/wm8750.c	2005-11-28 09:51:39.000000000 +0000
@@ -18,6 +18,7 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/platform_device.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>
Index: linux-2.6.15-rc2/sound/soc/codecs/wm8731.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/codecs/wm8731.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/codecs/wm8731.c	2005-11-28 09:51:39.000000000 +0000
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/pm.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
Index: linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-pcm.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/pxa/pxa2xx-pcm.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-pcm.c	2005-11-28 09:51:39.000000000 +0000
@@ -12,7 +12,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/dma-mapping.h>
 
Index: linux-2.6.15-rc2/sound/soc/soc-dpm.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/soc-dpm.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/soc-dpm.c	2005-11-28 09:51:39.000000000 +0000
@@ -36,6 +36,7 @@
 #include <linux/i2c.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
Index: linux-2.6.15-rc2/sound/soc/codecs/wm8753.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/codecs/wm8753.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/codecs/wm8753.c	2005-11-28 09:51:39.000000000 +0000
@@ -23,6 +23,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/pm.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
Index: linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-ac97.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/pxa/pxa2xx-ac97.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-ac97.c	2005-11-28 09:51:39.000000000 +0000
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
 #include <linux/delay.h>
Index: linux-2.6.15-rc2/sound/soc/pxa/mainstone.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/pxa/mainstone.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/pxa/mainstone.c	2005-11-28 09:51:39.000000000 +0000
@@ -22,6 +22,7 @@
 #include <linux/moduleparam.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
Index: linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-i2s.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/pxa/pxa2xx-i2s.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-i2s.c	2005-11-28 09:51:39.000000000 +0000
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/delay.h>
 
 #include <sound/driver.h>
Index: linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-ssp.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/pxa/pxa2xx-ssp.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/pxa/pxa2xx-ssp.c	2005-11-28 09:51:39.000000000 +0000
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>
Index: linux-2.6.15-rc2/sound/soc/soc-core.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/soc-core.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/soc-core.c	2005-11-28 09:51:39.000000000 +0000
@@ -33,6 +33,7 @@
 #include <linux/i2c.h>
 #include <linux/pm.h>
 #include <linux/bitops.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -891,7 +892,7 @@
 	memcpy(&template, _template, sizeof(template));
 	if(long_name)
 		template.name = long_name;
-	snd_runtime_check(!template.index, return NULL);
+	snd_assert(!template.index, return NULL);
 	//template.index = codec->num;
 	return snd_ctl_new1(&template, data);
 }
Index: linux-2.6.15-rc2/sound/soc/codecs/wm9713-voice.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/codecs/wm9713-voice.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/codecs/wm9713-voice.c	2005-11-28 09:51:39.000000000 +0000
@@ -37,6 +37,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/wm97xx.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
Index: linux-2.6.15-rc2/sound/soc/codecs/wm8971.c
===================================================================
--- linux-2.6.15-rc2.orig/sound/soc/codecs/wm8971.c	2005-11-28 09:46:01.000000000 +0000
+++ linux-2.6.15-rc2/sound/soc/codecs/wm8971.c	2005-11-28 09:51:39.000000000 +0000
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/pm.h>
+#include <linux/platform_device.h>
 #include <sound/driver.h>
 #include <sound/core.h>
 #include <sound/pcm.h>