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/natsemi | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/natsemi')
| -rw-r--r-- | drivers/net/ethernet/natsemi/jazzsonic.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/natsemi/macsonic.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/natsemi/ns83820.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c index 5b89fd377ae3..95dd39ffb230 100644 --- a/drivers/net/ethernet/natsemi/jazzsonic.c +++ b/drivers/net/ethernet/natsemi/jazzsonic.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/slab.h> | 38 | #include <linux/slab.h> |
| 39 | 39 | ||
| 40 | #include <asm/bootinfo.h> | 40 | #include <asm/bootinfo.h> |
| 41 | #include <asm/system.h> | ||
| 42 | #include <asm/pgtable.h> | 41 | #include <asm/pgtable.h> |
| 43 | #include <asm/io.h> | 42 | #include <asm/io.h> |
| 44 | #include <asm/dma.h> | 43 | #include <asm/dma.h> |
diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c index e640e23460de..b9680ba5a325 100644 --- a/drivers/net/ethernet/natsemi/macsonic.c +++ b/drivers/net/ethernet/natsemi/macsonic.c | |||
| @@ -53,7 +53,6 @@ | |||
| 53 | #include <linux/slab.h> | 53 | #include <linux/slab.h> |
| 54 | 54 | ||
| 55 | #include <asm/bootinfo.h> | 55 | #include <asm/bootinfo.h> |
| 56 | #include <asm/system.h> | ||
| 57 | #include <asm/pgtable.h> | 56 | #include <asm/pgtable.h> |
| 58 | #include <asm/io.h> | 57 | #include <asm/io.h> |
| 59 | #include <asm/hwtest.h> | 58 | #include <asm/hwtest.h> |
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c index c24b46cbfe27..d52728b3c436 100644 --- a/drivers/net/ethernet/natsemi/ns83820.c +++ b/drivers/net/ethernet/natsemi/ns83820.c | |||
| @@ -121,7 +121,6 @@ | |||
| 121 | 121 | ||
| 122 | #include <asm/io.h> | 122 | #include <asm/io.h> |
| 123 | #include <asm/uaccess.h> | 123 | #include <asm/uaccess.h> |
| 124 | #include <asm/system.h> | ||
| 125 | 124 | ||
| 126 | #define DRV_NAME "ns83820" | 125 | #define DRV_NAME "ns83820" |
| 127 | 126 | ||