Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6

[powerpc.git] / drivers / ieee1394 / sbp2.h

diff --git a/drivers/ieee1394/sbp2.h b/drivers/ieee1394/sbp2.h
index 38ca119..9ae8423 100644 (file)
--- a/drivers/ieee1394/sbp2.h
+++ b/drivers/ieee1394/sbp2.h
@@ -263,7 +263,7 @@ struct sbp2_command_info {
        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;