[x86] set modular ACPI_POWER_METER

svn path=/dists/trunk/linux-2.6/; revision=14846
This commit is contained in:
Maximilian Attems 2010-01-03 13:19:09 +00:00
parent 25acb9d736
commit 671baa32a8
2 changed files with 2 additions and 0 deletions

1
debian/changelog vendored
View File

@ -11,6 +11,7 @@ linux-2.6 (2.6.32-4) UNRELEASED; urgency=low
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)

View File

@ -121,6 +121,7 @@ CONFIG_CRYPTO_CRC32C_INTEL=m
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