diff options
author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/net/qlge/qlge_main.c | |
parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/net/qlge/qlge_main.c')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index b9a5f59d6c9..90d1f76c0e8 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -3224,7 +3224,7 @@ static int ql_adapter_reset(struct ql_adapter *qdev) | |||
3224 | 3224 | ||
3225 | if (value & RST_FO_FR) { | 3225 | if (value & RST_FO_FR) { |
3226 | QPRINTK(qdev, IFDOWN, ERR, | 3226 | QPRINTK(qdev, IFDOWN, ERR, |
3227 | "ETIMEOUT!!! errored out of resetting the chip!\n"); | 3227 | "ETIMEDOUT!!! errored out of resetting the chip!\n"); |
3228 | status = -ETIMEDOUT; | 3228 | status = -ETIMEDOUT; |
3229 | } | 3229 | } |
3230 | 3230 | ||