diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 12:23:57 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 12:23:57 +0200 |
commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /arch/powerpc/sysdev/Makefile | |
parent | [MTD] [NAND] nand_base.c fix broken link (diff) | |
parent | Fix WARN_ON() on bitfield ops (diff) | |
download | linux-440fdb53b4ae58602711b5b8c3a139ace2404dbb.tar.xz linux-440fdb53b4ae58602711b5b8c3a139ace2404dbb.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/sysdev/Makefile')
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 484eb4e0e9db..08ce31e612c2 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_PPC_PMI) += pmi.o obj-$(CONFIG_U3_DART) += dart_iommu.o obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o obj-$(CONFIG_FSL_SOC) += fsl_soc.o +obj-$(CONFIG_FSL_PCI) += fsl_pci.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ mv64x60-$(CONFIG_PCI) += mv64x60_pci.o |