aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-10 13:45:34 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-10 13:45:34 -0800
commitb8cbfa692485bf7568eda3d2f37545a76efb7c93 (patch)
treef0252a423bd271b12f03c46dcc23d0b7ef906729 /Makefile
parent78b9c0f91cf908616b8f9f356e1d1220e727ea88 (diff)
parente623a3b8086208eb118d9501b8bfb3e656e754d4 (diff)
downloadlinux-stericsson-b8cbfa692485bf7568eda3d2f37545a76efb7c93.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'Makefile')
-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 =
# Needed to be compatible with the O= option
LINUXINCLUDE := -Iinclude \
$(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
- -imacros include/linux/autoconf.h
+ -include include/linux/autoconf.h
CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
@@ -407,7 +407,7 @@ outputmakefile:
# of make so .config is not included in this case either (for *config).
no-dot-config-targets := clean mrproper distclean \
- cscope TAGS tags help %docs check%
+ cscope TAGS tags help %docs check% kernelrelease
config-targets := 0
mixed-targets := 0