Merge by hand (whitespace conflicts in libata.h)

[karo-tx-linux.git] / drivers / scsi / pci2000.h

diff --git a/drivers/scsi/pci2000.h b/drivers/scsi/pci2000.h
index f945a4232e5dab390b097f7c38877f0a8fdfca7c..0ebd8ce9e1dec408dca4e8dfb5cca66bed15acd4 100644 (file)
--- a/drivers/scsi/pci2000.h
+++ b/drivers/scsi/pci2000.h
@@ -26,9 +26,6 @@
 #ifndef        PSI_EIDE_SCSIOP
 #define        PSI_EIDE_SCSIOP 1
 
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif 
 #define        LINUXVERSION(v,p,s)    (((v)<<16) + ((p)<<8) + (s))
 
 /************************************************/