aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-03 17:07:43 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-03 17:07:43 -0400
commitd252a5e7b73026b3ba3c49940724292099e634f0 (patch)
treec151797f0daecf457ef7a4bad027ecfdd8d79ad6 /drivers/net/cxgb3
parentf0a3a1538d57dfb51c73d012cbb72f985cd419aa (diff)
parent1824a9897473fda5e5e42f991ddc674c175e3a09 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r--drivers/net/cxgb3/t3_hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 1dd1637663a..c8a865a7e26 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -3784,7 +3784,7 @@ int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,
3784 3784
3785 adapter->params.info = ai; 3785 adapter->params.info = ai;
3786 adapter->params.nports = ai->nports0 + ai->nports1; 3786 adapter->params.nports = ai->nports0 + ai->nports1;
3787 adapter->params.chan_map = !!ai->nports0 | (!!ai->nports1 << 1); 3787 adapter->params.chan_map = (!!ai->nports0) | (!!ai->nports1 << 1);
3788 adapter->params.rev = t3_read_reg(adapter, A_PL_REV); 3788 adapter->params.rev = t3_read_reg(adapter, A_PL_REV);
3789 /* 3789 /*
3790 * We used to only run the "adapter check task" once a second if 3790 * We used to only run the "adapter check task" once a second if