git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
drivers
/
usb
/
musb
/
ux500_dma.c
diff --git
a/drivers/usb/musb/ux500_dma.c
b/drivers/usb/musb/ux500_dma.c
index
639d58e
..
f1059e7
100644
(file)
--- a/
drivers/usb/musb/ux500_dma.c
+++ b/
drivers/usb/musb/ux500_dma.c
@@
-30,7
+30,7
@@
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
#include <linux/pfn.h>
-#include <
mach/usb
.h>
+#include <
linux/platform_data/usb-musb-ux500
.h>
#include "musb_core.h"
struct ux500_dma_channel {