patch for 2.6.22 - sent by Roberto

diff --git a/README b/README
new file mode 100644 (file)
index 0000000..a436ab5
--- /dev/null
+++ b/README
@@ -0,0 +1,5 @@
+NOTICE THAT THIS VERSION OF THE NOZOMI DRIVER
+HAS BEEN PATCHED TO BE COMPILED FOR KERNEL VERSION >= 2.6.22
+
+ACCORDING TO INFO PROVIDED AT:
+http://www.pharscape.org/component/option,com_forum/Itemid,68/page,viewtopic/p,1007/#1007

diff --git a/nozomi.c b/nozomi.c
index af41bb9..1f67781 100644 (file)
--- a/nozomi.c
+++ b/nozomi.c
@@ -1733,7 +1733,8 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev,
                BUG_ON(!dc->tty_flip_wq);
                return -ENOMEM;
        }
-       INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc);
+//     INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function, dc);
+        INIT_WORK(&dc->tty_flip_wq_struct, tty_flip_queue_function);
 #endif
        spin_lock_init(&dc->spin_mutex);
        make_proc_dirs();
@@ -2393,7 +2394,8 @@ static __init int nozomi_init(void)
 {
        int rval = 0;
 
-       rval = pci_module_init(&nozomi_driver);
+//     rval = pci_module_init(&nozomi_driver);
+        rval = pci_register_driver(&nozomi_driver);
        printk(KERN_INFO "Initializing %s\n", VERSION_STRING);
        return rval;
 }

diff --git a/readme b/readme
index 10998c0..a436ab5 100755 (executable)
--- a/readme
+++ b/readme
@@ -1,26 +1,5 @@
-To build this driver for your kernel, please check:
+NOTICE THAT THIS VERSION OF THE NOZOMI DRIVER
+HAS BEEN PATCHED TO BE COMPILED FOR KERNEL VERSION >= 2.6.22
 
-For kernel 2.6
----------------
-Check the Makefile and run 'make'.
-
-'make install' will copy the nozomi.ko module to the 
-/lib/modules/KERNEL_VERSION/kernel/drivers/pci/hotplug
-directory and runs 'insmod'
-
-For kernel 2.4
-----------
-make HW=PC_24
-
-
-
-Device Nodes
--------------
-If this is the first time, you will need to run the following commands:
-mknod /dev/noz0 c 241 0; mknod /dev/noz1 c 241 1; 
-mknod /dev/noz2 c 241 2; mknod /dev/noz3 c 241 3
-
-If you have troubles:
----------------------
-1) Have proper kernel headers/source as your running kernel.
-2) Make sure this variable in Makefile is correct KERNELDIR    = -I/path/to/kernel
+ACCORDING TO INFO PROVIDED AT:
+http://www.pharscape.org/component/option,com_forum/Itemid,68/page,viewtopic/p,1007/#1007