diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-06 08:11:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-06 08:11:28 +0200 |
| commit | 4d70230bb46859df6295744f7dcf8c560f01fb8f (patch) | |
| tree | a5b0f219c2f90365136a00b555fdd4fcc07ed3bf /kernel | |
| parent | 98bb318864ed10ae374573f1382147f113642059 (diff) | |
| parent | bfd412db9e7b0d8f7b9c09d12d07aa2ac785f1d0 (diff) | |
| download | op-kernel-dev-4d70230bb46859df6295744f7dcf8c560f01fb8f.zip op-kernel-dev-4d70230bb46859df6295744f7dcf8c560f01fb8f.tar.gz | |
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 dd201bd..834899f 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -419,7 +419,7 @@ int show_interrupts(struct seq_file *p, void *v) } else { seq_printf(p, " %8s", "None"); } -#ifdef CONFIG_GENIRC_IRQ_SHOW_LEVEL +#ifdef CONFIG_GENERIC_IRQ_SHOW_LEVEL seq_printf(p, " %-8s", irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge"); #endif if (desc->name) |
