diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:12:25 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:12:25 -0800 |
| commit | ba3c1d66fc9f6638ea22949e71d10dc4f7e83796 (patch) | |
| tree | ed8faa89356c801de088a99c42ccb3b4ba75790e /linux | |
| parent | 71a3d797f62b0d7560cb52e148f65fa9375965bf (diff) | |
| parent | b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (diff) | |
| download | syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.gz | |
Merge remote-tracking branch 'origin/syslinux-5.xx'
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Makefile b/linux/Makefile index f88a6cb3..11667e1d 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -66,4 +66,4 @@ strip: %.s: %.c $(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $< --include .*.d *.tmp +-include .*.d |