From ecd5eff55d142440f373513630fedffdca62c2b9 Mon Sep 17 00:00:00 2001
From: Peter Foley <pefoley2@verizon.net>
Date: Sun, 18 Dec 2011 18:15:16 -0500
Subject: [PATCH] --- yaml --- r: 285823 b: refs/heads/master c:
 e2aef4d33ac43ec45e4fc2903288030d7f464832 h: refs/heads/master i:   285821:
 daea4108cd78ef64e7baf5ccf630725e780259dc   285819:
 cb5ed6d2fcd38b6d3eee8e9f47b9458d6e3a47d4   285815:
 cfda7933564ec8ad90fa28c9a5957b21f0c92bcd   285807:
 43ed53ddc29cc4761fbc5502c7af747e0aa9ddd8   285791:
 86f5b9a2d167fa12c30bba9de06880c5f98652a1   285759:
 74cfa91a2d1a2b4b49d4ea476436ead79e3608f2   285695:
 6001b761057945ffc3242ced19de3ca9da3d8a2f v: v3

---
 [refs]                         | 2 +-
 trunk/scripts/kconfig/Makefile | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 21ca6f91d66d..94dbfec0a6a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c55ac154019f628b42316bc21545ee1b2bee3db6
+refs/heads/master: e2aef4d33ac43ec45e4fc2903288030d7f464832
diff --git a/trunk/scripts/kconfig/Makefile b/trunk/scripts/kconfig/Makefile
index ba573fe7c74d..4dba0b8f1f02 100644
--- a/trunk/scripts/kconfig/Makefile
+++ b/trunk/scripts/kconfig/Makefile
@@ -50,9 +50,8 @@ localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
 
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
-# The symlink is used to repair a deficiency in arch/um
 update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-	$(Q)echo "  GEN config"
+	$(Q)echo "  GEN     config.pot"
 	$(Q)xgettext --default-domain=linux                         \
 	    --add-comments --keyword=_ --keyword=N_                 \
 	    --from-code=UTF-8                                       \
@@ -63,10 +62,11 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
 	$(Q)ln -fs Kconfig.x86 arch/um/Kconfig
 	$(Q)(for i in `ls $(srctree)/arch/*/Kconfig`;    \
 	    do                                           \
-		echo "  GEN $$i";                        \
+		echo "  GEN     $$i";                    \
 		$(obj)/kxgettext $$i                     \
 		     >> $(obj)/config.pot;               \
 	    done )
+	$(Q)echo "  GEN     linux.pot"
 	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
 	    --output $(obj)/linux.pot
 	$(Q)rm -f $(srctree)/arch/um/Kconfig