[PATCH] Remove/adjust erroneous references to CONFIG_MODULE.

Robert P. J. Day rpjday at crashcourse.ca
Mon Dec 21 07:07:04 EST 2009


The correct config variable is CONFIG_MODULES, so tweak any references
to the incorrect CONFIG_MODULE.

Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>

---

  can someone verify that this looks correct, as there are only three
references to CONFIG_MODULE throughout the tree:

  * a superfluous one in common/Makefile that's already covered by
    a test to CONFIG_MODULES
  * a test in arch/ppc/Makefile
  * a comment in include/module.h

so i want to make sure i tweaked all that appropriately.


diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 2c9c535..c24d3c3 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -17,7 +17,7 @@ TEXT_BASE = $(CONFIG_TEXT_BASE)
 CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) -P

 # Add cleanup flags
-ifndef CONFIG_MODULE
+ifndef CONFIG_MODULES
 CPPFLAGS += -fdata-sections -ffunction-sections
 endif

diff --git a/common/Makefile b/common/Makefile
index d7a024b..0c075a9 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -2,7 +2,6 @@ obj-$(CONFIG_SHELL_HUSH)	+= hush.o
 obj-$(CONFIG_SHELL_SIMPLE)	+= parser.o
 obj-$(CONFIG_GREGORIAN_CALENDER) += date.o
 obj-$(CONFIG_OF_FLAT_TREE)	+= ft_build.o
-obj-$(CONFIG_MODULE)		+= module.o
 obj-$(CONFIG_KALLSYMS)		+= kallsyms.o
 obj-$(CONFIG_ENV_HANDLING)	+= environment.o
 obj-$(CONFIG_AUTO_COMPLETE)	+= complete.o
diff --git a/include/module.h b/include/module.h
index 03b226a..9d0e803 100644
--- a/include/module.h
+++ b/include/module.h
@@ -71,7 +71,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs,
 		       struct module *mod);
 #else
 #define EXPORT_SYMBOL(sym)
-#endif /* CONFIG_MODULE */
+#endif /* CONFIG_MODULES */

 extern struct list_head module_list;


========================================================================
Robert P. J. Day                               Waterloo, Ontario, CANADA

            Linux Consulting, Training and Kernel Pedantry.

Web page:                                          http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday
========================================================================



More information about the barebox mailing list