config/modversions.h and linux/modversions.h are not equivalent

diff --git a/Makefile.modbuild b/Makefile.modbuild
index 2a1e8c8ce6aea01f0680eb2bdff5dcd0e56d9065..993489c9114d7426ccde1b1431e933523685363b 100644 (file)
--- a/Makefile.modbuild
+++ b/Makefile.modbuild
@@ -80,14 +80,14 @@ _modinst_%:
 
 
 ifeq ($(CONFIG_MODVERSIONS),y)
-MODFLAGS += -DMODVERSIONS -include $(MODVERSIONS_H_PATH)
+MODFLAGS += -DMODVERSIONS -include $(LINUXDIR)/include/linux/modversions.h
 endif
 
 
 modules:       $(patsubst %, _mod_%, $(SUBDIRS))
 
 $(patsubst %, _mod_%, $(SUBDIRS)) : dummy
-       $(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
+       $(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS)" MAKING_MODULES=1 modules
 
 include/version.h: Makefile
        @echo \#define $(PROJECT)_RELEASE \"$(PROJECTRELEASE)\" >.ver

diff --git a/scripts/linux_flags-2.6/Makefile b/scripts/linux_flags-2.6/Makefile
index b731557711182ef3d449aa64516bb5f17b971ea9..46bf0fbbea38fd095bf1e4c2666c8e498ad85dec 100644 (file)
--- a/scripts/linux_flags-2.6/Makefile
+++ b/scripts/linux_flags-2.6/Makefile
@@ -7,7 +7,6 @@ $(obj)/fake.c: flags
 .PHONY: flags
 flags:
        echo LINUXDIR=$(LINUXDIR) >$(obj)/flags
-       echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/config/modversions.h >>$(obj)/flags
        echo ARCH=$(ARCH) >>$(obj)/flags
        echo AFLAGS="$(AFLAGS)" | sed 's_Iinclude_I"$(LINUXDIR)/include"_g'>>$(obj)/flags
        echo LDFLAGS= >>$(obj)/flags

diff --git a/scripts/linux_flags/Makefile b/scripts/linux_flags/Makefile
index 7cc35744cc2586718f264a1fda1049bd3d6a6715..98c65ff44b3d887ff18e0d95a20493f5b281cc78 100644 (file)
--- a/scripts/linux_flags/Makefile
+++ b/scripts/linux_flags/Makefile
@@ -6,7 +6,6 @@ all:
 
 modules:
        echo LINUXDIR=$(LINUXDIR) >flags
-       echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/linux/modversions.h >>flags
        echo ARCH=$(ARCH) >>flags
        echo AFLAGS="$(AFLAGS)" >>flags
        echo LDFLAGS="$(LDFLAGS)" >>flags