Merge by hand (whitespace conflicts in libata.h)

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

diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 0a0d8a908c7458e10d7896a41590956892dab81c..bf2ceb54354c50d3dabbb4f1730cbb39f36d19e2 100644 (file)
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -15,7 +15,6 @@
 #include <linux/types.h>
 #include <linux/mm.h>
 #include <linux/blkdev.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>