[kernel] r14674 - in dists/trunk/linux-2.6: . debian debian/config/powerpc

[Bastian Blank]

Author: waldi
Date: Tue Nov 24 19:06:37 2009
New Revision: 14674

Log:
Merge /dists/sid/linux-2.6.

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/powerpc/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Nov 24 18:35:28 2009	(r14673)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov 24 19:06:37 2009	(r14674)
@@ -6,6 +6,7 @@
 
   [ Bastian Blank ]
   * Enable PCI_MSI.
+  * [powerpc] Properly enable Apple PMU battery.
 
  -- Martin Michlmayr <tbm at cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
 

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Tue Nov 24 18:35:28 2009	(r14673)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Tue Nov 24 19:06:37 2009	(r14674)
@@ -638,6 +638,7 @@
 ##
 ## file: drivers/power/Kconfig
 ##
+CONFIG_POWER_SUPPLY=m
 CONFIG_BATTERY_PMU=m
 
 ##