summaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/hdlc_raw.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_raw.c
parent9c1ca6e68a5d8d58776833b6496c0656a10be50c (diff)
parent370076d932ff56a02b9c5328729a69d432cd4b32 (diff)
downloadlinux-655d2ce073f5927194dbc28d2bd3c062a4a3caac.tar.gz
linux-655d2ce073f5927194dbc28d2bd3c062a4a3caac.tar.bz2
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_raw.c')
-rw-r--r--drivers/net/wan/hdlc_raw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c
index e23bc6656267..bbbb819d764c 100644
--- a/drivers/net/wan/hdlc_raw.c
+++ b/drivers/net/wan/hdlc_raw.c
@@ -82,7 +82,7 @@ static int raw_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(raw_hdlc_proto));
if (result)
return result;