diff options
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
| -rw-r--r-- | drivers/ata/libata-core.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 50680a59a2ff..b9e9bd854298 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1529,6 +1529,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1529 | 1529 | ||
| 1530 | * atapi_dmadir: Enable ATAPI DMADIR bridge support | 1530 | * atapi_dmadir: Enable ATAPI DMADIR bridge support |
| 1531 | 1531 | ||
| 1532 | * disable: Disable this device. | ||
| 1533 | |||
| 1532 | If there are multiple matching configurations changing | 1534 | If there are multiple matching configurations changing |
| 1533 | the same attribute, the last one is used. | 1535 | the same attribute, the last one is used. |
| 1534 | 1536 | ||
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index dae73efe5dbf..ff0158481d53 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -6522,6 +6522,7 @@ static int __init ata_parse_force_one(char **cur, | |||
| 6522 | { "norst", .lflags = ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST }, | 6522 | { "norst", .lflags = ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST }, |
| 6523 | { "rstonce", .lflags = ATA_LFLAG_RST_ONCE }, | 6523 | { "rstonce", .lflags = ATA_LFLAG_RST_ONCE }, |
| 6524 | { "atapi_dmadir", .horkage_on = ATA_HORKAGE_ATAPI_DMADIR }, | 6524 | { "atapi_dmadir", .horkage_on = ATA_HORKAGE_ATAPI_DMADIR }, |
| 6525 | { "disable", .horkage_on = ATA_HORKAGE_DISABLE }, | ||
| 6525 | }; | 6526 | }; |
| 6526 | char *start = *cur, *p = *cur; | 6527 | char *start = *cur, *p = *cur; |
| 6527 | char *id, *val, *endp; | 6528 | char *id, *val, *endp; |
