From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 07:17:06 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
X-Git-Tag: v3.1-rc1~115
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=1d3fe4a75b691285cded47c9f1a91b30d25287b0

Merge branch 'kconfig' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
  kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
  xconfig: Abort close if configuration cannot be saved
  kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h
  kconfig/nconf: remove useless conditionnal
  kconfig/nconf: prevent segfault on empty menu
  kconfig/nconf: use the generic menu_get_ext_help()
  nconfig: Avoid Wunused-but-set warning
  kconfig/conf: mark xfgets() private
  kconfig: remove pending prototypes for kconfig_load()
  kconfig/conf: add command line options' description
  kconfig/conf: reduce the scope of `defconfig_file'
  kconfig: use calloc() for expr allocation
  kconfig: introduce specialized printer
  kconfig: do not overwrite symbol direct dependency in assignment
  kconfig/gconf: silent missing prototype warnings
  kconfig/gconf: kill deadcode
  kconfig: nuke LKC_DIRECT_LINK cruft
  kconfig: nuke reference to SWIG
  kconfig: add missing <stdlib.h> inclusion
  kconfig: add missing <ctype.h> inclusion
  ...

Fix up conflicts in scripts/kconfig/Makefile
---

1d3fe4a75b691285cded47c9f1a91b30d25287b0
diff --cc scripts/kconfig/Makefile
index 0b4276c047b2,84abb2fc61d1..82d2eb285b70
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -203,8 -203,8 +203,8 @@@ 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	+= zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
  clean-files     += mconf qconf gconf nconf
  clean-files     += config.pot linux.pot
  
@@@ -220,18 -220,15 +220,18 @@@ always := dochecklxdialo
  HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
  
  # generated files seem to need this to find local include files
 -HOSTCFLAGS_lex.zconf.o	:= -I$(src)
 +HOSTCFLAGS_zconf.lex.o	:= -I$(src)
  HOSTCFLAGS_zconf.tab.o	:= -I$(src)
  
 +LEX_PREFIX_zconf	:= zconf
 +YACC_PREFIX_zconf	:= zconf
 +
- 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))
  
@@@ -319,13 -316,9 +319,9 @@@ $(obj)/.tmp_gtkcheck
  	fi
  endif
  
 -$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c
 +$(obj)/zconf.tab.o: $(obj)/zconf.lex.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 $@