diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-06 02:11:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-06 02:11:28 -0400 |
| commit | 4d70230bb46859df6295744f7dcf8c560f01fb8f (patch) | |
| tree | a5b0f219c2f90365136a00b555fdd4fcc07ed3bf /kernel | |
| parent | 98bb318864ed10ae374573f1382147f113642059 (diff) | |
| parent | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into perf/urgent
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index dd201bd35103..834899f2500f 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c | |||
| @@ -419,7 +419,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 419 | } else { | 419 | } else { |
| 420 | seq_printf(p, " %8s", "None"); | 420 | seq_printf(p, " %8s", "None"); |
| 421 | } | 421 | } |
| 422 | #ifdef CONFIG_GENIRC_IRQ_SHOW_LEVEL | 422 | #ifdef CONFIG_GENERIC_IRQ_SHOW_LEVEL |
| 423 | seq_printf(p, " %-8s", irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge"); | 423 | seq_printf(p, " %-8s", irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge"); |
| 424 | #endif | 424 | #endif |
| 425 | if (desc->name) | 425 | if (desc->name) |