diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:42:23 -0400 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/scsi/atp870u.c | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
merge by hand (fix up qla_os.c merge error)
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) | |||
| 3146 | } | 3146 | } |
| 3147 | 3147 | ||
| 3148 | #define BLS buffer + len + size | 3148 | #define BLS buffer + len + size |
| 3149 | int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, | 3149 | static int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, |
| 3150 | char **start, off_t offset, int length, int inout) | 3150 | char **start, off_t offset, int length, int inout) |
| 3151 | { | 3151 | { |
| 3152 | static u8 buff[512]; | 3152 | static u8 buff[512]; |
| 3153 | int size = 0; | 3153 | int size = 0; |