Merge with Linux 2.4.3.

Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps.  This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/ieee1394/guid.c b/drivers/ieee1394/guid.c
index b7e1d2a27..02539351e 100644
--- a/drivers/ieee1394/guid.c
+++ b/drivers/ieee1394/guid.c
@@ -219,11 +219,19 @@ static struct hpsb_highlevel_ops guid_ops = {
         host_reset:  host_reset,
 };
 
+static struct hpsb_highlevel *hl;
+
 void init_ieee1394_guid(void)
 {
         atomic_set(&outstanding_requests, 0);
 
-        if (!hpsb_register_highlevel("GUID manager", &guid_ops)) {
+        hl = hpsb_register_highlevel("GUID manager", &guid_ops);
+        if (!hl) {
                 HPSB_ERR("out of memory during ieee1394 initialization");
         }
 }
+
+void cleanup_ieee1394_guid(void)
+{
+        hpsb_unregister_highlevel(hl);
+}