Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / um / util / Makefile

diff --git a/arch/um/util/Makefile b/arch/um/util/Makefile
index e2ab71209f3f8acedb10b911af487ead0fa804be..4c7551c28033bf5c7c69409bcf11178c2db2d5b4 100644 (file)
--- a/arch/um/util/Makefile
+++ b/arch/um/util/Makefile
@@ -1,8 +1,5 @@
 hostprogs-y            := mk_task mk_constants
 always                 := $(hostprogs-y)
 
-mk_task-objs           := mk_task_user.o mk_task_kern.o
-mk_constants-objs      := mk_constants_user.o mk_constants_kern.o
-
-HOSTCFLAGS_mk_task_kern.o      := $(CFLAGS) $(CPPFLAGS)
-HOSTCFLAGS_mk_constants_kern.o := $(CFLAGS) $(CPPFLAGS)
+HOSTCFLAGS_mk_task.o := -I$(objtree)/arch/um
+HOSTCFLAGS_mk_constants.o := -I$(objtree)/arch/um