[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 1afc4078b997ecad5fb4bedceb43ceeadbacdd6f
Author: Paul Fertser <fercerpav at gmail.com>
Date:   Fri Jun 5 00:10:08 2009 +0400

    GTA01: disable android wakelocks
    
    Enabling wakelocks leads to immediate suspend after resume. See
    ce6840da7184043a09dd57d4c201a32ef7b6c083 for clarifications.
    
    Signed-off-by: Paul Fertser <fercerpav at gmail.com>

diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig
index b60ebfb..2977572 100644
--- a/arch/arm/configs/gta01_moredrivers_defconfig
+++ b/arch/arm/configs/gta01_moredrivers_defconfig
@@ -1699,15 +1699,7 @@ CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
 # CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_HAS_WAKELOCK=y
-CONFIG_ANDROID_HAS_EARLYSUSPEND=y
-CONFIG_ANDROID_WAKELOCK=y
-CONFIG_ANDROID_USER_WAKELOCK=y
-CONFIG_ANDROID_EARLYSUSPEND=y
-# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
-CONFIG_ANDROID_CONSOLE_EARLYSUSPEND=y
-# CONFIG_ANDROID_FB_EARLYSUSPEND is not set
-CONFIG_ANDROID_POWER_ALARM=y
+# CONFIG_ANDROID_WAKELOCK is not set
 CONFIG_ANDROID_PARANOID_NETWORK=y
 
 #

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko