Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / devices.c

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index d06c7140392c194909a82f202113ebe19f6e374e..dcd8ddbec2bbc92b7577bc6f143d4085e3ec426f 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -24,7 +24,6 @@
 #include <plat/mux.h>
 #include <plat/mmc.h>
 #include <plat/omap7xx.h>
-#include <plat/mcbsp.h>
 
 #include <mach/camera.h>
 #include <mach/hardware.h>
@@ -250,16 +249,8 @@ static struct platform_device omap_pcm = {
        .id     = -1,
 };
 
-OMAP_MCBSP_PLATFORM_DEVICE(1);
-OMAP_MCBSP_PLATFORM_DEVICE(2);
-OMAP_MCBSP_PLATFORM_DEVICE(3);
-
 static void omap_init_audio(void)
 {
-       platform_device_register(&omap_mcbsp1);
-       platform_device_register(&omap_mcbsp2);
-       if (!cpu_is_omap7xx())
-               platform_device_register(&omap_mcbsp3);
        platform_device_register(&omap_pcm);
 }