diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-08-07 04:05:46 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 04:05:46 -0400 |
commit | 3859069bc3358772b08bd91efe9edec39a746ea8 (patch) | |
tree | 9ffe71711dd98cf511ad21d9990c597de0ac3b2b /drivers/net/wan/dscc4.c | |
parent | e2c709b0ba2886b5438b666222b4b3faf82d65a9 (diff) | |
parent | 867240f7b2a37b1be4ba37d904a9064a96c82099 (diff) |
Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
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 50ef5b4efd6..f5d55ad0226 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -103,7 +103,6 @@ #include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/delay.h> -#include <net/syncppp.h> #include <linux/hdlc.h> #include <linux/mutex.h> |