6 files changed, 18 insertions, 18 deletions

diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index e53f7748ac13..74720e65f114 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -107,7 +107,7 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = INT_730_MPU_EXT_NIRQ,
+                .start  = INT_7XX_MPU_EXT_NIRQ,
                 .end    = 0,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
@@ -196,8 +196,8 @@ static struct platform_device smc91x_device = {
 
 static struct resource kp_resources[] = {
         [0] = {
-                .start  = INT_730_MPUIO_KEYPAD,
-                .end    = INT_730_MPUIO_KEYPAD,
+                .start  = INT_7XX_MPUIO_KEYPAD,
+                .end    = INT_7XX_MPUIO_KEYPAD,
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index ec22838e8e79..2f897cf23504 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -74,7 +74,7 @@ static struct resource smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = INT_730_MPU_EXT_NIRQ,
+                .start  = INT_7XX_MPU_EXT_NIRQ,
                 .end    = 0,
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
@@ -163,8 +163,8 @@ static struct platform_device smc91x_device = {
 
 static struct resource kp_resources[] = {
         [0] = {
-                .start  = INT_730_MPUIO_KEYPAD,
-                .end    = INT_730_MPUIO_KEYPAD,
+                .start  = INT_7XX_MPUIO_KEYPAD,
+                .end    = INT_7XX_MPUIO_KEYPAD,
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index c05999c41165..704a80c29725 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -234,7 +234,7 @@ void __init omap_init_irq(void)
         /* Unmask level 2 handler */
 
         if (cpu_is_omap7xx())
-                omap_unmask_irq(INT_730_IH2_IRQ);
+                omap_unmask_irq(INT_7XX_IH2_IRQ);
         else if (cpu_is_omap15xx())
                 omap_unmask_irq(INT_1510_IH2_IRQ);
         else if (cpu_is_omap16xx())
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index 06f380bf221e..7ccca0069dce 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -85,16 +85,16 @@ static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {
                 .phys_base      = OMAP730_MCBSP1_BASE,
                 .dma_rx_sync    = OMAP_DMA_MCBSP1_RX,
                 .dma_tx_sync    = OMAP_DMA_MCBSP1_TX,
-                .rx_irq         = INT_730_McBSP1RX,
-                .tx_irq         = INT_730_McBSP1TX,
+                .rx_irq         = INT_7XX_McBSP1RX,
+                .tx_irq         = INT_7XX_McBSP1TX,
                 .ops            = &omap1_mcbsp_ops,
         },
         {
                 .phys_base      = OMAP730_MCBSP2_BASE,
                 .dma_rx_sync    = OMAP_DMA_MCBSP3_RX,
                 .dma_tx_sync    = OMAP_DMA_MCBSP3_TX,
-                .rx_irq         = INT_730_McBSP2RX,
-                .tx_irq         = INT_730_McBSP2TX,
+                .rx_irq         = INT_7XX_McBSP2RX,
+                .tx_irq         = INT_7XX_McBSP2TX,
                 .ops            = &omap1_mcbsp_ops,
         },
 };
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 12f246e3cdca..58479c75cac4 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -184,8 +184,8 @@ static void omap_pm_wakeup_setup(void)
          * wake up to a GPIO interrupt.
          */
         if (cpu_is_omap7xx())
-                level1_wake = OMAP_IRQ_BIT(INT_730_GPIO_BANK1) |
-                        OMAP_IRQ_BIT(INT_730_IH2_IRQ);
+                level1_wake = OMAP_IRQ_BIT(INT_7XX_GPIO_BANK1) |
+                        OMAP_IRQ_BIT(INT_7XX_IH2_IRQ);
         else if (cpu_is_omap15xx())
                 level1_wake = OMAP_IRQ_BIT(INT_GPIO_BANK1) |
                         OMAP_IRQ_BIT(INT_1510_IH2_IRQ);
@@ -197,8 +197,8 @@ static void omap_pm_wakeup_setup(void)
 
         if (cpu_is_omap7xx()) {
                 omap_writel(~level2_wake, OMAP_IH2_0_MIR);
-                omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) |
-                                OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)),
+                omap_writel(~(OMAP_IRQ_BIT(INT_7XX_WAKE_UP_REQ) |
+                                OMAP_IRQ_BIT(INT_7XX_MPUIO_KEYPAD)),
                                 OMAP_IH2_1_MIR);
         } else if (cpu_is_omap15xx()) {
                 level2_wake |= OMAP_IRQ_BIT(INT_KEYBOARD);
@@ -687,7 +687,7 @@ static int __init omap_pm_init(void)
         pm_idle = omap1_pm_idle;
 
         if (cpu_is_omap7xx())
-                setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq);
+                setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq);
         else if (cpu_is_omap16xx())
                 setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);
 
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 49381e271be3..ed07af109f00 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -113,8 +113,8 @@ void __init omap_serial_init(void)
         if (cpu_is_omap7xx()) {
                 serial_platform_data[0].regshift = 0;
                 serial_platform_data[1].regshift = 0;
-                serial_platform_data[0].irq = INT_730_UART_MODEM_1;
-                serial_platform_data[1].irq = INT_730_UART_MODEM_IRDA_2;
+                serial_platform_data[0].irq = INT_7XX_UART_MODEM_1;
+                serial_platform_data[1].irq = INT_7XX_UART_MODEM_IRDA_2;
         }
 
         if (cpu_is_omap15xx()) {