2000-12-13 21:24:01

by Christoph Hellwig

[permalink] [raw]
Subject: [[email protected]: [PATCH] fix 2.4.0-test12 scsi makefile]

----- Forwarded message from Christoph Hellwig <[email protected]> -----

Date: Wed, 13 Dec 2000 21:52:21 +0100
From: Christoph Hellwig <[email protected]>
To: Linus Torvalds <[email protected]>
Subject: [PATCH] fix 2.4.0-test12 scsi makefile
X-Mailer: Mutt 1.0i

Hi Linus,

this patch makes scsi usable not in the common case where scsi itself
is built into the kernel and some drivers are modules - the patch in
2.4.0-test12 made it work for modules only on parisc64 - now it
should work everywhere.

The comment in the patch explains how it works.

Please apply.

Christoph

--
Whip me. Beat me. Make me maintain AIX.


diff -uNr --exclude-from=dontdiff linux-2.4.0-test12/drivers/scsi/Makefile linux/drivers/scsi/Makefile
--- linux-2.4.0-test12/drivers/scsi/Makefile Tue Dec 12 22:41:34 2000
+++ linux/drivers/scsi/Makefile Wed Dec 13 22:12:02 2000
@@ -140,6 +140,9 @@
obj-m := $(filter-out $(obj-y), $(obj-m))
int-m := $(filter-out $(int-y), $(int-m))

+# Take multi-part drivers out of obj-y and put components in.
+obj-y := $(filter-out $(list-multi), $(obj-y)) $(int-y)
+
O_OBJS := $(filter-out $(export-objs), $(obj-y))
OX_OBJS := $(filter $(export-objs), $(obj-y))
M_OBJS := $(sort $(filter-out $(export-objs), $(obj-m)))

----- End forwarded message -----

--
Of course it doesn't work. We've performed a software upgrade.
Whip me. Beat me. Make me maintain AIX.