From 2082d5ac8e78136aa4485caa7c827862dc037cfa Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Tue, 24 Nov 2009 19:06:37 +0000
Subject: [PATCH] Merge /dists/sid/linux-2.6.

svn path=/dists/trunk/linux-2.6/; revision=14674
---
 debian/changelog             | 1 +
 debian/config/powerpc/config | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e59ae4a5d..5767c0476 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ linux-2.6 (2.6.32~rc8-1~experimental.2) UNRELEASED; urgency=low
 
   [ Bastian Blank ]
   * Enable PCI_MSI.
+  * [powerpc] Properly enable Apple PMU battery.
 
  -- Martin Michlmayr <tbm@cyrius.com>  Sun, 22 Nov 2009 13:56:12 +0000
 
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index 97ade5a6c..8478ebda2 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -638,6 +638,7 @@ CONFIG_TCIC=m
 ##
 ## file: drivers/power/Kconfig
 ##
+CONFIG_POWER_SUPPLY=m
 CONFIG_BATTERY_PMU=m
 
 ##