Merge commit 'v2.6.35' into kbuild/kconfig
Michal Marek [Wed, 4 Aug 2010 12:05:07 +0000 (14:05 +0200)]
Conflicts:
scripts/kconfig/Makefile

1  2 
Documentation/kbuild/kconfig.txt
scripts/kconfig/Makefile

Simple merge
@@@ -31,34 -31,44 +31,44 @@@ oldconfig: $(obj)/con
  
  silentoldconfig: $(obj)/conf
        $(Q)mkdir -p include/generated
 -      $< -s $(Kconfig)
 +      $< --$@ $(Kconfig)
  
+ # if no path is given, then use src directory to find file
+ ifdef LSMOD
+ LSMOD_F := $(LSMOD)
+ ifeq ($(findstring /,$(LSMOD)),)
+   LSMOD_F := $(objtree)/$(LSMOD)
+ endif
+ endif
  localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
-       $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
-       $(Q)if [ -f .config ]; then                                     \
+       $(Q)mkdir -p include/generated
+       $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
 -      $(Q)if [ -f .config ]; then                             \
 -                      cmp -s .tmp.config .config ||           \
 -                      (mv -f .config .config.old.1;           \
 -                       mv -f .tmp.config .config;             \
 -                       $(obj)/conf -s $(Kconfig);             \
 -                       mv -f .config.old.1 .config.old)       \
 -      else                                                    \
 -                      mv -f .tmp.config .config;              \
 -                      $(obj)/conf -s $(Kconfig);              \
++      $(Q)if [ -f .config ]; then                                     \
 +                      cmp -s .tmp.config .config ||                   \
 +                      (mv -f .config .config.old.1;                   \
 +                       mv -f .tmp.config .config;                     \
 +                       $(obj)/conf --silentoldconfig $(Kconfig);      \
 +                       mv -f .config.old.1 .config.old)               \
 +      else                                                            \
 +                      mv -f .tmp.config .config;                      \
 +                      $(obj)/conf --silentoldconfig $(Kconfig);       \
        fi
        $(Q)rm -f .tmp.config
  
  localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
-       $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
+       $(Q)mkdir -p include/generated
+       $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
        $(Q)sed -i s/=m/=y/ .tmp.config
 -      $(Q)if [ -f .config ]; then                             \
 -                      cmp -s .tmp.config .config ||           \
 -                      (mv -f .config .config.old.1;           \
 -                       mv -f .tmp.config .config;             \
 -                       $(obj)/conf -s $(Kconfig);             \
 -                       mv -f .config.old.1 .config.old)       \
 -      else                                                    \
 -                      mv -f .tmp.config .config;              \
 -                      $(obj)/conf -s $(Kconfig);              \
 +      $(Q)if [ -f .config ]; then                                     \
 +                      cmp -s .tmp.config .config ||                   \
 +                      (mv -f .config .config.old.1;                   \
 +                       mv -f .tmp.config .config;                     \
 +                       $(obj)/conf --silentoldconfig $(Kconfig);      \
 +                       mv -f .config.old.1 .config.old)               \
 +      else                                                            \
 +                      mv -f .tmp.config .config;                      \
 +                      $(obj)/conf --silentoldconfig $(Kconfig);       \
        fi
        $(Q)rm -f .tmp.config