diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-09 00:41:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-09 00:41:58 +0200 |
| commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
| tree | f1958f80f596cfcf496904f12a62662fa79ce990 /drivers/acpi/internal.h | |
| parent | Merge tag 'fixes-for-v4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | USB: option: add "D-Link DWM-221 B1" device id (diff) | |
| download | linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.tar.xz linux-636c8a8d85d0564222071f0caa4a4e6bf527efe5.zip | |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/acpi/internal.h')
| -rw-r--r-- | drivers/acpi/internal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index a37508ef66c1..7c188472d9c2 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -145,6 +145,12 @@ void acpi_early_processor_set_pdc(void); static inline void acpi_early_processor_set_pdc(void) {} #endif +#ifdef CONFIG_X86 +void acpi_early_processor_osc(void); +#else +static inline void acpi_early_processor_osc(void) {} +#endif + /* -------------------------------------------------------------------------- Embedded Controller -------------------------------------------------------------------------- */ |