ACPI: Move acpi_blacklisted() declaration to asm/acpi.h

The function acpi_blacklisted() is defined only when CONFIG_X86 is
enabled and is only used by X86 arch code. To align with its usage and
definition conditions, move its declaration to asm/acpi.h

Signed-off-by: Kuppuswamy Sathyanarayanan <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
[ rjw: Added empty code line in a header file ]
Signed-off-by: Rafael J. Wysocki <[email protected]>

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index f896eed4516c7e3c131751ab5865aa70cfa2d645..5af926c050f0944d1981a2a86bd960bc82f66444 100644 (file)
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -56,6 +56,8 @@ static inline void disable_acpi(void)
 
 extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
 
 
 extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
 

+extern int acpi_blacklisted(void);
+

 static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
 static inline void acpi_disable_pci(void)
 {
 static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
 static inline void acpi_disable_pci(void)
 {

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 34829f2c517ac278e1655c5a646bbbfbe051506b..2009f7ea59636890859b11a692e341aeea767880 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -421,7 +421,7 @@ extern char *wmi_get_acpi_device_uid(const char *guid);
 
 extern char acpi_video_backlight_string[];
 extern long acpi_is_video_device(acpi_handle handle);
 
 extern char acpi_video_backlight_string[];
 extern long acpi_is_video_device(acpi_handle handle);

-extern int acpi_blacklisted(void);
+

 extern void acpi_osi_setup(char *str);
 extern bool acpi_osi_is_win8(void);
 
 extern void acpi_osi_setup(char *str);
 extern bool acpi_osi_is_win8(void);