Messages in this thread | | | Date | Fri, 20 Dec 2013 10:15:25 +0100 | From | Takashi Iwai <> | Subject | Re: [UPDATE RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users. |
| |
At Fri, 20 Dec 2013 16:30:42 +0800, Lv Zheng wrote: > > 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. > > Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Takashi Iwai <tiwai@suse.de> > Cc: alsa-devel@alsa-project.org > Cc: ibm-acpi-devel@lists.sourceforge.net > Cc: platform-driver-x86@vger.kernel.org > Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Applied to sound git tree (with a different subject suffix), thanks.
Takashi
> --- > sound/pci/hda/patch_conexant.c | 2 +- > 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 3fbf288..6df4c35 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 34de5dc..5dca90e 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -3726,7 +3726,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); > > -- > 1.7.10 >
| |