diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 05:50:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-03-08 05:50:28 -0500 |
| commit | 9edf0fffb657b48ccf1c36d0a5dea61c4189f048 (patch) | |
| tree | 202b5e62b7e930eadeca2ee58dc6937ca7328de3 /include/linux | |
| parent | cf4a4652b7052246a1aca9b4d2ca069dff6f9aa4 (diff) | |
| parent | 5e03b79d8a06f35794d7c86475e9af50ac97a84d (diff) | |
Merge pobox.com:/garz/repo/netdev-2.6/ibmtr
into pobox.com:/garz/repo/net-drivers-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ibmtr.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/linux/ibmtr.h b/include/linux/ibmtr.h index dd8cbdc9f1a8..2ef0b21517fb 100644 --- a/include/linux/ibmtr.h +++ b/include/linux/ibmtr.h @@ -169,7 +169,7 @@ typedef enum { CLOSED, OPEN } open_state; struct tok_info { unsigned char irq; - void *mmio; + void __iomem *mmio; unsigned char hw_address[32]; unsigned char adapter_type; unsigned char data_rate; @@ -192,12 +192,13 @@ struct tok_info { /* Additions by Peter De Schrijver */ unsigned char page_mask; /* mask to select RAM page to Map*/ unsigned char mapped_ram_size; /* size of RAM page */ - __u32 sram_virt; /* Shared memory base address */ - __u32 init_srb; /* Initial System Request Block address */ - __u32 srb; /* System Request Block address */ - __u32 ssb; /* System Status Block address */ - __u32 arb; /* Adapter Request Block address */ - __u32 asb; /* Adapter Status Block address */ + __u32 sram_phys; /* Shared memory base address */ + void __iomem *sram_virt; /* Shared memory base address */ + void __iomem *init_srb; /* Initial System Request Block address */ + void __iomem *srb; /* System Request Block address */ + void __iomem *ssb; /* System Status Block address */ + void __iomem *arb; /* Adapter Request Block address */ + void __iomem *asb; /* Adapter Status Block address */ __u8 init_srb_page; __u8 srb_page; __u8 ssb_page; |