1 files changed, 9 insertions, 9 deletions

diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index 7ccca0069dce..3a51cb210de6 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -80,9 +80,9 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = {
 };
 
 #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
-static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {
+static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {
         {
-                .phys_base      = OMAP730_MCBSP1_BASE,
+                .phys_base      = OMAP7XX_MCBSP1_BASE,
                 .dma_rx_sync    = OMAP_DMA_MCBSP1_RX,
                 .dma_tx_sync    = OMAP_DMA_MCBSP1_TX,
                 .rx_irq         = INT_7XX_McBSP1RX,
@@ -90,7 +90,7 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {
                 .ops            = &omap1_mcbsp_ops,
         },
         {
-                .phys_base      = OMAP730_MCBSP2_BASE,
+                .phys_base      = OMAP7XX_MCBSP2_BASE,
                 .dma_rx_sync    = OMAP_DMA_MCBSP3_RX,
                 .dma_tx_sync    = OMAP_DMA_MCBSP3_TX,
                 .rx_irq         = INT_7XX_McBSP2RX,
@@ -98,10 +98,10 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {
                 .ops            = &omap1_mcbsp_ops,
         },
 };
-#define OMAP730_MCBSP_PDATA_SZ          ARRAY_SIZE(omap730_mcbsp_pdata)
+#define OMAP7XX_MCBSP_PDATA_SZ          ARRAY_SIZE(omap7xx_mcbsp_pdata)
 #else
-#define omap730_mcbsp_pdata             NULL
-#define OMAP730_MCBSP_PDATA_SZ          0
+#define omap7xx_mcbsp_pdata             NULL
+#define OMAP7XX_MCBSP_PDATA_SZ          0
 #endif
 
 #ifdef CONFIG_ARCH_OMAP15XX
@@ -173,7 +173,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
 int __init omap1_mcbsp_init(void)
 {
         if (cpu_is_omap7xx())
-                omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;
+                omap_mcbsp_count = OMAP7XX_MCBSP_PDATA_SZ;
         if (cpu_is_omap15xx())
                 omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;
         if (cpu_is_omap16xx())
@@ -185,8 +185,8 @@ int __init omap1_mcbsp_init(void)
                 return -ENOMEM;
 
         if (cpu_is_omap7xx())
-                omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata,
-                                                OMAP730_MCBSP_PDATA_SZ);
+                omap_mcbsp_register_board_cfg(omap7xx_mcbsp_pdata,
+                                                OMAP7XX_MCBSP_PDATA_SZ);
 
         if (cpu_is_omap15xx())
                 omap_mcbsp_register_board_cfg(omap15xx_mcbsp_pdata,