Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d171ebc5 authored Dec 20, 2013 by Lv Zheng Committed by Takashi Iwai Dec 20, 2013

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>

parent d8f66c71

sound/pci/hda/patch_conexant.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

sound/pci/hda/patch_realtek.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);