2 files changed, 3 insertions, 5 deletions

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 58dc8f651861..a6b4037beeae 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 6a5bdcefec64..be67750ec88b 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
    -------------------------------------------------------------------------- */