projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-tq-group
[oweals/u-boot.git]
/
include
/
scsi.h
diff --git
a/include/scsi.h
b/include/scsi.h
index 8929318925c777641fb6530cb45e8abdb0117197..2be4d4014af1e44a4ac1ffa022402cf7bc6a2350 100644
(file)
--- a/
include/scsi.h
+++ b/
include/scsi.h
@@
-187,7
+187,6
@@
void scsi_low_level_init(int busdevfunc);
void scsi_init(void);
void scsi_init(void);
-
#define SCSI_IDENTIFY 0xC0 /* not used */
/* Hardware errors */
#define SCSI_IDENTIFY 0xC0 /* not used */
/* Hardware errors */
@@
-199,7
+198,6
@@
void scsi_init(void);
#define SCSI_INT_STATE 0x00010000 /* unknown Interrupt number is stored in 16 LSB */
#define SCSI_INT_STATE 0x00010000 /* unknown Interrupt number is stored in 16 LSB */
-
#ifndef TRUE
#define TRUE 1
#endif
#ifndef TRUE
#define TRUE 1
#endif
@@
-207,9
+205,4
@@
void scsi_init(void);
#define FALSE 0
#endif
#define FALSE 0
#endif
-
-
-
-
#endif /* _SCSI_H */
#endif /* _SCSI_H */
-