aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-06 13:24:50 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-06 13:24:50 +1000
commitb3491269f5604e4265ee2f27b47a76ce1e3678b6 (patch)
tree671e3135c697ff680d6d8a4cced7563cd5cf75db /arch/powerpc
parent2e686bc3bf6268e30eb9584e0bcd43b7bec28f3b (diff)
powerpc: Use the merged of_device.c with ARCH=powerpc
Also compile btext.c with -fPIC; this was missed before. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 4842e82dbc2..06d618e52f8 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -7,6 +7,7 @@ EXTRA_CFLAGS += -mno-minimal-toc
endif
ifeq ($(CONFIG_PPC32),y)
CFLAGS_prom_init.o += -fPIC
+CFLAGS_btext.o += -fPIC
endif
extra-$(CONFIG_PPC_STD_MMU) := head.o
@@ -23,7 +24,7 @@ obj-y := traps.o prom.o semaphore.o
obj-$(CONFIG_PPC32) += setup.o process.o
obj-$(CONFIG_PPC64) += idle_power4.o
ifeq ($(CONFIG_PPC32),y)
-obj-$(CONFIG_PPC_OF) += prom_init.o
+obj-$(CONFIG_PPC_OF) += prom_init.o of_device.o
obj-$(CONFIG_MODULES) += ppc_ksyms.o
endif
obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o