diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/x86/kernel/quirks.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/x86/kernel/quirks.c')
| -rw-r--r-- | arch/x86/kernel/quirks.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index f6a11b9b1f98..67465ed89310 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c | |||
| @@ -35,9 +35,6 @@ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev) | |||
| 35 | if (!(word & (1 << 13))) { | 35 | if (!(word & (1 << 13))) { |
| 36 | dev_info(&dev->dev, "Intel E7520/7320/7525 detected; " | 36 | dev_info(&dev->dev, "Intel E7520/7320/7525 detected; " |
| 37 | "disabling irq balancing and affinity\n"); | 37 | "disabling irq balancing and affinity\n"); |
| 38 | #ifdef CONFIG_IRQBALANCE | ||
| 39 | irqbalance_disable(""); | ||
| 40 | #endif | ||
| 41 | noirqdebug_setup(""); | 38 | noirqdebug_setup(""); |
| 42 | #ifdef CONFIG_PROC_FS | 39 | #ifdef CONFIG_PROC_FS |
| 43 | no_irq_affinity = 1; | 40 | no_irq_affinity = 1; |