aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-11-23 11:25:50 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-11-27 07:44:36 +0100
commite8115ed383040348050284c6ea02913e35236d26 (patch)
treec2209f1cc930edf3ac7cdd57b3ba82727f71e76d
parent90c0daf25c0a1c673c3f8e3b5be99380ad602bee (diff)
downloadopenembedded-e8115ed383040348050284c6ea02913e35236d26.tar.gz
linux(-openmoko)-2.6.34: update shr.patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/linux/linux-2.6.34/om-gta01/defconfig2
-rw-r--r--recipes/linux/linux-2.6.34/om-gta02/defconfig2
-rw-r--r--recipes/linux/linux-2.6.34/shr.patch2881
-rw-r--r--recipes/linux/linux-openmoko_2.6.34.bb2
4 files changed, 97 insertions, 2790 deletions
diff --git a/recipes/linux/linux-2.6.34/om-gta01/defconfig b/recipes/linux/linux-2.6.34/om-gta01/defconfig
index 22d94448d3..4cc007ea24 100644
--- a/recipes/linux/linux-2.6.34/om-gta01/defconfig
+++ b/recipes/linux/linux-2.6.34/om-gta01/defconfig
@@ -351,7 +351,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
-CONFIG_HZ=200
+CONFIG_HZ=100
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
diff --git a/recipes/linux/linux-2.6.34/om-gta02/defconfig b/recipes/linux/linux-2.6.34/om-gta02/defconfig
index 7f765f95b1..a19cc727d8 100644
--- a/recipes/linux/linux-2.6.34/om-gta02/defconfig
+++ b/recipes/linux/linux-2.6.34/om-gta02/defconfig
@@ -354,7 +354,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
-CONFIG_HZ=200
+CONFIG_HZ=100
CONFIG_AEABI=y
# CONFIG_OABI_COMPAT is not set
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
diff --git a/recipes/linux/linux-2.6.34/shr.patch b/recipes/linux/linux-2.6.34/shr.patch
index b41918f42c..669258ed00 100644
--- a/recipes/linux/linux-2.6.34/shr.patch
+++ b/recipes/linux/linux-2.6.34/shr.patch
@@ -2,8 +2,9 @@ All patches from shr kernel repository
http://gitorious.org/~jama/htc-msm-2-6-32/openmoko-kernel/commits/shr-2.6.34
-0ea6c91 jbt6k74: fix WS
-b8595e5 gta01_defconfig: update to similar config as gta02_defconfig used in SHR
+2144a64 Use 100 as HZ value on S3C24XX
+7116806 Force GPS power up on resume if it were powered up on suspend
+137d559 jbt6k74: fix WS
c909f4a wm8753: use snd_soc_jack on neo1973
5d3109e Fix printk level of s3c touchscreen release message
6765601 s3c2410_ts: jitter less touchscreen for glamo, version 4
@@ -33,2791 +34,19 @@ a086ee4 DRM for platform devices
4460e0d touchscreen: ignore unexpected interrupts
16ac021 wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
-diff --git a/arch/arm/configs/gta01_defconfig b/arch/arm/configs/gta01_defconfig
-index 7cac1db..c968b25 100644
---- a/arch/arm/configs/gta01_defconfig
-+++ b/arch/arm/configs/gta01_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.34
--# Wed Nov 17 23:53:50 2010
-+# Linux kernel version: 2.6.34.7
-+# Thu Nov 18 00:41:51 2010
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -35,6 +35,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
- CONFIG_LOCALVERSION=""
- # CONFIG_LOCALVERSION_AUTO is not set
- CONFIG_HAVE_KERNEL_GZIP=y
-+CONFIG_HAVE_KERNEL_LZMA=y
- CONFIG_HAVE_KERNEL_LZO=y
- CONFIG_KERNEL_GZIP=y
- # CONFIG_KERNEL_BZIP2 is not set
-@@ -58,11 +59,11 @@ CONFIG_TREE_RCU=y
- CONFIG_RCU_FANOUT=32
- # CONFIG_RCU_FANOUT_EXACT is not set
- # CONFIG_TREE_RCU_TRACE is not set
--# CONFIG_IKCONFIG is not set
-+CONFIG_IKCONFIG=m
-+CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=18
- # CONFIG_CGROUPS is not set
--CONFIG_SYSFS_DEPRECATED=y
--CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_SYSFS_DEPRECATED_V2 is not set
- # CONFIG_RELAY is not set
- CONFIG_NAMESPACES=y
- # CONFIG_UTS_NS is not set
-@@ -75,7 +76,7 @@ CONFIG_INITRAMFS_SOURCE=""
- CONFIG_RD_GZIP=y
- CONFIG_RD_BZIP2=y
- CONFIG_RD_LZMA=y
--# CONFIG_RD_LZO is not set
-+CONFIG_RD_LZO=y
- # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
- CONFIG_SYSCTL=y
- CONFIG_ANON_INODES=y
-@@ -83,8 +84,7 @@ CONFIG_EMBEDDED=y
- CONFIG_UID16=y
- CONFIG_SYSCTL_SYSCALL=y
- CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--CONFIG_KALLSYMS_EXTRA_PASS=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
- CONFIG_HOTPLUG=y
- CONFIG_PRINTK=y
- CONFIG_BUG=y
-@@ -120,7 +120,7 @@ CONFIG_HAVE_CLK=y
- #
- # GCOV-based kernel profiling
- #
--# CONFIG_SLOW_WORK is not set
-+CONFIG_SLOW_WORK=y
- CONFIG_HAVE_GENERIC_DMA_COHERENT=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
-@@ -133,7 +133,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
- # CONFIG_MODULE_SRCVERSION_ALL is not set
- CONFIG_BLOCK=y
- # CONFIG_LBDAF is not set
--# CONFIG_BLK_DEV_BSG is not set
-+CONFIG_BLK_DEV_BSG=y
- # CONFIG_BLK_DEV_INTEGRITY is not set
-
- #
-@@ -141,7 +141,7 @@ CONFIG_BLOCK=y
- #
- CONFIG_IOSCHED_NOOP=y
- CONFIG_IOSCHED_DEADLINE=y
--# CONFIG_IOSCHED_CFQ is not set
-+CONFIG_IOSCHED_CFQ=m
- CONFIG_DEFAULT_DEADLINE=y
- # CONFIG_DEFAULT_CFQ is not set
- # CONFIG_DEFAULT_NOOP is not set
-@@ -237,11 +237,11 @@ CONFIG_PLAT_SAMSUNG=y
- #
- # Boot options
- #
--# CONFIG_S3C_BOOT_WATCHDOG is not set
-+CONFIG_S3C_BOOT_WATCHDOG=y
- CONFIG_S3C_BOOT_ERROR_RESET=y
- CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
--CONFIG_S3C_LOWLEVEL_UART_PORT=0
--CONFIG_SAMSUNG_GPIO_EXTRA=0
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+CONFIG_SAMSUNG_GPIO_EXTRA=64
- CONFIG_S3C_GPIO_SPACE=0
- CONFIG_S3C_ADC=y
- CONFIG_S3C_DEV_USB_HOST=y
-@@ -352,7 +352,8 @@ CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
- # CONFIG_PREEMPT is not set
- CONFIG_HZ=200
--# CONFIG_AEABI is not set
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
- # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
- # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
- # CONFIG_HIGHMEM is not set
-@@ -377,7 +378,7 @@ CONFIG_ALIGNMENT_TRAP=y
- #
- CONFIG_ZBOOT_ROM_TEXT=0x0
- CONFIG_ZBOOT_ROM_BSS=0x0
--CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list quiet "
- # CONFIG_XIP_KERNEL is not set
- # CONFIG_KEXEC is not set
-
-@@ -395,8 +396,7 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
- #
- # At least one emulation must be selected
- #
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_NWFPE is not set
- # CONFIG_FPE_FASTFPE is not set
-
- #
-@@ -407,7 +407,6 @@ CONFIG_BINFMT_ELF=y
- CONFIG_HAVE_AOUT=y
- # CONFIG_BINFMT_AOUT is not set
- # CONFIG_BINFMT_MISC is not set
--# CONFIG_ARTHUR is not set
-
- #
- # Power management options
-@@ -428,7 +427,14 @@ CONFIG_NET=y
- #
- CONFIG_PACKET=y
- CONFIG_UNIX=y
--# CONFIG_NET_KEY is not set
-+CONFIG_XFRM=y
-+CONFIG_XFRM_USER=m
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_XFRM_IPCOMP=m
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
- CONFIG_INET=y
- CONFIG_IP_MULTICAST=y
- CONFIG_IP_ADVANCED_ROUTER=y
-@@ -442,24 +448,25 @@ CONFIG_IP_PNP=y
- # CONFIG_IP_PNP_DHCP is not set
- # CONFIG_IP_PNP_BOOTP is not set
- # CONFIG_IP_PNP_RARP is not set
--# CONFIG_NET_IPIP is not set
--# CONFIG_NET_IPGRE is not set
-+CONFIG_NET_IPIP=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
- CONFIG_IP_MROUTE=y
- # CONFIG_IP_PIMSM_V1 is not set
- # CONFIG_IP_PIMSM_V2 is not set
- # CONFIG_ARPD is not set
- CONFIG_SYN_COOKIES=y
--# CONFIG_INET_AH is not set
--# CONFIG_INET_ESP is not set
--# CONFIG_INET_IPCOMP is not set
--# CONFIG_INET_XFRM_TUNNEL is not set
--# CONFIG_INET_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
--# CONFIG_INET_XFRM_MODE_TUNNEL is not set
--# CONFIG_INET_XFRM_MODE_BEET is not set
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
- # CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
-+CONFIG_INET_DIAG=m
-+CONFIG_INET_TCP_DIAG=m
- CONFIG_TCP_CONG_ADVANCED=y
- # CONFIG_TCP_CONG_BIC is not set
- # CONFIG_TCP_CONG_CUBIC is not set
-@@ -481,7 +488,26 @@ CONFIG_DEFAULT_WESTWOOD=y
- # CONFIG_DEFAULT_RENO is not set
- CONFIG_DEFAULT_TCP_CONG="westwood"
- CONFIG_TCP_MD5SIG=y
--# CONFIG_IPV6 is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+# CONFIG_IPV6_SIT_6RD is not set
-+CONFIG_IPV6_NDISC_NODETYPE=y
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -491,32 +517,172 @@ CONFIG_BRIDGE_NETFILTER=y
- #
- # Core Netfilter Configuration
- #
--# CONFIG_NETFILTER_NETLINK_QUEUE is not set
--# CONFIG_NETFILTER_NETLINK_LOG is not set
--# CONFIG_NF_CONNTRACK is not set
--# CONFIG_NETFILTER_XTABLES is not set
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+# CONFIG_NF_CONNTRACK_EVENTS is not set
-+# CONFIG_NF_CT_PROTO_DCCP is not set
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+# CONFIG_NETFILTER_TPROXY is not set
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+# CONFIG_NETFILTER_XT_TARGET_CT is not set
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_HL=m
-+# CONFIG_NETFILTER_XT_TARGET_LED is not set
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_HL=m
-+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_RECENT=m
-+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_TIME=m
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+# CONFIG_NETFILTER_XT_MATCH_OSF is not set
- # CONFIG_IP_VS is not set
-
- #
- # IP: Netfilter Configuration
- #
--# CONFIG_NF_DEFRAG_IPV4 is not set
-+CONFIG_NF_DEFRAG_IPV4=m
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
- # CONFIG_IP_NF_QUEUE is not set
--# CONFIG_IP_NF_IPTABLES is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_NF_NAT_NEEDED=y
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_RAW=m
- # CONFIG_IP_NF_ARPTABLES is not set
--# CONFIG_BRIDGE_NF_EBTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_MATCH_FRAG=m
-+CONFIG_IP6_NF_MATCH_OPTS=m
-+CONFIG_IP6_NF_MATCH_HL=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_RT=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+# CONFIG_IP6_NF_RAW is not set
-+CONFIG_BRIDGE_NF_EBTABLES=m
-+CONFIG_BRIDGE_EBT_BROUTE=m
-+CONFIG_BRIDGE_EBT_T_FILTER=m
-+CONFIG_BRIDGE_EBT_T_NAT=m
-+CONFIG_BRIDGE_EBT_802_3=m
-+CONFIG_BRIDGE_EBT_AMONG=m
-+CONFIG_BRIDGE_EBT_ARP=m
-+CONFIG_BRIDGE_EBT_IP=m
-+# CONFIG_BRIDGE_EBT_IP6 is not set
-+CONFIG_BRIDGE_EBT_LIMIT=m
-+CONFIG_BRIDGE_EBT_MARK=m
-+CONFIG_BRIDGE_EBT_PKTTYPE=m
-+CONFIG_BRIDGE_EBT_STP=m
-+CONFIG_BRIDGE_EBT_VLAN=m
-+CONFIG_BRIDGE_EBT_ARPREPLY=m
-+CONFIG_BRIDGE_EBT_DNAT=m
-+CONFIG_BRIDGE_EBT_MARK_T=m
-+CONFIG_BRIDGE_EBT_REDIRECT=m
-+CONFIG_BRIDGE_EBT_SNAT=m
-+CONFIG_BRIDGE_EBT_LOG=m
-+CONFIG_BRIDGE_EBT_ULOG=m
-+# CONFIG_BRIDGE_EBT_NFLOG is not set
- # CONFIG_IP_DCCP is not set
- # CONFIG_IP_SCTP is not set
- # CONFIG_RDS is not set
- # CONFIG_TIPC is not set
- # CONFIG_ATM is not set
--CONFIG_STP=y
--CONFIG_BRIDGE=y
-+CONFIG_STP=m
-+CONFIG_BRIDGE=m
- CONFIG_BRIDGE_IGMP_SNOOPING=y
- # CONFIG_NET_DSA is not set
- # CONFIG_VLAN_8021Q is not set
- # CONFIG_DECNET is not set
--CONFIG_LLC=y
-+CONFIG_LLC=m
- # CONFIG_LLC2 is not set
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
-@@ -531,34 +697,38 @@ CONFIG_NET_SCHED=y
- #
- # Queueing/Scheduling
- #
--# CONFIG_NET_SCH_CBQ is not set
--# CONFIG_NET_SCH_HTB is not set
--# CONFIG_NET_SCH_HFSC is not set
--# CONFIG_NET_SCH_PRIO is not set
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
- # CONFIG_NET_SCH_MULTIQ is not set
--# CONFIG_NET_SCH_RED is not set
--# CONFIG_NET_SCH_SFQ is not set
--# CONFIG_NET_SCH_TEQL is not set
--# CONFIG_NET_SCH_TBF is not set
--# CONFIG_NET_SCH_GRED is not set
--# CONFIG_NET_SCH_DSMARK is not set
--# CONFIG_NET_SCH_NETEM is not set
-+CONFIG_NET_SCH_RED=m
-+CONFIG_NET_SCH_SFQ=m
-+CONFIG_NET_SCH_TEQL=m
-+CONFIG_NET_SCH_TBF=m
-+CONFIG_NET_SCH_GRED=m
-+CONFIG_NET_SCH_DSMARK=m
-+CONFIG_NET_SCH_NETEM=m
- # CONFIG_NET_SCH_DRR is not set
-
- #
- # Classification
- #
- CONFIG_NET_CLS=y
--CONFIG_NET_CLS_BASIC=y
--# CONFIG_NET_CLS_TCINDEX is not set
--# CONFIG_NET_CLS_ROUTE4 is not set
--# CONFIG_NET_CLS_FW is not set
--# CONFIG_NET_CLS_U32 is not set
--# CONFIG_NET_CLS_RSVP is not set
--# CONFIG_NET_CLS_RSVP6 is not set
-+CONFIG_NET_CLS_BASIC=m
-+CONFIG_NET_CLS_TCINDEX=m
-+CONFIG_NET_CLS_ROUTE4=m
-+CONFIG_NET_CLS_ROUTE=y
-+CONFIG_NET_CLS_FW=m
-+CONFIG_NET_CLS_U32=m
-+CONFIG_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
- # CONFIG_NET_CLS_FLOW is not set
- # CONFIG_NET_EMATCH is not set
- # CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
- CONFIG_NET_SCH_FIFO=y
- # CONFIG_DCB is not set
-
-@@ -569,16 +739,46 @@ CONFIG_NET_SCH_FIFO=y
- # CONFIG_HAMRADIO is not set
- # CONFIG_CAN is not set
- # CONFIG_IRDA is not set
--# CONFIG_BT is not set
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIBTUSB=m
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_BT_MRVL is not set
-+# CONFIG_BT_ATH3K is not set
- # CONFIG_AF_RXRPC is not set
- CONFIG_FIB_RULES=y
- CONFIG_WIRELESS=y
-+CONFIG_WIRELESS_EXT=y
-+CONFIG_WEXT_CORE=y
-+CONFIG_WEXT_PROC=y
-+CONFIG_WEXT_PRIV=y
- # CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT_SYSFS=y
- # CONFIG_LIB80211 is not set
-
- #
- # CFG80211 needs to be enabled for MAC80211
- #
-+
-+#
-+# Some wireless drivers require a rate control algorithm
-+#
- # CONFIG_WIMAX is not set
- CONFIG_RFKILL=y
- CONFIG_RFKILL_LEDS=y
-@@ -592,7 +792,7 @@ CONFIG_RFKILL_INPUT=y
- #
- # Generic Driver Options
- #
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_UEVENT_HELPER_PATH=""
- CONFIG_DEVTMPFS=y
- CONFIG_DEVTMPFS_MOUNT=y
- CONFIG_STANDALONE=y
-@@ -600,10 +800,8 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
- CONFIG_FW_LOADER=y
- # CONFIG_FIRMWARE_IN_KERNEL is not set
- CONFIG_EXTRA_FIRMWARE=""
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
- # CONFIG_SYS_HYPERVISOR is not set
--# CONFIG_CONNECTOR is not set
-+CONFIG_CONNECTOR=m
- CONFIG_MTD=y
- # CONFIG_MTD_DEBUG is not set
- # CONFIG_MTD_TESTS is not set
-@@ -702,17 +900,23 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
- #
- # UBI - Unsorted block images
- #
--# CONFIG_MTD_UBI is not set
--# CONFIG_PARPORT is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_COW_COMMON is not set
--# CONFIG_BLK_DEV_LOOP is not set
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+CONFIG_MTD_UBI_GLUEBI=y
-
- #
--# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
-+# UBI debugging options
- #
-+# CONFIG_MTD_UBI_DEBUG is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_DRBD is not set
- # CONFIG_BLK_DEV_NBD is not set
--# CONFIG_BLK_DEV_UB is not set
-+CONFIG_BLK_DEV_UB=m
- CONFIG_BLK_DEV_RAM=y
- CONFIG_BLK_DEV_RAM_COUNT=16
- CONFIG_BLK_DEV_RAM_SIZE=4096
-@@ -720,18 +924,72 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
- # CONFIG_CDROM_PKTCDVD is not set
- # CONFIG_ATA_OVER_ETH is not set
- # CONFIG_MG_DISK is not set
--# CONFIG_MISC_DEVICES is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_AD525X_DPOT is not set
-+# CONFIG_ICS932S401 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+# CONFIG_ISL29003 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_TI_DAC7512 is not set
-+CONFIG_OPENMOKO_RESUME_REASON=y
-+# CONFIG_C2PORT is not set
-+
-+#
-+# EEPROM support
-+#
-+# CONFIG_EEPROM_AT24 is not set
-+# CONFIG_EEPROM_AT25 is not set
-+# CONFIG_EEPROM_LEGACY is not set
-+# CONFIG_EEPROM_MAX6875 is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IWMC3200TOP is not set
- CONFIG_HAVE_IDE=y
- # CONFIG_IDE is not set
-
- #
- # SCSI device support
- #
--CONFIG_SCSI_MOD=y
-+CONFIG_SCSI_MOD=m
- # CONFIG_RAID_ATTRS is not set
--# CONFIG_SCSI is not set
--# CONFIG_SCSI_DMA is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
- # CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+CONFIG_SCSI_MULTI_LUN=y
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_LIBFC is not set
-+# CONFIG_LIBFCOE is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_SCSI_DH is not set
-+# CONFIG_SCSI_OSD_INITIATOR is not set
- # CONFIG_ATA is not set
- # CONFIG_MD is not set
- CONFIG_NETDEVICES=y
-@@ -739,9 +997,10 @@ CONFIG_NETDEVICES=y
- # CONFIG_BONDING is not set
- # CONFIG_MACVLAN is not set
- # CONFIG_EQUALIZER is not set
--# CONFIG_TUN is not set
-+CONFIG_TUN=m
- # CONFIG_VETH is not set
- # CONFIG_NET_ETHERNET is not set
-+CONFIG_MII=m
- # CONFIG_NETDEV_1000 is not set
- # CONFIG_NETDEV_10000 is not set
- CONFIG_WLAN=y
-@@ -755,16 +1014,47 @@ CONFIG_WLAN=y
- #
- # USB Network Adapters
- #
--# CONFIG_USB_CATC is not set
--# CONFIG_USB_KAWETH is not set
--# CONFIG_USB_PEGASUS is not set
--# CONFIG_USB_RTL8150 is not set
--# CONFIG_USB_USBNET is not set
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=m
-+# CONFIG_USB_NET_AX8817X is not set
-+CONFIG_USB_NET_CDCETHER=m
-+# CONFIG_USB_NET_CDC_EEM is not set
-+# CONFIG_USB_NET_DM9601 is not set
-+# CONFIG_USB_NET_SMSC75XX is not set
-+# CONFIG_USB_NET_SMSC95XX is not set
-+# CONFIG_USB_NET_GL620A is not set
-+CONFIG_USB_NET_NET1080=m
-+# CONFIG_USB_NET_PLUSB is not set
-+# CONFIG_USB_NET_MCS7830 is not set
-+# CONFIG_USB_NET_RNDIS_HOST is not set
-+CONFIG_USB_NET_CDC_SUBSET=m
-+# CONFIG_USB_ALI_M5632 is not set
-+# CONFIG_USB_AN2720 is not set
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+# CONFIG_USB_EPSON2888 is not set
-+# CONFIG_USB_KC2190 is not set
-+CONFIG_USB_NET_ZAURUS=m
- # CONFIG_USB_HSO is not set
-+# CONFIG_USB_NET_INT51X1 is not set
- # CONFIG_USB_IPHETH is not set
-+# CONFIG_USB_SIERRA_NET is not set
- # CONFIG_WAN is not set
--# CONFIG_PPP is not set
-+CONFIG_PPP=m
-+CONFIG_PPP_MULTILINK=y
-+CONFIG_PPP_FILTER=y
-+CONFIG_PPP_ASYNC=m
-+CONFIG_PPP_SYNC_TTY=m
-+CONFIG_PPP_DEFLATE=m
-+CONFIG_PPP_BSDCOMP=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
- # CONFIG_SLIP is not set
-+CONFIG_SLHC=m
- # CONFIG_NETCONSOLE is not set
- # CONFIG_NETPOLL is not set
- # CONFIG_NET_POLL_CONTROLLER is not set
-@@ -786,7 +1076,7 @@ CONFIG_INPUT_MOUSEDEV=y
- # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
- CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
- CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
--# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_JOYDEV=m
- CONFIG_INPUT_EVDEV=y
- # CONFIG_INPUT_EVBUG is not set
-
-@@ -804,7 +1094,7 @@ CONFIG_KEYBOARD_GPIO=y
- # CONFIG_KEYBOARD_MAX7359 is not set
- # CONFIG_KEYBOARD_NEWTON is not set
- # CONFIG_KEYBOARD_OPENCORES is not set
--# CONFIG_KEYBOARD_STOWAWAY is not set
-+CONFIG_KEYBOARD_STOWAWAY=m
- # CONFIG_KEYBOARD_SUNKBD is not set
- # CONFIG_KEYBOARD_XTKBD is not set
- # CONFIG_INPUT_MOUSE is not set
-@@ -819,7 +1109,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
- # CONFIG_TOUCHSCREEN_DYNAPRO is not set
- # CONFIG_TOUCHSCREEN_EETI is not set
- # CONFIG_TOUCHSCREEN_FUJITSU is not set
--# CONFIG_TOUCHSCREEN_S3C2410 is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
- # CONFIG_TOUCHSCREEN_GUNZE is not set
- # CONFIG_TOUCHSCREEN_ELO is not set
- # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-@@ -841,9 +1131,10 @@ CONFIG_INPUT_MISC=y
- # CONFIG_INPUT_POWERMATE is not set
- # CONFIG_INPUT_YEALINK is not set
- # CONFIG_INPUT_CM109 is not set
--# CONFIG_INPUT_UINPUT is not set
-+CONFIG_INPUT_UINPUT=m
- CONFIG_INPUT_PCF50606_PMU=y
- # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-+# CONFIG_INPUT_LIS302DL is not set
-
- #
- # Hardware I/O ports
-@@ -900,7 +1191,7 @@ CONFIG_I2C_CHARDEV=y
- #
- # I2C Algorithms
- #
--# CONFIG_I2C_ALGOBIT is not set
-+CONFIG_I2C_ALGOBIT=y
- # CONFIG_I2C_ALGOPCF is not set
- # CONFIG_I2C_ALGOPCA is not set
-
-@@ -934,7 +1225,6 @@ CONFIG_I2C_S3C2410=y
- # CONFIG_I2C_DEBUG_ALGO is not set
- # CONFIG_I2C_DEBUG_BUS is not set
- CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
- CONFIG_SPI_MASTER=y
-
- #
-@@ -942,8 +1232,9 @@ CONFIG_SPI_MASTER=y
- #
- CONFIG_SPI_BITBANG=y
- CONFIG_SPI_GPIO=y
--# CONFIG_SPI_S3C24XX is not set
--# CONFIG_SPI_S3C24XX_GPIO is not set
-+CONFIG_SPI_S3C24XX=y
-+# CONFIG_SPI_S3C24XX_FIQ is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
- # CONFIG_SPI_XILINX is not set
- # CONFIG_SPI_DESIGNWARE is not set
-
-@@ -959,7 +1250,6 @@ CONFIG_SPI_GPIO=y
- # CONFIG_PPS is not set
- CONFIG_ARCH_REQUIRE_GPIOLIB=y
- CONFIG_GPIOLIB=y
--# CONFIG_DEBUG_GPIO is not set
- CONFIG_GPIO_SYSFS=y
-
- #
-@@ -998,16 +1288,19 @@ CONFIG_POWER_SUPPLY=y
- # CONFIG_BATTERY_DS2782 is not set
- # CONFIG_BATTERY_BQ27x00 is not set
- # CONFIG_BATTERY_MAX17040 is not set
-+# CONFIG_BATTERY_BQ27000_HDQ is not set
-+# CONFIG_HDQ_GPIO_BITBANG is not set
-+# CONFIG_BATTERY_PLATFORM is not set
- CONFIG_CHARGER_PCF50606=y
- # CONFIG_HWMON is not set
- # CONFIG_THERMAL is not set
- CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
-+CONFIG_WATCHDOG_NOWAYOUT=y
-
- #
- # Watchdog Device Drivers
- #
--# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_SOFT_WATCHDOG=y
- CONFIG_S3C2410_WATCHDOG=y
- CONFIG_PCF50606_WATCHDOG=y
- # CONFIG_MAX63XX_WATCHDOG is not set
-@@ -1051,12 +1344,13 @@ CONFIG_SSB_POSSIBLE=y
- # CONFIG_AB3100_CORE is not set
- # CONFIG_EZX_PCAP is not set
- # CONFIG_AB4500_CORE is not set
-+# CONFIG_MFD_GLAMO is not set
- CONFIG_MFD_PCF50606=y
- CONFIG_PCF50606_ADC=y
- CONFIG_REGULATOR=y
- # CONFIG_REGULATOR_DEBUG is not set
- # CONFIG_REGULATOR_DUMMY is not set
--# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-+CONFIG_REGULATOR_FIXED_VOLTAGE=y
- # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
- # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
- # CONFIG_REGULATOR_BQ24022 is not set
-@@ -1072,6 +1366,7 @@ CONFIG_REGULATOR_PCF50606=y
- #
- # Graphics support
- #
-+# CONFIG_DRM is not set
- # CONFIG_VGASTATE is not set
- CONFIG_VIDEO_OUTPUT_CONTROL=y
- CONFIG_FB=y
-@@ -1096,6 +1391,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
- #
- # Frame buffer hardware drivers
- #
-+# CONFIG_FB_UVESA is not set
- # CONFIG_FB_S1D13XXX is not set
- CONFIG_FB_S3C2410=y
- # CONFIG_FB_S3C2410_DEBUG is not set
-@@ -1130,30 +1426,24 @@ CONFIG_DUMMY_CONSOLE=y
- CONFIG_FRAMEBUFFER_CONSOLE=y
- # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
- # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
--CONFIG_FONTS=y
--# CONFIG_FONT_8x8 is not set
--# CONFIG_FONT_8x16 is not set
--CONFIG_FONT_6x11=y
--# CONFIG_FONT_7x14 is not set
--# CONFIG_FONT_PEARL_8x8 is not set
--# CONFIG_FONT_ACORN_8x8 is not set
--# CONFIG_FONT_MINI_4x6 is not set
--# CONFIG_FONT_SUN8x16 is not set
--# CONFIG_FONT_SUN12x22 is not set
--# CONFIG_FONT_10x18 is not set
--CONFIG_LOGO=y
--# CONFIG_LOGO_LINUX_MONO is not set
--# CONFIG_LOGO_LINUX_VGA16 is not set
--# CONFIG_LOGO_LINUX_CLUT224 is not set
--CONFIG_SOUND=y
--# CONFIG_SOUND_OSS_CORE is not set
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
-+# CONFIG_FONTS is not set
-+CONFIG_FONT_8x8=y
-+CONFIG_FONT_8x16=y
-+# CONFIG_LOGO is not set
-+CONFIG_SOUND=m
-+CONFIG_SOUND_OSS_CORE=y
-+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
- CONFIG_SND_JACK=y
--# CONFIG_SND_SEQUENCER is not set
--# CONFIG_SND_MIXER_OSS is not set
--# CONFIG_SND_PCM_OSS is not set
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+CONFIG_SND_SEQUENCER_OSS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
- # CONFIG_SND_SUPPORT_OLD_API is not set
- # CONFIG_SND_VERBOSE_PROCFS is not set
-@@ -1168,18 +1458,18 @@ CONFIG_SND_JACK=y
- # CONFIG_SND_ARM is not set
- # CONFIG_SND_SPI is not set
- # CONFIG_SND_USB is not set
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
- # CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
- # CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 is not set
- # CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES is not set
--CONFIG_SND_SOC_I2C_AND_SPI=y
-+CONFIG_SND_SOC_I2C_AND_SPI=m
- # CONFIG_SND_SOC_ALL_CODECS is not set
--CONFIG_SND_SOC_WM8753=y
--CONFIG_SND_SOC_LM4857=y
-+CONFIG_SND_SOC_WM8753=m
-+CONFIG_SND_SOC_LM4857=m
- # CONFIG_SOUND_PRIME is not set
- CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
-@@ -1188,58 +1478,66 @@ CONFIG_HID=y
- #
- # USB Input Devices
- #
--CONFIG_USB_HID=y
-+CONFIG_USB_HID=m
- # CONFIG_HID_PID is not set
- # CONFIG_USB_HIDDEV is not set
-
- #
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+
-+#
- # Special HID drivers
- #
- # CONFIG_HID_3M_PCT is not set
--CONFIG_HID_A4TECH=y
--CONFIG_HID_APPLE=y
--CONFIG_HID_BELKIN=y
--CONFIG_HID_CHERRY=y
--CONFIG_HID_CHICONY=y
--CONFIG_HID_CYPRESS=y
--CONFIG_HID_DRAGONRISE=y
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
- # CONFIG_DRAGONRISE_FF is not set
--CONFIG_HID_EZKEY=y
--CONFIG_HID_KYE=y
--CONFIG_HID_GYRATION=y
--# CONFIG_HID_TWINHAN is not set
--CONFIG_HID_KENSINGTON=y
--CONFIG_HID_LOGITECH=y
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LOGITECH=m
- # CONFIG_LOGITECH_FF is not set
- # CONFIG_LOGIRUMBLEPAD2_FF is not set
- # CONFIG_LOGIG940_FF is not set
--CONFIG_HID_MICROSOFT=y
-+# CONFIG_HID_MAGICMOUSE is not set
-+CONFIG_HID_MICROSOFT=m
- # CONFIG_HID_MOSART is not set
--CONFIG_HID_MONTEREY=y
--CONFIG_HID_NTRIG=y
--# CONFIG_HID_ORTEK is not set
--CONFIG_HID_PANTHERLORD=y
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
- # CONFIG_PANTHERLORD_FF is not set
--CONFIG_HID_PETALYNX=y
-+CONFIG_HID_PETALYNX=m
- # CONFIG_HID_QUANTA is not set
--CONFIG_HID_SAMSUNG=y
--CONFIG_HID_SONY=y
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
- # CONFIG_HID_STANTUM is not set
--CONFIG_HID_SUNPLUS=y
--CONFIG_HID_GREENASIA=y
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
- # CONFIG_GREENASIA_FF is not set
--CONFIG_HID_SMARTJOYPLUS=y
-+CONFIG_HID_SMARTJOYPLUS=m
- # CONFIG_SMARTJOYPLUS_FF is not set
--CONFIG_HID_TOPSEED=y
--CONFIG_HID_THRUSTMASTER=y
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THRUSTMASTER=m
- # CONFIG_THRUSTMASTER_FF is not set
--CONFIG_HID_ZEROPLUS=y
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_ZEROPLUS=m
- # CONFIG_ZEROPLUS_FF is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
- # CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
-+CONFIG_USB=m
- # CONFIG_USB_DEBUG is not set
- CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-@@ -1263,7 +1561,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
- # CONFIG_USB_ISP116X_HCD is not set
- # CONFIG_USB_ISP1760_HCD is not set
- # CONFIG_USB_ISP1362_HCD is not set
--CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD=m
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
- CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-@@ -1276,10 +1574,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
- #
- # USB Device Class drivers
- #
--# CONFIG_USB_ACM is not set
--# CONFIG_USB_PRINTER is not set
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
- # CONFIG_USB_WDM is not set
--# CONFIG_USB_TMC is not set
-+CONFIG_USB_TMC=m
-
- #
- # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-@@ -1288,17 +1586,80 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
- #
- # also be needed; see USB_STORAGE Help for more info
- #
-+CONFIG_USB_STORAGE=m
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=m
-+CONFIG_USB_STORAGE_FREECOM=m
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+CONFIG_USB_STORAGE_USBAT=m
-+CONFIG_USB_STORAGE_SDDR09=m
-+CONFIG_USB_STORAGE_SDDR55=m
-+CONFIG_USB_STORAGE_JUMPSHOT=m
-+CONFIG_USB_STORAGE_ALAUDA=m
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+CONFIG_USB_STORAGE_KARMA=m
-+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
- # CONFIG_USB_LIBUSUAL is not set
-
- #
- # USB Imaging devices
- #
- # CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-
- #
- # USB port drivers
- #
--# CONFIG_USB_SERIAL is not set
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_EZUSB=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+# CONFIG_USB_SERIAL_CP210X is not set
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=m
-+CONFIG_USB_SERIAL_VISOR=m
-+CONFIG_USB_SERIAL_IPAQ=m
-+CONFIG_USB_SERIAL_IR=m
-+CONFIG_USB_SERIAL_EDGEPORT=m
-+CONFIG_USB_SERIAL_EDGEPORT_TI=m
-+CONFIG_USB_SERIAL_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+# CONFIG_USB_SERIAL_IUU is not set
-+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-+CONFIG_USB_SERIAL_KEYSPAN=m
-+CONFIG_USB_SERIAL_KLSI=m
-+CONFIG_USB_SERIAL_KOBIL_SCT=m
-+CONFIG_USB_SERIAL_MCT_U232=m
-+CONFIG_USB_SERIAL_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+# CONFIG_USB_SERIAL_MOTOROLA is not set
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+# CONFIG_USB_SERIAL_QCAUX is not set
-+# CONFIG_USB_SERIAL_QUALCOMM is not set
-+# CONFIG_USB_SERIAL_SPCP8X5 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+# CONFIG_USB_SERIAL_SYMBOL is not set
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_OPTICON is not set
-+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
-+# CONFIG_USB_SERIAL_DEBUG is not set
-
- #
- # USB Miscellaneous drivers
-@@ -1317,12 +1678,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
- # CONFIG_USB_FTDI_ELAN is not set
- # CONFIG_USB_APPLEDISPLAY is not set
- # CONFIG_USB_LD is not set
--# CONFIG_USB_TRANCEVIBRATOR is not set
--# CONFIG_USB_IOWARRIOR is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
- # CONFIG_USB_TEST is not set
- # CONFIG_USB_ISIGHTFW is not set
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
-+CONFIG_USB_GADGET=m
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
- CONFIG_USB_GADGET_VBUS_DRAW=500
- CONFIG_USB_GADGET_SELECTED=y
-@@ -1337,7 +1697,7 @@ CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_S3C_HSOTG is not set
- # CONFIG_USB_GADGET_IMX is not set
- CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
-+CONFIG_USB_S3C2410=m
- # CONFIG_USB_S3C2410_DEBUG is not set
- # CONFIG_USB_GADGET_M66592 is not set
- # CONFIG_USB_GADGET_AMD5536UDC is not set
-@@ -1353,14 +1713,14 @@ CONFIG_USB_S3C2410=y
- CONFIG_USB_ETH=m
- CONFIG_USB_ETH_RNDIS=y
- # CONFIG_USB_ETH_EEM is not set
--# CONFIG_USB_GADGETFS is not set
-+CONFIG_USB_GADGETFS=m
- CONFIG_USB_FILE_STORAGE=m
- # CONFIG_USB_FILE_STORAGE_TEST is not set
--# CONFIG_USB_MASS_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
- # CONFIG_USB_MIDI_GADGET is not set
- # CONFIG_USB_G_PRINTER is not set
--# CONFIG_USB_CDC_COMPOSITE is not set
-+CONFIG_USB_CDC_COMPOSITE=m
- # CONFIG_USB_G_NOKIA is not set
- # CONFIG_USB_G_MULTI is not set
-
-@@ -1372,7 +1732,7 @@ CONFIG_USB_FILE_STORAGE=m
- # CONFIG_NOP_USB_XCEIV is not set
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
--# CONFIG_MMC_UNSAFE_RESUME is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-
- #
- # MMC/SD/SDIO Card Drivers
-@@ -1394,20 +1754,20 @@ CONFIG_MMC_S3C_PIO=y
- # CONFIG_MMC_S3C_PIODMA is not set
- # CONFIG_MEMSTICK is not set
- CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_CLASS=m
-
- #
- # LED drivers
- #
--# CONFIG_LEDS_S3C24XX is not set
-+CONFIG_LEDS_S3C24XX=m
- # CONFIG_LEDS_PCA9532 is not set
--CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO=m
- CONFIG_LEDS_GPIO_PLATFORM=y
- # CONFIG_LEDS_LP3944 is not set
- # CONFIG_LEDS_PCA955X is not set
- # CONFIG_LEDS_DAC124S085 is not set
--CONFIG_LEDS_PWM=y
--# CONFIG_LEDS_REGULATOR is not set
-+CONFIG_LEDS_PWM=m
-+CONFIG_LEDS_REGULATOR=m
- # CONFIG_LEDS_BD2802 is not set
- # CONFIG_LEDS_LT3593 is not set
- CONFIG_LEDS_TRIGGERS=y
-@@ -1415,8 +1775,8 @@ CONFIG_LEDS_TRIGGERS=y
- #
- # LED Triggers
- #
--CONFIG_LEDS_TRIGGER_TIMER=y
--CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_TIMER=m
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
- # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
- # CONFIG_LEDS_TRIGGER_GPIO is not set
- # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-@@ -1492,7 +1852,7 @@ CONFIG_RTC_DRV_PCF50606=y
- #
- # on-CPU RTC drivers
- #
--# CONFIG_RTC_DRV_S3C is not set
-+CONFIG_RTC_DRV_S3C=y
- # CONFIG_DMADEVICES is not set
- # CONFIG_AUXDISPLAY is not set
- # CONFIG_UIO is not set
-@@ -1501,11 +1861,14 @@ CONFIG_RTC_DRV_PCF50606=y
- # TI VLYNQ
- #
- # CONFIG_STAGING is not set
-+CONFIG_AR6000_WLAN=m
-+# CONFIG_AR6000_WLAN_DEBUG is not set
-+# CONFIG_AR6000_WLAN_RESET is not set
-
- #
- # File systems
- #
--CONFIG_EXT2_FS=m
-+CONFIG_EXT2_FS=y
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
-@@ -1513,22 +1876,32 @@ CONFIG_EXT3_FS=y
- # CONFIG_EXT3_FS_XATTR is not set
- # CONFIG_EXT4_FS is not set
- CONFIG_JBD=y
--# CONFIG_REISERFS_FS is not set
-+CONFIG_REISERFS_FS=y
-+# CONFIG_REISERFS_CHECK is not set
-+# CONFIG_REISERFS_PROC_INFO is not set
-+# CONFIG_REISERFS_FS_XATTR is not set
- # CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+CONFIG_XFS_FS=m
-+# CONFIG_XFS_QUOTA is not set
-+# CONFIG_XFS_POSIX_ACL is not set
-+# CONFIG_XFS_RT is not set
-+# CONFIG_XFS_DEBUG is not set
- # CONFIG_OCFS2_FS is not set
--# CONFIG_BTRFS_FS is not set
-+CONFIG_BTRFS_FS=m
-+# CONFIG_BTRFS_FS_POSIX_ACL is not set
- # CONFIG_NILFS2_FS is not set
- CONFIG_FILE_LOCKING=y
--# CONFIG_FSNOTIFY is not set
-+CONFIG_FSNOTIFY=y
- # CONFIG_DNOTIFY is not set
- CONFIG_INOTIFY=y
--# CONFIG_INOTIFY_USER is not set
-+CONFIG_INOTIFY_USER=y
- # CONFIG_QUOTA is not set
- # CONFIG_AUTOFS_FS is not set
--# CONFIG_AUTOFS4_FS is not set
--# CONFIG_FUSE_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+CONFIG_CUSE=m
-+CONFIG_GENERIC_ACL=y
-
- #
- # Caches
-@@ -1538,15 +1911,18 @@ CONFIG_INOTIFY=y
- #
- # CD-ROM/DVD Filesystems
- #
--# CONFIG_ISO9660_FS is not set
--# CONFIG_UDF_FS is not set
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-
- #
- # DOS/FAT/NT Filesystems
- #
--CONFIG_FAT_FS=y
-+CONFIG_FAT_FS=m
- # CONFIG_MSDOS_FS is not set
--CONFIG_VFAT_FS=y
-+CONFIG_VFAT_FS=m
- CONFIG_FAT_DEFAULT_CODEPAGE=437
- CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
- # CONFIG_NTFS_FS is not set
-@@ -1559,9 +1935,9 @@ CONFIG_PROC_SYSCTL=y
- CONFIG_PROC_PAGE_MONITOR=y
- CONFIG_SYSFS=y
- CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
-+CONFIG_TMPFS_POSIX_ACL=y
- # CONFIG_HUGETLB_PAGE is not set
--# CONFIG_CONFIGFS_FS is not set
-+CONFIG_CONFIGFS_FS=m
- CONFIG_MISC_FILESYSTEMS=y
- # CONFIG_ADFS_FS is not set
- # CONFIG_AFFS_FS is not set
-@@ -1585,9 +1961,17 @@ CONFIG_JFFS2_RTIME=y
- CONFIG_JFFS2_CMODE_PRIORITY=y
- # CONFIG_JFFS2_CMODE_SIZE is not set
- # CONFIG_JFFS2_CMODE_FAVOURLZO is not set
-+CONFIG_UBIFS_FS=y
-+CONFIG_UBIFS_FS_XATTR=y
-+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- # CONFIG_LOGFS is not set
- # CONFIG_CRAMFS is not set
--# CONFIG_SQUASHFS is not set
-+CONFIG_SQUASHFS=m
-+# CONFIG_SQUASHFS_EMBEDDED is not set
-+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
- # CONFIG_VXFS_FS is not set
- # CONFIG_MINIX_FS is not set
- # CONFIG_OMFS_FS is not set
-@@ -1596,7 +1980,37 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
- # CONFIG_ROMFS_FS is not set
- # CONFIG_SYSV_FS is not set
- # CONFIG_UFS_FS is not set
--# CONFIG_NETWORK_FILESYSTEMS is not set
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=m
-+CONFIG_NFS_V3=y
-+CONFIG_NFS_V3_ACL=y
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_V4_1 is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V2_ACL=y
-+CONFIG_NFSD_V3=y
-+CONFIG_NFSD_V3_ACL=y
-+CONFIG_NFSD_V4=y
-+CONFIG_LOCKD=m
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_ACL_SUPPORT=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=m
-+CONFIG_SUNRPC_GSS=m
-+CONFIG_RPCSEC_GSS_KRB5=m
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+# CONFIG_CEPH_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+# CONFIG_CIFS_WEAK_PW_HASH is not set
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-
- #
- # Partition Types
-@@ -1617,14 +2031,14 @@ CONFIG_MSDOS_PARTITION=y
- # CONFIG_ULTRIX_PARTITION is not set
- # CONFIG_SUN_PARTITION is not set
- # CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
-+CONFIG_EFI_PARTITION=y
- # CONFIG_SYSV68_PARTITION is not set
- CONFIG_NLS=y
- CONFIG_NLS_DEFAULT="iso8859-1"
--# CONFIG_NLS_CODEPAGE_437 is not set
-+CONFIG_NLS_CODEPAGE_437=y
- # CONFIG_NLS_CODEPAGE_737 is not set
- # CONFIG_NLS_CODEPAGE_775 is not set
--# CONFIG_NLS_CODEPAGE_850 is not set
-+CONFIG_NLS_CODEPAGE_850=m
- # CONFIG_NLS_CODEPAGE_852 is not set
- # CONFIG_NLS_CODEPAGE_855 is not set
- # CONFIG_NLS_CODEPAGE_857 is not set
-@@ -1634,19 +2048,19 @@ CONFIG_NLS_DEFAULT="iso8859-1"
- # CONFIG_NLS_CODEPAGE_863 is not set
- # CONFIG_NLS_CODEPAGE_864 is not set
- # CONFIG_NLS_CODEPAGE_865 is not set
--# CONFIG_NLS_CODEPAGE_866 is not set
-+CONFIG_NLS_CODEPAGE_866=m
- # CONFIG_NLS_CODEPAGE_869 is not set
--# CONFIG_NLS_CODEPAGE_936 is not set
--# CONFIG_NLS_CODEPAGE_950 is not set
-+CONFIG_NLS_CODEPAGE_936=m
-+CONFIG_NLS_CODEPAGE_950=m
- # CONFIG_NLS_CODEPAGE_932 is not set
- # CONFIG_NLS_CODEPAGE_949 is not set
- # CONFIG_NLS_CODEPAGE_874 is not set
- # CONFIG_NLS_ISO8859_8 is not set
--# CONFIG_NLS_CODEPAGE_1250 is not set
--# CONFIG_NLS_CODEPAGE_1251 is not set
--# CONFIG_NLS_ASCII is not set
--# CONFIG_NLS_ISO8859_1 is not set
--# CONFIG_NLS_ISO8859_2 is not set
-+CONFIG_NLS_CODEPAGE_1250=m
-+CONFIG_NLS_CODEPAGE_1251=m
-+CONFIG_NLS_ASCII=m
-+CONFIG_NLS_ISO8859_1=m
-+CONFIG_NLS_ISO8859_2=m
- # CONFIG_NLS_ISO8859_3 is not set
- # CONFIG_NLS_ISO8859_4 is not set
- # CONFIG_NLS_ISO8859_5 is not set
-@@ -1658,75 +2072,34 @@ CONFIG_NLS_DEFAULT="iso8859-1"
- # CONFIG_NLS_ISO8859_15 is not set
- # CONFIG_NLS_KOI8_R is not set
- # CONFIG_NLS_KOI8_U is not set
--# CONFIG_NLS_UTF8 is not set
-+CONFIG_NLS_UTF8=m
- # CONFIG_DLM is not set
-
- #
- # Kernel hacking
- #
--# CONFIG_PRINTK_TIME is not set
-+CONFIG_PRINTK_TIME=y
- # CONFIG_ENABLE_WARN_DEPRECATED is not set
- # CONFIG_ENABLE_MUST_CHECK is not set
- CONFIG_FRAME_WARN=1024
- # CONFIG_MAGIC_SYSRQ is not set
--# CONFIG_STRIP_ASM_SYMS is not set
-+CONFIG_STRIP_ASM_SYMS=y
- # CONFIG_UNUSED_SYMBOLS is not set
- # CONFIG_DEBUG_FS is not set
- # CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
--CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
--CONFIG_DETECT_HUNG_TASK=y
--# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
--CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--# CONFIG_TIMER_STATS is not set
--# CONFIG_DEBUG_OBJECTS is not set
--# CONFIG_DEBUG_SLAB is not set
--# CONFIG_DEBUG_KMEMLEAK is not set
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_LOCK_ALLOC is not set
--# CONFIG_PROVE_LOCKING is not set
--# CONFIG_LOCK_STAT is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
-+# CONFIG_DEBUG_KERNEL is not set
- CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_WRITECOUNT is not set
- CONFIG_DEBUG_MEMORY_INIT=y
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--# CONFIG_DEBUG_NOTIFIERS is not set
--# CONFIG_DEBUG_CREDENTIALS is not set
--CONFIG_FRAME_POINTER=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
- # CONFIG_RCU_CPU_STALL_DETECTOR is not set
--# CONFIG_BACKTRACE_SELF_TEST is not set
--# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
--# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
--# CONFIG_FAULT_INJECTION is not set
- # CONFIG_LATENCYTOP is not set
- # CONFIG_SYSCTL_SYSCALL_CHECK is not set
--# CONFIG_PAGE_POISONING is not set
- CONFIG_HAVE_FUNCTION_TRACER=y
- CONFIG_TRACING_SUPPORT=y
- # CONFIG_FTRACE is not set
- # CONFIG_SAMPLES is not set
- CONFIG_HAVE_ARCH_KGDB=y
--# CONFIG_KGDB is not set
-+CONFIG_ARM_UNWIND=y
- # CONFIG_DEBUG_USER is not set
--# CONFIG_DEBUG_ERRORS is not set
--# CONFIG_DEBUG_STACK_USAGE is not set
--# CONFIG_DEBUG_LL is not set
- # CONFIG_OC_ETM is not set
- CONFIG_DEBUG_S3C_UART=2
-
-@@ -1748,16 +2121,22 @@ CONFIG_CRYPTO=y
- #
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_ALGAPI2=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_AEAD2=y
-+CONFIG_CRYPTO_BLKCIPHER=m
-+CONFIG_CRYPTO_BLKCIPHER2=y
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_HASH2=y
-+CONFIG_CRYPTO_RNG2=y
- CONFIG_CRYPTO_PCOMP=y
--# CONFIG_CRYPTO_MANAGER is not set
--# CONFIG_CRYPTO_MANAGER2 is not set
--# CONFIG_CRYPTO_GF128MUL is not set
--# CONFIG_CRYPTO_NULL is not set
-+CONFIG_CRYPTO_MANAGER=m
-+CONFIG_CRYPTO_MANAGER2=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+CONFIG_CRYPTO_WORKQUEUE=y
- # CONFIG_CRYPTO_CRYPTD is not set
--# CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_TEST is not set
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-
- #
- # Authenticated Encryption with Associated Data
-@@ -1769,64 +2148,65 @@ CONFIG_CRYPTO_PCOMP=y
- #
- # Block modes
- #
--# CONFIG_CRYPTO_CBC is not set
-+CONFIG_CRYPTO_CBC=m
- # CONFIG_CRYPTO_CTR is not set
- # CONFIG_CRYPTO_CTS is not set
--# CONFIG_CRYPTO_ECB is not set
--# CONFIG_CRYPTO_LRW is not set
--# CONFIG_CRYPTO_PCBC is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
- # CONFIG_CRYPTO_XTS is not set
-
- #
- # Hash modes
- #
--# CONFIG_CRYPTO_HMAC is not set
--# CONFIG_CRYPTO_XCBC is not set
-+CONFIG_CRYPTO_HMAC=m
-+CONFIG_CRYPTO_XCBC=m
- # CONFIG_CRYPTO_VMAC is not set
-
- #
- # Digest
- #
--# CONFIG_CRYPTO_CRC32C is not set
-+CONFIG_CRYPTO_CRC32C=y
- # CONFIG_CRYPTO_GHASH is not set
--# CONFIG_CRYPTO_MD4 is not set
-+CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
--# CONFIG_CRYPTO_MICHAEL_MIC is not set
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- # CONFIG_CRYPTO_RMD128 is not set
- # CONFIG_CRYPTO_RMD160 is not set
- # CONFIG_CRYPTO_RMD256 is not set
- # CONFIG_CRYPTO_RMD320 is not set
--# CONFIG_CRYPTO_SHA1 is not set
--# CONFIG_CRYPTO_SHA256 is not set
--# CONFIG_CRYPTO_SHA512 is not set
--# CONFIG_CRYPTO_TGR192 is not set
--# CONFIG_CRYPTO_WP512 is not set
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-
- #
- # Ciphers
- #
- # CONFIG_CRYPTO_AES is not set
--# CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_ARC4 is not set
--# CONFIG_CRYPTO_BLOWFISH is not set
--# CONFIG_CRYPTO_CAMELLIA is not set
--# CONFIG_CRYPTO_CAST5 is not set
--# CONFIG_CRYPTO_CAST6 is not set
--# CONFIG_CRYPTO_DES is not set
--# CONFIG_CRYPTO_FCRYPT is not set
--# CONFIG_CRYPTO_KHAZAD is not set
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_DES=m
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_KHAZAD=m
- # CONFIG_CRYPTO_SALSA20 is not set
- # CONFIG_CRYPTO_SEED is not set
--# CONFIG_CRYPTO_SERPENT is not set
--# CONFIG_CRYPTO_TEA is not set
--# CONFIG_CRYPTO_TWOFISH is not set
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-
- #
- # Compression
- #
--# CONFIG_CRYPTO_DEFLATE is not set
-+CONFIG_CRYPTO_DEFLATE=y
- CONFIG_CRYPTO_ZLIB=y
--# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_LZO=y
-
- #
- # Random Number Generation
-@@ -1846,12 +2226,19 @@ CONFIG_CRC_T10DIF=y
- CONFIG_CRC_ITU_T=y
- CONFIG_CRC32=y
- CONFIG_CRC7=y
--# CONFIG_LIBCRC32C is not set
-+CONFIG_LIBCRC32C=y
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
- CONFIG_DECOMPRESS_GZIP=y
- CONFIG_DECOMPRESS_BZIP2=y
- CONFIG_DECOMPRESS_LZMA=y
-+CONFIG_DECOMPRESS_LZO=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
- CONFIG_NLATTR=y
-diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig
-index 59e805f..4ee7b28 100644
---- a/arch/arm/configs/gta02_defconfig
-+++ b/arch/arm/configs/gta02_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.34
--# Wed May 19 18:23:25 2010
-+# Linux kernel version: 2.6.34.7
-+# Fri Oct 29 12:33:18 2010
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -32,7 +32,6 @@ CONFIG_CONSTRUCTORS=y
- #
- CONFIG_EXPERIMENTAL=y
- CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
- CONFIG_INIT_ENV_ARG_LIMIT=32
- CONFIG_LOCALVERSION=""
- # CONFIG_LOCALVERSION_AUTO is not set
-@@ -85,7 +84,6 @@ CONFIG_ANON_INODES=y
- CONFIG_UID16=y
- CONFIG_SYSCTL_SYSCALL=y
- CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
- # CONFIG_KALLSYMS_EXTRA_PASS is not set
- CONFIG_HOTPLUG=y
- CONFIG_PRINTK=y
-@@ -122,9 +120,7 @@ CONFIG_HAVE_CLK=y
- #
- # GCOV-based kernel profiling
- #
--# CONFIG_GCOV_KERNEL is not set
- CONFIG_SLOW_WORK=y
--# CONFIG_SLOW_WORK_DEBUG is not set
- CONFIG_HAVE_GENERIC_DMA_COHERENT=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
-@@ -156,27 +152,27 @@ CONFIG_DEFAULT_IOSCHED="deadline"
- # CONFIG_INLINE_SPIN_LOCK_BH is not set
- # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
- # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
--# CONFIG_INLINE_SPIN_UNLOCK is not set
-+CONFIG_INLINE_SPIN_UNLOCK=y
- # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
--# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
- # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
- # CONFIG_INLINE_READ_TRYLOCK is not set
- # CONFIG_INLINE_READ_LOCK is not set
- # CONFIG_INLINE_READ_LOCK_BH is not set
- # CONFIG_INLINE_READ_LOCK_IRQ is not set
- # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
--# CONFIG_INLINE_READ_UNLOCK is not set
-+CONFIG_INLINE_READ_UNLOCK=y
- # CONFIG_INLINE_READ_UNLOCK_BH is not set
--# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-+CONFIG_INLINE_READ_UNLOCK_IRQ=y
- # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
- # CONFIG_INLINE_WRITE_TRYLOCK is not set
- # CONFIG_INLINE_WRITE_LOCK is not set
- # CONFIG_INLINE_WRITE_LOCK_BH is not set
- # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
- # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
--# CONFIG_INLINE_WRITE_UNLOCK is not set
-+CONFIG_INLINE_WRITE_UNLOCK=y
- # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
--# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
- # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
- # CONFIG_MUTEX_SPIN_ON_OWNER is not set
- CONFIG_FREEZER=y
-@@ -245,7 +241,7 @@ CONFIG_S3C_BOOT_WATCHDOG=y
- CONFIG_S3C_BOOT_ERROR_RESET=y
- CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
- CONFIG_S3C_LOWLEVEL_UART_PORT=2
--CONFIG_SAMSUNG_GPIO_EXTRA=0
-+CONFIG_SAMSUNG_GPIO_EXTRA=64
- CONFIG_S3C_GPIO_SPACE=0
- CONFIG_S3C_ADC=y
- CONFIG_S3C_DEV_USB_HOST=y
-@@ -262,7 +258,8 @@ CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
- CONFIG_CPU_LLSERIAL_S3C2440=y
- CONFIG_S3C2410_CLOCK=y
- CONFIG_S3C24XX_PWM=y
--CONFIG_S3C24XX_GPIO_EXTRA=0
-+CONFIG_S3C24XX_GPIO_EXTRA=64
-+CONFIG_S3C24XX_GPIO_EXTRA64=y
- CONFIG_S3C2410_DMA=y
- # CONFIG_S3C2410_DMA_DEBUG is not set
-
-@@ -352,9 +349,9 @@ CONFIG_VMSPLIT_3G=y
- # CONFIG_VMSPLIT_2G is not set
- # CONFIG_VMSPLIT_1G is not set
- CONFIG_PAGE_OFFSET=0xC0000000
--# CONFIG_PREEMPT_NONE is not set
-+CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
--CONFIG_PREEMPT=y
-+# CONFIG_PREEMPT is not set
- CONFIG_HZ=200
- CONFIG_AEABI=y
- # CONFIG_OABI_COMPAT is not set
-@@ -467,8 +464,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
- CONFIG_INET_XFRM_MODE_TUNNEL=m
- CONFIG_INET_XFRM_MODE_BEET=m
- # CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
-+CONFIG_INET_DIAG=m
-+CONFIG_INET_TCP_DIAG=m
- CONFIG_TCP_CONG_ADVANCED=y
- # CONFIG_TCP_CONG_BIC is not set
- # CONFIG_TCP_CONG_CUBIC is not set
-@@ -678,13 +675,13 @@ CONFIG_BRIDGE_EBT_ULOG=m
- # CONFIG_RDS is not set
- # CONFIG_TIPC is not set
- # CONFIG_ATM is not set
--CONFIG_STP=y
--CONFIG_BRIDGE=y
-+CONFIG_STP=m
-+CONFIG_BRIDGE=m
- CONFIG_BRIDGE_IGMP_SNOOPING=y
- # CONFIG_NET_DSA is not set
- # CONFIG_VLAN_8021Q is not set
- # CONFIG_DECNET is not set
--CONFIG_LLC=y
-+CONFIG_LLC=m
- # CONFIG_LLC2 is not set
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
-@@ -741,20 +738,20 @@ CONFIG_NET_SCH_FIFO=y
- # CONFIG_HAMRADIO is not set
- # CONFIG_CAN is not set
- # CONFIG_IRDA is not set
--CONFIG_BT=y
--CONFIG_BT_L2CAP=y
--CONFIG_BT_SCO=y
--CONFIG_BT_RFCOMM=y
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP=m
- CONFIG_BT_BNEP_MC_FILTER=y
- CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=y
-+CONFIG_BT_HIDP=m
-
- #
- # Bluetooth device drivers
- #
--CONFIG_BT_HCIBTUSB=y
-+CONFIG_BT_HCIBTUSB=m
- # CONFIG_BT_HCIBTSDIO is not set
- # CONFIG_BT_HCIUART is not set
- # CONFIG_BT_HCIBCM203X is not set
-@@ -777,6 +774,10 @@ CONFIG_WIRELESS_EXT_SYSFS=y
- #
- # CFG80211 needs to be enabled for MAC80211
- #
-+
-+#
-+# Some wireless drivers require a rate control algorithm
-+#
- # CONFIG_WIMAX is not set
- CONFIG_RFKILL=y
- CONFIG_RFKILL_LEDS=y
-@@ -906,21 +907,7 @@ CONFIG_MTD_UBI_GLUEBI=y
- #
- # UBI debugging options
- #
--CONFIG_MTD_UBI_DEBUG=y
--# CONFIG_MTD_UBI_DEBUG_MSG is not set
--# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
--CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
--# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
--# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
--# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
--
--#
--# Additional UBI debugging messages
--#
--# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
--# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
--# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
--# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
-+# CONFIG_MTD_UBI_DEBUG is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -936,7 +923,26 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
- # CONFIG_CDROM_PKTCDVD is not set
- # CONFIG_ATA_OVER_ETH is not set
- # CONFIG_MG_DISK is not set
--# CONFIG_MISC_DEVICES is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_AD525X_DPOT is not set
-+# CONFIG_ICS932S401 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+# CONFIG_ISL29003 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_TI_DAC7512 is not set
-+CONFIG_OPENMOKO_RESUME_REASON=y
-+# CONFIG_C2PORT is not set
-+
-+#
-+# EEPROM support
-+#
-+# CONFIG_EEPROM_AT24 is not set
-+# CONFIG_EEPROM_AT25 is not set
-+# CONFIG_EEPROM_LEGACY is not set
-+# CONFIG_EEPROM_MAX6875 is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IWMC3200TOP is not set
- CONFIG_HAVE_IDE=y
- # CONFIG_IDE is not set
-
-@@ -1247,6 +1253,7 @@ CONFIG_GPIO_SYSFS=y
- #
- # Memory mapped GPIO expanders:
- #
-+CONFIG_GPIO_GLAMO=y
- # CONFIG_GPIO_IT8761E is not set
-
- #
-@@ -1338,9 +1345,6 @@ CONFIG_PCF50633_ADC=y
- # CONFIG_EZX_PCAP is not set
- # CONFIG_AB4500_CORE is not set
- CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
--CONFIG_MFD_GLAMO_GPIO=y
--CONFIG_MFD_GLAMO_MCI=y
- CONFIG_REGULATOR=y
- # CONFIG_REGULATOR_DEBUG is not set
- # CONFIG_REGULATOR_DUMMY is not set
-@@ -1393,6 +1397,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
- # CONFIG_FB_METRONOME is not set
- # CONFIG_FB_MB862XX is not set
- # CONFIG_FB_BROADSHEET is not set
-+CONFIG_FB_GLAMO=y
- CONFIG_BACKLIGHT_LCD_SUPPORT=y
- CONFIG_LCD_CLASS_DEVICE=y
- # CONFIG_LCD_L4F00242T03 is not set
-@@ -1425,18 +1430,18 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
- CONFIG_FONT_8x8=y
- CONFIG_FONT_8x16=y
- # CONFIG_LOGO is not set
--CONFIG_SOUND=y
-+CONFIG_SOUND=m
- CONFIG_SOUND_OSS_CORE=y
- CONFIG_SOUND_OSS_CORE_PRECLAIM=y
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
- CONFIG_SND_JACK=y
--CONFIG_SND_SEQUENCER=y
--CONFIG_SND_SEQ_DUMMY=y
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
- CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=y
--CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
- CONFIG_SND_PCM_OSS_PLUGINS=y
- CONFIG_SND_SEQUENCER_OSS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
-@@ -1453,18 +1458,18 @@ CONFIG_SND_SEQUENCER_OSS=y
- # CONFIG_SND_ARM is not set
- # CONFIG_SND_SPI is not set
- # CONFIG_SND_USB is not set
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
- # CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
- # CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 is not set
- # CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES is not set
--CONFIG_SND_SOC_I2C_AND_SPI=y
-+CONFIG_SND_SOC_I2C_AND_SPI=m
- # CONFIG_SND_SOC_ALL_CODECS is not set
--CONFIG_SND_SOC_WM8753=y
--CONFIG_SND_SOC_LM4857=y
-+CONFIG_SND_SOC_WM8753=m
-+CONFIG_SND_SOC_LM4857=m
- # CONFIG_SOUND_PRIME is not set
- CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
-@@ -1473,7 +1478,7 @@ CONFIG_HID=y
- #
- # USB Input Devices
- #
--CONFIG_USB_HID=y
-+CONFIG_USB_HID=m
- # CONFIG_HID_PID is not set
- # CONFIG_USB_HIDDEV is not set
-
-@@ -1481,52 +1486,52 @@ CONFIG_USB_HID=y
- # Special HID drivers
- #
- # CONFIG_HID_3M_PCT is not set
--CONFIG_HID_A4TECH=y
--CONFIG_HID_APPLE=y
--CONFIG_HID_BELKIN=y
--CONFIG_HID_CHERRY=y
--CONFIG_HID_CHICONY=y
--CONFIG_HID_CYPRESS=y
--CONFIG_HID_DRAGONRISE=y
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
- # CONFIG_DRAGONRISE_FF is not set
--CONFIG_HID_EZKEY=y
--CONFIG_HID_KYE=y
--CONFIG_HID_GYRATION=y
--CONFIG_HID_TWINHAN=y
--CONFIG_HID_KENSINGTON=y
--CONFIG_HID_LOGITECH=y
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LOGITECH=m
- # CONFIG_LOGITECH_FF is not set
- # CONFIG_LOGIRUMBLEPAD2_FF is not set
- # CONFIG_LOGIG940_FF is not set
- # CONFIG_HID_MAGICMOUSE is not set
--CONFIG_HID_MICROSOFT=y
-+CONFIG_HID_MICROSOFT=m
- # CONFIG_HID_MOSART is not set
--CONFIG_HID_MONTEREY=y
--CONFIG_HID_NTRIG=y
--CONFIG_HID_ORTEK=y
--CONFIG_HID_PANTHERLORD=y
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
- # CONFIG_PANTHERLORD_FF is not set
--CONFIG_HID_PETALYNX=y
-+CONFIG_HID_PETALYNX=m
- # CONFIG_HID_QUANTA is not set
--CONFIG_HID_SAMSUNG=y
--CONFIG_HID_SONY=y
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
- # CONFIG_HID_STANTUM is not set
--CONFIG_HID_SUNPLUS=y
--CONFIG_HID_GREENASIA=y
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
- # CONFIG_GREENASIA_FF is not set
--CONFIG_HID_SMARTJOYPLUS=y
-+CONFIG_HID_SMARTJOYPLUS=m
- # CONFIG_SMARTJOYPLUS_FF is not set
--CONFIG_HID_TOPSEED=y
--CONFIG_HID_THRUSTMASTER=y
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THRUSTMASTER=m
- # CONFIG_THRUSTMASTER_FF is not set
--CONFIG_HID_WACOM=y
--CONFIG_HID_ZEROPLUS=y
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_ZEROPLUS=m
- # CONFIG_ZEROPLUS_FF is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
- # CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
-+CONFIG_USB=m
- # CONFIG_USB_DEBUG is not set
- CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-@@ -1548,7 +1553,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
- # CONFIG_USB_ISP116X_HCD is not set
- # CONFIG_USB_ISP1760_HCD is not set
- # CONFIG_USB_ISP1362_HCD is not set
--CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD=m
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
- CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-@@ -1669,9 +1674,8 @@ CONFIG_USB_TRANCEVIBRATOR=m
- CONFIG_USB_IOWARRIOR=m
- # CONFIG_USB_TEST is not set
- # CONFIG_USB_ISIGHTFW is not set
--CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET=m
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
--# CONFIG_USB_GADGET_DEBUG_FS is not set
- CONFIG_USB_GADGET_VBUS_DRAW=500
- CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_AT91 is not set
-@@ -1685,7 +1689,7 @@ CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_S3C_HSOTG is not set
- # CONFIG_USB_GADGET_IMX is not set
- CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
-+CONFIG_USB_S3C2410=m
- # CONFIG_USB_S3C2410_DEBUG is not set
- # CONFIG_USB_GADGET_M66592 is not set
- # CONFIG_USB_GADGET_AMD5536UDC is not set
-@@ -1701,13 +1705,14 @@ CONFIG_USB_S3C2410=y
- CONFIG_USB_ETH=m
- CONFIG_USB_ETH_RNDIS=y
- # CONFIG_USB_ETH_EEM is not set
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_MASS_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+# CONFIG_USB_FILE_STORAGE_TEST is not set
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
- # CONFIG_USB_MIDI_GADGET is not set
- # CONFIG_USB_G_PRINTER is not set
--# CONFIG_USB_CDC_COMPOSITE is not set
-+CONFIG_USB_CDC_COMPOSITE=m
- # CONFIG_USB_G_NOKIA is not set
- # CONFIG_USB_G_MULTI is not set
-
-@@ -1739,22 +1744,23 @@ CONFIG_MMC_S3C=y
- CONFIG_MMC_S3C_PIO=y
- # CONFIG_MMC_S3C_DMA is not set
- # CONFIG_MMC_S3C_PIODMA is not set
-+CONFIG_MMC_GLAMO=y
- # CONFIG_MEMSTICK is not set
- CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_CLASS=m
-
- #
- # LED drivers
- #
--CONFIG_LEDS_S3C24XX=y
-+CONFIG_LEDS_S3C24XX=m
- # CONFIG_LEDS_PCA9532 is not set
--CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO=m
- CONFIG_LEDS_GPIO_PLATFORM=y
- # CONFIG_LEDS_LP3944 is not set
- # CONFIG_LEDS_PCA955X is not set
- # CONFIG_LEDS_DAC124S085 is not set
--CONFIG_LEDS_PWM=y
--CONFIG_LEDS_REGULATOR=y
-+CONFIG_LEDS_PWM=m
-+CONFIG_LEDS_REGULATOR=m
- # CONFIG_LEDS_BD2802 is not set
- # CONFIG_LEDS_LT3593 is not set
- CONFIG_LEDS_TRIGGERS=y
-@@ -1762,8 +1768,8 @@ CONFIG_LEDS_TRIGGERS=y
- #
- # LED Triggers
- #
--CONFIG_LEDS_TRIGGER_TIMER=y
--CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_TIMER=m
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
- # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
- # CONFIG_LEDS_TRIGGER_GPIO is not set
- # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-@@ -1848,7 +1854,7 @@ CONFIG_RTC_DRV_S3C=y
- # TI VLYNQ
- #
- # CONFIG_STAGING is not set
--CONFIG_AR6000_WLAN=y
-+CONFIG_AR6000_WLAN=m
- # CONFIG_AR6000_WLAN_DEBUG is not set
- # CONFIG_AR6000_WLAN_RESET is not set
-
-@@ -1863,16 +1869,20 @@ CONFIG_EXT3_FS=y
- # CONFIG_EXT3_FS_XATTR is not set
- # CONFIG_EXT4_FS is not set
- CONFIG_JBD=y
--# CONFIG_JBD_DEBUG is not set
--CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS=y
- # CONFIG_REISERFS_CHECK is not set
- # CONFIG_REISERFS_PROC_INFO is not set
- # CONFIG_REISERFS_FS_XATTR is not set
- # CONFIG_JFS_FS is not set
- CONFIG_FS_POSIX_ACL=y
--# CONFIG_XFS_FS is not set
-+CONFIG_XFS_FS=m
-+# CONFIG_XFS_QUOTA is not set
-+# CONFIG_XFS_POSIX_ACL is not set
-+# CONFIG_XFS_RT is not set
-+# CONFIG_XFS_DEBUG is not set
- # CONFIG_OCFS2_FS is not set
--# CONFIG_BTRFS_FS is not set
-+CONFIG_BTRFS_FS=m
-+# CONFIG_BTRFS_FS_POSIX_ACL is not set
- # CONFIG_NILFS2_FS is not set
- CONFIG_FILE_LOCKING=y
- CONFIG_FSNOTIFY=y
-@@ -1945,9 +1955,7 @@ CONFIG_UBIFS_FS_XATTR=y
- CONFIG_UBIFS_FS_ADVANCED_COMPR=y
- CONFIG_UBIFS_FS_LZO=y
- CONFIG_UBIFS_FS_ZLIB=y
--CONFIG_UBIFS_FS_DEBUG=y
--CONFIG_UBIFS_FS_DEBUG_MSG_LVL=0
--CONFIG_UBIFS_FS_DEBUG_CHKS=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- # CONFIG_LOGFS is not set
- # CONFIG_CRAMFS is not set
- CONFIG_SQUASHFS=m
-@@ -2012,7 +2020,7 @@ CONFIG_MSDOS_PARTITION=y
- # CONFIG_ULTRIX_PARTITION is not set
- # CONFIG_SUN_PARTITION is not set
- # CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
-+CONFIG_EFI_PARTITION=y
- # CONFIG_SYSV68_PARTITION is not set
- CONFIG_NLS=y
- CONFIG_NLS_DEFAULT="iso8859-1"
-@@ -2066,20 +2074,18 @@ CONFIG_FRAME_WARN=1024
- # CONFIG_MAGIC_SYSRQ is not set
- CONFIG_STRIP_ASM_SYMS=y
- # CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
-+# CONFIG_DEBUG_FS is not set
- # CONFIG_HEADERS_CHECK is not set
- # CONFIG_DEBUG_KERNEL is not set
- CONFIG_DEBUG_BUGVERBOSE=y
- CONFIG_DEBUG_MEMORY_INIT=y
- CONFIG_FRAME_POINTER=y
- # CONFIG_RCU_CPU_STALL_DETECTOR is not set
--# CONFIG_LKDTM is not set
- # CONFIG_LATENCYTOP is not set
- # CONFIG_SYSCTL_SYSCALL_CHECK is not set
- CONFIG_HAVE_FUNCTION_TRACER=y
- CONFIG_TRACING_SUPPORT=y
- # CONFIG_FTRACE is not set
--# CONFIG_DYNAMIC_DEBUG is not set
- # CONFIG_SAMPLES is not set
- CONFIG_HAVE_ARCH_KGDB=y
- # CONFIG_ARM_UNWIND is not set
-@@ -2150,7 +2156,7 @@ CONFIG_CRYPTO_XCBC=m
- #
- # Digest
- #
--CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CRC32C=y
- # CONFIG_CRYPTO_GHASH is not set
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-@@ -2210,7 +2216,7 @@ CONFIG_CRC_T10DIF=y
- CONFIG_CRC_ITU_T=y
- CONFIG_CRC32=y
- CONFIG_CRC7=y
--CONFIG_LIBCRC32C=m
-+CONFIG_LIBCRC32C=y
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
- CONFIG_LZO_COMPRESS=y
-diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig
-index e966539..f0f4b9a 100644
---- a/arch/arm/configs/gta02_drm_defconfig
-+++ b/arch/arm/configs/gta02_drm_defconfig
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.34
--# Wed May 19 18:50:43 2010
-+# Linux kernel version: 2.6.34.7
-+# Fri Oct 29 12:33:18 2010
- #
- CONFIG_ARM=y
- CONFIG_HAVE_PWM=y
-@@ -32,7 +32,6 @@ CONFIG_CONSTRUCTORS=y
- #
- CONFIG_EXPERIMENTAL=y
- CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
- CONFIG_INIT_ENV_ARG_LIMIT=32
- CONFIG_LOCALVERSION=""
- # CONFIG_LOCALVERSION_AUTO is not set
-@@ -85,7 +84,6 @@ CONFIG_ANON_INODES=y
- CONFIG_UID16=y
- CONFIG_SYSCTL_SYSCALL=y
- CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
- # CONFIG_KALLSYMS_EXTRA_PASS is not set
- CONFIG_HOTPLUG=y
- CONFIG_PRINTK=y
-@@ -122,9 +120,7 @@ CONFIG_HAVE_CLK=y
- #
- # GCOV-based kernel profiling
- #
--# CONFIG_GCOV_KERNEL is not set
- CONFIG_SLOW_WORK=y
--# CONFIG_SLOW_WORK_DEBUG is not set
- CONFIG_HAVE_GENERIC_DMA_COHERENT=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
-@@ -156,27 +152,27 @@ CONFIG_DEFAULT_IOSCHED="deadline"
- # CONFIG_INLINE_SPIN_LOCK_BH is not set
- # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
- # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
--# CONFIG_INLINE_SPIN_UNLOCK is not set
-+CONFIG_INLINE_SPIN_UNLOCK=y
- # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
--# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
-+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
- # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
- # CONFIG_INLINE_READ_TRYLOCK is not set
- # CONFIG_INLINE_READ_LOCK is not set
- # CONFIG_INLINE_READ_LOCK_BH is not set
- # CONFIG_INLINE_READ_LOCK_IRQ is not set
- # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
--# CONFIG_INLINE_READ_UNLOCK is not set
-+CONFIG_INLINE_READ_UNLOCK=y
- # CONFIG_INLINE_READ_UNLOCK_BH is not set
--# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
-+CONFIG_INLINE_READ_UNLOCK_IRQ=y
- # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
- # CONFIG_INLINE_WRITE_TRYLOCK is not set
- # CONFIG_INLINE_WRITE_LOCK is not set
- # CONFIG_INLINE_WRITE_LOCK_BH is not set
- # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
- # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
--# CONFIG_INLINE_WRITE_UNLOCK is not set
-+CONFIG_INLINE_WRITE_UNLOCK=y
- # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
--# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
-+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
- # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
- # CONFIG_MUTEX_SPIN_ON_OWNER is not set
- CONFIG_FREEZER=y
-@@ -245,7 +241,7 @@ CONFIG_S3C_BOOT_WATCHDOG=y
- CONFIG_S3C_BOOT_ERROR_RESET=y
- CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
- CONFIG_S3C_LOWLEVEL_UART_PORT=2
--CONFIG_SAMSUNG_GPIO_EXTRA=0
-+CONFIG_SAMSUNG_GPIO_EXTRA=64
- CONFIG_S3C_GPIO_SPACE=0
- CONFIG_S3C_ADC=y
- CONFIG_S3C_DEV_USB_HOST=y
-@@ -262,7 +258,8 @@ CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
- CONFIG_CPU_LLSERIAL_S3C2440=y
- CONFIG_S3C2410_CLOCK=y
- CONFIG_S3C24XX_PWM=y
--CONFIG_S3C24XX_GPIO_EXTRA=0
-+CONFIG_S3C24XX_GPIO_EXTRA=64
-+CONFIG_S3C24XX_GPIO_EXTRA64=y
- CONFIG_S3C2410_DMA=y
- # CONFIG_S3C2410_DMA_DEBUG is not set
-
-@@ -352,9 +349,9 @@ CONFIG_VMSPLIT_3G=y
- # CONFIG_VMSPLIT_2G is not set
- # CONFIG_VMSPLIT_1G is not set
- CONFIG_PAGE_OFFSET=0xC0000000
--# CONFIG_PREEMPT_NONE is not set
-+CONFIG_PREEMPT_NONE=y
- # CONFIG_PREEMPT_VOLUNTARY is not set
--CONFIG_PREEMPT=y
-+# CONFIG_PREEMPT is not set
- CONFIG_HZ=200
- CONFIG_AEABI=y
- # CONFIG_OABI_COMPAT is not set
-@@ -467,8 +464,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m
- CONFIG_INET_XFRM_MODE_TUNNEL=m
- CONFIG_INET_XFRM_MODE_BEET=m
- # CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
-+CONFIG_INET_DIAG=m
-+CONFIG_INET_TCP_DIAG=m
- CONFIG_TCP_CONG_ADVANCED=y
- # CONFIG_TCP_CONG_BIC is not set
- # CONFIG_TCP_CONG_CUBIC is not set
-@@ -678,13 +675,13 @@ CONFIG_BRIDGE_EBT_ULOG=m
- # CONFIG_RDS is not set
- # CONFIG_TIPC is not set
- # CONFIG_ATM is not set
--CONFIG_STP=y
--CONFIG_BRIDGE=y
-+CONFIG_STP=m
-+CONFIG_BRIDGE=m
- CONFIG_BRIDGE_IGMP_SNOOPING=y
- # CONFIG_NET_DSA is not set
- # CONFIG_VLAN_8021Q is not set
- # CONFIG_DECNET is not set
--CONFIG_LLC=y
-+CONFIG_LLC=m
- # CONFIG_LLC2 is not set
- # CONFIG_IPX is not set
- # CONFIG_ATALK is not set
-@@ -741,20 +738,20 @@ CONFIG_NET_SCH_FIFO=y
- # CONFIG_HAMRADIO is not set
- # CONFIG_CAN is not set
- # CONFIG_IRDA is not set
--CONFIG_BT=y
--CONFIG_BT_L2CAP=y
--CONFIG_BT_SCO=y
--CONFIG_BT_RFCOMM=y
-+CONFIG_BT=m
-+CONFIG_BT_L2CAP=m
-+CONFIG_BT_SCO=m
-+CONFIG_BT_RFCOMM=m
- CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP=m
- CONFIG_BT_BNEP_MC_FILTER=y
- CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=y
-+CONFIG_BT_HIDP=m
-
- #
- # Bluetooth device drivers
- #
--CONFIG_BT_HCIBTUSB=y
-+CONFIG_BT_HCIBTUSB=m
- # CONFIG_BT_HCIBTSDIO is not set
- # CONFIG_BT_HCIUART is not set
- # CONFIG_BT_HCIBCM203X is not set
-@@ -777,6 +774,10 @@ CONFIG_WIRELESS_EXT_SYSFS=y
- #
- # CFG80211 needs to be enabled for MAC80211
- #
-+
-+#
-+# Some wireless drivers require a rate control algorithm
-+#
- # CONFIG_WIMAX is not set
- CONFIG_RFKILL=y
- CONFIG_RFKILL_LEDS=y
-@@ -906,21 +907,7 @@ CONFIG_MTD_UBI_GLUEBI=y
- #
- # UBI debugging options
- #
--CONFIG_MTD_UBI_DEBUG=y
--# CONFIG_MTD_UBI_DEBUG_MSG is not set
--# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
--CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
--# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
--# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
--# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
--
--#
--# Additional UBI debugging messages
--#
--# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
--# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
--# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
--# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
-+# CONFIG_MTD_UBI_DEBUG is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -936,7 +923,26 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
- # CONFIG_CDROM_PKTCDVD is not set
- # CONFIG_ATA_OVER_ETH is not set
- # CONFIG_MG_DISK is not set
--# CONFIG_MISC_DEVICES is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_AD525X_DPOT is not set
-+# CONFIG_ICS932S401 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+# CONFIG_ISL29003 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_TI_DAC7512 is not set
-+CONFIG_OPENMOKO_RESUME_REASON=y
-+# CONFIG_C2PORT is not set
-+
-+#
-+# EEPROM support
-+#
-+# CONFIG_EEPROM_AT24 is not set
-+# CONFIG_EEPROM_AT25 is not set
-+# CONFIG_EEPROM_LEGACY is not set
-+# CONFIG_EEPROM_MAX6875 is not set
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IWMC3200TOP is not set
- CONFIG_HAVE_IDE=y
- # CONFIG_IDE is not set
-
-@@ -1247,6 +1253,7 @@ CONFIG_GPIO_SYSFS=y
- #
- # Memory mapped GPIO expanders:
- #
-+CONFIG_GPIO_GLAMO=y
- # CONFIG_GPIO_IT8761E is not set
-
- #
-@@ -1338,10 +1345,6 @@ CONFIG_PCF50633_ADC=y
- # CONFIG_EZX_PCAP is not set
- # CONFIG_AB4500_CORE is not set
- CONFIG_MFD_GLAMO=y
--# CONFIG_MFD_GLAMO_FB is not set
--CONFIG_MFD_GLAMO_GPIO=y
--CONFIG_MFD_GLAMO_MCI=y
--CONFIG_MFD_GLAMO_DRM=y
- CONFIG_REGULATOR=y
- # CONFIG_REGULATOR_DEBUG is not set
- # CONFIG_REGULATOR_DUMMY is not set
-@@ -1366,6 +1369,7 @@ CONFIG_DRM_KMS_HELPER=y
- # CONFIG_DRM_MGA is not set
- # CONFIG_DRM_VIA is not set
- # CONFIG_DRM_SAVAGE is not set
-+CONFIG_DRM_GLAMO=y
- # CONFIG_VGASTATE is not set
- CONFIG_VIDEO_OUTPUT_CONTROL=y
- CONFIG_FB=y
-@@ -1398,6 +1402,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
- # CONFIG_FB_METRONOME is not set
- # CONFIG_FB_MB862XX is not set
- # CONFIG_FB_BROADSHEET is not set
-+# CONFIG_FB_GLAMO is not set
- CONFIG_BACKLIGHT_LCD_SUPPORT=y
- CONFIG_LCD_CLASS_DEVICE=y
- # CONFIG_LCD_L4F00242T03 is not set
-@@ -1430,18 +1435,18 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
- CONFIG_FONT_8x8=y
- CONFIG_FONT_8x16=y
- # CONFIG_LOGO is not set
--CONFIG_SOUND=y
-+CONFIG_SOUND=m
- CONFIG_SOUND_OSS_CORE=y
- CONFIG_SOUND_OSS_CORE_PRECLAIM=y
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
- CONFIG_SND_JACK=y
--CONFIG_SND_SEQUENCER=y
--CONFIG_SND_SEQ_DUMMY=y
-+CONFIG_SND_SEQUENCER=m
-+CONFIG_SND_SEQ_DUMMY=m
- CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=y
--CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
- CONFIG_SND_PCM_OSS_PLUGINS=y
- CONFIG_SND_SEQUENCER_OSS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
-@@ -1458,18 +1463,18 @@ CONFIG_SND_SEQUENCER_OSS=y
- # CONFIG_SND_ARM is not set
- # CONFIG_SND_SPI is not set
- # CONFIG_SND_USB is not set
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
- # CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
- # CONFIG_SND_S3C24XX_SOC_SIMTEC_TLV320AIC23 is not set
- # CONFIG_SND_S3C24XX_SOC_SIMTEC_HERMES is not set
--CONFIG_SND_SOC_I2C_AND_SPI=y
-+CONFIG_SND_SOC_I2C_AND_SPI=m
- # CONFIG_SND_SOC_ALL_CODECS is not set
--CONFIG_SND_SOC_WM8753=y
--CONFIG_SND_SOC_LM4857=y
-+CONFIG_SND_SOC_WM8753=m
-+CONFIG_SND_SOC_LM4857=m
- # CONFIG_SOUND_PRIME is not set
- CONFIG_HID_SUPPORT=y
- CONFIG_HID=y
-@@ -1478,7 +1483,7 @@ CONFIG_HID=y
- #
- # USB Input Devices
- #
--CONFIG_USB_HID=y
-+CONFIG_USB_HID=m
- # CONFIG_HID_PID is not set
- # CONFIG_USB_HIDDEV is not set
-
-@@ -1486,52 +1491,52 @@ CONFIG_USB_HID=y
- # Special HID drivers
- #
- # CONFIG_HID_3M_PCT is not set
--CONFIG_HID_A4TECH=y
--CONFIG_HID_APPLE=y
--CONFIG_HID_BELKIN=y
--CONFIG_HID_CHERRY=y
--CONFIG_HID_CHICONY=y
--CONFIG_HID_CYPRESS=y
--CONFIG_HID_DRAGONRISE=y
-+CONFIG_HID_A4TECH=m
-+CONFIG_HID_APPLE=m
-+CONFIG_HID_BELKIN=m
-+CONFIG_HID_CHERRY=m
-+CONFIG_HID_CHICONY=m
-+CONFIG_HID_CYPRESS=m
-+CONFIG_HID_DRAGONRISE=m
- # CONFIG_DRAGONRISE_FF is not set
--CONFIG_HID_EZKEY=y
--CONFIG_HID_KYE=y
--CONFIG_HID_GYRATION=y
--CONFIG_HID_TWINHAN=y
--CONFIG_HID_KENSINGTON=y
--CONFIG_HID_LOGITECH=y
-+CONFIG_HID_EZKEY=m
-+CONFIG_HID_KYE=m
-+CONFIG_HID_GYRATION=m
-+CONFIG_HID_TWINHAN=m
-+CONFIG_HID_KENSINGTON=m
-+CONFIG_HID_LOGITECH=m
- # CONFIG_LOGITECH_FF is not set
- # CONFIG_LOGIRUMBLEPAD2_FF is not set
- # CONFIG_LOGIG940_FF is not set
- # CONFIG_HID_MAGICMOUSE is not set
--CONFIG_HID_MICROSOFT=y
-+CONFIG_HID_MICROSOFT=m
- # CONFIG_HID_MOSART is not set
--CONFIG_HID_MONTEREY=y
--CONFIG_HID_NTRIG=y
--CONFIG_HID_ORTEK=y
--CONFIG_HID_PANTHERLORD=y
-+CONFIG_HID_MONTEREY=m
-+CONFIG_HID_NTRIG=m
-+CONFIG_HID_ORTEK=m
-+CONFIG_HID_PANTHERLORD=m
- # CONFIG_PANTHERLORD_FF is not set
--CONFIG_HID_PETALYNX=y
-+CONFIG_HID_PETALYNX=m
- # CONFIG_HID_QUANTA is not set
--CONFIG_HID_SAMSUNG=y
--CONFIG_HID_SONY=y
-+CONFIG_HID_SAMSUNG=m
-+CONFIG_HID_SONY=m
- # CONFIG_HID_STANTUM is not set
--CONFIG_HID_SUNPLUS=y
--CONFIG_HID_GREENASIA=y
-+CONFIG_HID_SUNPLUS=m
-+CONFIG_HID_GREENASIA=m
- # CONFIG_GREENASIA_FF is not set
--CONFIG_HID_SMARTJOYPLUS=y
-+CONFIG_HID_SMARTJOYPLUS=m
- # CONFIG_SMARTJOYPLUS_FF is not set
--CONFIG_HID_TOPSEED=y
--CONFIG_HID_THRUSTMASTER=y
-+CONFIG_HID_TOPSEED=m
-+CONFIG_HID_THRUSTMASTER=m
- # CONFIG_THRUSTMASTER_FF is not set
--CONFIG_HID_WACOM=y
--CONFIG_HID_ZEROPLUS=y
-+CONFIG_HID_WACOM=m
-+CONFIG_HID_ZEROPLUS=m
- # CONFIG_ZEROPLUS_FF is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
- # CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
-+CONFIG_USB=m
- # CONFIG_USB_DEBUG is not set
- CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-@@ -1553,7 +1558,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
- # CONFIG_USB_ISP116X_HCD is not set
- # CONFIG_USB_ISP1760_HCD is not set
- # CONFIG_USB_ISP1362_HCD is not set
--CONFIG_USB_OHCI_HCD=y
-+CONFIG_USB_OHCI_HCD=m
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
- CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-@@ -1674,9 +1679,8 @@ CONFIG_USB_TRANCEVIBRATOR=m
- CONFIG_USB_IOWARRIOR=m
- # CONFIG_USB_TEST is not set
- # CONFIG_USB_ISIGHTFW is not set
--CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET=m
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
--# CONFIG_USB_GADGET_DEBUG_FS is not set
- CONFIG_USB_GADGET_VBUS_DRAW=500
- CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_AT91 is not set
-@@ -1690,7 +1694,7 @@ CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_S3C_HSOTG is not set
- # CONFIG_USB_GADGET_IMX is not set
- CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
-+CONFIG_USB_S3C2410=m
- # CONFIG_USB_S3C2410_DEBUG is not set
- # CONFIG_USB_GADGET_M66592 is not set
- # CONFIG_USB_GADGET_AMD5536UDC is not set
-@@ -1706,13 +1710,14 @@ CONFIG_USB_S3C2410=y
- CONFIG_USB_ETH=m
- CONFIG_USB_ETH_RNDIS=y
- # CONFIG_USB_ETH_EEM is not set
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_MASS_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+# CONFIG_USB_FILE_STORAGE_TEST is not set
-+CONFIG_USB_MASS_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
- # CONFIG_USB_MIDI_GADGET is not set
- # CONFIG_USB_G_PRINTER is not set
--# CONFIG_USB_CDC_COMPOSITE is not set
-+CONFIG_USB_CDC_COMPOSITE=m
- # CONFIG_USB_G_NOKIA is not set
- # CONFIG_USB_G_MULTI is not set
-
-@@ -1744,22 +1749,23 @@ CONFIG_MMC_S3C=y
- CONFIG_MMC_S3C_PIO=y
- # CONFIG_MMC_S3C_DMA is not set
- # CONFIG_MMC_S3C_PIODMA is not set
-+CONFIG_MMC_GLAMO=y
- # CONFIG_MEMSTICK is not set
- CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
-+CONFIG_LEDS_CLASS=m
-
- #
- # LED drivers
- #
--CONFIG_LEDS_S3C24XX=y
-+CONFIG_LEDS_S3C24XX=m
- # CONFIG_LEDS_PCA9532 is not set
--CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_GPIO=m
- CONFIG_LEDS_GPIO_PLATFORM=y
- # CONFIG_LEDS_LP3944 is not set
- # CONFIG_LEDS_PCA955X is not set
- # CONFIG_LEDS_DAC124S085 is not set
--CONFIG_LEDS_PWM=y
--CONFIG_LEDS_REGULATOR=y
-+CONFIG_LEDS_PWM=m
-+CONFIG_LEDS_REGULATOR=m
- # CONFIG_LEDS_BD2802 is not set
- # CONFIG_LEDS_LT3593 is not set
- CONFIG_LEDS_TRIGGERS=y
-@@ -1767,8 +1773,8 @@ CONFIG_LEDS_TRIGGERS=y
- #
- # LED Triggers
- #
--CONFIG_LEDS_TRIGGER_TIMER=y
--CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-+CONFIG_LEDS_TRIGGER_TIMER=m
-+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
- # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
- # CONFIG_LEDS_TRIGGER_GPIO is not set
- # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-@@ -1853,7 +1859,7 @@ CONFIG_RTC_DRV_S3C=y
- # TI VLYNQ
- #
- # CONFIG_STAGING is not set
--CONFIG_AR6000_WLAN=y
-+CONFIG_AR6000_WLAN=m
- # CONFIG_AR6000_WLAN_DEBUG is not set
- # CONFIG_AR6000_WLAN_RESET is not set
-
-@@ -1868,16 +1874,20 @@ CONFIG_EXT3_FS=y
- # CONFIG_EXT3_FS_XATTR is not set
- # CONFIG_EXT4_FS is not set
- CONFIG_JBD=y
--# CONFIG_JBD_DEBUG is not set
--CONFIG_REISERFS_FS=m
-+CONFIG_REISERFS_FS=y
- # CONFIG_REISERFS_CHECK is not set
- # CONFIG_REISERFS_PROC_INFO is not set
- # CONFIG_REISERFS_FS_XATTR is not set
- # CONFIG_JFS_FS is not set
- CONFIG_FS_POSIX_ACL=y
--# CONFIG_XFS_FS is not set
-+CONFIG_XFS_FS=m
-+# CONFIG_XFS_QUOTA is not set
-+# CONFIG_XFS_POSIX_ACL is not set
-+# CONFIG_XFS_RT is not set
-+# CONFIG_XFS_DEBUG is not set
- # CONFIG_OCFS2_FS is not set
--# CONFIG_BTRFS_FS is not set
-+CONFIG_BTRFS_FS=m
-+# CONFIG_BTRFS_FS_POSIX_ACL is not set
- # CONFIG_NILFS2_FS is not set
- CONFIG_FILE_LOCKING=y
- CONFIG_FSNOTIFY=y
-@@ -1950,9 +1960,7 @@ CONFIG_UBIFS_FS_XATTR=y
- CONFIG_UBIFS_FS_ADVANCED_COMPR=y
- CONFIG_UBIFS_FS_LZO=y
- CONFIG_UBIFS_FS_ZLIB=y
--CONFIG_UBIFS_FS_DEBUG=y
--CONFIG_UBIFS_FS_DEBUG_MSG_LVL=0
--CONFIG_UBIFS_FS_DEBUG_CHKS=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- # CONFIG_LOGFS is not set
- # CONFIG_CRAMFS is not set
- CONFIG_SQUASHFS=m
-@@ -2017,7 +2025,7 @@ CONFIG_MSDOS_PARTITION=y
- # CONFIG_ULTRIX_PARTITION is not set
- # CONFIG_SUN_PARTITION is not set
- # CONFIG_KARMA_PARTITION is not set
--# CONFIG_EFI_PARTITION is not set
-+CONFIG_EFI_PARTITION=y
- # CONFIG_SYSV68_PARTITION is not set
- CONFIG_NLS=y
- CONFIG_NLS_DEFAULT="iso8859-1"
-@@ -2071,20 +2079,18 @@ CONFIG_FRAME_WARN=1024
- # CONFIG_MAGIC_SYSRQ is not set
- CONFIG_STRIP_ASM_SYMS=y
- # CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
-+# CONFIG_DEBUG_FS is not set
- # CONFIG_HEADERS_CHECK is not set
- # CONFIG_DEBUG_KERNEL is not set
- CONFIG_DEBUG_BUGVERBOSE=y
- CONFIG_DEBUG_MEMORY_INIT=y
- CONFIG_FRAME_POINTER=y
- # CONFIG_RCU_CPU_STALL_DETECTOR is not set
--# CONFIG_LKDTM is not set
- # CONFIG_LATENCYTOP is not set
- # CONFIG_SYSCTL_SYSCALL_CHECK is not set
- CONFIG_HAVE_FUNCTION_TRACER=y
- CONFIG_TRACING_SUPPORT=y
- # CONFIG_FTRACE is not set
--# CONFIG_DYNAMIC_DEBUG is not set
- # CONFIG_SAMPLES is not set
- CONFIG_HAVE_ARCH_KGDB=y
- # CONFIG_ARM_UNWIND is not set
-@@ -2155,7 +2161,7 @@ CONFIG_CRYPTO_XCBC=m
- #
- # Digest
- #
--CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CRC32C=y
- # CONFIG_CRYPTO_GHASH is not set
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-@@ -2215,7 +2221,7 @@ CONFIG_CRC_T10DIF=y
- CONFIG_CRC_ITU_T=y
- CONFIG_CRC32=y
- CONFIG_CRC7=y
--CONFIG_LIBCRC32C=m
-+CONFIG_LIBCRC32C=y
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
- CONFIG_LZO_COMPRESS=y
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 811dedc..1a7b708 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1191,7 +1191,7 @@ source kernel/Kconfig.preempt
+ config HZ
+ int
+ default 128 if ARCH_L7200
+- default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
++ default 200 if ARCH_EBSA110 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
+ default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
+ default AT91_TIMER_HZ if ARCH_AT91
+ default 100
diff --git a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h b/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
index dcef228..8eedc9c 100644
--- a/arch/arm/mach-s3c2410/include/mach/spi-gpio.h
@@ -2926,6 +155,64 @@ index 5cf35d8..1101411 100644
return 0;
}
#else
+diff --git a/arch/arm/mach-s3c2440/gta02-pm-gps.c b/arch/arm/mach-s3c2440/gta02-pm-gps.c
+index 9721f9a..7c7de09 100644
+--- a/arch/arm/mach-s3c2440/gta02-pm-gps.c
++++ b/arch/arm/mach-s3c2440/gta02-pm-gps.c
+@@ -41,7 +41,7 @@ int gta02_pm_gps_is_on(void)
+ EXPORT_SYMBOL_GPL(gta02_pm_gps_is_on);
+
+ /* This is the POWERON pin */
+-static void gps_pwron_set(int on)
++static void gps_pwron_set(int on, int ignore_state)
+ {
+ if (on) {
+ /* return UART pins to being UART pins */
+@@ -49,7 +49,7 @@ static void gps_pwron_set(int on)
+ /* remove pulldown now it won't be floating any more */
+ s3c2410_gpio_pullup(S3C2410_GPH(5), 0);
+
+- if (!gta02_gps.power_was_on)
++ if (!gta02_gps.power_was_on || ignore_state)
+ regulator_enable(gta02_gps.regulator);
+ } else {
+ /*
+@@ -60,7 +60,7 @@ static void gps_pwron_set(int on)
+ s3c2410_gpio_setpin(S3C2410_GPH(4), 0);
+ /* don't let RX from unpowered GPS float */
+ s3c2410_gpio_pullup(S3C2410_GPH(5), 1);
+- if (gta02_gps.power_was_on)
++ if (gta02_gps.power_was_on || ignore_state)
+ regulator_disable(gta02_gps.regulator);
+ }
+ }
+@@ -107,7 +107,7 @@ static ssize_t power_gps_write(struct device *dev,
+ unsigned long on = simple_strtoul(buf, NULL, 10);
+
+ if (!strcmp(attr->attr.name, "power_on")) {
+- gps_pwron_set(on);
++ gps_pwron_set(on, 0);
+ gta02_gps.power_was_on = !!on;
+ #ifdef CONFIG_PM
+ } else if (!strcmp(attr->attr.name, "keep_on_in_suspend")) {
+@@ -122,7 +122,7 @@ static int gta02_pm_gps_suspend(struct device *dev)
+ {
+ if (!gta02_gps.keep_on_in_suspend ||
+ !gta02_gps.power_was_on)
+- gps_pwron_set(0);
++ gps_pwron_set(0, 0);
+ else
+ dev_warn(dev, "GTA02: keeping gps ON "
+ "during suspend\n");
+@@ -132,7 +132,7 @@ static int gta02_pm_gps_suspend(struct device *dev)
+ static int gta02_pm_gps_resume(struct device *dev)
+ {
+ if (!gta02_gps.keep_on_in_suspend && gta02_gps.power_was_on)
+- gps_pwron_set(1);
++ gps_pwron_set(1, 1);
+
+ return 0;
+ }
diff --git a/arch/arm/mach-s3c2440/gta02-pm-usbhost.c b/arch/arm/mach-s3c2440/gta02-pm-usbhost.c
new file mode 100644
index 0000000..233340a
@@ -3514,6 +801,26 @@ index 9a9461d..031fd00 100644
bus_register_notifier(&platform_bus_type, &gta02_device_register_notifier);
bus_register_notifier(&spi_bus_type, &gta02_device_register_notifier);
+diff --git a/arch/arm/plat-samsung/time.c b/arch/arm/plat-samsung/time.c
+index 2231d80..d342876 100644
+--- a/arch/arm/plat-samsung/time.c
++++ b/arch/arm/plat-samsung/time.c
+@@ -195,12 +195,12 @@ static void s3c2410_timer_setup (void)
+
+ /* configure clock tick */
+
+- timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
++ timer_usec_ticks = timer_mask_usec_ticks(12, pclk);
+
+ tscaler = clk_get_parent(tdiv);
+
+- clk_set_rate(tscaler, pclk / 3);
+- clk_set_rate(tdiv, pclk / 6);
++ clk_set_rate(tscaler, pclk / 6);
++ clk_set_rate(tdiv, pclk / 12);
+ clk_set_parent(tin, tdiv);
+
+ tcnt = clk_get_rate(tin) / HZ;
diff --git a/drivers/ar6000/hif/hif2.c b/drivers/ar6000/hif/hif2.c
index 386d96e..90178d0 100644
--- a/drivers/ar6000/hif/hif2.c
diff --git a/recipes/linux/linux-openmoko_2.6.34.bb b/recipes/linux/linux-openmoko_2.6.34.bb
index 6ae8c999d0..b930fb84b0 100644
--- a/recipes/linux/linux-openmoko_2.6.34.bb
+++ b/recipes/linux/linux-openmoko_2.6.34.bb
@@ -2,5 +2,5 @@ require linux_${PV}.bb
require linux-openmoko.inc
# just for upgrade path in 2.6.34
KERNEL_RELEASE = "2.6.34.7"
-OM-PR = 13
+OM-PR = "14"
PKGV = "${KERNEL_RELEASE}-oe${OM-PR}"