[Linux1394-cvslog] rev 760 - trunk

[SVN U. <ben...@li...>]

Author: bencollins
Date: 2003-02-01 00:18:11 -0500 (Sat, 01 Feb 2003)
New Revision: 760

Modified:
   trunk/
   trunk/Makefile
   trunk/nodemgr.c
   trunk/ohci1394.h
Log:
Minor 2.5.59 changes.


Modified: trunk/ohci1394.h
==============================================================================
--- trunk/ohci1394.h	(original)
+++ trunk/ohci1394.h	2003-02-01 08:36:12.000000000 -0500
@@ -191,7 +191,7 @@
         /* iso receive */
 	int nb_iso_rcv_ctx;
 	unsigned long ir_ctx_usage; /* use test_and_set_bit() for atomicity */
-	unsigned int ir_multichannel_used; /* ditto */
+	unsigned long ir_multichannel_used; /* ditto */
         spinlock_t IR_channel_lock;
 
 	/* iso receive (legacy API) */

Modified: trunk/nodemgr.c
==============================================================================
--- trunk/nodemgr.c	(original)
+++ trunk/nodemgr.c	2003-02-01 08:36:12.000000000 -0500
@@ -1089,8 +1089,7 @@
 
 static void nodemgr_remove_node(struct node_entry *ne)
 {
-	HPSB_DEBUG("%s removed: Node[" NODE_BUS_FMT "]  GUID[%016Lx]  [%s]",
-		   (ne->host->node_id == ne->nodeid) ? "Host" : "Device",
+	HPSB_DEBUG("Device removed: Node[" NODE_BUS_FMT "]  GUID[%016Lx]  [%s]",
 		   NODE_BUS_ARGS(ne->nodeid), (unsigned long long)ne->guid,
 		   ne->vendor_name ?: "Unknown");
 

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	2003-02-01 08:36:12.000000000 -0500
@@ -20,8 +20,6 @@
 
 clean-files := oui.c
 
-include $(TOPDIR)/Rules.make
-
 ieee1394.o: $(ieee1394-objs)
 	$(LD) $(LDFLAGS) -r -o $@ $(ieee1394-objs)