git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
usb-ehci.c
diff --git
a/arch/arm/mach-omap2/usb-ehci.c
b/arch/arm/mach-omap2/usb-ehci.c
index c68f799e83c57bb53fb20c10fb0610fdbc53e8fc..d72d1ac303338e23bed5abe38392e9aed6e0183b 100644
(file)
--- a/
arch/arm/mach-omap2/usb-ehci.c
+++ b/
arch/arm/mach-omap2/usb-ehci.c
@@
-20,6
+20,8
@@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/clk.h>
+#include <linux/dma-mapping.h>
+
#include <asm/io.h>
#include <plat/mux.h>