summaryrefslogtreecommitdiffstats
path: root/arch/mips/netlogic/xlp/Makefile
diff options
context:
space:
mode:
authorJayachandran C <jayachandranc@netlogicmicro.com>2012-07-13 21:53:16 +0530
committerJohn Crispin <blogic@openwrt.org>2012-08-22 23:46:37 +0200
commit1f8a9ef10732c96b5f898eacd5603c07dcc68b32 (patch)
tree151f6f3ec4ca7ed33ba160e0201c6d72f1d2023a /arch/mips/netlogic/xlp/Makefile
parent98dbc5764d8b6fa9cabe316fe725281703bf0fc6 (diff)
downloadlinux-stable-1f8a9ef10732c96b5f898eacd5603c07dcc68b32.tar.gz
linux-stable-1f8a9ef10732c96b5f898eacd5603c07dcc68b32.tar.bz2
linux-stable-1f8a9ef10732c96b5f898eacd5603c07dcc68b32.zip
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 <jayachandranc@netlogicmicro.com> Patchwork: http://patchwork.linux-mips.org/patch/4097/ Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/netlogic/xlp/Makefile')
-rw-r--r--arch/mips/netlogic/xlp/Makefile1
1 files changed, 0 insertions, 1 deletions
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