1 files changed, 0 insertions, 72 deletions

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 379100c17639..aa0725608fb1 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,44 +63,7 @@ static void omap_init_rtc(void)
 static inline void omap_init_rtc(void) {}
 #endif
 
-#if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE)
-
-#if defined(CONFIG_ARCH_OMAP15XX)
-#  define OMAP1_MBOX_SIZE       0x23
-#  define INT_DSP_MAILBOX1      INT_1510_DSP_MAILBOX1
-#elif defined(CONFIG_ARCH_OMAP16XX)
-#  define OMAP1_MBOX_SIZE       0x2f
-#  define INT_DSP_MAILBOX1      INT_1610_DSP_MAILBOX1
-#endif
-
-#define OMAP1_MBOX_BASE         OMAP16XX_MAILBOX_BASE
-
-static struct resource mbox_resources[] = {
-        {
-                .start          = OMAP1_MBOX_BASE,
-                .end            = OMAP1_MBOX_BASE + OMAP1_MBOX_SIZE,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = INT_DSP_MAILBOX1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mbox_device = {
-        .name           = "omap1-mailbox",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(mbox_resources),
-        .resource       = mbox_resources,
-};
-
-static inline void omap_init_mbox(void)
-{
-        platform_device_register(&mbox_device);
-}
-#else
 static inline void omap_init_mbox(void) { }
-#endif
 
 /*-------------------------------------------------------------------------*/
 
@@ -230,42 +193,7 @@ static inline void omap_init_spi100k(void)
 
 /*-------------------------------------------------------------------------*/
 
-#if defined(CONFIG_OMAP_STI)
-
-#define OMAP1_STI_BASE          0xfffea000
-#define OMAP1_STI_CHANNEL_BASE  (OMAP1_STI_BASE + 0x400)
-
-static struct resource sti_resources[] = {
-        {
-                .start          = OMAP1_STI_BASE,
-                .end            = OMAP1_STI_BASE + SZ_1K - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = OMAP1_STI_CHANNEL_BASE,
-                .end            = OMAP1_STI_CHANNEL_BASE + SZ_1K - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        {
-                .start          = INT_1610_STI,
-                .flags          = IORESOURCE_IRQ,
-        }
-};
-
-static struct platform_device sti_device = {
-        .name           = "sti",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(sti_resources),
-        .resource       = sti_resources,
-};
-
-static inline void omap_init_sti(void)
-{
-        platform_device_register(&sti_device);
-}
-#else
 static inline void omap_init_sti(void) {}
-#endif
 
 /*-------------------------------------------------------------------------*/