Automatic merge of /spare/repo/netdev-2.6 branch master

[linux-2.6] / drivers / scsi / aic7xxx / aiclib.c

diff --git a/drivers/scsi/aic7xxx/aiclib.c b/drivers/scsi/aic7xxx/aiclib.c
index 79bfd9efd8ed924451701fb1e73bdf8fd79eca22..7c5a6db0e6724c5a0aa933575f57bc603090609b 100644 (file)
--- a/drivers/scsi/aic7xxx/aiclib.c
+++ b/drivers/scsi/aic7xxx/aiclib.c
@@ -35,7 +35,6 @@
 #include <linux/version.h>
 
 /* Core SCSI definitions */
-#include "scsi.h"
 #include <scsi/scsi_host.h>
 #include "aiclib.h"
 #include "cam.h"