[PATCH] Fix nodemgr.c compile (was Re: 2.5.67-mm2: ieee1394/nodemgr.c doesn't compile)

Ben Collins (bcollins@debian.org)
Sun, 13 Apr 2003 15:23:54 -0400


> The following compile error #ifdef CONFIG_IEEE1394_VERBOSEDEBUG seems to
> come from Linus' tree:

Thanks, here's a patch.

Index: nodemgr.c
===================================================================
--- linux/drivers/ieee1394/nodemgr.c (revision 862)
+++ linux/drivers/ieee1394/nodemgr.c (working copy)
@@ -1010,34 +1010,7 @@
kfree(ud);
}

-static void dump_directories (struct node_entry *ne)
-{
-#ifdef CONFIG_IEEE1394_VERBOSEDEBUG
- struct list_head *l;

- HPSB_DEBUG("vendor_id=0x%06x [%s], capabilities=0x%06x",
- ne->vendor_id, ne->vendor_name ?: "Unknown",
- ne->capabilities);
- list_for_each (l, &ne->unit_directories) {
- struct unit_directory *ud = list_entry (l, struct unit_directory, node_list);
- HPSB_DEBUG("unit directory:");
- if (ud->flags & UNIT_DIRECTORY_VENDOR_ID)
- HPSB_DEBUG(" vendor_id=0x%06x [%s]",
- ud->vendor_id,
- ud->vendor_name ?: "Unknown");
- if (ud->flags & UNIT_DIRECTORY_MODEL_ID)
- HPSB_DEBUG(" model_id=0x%06x [%s]",
- ud->model_id,
- ud->model_name ?: "Unknown");
- if (ud->flags & UNIT_DIRECTORY_SPECIFIER_ID)
- HPSB_DEBUG(" sw_specifier_id=0x%06x ", ud->specifier_id);
- if (ud->flags & UNIT_DIRECTORY_VERSION)
- HPSB_DEBUG(" sw_version=0x%06x ", ud->version);
- }
-#endif
- return;
-}
-
static void nodemgr_process_root_directory(struct host_info *hi, struct node_entry *ne)
{
octlet_t address;
@@ -1104,8 +1077,6 @@
break;
}
}
-
- dump_directories(ne);
}

#ifdef CONFIG_HOTPLUG
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/