projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
drivers
/
block
/
sym53c8xx.c
diff --git
a/drivers/block/sym53c8xx.c
b/drivers/block/sym53c8xx.c
index
87b63b7
..
44e998b
100644
(file)
--- a/
drivers/block/sym53c8xx.c
+++ b/
drivers/block/sym53c8xx.c
@@
-35,8
+35,6
@@
#include <common.h>
#include <common.h>
-#ifdef CONFIG_SCSI_SYM53C8XX
-
#include <command.h>
#include <pci.h>
#include <asm/processor.h>
#include <command.h>
#include <pci.h>
#include <asm/processor.h>
@@
-784,7
+782,7
@@
retry:
pccb->msgout[0]=SCSI_IDENTIFY;
transbytes=pccb->trans_bytes;
tmpptr=pccb->pdata;
pccb->msgout[0]=SCSI_IDENTIFY;
transbytes=pccb->trans_bytes;
tmpptr=pccb->pdata;
- pccb->pdata
=
&pccb->sense_buf[0];
+ pccb->pdata
=
&pccb->sense_buf[0];
datalen=pccb->datalen;
pccb->datalen=14;
tmpstat=pccb->status;
datalen=pccb->datalen;
pccb->datalen=14;
tmpstat=pccb->status;
@@
-870,6
+868,3
@@
void scsi_chip_init(void)
#endif
}
#endif
#endif
}
#endif
-
-
-#endif /* CONFIG_SCSI_SYM53C8XX */