Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.

Browse Source 
CONFIG_ACPI dependent code should include <linux/acpi.h> instead of
directly including <acpi/acpi.h>.  This patch cleans up such wrong
inclusions for Thinkpad ACPI users.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lv Zheng 2013-12-20 16:30:42 +08:00 committed by Takashi Iwai
parent d8f66c71d5
commit d171ebc5b9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/patch_conexant.c
View File

@ -3243,7 +3243,7 @@ enum {
#if IS_ENABLED(CONFIG_THINKPAD_ACPI) #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
#include <linux/thinkpad_acpi.h> #include <linux/thinkpad_acpi.h>
#include <acpi/acpi.h> #include <linux/acpi.h>
static int (*led_set_func)(int, bool); static int (*led_set_func)(int, bool);

2
sound/pci/hda/patch_realtek.c
View File

@ -3779,7 +3779,7 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec,
#if IS_ENABLED(CONFIG_THINKPAD_ACPI) #if IS_ENABLED(CONFIG_THINKPAD_ACPI)
#include <linux/thinkpad_acpi.h> #include <linux/thinkpad_acpi.h>
#include <acpi/acpi.h> #include <linux/acpi.h>
static int (*led_set_func)(int, bool); static int (*led_set_func)(int, bool);