diff options
Diffstat (limited to 'include/linux/cyclades.h')
| -rw-r--r-- | include/linux/cyclades.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/include/linux/cyclades.h b/include/linux/cyclades.h index 788850ba4e75..9ae03d5b3590 100644 --- a/include/linux/cyclades.h +++ b/include/linux/cyclades.h | |||
| @@ -507,16 +507,19 @@ struct ZFW_CTRL { | |||
| 507 | 507 | ||
| 508 | /* Per card data structure */ | 508 | /* Per card data structure */ |
| 509 | struct cyclades_card { | 509 | struct cyclades_card { |
| 510 | void __iomem *base_addr; | 510 | void __iomem *base_addr; |
| 511 | void __iomem *ctl_addr; | 511 | union { |
| 512 | int irq; | 512 | void __iomem *p9050; |
| 513 | unsigned int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ | 513 | struct RUNTIME_9060 __iomem *p9060; |
| 514 | unsigned int first_line; /* minor number of first channel on card */ | 514 | } ctl_addr; |
| 515 | unsigned int nports; /* Number of ports in the card */ | 515 | int irq; |
| 516 | int bus_index; /* address shift - 0 for ISA, 1 for PCI */ | 516 | unsigned int num_chips; /* 0 if card absent, -1 if Z/PCI, else Y */ |
| 517 | int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ | 517 | unsigned int first_line; /* minor number of first channel on card */ |
| 518 | spinlock_t card_lock; | 518 | unsigned int nports; /* Number of ports in the card */ |
| 519 | struct cyclades_port *ports; | 519 | int bus_index; /* address shift - 0 for ISA, 1 for PCI */ |
| 520 | int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ | ||
| 521 | spinlock_t card_lock; | ||
| 522 | struct cyclades_port *ports; | ||
| 520 | }; | 523 | }; |
| 521 | 524 | ||
| 522 | /*************************************** | 525 | /*************************************** |