diff options
| author | David S. Miller | 2010-11-19 22:13:47 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-11-19 22:13:47 +0100 |
| commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
| tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /drivers/net/bnx2x/bnx2x_main.c | |
| parent | X25: remove bkl in routing ioctls (diff) | |
| parent | net: fix kernel-doc for sk_filter_rcu_release (diff) | |
| download | kernel-qcow2-linux-24912420e923d56461b400d83f250a31bed8a964.tar.gz kernel-qcow2-linux-24912420e923d56461b400d83f250a31bed8a964.tar.xz kernel-qcow2-linux-24912420e923d56461b400d83f250a31bed8a964.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_main.c')
| -rw-r--r-- | drivers/net/bnx2x/bnx2x_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c index 7ffcb086cb6f..92057d7058da 100644 --- a/drivers/net/bnx2x/bnx2x_main.c +++ b/drivers/net/bnx2x/bnx2x_main.c @@ -9064,7 +9064,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev, default: pr_err("Unknown board_type (%ld), aborting\n", ent->driver_data); - return ENODEV; + return -ENODEV; } cid_count += CNIC_CONTEXT_USE; |