diff options
| author | Gabriel de Perthuis <g2p.code@gmail.com> | 2015-10-14 17:04:20 +0300 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2015-10-14 17:19:33 +0300 |
| commit | ed94fea5ba78d03808576f14745d8e59126489bd (patch) | |
| tree | 9ec83afc486ff9fb200d5e0f9c1abae6a811c82b /drivers/ipack/carriers | |
| parent | d1b0dc90abdb3487a8b60ac7c843708f98ff409a (diff) | |
| download | linux-ed94fea5ba78d03808576f14745d8e59126489bd.tar.xz | |
kconfig/merge_config.sh: Support KCONFIG_CONFIG
All make targets support $KCONFIG_CONFIG because they
run scripts/kconf. Make sure merge_config.sh accesses the
correct file in all cases.
Previously this script broke in two different code paths,
one for targets like kvmconfig (which use merge_config.sh -m
then call a target that respects KCONFIG_CONFIG) and one for
direct use of the script without -m, which called make rules
that edit KCONFIG_CONFIG but verified a different file.
Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'drivers/ipack/carriers')
0 files changed, 0 insertions, 0 deletions