summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 16:33:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-09 16:33:01 -0700
commit7f45e5cd1718ed769295033ca214032848a0097d (patch)
treebc4d2d43ea939c6c6b3782bf7d77537446eea225 /drivers/pci
parent6aecceccf5aa626b0af203e54ca62cbf308c53d8 (diff)
parent10f0d07c51516bd24b040016c6d4304eef05f115 (diff)
downloadtalos-obmc-linux-7f45e5cd1718ed769295033ca214032848a0097d.tar.gz
talos-obmc-linux-7f45e5cd1718ed769295033ca214032848a0097d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc32, leon: bugfix in LEON SMP interrupt init sparc32, sun4m: bugfix in SMP IPI traphandler sparc: Remove unnecessary semicolons Add support for allocating irqs for bootbus devices Do not skip interrupt sources in sun4d interrupt handler and acknowledge interrupts correctly Restructure sun4d_build_device_irq so that timer interrupts can be allocated sparc: PCIC_PCI needs SPARC32 dependency sparc: Do not select GENERIC_HARDIRQS_NO_DEPRECATED sparc32,leon: add GRPCI2 PCI Host driver sparc32,leon: added LEON-common low-level PCI routines sparc32: added CONFIG_PCIC_PCI Kconfig setting
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index c85f744270a5..094308e41be5 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_X86_VISWS) += setup-irq.o
obj-$(CONFIG_MN10300) += setup-bus.o
obj-$(CONFIG_MICROBLAZE) += setup-bus.o
obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
+obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o
#
# ACPI Related PCI FW Functions
OpenPOWER on IntegriCloud