ppc: Use the merged of_device.c from arch/powerpc/kernel

Signed-off-by: Paul Mackerras <paulus@samba.org>
git-mirror · Oct 17, 2005 · 3e63b9e · 3e63b9e
1 parent 30286ef
commit 3e63b9e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 277 deletions.
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_8xx)		+= m8xx_setup.o ppc8xx_pic.o $(wdt-mpc8xx-y) \
 ifeq ($(CONFIG_8xx),y)
 obj-$(CONFIG_PCI)		+= qspan_pci.o i8259.o
 endif
-obj-$(CONFIG_PPC_OF)		+= prom_init.o prom.o of_device.o
+obj-$(CONFIG_PPC_OF)		+= prom_init.o prom.o
 obj-$(CONFIG_PPC_PMAC)		+= open_pic.o indirect_pci.o
 obj-$(CONFIG_POWER4)		+= open_pic2.o
 obj-$(CONFIG_PPC_CHRP)		+= open_pic.o indirect_pci.o i8259.o

diff --git a/arch/ppc/syslib/of_device.c b/arch/ppc/syslib/of_device.c