diff options
| author | Salyzyn, Mark <mark_salyzyn@adaptec.com> | 2007-07-26 20:20:02 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-27 15:13:28 +0200 |
| commit | c835e3727b87115f98c612a5ecb8882826d2537e (patch) | |
| tree | e371abba43e2cad31b6fc1b96e22444381e9ffa5 /drivers/scsi/aacraid/aacraid.h | |
| parent | [SCSI] iscsi_tcp: Turn off bounce buffers (diff) | |
| download | linux-c835e3727b87115f98c612a5ecb8882826d2537e.tar.xz linux-c835e3727b87115f98c612a5ecb8882826d2537e.zip | |
[SCSI] aacraid: draw line in sand, sundry cleanup and version update
Minor unimportant cuttings from the floor bundled in with a version
stamp update. Only controversial change is the dropping of Alan Cox
copyright on the nark.c module since that file has no code written by
him in it.
Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
| -rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index 400d03403cd5..94727b9375ec 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h @@ -12,7 +12,7 @@ *----------------------------------------------------------------------------*/ #ifndef AAC_DRIVER_BUILD -# define AAC_DRIVER_BUILD 2447 +# define AAC_DRIVER_BUILD 2449 # define AAC_DRIVER_BRANCH "-ms" #endif #define MAXIMUM_NUM_CONTAINERS 32 @@ -1807,10 +1807,10 @@ struct aac_aifcmd { * accounting for the fact capacity could be a 64 bit value * */ -static inline u32 cap_to_cyls(sector_t capacity, u32 divisor) +static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor) { sector_div(capacity, divisor); - return (u32)capacity; + return capacity; } /* SCp.phase values */ |