Merge commit 'origin/master'

[oweals/u-boot.git] / drivers / sym53c8xx.c

diff --git a/drivers/sym53c8xx.c b/drivers/sym53c8xx.c
index e03a04924d433eab456362ef9fbafd75f4e5413a..29eeccd9a8f79c6934fb94aadc627d1c38debeb2 100644 (file)
--- a/drivers/sym53c8xx.c
+++ b/drivers/sym53c8xx.c
@@ -38,7 +38,6 @@
 #ifdef CONFIG_SCSI_SYM53C8XX
 
 #include <command.h>
-#include <cmd_boot.h>
 #include <pci.h>
 #include <asm/processor.h>
 #include <sym53c8xx.h>
@@ -52,7 +51,7 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI) && defined(CONFIG_SCSI_SYM53C8XX)
+#if defined(CONFIG_CMD_SCSI) && defined(CONFIG_SCSI_SYM53C8XX)
 
 #undef SCSI_SINGLE_STEP
 /*
@@ -182,7 +181,6 @@ void scsi_print_error(ccb *pccb)
 }
 
 
-
 /******************************************************************************
  * sets-up the SCSI controller
  * the base memory address is retrived via the pci_read_config_dword
@@ -404,7 +402,6 @@ void scsi_print_script(void)
 }
 
 
-
 void scsi_set_script(ccb *pccb)
 {
        int busdevfunc = pccb->priv;
@@ -587,7 +584,6 @@ void scsi_set_script(ccb *pccb)
 }
 
 
-
 void scsi_issue(ccb *pccb)
 {
        int busdevfunc = pccb->priv;
@@ -750,8 +746,6 @@ retry:
 }
 
 
-
-
 void scsi_chip_init(void)
 {
        /* first we issue a soft reset */
@@ -793,7 +787,7 @@ void scsi_chip_init(void)
        scsi_write_byte(DMODE,0x00);
 #endif
 }
-#endif /* (CONFIG_COMMANDS & CFG_CMD_SCSI) */
+#endif
 
 
 #endif /* CONFIG_SCSI_SYM53C8XX */