diff options
| author |   Paul Mackerras <paulus@samba.org> | 2005-10-20 21:06:44 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 21:06:44 +1000 |
| commit | d85b525e6e1d0886eebd1d4c4f954d9d2f226a63 (patch) | |
| tree | dd36c3369323d53aaa026530fe038d90b5626e16 /arch/ppc64/kernel/Makefile | |
| parent | powerpc: Move some calculations from xxx_calibrate_decr to time_init (diff) | |
| download | linux-dev-d85b525e6e1d0886eebd1d4c4f954d9d2f226a63.tar.xz linux-dev-d85b525e6e1d0886eebd1d4c4f954d9d2f226a63.zip | |
ppc64: Use the merged mpic.c
This means we now compile in arch/powerpc/sysdev for ARCH=ppc64.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
| -rw-r--r-- | arch/ppc64/kernel/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index 6cce419f4b09..6c02a79955c7 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile @@ -55,9 +55,8 @@ obj-$(CONFIG_HVCS) += hvcserver.o obj-$(CONFIG_IBMVIO) += vio.o obj-$(CONFIG_XICS) += xics.o -ifneq ($(CONFIG_PPC_MERGE),y) -obj-$(CONFIG_MPIC) += mpic.o +ifneq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \ pmac_time.o pmac_nvram.o pmac_low_i2c.o \ udbg_scc.o |