57 files changed, 16 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 8fdc9eb0f..9d8d16924 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ export BR2_VERSION:=2011.11-git
 # absolute path
 TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
-CONFIG=package/config
+CONFIG=support/kconfig
 DATE:=$(shell date +%Y%m%d)
 
 # Compute the full local version string so packages can use it as-is
diff --git a/package/config/.gitignore b/support/kconfig/.gitignore
index 2694c9a20..2694c9a20 100644
--- a/package/config/.gitignore
+++ b/support/kconfig/.gitignore
diff --git a/package/config/Makefile b/support/kconfig/Makefile
index ece2a822f..ece2a822f 100644
--- a/package/config/Makefile
+++ b/support/kconfig/Makefile
diff --git a/package/config/Makefile.br b/support/kconfig/Makefile.br
index c24b6b50f..c24b6b50f 100644
--- a/package/config/Makefile.br
+++ b/support/kconfig/Makefile.br
diff --git a/package/config/POTFILES.in b/support/kconfig/POTFILES.in
index 967457396..967457396 100644
--- a/package/config/POTFILES.in
+++ b/support/kconfig/POTFILES.in
diff --git a/package/config/README.buildroot2 b/support/kconfig/README.buildroot2
index 8ff0d095b..b92ec1427 100644
--- a/package/config/README.buildroot2
+++ b/support/kconfig/README.buildroot2
@@ -1,15 +1,15 @@
-This is a copy of the kconfig code in the kernel (currently 2.6.36-rc1) tweaked
+This is a copy of the kconfig code in the kernel (currently 2.6.37-rc1) tweaked
 to suit Buildroot.
 
 To update:
-	cp -r /usr/src/linux/scripts/kconfig package/config.new
-	cd package/config.new
-	cp -a ../config/patches ../config/README.buildroot2 .
+	cp -r /usr/src/linux/scripts/kconfig support/kconfig.new
+	cd support/config.new
+	cp -a ../kconfig/patches ../kconfig/README.buildroot2 .
 	quilt push -a
 	# Fix any conflict
 	cd ..
 	rm -rf config
-	mv config.new config
+	mv kconfig.new kconfig
 
 Then verify the toplevel targets work:
 	config
diff --git a/package/config/check.sh b/support/kconfig/check.sh
index fa59cbf9d..fa59cbf9d 100755
--- a/package/config/check.sh
+++ b/support/kconfig/check.sh
diff --git a/package/config/conf.c b/support/kconfig/conf.c
index 652e079a6..652e079a6 100644
--- a/package/config/conf.c
+++ b/support/kconfig/conf.c
diff --git a/package/config/confdata.c b/support/kconfig/confdata.c
index c9f13eec7..c9f13eec7 100644
--- a/package/config/confdata.c
+++ b/support/kconfig/confdata.c
diff --git a/package/config/expr.c b/support/kconfig/expr.c
index c5182f4d4..c5182f4d4 100644
--- a/package/config/expr.c
+++ b/support/kconfig/expr.c
diff --git a/package/config/expr.h b/support/kconfig/expr.h
index 3d238db49..3d238db49 100644
--- a/package/config/expr.h
+++ b/support/kconfig/expr.h
diff --git a/package/config/foo.h b/support/kconfig/foo.h
index b9cfdf831..b9cfdf831 100644
--- a/package/config/foo.h
+++ b/support/kconfig/foo.h
diff --git a/package/config/gconf.c b/support/kconfig/gconf.c
index 21185a0cb..f9daf987d 100644
--- a/package/config/gconf.c
+++ b/support/kconfig/gconf.c
@@ -1521,7 +1521,7 @@ int main(int ac, char *av[])
 	/* Determine GUI path */
 	env = getenv(SRCTREE);
 	if (env)
-		glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL);
+		glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
 	else if (av[0][0] == '/')
 		glade_file = g_strconcat(av[0], ".glade", NULL);
 	else
diff --git a/package/config/gconf.glade b/support/kconfig/gconf.glade
index 6cbc1bb45..6cbc1bb45 100644
--- a/package/config/gconf.glade
+++ b/support/kconfig/gconf.glade
diff --git a/package/config/images.c b/support/kconfig/images.c
index d4f84bd4a..d4f84bd4a 100644
--- a/package/config/images.c
+++ b/support/kconfig/images.c
diff --git a/package/config/kconfig_load.c b/support/kconfig/kconfig_load.c
index dbdcaad82..dbdcaad82 100644
--- a/package/config/kconfig_load.c
+++ b/support/kconfig/kconfig_load.c
diff --git a/package/config/kxgettext.c b/support/kconfig/kxgettext.c
index e9d8e791b..e9d8e791b 100644
--- a/package/config/kxgettext.c
+++ b/support/kconfig/kxgettext.c
diff --git a/package/config/lex.zconf.c_shipped b/support/kconfig/lex.zconf.c_shipped
index 6eb039718..6eb039718 100644
--- a/package/config/lex.zconf.c_shipped
+++ b/support/kconfig/lex.zconf.c_shipped
diff --git a/package/config/lkc.h b/support/kconfig/lkc.h
index e89906622..e89906622 100644
--- a/package/config/lkc.h
+++ b/support/kconfig/lkc.h
diff --git a/package/config/lkc_proto.h b/support/kconfig/lkc_proto.h
index 17342fef3..17342fef3 100644
--- a/package/config/lkc_proto.h
+++ b/support/kconfig/lkc_proto.h
diff --git a/package/config/lxdialog/.gitignore b/support/kconfig/lxdialog/.gitignore
index 90b08ff02..90b08ff02 100644
--- a/package/config/lxdialog/.gitignore
+++ b/support/kconfig/lxdialog/.gitignore
diff --git a/package/config/lxdialog/BIG.FAT.WARNING b/support/kconfig/lxdialog/BIG.FAT.WARNING
index a8999d82b..a8999d82b 100644
--- a/package/config/lxdialog/BIG.FAT.WARNING
+++ b/support/kconfig/lxdialog/BIG.FAT.WARNING
diff --git a/package/config/lxdialog/check-lxdialog.sh b/support/kconfig/lxdialog/check-lxdialog.sh
index 969cd4cc0..969cd4cc0 100644
--- a/package/config/lxdialog/check-lxdialog.sh
+++ b/support/kconfig/lxdialog/check-lxdialog.sh
diff --git a/package/config/lxdialog/checklist.c b/support/kconfig/lxdialog/checklist.c
index a2eb80fbc..a2eb80fbc 100644
--- a/package/config/lxdialog/checklist.c
+++ b/support/kconfig/lxdialog/checklist.c
diff --git a/package/config/lxdialog/dialog.h b/support/kconfig/lxdialog/dialog.h
index b5211fce0..b5211fce0 100644
--- a/package/config/lxdialog/dialog.h
+++ b/support/kconfig/lxdialog/dialog.h
diff --git a/package/config/lxdialog/inputbox.c b/support/kconfig/lxdialog/inputbox.c
index dd8e587c5..dd8e587c5 100644
--- a/package/config/lxdialog/inputbox.c
+++ b/support/kconfig/lxdialog/inputbox.c
diff --git a/package/config/lxdialog/menubox.c b/support/kconfig/lxdialog/menubox.c
index 1d604738f..1d604738f 100644
--- a/package/config/lxdialog/menubox.c
+++ b/support/kconfig/lxdialog/menubox.c
diff --git a/package/config/lxdialog/textbox.c b/support/kconfig/lxdialog/textbox.c
index c704712d0..c704712d0 100644
--- a/package/config/lxdialog/textbox.c
+++ b/support/kconfig/lxdialog/textbox.c
diff --git a/package/config/lxdialog/util.c b/support/kconfig/lxdialog/util.c
index f2375ad7e..f2375ad7e 100644
--- a/package/config/lxdialog/util.c
+++ b/support/kconfig/lxdialog/util.c
diff --git a/package/config/lxdialog/yesno.c b/support/kconfig/lxdialog/yesno.c
index 4e6e8090c..4e6e8090c 100644
--- a/package/config/lxdialog/yesno.c
+++ b/support/kconfig/lxdialog/yesno.c
diff --git a/package/config/mconf.c b/support/kconfig/mconf.c
index 3ed8a2530..3ed8a2530 100644
--- a/package/config/mconf.c
+++ b/support/kconfig/mconf.c
diff --git a/package/config/menu.c b/support/kconfig/menu.c
index d49f8b8ff..d49f8b8ff 100644
--- a/package/config/menu.c
+++ b/support/kconfig/menu.c
diff --git a/package/config/nconf.c b/support/kconfig/nconf.c
index db5637739..db5637739 100644
--- a/package/config/nconf.c
+++ b/support/kconfig/nconf.c
diff --git a/package/config/nconf.gui.c b/support/kconfig/nconf.gui.c
index f8137b3a5..f8137b3a5 100644
--- a/package/config/nconf.gui.c
+++ b/support/kconfig/nconf.gui.c
diff --git a/package/config/nconf.h b/support/kconfig/nconf.h
index 58fbda8fc..58fbda8fc 100644
--- a/package/config/nconf.h
+++ b/support/kconfig/nconf.h
diff --git a/package/config/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
index ef3a05e43..ef3a05e43 100644
--- a/package/config/patches/01-kconfig-kernel-to-buildroot.patch
+++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch
diff --git a/package/config/patches/02-cpp-comments-to-c-comments.patch b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
index cb27056ad..cb27056ad 100644
--- a/package/config/patches/02-cpp-comments-to-c-comments.patch
+++ b/support/kconfig/patches/02-cpp-comments-to-c-comments.patch
diff --git a/package/config/patches/03-change-config-option-prefix.patch b/support/kconfig/patches/03-change-config-option-prefix.patch
index d387236e7..d387236e7 100644
--- a/package/config/patches/03-change-config-option-prefix.patch
+++ b/support/kconfig/patches/03-change-config-option-prefix.patch
diff --git a/package/config/patches/05-really-clean-everything.patch b/support/kconfig/patches/05-really-clean-everything.patch
index a1517542e..a1517542e 100644
--- a/package/config/patches/05-really-clean-everything.patch
+++ b/support/kconfig/patches/05-really-clean-everything.patch
diff --git a/package/config/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.patch
index 8a27e251e..8a27e251e 100644
--- a/package/config/patches/06-br-build-system-integration.patch
+++ b/support/kconfig/patches/06-br-build-system-integration.patch
diff --git a/package/config/patches/08-make-write-deps.patch b/support/kconfig/patches/08-make-write-deps.patch
index b69daad6e..e5a21c386 100644
--- a/package/config/patches/08-make-write-deps.patch
+++ b/support/kconfig/patches/08-make-write-deps.patch
@@ -2,10 +2,10 @@
  util.c |  117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 116 insertions(+), 1 deletion(-)
 
-Index: config/util.c
+Index: kconfig/util.c
 ===================================================================
---- config.orig/util.c
-+++ config/util.c
+--- kconfig.orig/util.c
++++ kconfig/util.c
 @@ -29,6 +29,121 @@
  	return file;
  }
@@ -60,7 +60,7 @@ Index: config/util.c
 +	if (!out)
 +		return 1;
 +	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-+		"# See package/config/util.c write_make_deps()\n#\n");
++		"# See support/kconfig/util.c write_make_deps()\n#\n");
 +	menu = &rootmenu;//rootmenu.list;
 +	while (menu) {
 +		sym = menu->sym;
diff --git a/package/config/patches/09-implement-kconfig-probability.patch b/support/kconfig/patches/09-implement-kconfig-probability.patch
index 3f09673b8..3f09673b8 100644
--- a/package/config/patches/09-implement-kconfig-probability.patch
+++ b/support/kconfig/patches/09-implement-kconfig-probability.patch
diff --git a/package/config/patches/10-br-build-system.patch b/support/kconfig/patches/10-br-build-system.patch
index 85125e519..85125e519 100644
--- a/package/config/patches/10-br-build-system.patch
+++ b/support/kconfig/patches/10-br-build-system.patch
diff --git a/package/config/patches/11-use-mktemp-for-lxdialog.patch b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
index 21ca22883..21ca22883 100644
--- a/package/config/patches/11-use-mktemp-for-lxdialog.patch
+++ b/support/kconfig/patches/11-use-mktemp-for-lxdialog.patch
diff --git a/package/config/patches/12-fix-glade-file-path.patch b/support/kconfig/patches/12-fix-glade-file-path.patch
index 5b080c94b..681dce160 100644
--- a/package/config/patches/12-fix-glade-file-path.patch
+++ b/support/kconfig/patches/12-fix-glade-file-path.patch
@@ -2,16 +2,16 @@
  gconf.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: config/gconf.c
+Index: kconfig/gconf.c
 ===================================================================
---- config.orig/gconf.c
-+++ config/gconf.c
+--- kconfig.orig/gconf.c
++++ kconfig/gconf.c
 @@ -1521,7 +1521,7 @@
  	/* Determine GUI path */
  	env = getenv(SRCTREE);
  	if (env)
 -		glade_file = g_strconcat(env, "/scripts/kconfig/gconf.glade", NULL);
-+		glade_file = g_strconcat(env, "/package/config/gconf.glade", NULL);
++		glade_file = g_strconcat(env, "/support/kconfig/gconf.glade", NULL);
  	else if (av[0][0] == '/')
  		glade_file = g_strconcat(av[0], ".glade", NULL);
  	else
diff --git a/package/config/patches/14-support-out-of-tree-config.patch b/support/kconfig/patches/14-support-out-of-tree-config.patch
index 9fa6384d3..9fa6384d3 100644
--- a/package/config/patches/14-support-out-of-tree-config.patch
+++ b/support/kconfig/patches/14-support-out-of-tree-config.patch
diff --git a/package/config/patches/series b/support/kconfig/patches/series
index defdf5899..defdf5899 100644
--- a/package/config/patches/series
+++ b/support/kconfig/patches/series
diff --git a/package/config/qconf.cc b/support/kconfig/qconf.cc
index 06dd2e335..06dd2e335 100644
--- a/package/config/qconf.cc
+++ b/support/kconfig/qconf.cc
diff --git a/package/config/qconf.h b/support/kconfig/qconf.h
index 91677d900..91677d900 100644
--- a/package/config/qconf.h
+++ b/support/kconfig/qconf.h
diff --git a/package/config/streamline_config.pl b/support/kconfig/streamline_config.pl
index fd81fc33d..fd81fc33d 100644
--- a/package/config/streamline_config.pl
+++ b/support/kconfig/streamline_config.pl
diff --git a/package/config/symbol.c b/support/kconfig/symbol.c
index a796c95fe..a796c95fe 100644
--- a/package/config/symbol.c
+++ b/support/kconfig/symbol.c
diff --git a/package/config/util.c b/support/kconfig/util.c
index f962cef31..8a5efaa17 100644
--- a/package/config/util.c
+++ b/support/kconfig/util.c
@@ -79,7 +79,7 @@ static int write_make_deps(const char *name)
 	if (!out)
 		return 1;
 	fprintf(out, "# ATTENTION! This does not handle 'depends', just 'select'! \n"
-		"# See package/config/util.c write_make_deps()\n#\n");
+		"# See support/kconfig/util.c write_make_deps()\n#\n");
 	menu = &rootmenu;//rootmenu.list;
 	while (menu) {
 		sym = menu->sym;
diff --git a/package/config/zconf.gperf b/support/kconfig/zconf.gperf
index c9e690eb7..c9e690eb7 100644
--- a/package/config/zconf.gperf
+++ b/support/kconfig/zconf.gperf
diff --git a/package/config/zconf.hash.c_shipped b/support/kconfig/zconf.hash.c_shipped
index 4055d5de1..4055d5de1 100644
--- a/package/config/zconf.hash.c_shipped
+++ b/support/kconfig/zconf.hash.c_shipped
diff --git a/package/config/zconf.l b/support/kconfig/zconf.l
index 3dbaec185..3dbaec185 100644
--- a/package/config/zconf.l
+++ b/support/kconfig/zconf.l
diff --git a/package/config/zconf.tab.c_shipped b/support/kconfig/zconf.tab.c_shipped
index c27391d42..c27391d42 100644
--- a/package/config/zconf.tab.c_shipped
+++ b/support/kconfig/zconf.tab.c_shipped
diff --git a/package/config/zconf.y b/support/kconfig/zconf.y
index 0717a3235..0717a3235 100644
--- a/package/config/zconf.y
+++ b/support/kconfig/zconf.y