Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
@@ -48,10 +48,6 @@
|
||||
|
||||
#include <linux/stat.h>
|
||||
|
||||
#ifndef LINUX_VERSION_CODE
|
||||
#include <linux/version.h>
|
||||
#endif
|
||||
|
||||
#include "scsi_logging.h"
|
||||
#include "scsi_debug.h"
|
||||
|
||||
|
Reference in New Issue
Block a user