From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755766Ab3LTJPf (ORCPT <rfc822;w@1wt.eu>);
	Fri, 20 Dec 2013 04:15:35 -0500
Received: from cantor2.suse.de ([195.135.220.15]:43532 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755020Ab3LTJP0 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 20 Dec 2013 04:15:26 -0500
Date: Fri, 20 Dec 2013 10:15:25 +0100
Message-ID: <s5hfvpnevde.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Lv Zheng <lv.zheng@intel.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
        Len Brown <len.brown@intel.com>, Lv Zheng <zetalog@gmail.com>,
        <linux-kernel@vger.kernel.org>, linux-acpi@vger.kernel.org,
        Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
        Jaroslav Kysela <perex@perex.cz>, alsa-devel@alsa-project.org,
        ibm-acpi-devel@lists.sourceforge.net,
        platform-driver-x86@vger.kernel.org
Subject: Re: [UPDATE RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.
In-Reply-To: <b6ef94e61a18b87939cf9495a1c9212c1b7f5465.1387528106.git.lv.zheng@intel.com>
References: <cover.1387336613.git.lv.zheng@intel.com>
	<b6ef94e61a18b87939cf9495a1c9212c1b7f5465.1387528106.git.lv.zheng@intel.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.3
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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
>