From 1f8a9ef10732c96b5f898eacd5603c07dcc68b32 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Fri, 13 Jul 2012 21:53:16 +0530 Subject: MIPS: Netlogic: merge of.c into setup.c Move the function device_tree_init() from netlogic/xlp/of.c to setup.c, and remove the wrapper functions reserve_mem_mach() and free_mem_mach(). Remove file netlogic/xlp/of.c, and the Makefile entry for it. Signed-off-by: Jayachandran C Patchwork: http://patchwork.linux-mips.org/patch/4097/ Signed-off-by: John Crispin --- arch/mips/netlogic/xlp/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/mips/netlogic/xlp/Makefile') diff --git a/arch/mips/netlogic/xlp/Makefile b/arch/mips/netlogic/xlp/Makefile index 6b4b972218f0..5bd24b6a8f0b 100644 --- a/arch/mips/netlogic/xlp/Makefile +++ b/arch/mips/netlogic/xlp/Makefile @@ -1,4 +1,3 @@ obj-y += setup.o platform.o nlm_hal.o -obj-$(CONFIG_OF) += of.o obj-$(CONFIG_SMP) += wakeup.o obj-$(CONFIG_USB) += usb-init.o -- cgit v1.2.3