Merge by hand (whitespace conflicts in libata.h)

[safe/jmp/linux-2.6] / drivers / scsi / mvme147.c

diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index c44382d..cb367c2 100644 (file)
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -2,7 +2,6 @@
 #include <linux/mm.h>
 #include <linux/blkdev.h>
 #include <linux/sched.h>
-#include <linux/version.h>
 #include <linux/interrupt.h>
 
 #include <asm/page.h>