1 From 9f8c5ed5aa643f2bf61a8831e574df03d3c6fc50 Mon Sep 17 00:00:00 2001
2 From: Andy Green <andy@openmoko.com>
3 Date: Fri, 25 Jul 2008 23:06:07 +0100
4 Subject: [PATCH] config-update-2.6.21-rc1.patch
5 Signed-off-by: Andy Green <andy@openmoko.com>
8 defconfig-2.6.25 | 151 ++++++++++++++++++++++++++++++++++++------------------
9 1 files changed, 101 insertions(+), 50 deletions(-)
11 diff --git a/defconfig-2.6.25 b/defconfig-2.6.25
12 index ce1c1ca..0f663da 100644
13 --- a/defconfig-2.6.25
14 +++ b/defconfig-2.6.25
17 # Automatically generated make config: don't edit
18 -# Linux kernel version: 2.6.25-rc9
19 -# Sun Apr 13 08:49:27 2008
20 +# Linux kernel version: 2.6.26-rc1
21 +# Wed May 7 16:13:07 2008
24 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
25 @@ -66,6 +66,7 @@ CONFIG_SYSCTL=y
26 # CONFIG_EMBEDDED is not set
28 CONFIG_SYSCTL_SYSCALL=y
29 +CONFIG_SYSCTL_SYSCALL_CHECK=y
32 # CONFIG_KALLSYMS_EXTRA_PASS is not set
33 @@ -92,12 +93,14 @@ CONFIG_HAVE_OPROFILE=y
34 # CONFIG_KPROBES is not set
36 CONFIG_HAVE_KRETPROBES=y
37 +# CONFIG_HAVE_DMA_ATTRS is not set
38 CONFIG_PROC_PAGE_MONITOR=y
41 # CONFIG_TINY_SHMEM is not set
44 +# CONFIG_MODULE_FORCE_LOAD is not set
45 CONFIG_MODULE_UNLOAD=y
46 CONFIG_MODULE_FORCE_UNLOAD=y
47 # CONFIG_MODVERSIONS is not set
48 @@ -150,7 +153,7 @@ CONFIG_CLASSIC_RCU=y
49 # CONFIG_ARCH_KS8695 is not set
50 # CONFIG_ARCH_NS9XXX is not set
51 # CONFIG_ARCH_MXC is not set
52 -# CONFIG_ARCH_ORION is not set
53 +# CONFIG_ARCH_ORION5X is not set
54 # CONFIG_ARCH_PNX4008 is not set
55 # CONFIG_ARCH_PXA is not set
56 # CONFIG_ARCH_RPC is not set
57 @@ -203,6 +206,7 @@ CONFIG_S3C2410_PWM=y
58 # CONFIG_ARCH_BAST is not set
59 # CONFIG_MACH_OTOM is not set
60 # CONFIG_MACH_AML_M5900 is not set
61 +# CONFIG_MACH_TCT_HAMMER is not set
62 # CONFIG_MACH_VR1000 is not set
64 CONFIG_MACH_NEO1973_GTA01=y
65 @@ -226,7 +230,6 @@ CONFIG_S3C2440_C_FIQ=y
67 # CONFIG_MACH_NEXCODER_2440 is not set
68 CONFIG_SMDK2440_CPU2440=y
70 CONFIG_MACH_NEO1973_GTA02=y
71 # CONFIG_NEO1973_GTA02_2440 is not set
73 @@ -248,6 +251,7 @@ CONFIG_CPU_32=y
76 CONFIG_CPU_ABRT_EV4T=y
77 +CONFIG_CPU_PABRT_NOIFAR=y
78 CONFIG_CPU_CACHE_V4WT=y
79 CONFIG_CPU_CACHE_VIVT=y
80 CONFIG_CPU_COPY_V4WB=y
81 @@ -289,6 +293,7 @@ CONFIG_FLATMEM=y
82 CONFIG_FLAT_NODE_MEM_MAP=y
83 # CONFIG_SPARSEMEM_STATIC is not set
84 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
85 +CONFIG_PAGEFLAGS_EXTENDED=y
86 CONFIG_SPLIT_PTLOCK_CPUS=4096
87 # CONFIG_RESOURCES_64BIT is not set
88 CONFIG_ZONE_DMA_FLAG=1
89 @@ -328,7 +333,6 @@ CONFIG_BINFMT_ELF=y
90 # Power management options
97 @@ -406,8 +410,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
98 CONFIG_INET6_XFRM_MODE_BEET=m
99 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
101 +CONFIG_IPV6_NDISC_NODETYPE=y
103 # CONFIG_IPV6_MULTIPLE_TABLES is not set
104 +# CONFIG_IPV6_MROUTE is not set
105 # CONFIG_NETWORK_SECMARK is not set
107 # CONFIG_NETFILTER_DEBUG is not set
108 @@ -424,6 +430,7 @@ CONFIG_NF_CONNTRACK=m
110 CONFIG_NF_CONNTRACK_MARK=y
111 CONFIG_NF_CONNTRACK_EVENTS=y
112 +# CONFIG_NF_CT_PROTO_DCCP is not set
113 CONFIG_NF_CT_PROTO_GRE=m
114 CONFIG_NF_CT_PROTO_SCTP=m
115 # CONFIG_NF_CT_PROTO_UDPLITE is not set
116 @@ -501,6 +508,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
117 CONFIG_IP_NF_TARGET_NETMAP=m
118 CONFIG_NF_NAT_SNMP_BASIC=m
119 CONFIG_NF_NAT_PROTO_GRE=m
120 +CONFIG_NF_NAT_PROTO_SCTP=m
124 @@ -559,6 +567,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
125 CONFIG_BRIDGE_EBT_SNAT=m
126 CONFIG_BRIDGE_EBT_LOG=m
127 CONFIG_BRIDGE_EBT_ULOG=m
128 +# CONFIG_BRIDGE_EBT_NFLOG is not set
129 # CONFIG_IP_DCCP is not set
130 # CONFIG_IP_SCTP is not set
131 # CONFIG_TIPC is not set
132 @@ -675,6 +684,7 @@ CONFIG_MTD_PARTITIONS=y
133 # CONFIG_MTD_REDBOOT_PARTS is not set
134 CONFIG_MTD_CMDLINE_PARTS=y
135 # CONFIG_MTD_AFS_PARTS is not set
136 +# CONFIG_MTD_AR7_PARTS is not set
139 # User Modules And Translation Layers
140 @@ -870,6 +880,7 @@ CONFIG_CS89x0=m
142 # CONFIG_WLAN_PRE80211 is not set
143 # CONFIG_WLAN_80211 is not set
144 +# CONFIG_IWLWIFI_LEDS is not set
147 # USB Network Adapters
148 @@ -991,6 +1002,7 @@ CONFIG_VT_CONSOLE=y
149 CONFIG_NR_TTY_DEVICES=4
151 CONFIG_VT_HW_CONSOLE_BINDING=y
153 # CONFIG_SERIAL_NONSTANDARD is not set
156 @@ -1018,13 +1030,6 @@ CONFIG_I2C_BOARDINFO=y
162 -# CONFIG_I2C_ALGOBIT is not set
163 -# CONFIG_I2C_ALGOPCF is not set
164 -# CONFIG_I2C_ALGOPCA is not set
167 # I2C Hardware Bus support
169 # CONFIG_I2C_GPIO is not set
170 @@ -1035,6 +1040,7 @@ CONFIG_I2C_S3C2410=y
171 # CONFIG_I2C_TAOS_EVM is not set
172 # CONFIG_I2C_STUB is not set
173 # CONFIG_I2C_TINY_USB is not set
174 +# CONFIG_I2C_PCA_PLATFORM is not set
177 # Miscellaneous I2C Chip support
178 @@ -1046,18 +1052,12 @@ CONFIG_SENSORS_PCF50633=y
179 # CONFIG_SENSORS_PCF8574 is not set
180 # CONFIG_PCF8575 is not set
181 # CONFIG_SENSORS_PCF8591 is not set
182 -# CONFIG_TPS65010 is not set
183 # CONFIG_SENSORS_MAX6875 is not set
184 # CONFIG_SENSORS_TSL2550 is not set
185 -CONFIG_SENSORS_TSL256X=m
186 # CONFIG_I2C_DEBUG_CORE is not set
187 # CONFIG_I2C_DEBUG_ALGO is not set
188 # CONFIG_I2C_DEBUG_BUS is not set
189 # CONFIG_I2C_DEBUG_CHIP is not set
195 # CONFIG_SPI_DEBUG is not set
197 @@ -1159,6 +1159,7 @@ CONFIG_SSB_POSSIBLE=y
199 # CONFIG_MFD_SM501 is not set
200 # CONFIG_MFD_ASIC3 is not set
201 +# CONFIG_HTC_PASIC3 is not set
203 CONFIG_MFD_GLAMO_FB=y
204 CONFIG_MFD_GLAMO_SPI_GPIO=y
205 @@ -1168,8 +1169,16 @@ CONFIG_MFD_GLAMO_MCI=y
211 +# Multimedia core support
213 # CONFIG_VIDEO_DEV is not set
214 # CONFIG_DVB_CORE is not set
217 +# Multimedia drivers
220 # CONFIG_USB_DABUSB is not set
222 @@ -1188,6 +1197,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
223 # CONFIG_FB_SYS_FILLRECT is not set
224 # CONFIG_FB_SYS_COPYAREA is not set
225 # CONFIG_FB_SYS_IMAGEBLIT is not set
226 +# CONFIG_FB_FOREIGN_ENDIAN is not set
227 # CONFIG_FB_SYS_FOPS is not set
228 CONFIG_FB_DEFERRED_IO=y
229 # CONFIG_FB_SVGALIB is not set
230 @@ -1295,15 +1305,16 @@ CONFIG_SND_SOC=y
231 CONFIG_SND_S3C24XX_SOC=y
232 CONFIG_SND_S3C24XX_SOC_I2S=y
233 CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
234 +# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
235 CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
236 # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
239 -# SoC Audio support for SuperH
240 +# ALSA SoC audio for Freescale SOCs
244 -# ALSA SoC audio for Freescale SOCs
245 +# SoC Audio for the Texas Instruments OMAP
247 CONFIG_SND_SOC_WM8753=y
249 @@ -1338,13 +1349,14 @@ CONFIG_USB_DEVICEFS=y
250 CONFIG_USB_DEVICE_CLASS=y
251 # CONFIG_USB_DYNAMIC_MINORS is not set
253 -CONFIG_USB_PERSIST=y
254 # CONFIG_USB_OTG is not set
257 # USB Host Controller Drivers
259 +# CONFIG_USB_C67X00_HCD is not set
260 # CONFIG_USB_ISP116X_HCD is not set
261 +# CONFIG_USB_ISP1760_HCD is not set
262 CONFIG_USB_OHCI_HCD=y
263 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
264 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
265 @@ -1376,7 +1388,9 @@ CONFIG_USB_STORAGE_SDDR09=y
266 CONFIG_USB_STORAGE_SDDR55=y
267 CONFIG_USB_STORAGE_JUMPSHOT=y
268 CONFIG_USB_STORAGE_ALAUDA=y
269 +# CONFIG_USB_STORAGE_ONETOUCH is not set
270 CONFIG_USB_STORAGE_KARMA=y
271 +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
272 CONFIG_USB_LIBUSUAL=y
275 @@ -1434,6 +1448,7 @@ CONFIG_USB_SERIAL_MOS7840=m
276 CONFIG_USB_SERIAL_NAVMAN=m
277 CONFIG_USB_SERIAL_PL2303=m
278 # CONFIG_USB_SERIAL_OTI6858 is not set
279 +# CONFIG_USB_SERIAL_SPCP8X5 is not set
280 CONFIG_USB_SERIAL_HP4X=m
281 CONFIG_USB_SERIAL_SAFE=m
282 CONFIG_USB_SERIAL_SAFE_PADDED=y
283 @@ -1478,6 +1493,7 @@ CONFIG_USB_GADGET_SELECTED=y
284 # CONFIG_USB_GADGET_NET2280 is not set
285 # CONFIG_USB_GADGET_PXA2XX is not set
286 # CONFIG_USB_GADGET_M66592 is not set
287 +# CONFIG_USB_GADGET_PXA27X is not set
288 # CONFIG_USB_GADGET_GOKU is not set
289 # CONFIG_USB_GADGET_LH7A40X is not set
290 # CONFIG_USB_GADGET_OMAP is not set
291 @@ -1536,6 +1552,7 @@ CONFIG_LEDS_NEO1973_GTA02=y
292 CONFIG_LEDS_TRIGGERS=y
293 CONFIG_LEDS_TRIGGER_TIMER=y
294 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
295 +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
299 @@ -1589,6 +1606,7 @@ CONFIG_RTC_INTF_DEV=y
303 +# CONFIG_UIO is not set
307 @@ -1605,7 +1623,6 @@ CONFIG_JBD=y
308 # CONFIG_JFS_FS is not set
309 # CONFIG_FS_POSIX_ACL is not set
310 # CONFIG_XFS_FS is not set
311 -# CONFIG_GFS2_FS is not set
312 # CONFIG_OCFS2_FS is not set
315 @@ -1728,6 +1745,7 @@ CONFIG_NLS_UTF8=m
317 CONFIG_ENABLE_WARN_DEPRECATED=y
318 CONFIG_ENABLE_MUST_CHECK=y
319 +CONFIG_FRAME_WARN=1024
321 # CONFIG_UNUSED_SYMBOLS is not set
323 @@ -1738,6 +1756,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
325 # CONFIG_SCHEDSTATS is not set
327 +# CONFIG_DEBUG_OBJECTS is not set
328 # CONFIG_DEBUG_SLAB is not set
329 CONFIG_DEBUG_PREEMPT=y
330 # CONFIG_DEBUG_RT_MUTEXES is not set
331 @@ -1756,6 +1775,7 @@ CONFIG_STACKTRACE=y
332 CONFIG_DEBUG_BUGVERBOSE=y
334 # CONFIG_DEBUG_VM is not set
335 +# CONFIG_DEBUG_WRITECOUNT is not set
336 # CONFIG_DEBUG_LIST is not set
338 CONFIG_FRAME_POINTER=y
339 @@ -1779,53 +1799,82 @@ CONFIG_DEBUG_S3C_UART=2
340 # CONFIG_SECURITY is not set
341 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
345 +# Crypto core or helper
347 CONFIG_CRYPTO_ALGAPI=y
349 CONFIG_CRYPTO_BLKCIPHER=y
350 -# CONFIG_CRYPTO_SEQIV is not set
352 CONFIG_CRYPTO_MANAGER=y
353 +CONFIG_CRYPTO_GF128MUL=m
354 +CONFIG_CRYPTO_NULL=m
355 +# CONFIG_CRYPTO_CRYPTD is not set
356 +CONFIG_CRYPTO_AUTHENC=m
357 +CONFIG_CRYPTO_TEST=m
360 +# Authenticated Encryption with Associated Data
362 +# CONFIG_CRYPTO_CCM is not set
363 +# CONFIG_CRYPTO_GCM is not set
364 +# CONFIG_CRYPTO_SEQIV is not set
370 +# CONFIG_CRYPTO_CTR is not set
371 +# CONFIG_CRYPTO_CTS is not set
374 +CONFIG_CRYPTO_PCBC=m
375 +# CONFIG_CRYPTO_XTS is not set
382 -CONFIG_CRYPTO_NULL=m
387 +CONFIG_CRYPTO_CRC32C=m
390 +CONFIG_CRYPTO_MICHAEL_MIC=m
392 CONFIG_CRYPTO_SHA256=m
393 CONFIG_CRYPTO_SHA512=m
394 -CONFIG_CRYPTO_WP512=m
395 CONFIG_CRYPTO_TGR192=m
396 -CONFIG_CRYPTO_GF128MUL=m
399 -CONFIG_CRYPTO_PCBC=m
401 -# CONFIG_CRYPTO_XTS is not set
402 -# CONFIG_CRYPTO_CTR is not set
403 -# CONFIG_CRYPTO_GCM is not set
404 -# CONFIG_CRYPTO_CCM is not set
405 -# CONFIG_CRYPTO_CRYPTD is not set
407 -CONFIG_CRYPTO_FCRYPT=m
408 -CONFIG_CRYPTO_BLOWFISH=m
409 -CONFIG_CRYPTO_TWOFISH=m
410 -CONFIG_CRYPTO_TWOFISH_COMMON=m
411 -CONFIG_CRYPTO_SERPENT=m
412 +CONFIG_CRYPTO_WP512=m
418 +CONFIG_CRYPTO_ANUBIS=m
419 +CONFIG_CRYPTO_ARC4=m
420 +CONFIG_CRYPTO_BLOWFISH=m
421 +CONFIG_CRYPTO_CAMELLIA=m
422 CONFIG_CRYPTO_CAST5=m
423 CONFIG_CRYPTO_CAST6=m
425 -CONFIG_CRYPTO_ARC4=m
427 +CONFIG_CRYPTO_FCRYPT=m
428 CONFIG_CRYPTO_KHAZAD=m
429 -CONFIG_CRYPTO_ANUBIS=m
430 -# CONFIG_CRYPTO_SEED is not set
431 # CONFIG_CRYPTO_SALSA20 is not set
432 +# CONFIG_CRYPTO_SEED is not set
433 +CONFIG_CRYPTO_SERPENT=m
435 +CONFIG_CRYPTO_TWOFISH=m
436 +CONFIG_CRYPTO_TWOFISH_COMMON=m
441 CONFIG_CRYPTO_DEFLATE=m
442 -CONFIG_CRYPTO_MICHAEL_MIC=m
443 -CONFIG_CRYPTO_CRC32C=m
444 -CONFIG_CRYPTO_CAMELLIA=m
445 -CONFIG_CRYPTO_TEST=m
446 -CONFIG_CRYPTO_AUTHENC=m
447 # CONFIG_CRYPTO_LZO is not set
450 @@ -1833,6 +1882,8 @@ CONFIG_CRYPTO_HW=y
454 +# CONFIG_GENERIC_FIND_FIRST_BIT is not set
455 +# CONFIG_GENERIC_FIND_NEXT_BIT is not set
458 # CONFIG_CRC_ITU_T is not set