diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-07 05:10:27 -0400 |
| commit | 32bb93b02da8c75031e601ff1f9a25f99febbe5f (patch) | |
| tree | 429d2b978f517d366de572fa5058d513ed7b51a6 /drivers/net/wan/dscc4.c | |
| parent | 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 (diff) | |
| parent | 3859069bc3358772b08bd91efe9edec39a746ea8 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wan/dscc4.c')
| -rw-r--r-- | drivers/net/wan/dscc4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 50ef5b4efd6d..f5d55ad02267 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
| @@ -103,7 +103,6 @@ | |||
| 103 | #include <linux/netdevice.h> | 103 | #include <linux/netdevice.h> |
| 104 | #include <linux/skbuff.h> | 104 | #include <linux/skbuff.h> |
| 105 | #include <linux/delay.h> | 105 | #include <linux/delay.h> |
| 106 | #include <net/syncppp.h> | ||
| 107 | #include <linux/hdlc.h> | 106 | #include <linux/hdlc.h> |
| 108 | #include <linux/mutex.h> | 107 | #include <linux/mutex.h> |
| 109 | 108 | ||