Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / scsi / scsi.h

diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h
index e2360c2..d5a55fa 100644 (file)
--- a/drivers/scsi/scsi.h
+++ b/drivers/scsi/scsi.h
@@ -20,12 +20,9 @@
 #ifndef _SCSI_H
 #define _SCSI_H
 
-#include <linux/config.h>          /* for CONFIG_SCSI_LOGGING */
-
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_eh.h>
-#include <scsi/scsi_request.h>
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsi.h>
 
@@ -45,21 +42,6 @@ struct scsi_device;
 struct scsi_target;
 struct scatterlist;
 
-/*
- * Legacy dma direction interfaces.
- *
- * This assumes the pci/sbus dma mapping flags have the same numercial
- * values as the generic dma-mapping ones.  Currently they have but there's
- * no way to check.  Better don't use these interfaces!
- */
-#define SCSI_DATA_UNKNOWN      (DMA_BIDIRECTIONAL)
-#define SCSI_DATA_WRITE                (DMA_TO_DEVICE)
-#define SCSI_DATA_READ         (DMA_FROM_DEVICE)
-#define SCSI_DATA_NONE         (DMA_NONE)
-
-#define scsi_to_pci_dma_dir(scsi_dir)  ((int)(scsi_dir))
-#define scsi_to_sbus_dma_dir(scsi_dir) ((int)(scsi_dir))
-
 /* obsolete typedef junk. */
 #include "scsi_typedefs.h"