diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
commit | 21d7f14b70fed254222a24e124e8771e1437be4c (patch) | |
tree | 3c52e48b28d5675bafa005e061b5639966671ca3 /fs/proc/Makefile | |
parent | eff6a902ff6b8a42f768c4b78fc63b9b8d0a41d9 (diff) | |
parent | 2ea8f7ea87f24735c49543c7f523919295028c58 (diff) |
Merge branch 'lsk/v3.14/topic/of' into linux-linaro-lsk-v3.14lsk-v3.14-15.02lsk-v3.14-14.02
Conflicts:
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/address.c
drivers/of/selftest.c
include/linux/of.h
Diffstat (limited to 'fs/proc/Makefile')
-rw-r--r-- | fs/proc/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/proc/Makefile b/fs/proc/Makefile index ab30716584f5..239493ec718e 100644 --- a/fs/proc/Makefile +++ b/fs/proc/Makefile @@ -27,6 +27,5 @@ proc-$(CONFIG_PROC_SYSCTL) += proc_sysctl.o proc-$(CONFIG_NET) += proc_net.o proc-$(CONFIG_PROC_KCORE) += kcore.o proc-$(CONFIG_PROC_VMCORE) += vmcore.o -proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o proc-$(CONFIG_PRINTK) += kmsg.o proc-$(CONFIG_PROC_PAGE_MONITOR) += page.o |