projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-3.5' of git://openrisc.net/jonas/linux
[linux-2.6-block.git]
/
drivers
/
staging
/
octeon
/
ethernet-mdio.h
diff --git
a/drivers/staging/octeon/ethernet-mdio.h
b/drivers/staging/octeon/ethernet-mdio.h
index 55d0614a7cd94f67e867e8b6eb2f8f498405f722..a417d4fce12c1c8a5813d5c9b6d3f9ebc577f32b 100644
(file)
--- a/
drivers/staging/octeon/ethernet-mdio.h
+++ b/
drivers/staging/octeon/ethernet-mdio.h
@@
-32,7
+32,6
@@
#include <linux/ip.h>
#include <linux/string.h>
#include <linux/ethtool.h>
-#include <linux/mii.h>
#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <net/dst.h>