diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 01:45:50 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:45:50 -0400 |
| commit | edd84690d15e4cb144cc60b754d4eaf8fac0a711 (patch) | |
| tree | 4fc645c52ad9eebcdf59a6ab32d534df121dd280 /drivers/acpi/power.c | |
| parent | 7c27fd19b6d985957424348361afa066ff4c74d8 (diff) | |
| parent | ae7d51517bc3b0fe10c6af38234ef0f92bbae6a4 (diff) | |
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.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 11968ba28feb..56665a63bf19 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
| @@ -54,10 +54,6 @@ ACPI_MODULE_NAME("power"); | |||
| 54 | #define ACPI_POWER_RESOURCE_STATE_ON 0x01 | 54 | #define ACPI_POWER_RESOURCE_STATE_ON 0x01 |
| 55 | #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF | 55 | #define ACPI_POWER_RESOURCE_STATE_UNKNOWN 0xFF |
| 56 | 56 | ||
| 57 | #ifdef MODULE_PARAM_PREFIX | ||
| 58 | #undef MODULE_PARAM_PREFIX | ||
| 59 | #endif | ||
| 60 | #define MODULE_PARAM_PREFIX "acpi." | ||
| 61 | int acpi_power_nocheck; | 57 | int acpi_power_nocheck; |
| 62 | module_param_named(power_nocheck, acpi_power_nocheck, bool, 000); | 58 | module_param_named(power_nocheck, acpi_power_nocheck, bool, 000); |
| 63 | 59 | ||