From a2b9d5abb7d3f1b115b56ec085eaabeb7e978c9d Mon Sep 17 00:00:00 2001 From: "Paolo \\'Blaisorblade\\' Giarrusso" Date: Wed, 13 Oct 2004 07:29:58 -0700 Subject: [PATCH] [PATCH] uml: no extraversion in arch/um/Makefile for mainline Extraversion in arch/um/Makefile is not needed in mainline, but just for separate patches; also, they should set it in the main Makefile, not elsewhere (Jeff Garzik has just complained). Also remove the dependency from version.h on arch/um/Makefile: it was added because arch/um/Makefile could change the kernel version number. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/um/Makefile b/arch/um/Makefile index 6dd11f51d08d6..a7f5e94b349d8 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -8,13 +8,6 @@ OS := $(shell uname -s) #We require it or things break. SHELL := /bin/bash -# Recalculate MODLIB to reflect the EXTRAVERSION changes (via KERNELRELEASE) -# The way the toplevel Makefile is written EXTRAVERSION is not supposed -# to be changed outside the toplevel Makefile, but recalculating MODLIB is -# a sufficient workaround until we no longer need architecture dependent -# EXTRAVERSION... -MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) - core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/sys-$(SUBARCH)/ @@ -73,8 +66,6 @@ ifeq ($(CONFIG_MODE_SKAS), y) $(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h endif -include/linux/version.h: arch/$(ARCH)/Makefile - $(ARCH_DIR)/vmlinux.lds.S : touch $@ -- 2.53.0