aboutsummaryrefslogtreecommitdiffstats
path: root/extlinux
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-01-18 16:12:25 -0800
committerH. Peter Anvin <hpa@zytor.com>2014-01-18 16:12:25 -0800
commitba3c1d66fc9f6638ea22949e71d10dc4f7e83796 (patch)
treeed8faa89356c801de088a99c42ccb3b4ba75790e /extlinux
parent71a3d797f62b0d7560cb52e148f65fa9375965bf (diff)
parentb4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (diff)
downloadsyslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.gz
syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.xz
syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.zip
Merge remote-tracking branch 'origin/syslinux-5.xx'
Resolved Conflicts: version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'extlinux')
-rw-r--r--extlinux/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/extlinux/Makefile b/extlinux/Makefile
index 91486880..02d1db51 100644
--- a/extlinux/Makefile
+++ b/extlinux/Makefile
@@ -64,4 +64,4 @@ strip:
%.s: %.c
$(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d