projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.14-fixes' of git://git.infradead.org/battery-2.6
[cascardo/linux.git]
/
drivers
/
staging
/
octeon
/
ethernet-sgmii.c
diff --git
a/drivers/staging/octeon/ethernet-sgmii.c
b/drivers/staging/octeon/ethernet-sgmii.c
index
5e148b5
..
d3e8243
100644
(file)
--- a/
drivers/staging/octeon/ethernet-sgmii.c
+++ b/
drivers/staging/octeon/ethernet-sgmii.c
@@
-35,9
+35,9
@@
#include "octeon-ethernet.h"
#include "ethernet-util.h"
-#include
"cvmx-helper.h"
+#include
<asm/octeon/cvmx-helper.h>
-#include
"cvmx-gmxx-defs.h"
+#include
<asm/octeon/cvmx-gmxx-defs.h>
int cvm_oct_sgmii_open(struct net_device *dev)
{