diff options
Diffstat (limited to 'drivers/acpi/internal.h')
-rw-r--r-- | drivers/acpi/internal.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 20f423337e1f..a29739c0ba79 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h | |||
@@ -26,11 +26,6 @@ | |||
26 | acpi_status acpi_os_initialize1(void); | 26 | acpi_status acpi_os_initialize1(void); |
27 | int init_acpi_device_notify(void); | 27 | int init_acpi_device_notify(void); |
28 | int acpi_scan_init(void); | 28 | int acpi_scan_init(void); |
29 | #ifdef CONFIG_ACPI_PCI_SLOT | ||
30 | void acpi_pci_slot_init(void); | ||
31 | #else | ||
32 | static inline void acpi_pci_slot_init(void) { } | ||
33 | #endif | ||
34 | void acpi_pci_root_init(void); | 29 | void acpi_pci_root_init(void); |
35 | void acpi_pci_link_init(void); | 30 | void acpi_pci_link_init(void); |
36 | void acpi_pci_root_hp_init(void); | 31 | void acpi_pci_root_hp_init(void); |
@@ -92,6 +87,7 @@ void acpi_device_add_finalize(struct acpi_device *device); | |||
92 | void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); | 87 | void acpi_free_pnp_ids(struct acpi_device_pnp *pnp); |
93 | int acpi_bind_one(struct device *dev, acpi_handle handle); | 88 | int acpi_bind_one(struct device *dev, acpi_handle handle); |
94 | int acpi_unbind_one(struct device *dev); | 89 | int acpi_unbind_one(struct device *dev); |
90 | void acpi_bus_device_eject(void *data, u32 ost_src); | ||
95 | 91 | ||
96 | /* -------------------------------------------------------------------------- | 92 | /* -------------------------------------------------------------------------- |
97 | Power Resource | 93 | Power Resource |
@@ -169,9 +165,7 @@ int acpi_create_platform_device(struct acpi_device *adev, | |||
169 | Video | 165 | Video |
170 | -------------------------------------------------------------------------- */ | 166 | -------------------------------------------------------------------------- */ |
171 | #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) | 167 | #if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE) |
172 | bool acpi_video_backlight_quirks(void); | 168 | bool acpi_osi_is_win8(void); |
173 | #else | ||
174 | static inline bool acpi_video_backlight_quirks(void) { return false; } | ||
175 | #endif | 169 | #endif |
176 | 170 | ||
177 | #endif /* _ACPI_INTERNAL_H_ */ | 171 | #endif /* _ACPI_INTERNAL_H_ */ |