diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /drivers/net/e100.c | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index a26ccab057d5..b997e578e58f 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
| @@ -2858,7 +2858,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
| 2858 | } | 2858 | } |
| 2859 | nic->cbs_pool = pci_pool_create(netdev->name, | 2859 | nic->cbs_pool = pci_pool_create(netdev->name, |
| 2860 | nic->pdev, | 2860 | nic->pdev, |
| 2861 | nic->params.cbs.count * sizeof(struct cb), | 2861 | nic->params.cbs.max * sizeof(struct cb), |
| 2862 | sizeof(u32), | 2862 | sizeof(u32), |
| 2863 | 0); | 2863 | 0); |
| 2864 | DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", | 2864 | DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", |