Merge by Hand

[linux-2.6-omap-h63xx.git] / include / scsi / scsi_transport_fc.h

diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
index 319ff7a60dfe91fbdc8f95b0351d1193e392433e..fac547d32a98f112123ec4c2e35c59e2e1a586c4 100644 (file)
--- a/include/scsi/scsi_transport_fc.h
+++ b/include/scsi/scsi_transport_fc.h
@@ -28,6 +28,7 @@
 #define SCSI_TRANSPORT_FC_H
 
 #include <linux/config.h>
+#include <linux/sched.h>
 #include <scsi/scsi.h>
 
 struct scsi_transport_template;