]>
Commit | Line | Data |
---|---|---|
2afe067c MM |
1 | diff -ur linux/drivers/ieee1394/ohci1394.h linux-/drivers/ieee1394/ohci1394.h |
2 | --- linux/drivers/ieee1394/ohci1394.h Wed Jan 24 14:03:08 2001 | |
3 | +++ linux-/drivers/ieee1394/ohci1394.h Wed Jan 24 13:52:25 2001 | |
4 | @@ -276,6 +276,8 @@ | |
5 | return readl(ohci->registers + offset); | |
6 | } | |
7 | ||
8 | +/* I guess it should be in ohci*.c ... */ | |
9 | +#ifndef OTHER_FILE | |
10 | /* This structure is not properly initialized ... it is taken from | |
11 | the lynx_csr_rom written by Andreas ... Some fields in the root | |
12 | directory and the module dependent info needs to be modified | |
13 | @@ -348,7 +350,7 @@ | |
14 | 0x314c5630, | |
15 | 0x33000000 | |
16 | }; | |
17 | - | |
18 | +#endif | |
19 | ||
20 | /* 2 KiloBytes of register space */ | |
21 | #define OHCI1394_REGISTER_SIZE 0x800 | |
8de50504 SZ |
22 | diff -Naur linux/pcmcia-cs-3.1.25-p/clients/ohci1394_stub.c linux/pcmcia-cs-3.1.25/clients/ohci1394_stub.c |
23 | --- linux/pcmcia-cs-3.1.25-p/clients/ohci1394_stub.c Sat Feb 3 03:29:14 2001 | |
24 | +++ linux/pcmcia-cs-3.1.25/clients/ohci1394_stub.c Tue Mar 20 16:03:58 2001 | |
2afe067c MM |
25 | @@ -56,6 +56,7 @@ |
26 | #include <../drivers/ieee1394/ieee1394_types.h> | |
27 | #include <../drivers/ieee1394/hosts.h> | |
28 | #include <../drivers/ieee1394/ieee1394_core.h> | |
29 | +#define OTHER_FILE | |
8de50504 | 30 | #define ohci_csr_rom _ohci_csr_rom |
2afe067c MM |
31 | #include <../drivers/ieee1394/ohci1394.h> |
32 |