summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-core.c
diff options
context:
space:
mode:
authorJeff Garzik2007-03-28 07:57:37 +0200
committerJeff Garzik2007-03-28 07:57:37 +0200
commitd7d0dad62a641c156386288a747c1a2f6bb2e42d (patch)
treeb95bd786ae78c199892791bff1d2c583475e2239 /drivers/ata/libata-core.c
parent[PATCH] aio: remove bare user-triggerable error printk (diff)
downloadkernel-qcow2-linux-d7d0dad62a641c156386288a747c1a2f6bb2e42d.tar.gz
kernel-qcow2-linux-d7d0dad62a641c156386288a747c1a2f6bb2e42d.tar.xz
kernel-qcow2-linux-d7d0dad62a641c156386288a747c1a2f6bb2e42d.zip
[libata] Disable ACPI by default; fix namespace problems
Not yet ready to turn on ATA ACPI by default, for either PATA or SATA. Also, rename the global-scope module parameter variable 'noacpi' to something more libata-specific, reducing the potential for namespace collision. Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r--drivers/ata/libata-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index bf327d473ce9..48ee399d3a44 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -93,8 +93,8 @@ 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 noacpi;
-module_param(noacpi, int, 0444);
+int libata_noacpi = 1;
+module_param_named(noacpi, libata_noacpi, int, 0444);
MODULE_PARM_DESC(noacpi, "Disables the use of ACPI in suspend/resume when set");
MODULE_AUTHOR("Jeff Garzik");