aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Kbuild.include2
-rw-r--r--scripts/Makefile.build4
-rw-r--r--scripts/Makefile.host2
-rw-r--r--scripts/Makefile.lib10
-rw-r--r--scripts/kconfig/lex.zconf.c_shipped84
-rw-r--r--scripts/kconfig/lxdialog/BIG.FAT.WARNING2
-rw-r--r--scripts/kconfig/lxdialog/menubox.c2
-rw-r--r--scripts/kconfig/zconf.tab.c_shipped2
8 files changed, 54 insertions, 54 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index b0d067be7..a7fb4d521 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -99,7 +99,7 @@ cmd = @$(echo-cmd) $(cmd_$(1))
99objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o))) 99objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
100 100
101### 101###
102# if_changed - execute command if any prerequisite is newer than 102# if_changed - execute command if any prerequisite is newer than
103# target, or command line has changed 103# target, or command line has changed
104# if_changed_dep - as if_changed, but uses fixdep to reveal dependencies 104# if_changed_dep - as if_changed, but uses fixdep to reveal dependencies
105# including used config symbols 105# including used config symbols
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e48e60da3..ddefea5a6 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -216,7 +216,7 @@ $(real-objs-m) : modkern_aflags := $(AFLAGS_MODULE)
216$(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE) 216$(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
217 217
218quiet_cmd_as_s_S = CPP $(quiet_modtag) $@ 218quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
219cmd_as_s_S = $(CPP) $(a_flags) -o $@ $< 219cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
220 220
221%.s: %.S FORCE 221%.s: %.S FORCE
222 $(call if_changed_dep,as_s_S) 222 $(call if_changed_dep,as_s_S)
@@ -284,7 +284,7 @@ link_multi_deps = \
284$(filter $(addprefix $(obj)/, \ 284$(filter $(addprefix $(obj)/, \
285$($(subst $(obj)/,,$(@:.o=-objs))) \ 285$($(subst $(obj)/,,$(@:.o=-objs))) \
286$($(subst $(obj)/,,$(@:.o=-y)))), $^) 286$($(subst $(obj)/,,$(@:.o=-y)))), $^)
287 287
288quiet_cmd_link_multi-y = LD $@ 288quiet_cmd_link_multi-y = LD $@
289cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) 289cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
290 290
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 2d519704b..763e2f2d7 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -152,5 +152,5 @@ $(host-cshlib): %: $(host-cshobjs) FORCE
152 $(call if_changed,host-cshlib) 152 $(call if_changed,host-cshlib)
153 153
154targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ 154targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
155 $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 155 $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
156 156
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 2cb4935e8..e1e0ba481 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -18,7 +18,7 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
18# --------------------------------------------------------------------------- 18# ---------------------------------------------------------------------------
19# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o 19# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
20# and add the directory to the list of dirs to descend into: $(subdir-y) 20# and add the directory to the list of dirs to descend into: $(subdir-y)
21# o if we encounter foo/ in $(obj-m), remove it from $(obj-m) 21# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
22# and add the directory to the list of dirs to descend into: $(subdir-m) 22# and add the directory to the list of dirs to descend into: $(subdir-m)
23 23
24__subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y))) 24__subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))
@@ -32,7 +32,7 @@ obj-m := $(filter-out %/, $(obj-m))
32 32
33subdir-ym := $(sort $(subdir-y) $(subdir-m)) 33subdir-ym := $(sort $(subdir-y) $(subdir-m))
34 34
35# if $(foo-objs) exists, foo.o is a composite object 35# if $(foo-objs) exists, foo.o is a composite object
36multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) 36multi-used-y := $(sort $(foreach m,$(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
37multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m)))) 37multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))), $(m))))
38multi-used := $(multi-used-y) $(multi-used-m) 38multi-used := $(multi-used-y) $(multi-used-m)
@@ -76,7 +76,7 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs))
76 76
77# These flags are needed for modversions and compiling, so we define them here 77# These flags are needed for modversions and compiling, so we define them here
78# already 78# already
79# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 79# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
80# end up in (or would, if it gets compiled in) 80# end up in (or would, if it gets compiled in)
81# Note: It's possible that one object gets potentially linked into more 81# Note: It's possible that one object gets potentially linked into more
82# than one module. In that case KBUILD_MODNAME will be set to foo_bar, 82# than one module. In that case KBUILD_MODNAME will be set to foo_bar,
@@ -134,7 +134,7 @@ $(obj)/%:: $(src)/%_shipped
134 134
135# Commands useful for building a boot image 135# Commands useful for building a boot image
136# =========================================================================== 136# ===========================================================================
137# 137#
138# Use as following: 138# Use as following:
139# 139#
140# target: source(s) FORCE 140# target: source(s) FORCE
@@ -148,7 +148,7 @@ $(obj)/%:: $(src)/%_shipped
148 148
149quiet_cmd_ld = LD $@ 149quiet_cmd_ld = LD $@
150cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \ 150cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
151 $(filter-out FORCE,$^) -o $@ 151 $(filter-out FORCE,$^) -o $@
152 152
153# Objcopy 153# Objcopy
154# --------------------------------------------------------------------------- 154# ---------------------------------------------------------------------------
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index 24e3c8cbb..7a4ca2c16 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -42,7 +42,7 @@ typedef uint32_t flex_uint32_t;
42typedef signed char flex_int8_t; 42typedef signed char flex_int8_t;
43typedef short int flex_int16_t; 43typedef short int flex_int16_t;
44typedef int flex_int32_t; 44typedef int flex_int32_t;
45typedef unsigned char flex_uint8_t; 45typedef unsigned char flex_uint8_t;
46typedef unsigned short int flex_uint16_t; 46typedef unsigned short int flex_uint16_t;
47typedef unsigned int flex_uint32_t; 47typedef unsigned int flex_uint32_t;
48#endif /* ! C99 */ 48#endif /* ! C99 */
@@ -148,7 +148,7 @@ extern FILE *zconfin, *zconfout;
148#define EOB_ACT_LAST_MATCH 2 148#define EOB_ACT_LAST_MATCH 2
149 149
150 #define YY_LESS_LINENO(n) 150 #define YY_LESS_LINENO(n)
151 151
152/* Return all but the first "n" matched characters back to the input stream. */ 152/* Return all but the first "n" matched characters back to the input stream. */
153#define yyless(n) \ 153#define yyless(n) \
154 do \ 154 do \
@@ -215,7 +215,7 @@ struct yy_buffer_state
215 215
216 int yy_bs_lineno; /**< The line count. */ 216 int yy_bs_lineno; /**< The line count. */
217 int yy_bs_column; /**< The column count. */ 217 int yy_bs_column; /**< The column count. */
218 218
219 /* Whether to try to fill the input buffer when we reach the 219 /* Whether to try to fill the input buffer when we reach the
220 * end of it. 220 * end of it.
221 */ 221 */
@@ -833,7 +833,7 @@ extern int zconfwrap (void );
833#endif 833#endif
834 834
835 static void yyunput (int c,char *buf_ptr ); 835 static void yyunput (int c,char *buf_ptr );
836 836
837#ifndef yytext_ptr 837#ifndef yytext_ptr
838static void yy_flex_strncpy (char *,yyconst char *,int ); 838static void yy_flex_strncpy (char *,yyconst char *,int );
839#endif 839#endif
@@ -938,7 +938,7 @@ YY_DECL
938 register yy_state_type yy_current_state; 938 register yy_state_type yy_current_state;
939 register char *yy_cp, *yy_bp; 939 register char *yy_cp, *yy_bp;
940 register int yy_act; 940 register int yy_act;
941 941
942 int str = 0; 942 int str = 0;
943 int ts, i; 943 int ts, i;
944 944
@@ -1536,7 +1536,7 @@ static int yy_get_next_buffer (void)
1536{ 1536{
1537 register yy_state_type yy_current_state; 1537 register yy_state_type yy_current_state;
1538 register char *yy_cp; 1538 register char *yy_cp;
1539 1539
1540 yy_current_state = (yy_start); 1540 yy_current_state = (yy_start);
1541 1541
1542 for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) 1542 for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
@@ -1555,7 +1555,7 @@ static int yy_get_next_buffer (void)
1555 static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) 1555 static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
1556{ 1556{
1557 register int yy_is_jam; 1557 register int yy_is_jam;
1558 1558
1559 yy_current_state = yy_nxt[yy_current_state][1]; 1559 yy_current_state = yy_nxt[yy_current_state][1];
1560 yy_is_jam = (yy_current_state <= 0); 1560 yy_is_jam = (yy_current_state <= 0);
1561 1561
@@ -1565,7 +1565,7 @@ static int yy_get_next_buffer (void)
1565 static void yyunput (int c, register char * yy_bp ) 1565 static void yyunput (int c, register char * yy_bp )
1566{ 1566{
1567 register char *yy_cp; 1567 register char *yy_cp;
1568 1568
1569 yy_cp = (yy_c_buf_p); 1569 yy_cp = (yy_c_buf_p);
1570 1570
1571 /* undo effects of setting up zconftext */ 1571 /* undo effects of setting up zconftext */
@@ -1608,7 +1608,7 @@ static int yy_get_next_buffer (void)
1608 1608
1609{ 1609{
1610 int c; 1610 int c;
1611 1611
1612 *(yy_c_buf_p) = (yy_hold_char); 1612 *(yy_c_buf_p) = (yy_hold_char);
1613 1613
1614 if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) 1614 if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
@@ -1675,12 +1675,12 @@ static int yy_get_next_buffer (void)
1675 1675
1676/** Immediately switch to a different input stream. 1676/** Immediately switch to a different input stream.
1677 * @param input_file A readable stream. 1677 * @param input_file A readable stream.
1678 * 1678 *
1679 * @note This function does not reset the start condition to @c INITIAL . 1679 * @note This function does not reset the start condition to @c INITIAL .
1680 */ 1680 */
1681 void zconfrestart (FILE * input_file ) 1681 void zconfrestart (FILE * input_file )
1682{ 1682{
1683 1683
1684 if ( ! YY_CURRENT_BUFFER ){ 1684 if ( ! YY_CURRENT_BUFFER ){
1685 zconfensure_buffer_stack (); 1685 zconfensure_buffer_stack ();
1686 YY_CURRENT_BUFFER_LVALUE = 1686 YY_CURRENT_BUFFER_LVALUE =
@@ -1693,11 +1693,11 @@ static int yy_get_next_buffer (void)
1693 1693
1694/** Switch to a different input buffer. 1694/** Switch to a different input buffer.
1695 * @param new_buffer The new input buffer. 1695 * @param new_buffer The new input buffer.
1696 * 1696 *
1697 */ 1697 */
1698 void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer ) 1698 void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer )
1699{ 1699{
1700 1700
1701 /* TODO. We should be able to replace this entire function body 1701 /* TODO. We should be able to replace this entire function body
1702 * with 1702 * with
1703 * zconfpop_buffer_state(); 1703 * zconfpop_buffer_state();
@@ -1737,13 +1737,13 @@ static void zconf_load_buffer_state (void)
1737/** Allocate and initialize an input buffer state. 1737/** Allocate and initialize an input buffer state.
1738 * @param file A readable stream. 1738 * @param file A readable stream.
1739 * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. 1739 * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
1740 * 1740 *
1741 * @return the allocated buffer state. 1741 * @return the allocated buffer state.
1742 */ 1742 */
1743 YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size ) 1743 YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size )
1744{ 1744{
1745 YY_BUFFER_STATE b; 1745 YY_BUFFER_STATE b;
1746 1746
1747 b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) ); 1747 b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) );
1748 if ( ! b ) 1748 if ( ! b )
1749 YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" ); 1749 YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" );
@@ -1766,11 +1766,11 @@ static void zconf_load_buffer_state (void)
1766 1766
1767/** Destroy the buffer. 1767/** Destroy the buffer.
1768 * @param b a buffer created with zconf_create_buffer() 1768 * @param b a buffer created with zconf_create_buffer()
1769 * 1769 *
1770 */ 1770 */
1771 void zconf_delete_buffer (YY_BUFFER_STATE b ) 1771 void zconf_delete_buffer (YY_BUFFER_STATE b )
1772{ 1772{
1773 1773
1774 if ( ! b ) 1774 if ( ! b )
1775 return; 1775 return;
1776 1776
@@ -1791,7 +1791,7 @@ static void zconf_load_buffer_state (void)
1791 1791
1792{ 1792{
1793 int oerrno = errno; 1793 int oerrno = errno;
1794 1794
1795 zconf_flush_buffer(b ); 1795 zconf_flush_buffer(b );
1796 1796
1797 b->yy_input_file = file; 1797 b->yy_input_file = file;
@@ -1807,13 +1807,13 @@ static void zconf_load_buffer_state (void)
1807 } 1807 }
1808 1808
1809 b->yy_is_interactive = 0; 1809 b->yy_is_interactive = 0;
1810 1810
1811 errno = oerrno; 1811 errno = oerrno;
1812} 1812}
1813 1813
1814/** Discard all buffered characters. On the next scan, YY_INPUT will be called. 1814/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
1815 * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. 1815 * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
1816 * 1816 *
1817 */ 1817 */
1818 void zconf_flush_buffer (YY_BUFFER_STATE b ) 1818 void zconf_flush_buffer (YY_BUFFER_STATE b )
1819{ 1819{
@@ -1842,7 +1842,7 @@ static void zconf_load_buffer_state (void)
1842 * the current state. This function will allocate the stack 1842 * the current state. This function will allocate the stack
1843 * if necessary. 1843 * if necessary.
1844 * @param new_buffer The new state. 1844 * @param new_buffer The new state.
1845 * 1845 *
1846 */ 1846 */
1847void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) 1847void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
1848{ 1848{
@@ -1872,7 +1872,7 @@ void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer )
1872 1872
1873/** Removes and deletes the top of the stack, if present. 1873/** Removes and deletes the top of the stack, if present.
1874 * The next element becomes the new top. 1874 * The next element becomes the new top.
1875 * 1875 *
1876 */ 1876 */
1877void zconfpop_buffer_state (void) 1877void zconfpop_buffer_state (void)
1878{ 1878{
@@ -1896,7 +1896,7 @@ void zconfpop_buffer_state (void)
1896static void zconfensure_buffer_stack (void) 1896static void zconfensure_buffer_stack (void)
1897{ 1897{
1898 int num_to_alloc; 1898 int num_to_alloc;
1899 1899
1900 if (!(yy_buffer_stack)) { 1900 if (!(yy_buffer_stack)) {
1901 1901
1902 /* First allocation is just for 2 elements, since we don't know if this 1902 /* First allocation is just for 2 elements, since we don't know if this
@@ -1907,9 +1907,9 @@ static void zconfensure_buffer_stack (void)
1907 (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc 1907 (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
1908 (num_to_alloc * sizeof(struct yy_buffer_state*) 1908 (num_to_alloc * sizeof(struct yy_buffer_state*)
1909 ); 1909 );
1910 1910
1911 memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); 1911 memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
1912 1912
1913 (yy_buffer_stack_max) = num_to_alloc; 1913 (yy_buffer_stack_max) = num_to_alloc;
1914 (yy_buffer_stack_top) = 0; 1914 (yy_buffer_stack_top) = 0;
1915 return; 1915 return;
@@ -1935,13 +1935,13 @@ static void zconfensure_buffer_stack (void)
1935/** Setup the input buffer state to scan directly from a user-specified character buffer. 1935/** Setup the input buffer state to scan directly from a user-specified character buffer.
1936 * @param base the character buffer 1936 * @param base the character buffer
1937 * @param size the size in bytes of the character buffer 1937 * @param size the size in bytes of the character buffer
1938 * 1938 *
1939 * @return the newly allocated buffer state object. 1939 * @return the newly allocated buffer state object.
1940 */ 1940 */
1941YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) 1941YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size )
1942{ 1942{
1943 YY_BUFFER_STATE b; 1943 YY_BUFFER_STATE b;
1944 1944
1945 if ( size < 2 || 1945 if ( size < 2 ||
1946 base[size-2] != YY_END_OF_BUFFER_CHAR || 1946 base[size-2] != YY_END_OF_BUFFER_CHAR ||
1947 base[size-1] != YY_END_OF_BUFFER_CHAR ) 1947 base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -1970,14 +1970,14 @@ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size )
1970/** Setup the input buffer state to scan a string. The next call to zconflex() will 1970/** Setup the input buffer state to scan a string. The next call to zconflex() will
1971 * scan from a @e copy of @a str. 1971 * scan from a @e copy of @a str.
1972 * @param yy_str a NUL-terminated string to scan 1972 * @param yy_str a NUL-terminated string to scan
1973 * 1973 *
1974 * @return the newly allocated buffer state object. 1974 * @return the newly allocated buffer state object.
1975 * @note If you want to scan bytes that may contain NUL values, then use 1975 * @note If you want to scan bytes that may contain NUL values, then use
1976 * zconf_scan_bytes() instead. 1976 * zconf_scan_bytes() instead.
1977 */ 1977 */
1978YY_BUFFER_STATE zconf_scan_string (yyconst char * yy_str ) 1978YY_BUFFER_STATE zconf_scan_string (yyconst char * yy_str )
1979{ 1979{
1980 1980
1981 return zconf_scan_bytes(yy_str,strlen(yy_str) ); 1981 return zconf_scan_bytes(yy_str,strlen(yy_str) );
1982} 1982}
1983 1983
@@ -1985,7 +1985,7 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * yy_str )
1985 * scan from a @e copy of @a bytes. 1985 * scan from a @e copy of @a bytes.
1986 * @param bytes the byte buffer to scan 1986 * @param bytes the byte buffer to scan
1987 * @param len the number of bytes in the buffer pointed to by @a bytes. 1987 * @param len the number of bytes in the buffer pointed to by @a bytes.
1988 * 1988 *
1989 * @return the newly allocated buffer state object. 1989 * @return the newly allocated buffer state object.
1990 */ 1990 */
1991YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len ) 1991YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len )
@@ -1994,7 +1994,7 @@ YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len )
1994 char *buf; 1994 char *buf;
1995 yy_size_t n; 1995 yy_size_t n;
1996 int i; 1996 int i;
1997 1997
1998 /* Get memory for full buffer, including space for trailing EOB's. */ 1998 /* Get memory for full buffer, including space for trailing EOB's. */
1999 n = len + 2; 1999 n = len + 2;
2000 buf = (char *) zconfalloc(n ); 2000 buf = (char *) zconfalloc(n );
@@ -2048,16 +2048,16 @@ static void yy_fatal_error (yyconst char* msg )
2048/* Accessor methods (get/set functions) to struct members. */ 2048/* Accessor methods (get/set functions) to struct members. */
2049 2049
2050/** Get the current line number. 2050/** Get the current line number.
2051 * 2051 *
2052 */ 2052 */
2053int zconfget_lineno (void) 2053int zconfget_lineno (void)
2054{ 2054{
2055 2055
2056 return zconflineno; 2056 return zconflineno;
2057} 2057}
2058 2058
2059/** Get the input stream. 2059/** Get the input stream.
2060 * 2060 *
2061 */ 2061 */
2062FILE *zconfget_in (void) 2062FILE *zconfget_in (void)
2063{ 2063{
@@ -2065,7 +2065,7 @@ FILE *zconfget_in (void)
2065} 2065}
2066 2066
2067/** Get the output stream. 2067/** Get the output stream.
2068 * 2068 *
2069 */ 2069 */
2070FILE *zconfget_out (void) 2070FILE *zconfget_out (void)
2071{ 2071{
@@ -2073,7 +2073,7 @@ FILE *zconfget_out (void)
2073} 2073}
2074 2074
2075/** Get the length of the current token. 2075/** Get the length of the current token.
2076 * 2076 *
2077 */ 2077 */
2078int zconfget_leng (void) 2078int zconfget_leng (void)
2079{ 2079{
@@ -2081,7 +2081,7 @@ int zconfget_leng (void)
2081} 2081}
2082 2082
2083/** Get the current token. 2083/** Get the current token.
2084 * 2084 *
2085 */ 2085 */
2086 2086
2087char *zconfget_text (void) 2087char *zconfget_text (void)
@@ -2091,18 +2091,18 @@ char *zconfget_text (void)
2091 2091
2092/** Set the current line number. 2092/** Set the current line number.
2093 * @param line_number 2093 * @param line_number
2094 * 2094 *
2095 */ 2095 */
2096void zconfset_lineno (int line_number ) 2096void zconfset_lineno (int line_number )
2097{ 2097{
2098 2098
2099 zconflineno = line_number; 2099 zconflineno = line_number;
2100} 2100}
2101 2101
2102/** Set the input stream. This does not discard the current 2102/** Set the input stream. This does not discard the current
2103 * input buffer. 2103 * input buffer.
2104 * @param in_str A readable stream. 2104 * @param in_str A readable stream.
2105 * 2105 *
2106 * @see zconf_switch_to_buffer 2106 * @see zconf_switch_to_buffer
2107 */ 2107 */
2108void zconfset_in (FILE * in_str ) 2108void zconfset_in (FILE * in_str )
@@ -2128,7 +2128,7 @@ void zconfset_debug (int bdebug )
2128/* zconflex_destroy is for both reentrant and non-reentrant scanners. */ 2128/* zconflex_destroy is for both reentrant and non-reentrant scanners. */
2129int zconflex_destroy (void) 2129int zconflex_destroy (void)
2130{ 2130{
2131 2131
2132 /* Pop the buffer stack, destroying each element. */ 2132 /* Pop the buffer stack, destroying each element. */
2133 while(YY_CURRENT_BUFFER){ 2133 while(YY_CURRENT_BUFFER){
2134 zconf_delete_buffer(YY_CURRENT_BUFFER ); 2134 zconf_delete_buffer(YY_CURRENT_BUFFER );
diff --git a/scripts/kconfig/lxdialog/BIG.FAT.WARNING b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
index c9bfbb902..b5d3b10b2 100644
--- a/scripts/kconfig/lxdialog/BIG.FAT.WARNING
+++ b/scripts/kconfig/lxdialog/BIG.FAT.WARNING
@@ -1,4 +1,4 @@
1This is NOT the official version of dialog. This version has been 1This is NOT the official version of dialog. This version has been
2significantly modified from the original. It is for use by the Linux 2significantly modified from the original. It is for use by the Linux
3busybox configuration script. Please do not bother Savio Lam with 3busybox configuration script. Please do not bother Savio Lam with
4questions about this program. 4questions about this program.
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index bf8052f4f..078e55a2e 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -26,7 +26,7 @@
26 * 26 *
27 * *) A bugfix for the Page-Down problem 27 * *) A bugfix for the Page-Down problem
28 * 28 *
29 * *) Formerly when I used Page Down and Page Up, the cursor would be set 29 * *) Formerly when I used Page Down and Page Up, the cursor would be set
30 * to the first position in the menu box. Now lxdialog is a bit 30 * to the first position in the menu box. Now lxdialog is a bit
31 * smarter and works more like other menu systems (just have a look at 31 * smarter and works more like other menu systems (just have a look at
32 * it). 32 * it).
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index e14eafa6c..ca8003dce 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -1086,7 +1086,7 @@ yyparse ()
1086#endif 1086#endif
1087#endif 1087#endif
1088{ 1088{
1089 1089
1090 register int yystate; 1090 register int yystate;
1091 register int yyn; 1091 register int yyn;
1092 int yyresult; 1092 int yyresult;