diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/net/ethoc.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/net/ethoc.c')
| -rw-r--r-- | drivers/net/ethoc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index db0290f05bdf..a83dd312c3ac 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c | |||
| @@ -542,7 +542,7 @@ static irqreturn_t ethoc_interrupt(int irq, void *dev_id) | |||
| 542 | 542 | ||
| 543 | /* Figure out what triggered the interrupt... | 543 | /* Figure out what triggered the interrupt... |
| 544 | * The tricky bit here is that the interrupt source bits get | 544 | * The tricky bit here is that the interrupt source bits get |
| 545 | * set in INT_SOURCE for an event irregardless of whether that | 545 | * set in INT_SOURCE for an event regardless of whether that |
| 546 | * event is masked or not. Thus, in order to figure out what | 546 | * event is masked or not. Thus, in order to figure out what |
| 547 | * triggered the interrupt, we need to remove the sources | 547 | * triggered the interrupt, we need to remove the sources |
| 548 | * for all events that are currently masked. This behaviour | 548 | * for all events that are currently masked. This behaviour |