Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64194061 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k: oktagon makefile fix 



oktagon_esp is described as modular.  However, drivers/scsi/Makefile doesn't
handle it right - it's multi-object module, with one of the parts being built
from .S.  Current makefile tries to declare each part a module of its own;
that not only wouldn't work (oktagon_io.o doesn't have the right parts for
that), it actually doesn't even build since kbuild doesn't believe in
single-object modules built from .S.  Turned into proper multi-object
module...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cef46b1f

drivers/scsi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ obj-$(CONFIG_CYBERSTORMII_SCSI) += NCR53C9x.o cyberstormII.o 
obj-$(CONFIG_BLZ2060_SCSI)	+= NCR53C9x.o	blz2060.o

obj-$(CONFIG_BLZ1230_SCSI)	+= NCR53C9x.o	blz1230.o

obj-$(CONFIG_FASTLANE_SCSI)	+= NCR53C9x.o	fastlane.o

obj-$(CONFIG_OKTAGON_SCSI)	+= NCR53C9x.o	oktagon_esp.o	oktagon_io.o

obj-$(CONFIG_OKTAGON_SCSI)	+= NCR53C9x.o	oktagon_esp_mod.o

obj-$(CONFIG_ATARI_SCSI)	+= atari_scsi.o

obj-$(CONFIG_MAC_SCSI)		+= mac_scsi.o

obj-$(CONFIG_SCSI_MAC_ESP)	+= mac_esp.o	NCR53C9x.o
@@ -164,6 +164,7 @@ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) 
zalon7xx-objs	:= zalon.o ncr53c8xx.o

NCR_Q720_mod-objs	:= NCR_Q720.o ncr53c8xx.o

libata-objs	:= libata-core.o libata-scsi.o

oktagon_esp_mod-objs	:= oktagon_esp.o oktagon_io.o



# Files generated that shall be removed upon make clean

clean-files :=	53c7xx_d.h 53c700_d.h	\