diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:34 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:40 +0200 |
| commit | 67ece13ffe862f9d17a144c6cd3feef88a57db13 (patch) | |
| tree | ec2036681d19a9c10b2fad941eb8f58f9eafcfc8 /include/acpi/processor.h | |
| parent | fa84cf094ef9667e2b91c104b0a788fd1896f482 (diff) | |
| parent | 4aaf448fa9754e2d5ee188d32327b24ffc15ca4d (diff) | |
Merge branch 'topic/vga_switcheroo' into for-next
Pull the vga_switcheroo audio client fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/acpi/processor.h')
| -rw-r--r-- | include/acpi/processor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 40a916efd7c03..1194a4c78d557 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -309,7 +309,7 @@ static inline void acpi_processor_ppc_exit(void) { return; } -static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr, +static inline void acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag) { static unsigned int printout = 1; @@ -320,7 +320,6 @@ static inline int acpi_processor_ppc_has_changed(struct acpi_processor *pr, "Consider compiling CPUfreq support into your kernel.\n"); printout = 0; } - return 0; } static inline int acpi_processor_get_bios_limit(int cpu, unsigned int *limit) { |