summaryrefslogtreecommitdiffstats
path: root/arch/i386/boot/Makefile
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-06-26 22:19:40 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-06-26 22:19:40 +0100
commit2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch)
treead8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/i386/boot/Makefile
parentba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff)
parent8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff)
downloadtalos-op-linux-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.tar.gz
talos-op-linux-2a322e4c08be4e7cb0c04b427ddaaa679fd88863.zip
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/i386/boot/Makefile')
-rw-r--r--arch/i386/boot/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index 43cd6220ee49..1e71382d413a 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -25,8 +25,8 @@ SVGA_MODE := -DSVGA_MODE=NORMAL_VGA
#RAMDISK := -DRAMDISK=512
-targets := vmlinux.bin bootsect bootsect.o setup setup.o \
- zImage bzImage
+targets := vmlinux.bin bootsect bootsect.o \
+ setup setup.o zImage bzImage
subdir- := compressed
hostprogs-y := tools/build
OpenPOWER on IntegriCloud