diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 10:05:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 10:05:10 -0800 |
commit | fc03da1ca1954f103ed57daf90611cefa57b07e0 (patch) | |
tree | 2b9b44b1a39f7743c1c3d7bc89654792686d7dbc /arch/ppc/syslib/Makefile | |
parent | caf5b04c82f05c65843b2d7189845d6c3df5a41e (diff) | |
parent | e05b3b4adbaeea508bd1c195f1f2e22c8251176b (diff) | |
download | op-kernel-dev-fc03da1ca1954f103ed57daf90611cefa57b07e0.zip op-kernel-dev-fc03da1ca1954f103ed57daf90611cefa57b07e0.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc/syslib/Makefile')
-rw-r--r-- | arch/ppc/syslib/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 84ef030..159dcd9 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile @@ -39,8 +39,6 @@ obj-$(CONFIG_8xx) += m8xx_setup.o ppc8xx_pic.o $(wdt-mpc8xx-y) \ ppc_sys.o mpc8xx_devices.o mpc8xx_sys.o obj-$(CONFIG_PCI_QSPAN) += qspan_pci.o obj-$(CONFIG_PPC_OF) += prom_init.o prom.o -obj-$(CONFIG_PPC_PMAC) += open_pic.o -obj-$(CONFIG_POWER4) += open_pic2.o obj-$(CONFIG_PPC_CHRP) += open_pic.o obj-$(CONFIG_PPC_PREP) += open_pic.o todc_time.o obj-$(CONFIG_BAMBOO) += pci_auto.o todc_time.o |