From: Tony Lindgren <tony@atomide.com>
Date: Mon, 20 Aug 2007 08:18:07 +0000 (-0700)
Subject: musb: Rename dma.h to musb_dma.h
X-Git-Tag: v2.6.23-omap1~154
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=851c24e263470469fc35f4cffa5fd1ff686dbb11;p=linux-2.6-omap-h63xx.git

musb: Rename dma.h to musb_dma.h

Rename dma.h to musb_dma.h

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h
index c1218650a3d..1d72c1b1acc 100644
--- a/drivers/usb/musb/cppi_dma.h
+++ b/drivers/usb/musb/cppi_dma.h
@@ -9,7 +9,7 @@
 #include <linux/errno.h>
 #include <linux/dmapool.h>
 
-#include "dma.h"
+#include "musb_dma.h"
 #include "musb_core.h"
 #include "davinci.h"
 
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 3fdb95bbdc5..7c84f942d39 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -54,7 +54,7 @@ struct musb_ep;
 
 
 #include "debug.h"
-#include "dma.h"
+#include "musb_dma.h"
 
 #ifdef CONFIG_USB_MUSB_SOC
 /*
diff --git a/drivers/usb/musb/dma.h b/drivers/usb/musb/musb_dma.h
similarity index 100%
rename from drivers/usb/musb/dma.h
rename to drivers/usb/musb/musb_dma.h