[kernel] r19518 - in dists/trunk/linux/debian: . config config/armhf config/kernelarch-x86 config/powerpc

[Bastian Blank]

Author: waldi
Date: Wed Nov 21 17:33:43 2012
New Revision: 19518

Log:
* debian/changelog: Update.
* debian/config: Enable POWER_SUPPLY.

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/armhf/config.mx5
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/kernelarch-x86/config
   dists/trunk/linux/debian/config/powerpc/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Wed Nov 21 17:26:32 2012	(r19517)
+++ dists/trunk/linux/debian/changelog	Wed Nov 21 17:33:43 2012	(r19518)
@@ -3,6 +3,9 @@
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.7
 
+  [ Bastian Blank ]
+  * Enable POWER_SUPPLY.
+
  -- Bastian Blank <waldi at debian.org>  Wed, 21 Nov 2012 09:34:28 +0100
 
 linux (3.6.6-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.mx5	Wed Nov 21 17:26:32 2012	(r19517)
+++ dists/trunk/linux/debian/config/armhf/config.mx5	Wed Nov 21 17:33:43 2012	(r19518)
@@ -97,11 +97,6 @@
 CONFIG_MWIFIEX_SDIO=m
 
 ##
-## file: drivers/power/Kconfig
-##
-CONFIG_POWER_SUPPLY=y
-
-##
 ## file: drivers/regulator/Kconfig
 ##
 #. Provide dummy if lookup fails

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Wed Nov 21 17:26:32 2012	(r19517)
+++ dists/trunk/linux/debian/config/config	Wed Nov 21 17:33:43 2012	(r19518)
@@ -2462,7 +2462,8 @@
 ##
 ## file: drivers/power/Kconfig
 ##
-# CONFIG_POWER_SUPPLY is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_WM831X_POWER=m
 CONFIG_WM8350_POWER=m
 # CONFIG_TEST_POWER is not set

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Wed Nov 21 17:26:32 2012	(r19517)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Wed Nov 21 17:33:43 2012	(r19518)
@@ -1134,8 +1134,6 @@
 ##
 ## file: drivers/power/Kconfig
 ##
-CONFIG_POWER_SUPPLY=m
-# CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_SBS=m

Modified: dists/trunk/linux/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux/debian/config/powerpc/config	Wed Nov 21 17:26:32 2012	(r19517)
+++ dists/trunk/linux/debian/config/powerpc/config	Wed Nov 21 17:33:43 2012	(r19518)
@@ -691,7 +691,6 @@
 ##
 ## file: drivers/power/Kconfig
 ##
-CONFIG_POWER_SUPPLY=m
 CONFIG_BATTERY_PMU=m
 
 ##