2 files changed, 7 insertions, 2 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index e6499db4c8cc..a90d3cc76bfa 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -74,6 +74,7 @@ help:
         @echo  '  xconfig         - Update current config utilising a QT based front-end'
         @echo  '  gconfig         - Update current config utilising a GTK based front-end'
         @echo  '  oldconfig       - Update current config utilising a provided .config as base'
+        @echo  '  silentoldconfig - Same as oldconfig, but quietly'
         @echo  '  randconfig      - New config with random answer to all options'
         @echo  '  defconfig       - New config with default answer to all options'
         @echo  '  allmodconfig    - New config selecting modules when possible'
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index a69d8acbf274..69f96b398c22 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -193,8 +193,11 @@ load:
                                 continue;
                         *p++ = 0;
                         p2 = strchr(p, '\n');
-                        if (p2)
-                                *p2 = 0;
+                        if (p2) {
+                                *p2-- = 0;
+                                if (*p2 == '\r')
+                                        *p2 = 0;
+                        }
                         if (def == S_DEF_USER) {
                                 sym = sym_find(line + 7);
                                 if (!sym) {
@@ -266,6 +269,7 @@ load:
                                 ;
                         }
                         break;
+                case '\r':
                 case '\n':
                         break;
                 default: