aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Gerst <bgerst@didntduck.org>2005-10-30 14:59:18 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-30 17:37:10 -0800
commit4276d32260662d5401a15a0a46e506fb5c8ab563 (patch)
tree5968cda01076da10592729986975c7952d18862e
parentMerge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff)
downloadlinux-dev-4276d32260662d5401a15a0a46e506fb5c8ab563.tar.xz
linux-dev-4276d32260662d5401a15a0a46e506fb5c8ab563.zip
[PATCH] Remove redundant configs.o
Since CONFIG_IKCONFIG_PROC already depends on CONFIG_IKCONFIG, adding configs.o again is redundant. Signed-off-by: Brian Gerst <bgerst@didntduck.org> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--kernel/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index ff4dc02ce170..980b5e454441 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_KEXEC) += kexec.o
obj-$(CONFIG_COMPAT) += compat.o
obj-$(CONFIG_CPUSETS) += cpuset.o
obj-$(CONFIG_IKCONFIG) += configs.o
-obj-$(CONFIG_IKCONFIG_PROC) += configs.o
obj-$(CONFIG_STOP_MACHINE) += stop_machine.o
obj-$(CONFIG_AUDIT) += audit.o
obj-$(CONFIG_AUDITSYSCALL) += auditsc.o