Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[~andy/linux] / net / decnet / dn_dev.c

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index b6c80f3b8185fee0af39e106f6fc052110bc7a7b..1c6a5bb6f0c8da8cba2e31021ad0f1171f0aeecf 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -684,7 +684,6 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
                return -ENODEV;
 
        if ((dn_db = dev->dn_ptr) == NULL) {
-               int err;
                dn_db = dn_dev_create(dev, &err);
                if (!dn_db)
                        return err;