diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/net/irda | |
| parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/irda')
| -rw-r--r-- | drivers/net/irda/sa1100_ir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c index c412e8026173..1dcdce0631aa 100644 --- a/drivers/net/irda/sa1100_ir.c +++ b/drivers/net/irda/sa1100_ir.c | |||
| @@ -331,7 +331,7 @@ static int sa1100_irda_resume(struct platform_device *pdev) | |||
| 331 | * If we missed a speed change, initialise at the new speed | 331 | * If we missed a speed change, initialise at the new speed |
| 332 | * directly. It is debatable whether this is actually | 332 | * directly. It is debatable whether this is actually |
| 333 | * required, but in the interests of continuing from where | 333 | * required, but in the interests of continuing from where |
| 334 | * we left off it is desireable. The converse argument is | 334 | * we left off it is desirable. The converse argument is |
| 335 | * that we should re-negotiate at 9600 baud again. | 335 | * that we should re-negotiate at 9600 baud again. |
| 336 | */ | 336 | */ |
| 337 | if (si->newspeed) { | 337 | if (si->newspeed) { |