diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /drivers/char/rio/host.h | |
| parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
| parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'drivers/char/rio/host.h')
| -rw-r--r-- | drivers/char/rio/host.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h index 179cdbea712b..ee2ddea7a63a 100644 --- a/drivers/char/rio/host.h +++ b/drivers/char/rio/host.h | |||
| @@ -48,8 +48,8 @@ struct Host { | |||
| 48 | unsigned char Ivec; /* POLLED or ivec number */ | 48 | unsigned char Ivec; /* POLLED or ivec number */ |
| 49 | unsigned char Mode; /* Control stuff */ | 49 | unsigned char Mode; /* Control stuff */ |
| 50 | unsigned char Slot; /* Slot */ | 50 | unsigned char Slot; /* Slot */ |
| 51 | caddr_t Caddr; /* KV address of DPRAM */ | 51 | void __iomem *Caddr; /* KV address of DPRAM */ |
| 52 | struct DpRam *CardP; /* KV address of DPRAM, with overlay */ | 52 | struct DpRam __iomem *CardP; /* KV address of DPRAM, with overlay */ |
| 53 | unsigned long PaddrP; /* Phys. address of DPRAM */ | 53 | unsigned long PaddrP; /* Phys. address of DPRAM */ |
| 54 | char Name[MAX_NAME_LEN]; /* The name of the host */ | 54 | char Name[MAX_NAME_LEN]; /* The name of the host */ |
| 55 | unsigned int UniqueNum; /* host unique number */ | 55 | unsigned int UniqueNum; /* host unique number */ |
| @@ -57,7 +57,7 @@ struct Host { | |||
| 57 | unsigned int WorkToBeDone; /* set to true each interrupt */ | 57 | unsigned int WorkToBeDone; /* set to true each interrupt */ |
| 58 | unsigned int InIntr; /* Being serviced? */ | 58 | unsigned int InIntr; /* Being serviced? */ |
| 59 | unsigned int IntSrvDone; /* host's interrupt has been serviced */ | 59 | unsigned int IntSrvDone; /* host's interrupt has been serviced */ |
| 60 | void (*Copy) (void *, void *, int); /* copy func */ | 60 | void (*Copy) (void *, void __iomem *, int); /* copy func */ |
| 61 | struct timer_list timer; | 61 | struct timer_list timer; |
| 62 | /* | 62 | /* |
| 63 | ** I M P O R T A N T ! | 63 | ** I M P O R T A N T ! |
| @@ -83,11 +83,11 @@ struct Host { | |||
| 83 | 83 | ||
| 84 | struct Top Topology[LINKS_PER_UNIT]; /* one per link */ | 84 | struct Top Topology[LINKS_PER_UNIT]; /* one per link */ |
| 85 | struct Map Mapping[MAX_RUP]; /* Mappings for host */ | 85 | struct Map Mapping[MAX_RUP]; /* Mappings for host */ |
| 86 | struct PHB *PhbP; /* Pointer to the PHB array */ | 86 | struct PHB __iomem *PhbP; /* Pointer to the PHB array */ |
| 87 | unsigned short *PhbNumP; /* Ptr to Number of PHB's */ | 87 | unsigned short __iomem *PhbNumP; /* Ptr to Number of PHB's */ |
| 88 | struct LPB *LinkStrP; /* Link Structure Array */ | 88 | struct LPB __iomem *LinkStrP; /* Link Structure Array */ |
| 89 | struct RUP *RupP; /* Sixteen real rups here */ | 89 | struct RUP __iomem *RupP; /* Sixteen real rups here */ |
| 90 | struct PARM_MAP *ParmMapP; /* points to the parmmap */ | 90 | struct PARM_MAP __iomem *ParmMapP; /* points to the parmmap */ |
| 91 | unsigned int ExtraUnits[MAX_EXTRA_UNITS]; /* unknown things */ | 91 | unsigned int ExtraUnits[MAX_EXTRA_UNITS]; /* unknown things */ |
| 92 | unsigned int NumExtraBooted; /* how many of the above */ | 92 | unsigned int NumExtraBooted; /* how many of the above */ |
| 93 | /* | 93 | /* |