diff options
author | Joel Becker <jlbec@evilplan.org> | 2011-08-21 21:02:57 -0700 |
---|---|---|
committer | Joel Becker <jlbec@evilplan.org> | 2011-08-21 21:02:57 -0700 |
commit | 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e (patch) | |
tree | 06cabdc34538f3b38a39e3b802ecc1a2ab2aae00 /drivers/net/cxgb4 | |
parent | c7e25e6e0b0486492c5faaf6312b37413642c48e (diff) | |
parent | 93862d5e1ab875664c6cc95254fc365028a48bb1 (diff) | |
download | linux-3.10-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.gz linux-3.10-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.tar.bz2 linux-3.10-99b1bb61b225c3eb4d3b196d4f1d041695b19a7e.zip |
Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-fixes
Diffstat (limited to 'drivers/net/cxgb4')
-rw-r--r-- | drivers/net/cxgb4/cxgb4.h | 1 | ||||
-rw-r--r-- | drivers/net/cxgb4/cxgb4_main.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/cxgb4/cxgb4.h index bc9982a4c1f..223a7f72343 100644 --- a/drivers/net/cxgb4/cxgb4.h +++ b/drivers/net/cxgb4/cxgb4.h @@ -276,7 +276,6 @@ enum { }; struct adapter; -struct vlan_group; struct sge_rspq; struct port_info { diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c index 7e3cfbe89e3..c9957b7f17b 100644 --- a/drivers/net/cxgb4/cxgb4_main.c +++ b/drivers/net/cxgb4/cxgb4_main.c @@ -3704,7 +3704,7 @@ static int __devinit init_one(struct pci_dev *pdev, if (err) { dev_warn(&pdev->dev, "only %d net devices registered\n", i); err = 0; - }; + } if (cxgb4_debugfs_root) { adapter->debugfs_root = debugfs_create_dir(pci_name(pdev), |