X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Finclude%2Fmodules.h;h=d53f774927499362e53ad146817de8cb892e7015;hb=f2fd50e797e6a3b3590e4c2e13b6782dd87c25a2;hp=591dbf92bc2708636ed4c82947ab7b04c4465e5c;hpb=975f0f89b7a643abd7cc463d788dad34ac014b65;p=tpg%2Facess2.git

diff --git a/Kernel/include/modules.h b/Kernel/include/modules.h
index 591dbf92..d53f7749 100644
--- a/Kernel/include/modules.h
+++ b/Kernel/include/modules.h
@@ -17,9 +17,12 @@
 # error "Unknown architecture when determining MODULE_ARCH_ID ('" #ARCHDIR "')"
 #endif
 
-#define MODULE_DEFINE(_flags,_ver,_ident,_entry,_deinit,_deps...)	char *_DriverDeps_##_ident[]={_deps};\
-	tModule __attribute__ ((section ("KMODULES"),unused)) _DriverInfo_##_ident=\
-	{MODULE_MAGIC,MODULE_ARCH_ID,_flags,_ver,NULL,#_ident,_entry,_deinit,_DriverDeps_##_ident}
+#define MODULE_DEFINE(_flags,_ver,_ident,_entry,_deinit,_deps...) \
+	char *EXPAND_CONCAT(_DriverDeps_,_ident)[]={_deps};\
+	tModule __attribute__ ((section ("KMODULES"),unused))\
+	EXPAND_CONCAT(_DriverInfo_,_ident)=\
+	{MODULE_MAGIC,MODULE_ARCH_ID,_flags,_ver,NULL,EXPAND_STR(_ident),\
+	_entry,_deinit,EXPAND_CONCAT(_DriverDeps_,_ident)}
 
 typedef struct sModule {
 	Uint32	Magic;