diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-28 19:23:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-28 19:23:40 -0700 |
| commit | 16585e76a71b64d75a090148c2a94bd4d50a5544 (patch) | |
| tree | 3f21850be8fe914ffc6ca581e98aea0871300b7c /drivers/ide/ide.c | |
| parent | facf014792093d95e308b5d6ce9bc86d3c90e5b1 (diff) | |
| parent | a75ad3c27a6ad78c4306cac939938050dcde54f3 (diff) | |
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] scsi: kill overeager "not-ready" messages
[PATCH] it821x: fix ide dma setup bug
[PATCH] ide: if the id fields looks screwy, disable DMA
[PATCH] ide: option to disable cache flushes for buggy drives
Diffstat (limited to 'drivers/ide/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 05fbd9298db..defd4b4bd37 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -1539,7 +1539,7 @@ static int __init ide_setup(char *s) const char *hd_words[] = { "none", "noprobe", "nowerr", "cdrom", "serialize", "autotune", "noautotune", "minus8", "swapdata", "bswap", - "minus11", "remap", "remap63", "scsi", NULL }; + "noflush", "remap", "remap63", "scsi", NULL }; unit = s[2] - 'a'; hw = unit / MAX_DRIVES; unit = unit % MAX_DRIVES; @@ -1578,6 +1578,9 @@ static int __init ide_setup(char *s) case -10: /* "bswap" */ drive->bswap = 1; goto done; + case -11: /* noflush */ + drive->noflush = 1; + goto done; case -12: /* "remap" */ drive->remap_0_to_1 = 1; goto done; |