Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"

[oweals/u-boot.git] / include / scsi.h

diff --git a/include/scsi.h b/include/scsi.h
index 190dacd0f2ec1688885fbe824a5f84efdc4322fd..c8796785a465e82b55a1d2864722d2c14ee55f89 100644 (file)
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -166,11 +166,8 @@ typedef struct SCSI_cmd_block{
 void scsi_print_error(ccb *pccb);
 int scsi_exec(ccb *pccb);
 void scsi_bus_reset(void);
-#if !defined(CONFIG_DM_SCSI)
 void scsi_low_level_init(int busdevfunc);
-#else
-void scsi_low_level_init(int busdevfunc, struct udevice *dev);
-#endif
+
 
 /***************************************************************************
  * functions residing inside cmd_scsi.c
@@ -178,21 +175,6 @@ void scsi_low_level_init(int busdevfunc, struct udevice *dev);
 void scsi_init(void);
 int scsi_scan(int mode);
 
-#if defined(CONFIG_DM_SCSI)
-/**
- * struct scsi_platdata - stores information about SCSI controller
- *
- * @base: Controller base address
- * @max_lun: Maximum number of logical units
- * @max_id: Maximum number of target ids
- */
-struct scsi_platdata {
-       unsigned long base;
-       unsigned long max_lun;
-       unsigned long max_id;
-};
-#endif
-
 #define SCSI_IDENTIFY                                  0xC0  /* not used */
 
 /* Hardware errors  */