[PATCH 1/2] kconfig: sync with linux v3.1-rc1

[Sascha Hauer]

On Fri, Aug 12, 2011 at 03:32:06PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> this will allow to use new introduce IS_BUILTIN, IS_ENABLE and IS_MODULE
> macro and drop as much as possible
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
> ---
>  Makefile                                 |    2 +-
>  scripts/kconfig/Makefile                 |   85 +++-----
>  scripts/kconfig/conf.c                   |   50 ++++-
>  scripts/kconfig/confdata.c               |  309 +++++++++++++++++++-----------
>  scripts/kconfig/expr.c                   |   13 +-
>  scripts/kconfig/expr.h                   |    7 -
>  scripts/kconfig/gconf.c                  |   50 +----
>  scripts/kconfig/kxgettext.c              |    1 -
>  scripts/kconfig/lkc.h                    |   18 +--
>  scripts/kconfig/lkc_proto.h              |    1 +
>  scripts/kconfig/lxdialog/BIG.FAT.WARNING |    2 +-
>  scripts/kconfig/mconf.c                  |    2 +-
>  scripts/kconfig/menu.c                   |    5 +-
>  scripts/kconfig/nconf.c                  |   44 ++---
>  scripts/kconfig/qconf.cc                 |   22 ++-
>  scripts/kconfig/qconf.h                  |    2 +-
>  scripts/kconfig/streamline_config.pl     |   16 +-
>  scripts/kconfig/symbol.c                 |   47 +++++-
>  scripts/kconfig/util.c                   |    2 +
>  scripts/kconfig/zconf.gperf              |    2 +-
>  scripts/kconfig/zconf.hash.c_shipped     |  273 +++++++++++++++-----------
>  scripts/kconfig/zconf.l                  |   44 +++--
>  scripts/kconfig/zconf.tab.c_shipped      |   71 ++++----
>  scripts/kconfig/zconf.y                  |   21 +--
>  24 files changed, 598 insertions(+), 491 deletions(-)

Did you forget to git add something?

  HOSTCC  scripts/basic/fixdep
  HOSTCC  scripts/basic/docproc
make[1]: *** No rule to make target `scripts/kconfig/zconf.lex.c', needed by `scripts/kconfig/zconf.tab.o'.  Stop.
make[1]: *** Waiting for unfinished jobs....
  HOSTCC  scripts/kconfig/conf.o
make: *** [freescale_mx51_babbage_defconfig] Error 2

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |