aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-10-10 04:53:21 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-12 19:56:18 -0400
commit6070bf6afe4c4232ec1e04fa16c056758b2e681b (patch)
tree1735400daa3e18cfbc6e5901c2f737a122021441 /arch/powerpc/sysdev
parent64b60e096fa391c56f93e6216115e6757bf86b7e (diff)
powerpc: Remove old Makefile workaround for arch/ppc
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> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r--arch/powerpc/sysdev/Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 55618ba9eff0..a44709a94f97 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -38,15 +38,12 @@ ifeq ($(CONFIG_PCI),y)
38obj-$(CONFIG_4xx) += ppc4xx_pci.o 38obj-$(CONFIG_4xx) += ppc4xx_pci.o
39endif 39endif
40 40
41# Temporary hack until we have migrated to asm-powerpc
42ifeq ($(ARCH),powerpc)
43obj-$(CONFIG_CPM) += cpm_common.o 41obj-$(CONFIG_CPM) += cpm_common.o
44obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o 42obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
45obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o 43obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o
46obj-$(CONFIG_PPC_DCR) += dcr.o 44obj-$(CONFIG_PPC_DCR) += dcr.o
47obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o 45obj-$(CONFIG_8xx) += mpc8xx_pic.o cpm1.o
48obj-$(CONFIG_UCODE_PATCH) += micropatch.o 46obj-$(CONFIG_UCODE_PATCH) += micropatch.o
49endif
50 47
51ifeq ($(CONFIG_SUSPEND),y) 48ifeq ($(CONFIG_SUSPEND),y)
52obj-$(CONFIG_6xx) += 6xx-suspend.o 49obj-$(CONFIG_6xx) += 6xx-suspend.o