Merge branch 'from-linus' into upstream

[linux-2.6] / drivers / scsi / atari_dma_emul.c

diff --git a/drivers/scsi/atari_dma_emul.c b/drivers/scsi/atari_dma_emul.c
index 7026045527fd41a01309b9bf60489a3e2830553d..8d5d2a5da961e195dc2882e6523c8ed670f363e6 100644 (file)
--- a/drivers/scsi/atari_dma_emul.c
+++ b/drivers/scsi/atari_dma_emul.c
@@ -19,6 +19,8 @@
  * this code.
  */
 
+#include <linux/compiler.h>
+#include <asm/thread_info.h>
 #include <asm/uaccess.h>
 
 #define hades_dma_ctrl         (*(unsigned char *) 0xffff8717)