patch-2_6_7-vs1_9_1_12

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

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index e9d6a16..9e799ec 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -50,7 +50,7 @@ struct kparam_array
    not there, read bits mean it's readable, write bits mean it's
    writable. */
 #define __module_param_call(prefix, name, set, get, arg, perm)         \
-       static char __param_str_##name[] __initdata = prefix #name;     \
+       static char __param_str_##name[] = prefix #name;                \
        static struct kernel_param const __param_##name                 \
        __attribute_used__                                              \
     __attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) \
@@ -71,7 +71,7 @@ struct kparam_array
 
 /* Actually copy string: maxlen param is usually sizeof(string). */
 #define module_param_string(name, string, len, perm)                   \
-       static struct kparam_string __param_string_##name __initdata    \
+       static struct kparam_string __param_string_##name               \
                = { len, string };                                      \
        module_param_call(name, param_set_copystring, param_get_charp,  \
                   &__param_string_##name, perm)
@@ -147,4 +147,4 @@ int param_array(const char *name,
                void *elem, int elemsize,
                int (*set)(const char *, struct kernel_param *kp),
                int *num);
-#endif /* _LINUX_MODULE_PARAM_TYPES_H */
+#endif /* _LINUX_MODULE_PARAMS_H */