aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2006-12-07 20:57:10 +0800
committerLen Brown <len.brown@intel.com>2006-12-15 23:38:35 -0500
commitae8433324be16673c75951986dcf85f29c090557 (patch)
treec762438e6d685f3f106a5c2bc9fc93246bfb47ff /include/acpi
parentdb3e1cc3257758d8a694d0a6ab29f109fb019853 (diff)
downloadkernel_samsung_aries-ae8433324be16673c75951986dcf85f29c090557.zip
kernel_samsung_aries-ae8433324be16673c75951986dcf85f29c090557.tar.gz
kernel_samsung_aries-ae8433324be16673c75951986dcf85f29c090557.tar.bz2
ACPI: Set fake hid for non-PNPID ACPI devices
We do this mainly because: 1. hid is used to match ACPI devices and drivers. .match method which is incompatible to driver model can be deleted from acpi_driver.ops then. 2. As the .uevent method mark ACPI drivers by PNPID, fake hid is set to non-PNPID devices so that udev script can load the right ACPI driver by looking for "HWID = " or "COMPTID = ". Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h6
-rw-r--r--include/acpi/acpi_drivers.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 58dc8f6..a6b4037 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -97,8 +97,6 @@ typedef int (*acpi_op_resume) (struct acpi_device * device);
typedef int (*acpi_op_scan) (struct acpi_device * device);
typedef int (*acpi_op_bind) (struct acpi_device * device);
typedef int (*acpi_op_unbind) (struct acpi_device * device);
-typedef int (*acpi_op_match) (struct acpi_device * device,
- struct acpi_driver * driver);
typedef int (*acpi_op_shutdown) (struct acpi_device * device);
struct acpi_bus_ops {
@@ -112,9 +110,8 @@ struct acpi_bus_ops {
u32 acpi_op_scan:1;
u32 acpi_op_bind:1;
u32 acpi_op_unbind:1;
- u32 acpi_op_match:1;
u32 acpi_op_shutdown:1;
- u32 reserved:20;
+ u32 reserved:21;
};
struct acpi_device_ops {
@@ -128,7 +125,6 @@ struct acpi_device_ops {
acpi_op_scan scan;
acpi_op_bind bind;
acpi_op_unbind unbind;
- acpi_op_match match;
acpi_op_shutdown shutdown;
};
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 6a5bdce..be67750 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -43,6 +43,8 @@
#define ACPI_BUTTON_HID_POWERF "ACPI_FPB"
#define ACPI_BUTTON_HID_SLEEPF "ACPI_FSB"
+#define ACPI_VIDEO_HID "ACPI_VID"
+#define ACPI_PCI_BRIDGE_HID "ACPI_PCI"
/* --------------------------------------------------------------------------
PCI
-------------------------------------------------------------------------- */