summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2010-08-10 18:03:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 08:59:20 -0700
commitcfbef3cb16658046c6faa8c9816018dd11ae62f0 (patch)
treee3c548806eda5f695bedea312660222b7384d53f /fs
parenta2a20c412c86e0bb46a9ab0dd31bcfe6d201b913 (diff)
downloadlinux-3.10-cfbef3cb16658046c6faa8c9816018dd11ae62f0.tar.gz
linux-3.10-cfbef3cb16658046c6faa8c9816018dd11ae62f0.tar.bz2
linux-3.10-cfbef3cb16658046c6faa8c9816018dd11ae62f0.zip
procfs: simplify conditional processing of fs/proc.o.
Since the entire fs/proc directory is conditionally included based on CONFIG_PROC_FS, it's redundant to check that same variable within that directory. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index 11a7b5c6815..2758e2afc51 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -2,7 +2,7 @@
# Makefile for the Linux proc filesystem routines.
#
-obj-$(CONFIG_PROC_FS) += proc.o
+obj-y += proc.o
proc-y := nommu.o task_nommu.o
proc-$(CONFIG_MMU) := mmu.o task_mmu.o