diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
tree | 64b6b9655e944284937f5eeff643f0754f35d0af /scripts/Makefile.lib | |
parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'scripts/Makefile.lib')
-rw-r--r-- | scripts/Makefile.lib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index cbcd654215e6..54fd1b700131 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -241,7 +241,7 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ | |||
241 | lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ | 241 | lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ |
242 | (rm -f $@ ; false) | 242 | (rm -f $@ ; false) |
243 | 243 | ||
244 | quiet_cmd_lzo = LZO $@ | 244 | quiet_cmd_lzo = LZO $@ |
245 | cmd_lzo = (cat $(filter-out FORCE,$^) | \ | 245 | cmd_lzo = (cat $(filter-out FORCE,$^) | \ |
246 | lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ | 246 | lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ |
247 | (rm -f $@ ; false) | 247 | (rm -f $@ ; false) |