Merge branch 'kconfig-trivial' of git://github.com/lacombar/linux-2.6 into kbuild/kconfig (36fee535) · Commits · e / devices / android_kernel_teracube_2e

scripts/kconfig/Makefile

+8 −15

Original line number	Diff line number	Diff line
		@@ -170,8 +170,8 @@ mconf-objs := mconf.o zconf.tab.o $(lxdialog)
		nconf-objs := nconf.o zconf.tab.o nconf.gui.o
		kxgettext-objs := kxgettext.o zconf.tab.o
		qconf-cxxobjs := qconf.o
		qconf-objs := kconfig_load.o zconf.tab.o
		gconf-objs := gconf.o kconfig_load.o zconf.tab.o
		qconf-objs := zconf.tab.o
		gconf-objs := gconf.o zconf.tab.o

		hostprogs-y := conf

		@@ -203,7 +203,7 @@ ifeq ($(gconf-target),1)
		hostprogs-y += gconf
		endif

		clean-files := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
		clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
		clean-files += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
		clean-files += mconf qconf gconf nconf
		clean-files += config.pot linux.pot
		@@ -223,12 +223,12 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC)
		HOSTCFLAGS_lex.zconf.o := -I$(src)
		HOSTCFLAGS_zconf.tab.o := -I$(src)

		HOSTLOADLIBES_qconf = $(KC_QT_LIBS) -ldl
		HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
		HOSTLOADLIBES_qconf = $(KC_QT_LIBS)
		HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS)

		HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
		HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
		HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
		-D LKC_DIRECT_LINK
		-Wno-missing-prototypes

		HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

		@@ -318,18 +318,11 @@ endif

		$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c

		$(obj)/kconfig_load.o: $(obj)/lkc_defs.h

		$(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h

		$(obj)/gconf.o: $(obj)/lkc_defs.h
		$(obj)/qconf.o: $(obj)/qconf.moc

		$(obj)/%.moc: $(src)/%.h
		$(KC_QT_MOC) -i $< -o $@

		$(obj)/lkc_defs.h: $(src)/lkc_proto.h
		$(Q)sed < $< > $@ 's/P($[^,]$,./#define \1 (\*\1_p)/'

		# Extract gconf menu items for I18N support
		$(obj)/gconf.glade.h: $(obj)/gconf.glade
		$(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \

scripts/kconfig/conf.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include <sys/stat.h>
		#include <sys/time.h>

		#define LKC_DIRECT_LINK
		#include "lkc.h"

		static void conf(struct menu *menu);
		@@ -106,6 +105,7 @@ static int conf_askvalue(struct symbol sym, const char def)
		return 0;
		}
		check_stdin();
		/* fall through */
		case oldaskconfig:
		fflush(stdout);
		xfgets(line, 128, stdin);
		@@ -150,6 +150,7 @@ static int conf_string(struct menu *menu)
		def = NULL;
		break;
		}
		/* fall through */
		default:
		line[strlen(line)-1] = 0;
		def = line;
		@@ -304,6 +305,7 @@ static int conf_choice(struct menu *menu)
		break;
		}
		check_stdin();
		/* fall through */
		case oldaskconfig:
		fflush(stdout);
		xfgets(line, 128, stdin);
		@@ -369,6 +371,7 @@ static void conf(struct menu *menu)
		check_conf(menu);
		return;
		}
		/* fall through */
		case P_COMMENT:
		prompt = menu_get_prompt(menu);
		if (prompt)

scripts/kconfig/confdata.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -7,13 +7,13 @@
		#include <ctype.h>
		#include <errno.h>
		#include <fcntl.h>
		#include <stdarg.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <string.h>
		#include <time.h>
		#include <unistd.h>

		#define LKC_DIRECT_LINK
		#include "lkc.h"

		static void conf_warning(const char *fmt, ...)
		@@ -128,6 +128,7 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		sym->flags \|= def_flags;
		break;
		}
		/* fall through */
		case S_BOOLEAN:
		if (p[0] == 'y') {
		sym->def[def].tri = yes;
		@@ -140,7 +141,7 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		break;
		}
		conf_warning("symbol value '%s' invalid for %s", p, sym->name);
		break;
		return 1;
		case S_OTHER:
		if (*p != '"') {
		for (p2 = p; p2 && !isspace(p2); p2++)
		@@ -148,6 +149,7 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		sym->type = S_STRING;
		goto done;
		}
		/* fall through */
		case S_STRING:
		if (*p++ != '"')
		break;
		@@ -162,6 +164,7 @@ static int conf_set_sym_val(struct symbol sym, int def, int def_flags, char p)
		conf_warning("invalid string found");
		return 1;
		}
		/* fall through */
		case S_INT:
		case S_HEX:
		done:
		@@ -237,6 +240,7 @@ int conf_read_simple(const char *name, int def)
		case S_STRING:
		if (sym->def[def].val)
		free(sym->def[def].val);
		/* fall through */
		default:
		sym->def[def].val = NULL;
		sym->def[def].tri = no;
		@@ -363,6 +367,7 @@ int conf_read(const char *name)
		break;
		if (!sym_is_choice(sym))
		goto sym_ok;
		/* fall through */
		default:
		if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val))
		goto sym_ok;

scripts/kconfig/expr.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		#include <stdlib.h>
		#include <string.h>

		#define LKC_DIRECT_LINK
		#include "lkc.h"

		#define DEBUG_EXPR 0

scripts/kconfig/expr.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -172,8 +172,6 @@ struct menu {
		#define MENU_CHANGED 0x0001
		#define MENU_ROOT 0x0002

		#ifndef SWIG

		extern struct file *file_list;
		extern struct file *current_file;
		struct file lookup_file(const char name);
		@@ -218,7 +216,6 @@ static inline int expr_is_no(struct expr *e)
		{
		return e && (e->type == E_SYMBOL && e->left.sym == &symbol_no);
		}
		#endif

		#ifdef __cplusplus
		}