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/osl.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/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 99d6c5128280..ee0b9f761f76 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | #include <linux/efi.h> | 46 | #include <linux/efi.h> |
| 47 | 47 | ||
| 48 | #define _COMPONENT ACPI_OS_SERVICES | 48 | #define _COMPONENT ACPI_OS_SERVICES |
| 49 | ACPI_MODULE_NAME("osl") | 49 | ACPI_MODULE_NAME("osl"); |
| 50 | #define PREFIX "ACPI: " | 50 | #define PREFIX "ACPI: " |
| 51 | struct acpi_os_dpc { | 51 | struct acpi_os_dpc { |
| 52 | acpi_osd_exec_callback function; | 52 | acpi_osd_exec_callback function; |