Commit f21701fb authored by Matthew Wilcox's avatar Matthew Wilcox Committed by David S. Miller

[kbuild]: Use include_config instead of include-config.

parent 788603a8
...@@ -214,7 +214,7 @@ SUBDIRS := ...@@ -214,7 +214,7 @@ SUBDIRS :=
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
export include-config := 1 export include_config := 1
-include .config -include .config
...@@ -238,7 +238,7 @@ drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y)) ...@@ -238,7 +238,7 @@ drivers-y := $(patsubst %/, %/built-in.o, $(drivers-y))
net-y := $(patsubst %/, %/built-in.o, $(net-y)) net-y := $(patsubst %/, %/built-in.o, $(net-y))
libs-y := $(patsubst %/, %/lib.a, $(libs-y)) libs-y := $(patsubst %/, %/lib.a, $(libs-y))
ifdef include-config ifdef include_config
# Here goes the main Makefile # Here goes the main Makefile
# =========================================================================== # ===========================================================================
...@@ -602,7 +602,7 @@ rpm: clean spec ...@@ -602,7 +602,7 @@ rpm: clean spec
rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \ rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
rm $(TOPDIR)/../$(KERNELPATH).tar.gz rm $(TOPDIR)/../$(KERNELPATH).tar.gz
else # ifdef include-config else # ifdef include_config
ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
...@@ -828,7 +828,7 @@ else # ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) ...@@ -828,7 +828,7 @@ else # ifneq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
$(MAKE) $@ $(MAKE) $@
endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),) endif # ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
endif # ifdef include-config endif # ifdef include_config
# FIXME Should go into a make.lib or something # FIXME Should go into a make.lib or something
# =========================================================================== # ===========================================================================
......
...@@ -7,7 +7,7 @@ src := $(obj) ...@@ -7,7 +7,7 @@ src := $(obj)
.PHONY: __build .PHONY: __build
__build: __build:
ifdef include-config ifdef include_config
include .config include .config
endif endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment