[kernel] r17660 - dists/trunk/linux-2.6/debian/config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Tue Jun 14 12:27:19 2011
New Revision: 17660

Log:
ACPI_POWER_METER got renamed to SENSORS_ACPI_POWER

Modified:
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 14 12:20:22 2011	(r17659)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 14 12:27:19 2011	(r17660)
@@ -434,6 +434,7 @@
 ##
 ## file: drivers/hwmon/Kconfig
 ##
+CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ADM1021=m
 CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
@@ -1561,7 +1562,6 @@
 ##
 ## file: unknown
 ##
-CONFIG_ACPI_POWER_METER=m
 CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_RADIO_MAESTRO=m
 CONFIG_SENSORS_PKGTEMP=m