diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-03 23:54:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-03 23:54:56 -0400 |
| commit | 73561695b2e77473e353a5ae63bab81ed5098d8e (patch) | |
| tree | d039affaa54d38985e41566e4d62e0aa6a170287 /arch/ppc/syslib/Makefile | |
| parent | 6f2f38128170814e151cfedf79532e19cd179567 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
| download | kernel-crypto-73561695b2e77473e353a5ae63bab81ed5098d8e.tar.gz kernel-crypto-73561695b2e77473e353a5ae63bab81ed5098d8e.tar.xz kernel-crypto-73561695b2e77473e353a5ae63bab81ed5098d8e.zip | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'arch/ppc/syslib/Makefile')
| -rw-r--r-- | arch/ppc/syslib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index dd418ea3426..96acf85800d 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile @@ -81,7 +81,7 @@ obj-$(CONFIG_SBC82xx) += todc_time.o obj-$(CONFIG_SPRUCE) += cpc700_pic.o indirect_pci.o pci_auto.o \ todc_time.o obj-$(CONFIG_8260) += m8260_setup.o -obj-$(CONFIG_PCI_8260) += m8260_pci.o indirect_pci.o +obj-$(CONFIG_PCI_8260) += m82xx_pci.o indirect_pci.o pci_auto.o obj-$(CONFIG_8260_PCI9) += m8260_pci_erratum9.o obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o ifeq ($(CONFIG_PPC_GEN550),y) @@ -97,7 +97,7 @@ obj-$(CONFIG_MPC10X_OPENPIC) += open_pic.o obj-$(CONFIG_40x) += dcr.o obj-$(CONFIG_BOOKE) += dcr.o obj-$(CONFIG_85xx) += open_pic.o ppc85xx_common.o ppc85xx_setup.o \ - ppc_sys.o mpc85xx_sys.o \ + ppc_sys.o i8259.o mpc85xx_sys.o \ mpc85xx_devices.o ifeq ($(CONFIG_85xx),y) obj-$(CONFIG_PCI) += indirect_pci.o pci_auto.o |