ChangeSet 1.2086, 2005/03/12 14:03:27-08:00, [EMAIL PROTECTED]
Merge bk://linux-sam.bkbits.net/kbuild
into ppc970.osdl.org:/home/torvalds/v2.6/linux
drivers/video/console/Makefile | 4 ++--
include/linux/module.h | 13 ++-----------
2 files changed, 4 insertions(+), 13 deletions(-)
diff -Nru a/drivers/video/console/Makefile b/drivers/video/console/Makefile
--- a/drivers/video/console/Makefile 2005-03-12 21:44:52 -08:00
+++ b/drivers/video/console/Makefile 2005-03-12 21:44:52 -08:00
@@ -39,5 +39,5 @@
sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \
-e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > $@
-$(obj)/promcon_tbl.c: $(src)/prom.uni FORCE
- $(call if_changed,conmakehash)
+$(obj)/promcon_tbl.c: $(src)/prom.uni
+ $(call cmd,conmakehash)
diff -Nru a/include/linux/module.h b/include/linux/module.h
--- a/include/linux/module.h 2005-03-12 21:44:52 -08:00
+++ b/include/linux/module.h 2005-03-12 21:44:52 -08:00
@@ -77,24 +77,14 @@
extern struct subsystem module_subsys;
#ifdef MODULE
-#define ___module_cat(a,b) __mod_ ## a ## b
-#define __module_cat(a,b) ___module_cat(a,b)
-#define __MODULE_INFO(tag, name, info) \
-static const char __module_cat(name,__LINE__)[]
\
- __attribute_used__ \
- __attribute__((section(".modinfo"),unused)) = __stringify(tag) "=" info
-
#define MODULE_GENERIC_TABLE(gtype,name) \
extern const struct gtype##_id __mod_##gtype##_table \
__attribute__ ((unused, alias(__stringify(name))))
extern struct module __this_module;
#define THIS_MODULE (&__this_module)
-
#else /* !MODULE */
-
#define MODULE_GENERIC_TABLE(gtype,name)
-#define __MODULE_INFO(tag, name, info)
#define THIS_MODULE ((struct module *)0)
#endif
@@ -560,7 +550,8 @@
/* DEPRECATED: Do not use. */
#define MODULE_PARM(var,type) \
struct obsolete_modparm __parm_##var __attribute__((section("__obsparm"))) = \
-{ __stringify(var), type, &MODULE_PARM_ };
+{ __stringify(var), type, &MODULE_PARM_ }; \
+__MODULE_PARM_TYPE(var, type);
#else
#define MODULE_PARM(var,type) static void __attribute__((__unused__))
*__parm_##var = &MODULE_PARM_;
#endif
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
