diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-11 11:25:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-11 11:25:50 +0200 |
| commit | 50c0587eedc15235144216f2d2a5bd2a85e03289 (patch) | |
| tree | 74f24e52bba71efea51dc8ada3ac5427aa1627e5 /arch/x86/boot | |
| parent | 3b290398638ee4e57f1fb2e35c02005cba9a737f (diff) | |
| parent | 75d089d12a66a8662d888ff60a9eaea230fed53e (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 700a9c6e6159..be8e688fa0d4 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile @@ -162,6 +162,9 @@ isoimage: $(obj)/bzImage for i in lib lib64 share end ; do \ if [ -f /usr/$$i/syslinux/isolinux.bin ] ; then \ cp /usr/$$i/syslinux/isolinux.bin $(obj)/isoimage ; \ + if [ -f /usr/$$i/syslinux/ldlinux.c32 ]; then \ + cp /usr/$$i/syslinux/ldlinux.c32 $(obj)/isoimage ; \ + fi ; \ break ; \ fi ; \ if [ $$i = end ] ; then exit 1 ; fi ; \ |