summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-05 01:45:50 -0400
committerLen Brown <len.brown@intel.com>2009-04-05 01:45:50 -0400
commitedd84690d15e4cb144cc60b754d4eaf8fac0a711 (patch)
tree4fc645c52ad9eebcdf59a6ab32d534df121dd280 /drivers/acpi/power.c
parent7c27fd19b6d985957424348361afa066ff4c74d8 (diff)
parentae7d51517bc3b0fe10c6af38234ef0f92bbae6a4 (diff)
downloadop-kernel-dev-edd84690d15e4cb144cc60b754d4eaf8fac0a711.zip
op-kernel-dev-edd84690d15e4cb144cc60b754d4eaf8fac0a711.tar.gz
Merge branch 'acpi-modparam' into release
Conflicts: drivers/acpi/Makefile Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 11968ba2..56665a6 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -54,10 +54,6 @@ ACPI_MODULE_NAME("power");
#define ACPI_POWER_RESOURCE_STATE_ON 0x01
#define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF
-#ifdef MODULE_PARAM_PREFIX
-#undef MODULE_PARAM_PREFIX
-#endif
-#define MODULE_PARAM_PREFIX "acpi."
int acpi_power_nocheck;
module_param_named(power_nocheck, acpi_power_nocheck, bool, 000);
OpenPOWER on IntegriCloud