summaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-10 22:25:26 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-10 22:25:26 +1000
commitdaec962e27490be4fae9ab5a51d0c17f6e638715 (patch)
tree86044d794f5406dcdcca5e6827607782d7c27ab1 /arch/ppc
parentb3b8dc6c07cecc1f8d52d03f677206bdf9f794c9 (diff)
powerpc: Use arch/powerpc/mm and arch/powerpc/lib for 64-bit
This also puts a copy of indirect_pci.c in arch/powerpc/sysdev so that we don't need to build in arch/ppc/syslib. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/syslib/Makefile14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index 1b0a84931af..b8d08f33f7e 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -5,7 +5,6 @@
CFLAGS_prom_init.o += -fPIC
CFLAGS_btext.o += -fPIC
-ifneq ($(CONFIG_PPC_MERGE),y)
wdt-mpc8xx-$(CONFIG_8xx_WDT) += m8xx_wdt.o
obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o
@@ -110,16 +109,3 @@ obj-$(CONFIG_PPC_MPC52xx) += mpc52xx_setup.o mpc52xx_pic.o \
ifeq ($(CONFIG_PPC_MPC52xx),y)
obj-$(CONFIG_PCI) += mpc52xx_pci.o
endif
-
-else
-# Stuff still needed by the merged powerpc sources
-
-obj-$(CONFIG_PPCBUG_NVRAM) += prep_nvram.o
-obj-$(CONFIG_PPC_OF) += prom_init.o prom.o of_device.o
-obj-$(CONFIG_PPC_PMAC) += indirect_pci.o
-obj-$(CONFIG_PPC_CHRP) += indirect_pci.o i8259.o
-obj-$(CONFIG_PPC_PREP) += indirect_pci.o i8259.o todc_time.o
-obj-$(CONFIG_BOOTX_TEXT) += btext.o
-obj-$(CONFIG_MPC10X_BRIDGE) += mpc10x_common.o indirect_pci.o ppc_sys.o
-
-endif