From 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 4 Feb 2000 07:40:19 +0000 Subject: Merge with Linux 2.3.32. --- drivers/scsi/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'drivers/scsi/Makefile') diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 2324184d1..0cd616405 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile @@ -40,8 +40,8 @@ ifeq ($(CONFIG_SCSI),y) OX_OBJS := scsi_syms.o endif L_OBJS += scsi_n_syms.o hosts.o scsi_ioctl.o constants.o scsicam.o - L_OBJS += scsi_error.o scsi_obsolete.o scsi_queue.o - L_OBJS += scsi_proc.o + L_OBJS += scsi_error.o scsi_obsolete.o scsi_queue.o scsi_lib.o + L_OBJS += scsi_merge.o scsi_proc.o else ifeq ($(CONFIG_SCSI),m) MIX_OBJS += scsi_syms.o @@ -725,10 +725,11 @@ megaraid.o: megaraid.c $(CC) $(CFLAGS) -c megaraid.c scsi_mod.o: $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o constants.o \ - scsicam.o scsi_proc.o scsi_error.o scsi_obsolete.o scsi_queue.o + scsicam.o scsi_proc.o scsi_error.o scsi_obsolete.o \ + scsi_queue.o scsi_lib.o scsi_merge.o $(LD) $(LD_RFLAG) -r -o $@ $(MIX_OBJS) hosts.o scsi.o scsi_ioctl.o \ - constants.o scsicam.o scsi_proc.o \ - scsi_error.o scsi_obsolete.o scsi_queue.o \ + constants.o scsicam.o scsi_proc.o scsi_merge.o \ + scsi_error.o scsi_obsolete.o scsi_queue.o scsi_lib.o sr_mod.o: sr.o sr_ioctl.o sr_vendor.o $(LD) $(LD_RFLAG) -r -o $@ sr.o sr_ioctl.o sr_vendor.o -- cgit v1.2.3