diff options
author | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-26 14:14:55 -0400 |
commit | 153b1e1fd957861e2c185473dd3c3d93561066e4 (patch) | |
tree | c296359e8212ed83c2834b20a62b7a650f3d0fc2 /drivers/scsi/atp870u.c | |
parent | cdbbde14cb55dd10771ce79154f787322d88411b (diff) | |
parent | c3e9dda4f5702ee5b346f4770de53f79e8ad1d8d (diff) | |
download | talos-op-linux-153b1e1fd957861e2c185473dd3c3d93561066e4.tar.gz talos-op-linux-153b1e1fd957861e2c185473dd3c3d93561066e4.zip |
Automatic merge of ../scsi-misc-2.6-old/
Diffstat (limited to 'drivers/scsi/atp870u.c')
-rw-r--r-- | drivers/scsi/atp870u.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index 45b75ddacaab..e6153fe5842a 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c @@ -3146,8 +3146,8 @@ static const char *atp870u_info(struct Scsi_Host *notused) } #define BLS buffer + len + size -int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, - char **start, off_t offset, int length, int inout) +static int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, + char **start, off_t offset, int length, int inout) { static u8 buff[512]; int size = 0; |