diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 15:00:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 15:00:47 +1100 |
| commit | 83b5775c1c73bcfe9ed834eb881fb2f4eb5ff82c (patch) | |
| tree | aabfc36976cc35a00f46c208e8523dea77816fb9 /kernel/irq | |
| parent | 0ad581c7e76f53fc8907e1331038ddf5d41d0ac3 (diff) | |
| parent | 46e06ac2d4a0d10f832f3e0e8aef3573c8c2232b (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/chip.c | 4 | ||||
| -rw-r--r-- | kernel/irq/spurious.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index c1660194d115..ae70e93b29b5 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -166,11 +166,11 @@ int set_irq_data(unsigned int irq, void *data) EXPORT_SYMBOL(set_irq_data); /** - * set_irq_data - set irq type data for an irq + * set_irq_msi - set irq type data for an irq * @irq: Interrupt number * @entry: Pointer to MSI descriptor data * - * Set the hardware irq controller data for an irq + * Set the MSI descriptor entry for an irq */ int set_irq_msi(unsigned int irq, struct msi_desc *entry) { diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index bd7273e6282e..7a5894e87f24 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -232,7 +232,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, /* * If we are seeing only the odd spurious IRQ caused by * bus asynchronicity then don't eventually trigger an error, - * otherwise the couter becomes a doomsday timer for otherwise + * otherwise the counter becomes a doomsday timer for otherwise * working systems */ if (time_after(jiffies, desc->last_unhandled + HZ/10)) |