aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-10 16:45:34 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-10 16:45:34 -0500
commitb8cbfa692485bf7568eda3d2f37545a76efb7c93 (patch)
treef0252a423bd271b12f03c46dcc23d0b7ef906729
parent78b9c0f91cf908616b8f9f356e1d1220e727ea88 (diff)
parente623a3b8086208eb118d9501b8bfb3e656e754d4 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ea96da1572d5..6d1f727f4399 100644
--- a/Makefile
+++ b/Makefile
@@ -347,7 +347,7 @@ AFLAGS_KERNEL =
347# Needed to be compatible with the O= option 347# Needed to be compatible with the O= option
348LINUXINCLUDE := -Iinclude \ 348LINUXINCLUDE := -Iinclude \
349 $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \ 349 $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
350 -imacros include/linux/autoconf.h 350 -include include/linux/autoconf.h
351 351
352CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) 352CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
353 353
@@ -407,7 +407,7 @@ outputmakefile:
407# of make so .config is not included in this case either (for *config). 407# of make so .config is not included in this case either (for *config).
408 408
409no-dot-config-targets := clean mrproper distclean \ 409no-dot-config-targets := clean mrproper distclean \
410 cscope TAGS tags help %docs check% 410 cscope TAGS tags help %docs check% kernelrelease
411 411
412config-targets := 0 412config-targets := 0
413mixed-targets := 0 413mixed-targets := 0