Merge commit 'linus/master' into x86/urgent

[linux-2.6-block.git] / include / scsi / osd_protocol.h

diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h
index 2cc8e8b1cc19da61757676325ab3ae9cd9050e2d..685661283540f64beb081b291dc6689c0a255fc0 100644 (file)
--- a/include/scsi/osd_protocol.h
+++ b/include/scsi/osd_protocol.h
@@ -17,6 +17,7 @@
 #define __OSD_PROTOCOL_H__
 
 #include <linux/types.h>
+#include <linux/kernel.h>
 #include <asm/unaligned.h>
 #include <scsi/scsi.h>