From 64048f298ed8862ccbab4414c37e39d939b1ba8f Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Fri, 12 Dec 2008 13:14:18 -0800
Subject: [PATCH] --- yaml --- r: 123259 b: refs/heads/master c:
 17483a1f34c970e6c2cb8c082d4441bfabbe88a9 h: refs/heads/master i:   123257:
 83899ef3c4324f153d7b43d1908f7a919ce0bf96   123255:
 74f8654c3cb5c7070528b4411f05c768ac54dbae v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86/Kconfig             | 2 +-
 trunk/drivers/pci/intr_remapping.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 60718d3e68a8..ee0b14c87c81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48a1b10aff588833b73994704c47bbd0deb73e9c
+refs/heads/master: 17483a1f34c970e6c2cb8c082d4441bfabbe88a9
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 29073532f94c..60a008857a38 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -240,7 +240,7 @@ config X86_HAS_BOOT_CPU_ID
 
 config SPARSE_IRQ
 	bool "Support sparse irq numbering"
-	depends on (PCI_MSI || HT_IRQ) && SMP
+	depends on PCI_MSI || HT_IRQ
 	default y
 	help
 	  This enables support for sparse irq, esp for msi/msi-x. You may need
diff --git a/trunk/drivers/pci/intr_remapping.c b/trunk/drivers/pci/intr_remapping.c
index c9958ec5e25e..f78371b22529 100644
--- a/trunk/drivers/pci/intr_remapping.c
+++ b/trunk/drivers/pci/intr_remapping.c
@@ -5,6 +5,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <asm/io_apic.h>
+#include <asm/smp.h>
 #include <linux/intel-iommu.h>
 #include "intr_remapping.h"