diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/net/ethernet/dlink | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/dlink')
| -rw-r--r-- | drivers/net/ethernet/dlink/de600.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/dlink/de620.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/dlink/de600.c b/drivers/net/ethernet/dlink/de600.c index 682750c052c8..414f0eea1049 100644 --- a/drivers/net/ethernet/dlink/de600.c +++ b/drivers/net/ethernet/dlink/de600.c | |||
| @@ -46,7 +46,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj | |||
| 46 | #include <linux/interrupt.h> | 46 | #include <linux/interrupt.h> |
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/in.h> | 48 | #include <linux/in.h> |
| 49 | #include <asm/system.h> | ||
| 50 | #include <linux/errno.h> | 49 | #include <linux/errno.h> |
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 52 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
diff --git a/drivers/net/ethernet/dlink/de620.c b/drivers/net/ethernet/dlink/de620.c index afc5aaac6b60..2e2bc60ee811 100644 --- a/drivers/net/ethernet/dlink/de620.c +++ b/drivers/net/ethernet/dlink/de620.c | |||
| @@ -122,7 +122,6 @@ static const char version[] = | |||
| 122 | #include <linux/skbuff.h> | 122 | #include <linux/skbuff.h> |
| 123 | 123 | ||
| 124 | #include <asm/io.h> | 124 | #include <asm/io.h> |
| 125 | #include <asm/system.h> | ||
| 126 | 125 | ||
| 127 | /* Constant definitions for the DE-620 registers, commands and bits */ | 126 | /* Constant definitions for the DE-620 registers, commands and bits */ |
| 128 | #include "de620.h" | 127 | #include "de620.h" |