Skip to content

Commit dfac21b

Browse files
Kuppuswamy Sathyanarayananrafaeljw
authored andcommitted
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]>
1 parent d8f2038 commit dfac21b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

arch/x86/include/asm/acpi.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ static inline void disable_acpi(void)
5656

5757
extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
5858

59+
extern int acpi_blacklisted(void);
60+
5961
static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
6062
static inline void acpi_disable_pci(void)
6163
{

include/linux/acpi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ extern char *wmi_get_acpi_device_uid(const char *guid);
421421

422422
extern char acpi_video_backlight_string[];
423423
extern long acpi_is_video_device(acpi_handle handle);
424-
extern int acpi_blacklisted(void);
424+
425425
extern void acpi_osi_setup(char *str);
426426
extern bool acpi_osi_is_win8(void);
427427

0 commit comments

Comments
 (0)