From bcf1f0bc52ee2b6585853c151dbf61761ddb6dbf Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 10 Oct 2008 08:53:21 +0000 Subject: [PATCH] --- yaml --- r: 114612 b: refs/heads/master c: 6070bf6afe4c4232ec1e04fa16c056758b2e681b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/Makefile | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2ed65f050981..1649b9495c47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64b60e096fa391c56f93e6216115e6757bf86b7e +refs/heads/master: 6070bf6afe4c4232ec1e04fa16c056758b2e681b diff --git a/trunk/arch/powerpc/sysdev/Makefile b/trunk/arch/powerpc/sysdev/Makefile index 55618ba9eff0..a44709a94f97 100644 --- a/trunk/arch/powerpc/sysdev/Makefile +++ b/trunk/arch/powerpc/sysdev/Makefile @@ -38,15 +38,12 @@ ifeq ($(CONFIG_PCI),y) obj-$(CONFIG_4xx) += ppc4xx_pci.o endif -# Temporary hack until we have migrated to asm-powerpc -ifeq ($(ARCH),powerpc) obj-$(CONFIG_CPM) += cpm_common.o obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o obj-$(CONFIG_PPC_DCR) += dcr.o obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o obj-$(CONFIG_UCODE_PATCH) += micropatch.o -endif ifeq ($(CONFIG_SUSPEND),y) obj-$(CONFIG_6xx) += 6xx-suspend.o