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/system.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/system.c')
| -rw-r--r-- | drivers/acpi/system.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 44be75ee7264..da51f05ef8d8 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
| @@ -33,10 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | 34 | #define _COMPONENT ACPI_SYSTEM_COMPONENT |
| 35 | ACPI_MODULE_NAME("system"); | 35 | ACPI_MODULE_NAME("system"); |
| 36 | #ifdef MODULE_PARAM_PREFIX | ||
| 37 | #undef MODULE_PARAM_PREFIX | ||
| 38 | #endif | ||
| 39 | #define MODULE_PARAM_PREFIX "acpi." | ||
| 40 | 36 | ||
| 41 | #define ACPI_SYSTEM_CLASS "system" | 37 | #define ACPI_SYSTEM_CLASS "system" |
| 42 | #define ACPI_SYSTEM_DEVICE_NAME "System" | 38 | #define ACPI_SYSTEM_DEVICE_NAME "System" |