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/cm_sbs.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/cm_sbs.c')
| -rw-r--r-- | drivers/acpi/cm_sbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c index 4a9b7bf6f44e..f9db4f444bd0 100644 --- a/drivers/acpi/cm_sbs.c +++ b/drivers/acpi/cm_sbs.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #include <acpi/actypes.h> | 31 | #include <acpi/actypes.h> |
| 32 | #include <acpi/acutils.h> | 32 | #include <acpi/acutils.h> |
| 33 | 33 | ||
| 34 | ACPI_MODULE_NAME("cm_sbs") | 34 | ACPI_MODULE_NAME("cm_sbs"); |
| 35 | #define ACPI_AC_CLASS "ac_adapter" | 35 | #define ACPI_AC_CLASS "ac_adapter" |
| 36 | #define ACPI_BATTERY_CLASS "battery" | 36 | #define ACPI_BATTERY_CLASS "battery" |
| 37 | #define ACPI_SBS_COMPONENT 0x00080000 | 37 | #define ACPI_SBS_COMPONENT 0x00080000 |