diff options
| author | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 10:33:43 -0400 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-18 10:37:41 -0400 |
| commit | 95bb335c0ebe96afe926387a1ef3a096bd884a82 (patch) | |
| tree | 56115332b4f2f7ef300c36248a6a7d20db2e639d /drivers/scsi/gvp11.h | |
| parent | 1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a (diff) | |
| parent | 9cccde93fed1ca988eb2fb17ab9194bf7b5ed1b0 (diff) | |
| download | linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.tar.gz linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.tar.bz2 linux-95bb335c0ebe96afe926387a1ef3a096bd884a82.zip | |
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/gvp11.h')
| -rw-r--r-- | drivers/scsi/gvp11.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/scsi/gvp11.h b/drivers/scsi/gvp11.h index bf22859a5035..e2efdf9601ef 100644 --- a/drivers/scsi/gvp11.h +++ b/drivers/scsi/gvp11.h @@ -15,11 +15,11 @@ int gvp11_detect(struct scsi_host_template *); int gvp11_release(struct Scsi_Host *); #ifndef CMD_PER_LUN -#define CMD_PER_LUN 2 +#define CMD_PER_LUN 2 #endif #ifndef CAN_QUEUE -#define CAN_QUEUE 16 +#define CAN_QUEUE 16 #endif #ifndef HOSTS_C @@ -28,24 +28,24 @@ int gvp11_release(struct Scsi_Host *); * if the transfer address ANDed with this results in a non-zero * result, then we can't use DMA. */ -#define GVP11_XFER_MASK (0xff000001) +#define GVP11_XFER_MASK (0xff000001) typedef struct { - unsigned char pad1[64]; - volatile unsigned short CNTR; - unsigned char pad2[31]; - volatile unsigned char SASR; - unsigned char pad3; - volatile unsigned char SCMD; - unsigned char pad4[4]; - volatile unsigned short BANK; - unsigned char pad5[6]; - volatile unsigned long ACR; - volatile unsigned short secret1; /* store 0 here */ - volatile unsigned short ST_DMA; - volatile unsigned short SP_DMA; - volatile unsigned short secret2; /* store 1 here */ - volatile unsigned short secret3; /* store 15 here */ + unsigned char pad1[64]; + volatile unsigned short CNTR; + unsigned char pad2[31]; + volatile unsigned char SASR; + unsigned char pad3; + volatile unsigned char SCMD; + unsigned char pad4[4]; + volatile unsigned short BANK; + unsigned char pad5[6]; + volatile unsigned long ACR; + volatile unsigned short secret1; /* store 0 here */ + volatile unsigned short ST_DMA; + volatile unsigned short SP_DMA; + volatile unsigned short secret2; /* store 1 here */ + volatile unsigned short secret3; /* store 15 here */ } gvp11_scsiregs; /* bits in CNTR */ |