diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/ethoc.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
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 |