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>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 4842e82dbc2b..06d618e52f8e 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