[PATCH] ARM: OMAP: omap1610-ir.c build fix and warning cleanup

Needed to change OMAP_DMA_CDSA_L_REG to OMAP1_DMA_CDSA_L_REG to get
driver linked. In addition one compiler warning removed.

diff --git a/drivers/net/irda/omap1610-ir.c b/drivers/net/irda/omap1610-ir.c
index 19514560ad877de5ca787bea946c14f2806273e5..8d503ba033b861dd393f676ec85b0ab249e6ec9c 100644 (file)
--- a/drivers/net/irda/omap1610-ir.c
+++ b/drivers/net/irda/omap1610-ir.c
@@ -405,7 +405,7 @@ omap1610_irda_irq(int irq, void *dev_id, struct pt_regs *hw_regs)
                skb_reserve(skb, 1);
 
                w = OMAP_DMA_CDAC_REG(si->rx_dma_channel);
-               w -= OMAP_DMA_CDSA_L_REG(si->rx_dma_channel);
+               w -= OMAP1_DMA_CDSA_L_REG(si->rx_dma_channel);
 
                if (si->speed != 4000000) {
                        memcpy(skb_put(skb, w - 2), si->rx_buf_dma_virt, w - 2);        /* Copy DMA buffer to skb */
@@ -605,7 +605,7 @@ static int omap1610_irda_start(struct net_device *dev)
         * Setup the serial port for the specified config.
         */
 
-#if CONFIG_MACH_OMAP_H3
+#ifdef CONFIG_MACH_OMAP_H3
 
        if ((err = read_gpio_expa(&ioExpanderVal, 0x26))) {
                printk(KERN_ERR "Error reading from I/O EXPANDER \n");