[PATCH gnumach 01/16] Move Linux module macros to their original header

[Guillem Jover]

* linux/pcmcia-cs/glue/wireless_glue.h (EXPORT_SYMBOL)
(SET_MODULE_OWNER): Move to ...
* linux/src/include/linux/module.h [!MODULE]: ... here.
---
 linux/pcmcia-cs/glue/wireless_glue.h |    9 ---------
 linux/src/include/linux/module.h     |    3 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/linux/pcmcia-cs/glue/wireless_glue.h 
b/linux/pcmcia-cs/glue/wireless_glue.h
index 05eef4b..dc354dd 100644
--- a/linux/pcmcia-cs/glue/wireless_glue.h
+++ b/linux/pcmcia-cs/glue/wireless_glue.h
@@ -49,15 +49,6 @@
 
 
 /*
- * We compile everything directly into the GNU Mach kernel, there are no
- * modules.
- */
-#define SET_MODULE_OWNER(a)     do{ } while(0)
-#define EXPORT_SYMBOL(a)
-
-
-
-/*
  * We need some `schedule_task' replacement.  This is defined in
  * kernel/context.c in the Linux kernel.
  */
diff --git a/linux/src/include/linux/module.h b/linux/src/include/linux/module.h
index bc364f7..acc2540 100644
--- a/linux/src/include/linux/module.h
+++ b/linux/src/include/linux/module.h
@@ -101,9 +101,12 @@ int Using_Versions; /* gcc will handle this global (used 
as a flag) correctly */
 
 #else
 
+#define EXPORT_SYMBOL(sym)
+
 #define MOD_INC_USE_COUNT      do { } while (0)
 #define MOD_DEC_USE_COUNT      do { } while (0)
 #define MOD_IN_USE             1
+#define SET_MODULE_OWNER(dev)  do{ } while(0)
 
 #endif
 
-- 
1.7.5.4