dragon-nx-32: resolve Makefile merge failure in previous
authorAlan Cox <alan@linux.intel.com>
Sat, 10 Mar 2018 23:57:13 +0000 (23:57 +0000)
committerAlan Cox <alan@linux.intel.com>
Sat, 10 Mar 2018 23:57:13 +0000 (23:57 +0000)
Kernel/platform-dragon-nx32/Makefile

index 8a40526..29fc145 100644 (file)
@@ -8,7 +8,7 @@ DSRCS = ../dev/devdw.c ../dev/blkdev.c ../dev/devide.c \
         ../dev/devsd.c ../dev/devscsi.c
 
 DDSRCS = ../dev/devide_discard.c ../dev/devscsi_discard.c ../dev/mbr.c \
-       ../dev/devsd_discard.c
+         ../dev/gpt.c ../dev/devsd_discard.c
 
 ASRCS = crt0.s dragon.s mem-nx32.s video.s ide.s spi.s scsi_tc3.s
 ASRCS += tricks.s commonmem.s usermem_sam.s floppy.s drivewire.s
@@ -56,7 +56,7 @@ image:
        ../tty.o ../devsys.o ../usermem.o ../syscall_fs2.o ../syscall_exec16.o \
        ../syscall_fs3.o \
        devlpr.o devtty.o libc.o ../vt.o video.o ../font8x8.o \
-       devide.o blkdev.o ide.o devide_discard.o mbr.o \
+       devide.o blkdev.o ide.o devide_discard.o mbr.o gpt.o \
        devsd.o devsd_discard.o spi.o devscsi.o devscsi_discard.o \
        scsi_tc3.o discard.o
        ../tools/pad256 ../fuzix.bin