diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-30 23:59:19 -0400 |
| commit | 8fa76f7e61ef4e5bc97207143ea4e198b22487bc (patch) | |
| tree | 266c42b6687e68e4febb72d8c031e5facd899a1c /drivers/scsi/a2091.h | |
| parent | a41a7b91772da2c77ac0da74285fd8ebd86a85ba (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/a2091.h')
| -rw-r--r-- | drivers/scsi/a2091.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/a2091.h b/drivers/scsi/a2091.h index 1c3daa1fd754..794b8e65c711 100644 --- a/drivers/scsi/a2091.h +++ b/drivers/scsi/a2091.h | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | #define A2091_XFER_MASK (0xff000001) | 26 | #define A2091_XFER_MASK (0xff000001) |
| 27 | 27 | ||
| 28 | typedef struct { | 28 | struct a2091_scsiregs { |
| 29 | unsigned char pad1[64]; | 29 | unsigned char pad1[64]; |
| 30 | volatile unsigned short ISTR; | 30 | volatile unsigned short ISTR; |
| 31 | volatile unsigned short CNTR; | 31 | volatile unsigned short CNTR; |
| @@ -44,7 +44,7 @@ typedef struct { | |||
| 44 | volatile unsigned short CINT; | 44 | volatile unsigned short CINT; |
| 45 | unsigned char pad7[2]; | 45 | unsigned char pad7[2]; |
| 46 | volatile unsigned short FLUSH; | 46 | volatile unsigned short FLUSH; |
| 47 | } a2091_scsiregs; | 47 | }; |
| 48 | 48 | ||
| 49 | #define DAWR_A2091 (3) | 49 | #define DAWR_A2091 (3) |
| 50 | 50 | ||