diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
-rw-r--r-- | drivers/net/netxen/netxen_nic.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h index db5c8d27d5d8..eef9e66becbd 100644 --- a/drivers/net/netxen/netxen_nic.h +++ b/drivers/net/netxen/netxen_nic.h | |||
@@ -543,13 +543,13 @@ struct netxen_hardware_context { | |||
543 | void __iomem *pci_base1; | 543 | void __iomem *pci_base1; |
544 | void __iomem *pci_base2; | 544 | void __iomem *pci_base2; |
545 | void __iomem *db_base; | 545 | void __iomem *db_base; |
546 | void __iomem *ocm_win_crb; | ||
547 | |||
546 | unsigned long db_len; | 548 | unsigned long db_len; |
547 | unsigned long pci_len0; | 549 | unsigned long pci_len0; |
548 | 550 | ||
549 | int qdr_sn_window; | 551 | u32 ocm_win; |
550 | int ddr_mn_window; | 552 | u32 resv1; |
551 | u32 mn_win_crb; | ||
552 | u32 ms_win_crb; | ||
553 | 553 | ||
554 | u8 cut_through; | 554 | u8 cut_through; |
555 | u8 revision_id; | 555 | u8 revision_id; |
@@ -1183,8 +1183,7 @@ struct netxen_adapter { | |||
1183 | int (*pci_mem_read)(struct netxen_adapter *, u64, u64 *); | 1183 | int (*pci_mem_read)(struct netxen_adapter *, u64, u64 *); |
1184 | int (*pci_mem_write)(struct netxen_adapter *, u64, u64); | 1184 | int (*pci_mem_write)(struct netxen_adapter *, u64, u64); |
1185 | 1185 | ||
1186 | unsigned long (*pci_set_window)(struct netxen_adapter *, | 1186 | int (*pci_set_window)(struct netxen_adapter *, u64, u32 *); |
1187 | unsigned long long); | ||
1188 | 1187 | ||
1189 | u32 (*io_read)(struct netxen_adapter *, void __iomem *); | 1188 | u32 (*io_read)(struct netxen_adapter *, void __iomem *); |
1190 | void (*io_write)(struct netxen_adapter *, void __iomem *, u32); | 1189 | void (*io_write)(struct netxen_adapter *, void __iomem *, u32); |