From patchwork Tue Apr 27 21:01:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 95498 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 o3RL1KPq014391 for ; Tue, 27 Apr 2010 21:01:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756901Ab0D0VBO (ORCPT ); Tue, 27 Apr 2010 17:01:14 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:53131 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755107Ab0D0VBM (ORCPT ); Tue, 27 Apr 2010 17:01:12 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RL17aN020014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Apr 2010 14:01:08 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RL17kH019428; Tue, 27 Apr 2010 14:01:07 -0700 Message-Id: <201004272101.o3RL17kH019428@imap1.linux-foundation.org> Subject: [patch for 2.6.34? 1/1] power_meter: acpi_device_class "power_meter_resource" too long To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, error27@gmail.com, djwong@us.ibm.com, stable@kernel.org From: akpm@linux-foundation.org Date: Tue, 27 Apr 2010 14:01:07 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.504 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: 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]); Tue, 27 Apr 2010 21:01:20 +0000 (UTC) diff -puN drivers/acpi/power_meter.c~power_meter-acpi_device_class-power_meter_resource-too-long drivers/acpi/power_meter.c --- a/drivers/acpi/power_meter.c~power_meter-acpi_device_class-power_meter_resource-too-long +++ a/drivers/acpi/power_meter.c @@ -35,7 +35,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