Re: [PATCH] fix 2.4.x ieee1394

[Erik Andersen]

On Sun Dec 29, 2002 at 04:38:21PM +0100, Adrian Bunk wrote:
> When I try 2.4.21-pre2 with your patch and the IEEE 1394 options you 
> mention in your mail _nothing_ gets built inside the drivers/ieee1394 
> directory and the error message at the final linking is:
> 
> <--  snip  -->
> 
> ...
>         -o vmlinux
> ld: cannot open drivers/ieee1394/ieee1394.o: No such file or directory
> make: *** [vmlinux] Error 1
> 
> <--  snip  -->
> 
> 
> How did you manage to get a kernel that actually compiles?
> 

Sorry about that.  I missed a spot.  Here is the full fix:

--- linux/drivers/ieee1394/Makefile.orig	2002-12-21 14:32:36.000000000 -0700
+++ linux/drivers/ieee1394/Makefile	2002-12-21 19:43:05.000000000 -0700
@@ -18,7 +18,8 @@
 obj-$(CONFIG_IEEE1394_AMDTP) += amdtp.o
 obj-$(CONFIG_IEEE1394_CMP) += cmp.o
 
-include $(TOPDIR)/Rules.make
-
 ieee1394.o: $(ieee1394-objs)
 	$(LD) $(LDFLAGS) -r -o $@ $(ieee1394-objs)
+
+include $(TOPDIR)/Rules.make
+
--- linux/Makefile.orig	2002-12-21 14:32:42.000000000 -0700
+++ linux/Makefile	2002-12-21 19:59:00.000000000 -0700
@@ -153,7 +153,7 @@
 DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
 DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o
-DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
+DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394.o
 
 ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
 DRIVERS-y += drivers/cdrom/driver.o

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--