summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 23:30:08 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 23:30:08 +0400
commit259cdbee2094d28b72f0f3d77bc9203d682994ff (patch)
treede2017bda15cce950d96ef6d1771dd7e7fbab490 /kernel
parent9ada9fd5dfaf0076eadf42cecc68f7adc1717c58 (diff)
parent023bba36387de704b3ea2a69bf9f9ed2301cfbcc (diff)
downloadlinux-259cdbee2094d28b72f0f3d77bc9203d682994ff.tar.xz
Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull irqdomain changes from Grant Likely: "Trivial changes to irqdomain. An update to the documentation and make one of the error paths not quite so obnoxious." * tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6: irqdomain: update documentation irqdomain: stop screaming about preallocated irqdescs
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/irqdomain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 4e69e24d3d7d..96f3a1d9c379 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -177,8 +177,8 @@ struct irq_domain *irq_domain_add_simple(struct device_node *of_node,
irq_base = irq_alloc_descs(first_irq, first_irq, size,
of_node_to_nid(of_node));
if (irq_base < 0) {
- WARN(1, "Cannot allocate irq_descs @ IRQ%d, assuming pre-allocated\n",
- first_irq);
+ pr_info("Cannot allocate irq_descs @ IRQ%d, assuming pre-allocated\n",
+ first_irq);
irq_base = first_irq;
}
} else