--- .difftmp1	2010-07-08 15:23:18.971120642 +0200
+++ .difftmp2	2010-07-08 15:23:18.991120043 +0200
@@ -223,6 +223,7 @@
 CONFIG_HIGHMEM=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HOTPLUG=y
+CONFIG_HTC_FB_CONSOLE_BOOT=y
 CONFIG_HTC_FB_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 CONFIG_HZ=100
@@ -318,11 +319,11 @@
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSM7X00A_IDLE_SLEEP_MIN_TIME=50000000
-CONFIG_MSM7X00A_IDLE_SLEEP_MODE=1
-CONFIG_MSM7X00A_IDLE_SLEEP_MODE_POWER_COLLAPSE=y
+CONFIG_MSM7X00A_IDLE_SLEEP_MODE=4
+CONFIG_MSM7X00A_IDLE_SLEEP_WAIT_FOR_INTERRUPT=y
 CONFIG_MSM7X00A_IDLE_SPIN_TIME=80000
-CONFIG_MSM7X00A_SLEEP_MODE=0
-CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND=y
+CONFIG_MSM7X00A_SLEEP_MODE=4
+CONFIG_MSM7X00A_SLEEP_WAIT_FOR_INTERRUPT=y
 CONFIG_MSM7X00A_USE_GP_TIMER=y
 CONFIG_MSM_AMSS_VERSION=1550
 CONFIG_MSM_AMSS_VERSION_1550=y