ARM: OMAP: No need to include board-h4.h from hardware.h

[linux-2.6-omap-h63xx.git] / drivers / net / irda / omap-ir.c

diff --git a/drivers/net/irda/omap-ir.c b/drivers/net/irda/omap-ir.c
index 1fc8c318179cadcb76628c933c94be653947fd7b..59401b7dadc525afee1b59dc5462e4612620d308 100644 (file)
--- a/drivers/net/irda/omap-ir.c
+++ b/drivers/net/irda/omap-ir.c
@@ -63,13 +63,13 @@
 
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/serial.h>
 #include <asm/mach-types.h>
-#include <asm/dma.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/irda.h>
+#include <mach/dma.h>
+#include <mach/mux.h>
+#include <mach/gpio.h>
+#include <mach/irda.h>
 
 #define UART3_EFR_EN                   (1 << 4)
 #define UART3_MCR_EN_TCR_TLR           (1 << 6)
@@ -378,12 +378,8 @@ omap_irda_irq(int irq, void *dev_id)
 
                skb_reserve(skb, 1);
 
-               w = OMAP_DMA_CDAC_REG(omap_ir->rx_dma_channel);
-
-               if (cpu_is_omap16xx())
-                       w -= OMAP1_DMA_CDSA_L_REG(omap_ir->rx_dma_channel);
-               if (cpu_is_omap24xx())
-                       w -= OMAP2_DMA_CDSA_REG(omap_ir->rx_dma_channel);
+               w = omap_get_dma_dst_pos(omap_ir->rx_dma_channel) -
+                                               omap_ir->rx_buf_dma_phys;
 
                if (!IS_FIR(omap_ir))
                        /* Copy DMA buffer to skb */