From: Michal Marek <mmarek@suse.cz>
Date: Wed, 27 Oct 2010 22:54:25 +0000 (+0200)
Subject: Merge branch 'message-callback' into kbuild/kconfig
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=70c74e59db7450d5c9164abeb3b6752f8045288b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'message-callback' into kbuild/kconfig

Conflicts:
	scripts/kconfig/nconf.c
---

70c74e59db7450d5c9164abeb3b6752f8045288b
diff --cc scripts/kconfig/nconf.c
index a2969fdc66b4,16233a9382c8..272a987f23e0
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@@ -693,24 -680,12 +673,10 @@@ static int do_exit(void
  		if (res)
  			btn_dialog(
  				main_window,
 -				_("Error during writing of the kernel "
 -				  "configuration.\n"
 -				  "Your kernel configuration "
 -				  "changes were NOT saved."),
 +				_("Error during writing of configuration.\n"
 +				  "Your configuration changes were NOT saved."),
  				  1,
  				  "<OK>");
- 		else {
- 			char buf[1024];
- 			snprintf(buf, 1024,
- 				_("Configuration written to %s\n"
- 				  "End of the configuration.\n"
- 				  "Execute 'make' to start the build or try"
- 				  " 'make help'."), filename);
- 			btn_dialog(
- 				main_window,
- 				buf,
- 				1,
- 				"<OK>");
- 		}
  		break;
  	default:
  		btn_dialog(