CONFIG_MODULE -> CONFIG_MODULES

arch/arm/Kconfig

@@ -15,7 +15,7 @@ config BOARDINFO
 config ARM
 	bool
 	select HAS_KALLSYMS
-	select HAS_MODULE
+	select HAS_MODULES
 	default y
 
 config ARM920T

arch/arm/lib/Makefile

@@ -9,4 +9,4 @@ obj-y	+= _udivsi3.o
 obj-y	+= _umodsi3.o
 obj-y	+= _lshrdi3.o
 obj-y	+= arm.o
-obj-$(CONFIG_MODULE) += module.o
+obj-$(CONFIG_MODULES) += module.o

arch/blackfin/Kconfig

@@ -2,7 +2,7 @@
 config BLACKFIN
 	bool
 	select HAS_KALLSYMS
-	select HAS_MODULE
+	select HAS_MODULES
 	default y
 
 config BF561

arch/blackfin/lib/Makefile

@@ -14,4 +14,4 @@ obj-y += cpu.o
 obj-y += flush.o
 obj-y += interrupt.o
 obj-y += traps.o
-obj-$(CONFIG_MODULE) += module.o
+obj-$(CONFIG_MODULES) += module.o

arch/ppc/Kconfig

@@ -18,7 +18,7 @@ config HAS_EARLY_INIT
 config PPC
 	bool
 	select HAS_KALLSYMS
-	select HAS_MODULE
+	select HAS_MODULES
 	default y
 
 # Uh, we should decide which one we want to use

arch/ppc/lib/Makefile

@@ -10,5 +10,5 @@ obj-y += time.o
 obj-y += misc.o
 obj-$(CONFIG_CMD_BOOTM) += ppclinux.o
 obj-y += board_data.o
-obj-$(CONFIG_MODULE) += module.o
+obj-$(CONFIG_MODULES) += module.o
 

common/Kconfig

@@ -5,7 +5,7 @@ config GREGORIAN_CALENDER
 config HAS_KALLSYMS
 	bool
 
-config HAS_MODULE
+config HAS_MODULES
 	bool
 
 menu "General Settings              "
@@ -28,8 +28,8 @@ config EXPERIMENTAL
 	bool
 	prompt "Prompt for experimental code"
 
-config MODULE
-	depends on HAS_MODULE
+config MODULES
+	depends on HAS_MODULES
 	depends on EXPERIMENTAL
 	bool "module support"
 	help

include/module.h

@@ -3,12 +3,13 @@
 
 #include <elf.h>
 #include <asm/module.h>
+#include <compiler.h>
 
 #ifndef MODULE_SYMBOL_PREFIX
 #define MODULE_SYMBOL_PREFIX
 #endif
 
-#ifdef CONFIG_MODULE
+#ifdef CONFIG_MODULES
 struct kernel_symbol
 {
 	unsigned long value;