diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2013-12-20 16:30:42 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-12-20 10:14:05 +0100 |
| commit | d171ebc5b9d197c1ec76c4b21c91981649db4c65 (patch) | |
| tree | c0429f66dce8b735abe320e5dbac6961651051e8 /sound/pci | |
| parent | d8f66c71d547538e1c61622139455dd231238aef (diff) | |
| download | blackbird-op-linux-d171ebc5b9d197c1ec76c4b21c91981649db4c65.tar.gz blackbird-op-linux-d171ebc5b9d197c1ec76c4b21c91981649db4c65.zip | |
ALSA: hda - Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.
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>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 2 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 3fbf2883e06e..6df4c35b48c5 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3243,7 +3243,7 @@ enum { #if IS_ENABLED(CONFIG_THINKPAD_ACPI) #include <linux/thinkpad_acpi.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static int (*led_set_func)(int, bool); diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3578f11c8e12..ef43171c0bd0 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3779,7 +3779,7 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec, #if IS_ENABLED(CONFIG_THINKPAD_ACPI) #include <linux/thinkpad_acpi.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static int (*led_set_func)(int, bool); |
