diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 09:45:50 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 09:45:50 +0400 |
| commit | edd84690d15e4cb144cc60b754d4eaf8fac0a711 (patch) | |
| tree | 4fc645c52ad9eebcdf59a6ab32d534df121dd280 /drivers/acpi/debug.c | |
| parent | 7c27fd19b6d985957424348361afa066ff4c74d8 (diff) | |
| parent | ae7d51517bc3b0fe10c6af38234ef0f92bbae6a4 (diff) | |
| download | linux-edd84690d15e4cb144cc60b754d4eaf8fac0a711.tar.xz | |
Merge branch 'acpi-modparam' into release
Conflicts:
drivers/acpi/Makefile
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/debug.c')
| -rw-r--r-- | drivers/acpi/debug.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index 9cb189f3c77c..a8287be0870e 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c @@ -13,11 +13,6 @@ #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME("debug"); -#ifdef MODULE_PARAM_PREFIX -#undef MODULE_PARAM_PREFIX -#endif -#define MODULE_PARAM_PREFIX "acpi." - struct acpi_dlayer { const char *name; unsigned long value; |