Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[pandora-kernel.git] / drivers / scsi / a3000.h

diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h
index c7afe16..49db4a3 100644 (file)
--- a/drivers/scsi/a3000.h
+++ b/drivers/scsi/a3000.h
@@ -12,41 +12,41 @@
 #include <linux/types.h>
 
 #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
 
 /*
  * if the transfer address ANDed with this results in a non-zero
  * result, then we can't use DMA.
  */
-#define A3000_XFER_MASK  (0x00000003)
+#define A3000_XFER_MASK                (0x00000003)
 
-typedef struct {
-             unsigned char      pad1[2];
-    volatile unsigned short     DAWR;
-    volatile unsigned int       WTC;
-             unsigned char      pad2[2];
-    volatile unsigned short     CNTR;
-    volatile unsigned long      ACR;
-             unsigned char      pad3[2];
-    volatile unsigned short     ST_DMA;
-             unsigned char      pad4[2];
-    volatile unsigned short     FLUSH;
-             unsigned char      pad5[2];
-    volatile unsigned short     CINT;
-             unsigned char      pad6[2];
-    volatile unsigned short     ISTR;
-            unsigned char      pad7[30];
-    volatile unsigned short     SP_DMA;
-             unsigned char      pad8;
-    volatile unsigned char      SASR;
-             unsigned char      pad9;
-    volatile unsigned char      SCMD;
-} a3000_scsiregs;
+struct a3000_scsiregs {
+                unsigned char  pad1[2];
+       volatile unsigned short DAWR;
+       volatile unsigned int   WTC;
+                unsigned char  pad2[2];
+       volatile unsigned short CNTR;
+       volatile unsigned long  ACR;
+                unsigned char  pad3[2];
+       volatile unsigned short ST_DMA;
+                unsigned char  pad4[2];
+       volatile unsigned short FLUSH;
+                unsigned char  pad5[2];
+       volatile unsigned short CINT;
+                unsigned char  pad6[2];
+       volatile unsigned short ISTR;
+                unsigned char  pad7[30];
+       volatile unsigned short SP_DMA;
+                unsigned char  pad8;
+       volatile unsigned char  SASR;
+                unsigned char  pad9;
+       volatile unsigned char  SCMD;
+};
 
 #define DAWR_A3000             (3)