Merge branch 'next' into for-linus

1 files changed, 1 insertions, 2 deletions

diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index c704712d0227..154c2dd245b7 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -320,7 +320,6 @@ static void print_page(WINDOW * win, int height, int width)
  */
 static void print_line(WINDOW * win, int row, int width)
 {
-        int y, x;
         char *line;
 
         line = get_line();
@@ -329,10 +328,10 @@ static void print_line(WINDOW * win, int row, int width)
         waddch(win, ' ');
         waddnstr(win, line, MIN(strlen(line), width - 2));
 
-        getyx(win, y, x);
         /* Clear 'residue' of previous line */
 #if OLD_NCURSES
         {
+                int x = getcurx(win);
                 int i;
                 for (i = 0; i < width - x; i++)
                         waddch(win, ' ');