aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:11:16 +0000
committerAndy Green <andy@openmoko.com>2008-11-19 17:11:16 +0000
commit27460b673fa446babd4d35ca8eb5f66c42cb99a3 (patch)
treed23f330f5193d6e8cba571c60061dbb851ac12db /arch
parent8774cfaa0f984619499f079cf83d08491975e229 (diff)
tracking-config-remove-suspend-testing-config.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/gta02-moredrivers-defconfig11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
index 23f46b673c8..44e940c053d 100644
--- a/arch/arm/configs/gta02-moredrivers-defconfig
+++ b/arch/arm/configs/gta02-moredrivers-defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.27
-# Sat Oct 25 08:14:34 2008
+# Sun Oct 26 01:47:48 2008
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -189,7 +189,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
#
# Power management
#
-# CONFIG_S3C2410_PM_DEBUG is not set
+CONFIG_S3C2410_PM_DEBUG=y
# CONFIG_S3C2410_PM_CHECK is not set
CONFIG_S3C_LOWLEVEL_UART_PORT=2
@@ -356,7 +356,7 @@ CONFIG_PM_VERBOSE=y
CONFIG_CAN_PM_TRACE=y
CONFIG_PM_SLEEP=y
CONFIG_SUSPEND=y
-CONFIG_PM_TEST_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
CONFIG_APM_EMULATION=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -1106,7 +1106,7 @@ CONFIG_GPIO_SYSFS=y
CONFIG_POWER_SUPPLY=y
CONFIG_POWER_SUPPLY_DEBUG=y
CONFIG_PDA_POWER=y
-# CONFIG_APM_POWER is not set
+CONFIG_APM_POWER=y
# CONFIG_BATTERY_DS2760 is not set
# CONFIG_BATTERY_BQ27x00 is not set
CONFIG_BATTERY_BQ27000_HDQ=y
@@ -1672,9 +1672,6 @@ CONFIG_ANDROID_POWER_STAT=y
CONFIG_ANDROID_POWER_ALARM=y
CONFIG_ANDROID_LOGGER=y
# CONFIG_ANDROID_RAM_CONSOLE is not set
-# CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE is not set
-# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set
-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set
# CONFIG_ANDROID_TIMED_GPIO is not set
# CONFIG_ANDROID_PARANOID_NETWORK is not set