Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / drivers / usb / musb / tusb6010_omap.c

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 66e146e..7e073a0 100644 (file)
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -15,12 +15,12 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/mux.h>
+#include <mach/dma.h>
+#include <mach/mux.h>
 
 #include "musb_core.h"
 
-#define to_chdat(c)            (struct tusb_omap_dma_ch *)(c)->private_data
+#define to_chdat(c)            ((struct tusb_omap_dma_ch *)(c)->private_data)
 
 #define MAX_DMAREQ             5       /* REVISIT: Really 6, but req5 not OK */
 
@@ -188,7 +188,7 @@ static void tusb_omap_dma_cb(int lch, u16 ch_status, void *data)
 
        channel->status = MUSB_DMA_STATUS_FREE;
 
-       /* Handle only RX callbacks here. TX callbacks musb be handled based
+       /* Handle only RX callbacks here. TX callbacks must be handled based
         * on the TUSB DMA status interrupt.
         * REVISIT: Use both TUSB DMA status interrupt and OMAP DMA callback
         * interrupt for RX and TX.