diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-10-04 12:33:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2007-10-04 12:33:03 +0200 |
| commit | ae53e9ef1dda5e8ee7dfe3a7fc0b17ccb7c81910 (patch) | |
| tree | 1eddfc66660591e312815241b9966268a4a9cf4e | |
| parent | 0b19fcf4919a7c89876403cdc3f10811f8d50480 (diff) | |
| download | barebox-ae53e9ef1dda5e8ee7dfe3a7fc0b17ccb7c81910.tar.gz barebox-ae53e9ef1dda5e8ee7dfe3a7fc0b17ccb7c81910.tar.xz | |
CONFIG_MODULE -> CONFIG_MODULES
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
| -rw-r--r-- | arch/blackfin/lib/Makefile | 2 | ||||
| -rw-r--r-- | arch/ppc/Kconfig | 2 | ||||
| -rw-r--r-- | arch/ppc/lib/Makefile | 2 | ||||
| -rw-r--r-- | common/Kconfig | 6 | ||||
| -rw-r--r-- | include/module.h | 3 |
8 files changed, 11 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index af786f20a5..ca85a2b884 100644 --- a/arch/arm/Kconfig +++ b/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 diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 7d6f2256cf..5c207457e4 100644 --- a/arch/arm/lib/Makefile +++ b/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 diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index f70df95680..ad570c2ca0 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -2,7 +2,7 @@ config BLACKFIN bool select HAS_KALLSYMS - select HAS_MODULE + select HAS_MODULES default y config BF561 diff --git a/arch/blackfin/lib/Makefile b/arch/blackfin/lib/Makefile index 286f138e3c..2f7731824b 100644 --- a/arch/blackfin/lib/Makefile +++ b/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 diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 6efc59f41c..8ce9dba900 100644 --- a/arch/ppc/Kconfig +++ b/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 diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile index 1cb545b05a..f893464d76 100644 --- a/arch/ppc/lib/Makefile +++ b/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 diff --git a/common/Kconfig b/common/Kconfig index 30738e2cb8..19ab4832d3 100644 --- a/common/Kconfig +++ b/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 diff --git a/include/module.h b/include/module.h index 421b9374fb..ba15ccd4ad 100644 --- a/include/module.h +++ b/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; |