From ff940eb22f813199987bd52cc2967c00804d9893 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Fri, 17 Nov 2006 23:12:14 -0700 Subject: [PATCH] --- yaml --- r: 42255 b: refs/heads/master c: 4687522c0dba89f1f71aeb8cf08acc4e1ee87fda h: refs/heads/master i: 42253: c434368beb1f67cbd8b963e64f56c65df033d91f 42251: 3cc56a919d18ac45e3dcb5267566a2f9d993f013 42247: f1344bbd77fa0130b6a92c9f32b4dfecf73151e2 42239: 7e3b0397eec3a76c5a7eed51167171d6384cfba0 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2ae1444b9c6c..597479b1bc09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a06c3b176976919e223844f8ed9f1acae20b433 +refs/heads/master: 4687522c0dba89f1f71aeb8cf08acc4e1ee87fda diff --git a/trunk/arch/powerpc/sysdev/Makefile b/trunk/arch/powerpc/sysdev/Makefile index 8ba11ab5e614..bae874626fc3 100644 --- a/trunk/arch/powerpc/sysdev/Makefile +++ b/trunk/arch/powerpc/sysdev/Makefile @@ -11,11 +11,11 @@ obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o obj-$(CONFIG_FSL_SOC) += fsl_soc.o obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o obj-$(CONFIG_QUICC_ENGINE) += qe_lib/ -obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_pic.o ifeq ($(CONFIG_PPC_MERGE),y) obj-$(CONFIG_PPC_I8259) += i8259.o obj-$(CONFIG_PPC_83xx) += ipic.o +obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_pic.o endif # Temporary hack until we have migrated to asm-powerpc