diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 17:42:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-24 17:42:03 -0500 |
| commit | 47143b094d4700842e42b0a7cc2548d7ae292690 (patch) | |
| tree | ab1e7fb7cdedd29c8a9b953e58110ff3870946e4 /drivers/pci/Makefile | |
| parent | 0b9466ccea3c4ec363737288dd9467bf978c9c2d (diff) | |
| parent | f02cbbe657939489347cbda598401a56913ffcbd (diff) | |
Merge branch 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
* 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
pci root complex: support for tile architecture
drivers/net/tile/: on-chip network drivers for the tile architecture
MAINTAINERS: add drivers/char/hvc_tile.c as maintained by tile
Diffstat (limited to 'drivers/pci/Makefile')
| -rw-r--r-- | drivers/pci/Makefile | 1 |
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 | |||
| 49 | obj-$(CONFIG_X86_VISWS) += setup-irq.o | 49 | obj-$(CONFIG_X86_VISWS) += setup-irq.o |
| 50 | obj-$(CONFIG_MN10300) += setup-bus.o | 50 | obj-$(CONFIG_MN10300) += setup-bus.o |
| 51 | obj-$(CONFIG_MICROBLAZE) += setup-bus.o | 51 | obj-$(CONFIG_MICROBLAZE) += setup-bus.o |
| 52 | obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o | ||
| 52 | 53 | ||
| 53 | # | 54 | # |
| 54 | # ACPI Related PCI FW Functions | 55 | # ACPI Related PCI FW Functions |