diff options
author | Len Brown <len.brown@intel.com> | 2007-02-16 22:10:32 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-16 22:10:32 -0500 |
commit | c0cd79d11412969b6b8fa1624cdc1277db82e2fe (patch) | |
tree | 100ee9bb6f13fc0fb3d1887516712541a5fc0769 /drivers/acpi/debug.c | |
parent | 81450b73dde07f473a4a7208b209b4c8b7251d90 (diff) | |
parent | db2d4ccdc8f9f3433d3a8566404189f2e9295c23 (diff) |
Pull fluff into release branch
Conflicts:
arch/x86_64/pci/mmconfig.c
drivers/acpi/bay.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/debug.c')
-rw-r--r-- | drivers/acpi/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index d48f65a8f658..bf513e07b773 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <acpi/acglobal.h> | 12 | #include <acpi/acglobal.h> |
13 | 13 | ||
14 | #define _COMPONENT ACPI_SYSTEM_COMPONENT | 14 | #define _COMPONENT ACPI_SYSTEM_COMPONENT |
15 | ACPI_MODULE_NAME("debug") | 15 | ACPI_MODULE_NAME("debug"); |
16 | 16 | ||
17 | #ifdef MODULE_PARAM_PREFIX | 17 | #ifdef MODULE_PARAM_PREFIX |
18 | #undef MODULE_PARAM_PREFIX | 18 | #undef MODULE_PARAM_PREFIX |