Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[karo-tx-linux.git] / include / scsi / scsi_cmnd.h

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index e6b61fab66ddf69a66adc5f81f6647fe2ad11da9..7529f4388bb46df6655e61364217c78e2199ea18 100644 (file)
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -4,6 +4,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
 #include <linux/types.h>
+#include <linux/timer.h>
 
 struct request;
 struct scatterlist;