diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /scripts/Makefile.lib | |
| parent | 3d1c1829ebe7e8bb48a997b39b4865abc9197e5e (diff) | |
| parent | dda54e76d7dba0532ebdd72e0b4f492a03f83225 (diff) | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
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 1c702ca8aac8..93b2b5938a2e 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
| @@ -197,7 +197,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ | |||
| 197 | # --------------------------------------------------------------------------- | 197 | # --------------------------------------------------------------------------- |
| 198 | 198 | ||
| 199 | quiet_cmd_gzip = GZIP $@ | 199 | quiet_cmd_gzip = GZIP $@ |
| 200 | cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \ | 200 | cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ |
| 201 | (rm -f $@ ; false) | 201 | (rm -f $@ ; false) |
| 202 | 202 | ||
| 203 | # DTC | 203 | # DTC |