diff --git a/[refs] b/[refs] index 283c1f5ec956..85fdc94fce9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f035a0104234ca1147c88c5850e405ebc0e92e +refs/heads/master: af56976dd21efe8e91d5175913c2b1f7be91c651 diff --git a/trunk/drivers/staging/rts5139/rts51x_scsi.c b/trunk/drivers/staging/rts5139/rts51x_scsi.c index 052911c93103..b58f1dfe006d 100644 --- a/trunk/drivers/staging/rts5139/rts51x_scsi.c +++ b/trunk/drivers/staging/rts5139/rts51x_scsi.c @@ -2072,7 +2072,7 @@ int command_abort(struct scsi_cmnd *srb) /* This invokes the transport reset mechanism to reset the state of the * device */ -int device_reset(struct scsi_cmnd *srb) +static int device_reset(struct scsi_cmnd *srb) { int result = 0; diff --git a/trunk/drivers/staging/rts5139/rts51x_scsi.h b/trunk/drivers/staging/rts5139/rts51x_scsi.h index cdfe550371ce..3a5213611d21 100644 --- a/trunk/drivers/staging/rts5139/rts51x_scsi.h +++ b/trunk/drivers/staging/rts5139/rts51x_scsi.h @@ -151,7 +151,6 @@ int proc_info(struct Scsi_Host *host, char *buffer, char **start, off_t offset, int length, int inout); int queuecommand(struct Scsi_Host *, struct scsi_cmnd *); int command_abort(struct scsi_cmnd *srb); -int device_reset(struct scsi_cmnd *srb); int bus_reset(struct scsi_cmnd *srb); #endif /* __RTS51X_SCSI_H */