--- .difftmp1	2010-05-29 00:47:24.825223854 +0200
+++ .difftmp2	2010-05-29 00:47:24.837223635 +0200
@@ -6,17 +6,17 @@
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ANDROID_PARANOID_NETWORK=y
 CONFIG_ANDROID_PMEM=y
+CONFIG_ANDROID_RAM_CONSOLE_EARLY_ADDR=0xF8010000
+CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT=y
+CONFIG_ANDROID_RAM_CONSOLE_EARLY_SIZE=0x00040000
 CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_DATA_SIZE=128
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_ECC_SIZE=16
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_POLYNOMIAL=0x11d
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION_SYMBOL_SIZE=8
-CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION=y
 CONFIG_ANDROID_RAM_CONSOLE=y
 CONFIG_ANDROID_TIMED_GPIO=y
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANDROID=y
 CONFIG_ANON_INODES=y
+CONFIG_APANIC_PLABEL="kpanic"
+CONFIG_APANIC=y
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_MSM_SCORPION=y
 CONFIG_ARCH_MSM=y
@@ -26,26 +26,21 @@
 CONFIG_ARM_L1_CACHE_SHIFT=5
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_THUMB=y
-CONFIG_ARM_UNWIND=y
 CONFIG_ARM=y
 CONFIG_ASHMEM=y
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
-CONFIG_BATTERY_DS2784=y
 CONFIG_BCM4329_FW_PATH="/system/etc/firmware/fw_bcm4329.bin"
 CONFIG_BCM4329=m
 CONFIG_BCM4329_NVRAM_PATH="/proc/calibration"
 CONFIG_BINFMT_ELF=y
 CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV=y
 CONFIG_BLOCK=y
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 CONFIG_BOUNCE=y
-CONFIG_BRANCH_PROFILE_NONE=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_BT_BNEP=y
 CONFIG_BT_HCIUART_H4=y
@@ -59,6 +54,7 @@
 CONFIG_BT=y
 CONFIG_BUG=y
 CONFIG_CACHE_FLUSH_RANGE_LIMIT=0x40000
+CONFIG_CAN_PM_TRACE=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CFG80211_DEFAULT_PS_VALUE=0
 CONFIG_CGROUP_CPUACCT=y
@@ -66,8 +62,10 @@
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CGROUPS=y
-CONFIG_CMDLINE="mem=64M console=ttyMSM,115200n8"
+CONFIG_CMDLINE=""
 CONFIG_COMPAT_BRK=y
+CONFIG_CONNECTOR=y
+CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CONSTRUCTORS=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -127,18 +125,21 @@
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_SG=y
+CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_DEBUG_VM=y
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DEFAULT_CFQ=y
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DETECT_SOFTLOCKUP=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_DEBUG=y
-CONFIG_DM_UEVENT=y
+CONFIG_DEVKMEM=y
+CONFIG_DEVMEM=y
+CONFIG_DS2745=y
+CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY=y
 CONFIG_EARLYSUSPEND=y
 CONFIG_EMBEDDED=y
@@ -150,6 +151,7 @@
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
 CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_XIP=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
@@ -163,21 +165,24 @@
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_EARLYSUSPEND=y
 CONFIG_FB_MSM_LCDC=y
 CONFIG_FB_MSM=y
 CONFIG_FB=y
 CONFIG_FIB_RULES=y
-CONFIG_FILE_LOCKING=y
+CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FONT_8x8=y
+CONFIG_FONTS=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAME_POINTER=y
 CONFIG_FRAME_WARN=1024
 CONFIG_FREEZER=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
 CONFIG_FS_POSIX_ACL=y
-CONFIG_FTRACE=y
+CONFIG_FS_XIP=y
 CONFIG_FUTEX=y
 CONFIG_FW_LOADER=y
 CONFIG_GENERIC_ALLOCATOR=y
@@ -217,15 +222,13 @@
 CONFIG_HIGHMEM=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HOTPLUG=y
-CONFIG_HTC_35MM_JACK=y
-CONFIG_HTC_PWRSPLY=y
+CONFIG_HTC_FB_CONSOLE=y
+CONFIG_HW_CONSOLE=y
 CONFIG_HZ=100
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
 CONFIG_I2C_HELPER_AUTO=y
 CONFIG_I2C_MSM=y
 CONFIG_I2C=y
-CONFIG_IFB=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_IKCONFIG=y
 CONFIG_INET6_AH=y
@@ -258,20 +261,6 @@
 CONFIG_IOSCHED_CFQ=y
 CONFIG_IOSCHED_NOOP=y
 CONFIG_IP_FIB_HASH=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MATCH_ADDRTYPE=y
-CONFIG_IP_NF_MATCH_AH=y
-CONFIG_IP_NF_MATCH_ECN=y
-CONFIG_IP_NF_MATCH_TTL=y
-CONFIG_IP_NF_TARGET_LOG=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_TARGET_REJECT=y
 CONFIG_IPV6_MIP6=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_NDISC_NODETYPE=y
@@ -299,22 +288,27 @@
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCK_KERNEL=y
 CONFIG_LOG_BUF_SHIFT=17
-CONFIG_MACH_MAHIMAHI=y
-CONFIG_MACH_QSD8X50_FFA=y
-CONFIG_MACH_SWORDFISH=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO=y
+CONFIG_MACH_HTCLEO=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_MD=y
 CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_TUNER_CUSTOMISE=y
+CONFIG_MEDIA_TUNER_MC44S803=y
+CONFIG_MEDIA_TUNER_MT20XX=y
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER=y
-CONFIG_MII=y
 CONFIG_MISC_DEVICES=y
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MMC_BLOCK_DEFERRED_RESUME=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_EMBEDDED_SDIO=y
 CONFIG_MMC_MSM7X00A=y
-CONFIG_MMC_PARANOID_SD_INIT=y
 CONFIG_MMC_UNSAFE_RESUME=y
 CONFIG_MMC=y
 CONFIG_MMU=y
@@ -328,12 +322,12 @@
 CONFIG_MSM7X00A_IDLE_SPIN_TIME=80000
 CONFIG_MSM7X00A_SLEEP_MODE=0
 CONFIG_MSM7X00A_SLEEP_MODE_POWER_COLLAPSE_SUSPEND=y
-CONFIG_MSM7X00A_USE_GP_TIMER=y
-CONFIG_MSM_AMSS_VERSION=6225
-CONFIG_MSM_AMSS_VERSION_6225=y
+CONFIG_MSM7X00A_USE_DG_TIMER=y
+CONFIG_MSM_AMSS_VERSION=1550
+CONFIG_MSM_AMSS_VERSION_1550=y
+CONFIG_MSM_AMSS_VERSION_WINCE=y
 CONFIG_MSM_CAMERA=y
-CONFIG_MSM_DEBUG_UART=1
-CONFIG_MSM_DEBUG_UART1=y
+CONFIG_MSM_DEBUG_UART_NONE=y
 CONFIG_MSM_FIQ_SUPPORT=y
 CONFIG_MSM_IDLE_STATS_BUCKET_COUNT=10
 CONFIG_MSM_IDLE_STATS_BUCKET_SHIFT=2
@@ -345,14 +339,14 @@
 CONFIG_MSM_QDSP6=y
 CONFIG_MSM_RMNET=y
 CONFIG_MSM_RPCSERVERS=y
-CONFIG_MSM_SERIAL_DEBUGGER_NO_SLEEP=y
-CONFIG_MSM_SERIAL_DEBUGGER=y
 CONFIG_MSM_SMD=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK2MTD=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_CHAR=y
+CONFIG_MTD_CHAR=m
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
@@ -362,104 +356,23 @@
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD=y
 CONFIG_NEON=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_CLS=y
-CONFIG_NETDEV_10000=y
-CONFIG_NETDEV_1000=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_ETHERNET=y
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NETFILTER_NETLINK_QUEUE=y
-CONFIG_NETFILTER_NETLINK=y
-CONFIG_NETFILTER_XTABLES=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_HL=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_LED=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER=y
 CONFIG_NET_KEY=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_FIFO=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NET=y
 CONFIG_NEW_LEDS=y
-CONFIG_NF_CONNTRACK_AMANDA=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_H323=y
-CONFIG_NF_CONNTRACK_IPV4=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_NETBIOS_NS=y
-CONFIG_NF_CONNTRACK_PPTP=y
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_GRE=y
-CONFIG_NF_CT_PROTO_SCTP=y
-CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_DEFRAG_IPV4=y
-CONFIG_NF_NAT_AMANDA=y
-CONFIG_NF_NAT_FTP=y
-CONFIG_NF_NAT_H323=y
-CONFIG_NF_NAT_IRC=y
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_NF_NAT_PPTP=y
-CONFIG_NF_NAT_PROTO_DCCP=y
-CONFIG_NF_NAT_PROTO_GRE=y
-CONFIG_NF_NAT_PROTO_SCTP=y
-CONFIG_NF_NAT_PROTO_UDPLITE=y
-CONFIG_NF_NAT_SIP=y
-CONFIG_NF_NAT_TFTP=y
-CONFIG_NF_NAT=y
 CONFIG_NLATTR=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS=y
 CONFIG_NO_HZ=y
+CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL=y
 CONFIG_PACKET=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PANIC_TIMEOUT=5
+CONFIG_PM_DEBUG=y
 CONFIG_PM_SLEEP=y
 CONFIG_PM=y
 CONFIG_POWER_SUPPLY=y
@@ -474,17 +387,14 @@
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PRINTK=y
+CONFIG_PROC_EVENTS=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RD_GZIP=y
-CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_ENC8=y
-CONFIG_REED_SOLOMON=y
 CONFIG_REGULATOR_DEBUG=y
-CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_RFKILL_LEDS=y
@@ -500,44 +410,39 @@
 CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_S5K3E2FX=y
+CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SENSORS_AKM8973=y
 CONFIG_SERIAL_BCM_BT_LPM=y
-CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_MSM_HS=y
-CONFIG_SERIAL_MSM=y
 CONFIG_SHMEM=y
 CONFIG_SIGNALFD=y
 CONFIG_SLABINFO=y
 CONFIG_SLAB=y
 CONFIG_SLHC=y
-CONFIG_SMC91X=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SQUASHFS_EMBEDDED=y
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_SQUASHFS=y
 CONFIG_SSB_POSSIBLE=y
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
+CONFIG_SWAP=y
 CONFIG_SWITCH_GPIO=y
 CONFIG_SWITCH=y
 CONFIG_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TEXTSEARCH_BM=y
-CONFIG_TEXTSEARCH_FSM=y
-CONFIG_TEXTSEARCH_KMP=y
-CONFIG_TEXTSEARCH=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIMERFD=y
 CONFIG_TIMER_STATS=y
 CONFIG_TMPFS=y
-CONFIG_TOUCHSCREEN_MSM=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_TRACING_SUPPORT=y
 CONFIG_TREE_RCU=y
@@ -563,6 +468,7 @@
 CONFIG_USER_WAKELOCK=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VERIFY_PERMISSION_FAULT=y
+CONFIG_VERY_EARLY_CONSOLE=y
 CONFIG_VFAT_FS=y
 CONFIG_VFPv3=y
 CONFIG_VFP=y
@@ -578,9 +484,9 @@
 CONFIG_VMALLOC_RESERVE=0x30000000
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_VMSPLIT_3G=y
-CONFIG_VP_A1026=y
-CONFIG_W1_MASTER_DS2482=y
-CONFIG_W1=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_VT=y
 CONFIG_WAKELOCK_STAT=y
 CONFIG_WAKELOCK=y
 CONFIG_WIFI_CONTROL_FUNC=y
@@ -592,7 +498,7 @@
 CONFIG_XFRM_IPCOMP=y
 CONFIG_XFRM=y
 CONFIG_YAFFS_AUTO_YAFFS2=y
-CONFIG_YAFFS_FS=y
+CONFIG_YAFFS_FS=m
 CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 CONFIG_YAFFS_YAFFS1=y
 CONFIG_YAFFS_YAFFS2=y