projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'linux-kselftest-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
gvp11.h
diff --git
a/drivers/scsi/gvp11.h
b/drivers/scsi/gvp11.h
index b27a3ee3313e223092fce1852ee78b2acb232a0b..852913cde5dd9a5b5bdf43722d76613ef68c12d2 100644
(file)
--- a/
drivers/scsi/gvp11.h
+++ b/
drivers/scsi/gvp11.h
@@
-11,9
+11,6
@@
#include <linux/types.h>
#include <linux/types.h>
-int gvp11_detect(struct scsi_host_template *);
-int gvp11_release(struct Scsi_Host *);
-
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
#ifndef CMD_PER_LUN
#define CMD_PER_LUN 2
#endif
@@
-22,8
+19,6
@@
int gvp11_release(struct Scsi_Host *);
#define CAN_QUEUE 16
#endif
#define CAN_QUEUE 16
#endif
-#ifndef HOSTS_C
-
/*
* if the transfer address ANDed with this results in a non-zero
* result, then we can't use DMA.
/*
* if the transfer address ANDed with this results in a non-zero
* result, then we can't use DMA.
@@
-54,6
+49,4
@@
struct gvp11_scsiregs {
#define GVP11_DMAC_INT_ENABLE (1<<3)
#define GVP11_DMAC_DIR_WRITE (1<<4)
#define GVP11_DMAC_INT_ENABLE (1<<3)
#define GVP11_DMAC_DIR_WRITE (1<<4)
-#endif /* else def HOSTS_C */
-
#endif /* GVP11_H */
#endif /* GVP11_H */