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 remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic...
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
cavium-octeon
/
octeon-usb.c
diff --git
a/arch/mips/cavium-octeon/octeon-usb.c
b/arch/mips/cavium-octeon/octeon-usb.c
index 542be1cd0f32c6cbe14cb0c3936ffe9cd11bd594..bfdfaf32d2c49742066329e800a6b535f363c3e1 100644
(file)
--- a/
arch/mips/cavium-octeon/octeon-usb.c
+++ b/
arch/mips/cavium-octeon/octeon-usb.c
@@
-13,9
+13,9
@@
#include <linux/mutex.h>
#include <linux/delay.h>
#include <linux/of_platform.h>
+#include <linux/io.h>
#include <asm/octeon/octeon.h>
-#include <asm/octeon/cvmx-gpio-defs.h>
/* USB Control Register */
union cvm_usbdrd_uctl_ctl {