diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /kernel/irq/migration.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'kernel/irq/migration.c')
| -rw-r--r-- | kernel/irq/migration.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c index bc6194698dfd..47420908fba0 100644 --- a/kernel/irq/migration.c +++ b/kernel/irq/migration.c | |||
| @@ -35,7 +35,7 @@ void irq_move_masked_irq(struct irq_data *idata) | |||
| 35 | * do the disable, re-program, enable sequence. | 35 | * do the disable, re-program, enable sequence. |
| 36 | * This is *not* particularly important for level triggered | 36 | * This is *not* particularly important for level triggered |
| 37 | * but in a edge trigger case, we might be setting rte | 37 | * but in a edge trigger case, we might be setting rte |
| 38 | * when an active trigger is comming in. This could | 38 | * when an active trigger is coming in. This could |
| 39 | * cause some ioapics to mal-function. | 39 | * cause some ioapics to mal-function. |
| 40 | * Being paranoid i guess! | 40 | * Being paranoid i guess! |
| 41 | * | 41 | * |