From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 26 Feb 2010 10:17:16 +0000 (+0100)
Subject: x86: apic: Fix mismerge, add arch_probe_nr_irqs() again
X-Git-Tag: v2.6.34-rc1~217^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21c2fd9970cc8e457058f84016450a2e9876125e;p=pandora-kernel.git

x86: apic: Fix mismerge, add arch_probe_nr_irqs() again

Merge commit aef55d4922 mis-merged io_apic.c so we lost the
arch_probe_nr_irqs() method.

This caused subtle boot breakages (udev confusion likely
due to missing drivers) with certain configs.

Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <20100207210250.GB8256@jenkins.home.ifup.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

Reading git-diff-tree failed