Skip to content

L
linux
Commit 2fc8b941 authored by Linus Torvalds's avatar Linus Torvalds Committed by Linus Torvalds
Browse files
Options

Merge http://linux-isdn.bkbits.net/linux-2.5.make 

into home.transmeta.com:/home/torvalds/v2.5/kconfig
parents 0e01a0dd 9876ddfe
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
Makefile
View file @ 2fc8b941
...@@ -214,7 +214,7 @@ SUBDIRS := ...@@ -214,7 +214,7 @@ SUBDIRS :=
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
include-config := 1 export include-config := 1
-include .config -include .config
......
scripts/Makefile.build
View file @ 2fc8b941
...@@ -7,7 +7,9 @@ src := $(obj) ...@@ -7,7 +7,9 @@ src := $(obj)
.PHONY: __build .PHONY: __build
__build: __build:
ifdef include-config
include .config include .config
endif
include $(obj)/Makefile include $(obj)/Makefile
......
scripts/Makefile.modver
View file @ 2fc8b941
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
src := $(obj) src := $(obj)
MODVERDIR := include/linux/modules
.PHONY: modver .PHONY: modver
modver: modver:
...@@ -28,8 +30,6 @@ else ...@@ -28,8 +30,6 @@ else
# This sets version suffixes on exported symbols # This sets version suffixes on exported symbols
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
MODVERDIR := include/linux/modules
# #
# Added the SMP separator to stop module accidents between uniprocessor # Added the SMP separator to stop module accidents between uniprocessor
# and SMP Intel boxes - AC - from bits by Michael Chastain # and SMP Intel boxes - AC - from bits by Michael Chastain
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7