[kernel] r14846 - in dists/trunk/linux-2.6/debian: . config/kernelarch-x86

[Maximilian Attems]

Author: maks
Date: Sun Jan  3 13:19:09 2010
New Revision: 14846

Log:
[x86] set modular ACPI_POWER_METER

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Jan  2 21:37:07 2010	(r14845)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jan  3 13:19:09 2010	(r14846)
@@ -11,6 +11,7 @@
     SCSI_BFA_FC, USB_GL860, USB_GSPCA_JEILINJ, I2C_SI4713, RADIO_SI4713,
     RADIO_SI470X, DVB_USB_FRIIO, EDAC_I3200, SENSORS_TMP421, SENSORS_WM8350,
     SBC_FITPC2_WATCHDOG, TOUCHSCREEN_MCS5000, UIO_PCI_GENERIC.
+  * [x86] set ACPI_POWER_METER.
 
   [ dann frazier ]
   * Fix vserver build on ia64 (Closes: #563356)

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sat Jan  2 21:37:07 2010	(r14845)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Sun Jan  3 13:19:09 2010	(r14846)
@@ -121,6 +121,7 @@
 CONFIG_ACPI=y
 CONFIG_ACPI_PROCFS=y
 # CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_SYSFS_POWER=y
 # CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m