diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/scsi/arm/eesox.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/scsi/arm/eesox.c')
| -rw-r--r-- | drivers/scsi/arm/eesox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index d8435132f461..edfd12b48c28 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c | |||
| @@ -429,7 +429,7 @@ eesoxscsi_set_proc_info(struct Scsi_Host *host, char *buffer, int length) | |||
| 429 | * Params : buffer - a buffer to write information to | 429 | * Params : buffer - a buffer to write information to |
| 430 | * start - a pointer into this buffer set by this routine to the start | 430 | * start - a pointer into this buffer set by this routine to the start |
| 431 | * of the required information. | 431 | * of the required information. |
| 432 | * offset - offset into information that we have read upto. | 432 | * offset - offset into information that we have read up to. |
| 433 | * length - length of buffer | 433 | * length - length of buffer |
| 434 | * host_no - host number to return information for | 434 | * host_no - host number to return information for |
| 435 | * inout - 0 for reading, 1 for writing. | 435 | * inout - 0 for reading, 1 for writing. |