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 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
octeon
/
ethernet-sgmii.c
diff --git
a/drivers/staging/octeon/ethernet-sgmii.c
b/drivers/staging/octeon/ethernet-sgmii.c
index 6061d01eca2daf067fe091f96545f356b99f1280..2d8589eb461e9cdf3fdfc1ace1dc552f930a91d3 100644
(file)
--- a/
drivers/staging/octeon/ethernet-sgmii.c
+++ b/
drivers/staging/octeon/ethernet-sgmii.c
@@
-26,7
+26,6
@@
**********************************************************************/
#include <linux/kernel.h>
#include <linux/netdevice.h>
-#include <linux/mii.h>
#include <net/dst.h>
#include <asm/octeon/octeon.h>