diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-07-02 17:19:04 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-12 18:11:43 +0200 |
commit | 6ac5310e649df5fcd240d764503bf16a1317ea39 (patch) | |
tree | 286700815b3f30dc13cc3b2d9980b0244b244d33 /arch/mips/sgi-ip27/Makefile | |
parent | MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER (diff) | |
parent | MIPS: tlbex: Fix size of area to be flushed. (diff) | |
download | linux-dev-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.xz linux-dev-6ac5310e649df5fcd240d764503bf16a1317ea39.zip |
Merge branch '3.10-fixes' into mips-for-linux-next
This that should have been fixed but weren't, way to much, intrusive
and late.
Diffstat (limited to 'arch/mips/sgi-ip27/Makefile')
-rw-r--r-- | arch/mips/sgi-ip27/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/sgi-ip27/Makefile b/arch/mips/sgi-ip27/Makefile index 1f29e761d691..da8f6816d346 100644 --- a/arch/mips/sgi-ip27/Makefile +++ b/arch/mips/sgi-ip27/Makefile @@ -7,4 +7,5 @@ obj-y := ip27-berr.o ip27-irq.o ip27-init.o ip27-klconfig.o ip27-klnuma.o \ ip27-xtalk.o obj-$(CONFIG_EARLY_PRINTK) += ip27-console.o +obj-$(CONFIG_PCI) += ip27-irq-pci.o obj-$(CONFIG_SMP) += ip27-smp.o |