Merge branch 'sfi-base' into release

[karo-tx-linux.git] / drivers / acpi / pci_root.c

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index dee916707a7d1b550d88636ebe60528faa36a035..31122214e0ec68c92b7da6020789fcb61daed48e 100644 (file)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -63,20 +63,6 @@ static struct acpi_driver acpi_pci_root_driver = {
                },
 };
 
-struct acpi_pci_root {
-       struct list_head node;
-       struct acpi_device *device;
-       struct pci_bus *bus;
-       u16 segment;
-       u8 bus_nr;
-
-       u32 osc_support_set;    /* _OSC state of support bits */
-       u32 osc_control_set;    /* _OSC state of control bits */
-       u32 osc_control_qry;    /* the latest _OSC query result */
-
-       u32 osc_queried:1;      /* has _OSC control been queried? */
-};
-
 static LIST_HEAD(acpi_pci_roots);
 
 static struct acpi_pci_driver *sub_driver;
@@ -319,7 +305,7 @@ static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags)
        return status;
 }
 
-static struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
+struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
 {
        struct acpi_pci_root *root;
 
@@ -329,6 +315,7 @@ static struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
        }
        return NULL;
 }
+EXPORT_SYMBOL_GPL(acpi_pci_find_root);
 
 struct acpi_handle_node {
        struct list_head node;