aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/Kconfig1
-rw-r--r--drivers/pci/Makefile4
-rw-r--r--drivers/pci/htirq.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 0af6d7288415..30294127a0aa 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -55,7 +55,6 @@ config PCI_DEBUG
55config HT_IRQ 55config HT_IRQ
56 bool "Interrupts on hypertransport devices" 56 bool "Interrupts on hypertransport devices"
57 default y 57 default y
58 depends on PCI_MSI
59 depends on X86_LOCAL_APIC && X86_IO_APIC 58 depends on X86_LOCAL_APIC && X86_IO_APIC
60 help 59 help
61 This allows native hypertransport devices to use interrupts. 60 This allows native hypertransport devices to use interrupts.
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index 04694ec7224b..e3beb784406f 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -17,6 +17,9 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
17# Build the PCI MSI interrupt support 17# Build the PCI MSI interrupt support
18obj-$(CONFIG_PCI_MSI) += msi.o 18obj-$(CONFIG_PCI_MSI) += msi.o
19 19
20# Build the Hypertransport interrupt support
21obj-$(CONFIG_HT_IRQ) += htirq.o
22
20# 23#
21# Some architectures use the generic PCI setup functions 24# Some architectures use the generic PCI setup functions
22# 25#
@@ -29,7 +32,6 @@ obj-$(CONFIG_PPC32) += setup-irq.o
29obj-$(CONFIG_PPC64) += setup-bus.o 32obj-$(CONFIG_PPC64) += setup-bus.o
30obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o 33obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
31obj-$(CONFIG_X86_VISWS) += setup-irq.o 34obj-$(CONFIG_X86_VISWS) += setup-irq.o
32obj-$(CONFIG_HT_IRQ) += htirq.o
33 35
34# 36#
35# ACPI Related PCI FW Functions 37# ACPI Related PCI FW Functions
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 4ba46359d367..0e27f2404a83 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -11,6 +11,7 @@
11#include <linux/spinlock.h> 11#include <linux/spinlock.h>
12#include <linux/slab.h> 12#include <linux/slab.h>
13#include <linux/gfp.h> 13#include <linux/gfp.h>
14#include <linux/htirq.h>
14 15
15/* Global ht irq lock. 16/* Global ht irq lock.
16 * 17 *