Merge /dists/sid/linux-2.6.
svn path=/dists/trunk/linux-2.6/; revision=14674
This commit is contained in:
parent
f39af9bc20
commit
2082d5ac8e
|
@ -6,6 +6,7 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low
|
||||||
|
|
||||||
[ Bastian Blank ]
|
[ Bastian Blank ]
|
||||||
* Enable PCI_MSI.
|
* Enable PCI_MSI.
|
||||||
|
* [powerpc] Properly enable Apple PMU battery.
|
||||||
|
|
||||||
-- Martin Michlmayr <tbm@cyrius.com> Sun, 22 Nov 2009 13:56:12 +0000
|
-- Martin Michlmayr <tbm@cyrius.com> Sun, 22 Nov 2009 13:56:12 +0000
|
||||||
|
|
||||||
|
|
|
@ -638,6 +638,7 @@ CONFIG_TCIC=m
|
||||||
##
|
##
|
||||||
## file: drivers/power/Kconfig
|
## file: drivers/power/Kconfig
|
||||||
##
|
##
|
||||||
|
CONFIG_POWER_SUPPLY=m
|
||||||
CONFIG_BATTERY_PMU=m
|
CONFIG_BATTERY_PMU=m
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|
Loading…
Reference in New Issue