diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2006-10-04 02:17:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 07:55:30 -0700 |
| commit | 95d77884c77beed676036d2f74d10b470a483c63 (patch) | |
| tree | 7897bc159d0d8ac972abc76e01d6e54c2bca3c84 /drivers/pci | |
| parent | 03571e11c4a6d08230657f80970f0a5cc7820471 (diff) | |
| download | linux-3.10-95d77884c77beed676036d2f74d10b470a483c63.tar.gz linux-3.10-95d77884c77beed676036d2f74d10b470a483c63.tar.bz2 linux-3.10-95d77884c77beed676036d2f74d10b470a483c63.zip | |
[PATCH] htirq: tidy up the htirq code
This moves the declarations for the architecture helpers into
include/linux/htirq.h from the generic include/linux/pci.h. Hopefully this
will make this distinction clearer.
htirq.h is included where it is needed.
The dependency on the msi code is fixed and removed.
The Makefile is tidied up.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg KH <greg@kroah.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pci/Makefile | 4 | ||||
| -rw-r--r-- | drivers/pci/htirq.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index 0af6d728841..30294127a0a 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -55,7 +55,6 @@ config PCI_DEBUG config HT_IRQ bool "Interrupts on hypertransport devices" default y - depends on PCI_MSI depends on X86_LOCAL_APIC && X86_IO_APIC help This allows native hypertransport devices to use interrupts. diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 04694ec7224..e3beb784406 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -17,6 +17,9 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ # Build the PCI MSI interrupt support obj-$(CONFIG_PCI_MSI) += msi.o +# Build the Hypertransport interrupt support +obj-$(CONFIG_HT_IRQ) += htirq.o + # # Some architectures use the generic PCI setup functions # @@ -29,7 +32,6 @@ obj-$(CONFIG_PPC32) += setup-irq.o obj-$(CONFIG_PPC64) += setup-bus.o obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o obj-$(CONFIG_X86_VISWS) += setup-irq.o -obj-$(CONFIG_HT_IRQ) += htirq.o # # ACPI Related PCI FW Functions diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index 4ba46359d36..0e27f2404a8 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c @@ -11,6 +11,7 @@ #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/gfp.h> +#include <linux/htirq.h> /* Global ht irq lock. * |