diff options
author | Arnd Bergmann | 2011-07-28 17:25:46 +0200 |
---|---|---|
committer | Arnd Bergmann | 2011-07-28 17:25:46 +0200 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /kernel/Makefile | |
parent | arm/dt: tegra devicetree support (diff) | |
parent | dmaengine: imx-sdma: add device tree probe support (diff) | |
download | kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.gz kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz kernel-qcow2-linux-6124a4e430b64d1577438c8648c59e996d02e73e.zip |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'kernel/Makefile')
-rw-r--r-- | kernel/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 2d64cfcc8b42..d06467fc8f7c 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -125,11 +125,10 @@ targets += config_data.gz $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE $(call if_changed,gzip) -quiet_cmd_ikconfiggz = IKCFG $@ - cmd_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@ + filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") targets += config_data.h $(obj)/config_data.h: $(obj)/config_data.gz FORCE - $(call if_changed,ikconfiggz) + $(call filechk,ikconfiggz) $(obj)/time.o: $(obj)/timeconst.h |