Patchwork Remove old workaround for arch/ppc vs. arch/powerpc from Makefile

login
register
mail settings
Submitter Josh Boyer
Date Oct. 10, 2008, 6:53 p.m.
Message ID <20081010185321.GA16769@yoda.jdub.homelinux.org>
Download mbox | patch
Permalink /patch/3851/
State Accepted, archived
Headers show

Comments

Josh Boyer - Oct. 10, 2008, 6:53 p.m.
There is an old workaround in the sysdev/Makefile for dealing
with arch/ppc vs. arch/powerpc compiles.  This is no longer
needed as arch/ppc is dead.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
---
Kumar Gala - Oct. 10, 2008, 7:53 p.m.
On Oct 10, 2008, at 1:53 PM, Josh Boyer wrote:

> There is an old workaround in the sysdev/Makefile for dealing
> with arch/ppc vs. arch/powerpc compiles.  This is no longer
> needed as arch/ppc is dead.
>
> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
> ---

Acked-by: Kumar Gala <galak@kernel.crashing.org>

- k

Patch

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 55618ba..a44709a 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/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