summaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/hdlc_ppp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-02-06 03:52:44 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-06 03:52:44 -0800
commit655d2ce073f5927194dbc28d2bd3c062a4a3caac (patch)
tree9fa289764e2b3cd8dbdc6d11299f0f16b93414b6 /drivers/net/wan/hdlc_ppp.c
parent9c1ca6e68a5d8d58776833b6496c0656a10be50c (diff)
parent370076d932ff56a02b9c5328729a69d432cd4b32 (diff)
downloadtalos-op-linux-655d2ce073f5927194dbc28d2bd3c062a4a3caac.tar.gz
talos-op-linux-655d2ce073f5927194dbc28d2bd3c062a4a3caac.zip
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wan/hdlc_ppp.c')
-rw-r--r--drivers/net/wan/hdlc_ppp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 519e1550e2e7..10396d9686f4 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -122,7 +122,7 @@ static int ppp_ioctl(struct net_device *dev, struct ifreq *ifr)
if (result)
return result;
- result = attach_hdlc_protocol(dev, &proto, NULL,
+ result = attach_hdlc_protocol(dev, &proto,
sizeof(struct ppp_state));
if (result)
return result;
OpenPOWER on IntegriCloud