From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754797Ab2CFQMU (ORCPT ); Tue, 6 Mar 2012 11:12:20 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38974 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751717Ab2CFQMT (ORCPT ); Tue, 6 Mar 2012 11:12:19 -0500 Date: Tue, 6 Mar 2012 08:11:34 -0800 From: tip-bot for Mika Westerberg Message-ID: Cc: linux-kernel@vger.kernel.org, mjg@redhat.com, alan@linux.intel.com, hpa@zytor.com, mingo@redhat.com, kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, mika.westerberg@linux.intel.com, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, alan@linux.intel.com, mjg@redhat.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, mika.westerberg@linux.intel.com, tglx@linutronix.de, mingo@elte.hu To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/mid/thermal: Add msic_thermal alias Git-Commit-ID: 634830704d80ee0f544c16ea3c19dd2e819d2256 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (terminus.zytor.com [127.0.0.1]); Tue, 06 Mar 2012 08:12:01 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 634830704d80ee0f544c16ea3c19dd2e819d2256 Gitweb: http://git.kernel.org/tip/634830704d80ee0f544c16ea3c19dd2e819d2256 Author: Mika Westerberg AuthorDate: Mon, 5 Mar 2012 15:01:03 -0800 Committer: Ingo Molnar CommitDate: Tue, 6 Mar 2012 09:01:25 +0100 x86/mid/thermal: Add msic_thermal alias This device is called "msic_thermal" instead of "msic_sensor" on actual boards so rename it. Signed-off-by: Mika Westerberg Signed-off-by: Kirill A. Shutemov [ Updated to rename rather than add an entry as er discussion with Mika & Durgadoss R] Signed-off-by: Alan Cox Acked-by: H. Peter Anvin Cc: Matthew Garrett Signed-off-by: Andrew Morton Link: http://lkml.kernel.org/n/tip-gyrbptvkozsbp2yk3ssu084o@git.kernel.org Signed-off-by: Ingo Molnar --- drivers/platform/x86/intel_mid_thermal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c index d824a71..5917b3c 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c @@ -543,7 +543,7 @@ static int mid_thermal_remove(struct platform_device *pdev) return configure_adc(0); } -#define DRIVER_NAME "msic_sensor" +#define DRIVER_NAME "msic_thermal" static const struct platform_device_id therm_id_table[] = { { DRIVER_NAME, 1 },