diff -ur linux/drivers/ieee1394/ohci1394.h linux-/drivers/ieee1394/ohci1394.h
--- linux/drivers/ieee1394/ohci1394.h	Wed Jan 24 14:03:08 2001
+++ linux-/drivers/ieee1394/ohci1394.h	Wed Jan 24 13:52:25 2001
@@ -276,6 +276,8 @@
         return readl(ohci->registers + offset);
 }
 
+/* I guess it should be in ohci*.c ... */
+#ifndef OTHER_FILE
 /* This structure is not properly initialized ... it is taken from
    the lynx_csr_rom written by Andreas ... Some fields in the root
    directory and the module dependent info needs to be modified
@@ -348,7 +350,7 @@
         0x314c5630,
         0x33000000
 };
-
+#endif
 
 /* 2 KiloBytes of register space */
 #define OHCI1394_REGISTER_SIZE                0x800       
diff -Naur linux/pcmcia-cs-3.1.25-p/clients/ohci1394_stub.c linux/pcmcia-cs-3.1.25/clients/ohci1394_stub.c
--- linux/pcmcia-cs-3.1.25-p/clients/ohci1394_stub.c	Sat Feb  3 03:29:14 2001
+++ linux/pcmcia-cs-3.1.25/clients/ohci1394_stub.c	Tue Mar 20 16:03:58 2001
@@ -56,6 +56,7 @@
 #include <../drivers/ieee1394/ieee1394_types.h>
 #include <../drivers/ieee1394/hosts.h>
 #include <../drivers/ieee1394/ieee1394_core.h>
+#define OTHER_FILE
 #define ohci_csr_rom _ohci_csr_rom
 #include <../drivers/ieee1394/ohci1394.h>