From 38dbbebd6f9207f63b339d19f91e29345e95b828 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 5 Oct 2007 16:28:36 -0400 Subject: [PATCH] --- yaml --- r: 68151 b: refs/heads/master c: 6ebe9d8667d3f449350cbc6686cd917ecf1f40dd h: refs/heads/master i: 68149: e24a4ff9665edb54031f6ee5bcd1b8673ba6d050 68147: c64bf047cbf3d79c1e0e080c8e8cbb6e573321ab 68143: 607e2f960d9bb0b38cb5d38c3c2e0e0cdac81d41 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9d5efff443fb..c15ed3fee071 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2db78dd302d26d242d3e8e5c4c5024b6c3ea93c2 +refs/heads/master: 6ebe9d8667d3f449350cbc6686cd917ecf1f40dd diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index aecbdad960fb..64d2c99d15e1 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -105,9 +105,9 @@ static int ata_probe_timeout = ATA_TMOUT_INTERNAL / HZ; module_param(ata_probe_timeout, int, 0444); MODULE_PARM_DESC(ata_probe_timeout, "Set ATA probing timeout (seconds)"); -int libata_noacpi = 1; +int libata_noacpi = 0; module_param_named(noacpi, libata_noacpi, int, 0444); -MODULE_PARM_DESC(noacpi, "Disables the use of ACPI in suspend/resume when set"); +MODULE_PARM_DESC(noacpi, "Disables the use of ACPI in probe/suspend/resume when set"); MODULE_AUTHOR("Jeff Garzik"); MODULE_DESCRIPTION("Library module for ATA devices");