diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /drivers/scsi/pmcraid.h | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'drivers/scsi/pmcraid.h')
| -rw-r--r-- | drivers/scsi/pmcraid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 4db210d93947..34e4c915002e 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h | |||
| @@ -1024,7 +1024,7 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = { | |||
| 1024 | 1024 | ||
| 1025 | 1025 | ||
| 1026 | /* | 1026 | /* |
| 1027 | * pmcraid_ioctl_header - definition of header structure that preceeds all the | 1027 | * pmcraid_ioctl_header - definition of header structure that precedes all the |
| 1028 | * buffers given as ioctl arguments. | 1028 | * buffers given as ioctl arguments. |
| 1029 | * | 1029 | * |
| 1030 | * .signature : always ASCII string, "PMCRAID" | 1030 | * .signature : always ASCII string, "PMCRAID" |