2 files changed, 25 insertions, 2 deletions

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c627bc408a6b..53b821d7b8a8 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -336,6 +336,27 @@ int acpi_match_ids (struct acpi_device	*device, char	*ids);
 int acpi_create_dir(struct acpi_device *);
 void acpi_remove_dir(struct acpi_device *);
 
+
+/*
+ * Bind physical devices with ACPI devices
+ */
+#include <linux/device.h>
+struct acpi_bus_type {
+        struct list_head        list;
+        struct bus_type         *bus;
+        /* For general devices under the bus*/
+        int (*find_device)(struct device *, acpi_handle*);
+        /* For bridges, such as PCI root bridge, IDE controller */
+        int (*find_bridge)(struct device *, acpi_handle *);
+};
+int register_acpi_bus_type(struct acpi_bus_type *);
+int unregister_acpi_bus_type(struct acpi_bus_type *);
+struct device *acpi_get_physical_device(acpi_handle);
+/* helper */
+acpi_handle acpi_get_child(acpi_handle, acpi_integer);
+acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
+#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->firmware_data))
+
 #endif /*CONFIG_ACPI_BUS*/
 
 #endif /*__ACPI_BUS_H__*/
diff --git a/include/linux/device.h b/include/linux/device.h
index df94c0de53f2..de2d6fe349de 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -269,8 +269,10 @@ struct device {
         struct device_driver *driver;   /* which driver has allocated this
                                            device */
         void            *driver_data;   /* data private to the driver */
-        void            *platform_data; /* Platform specific data (e.g. ACPI,
-                                           BIOS data relevant to device) */
+        void            *platform_data; /* Platform specific data, device
+                                           core doesn't touch it */
+        void            *firmware_data; /* Firmware specific data (e.g. ACPI,
+                                           BIOS data),reserved for device core*/
         struct dev_pm_info      power;
 
         u64             *dma_mask;      /* dma mask (if dma'able device) */