summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2013-12-20 09:30:42 +0100
committerTakashi Iwai <tiwai@suse.de>2013-12-20 10:14:05 +0100
commitd171ebc5b9d197c1ec76c4b21c91981649db4c65 (patch)
treec0429f66dce8b735abe320e5dbac6961651051e8 /sound/pci/hda/patch_realtek.c
parentALSA: hda - Add warning texts when codec driver Kconfig doesn't match (diff)
downloadlinux-d171ebc5b9d197c1ec76c4b21c91981649db4c65.tar.xz
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/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c2
1 files changed, 1 insertions, 1 deletions
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);