• Linus Torvalds's avatar
    Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 1d3fe4a7
    Linus Torvalds authored
    * '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
    1d3fe4a7
Makefile 11.2 KB