linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / vermagic.h

diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
index 46919f9..fadc535 100644 (file)
--- a/include/linux/vermagic.h
+++ b/include/linux/vermagic.h
@@ -1,4 +1,4 @@
-#include <linux/utsrelease.h>
+#include <linux/version.h>
 #include <linux/module.h>
 
 /* Simply sanity version stamp for modules. */
@@ -12,11 +12,6 @@
 #else
 #define MODULE_VERMAGIC_PREEMPT ""
 #endif
-#ifdef CONFIG_MODULE_UNLOAD
-#define MODULE_VERMAGIC_MODULE_UNLOAD "mod_unload "
-#else
-#define MODULE_VERMAGIC_MODULE_UNLOAD ""
-#endif
 #ifndef MODULE_ARCH_VERMAGIC
 #define MODULE_ARCH_VERMAGIC ""
 #endif
@@ -24,5 +19,5 @@
 #define VERMAGIC_STRING                                                \
        UTS_RELEASE " "                                                 \
        MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT                     \
-       MODULE_VERMAGIC_MODULE_UNLOAD MODULE_ARCH_VERMAGIC              \
+       MODULE_ARCH_VERMAGIC                                            \
        "gcc-" __stringify(__GNUC__) "." __stringify(__GNUC_MINOR__)