diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 23:48:34 +0000 |
| commit | 7fd36ebeeec9244a7431bb010e6e3c5e4848a0d5 (patch) | |
| tree | 5fb03a9aafdd1cec5f4f6ff7f1873174cb89b66c /include/linux/cyclades.h | |
| parent | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (diff) | |
Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)
Diffstat (limited to 'include/linux/cyclades.h')
| -rw-r--r-- | include/linux/cyclades.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 9aff2f0af..7452d838d 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h @@ -7,6 +7,10 @@ * * This file contains the general definitions for the cyclades.c driver *$Log: cyclades.h,v $ + *Revision 3.1 2000/04/19 18:52:52 ivan + *converted address fields to unsigned long and added fields for physical + *addresses on cyclades_card structure; + * *Revision 3.0 1998/11/02 14:20:59 ivan *added nports field on cyclades_card structure; * @@ -500,8 +504,10 @@ struct ZFW_CTRL { /* Per card data structure */ struct cyclades_card { - long base_addr; - long ctl_addr; + unsigned long base_phys; + unsigned long ctl_phys; + unsigned long base_addr; + unsigned long ctl_addr; int irq; int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ int first_line; /* minor number of first channel on card */ |