diff options
Diffstat (limited to 'include/acpi/acpi_drivers.h')
-rw-r--r-- | include/acpi/acpi_drivers.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 579fe191b7e7..e976cb109b13 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/acpi.h> | 29 | #include <linux/acpi.h> |
30 | #include <acpi/acpi_bus.h> | 30 | #include <acpi/acpi_bus.h> |
31 | 31 | ||
32 | |||
33 | #define ACPI_MAX_STRING 80 | 32 | #define ACPI_MAX_STRING 80 |
34 | 33 | ||
35 | #define ACPI_BUS_COMPONENT 0x00010000 | 34 | #define ACPI_BUS_COMPONENT 0x00010000 |
@@ -44,7 +43,6 @@ | |||
44 | #define ACPI_BUTTON_HID_POWERF "ACPI_FPB" | 43 | #define ACPI_BUTTON_HID_POWERF "ACPI_FPB" |
45 | #define ACPI_BUTTON_HID_SLEEPF "ACPI_FSB" | 44 | #define ACPI_BUTTON_HID_SLEEPF "ACPI_FSB" |
46 | 45 | ||
47 | |||
48 | /* -------------------------------------------------------------------------- | 46 | /* -------------------------------------------------------------------------- |
49 | PCI | 47 | PCI |
50 | -------------------------------------------------------------------------- */ | 48 | -------------------------------------------------------------------------- */ |
@@ -55,49 +53,49 @@ | |||
55 | 53 | ||
56 | /* ACPI PCI Interrupt Link (pci_link.c) */ | 54 | /* ACPI PCI Interrupt Link (pci_link.c) */ |
57 | 55 | ||
58 | int acpi_irq_penalty_init (void); | 56 | int acpi_irq_penalty_init(void); |
59 | int acpi_pci_link_allocate_irq (acpi_handle handle, int index, int *edge_level, | 57 | int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *edge_level, |
60 | int *active_high_low, char **name); | 58 | int *active_high_low, char **name); |
61 | int acpi_pci_link_free_irq(acpi_handle handle); | 59 | int acpi_pci_link_free_irq(acpi_handle handle); |
62 | 60 | ||
63 | /* ACPI PCI Interrupt Routing (pci_irq.c) */ | 61 | /* ACPI PCI Interrupt Routing (pci_irq.c) */ |
64 | 62 | ||
65 | int acpi_pci_irq_add_prt (acpi_handle handle, int segment, int bus); | 63 | int acpi_pci_irq_add_prt(acpi_handle handle, int segment, int bus); |
66 | void acpi_pci_irq_del_prt (int segment, int bus); | 64 | void acpi_pci_irq_del_prt(int segment, int bus); |
67 | 65 | ||
68 | /* ACPI PCI Device Binding (pci_bind.c) */ | 66 | /* ACPI PCI Device Binding (pci_bind.c) */ |
69 | 67 | ||
70 | struct pci_bus; | 68 | struct pci_bus; |
71 | 69 | ||
72 | acpi_status acpi_get_pci_id (acpi_handle handle, struct acpi_pci_id *id); | 70 | acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id); |
73 | int acpi_pci_bind (struct acpi_device *device); | 71 | int acpi_pci_bind(struct acpi_device *device); |
74 | int acpi_pci_unbind (struct acpi_device *device); | 72 | int acpi_pci_unbind(struct acpi_device *device); |
75 | int acpi_pci_bind_root (struct acpi_device *device, struct acpi_pci_id *id, struct pci_bus *bus); | 73 | int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id, |
74 | struct pci_bus *bus); | ||
76 | 75 | ||
77 | /* Arch-defined function to add a bus to the system */ | 76 | /* Arch-defined function to add a bus to the system */ |
78 | 77 | ||
79 | struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, int bus); | 78 | struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, |
80 | 79 | int bus); | |
81 | #endif /*CONFIG_ACPI_PCI*/ | ||
82 | 80 | ||
81 | #endif /*CONFIG_ACPI_PCI */ | ||
83 | 82 | ||
84 | /* -------------------------------------------------------------------------- | 83 | /* -------------------------------------------------------------------------- |
85 | Power Resource | 84 | Power Resource |
86 | -------------------------------------------------------------------------- */ | 85 | -------------------------------------------------------------------------- */ |
87 | 86 | ||
88 | #ifdef CONFIG_ACPI_POWER | 87 | #ifdef CONFIG_ACPI_POWER |
89 | int acpi_enable_wakeup_device_power (struct acpi_device *dev); | 88 | int acpi_enable_wakeup_device_power(struct acpi_device *dev); |
90 | int acpi_disable_wakeup_device_power (struct acpi_device *dev); | 89 | int acpi_disable_wakeup_device_power(struct acpi_device *dev); |
91 | int acpi_power_get_inferred_state (struct acpi_device *device); | 90 | int acpi_power_get_inferred_state(struct acpi_device *device); |
92 | int acpi_power_transition (struct acpi_device *device, int state); | 91 | int acpi_power_transition(struct acpi_device *device, int state); |
93 | #endif | 92 | #endif |
94 | 93 | ||
95 | |||
96 | /* -------------------------------------------------------------------------- | 94 | /* -------------------------------------------------------------------------- |
97 | Embedded Controller | 95 | Embedded Controller |
98 | -------------------------------------------------------------------------- */ | 96 | -------------------------------------------------------------------------- */ |
99 | #ifdef CONFIG_ACPI_EC | 97 | #ifdef CONFIG_ACPI_EC |
100 | int acpi_ec_ecdt_probe (void); | 98 | int acpi_ec_ecdt_probe(void); |
101 | #endif | 99 | #endif |
102 | 100 | ||
103 | /* -------------------------------------------------------------------------- | 101 | /* -------------------------------------------------------------------------- |