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/system.c | |
| parent | Pull misc-for-upstream into release branch (diff) | |
| parent | ACPI: IA64: react to acpi_table_parse() return value change (diff) | |
| download | wireguard-linux-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.xz wireguard-linux-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.zip | |
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/system.c')
| -rw-r--r-- | drivers/acpi/system.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 7147b0bdab0a..83a8d3097904 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c @@ -31,14 +31,13 @@ #include <acpi/acpi_drivers.h> #define _COMPONENT ACPI_SYSTEM_COMPONENT -ACPI_MODULE_NAME("acpi_system") +ACPI_MODULE_NAME("system"); #ifdef MODULE_PARAM_PREFIX #undef MODULE_PARAM_PREFIX #endif #define MODULE_PARAM_PREFIX "acpi." #define ACPI_SYSTEM_CLASS "system" -#define ACPI_SYSTEM_DRIVER_NAME "ACPI System Driver" #define ACPI_SYSTEM_DEVICE_NAME "System" #define ACPI_SYSTEM_FILE_INFO "info" #define ACPI_SYSTEM_FILE_EVENT "event" |