diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-12-22 19:21:47 -0500 |
| commit | f80ca163d65903276bec7045a484a79c0897eb2d (patch) | |
| tree | 97c7d61d43248b9db0757a76af80ff58b98b5599 /scripts/kconfig/Makefile | |
| parent | 0794ec8ce327ec74416b569b8fb1951274693700 (diff) | |
| parent | a6d52d70677e99bdb89b6921c265d0a58c22e597 (diff) | |
Merge branch 'ioat' into fixes
Diffstat (limited to 'scripts/kconfig/Makefile')
| -rw-r--r-- | scripts/kconfig/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 6d69c7ccdcc7..80599e3a7994 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -30,7 +30,7 @@ silentoldconfig: $(obj)/conf | |||
| 30 | $< -s $(Kconfig) | 30 | $< -s $(Kconfig) |
| 31 | 31 | ||
| 32 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | 32 | localmodconfig: $(obj)/streamline_config.pl $(obj)/conf |
| 33 | $(Q)perl $< $(Kconfig) > .tmp.config | 33 | $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config |
| 34 | $(Q)if [ -f .config ]; then \ | 34 | $(Q)if [ -f .config ]; then \ |
| 35 | cmp -s .tmp.config .config || \ | 35 | cmp -s .tmp.config .config || \ |
| 36 | (mv -f .config .config.old.1; \ | 36 | (mv -f .config .config.old.1; \ |
| @@ -44,7 +44,7 @@ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf | |||
| 44 | $(Q)rm -f .tmp.config | 44 | $(Q)rm -f .tmp.config |
| 45 | 45 | ||
| 46 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf | 46 | localyesconfig: $(obj)/streamline_config.pl $(obj)/conf |
| 47 | $(Q)perl $< $(Kconfig) > .tmp.config | 47 | $(Q)perl $< $(srctree) $(Kconfig) > .tmp.config |
| 48 | $(Q)sed -i s/=m/=y/ .tmp.config | 48 | $(Q)sed -i s/=m/=y/ .tmp.config |
| 49 | $(Q)if [ -f .config ]; then \ | 49 | $(Q)if [ -f .config ]; then \ |
| 50 | cmp -s .tmp.config .config || \ | 50 | cmp -s .tmp.config .config || \ |