Skip to content

L
linux
Commit 2061546a authored by Len Brown's avatar Len Brown
Browse files
Options

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.5 

into intel.com:/home/lenb/src/linux-acpi-test-2.6.6
parents 4774cf7a 681b5149
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
drivers/acpi/scan.c
View file @ 2061546a
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/module.h>
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */ #include <acpi/acinterp.h> /* for acpi_ex_eisa_id_to_string() */
...@@ -18,6 +19,10 @@ extern struct acpi_device *acpi_root; ...@@ -18,6 +19,10 @@ extern struct acpi_device *acpi_root;
struct acpi_device *acpi_fixed_pwr_button; struct acpi_device *acpi_fixed_pwr_button;
struct acpi_device *acpi_fixed_sleep_button; struct acpi_device *acpi_fixed_sleep_button;
EXPORT_SYMBOL(acpi_fixed_pwr_button);
EXPORT_SYMBOL(acpi_fixed_sleep_button);
#define ACPI_BUS_CLASS "system_bus" #define ACPI_BUS_CLASS "system_bus"
#define ACPI_BUS_HID "ACPI_BUS" #define ACPI_BUS_HID "ACPI_BUS"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7