diff options
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 | |||
| 55 | 55 | ||
| 56 | obj-$(CONFIG_IBMVIO) += vio.o | 56 | obj-$(CONFIG_IBMVIO) += vio.o |
| 57 | obj-$(CONFIG_XICS) += xics.o | 57 | obj-$(CONFIG_XICS) += xics.o |
| 58 | ifneq ($(CONFIG_PPC_MERGE),y) | ||
| 59 | obj-$(CONFIG_MPIC) += mpic.o | ||
| 60 | 58 | ||
| 59 | ifneq ($(CONFIG_PPC_MERGE),y) | ||
| 61 | obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \ | 60 | obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \ |
| 62 | pmac_time.o pmac_nvram.o pmac_low_i2c.o \ | 61 | pmac_time.o pmac_nvram.o pmac_low_i2c.o \ |
| 63 | udbg_scc.o | 62 | udbg_scc.o |