summaryrefslogtreecommitdiffstats
path: root/drivers/pci/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-11-29 19:44:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-29 19:44:22 +0100
commit8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch)
treed4933996296141103b1f54e563268b23c95d6dd4 /drivers/pci/Makefile
parentstaging: fix winbond build, needs delay.h (diff)
parentUn-inline get_pipe_info() helper function (diff)
downloadlinux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz
linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.zip
Merge branch 'master' into work
Diffstat (limited to 'drivers/pci/Makefile')
-rw-r--r--drivers/pci/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index f01e344cf4bd..98e6fdf34d30 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
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
#
# ACPI Related PCI FW Functions