From patchwork Fri Mar 19 11:49:20 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dan Carpenter <error27@gmail.com>
X-Patchwork-Id: 86927
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2JBnV6B025533
	for <patchwork-acpi@patchwork.kernel.org>;
	Fri, 19 Mar 2010 11:49:32 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751900Ab0CSLtb (ORCPT
	<rfc822;patchwork-acpi@patchwork.kernel.org>);
	Fri, 19 Mar 2010 07:49:31 -0400
Received: from mail-bw0-f209.google.com ([209.85.218.209]:61806 "EHLO
	mail-bw0-f209.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751393Ab0CSLt3 (ORCPT
	<rfc822; linux-acpi@vger.kernel.org>); Fri, 19 Mar 2010 07:49:29 -0400
Received: by bwz1 with SMTP id 1so2871827bwz.21
	for <multiple recipients>; Fri, 19 Mar 2010 04:49:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:date:from:to:cc:subject
	:message-id:mail-followup-to:mime-version:content-type
	:content-disposition:user-agent;
	bh=Se/YVlM6IVknKLfOGF7ZJnY/pzREKPR+gG/och/fHJ0=;
	b=bVO5jcrLVMv4/Gw/6kRWswH3905RxC3HLeptIMomSECzosjuCu5Vdh2zJI8urBrLM3
	sYuNj4uGNolUj5m4141dbIJrV8HIhh2fnJkmheQlX1IgXa0r+RSvnnR0ekKwmZPsW9J/
	7T9FPHsTZUq5n1ZcVL6cAq9hQic9Bl+PfqH2g=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version
	:content-type:content-disposition:user-agent;
	b=U2+ac9ih3YWZ3i322U3nb0ouJsCL4eSLubHJ2j11MWx+jysARwjToBpN0AFLPw0d2N
	52Ku3fMqlg5LIwE/InVKRA1ijrAwd58nowegyllx2kchjZANn6qIAbyFq5L5dupwbvbC
	teJOkyINhX0l7R2RCVFq/O5Yv3PCZ/9xq99iE=
Received: by 10.204.36.71 with SMTP id s7mr2920916bkd.171.1268999368095;
	Fri, 19 Mar 2010 04:49:28 -0700 (PDT)
Received: from bicker ([196.43.68.18]) by mx.google.com with ESMTPS id
	s17sm4243433bkd.10.2010.03.19.04.49.24
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Fri, 19 Mar 2010 04:49:27 -0700 (PDT)
Date: Fri, 19 Mar 2010 14:49:20 +0300
From: Dan Carpenter <error27@gmail.com>
To: Len Brown <lenb@kernel.org>
Cc: "Darrick J. Wong" <djwong@us.ibm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	=?iso-8859-1?Q?M=E1rton_N=E9meth?= <nm127@freemail.hu>,
	Lin Ming <ming.m.lin@intel.com>, linux-acpi@vger.kernel.org,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] power_meter: acpi_device_class "power_meter_resource" too
	long
Message-ID: <20100319114920.GP5331@bicker>
Mail-Followup-To: Dan Carpenter <error27@gmail.com>,
	Len Brown <lenb@kernel.org>, "Darrick J. Wong" <djwong@us.ibm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	=?iso-8859-1?Q?M=E1rton_N=E9meth?= <nm127@freemail.hu>,
	Lin Ming <ming.m.lin@intel.com>, linux-acpi@vger.kernel.org,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-acpi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-acpi.vger.kernel.org>
X-Mailing-List: linux-acpi@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Fri, 19 Mar 2010 11:49:32 +0000 (UTC)


diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
index 834c5af..31baa1e 100644
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
@@ -34,7 +34,7 @@
 #define ACPI_POWER_METER_NAME		"power_meter"
 ACPI_MODULE_NAME(ACPI_POWER_METER_NAME);
 #define ACPI_POWER_METER_DEVICE_NAME	"Power Meter"
-#define ACPI_POWER_METER_CLASS		"power_meter_resource"
+#define ACPI_POWER_METER_CLASS		"pwr_meter_resource"
 
 #define NUM_SENSORS			17