Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kconfig-language.txt: remove bogus hint
  kconfig: fix MAC OS X warnings in menuconfig
  modpost: i2c aliases need no trailing wildcard

1 files changed, 2 insertions, 1 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 734cf4f3131e..6841e95c0989 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -773,7 +773,7 @@ static void conf_string(struct menu *menu)
 
         while (1) {
                 int res;
-                char *heading;
+                const char *heading;
 
                 switch (sym_get_type(menu->sym)) {
                 case S_INT:
@@ -925,3 +925,4 @@ int main(int ac, char **av)
 
         return 0;
 }
+