diff --git a/[refs] b/[refs] index be509306cee6..9f38ff8560d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cbe19d48af198f0070470a2d836828de24fe163 +refs/heads/master: 1e0dbafd30b2e1cd17fd141f4cfd633078524e8c diff --git a/trunk/drivers/scsi/advansys.c b/trunk/drivers/scsi/advansys.c index 83695416b2c9..587eac920790 100644 --- a/trunk/drivers/scsi/advansys.c +++ b/trunk/drivers/scsi/advansys.c @@ -3881,7 +3881,7 @@ typedef struct asc_board { /* * The following fields are used only for Wide Boards. */ - void *ioremap_addr; /* I/O Memory remap address. */ + void __iomem *ioremap_addr; /* I/O Memory remap address. */ ushort ioport; /* I/O Port address. */ ADV_CARR_T *orig_carrp; /* ADV_CARR_T memory block. */ adv_req_t *orig_reqp; /* adv_req_t memory block. */