[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 <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 6dd11f51d08d6635e3c83209beb1bda2eee1f22e..a7f5e94b349d895454ea12979406d06305276566 100644 (file)
--- 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 $@