diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/ide/ide-disk.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/ide/ide-disk.c')
| -rw-r--r-- | drivers/ide/ide-disk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index a5017de72da5..f033d732f387 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | * Version 1.15 convert all calls to ide_raw_taskfile | 37 | * Version 1.15 convert all calls to ide_raw_taskfile |
| 38 | * since args will return register content. | 38 | * since args will return register content. |
| 39 | * Version 1.16 added suspend-resume-checkpower | 39 | * Version 1.16 added suspend-resume-checkpower |
| 40 | * Version 1.17 do flush on standy, do flush on ATA < ATA6 | 40 | * Version 1.17 do flush on standby, do flush on ATA < ATA6 |
| 41 | * fix wcache setup. | 41 | * fix wcache setup. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||