diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:30:18 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:30:18 -0400 |
| commit | 9759d22c8348343b0da4e25d6150c41712686c14 (patch) | |
| tree | 338b185f11d705258888a8f2318a3a3b7ea0968d /drivers | |
| parent | ed40d0c472b136682b2fcba05f89762859c7374f (diff) | |
| parent | f0bba9f934517533acbda7329be93f55d5a01c03 (diff) | |
Merge branch 'master' into devel
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/arm/cumana_2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 8ee01b907332..c9902b5c1f2b 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c | |||
| @@ -318,7 +318,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length) | |||
| 318 | { | 318 | { |
| 319 | int ret = length; | 319 | int ret = length; |
| 320 | 320 | ||
| 321 | if (length >= 11 && strcmp(buffer, "CUMANASCSI2") == 0) { | 321 | if (length >= 11 && strncmp(buffer, "CUMANASCSI2", 11) == 0) { |
| 322 | buffer += 11; | 322 | buffer += 11; |
| 323 | length -= 11; | 323 | length -= 11; |
| 324 | 324 | ||