diff options
| author | Matt Porter <mporter@kernel.crashing.org> | 2005-11-08 21:34:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 07:55:51 -0800 |
| commit | c099af7622c8e032edcfdc057cde1015761adeac (patch) | |
| tree | 2e4e134239a7e7f7d776515415bef871cf0213a5 /arch/ppc | |
| parent | ce9982d048bb498c38ec1fe2ae59a44350882f3f (diff) | |
| download | op-kernel-dev-c099af7622c8e032edcfdc057cde1015761adeac.zip op-kernel-dev-c099af7622c8e032edcfdc057cde1015761adeac.tar.gz | |
[PATCH] ppc32: Fix RapidIO build on 85xx
Fixes mismerged Makefile that prevented the ppc85xx rapidio support from being
built.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/syslib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 5bd33ba..5b7f2b8 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile @@ -33,7 +33,6 @@ obj-$(CONFIG_PPC4xx_DMA) += ppc4xx_dma.o obj-$(CONFIG_PPC4xx_EDMA) += ppc4xx_sgdma.o ifeq ($(CONFIG_40x),y) obj-$(CONFIG_PCI) += pci_auto.o ppc405_pci.o -obj-$(CONFIG_RAPIDIO) += ppc85xx_rio.o endif endif obj-$(CONFIG_8xx) += m8xx_setup.o ppc8xx_pic.o $(wdt-mpc8xx-y) \ @@ -96,6 +95,7 @@ obj-$(CONFIG_85xx) += open_pic.o ppc85xx_common.o ppc85xx_setup.o \ ifeq ($(CONFIG_85xx),y) obj-$(CONFIG_PCI) += pci_auto.o endif +obj-$(CONFIG_RAPIDIO) += ppc85xx_rio.o obj-$(CONFIG_83xx) += ipic.o ppc83xx_setup.o ppc_sys.o \ mpc83xx_sys.o mpc83xx_devices.o ifeq ($(CONFIG_83xx),y) |
