Merge branch 'linus' into x86/memory-corruption-check

[linux-2.6-omap-h63xx.git] / drivers / scsi / aacraid / rx.c

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 1f18b83e1e02b90cb64850e2d0181bcaea57f4f2..073208b0f622cf6148d86418f384bbf5fa8f3f5c 100644 (file)
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -39,7 +39,6 @@
 #include <linux/completion.h>
 #include <linux/time.h>
 #include <linux/interrupt.h>
-#include <asm/semaphore.h>
 
 #include <scsi/scsi_host.h>