Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[pandora-kernel.git] / drivers / ieee1394 / sbp2.h

diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 38ca119..44402b9 100644 (file)
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -250,20 +250,20 @@ enum sbp2_dma_types {
 /* Per SCSI command */
 struct sbp2_command_info {
        struct list_head list;
-       struct sbp2_command_orb command_orb ____cacheline_aligned;
-       dma_addr_t command_orb_dma ____cacheline_aligned;
+       struct sbp2_command_orb command_orb;
+       dma_addr_t command_orb_dma;
        struct scsi_cmnd *Current_SCpnt;
        void (*Current_done)(struct scsi_cmnd *);
 
        /* Also need s/g structure for each sbp2 command */
        struct sbp2_unrestricted_page_table
-                       scatter_gather_element[SG_ALL] ____cacheline_aligned;
-       dma_addr_t sge_dma ____cacheline_aligned;
+               scatter_gather_element[SG_ALL] __attribute__((aligned(8)));
+       dma_addr_t sge_dma;
        void *sge_buffer;
        dma_addr_t cmd_dma;
        enum sbp2_dma_types dma_type;
        unsigned long dma_size;
-       int dma_dir;
+       enum dma_data_direction dma_dir;
 };
 
 /* Per FireWire host */
@@ -302,7 +302,7 @@ struct sbp2_lu {
        u64 status_fifo_addr;
 
        /* Waitqueue flag for logins, reconnects, logouts, query logins */
-       int access_complete:1;
+       unsigned int access_complete:1;
 
        /* Pool of command ORBs for this logical unit */
        spinlock_t cmd_orb_lock;