[libata] Disable ACPI by default; fix namespace problems

[deliverable/linux.git] / drivers / ata / libata-core.c

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 3c1f8830ac8bf7dedef3d44b049beefcf695e811..48ee399d3a44855ee15032da4b6255df85b2b75a 100644 (file)
--- 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");
@@ -826,7 +826,7 @@ static u64 ata_id_n_sectors(const u16 *id)
 /**
  *     ata_id_to_dma_mode      -       Identify DMA mode from id block
  *     @dev: device to identify
- *     @mode: mode to assume if we cannot tell
+ *     @unknown: mode to assume if we cannot tell
  *
  *     Set up the timing values for the device based upon the identify
  *     reported values for the DMA mode. This function is used by drivers