git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[pandora-kernel.git]
/
drivers
/
scsi
/
a3000.h
diff --git
a/drivers/scsi/a3000.h
b/drivers/scsi/a3000.h
index
684813e
..
49db4a3
100644
(file)
--- a/
drivers/scsi/a3000.h
+++ b/
drivers/scsi/a3000.h
@@
-25,7
+25,7
@@
*/
#define A3000_XFER_MASK (0x00000003)
*/
#define A3000_XFER_MASK (0x00000003)
-
typedef struct
{
+
struct a3000_scsiregs
{
unsigned char pad1[2];
volatile unsigned short DAWR;
volatile unsigned int WTC;
unsigned char pad1[2];
volatile unsigned short DAWR;
volatile unsigned int WTC;
@@
-46,7
+46,7
@@
typedef struct {
volatile unsigned char SASR;
unsigned char pad9;
volatile unsigned char SCMD;
volatile unsigned char SASR;
unsigned char pad9;
volatile unsigned char SCMD;
-}
a3000_scsiregs
;
+};
#define DAWR_A3000 (3)
#define DAWR_A3000 (3)