aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 16:38:42 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 16:38:42 -0500
commitcb553c480078759014096bc766dc76400e1d8397 (patch)
tree97262cd9252a7dc68f8701f8435b0d10b9e79536
parent42eaf0d8f2e7b8201afc00b0ebe1bd89ea51d42d (diff)
parent040cf8cfe5f0674ddf256f98366137a7b90d421f (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Update defconfigs [MIPS] Support for several more SNI RM models. [MIPS] Include <asm/bugs> to for declaration of check_bugs32. [MIPS] Add external declaration of pagetable_init() to pgalloc.h [MIPS] Make kernel_thread_helper() static [MIPS] Make __declare_dbe_table static and avoid it getting optimized away [MIPS] Use MIPS R2 instructions for bitops. [MIPS] signals: Share even more code. [MIPS] Fix CONFIG_MIPS32_N32=y CONFIG_MIPS32_O32=n build [MIPS] Iomap implementation. [MIPS] <asm/compat-signal.h> needs to include <asm/uaccess.h>. [MIPS] IP27: Fix warning. [MIPS] Fix sigset_t endianess swapping issues in 32-bit compat code.
Diffstat
-rw-r--r--arch/mips/Kconfig5
-rw-r--r--arch/mips/configs/atlas_defconfig233
-rw-r--r--arch/mips/configs/bigsur_defconfig84
-rw-r--r--arch/mips/configs/capcella_defconfig161
-rw-r--r--arch/mips/configs/cobalt_defconfig129
-rw-r--r--arch/mips/configs/db1000_defconfig156
-rw-r--r--arch/mips/configs/db1100_defconfig156
-rw-r--r--arch/mips/configs/db1200_defconfig187
-rw-r--r--arch/mips/configs/db1500_defconfig195
-rw-r--r--arch/mips/configs/db1550_defconfig169
-rw-r--r--arch/mips/configs/ddb5477_defconfig127
-rw-r--r--arch/mips/configs/decstation_defconfig93
-rw-r--r--arch/mips/configs/e55_defconfig91
-rw-r--r--arch/mips/configs/emma2rh_defconfig278
-rw-r--r--arch/mips/configs/ev64120_defconfig125
-rw-r--r--arch/mips/configs/excite_defconfig173
-rw-r--r--arch/mips/configs/ip22_defconfig209
-rw-r--r--arch/mips/configs/ip27_defconfig137
-rw-r--r--arch/mips/configs/ip32_defconfig145
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig104
-rw-r--r--arch/mips/configs/jazz_defconfig152
-rw-r--r--arch/mips/configs/jmr3927_defconfig127
-rw-r--r--arch/mips/configs/lasat200_defconfig136
-rw-r--r--arch/mips/configs/malta_defconfig172
-rw-r--r--arch/mips/configs/mipssim_defconfig114
-rw-r--r--arch/mips/configs/mpc30x_defconfig137
-rw-r--r--arch/mips/configs/ocelot_3_defconfig192
-rw-r--r--arch/mips/configs/ocelot_c_defconfig128
-rw-r--r--arch/mips/configs/ocelot_defconfig124
-rw-r--r--arch/mips/configs/ocelot_g_defconfig142
-rw-r--r--arch/mips/configs/pb1100_defconfig156
-rw-r--r--arch/mips/configs/pb1500_defconfig169
-rw-r--r--arch/mips/configs/pb1550_defconfig169
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig111
-rw-r--r--arch/mips/configs/pnx8550-stb810_defconfig81
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig146
-rw-r--r--arch/mips/configs/qemu_defconfig95
-rw-r--r--arch/mips/configs/rbhma4500_defconfig200
-rw-r--r--arch/mips/configs/rm200_defconfig263
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig123
-rw-r--r--arch/mips/configs/sead_defconfig81
-rw-r--r--arch/mips/configs/tb0226_defconfig194
-rw-r--r--arch/mips/configs/tb0229_defconfig177
-rw-r--r--arch/mips/configs/tb0287_defconfig144
-rw-r--r--arch/mips/configs/workpad_defconfig149
-rw-r--r--arch/mips/configs/wrppmc_defconfig152
-rw-r--r--arch/mips/configs/yosemite_defconfig111
-rw-r--r--arch/mips/defconfig209
-rw-r--r--arch/mips/kernel/Makefile4
-rw-r--r--arch/mips/kernel/cpu-probe.c1
-rw-r--r--arch/mips/kernel/process.c35
-rw-r--r--arch/mips/kernel/signal.c18
-rw-r--r--arch/mips/kernel/signal32.c122
-rw-r--r--arch/mips/kernel/signal_n32.c8
-rw-r--r--arch/mips/kernel/traps.c10
-rw-r--r--arch/mips/lib/Makefile3
-rw-r--r--arch/mips/lib/iomap-pci.c74
-rw-r--r--arch/mips/lib/iomap.c253
-rw-r--r--arch/mips/mm/init.c2
-rw-r--r--arch/mips/mm/pgtable-32.c1
-rw-r--r--arch/mips/mm/pgtable-64.c1
-rw-r--r--arch/mips/pci/fixup-sni.c66
-rw-r--r--arch/mips/pci/ops-sni.c77
-rw-r--r--arch/mips/pci/pci.c8
-rw-r--r--arch/mips/sgi-ip27/ip27-memory.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-timer.c2
-rw-r--r--arch/mips/sni/Makefile2
-rw-r--r--arch/mips/sni/a20r.c227
-rw-r--r--arch/mips/sni/ds1216.c81
-rw-r--r--arch/mips/sni/irq.c188
-rw-r--r--arch/mips/sni/pcimt.c390
-rw-r--r--arch/mips/sni/pcit.c351
-rw-r--r--arch/mips/sni/reset.c9
-rw-r--r--arch/mips/sni/rm200.c186
-rw-r--r--arch/mips/sni/setup.c242
-rw-r--r--arch/mips/sni/sniprom.c129
-rw-r--r--arch/mips/sni/time.c148
-rw-r--r--include/asm-mips/abi.h2
-rw-r--r--include/asm-mips/bitops.h52
-rw-r--r--include/asm-mips/compat-signal.h8
-rw-r--r--include/asm-mips/ds1216.h31
-rw-r--r--include/asm-mips/io.h29
-rw-r--r--include/asm-mips/mach-rm/cpu-feature-overrides.h5
-rw-r--r--include/asm-mips/pci.h1
-rw-r--r--include/asm-mips/pgalloc.h2
-rw-r--r--include/asm-mips/signal.h17
-rw-r--r--include/asm-mips/sni.h132
87 files changed, 7920 insertions, 2110 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index a92ce6bd7cf1..46fa5ca9f5ac 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -726,15 +726,16 @@ config SNI_RM
726 select BOOT_ELF32 726 select BOOT_ELF32
727 select DMA_NONCOHERENT 727 select DMA_NONCOHERENT
728 select GENERIC_ISA_DMA 728 select GENERIC_ISA_DMA
729 select HAVE_STD_PC_SERIAL_PORT
730 select HW_HAS_EISA 729 select HW_HAS_EISA
731 select HW_HAS_PCI 730 select HW_HAS_PCI
731 select IRQ_CPU
732 select I8253 732 select I8253
733 select I8259 733 select I8259
734 select ISA 734 select ISA
735 select SWAP_IO_SPACE if CPU_BIG_ENDIAN 735 select SWAP_IO_SPACE if CPU_BIG_ENDIAN
736 select SYS_HAS_CPU_R4X00 736 select SYS_HAS_CPU_R4X00
737 select SYS_HAS_CPU_R5000 737 select SYS_HAS_CPU_R5000
738 select SYS_HAS_CPU_R10000
738 select R5000_CPU_SCACHE 739 select R5000_CPU_SCACHE
739 select SYS_SUPPORTS_32BIT_KERNEL 740 select SYS_SUPPORTS_32BIT_KERNEL
740 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL 741 select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL
@@ -1066,7 +1067,7 @@ config BOOT_ELF32
1066 1067
1067config MIPS_L1_CACHE_SHIFT 1068config MIPS_L1_CACHE_SHIFT
1068 int 1069 int
1069 default "4" if MACH_DECSTATION 1070 default "4" if MACH_DECSTATION || SNI_RM
1070 default "7" if SGI_IP27 1071 default "7" if SGI_IP27
1071 default "5" 1072 default "5"
1072 1073
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index ac1891687520..45874d1038d3 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 09:59:39 2006 4# Sun Feb 18 21:27:35 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32CONFIG_MIPS_ATLAS=y 31CONFIG_MIPS_ATLAS=y
@@ -42,6 +41,7 @@ CONFIG_MIPS_ATLAS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MIPS_ATLAS=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_BONITO64=y 77CONFIG_MIPS_BONITO64=y
@@ -129,8 +133,8 @@ CONFIG_BOARD_SCACHE=y
129CONFIG_RM7000_CPU_SCACHE=y 133CONFIG_RM7000_CPU_SCACHE=y
130CONFIG_CPU_HAS_PREFETCH=y 134CONFIG_CPU_HAS_PREFETCH=y
131CONFIG_MIPS_MT_DISABLED=y 135CONFIG_MIPS_MT_DISABLED=y
132# CONFIG_MIPS_MT_SMTC is not set
133# CONFIG_MIPS_MT_SMP is not set 136# CONFIG_MIPS_MT_SMP is not set
137# CONFIG_MIPS_MT_SMTC is not set
134# CONFIG_MIPS_VPE_LOADER is not set 138# CONFIG_MIPS_VPE_LOADER is not set
135CONFIG_SYS_SUPPORTS_MULTITHREADING=y 139CONFIG_SYS_SUPPORTS_MULTITHREADING=y
136# CONFIG_64BIT_PHYS_ADDR is not set 140# CONFIG_64BIT_PHYS_ADDR is not set
@@ -149,6 +153,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
149# CONFIG_SPARSEMEM_STATIC is not set 153# CONFIG_SPARSEMEM_STATIC is not set
150CONFIG_SPLIT_PTLOCK_CPUS=4 154CONFIG_SPLIT_PTLOCK_CPUS=4
151# CONFIG_RESOURCES_64BIT is not set 155# CONFIG_RESOURCES_64BIT is not set
156CONFIG_ZONE_DMA_FLAG=1
152# CONFIG_HZ_48 is not set 157# CONFIG_HZ_48 is not set
153CONFIG_HZ_100=y 158CONFIG_HZ_100=y
154# CONFIG_HZ_128 is not set 159# CONFIG_HZ_128 is not set
@@ -161,6 +166,7 @@ CONFIG_HZ=100
161CONFIG_PREEMPT_NONE=y 166CONFIG_PREEMPT_NONE=y
162# CONFIG_PREEMPT_VOLUNTARY is not set 167# CONFIG_PREEMPT_VOLUNTARY is not set
163# CONFIG_PREEMPT is not set 168# CONFIG_PREEMPT is not set
169# CONFIG_KEXEC is not set
164CONFIG_LOCKDEP_SUPPORT=y 170CONFIG_LOCKDEP_SUPPORT=y
165CONFIG_STACKTRACE_SUPPORT=y 171CONFIG_STACKTRACE_SUPPORT=y
166CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 172CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -179,15 +185,20 @@ CONFIG_LOCALVERSION=""
179CONFIG_LOCALVERSION_AUTO=y 185CONFIG_LOCALVERSION_AUTO=y
180CONFIG_SWAP=y 186CONFIG_SWAP=y
181CONFIG_SYSVIPC=y 187CONFIG_SYSVIPC=y
188# CONFIG_IPC_NS is not set
189CONFIG_SYSVIPC_SYSCTL=y
182# CONFIG_POSIX_MQUEUE is not set 190# CONFIG_POSIX_MQUEUE is not set
183# CONFIG_BSD_PROCESS_ACCT is not set 191# CONFIG_BSD_PROCESS_ACCT is not set
184CONFIG_SYSCTL=y 192# CONFIG_TASKSTATS is not set
193# CONFIG_UTS_NS is not set
185# CONFIG_AUDIT is not set 194# CONFIG_AUDIT is not set
186# CONFIG_IKCONFIG is not set 195# CONFIG_IKCONFIG is not set
196CONFIG_SYSFS_DEPRECATED=y
187CONFIG_RELAY=y 197CONFIG_RELAY=y
188CONFIG_INITRAMFS_SOURCE=""
189# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 198# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
199CONFIG_SYSCTL=y
190CONFIG_EMBEDDED=y 200CONFIG_EMBEDDED=y
201CONFIG_SYSCTL_SYSCALL=y
191CONFIG_KALLSYMS=y 202CONFIG_KALLSYMS=y
192# CONFIG_KALLSYMS_EXTRA_PASS is not set 203# CONFIG_KALLSYMS_EXTRA_PASS is not set
193CONFIG_HOTPLUG=y 204CONFIG_HOTPLUG=y
@@ -195,12 +206,12 @@ CONFIG_PRINTK=y
195CONFIG_BUG=y 206CONFIG_BUG=y
196CONFIG_ELF_CORE=y 207CONFIG_ELF_CORE=y
197CONFIG_BASE_FULL=y 208CONFIG_BASE_FULL=y
198CONFIG_RT_MUTEXES=y
199CONFIG_FUTEX=y 209CONFIG_FUTEX=y
200CONFIG_EPOLL=y 210CONFIG_EPOLL=y
201CONFIG_SHMEM=y 211CONFIG_SHMEM=y
202CONFIG_SLAB=y 212CONFIG_SLAB=y
203CONFIG_VM_EVENT_COUNTERS=y 213CONFIG_VM_EVENT_COUNTERS=y
214CONFIG_RT_MUTEXES=y
204# CONFIG_TINY_SHMEM is not set 215# CONFIG_TINY_SHMEM is not set
205CONFIG_BASE_SMALL=0 216CONFIG_BASE_SMALL=0
206# CONFIG_SLOB is not set 217# CONFIG_SLOB is not set
@@ -218,6 +229,7 @@ CONFIG_KMOD=y
218# 229#
219# Block layer 230# Block layer
220# 231#
232CONFIG_BLOCK=y
221# CONFIG_LBD is not set 233# CONFIG_LBD is not set
222# CONFIG_BLK_DEV_IO_TRACE is not set 234# CONFIG_BLK_DEV_IO_TRACE is not set
223# CONFIG_LSF is not set 235# CONFIG_LSF is not set
@@ -260,6 +272,14 @@ CONFIG_BINFMT_ELF=y
260CONFIG_TRAD_SIGNALS=y 272CONFIG_TRAD_SIGNALS=y
261 273
262# 274#
275# Power management options
276#
277CONFIG_PM=y
278# CONFIG_PM_LEGACY is not set
279# CONFIG_PM_DEBUG is not set
280# CONFIG_PM_SYSFS_DEPRECATED is not set
281
282#
263# Networking 283# Networking
264# 284#
265CONFIG_NET=y 285CONFIG_NET=y
@@ -273,7 +293,10 @@ CONFIG_PACKET_MMAP=y
273CONFIG_UNIX=y 293CONFIG_UNIX=y
274CONFIG_XFRM=y 294CONFIG_XFRM=y
275CONFIG_XFRM_USER=m 295CONFIG_XFRM_USER=m
296# CONFIG_XFRM_SUB_POLICY is not set
297CONFIG_XFRM_MIGRATE=y
276CONFIG_NET_KEY=y 298CONFIG_NET_KEY=y
299CONFIG_NET_KEY_MIGRATE=y
277CONFIG_INET=y 300CONFIG_INET=y
278CONFIG_IP_MULTICAST=y 301CONFIG_IP_MULTICAST=y
279CONFIG_IP_ADVANCED_ROUTER=y 302CONFIG_IP_ADVANCED_ROUTER=y
@@ -281,7 +304,6 @@ CONFIG_ASK_IP_FIB_HASH=y
281# CONFIG_IP_FIB_TRIE is not set 304# CONFIG_IP_FIB_TRIE is not set
282CONFIG_IP_FIB_HASH=y 305CONFIG_IP_FIB_HASH=y
283CONFIG_IP_MULTIPLE_TABLES=y 306CONFIG_IP_MULTIPLE_TABLES=y
284CONFIG_IP_ROUTE_FWMARK=y
285CONFIG_IP_ROUTE_MULTIPATH=y 307CONFIG_IP_ROUTE_MULTIPATH=y
286# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 308# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
287CONFIG_IP_ROUTE_VERBOSE=y 309CONFIG_IP_ROUTE_VERBOSE=y
@@ -304,10 +326,13 @@ CONFIG_INET_XFRM_TUNNEL=m
304CONFIG_INET_TUNNEL=m 326CONFIG_INET_TUNNEL=m
305CONFIG_INET_XFRM_MODE_TRANSPORT=m 327CONFIG_INET_XFRM_MODE_TRANSPORT=m
306CONFIG_INET_XFRM_MODE_TUNNEL=m 328CONFIG_INET_XFRM_MODE_TUNNEL=m
329CONFIG_INET_XFRM_MODE_BEET=m
307CONFIG_INET_DIAG=y 330CONFIG_INET_DIAG=y
308CONFIG_INET_TCP_DIAG=y 331CONFIG_INET_TCP_DIAG=y
309# CONFIG_TCP_CONG_ADVANCED is not set 332# CONFIG_TCP_CONG_ADVANCED is not set
310CONFIG_TCP_CONG_BIC=y 333CONFIG_TCP_CONG_CUBIC=y
334CONFIG_DEFAULT_TCP_CONG="cubic"
335CONFIG_TCP_MD5SIG=y
311 336
312# 337#
313# IP: Virtual Server Configuration 338# IP: Virtual Server Configuration
@@ -349,11 +374,17 @@ CONFIG_IPV6_ROUTE_INFO=y
349CONFIG_INET6_AH=m 374CONFIG_INET6_AH=m
350CONFIG_INET6_ESP=m 375CONFIG_INET6_ESP=m
351CONFIG_INET6_IPCOMP=m 376CONFIG_INET6_IPCOMP=m
377CONFIG_IPV6_MIP6=y
352CONFIG_INET6_XFRM_TUNNEL=m 378CONFIG_INET6_XFRM_TUNNEL=m
353CONFIG_INET6_TUNNEL=m 379CONFIG_INET6_TUNNEL=m
354CONFIG_INET6_XFRM_MODE_TRANSPORT=m 380CONFIG_INET6_XFRM_MODE_TRANSPORT=m
355CONFIG_INET6_XFRM_MODE_TUNNEL=m 381CONFIG_INET6_XFRM_MODE_TUNNEL=m
382CONFIG_INET6_XFRM_MODE_BEET=m
383CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
384CONFIG_IPV6_SIT=m
356CONFIG_IPV6_TUNNEL=m 385CONFIG_IPV6_TUNNEL=m
386CONFIG_IPV6_MULTIPLE_TABLES=y
387CONFIG_IPV6_SUBTREES=y
357CONFIG_NETWORK_SECMARK=y 388CONFIG_NETWORK_SECMARK=y
358CONFIG_NETFILTER=y 389CONFIG_NETFILTER=y
359# CONFIG_NETFILTER_DEBUG is not set 390# CONFIG_NETFILTER_DEBUG is not set
@@ -365,19 +396,43 @@ CONFIG_BRIDGE_NETFILTER=y
365CONFIG_NETFILTER_NETLINK=m 396CONFIG_NETFILTER_NETLINK=m
366CONFIG_NETFILTER_NETLINK_QUEUE=m 397CONFIG_NETFILTER_NETLINK_QUEUE=m
367CONFIG_NETFILTER_NETLINK_LOG=m 398CONFIG_NETFILTER_NETLINK_LOG=m
399CONFIG_NF_CONNTRACK_ENABLED=m
400CONFIG_NF_CONNTRACK_SUPPORT=y
401# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
402CONFIG_NF_CONNTRACK=m
403CONFIG_NF_CT_ACCT=y
404CONFIG_NF_CONNTRACK_MARK=y
405CONFIG_NF_CONNTRACK_SECMARK=y
406CONFIG_NF_CONNTRACK_EVENTS=y
407CONFIG_NF_CT_PROTO_GRE=m
408CONFIG_NF_CT_PROTO_SCTP=m
409CONFIG_NF_CONNTRACK_AMANDA=m
410CONFIG_NF_CONNTRACK_FTP=m
411CONFIG_NF_CONNTRACK_H323=m
412CONFIG_NF_CONNTRACK_IRC=m
413# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
414CONFIG_NF_CONNTRACK_PPTP=m
415CONFIG_NF_CONNTRACK_SANE=m
416CONFIG_NF_CONNTRACK_SIP=m
417CONFIG_NF_CONNTRACK_TFTP=m
418CONFIG_NF_CT_NETLINK=m
368CONFIG_NETFILTER_XTABLES=m 419CONFIG_NETFILTER_XTABLES=m
369CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 420CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
370CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 421CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
422CONFIG_NETFILTER_XT_TARGET_DSCP=m
371CONFIG_NETFILTER_XT_TARGET_MARK=m 423CONFIG_NETFILTER_XT_TARGET_MARK=m
372CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 424CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
425CONFIG_NETFILTER_XT_TARGET_NFLOG=m
373CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 426CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
374CONFIG_NETFILTER_XT_TARGET_SECMARK=m 427CONFIG_NETFILTER_XT_TARGET_SECMARK=m
375CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 428CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
429CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
376CONFIG_NETFILTER_XT_MATCH_COMMENT=m 430CONFIG_NETFILTER_XT_MATCH_COMMENT=m
377CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 431CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
378CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 432CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
379CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 433CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
380CONFIG_NETFILTER_XT_MATCH_DCCP=m 434CONFIG_NETFILTER_XT_MATCH_DCCP=m
435CONFIG_NETFILTER_XT_MATCH_DSCP=m
381CONFIG_NETFILTER_XT_MATCH_ESP=m 436CONFIG_NETFILTER_XT_MATCH_ESP=m
382CONFIG_NETFILTER_XT_MATCH_HELPER=m 437CONFIG_NETFILTER_XT_MATCH_HELPER=m
383CONFIG_NETFILTER_XT_MATCH_LENGTH=m 438CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -395,60 +450,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
395CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 450CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
396CONFIG_NETFILTER_XT_MATCH_STRING=m 451CONFIG_NETFILTER_XT_MATCH_STRING=m
397CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 452CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
453CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
398 454
399# 455#
400# IP: Netfilter Configuration 456# IP: Netfilter Configuration
401# 457#
402CONFIG_IP_NF_CONNTRACK=m 458CONFIG_NF_CONNTRACK_IPV4=m
403CONFIG_IP_NF_CT_ACCT=y 459CONFIG_NF_CONNTRACK_PROC_COMPAT=y
404CONFIG_IP_NF_CONNTRACK_MARK=y
405CONFIG_IP_NF_CONNTRACK_SECMARK=y
406CONFIG_IP_NF_CONNTRACK_EVENTS=y
407CONFIG_IP_NF_CONNTRACK_NETLINK=m
408CONFIG_IP_NF_CT_PROTO_SCTP=m
409CONFIG_IP_NF_FTP=m
410CONFIG_IP_NF_IRC=m
411# CONFIG_IP_NF_NETBIOS_NS is not set
412CONFIG_IP_NF_TFTP=m
413CONFIG_IP_NF_AMANDA=m
414CONFIG_IP_NF_PPTP=m
415CONFIG_IP_NF_H323=m
416CONFIG_IP_NF_SIP=m
417CONFIG_IP_NF_QUEUE=m 460CONFIG_IP_NF_QUEUE=m
418CONFIG_IP_NF_IPTABLES=m 461CONFIG_IP_NF_IPTABLES=m
419CONFIG_IP_NF_MATCH_IPRANGE=m 462CONFIG_IP_NF_MATCH_IPRANGE=m
420CONFIG_IP_NF_MATCH_TOS=m 463CONFIG_IP_NF_MATCH_TOS=m
421CONFIG_IP_NF_MATCH_RECENT=m 464CONFIG_IP_NF_MATCH_RECENT=m
422CONFIG_IP_NF_MATCH_ECN=m 465CONFIG_IP_NF_MATCH_ECN=m
423CONFIG_IP_NF_MATCH_DSCP=m
424CONFIG_IP_NF_MATCH_AH=m 466CONFIG_IP_NF_MATCH_AH=m
425CONFIG_IP_NF_MATCH_TTL=m 467CONFIG_IP_NF_MATCH_TTL=m
426CONFIG_IP_NF_MATCH_OWNER=m 468CONFIG_IP_NF_MATCH_OWNER=m
427CONFIG_IP_NF_MATCH_ADDRTYPE=m 469CONFIG_IP_NF_MATCH_ADDRTYPE=m
428CONFIG_IP_NF_MATCH_HASHLIMIT=m
429CONFIG_IP_NF_FILTER=m 470CONFIG_IP_NF_FILTER=m
430CONFIG_IP_NF_TARGET_REJECT=m 471CONFIG_IP_NF_TARGET_REJECT=m
431CONFIG_IP_NF_TARGET_LOG=m 472CONFIG_IP_NF_TARGET_LOG=m
432CONFIG_IP_NF_TARGET_ULOG=m 473CONFIG_IP_NF_TARGET_ULOG=m
433CONFIG_IP_NF_TARGET_TCPMSS=m 474CONFIG_NF_NAT=m
434CONFIG_IP_NF_NAT=m 475CONFIG_NF_NAT_NEEDED=y
435CONFIG_IP_NF_NAT_NEEDED=y
436CONFIG_IP_NF_TARGET_MASQUERADE=m 476CONFIG_IP_NF_TARGET_MASQUERADE=m
437CONFIG_IP_NF_TARGET_REDIRECT=m 477CONFIG_IP_NF_TARGET_REDIRECT=m
438CONFIG_IP_NF_TARGET_NETMAP=m 478CONFIG_IP_NF_TARGET_NETMAP=m
439CONFIG_IP_NF_TARGET_SAME=m 479CONFIG_IP_NF_TARGET_SAME=m
440# CONFIG_IP_NF_NAT_SNMP_BASIC is not set 480CONFIG_NF_NAT_SNMP_BASIC=m
441CONFIG_IP_NF_NAT_IRC=m 481CONFIG_NF_NAT_PROTO_GRE=m
442CONFIG_IP_NF_NAT_FTP=m 482CONFIG_NF_NAT_FTP=m
443CONFIG_IP_NF_NAT_TFTP=m 483CONFIG_NF_NAT_IRC=m
444CONFIG_IP_NF_NAT_AMANDA=m 484CONFIG_NF_NAT_TFTP=m
445CONFIG_IP_NF_NAT_PPTP=m 485CONFIG_NF_NAT_AMANDA=m
446CONFIG_IP_NF_NAT_H323=m 486CONFIG_NF_NAT_PPTP=m
447CONFIG_IP_NF_NAT_SIP=m 487CONFIG_NF_NAT_H323=m
488CONFIG_NF_NAT_SIP=m
448CONFIG_IP_NF_MANGLE=m 489CONFIG_IP_NF_MANGLE=m
449CONFIG_IP_NF_TARGET_TOS=m 490CONFIG_IP_NF_TARGET_TOS=m
450CONFIG_IP_NF_TARGET_ECN=m 491CONFIG_IP_NF_TARGET_ECN=m
451CONFIG_IP_NF_TARGET_DSCP=m
452CONFIG_IP_NF_TARGET_TTL=m 492CONFIG_IP_NF_TARGET_TTL=m
453# CONFIG_IP_NF_TARGET_CLUSTERIP is not set 493# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
454CONFIG_IP_NF_RAW=m 494CONFIG_IP_NF_RAW=m
@@ -459,6 +499,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
459# 499#
460# IPv6: Netfilter Configuration (EXPERIMENTAL) 500# IPv6: Netfilter Configuration (EXPERIMENTAL)
461# 501#
502CONFIG_NF_CONNTRACK_IPV6=m
462CONFIG_IP6_NF_QUEUE=m 503CONFIG_IP6_NF_QUEUE=m
463CONFIG_IP6_NF_IPTABLES=m 504CONFIG_IP6_NF_IPTABLES=m
464CONFIG_IP6_NF_MATCH_RT=m 505CONFIG_IP6_NF_MATCH_RT=m
@@ -468,6 +509,7 @@ CONFIG_IP6_NF_MATCH_HL=m
468CONFIG_IP6_NF_MATCH_OWNER=m 509CONFIG_IP6_NF_MATCH_OWNER=m
469CONFIG_IP6_NF_MATCH_IPV6HEADER=m 510CONFIG_IP6_NF_MATCH_IPV6HEADER=m
470CONFIG_IP6_NF_MATCH_AH=m 511CONFIG_IP6_NF_MATCH_AH=m
512CONFIG_IP6_NF_MATCH_MH=m
471CONFIG_IP6_NF_MATCH_EUI64=m 513CONFIG_IP6_NF_MATCH_EUI64=m
472CONFIG_IP6_NF_FILTER=m 514CONFIG_IP6_NF_FILTER=m
473CONFIG_IP6_NF_TARGET_LOG=m 515CONFIG_IP6_NF_TARGET_LOG=m
@@ -527,13 +569,12 @@ CONFIG_LLC=m
527# CONFIG_LLC2 is not set 569# CONFIG_LLC2 is not set
528# CONFIG_IPX is not set 570# CONFIG_IPX is not set
529CONFIG_ATALK=m 571CONFIG_ATALK=m
530CONFIG_DEV_APPLETALK=y 572CONFIG_DEV_APPLETALK=m
531CONFIG_IPDDP=m 573CONFIG_IPDDP=m
532CONFIG_IPDDP_ENCAP=y 574CONFIG_IPDDP_ENCAP=y
533CONFIG_IPDDP_DECAP=y 575CONFIG_IPDDP_DECAP=y
534# CONFIG_X25 is not set 576# CONFIG_X25 is not set
535# CONFIG_LAPB is not set 577# CONFIG_LAPB is not set
536CONFIG_NET_DIVERT=y
537# CONFIG_ECONET is not set 578# CONFIG_ECONET is not set
538# CONFIG_WAN_ROUTER is not set 579# CONFIG_WAN_ROUTER is not set
539 580
@@ -541,6 +582,7 @@ CONFIG_NET_DIVERT=y
541# QoS and/or fair queueing 582# QoS and/or fair queueing
542# 583#
543CONFIG_NET_SCHED=y 584CONFIG_NET_SCHED=y
585CONFIG_NET_SCH_FIFO=y
544CONFIG_NET_SCH_CLK_JIFFIES=y 586CONFIG_NET_SCH_CLK_JIFFIES=y
545# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 587# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
546# CONFIG_NET_SCH_CLK_CPU is not set 588# CONFIG_NET_SCH_CLK_CPU is not set
@@ -595,6 +637,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
595CONFIG_IEEE80211_SOFTMAC=m 637CONFIG_IEEE80211_SOFTMAC=m
596# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 638# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
597CONFIG_WIRELESS_EXT=y 639CONFIG_WIRELESS_EXT=y
640CONFIG_FIB_RULES=y
598 641
599# 642#
600# Device Drivers 643# Device Drivers
@@ -642,6 +685,7 @@ CONFIG_BLK_DEV_NBD=m
642CONFIG_BLK_DEV_RAM=y 685CONFIG_BLK_DEV_RAM=y
643CONFIG_BLK_DEV_RAM_COUNT=16 686CONFIG_BLK_DEV_RAM_COUNT=16
644CONFIG_BLK_DEV_RAM_SIZE=4096 687CONFIG_BLK_DEV_RAM_SIZE=4096
688CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
645# CONFIG_BLK_DEV_INITRD is not set 689# CONFIG_BLK_DEV_INITRD is not set
646CONFIG_CDROM_PKTCDVD=m 690CONFIG_CDROM_PKTCDVD=m
647CONFIG_CDROM_PKTCDVD_BUFFERS=8 691CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -649,9 +693,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
649CONFIG_ATA_OVER_ETH=m 693CONFIG_ATA_OVER_ETH=m
650 694
651# 695#
696# Misc devices
697#
698CONFIG_SGI_IOC4=m
699# CONFIG_TIFM_CORE is not set
700
701#
652# ATA/ATAPI/MFM/RLL support 702# ATA/ATAPI/MFM/RLL support
653# 703#
654CONFIG_IDE=y 704CONFIG_IDE=y
705CONFIG_IDE_MAX_HWIFS=4
655CONFIG_BLK_DEV_IDE=y 706CONFIG_BLK_DEV_IDE=y
656 707
657# 708#
@@ -681,6 +732,8 @@ CONFIG_IDE_GENERIC=y
681# 732#
682CONFIG_RAID_ATTRS=m 733CONFIG_RAID_ATTRS=m
683CONFIG_SCSI=y 734CONFIG_SCSI=y
735CONFIG_SCSI_TGT=m
736CONFIG_SCSI_NETLINK=y
684CONFIG_SCSI_PROC_FS=y 737CONFIG_SCSI_PROC_FS=y
685 738
686# 739#
@@ -700,14 +753,17 @@ CONFIG_CHR_DEV_SCH=m
700CONFIG_SCSI_MULTI_LUN=y 753CONFIG_SCSI_MULTI_LUN=y
701CONFIG_SCSI_CONSTANTS=y 754CONFIG_SCSI_CONSTANTS=y
702CONFIG_SCSI_LOGGING=y 755CONFIG_SCSI_LOGGING=y
756CONFIG_SCSI_SCAN_ASYNC=y
703 757
704# 758#
705# SCSI Transport Attributes 759# SCSI Transports
706# 760#
707CONFIG_SCSI_SPI_ATTRS=y 761CONFIG_SCSI_SPI_ATTRS=y
708CONFIG_SCSI_FC_ATTRS=y 762CONFIG_SCSI_FC_ATTRS=y
709CONFIG_SCSI_ISCSI_ATTRS=m 763CONFIG_SCSI_ISCSI_ATTRS=m
710CONFIG_SCSI_SAS_ATTRS=m 764CONFIG_SCSI_SAS_ATTRS=m
765CONFIG_SCSI_SAS_LIBSAS=m
766CONFIG_SCSI_SAS_LIBSAS_DEBUG=y
711 767
712# 768#
713# SCSI low-level drivers 769# SCSI low-level drivers
@@ -720,30 +776,39 @@ CONFIG_ISCSI_TCP=m
720# CONFIG_SCSI_AIC7XXX is not set 776# CONFIG_SCSI_AIC7XXX is not set
721# CONFIG_SCSI_AIC7XXX_OLD is not set 777# CONFIG_SCSI_AIC7XXX_OLD is not set
722# CONFIG_SCSI_AIC79XX is not set 778# CONFIG_SCSI_AIC79XX is not set
779CONFIG_SCSI_AIC94XX=m
780# CONFIG_AIC94XX_DEBUG is not set
723# CONFIG_SCSI_DPT_I2O is not set 781# CONFIG_SCSI_DPT_I2O is not set
782# CONFIG_SCSI_ARCMSR is not set
724# CONFIG_MEGARAID_NEWGEN is not set 783# CONFIG_MEGARAID_NEWGEN is not set
725# CONFIG_MEGARAID_LEGACY is not set 784# CONFIG_MEGARAID_LEGACY is not set
726# CONFIG_MEGARAID_SAS is not set 785# CONFIG_MEGARAID_SAS is not set
727# CONFIG_SCSI_SATA is not set
728# CONFIG_SCSI_HPTIOP is not set 786# CONFIG_SCSI_HPTIOP is not set
729# CONFIG_SCSI_DMX3191D is not set 787# CONFIG_SCSI_DMX3191D is not set
730# CONFIG_SCSI_FUTURE_DOMAIN is not set 788# CONFIG_SCSI_FUTURE_DOMAIN is not set
731# CONFIG_SCSI_IPS is not set 789# CONFIG_SCSI_IPS is not set
732# CONFIG_SCSI_INITIO is not set 790# CONFIG_SCSI_INITIO is not set
733# CONFIG_SCSI_INIA100 is not set 791# CONFIG_SCSI_INIA100 is not set
792# CONFIG_SCSI_STEX is not set
734CONFIG_SCSI_SYM53C8XX_2=y 793CONFIG_SCSI_SYM53C8XX_2=y
735CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 794CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
736CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 795CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
737CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 796CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
738CONFIG_SCSI_SYM53C8XX_MMIO=y 797CONFIG_SCSI_SYM53C8XX_MMIO=y
739# CONFIG_SCSI_IPR is not set
740# CONFIG_SCSI_QLOGIC_1280 is not set 798# CONFIG_SCSI_QLOGIC_1280 is not set
741# CONFIG_SCSI_QLA_FC is not set 799# CONFIG_SCSI_QLA_FC is not set
800# CONFIG_SCSI_QLA_ISCSI is not set
742# CONFIG_SCSI_LPFC is not set 801# CONFIG_SCSI_LPFC is not set
743# CONFIG_SCSI_DC395x is not set 802# CONFIG_SCSI_DC395x is not set
744# CONFIG_SCSI_DC390T is not set 803# CONFIG_SCSI_DC390T is not set
745# CONFIG_SCSI_NSP32 is not set 804# CONFIG_SCSI_NSP32 is not set
746# CONFIG_SCSI_DEBUG is not set 805# CONFIG_SCSI_DEBUG is not set
806# CONFIG_SCSI_SRP is not set
807
808#
809# Serial ATA (prod) and Parallel ATA (experimental) drivers
810#
811# CONFIG_ATA is not set
747 812
748# 813#
749# Multi-device support (RAID and LVM) 814# Multi-device support (RAID and LVM)
@@ -759,6 +824,7 @@ CONFIG_MD_RAID5_RESHAPE=y
759CONFIG_MD_MULTIPATH=m 824CONFIG_MD_MULTIPATH=m
760CONFIG_MD_FAULTY=m 825CONFIG_MD_FAULTY=m
761CONFIG_BLK_DEV_DM=m 826CONFIG_BLK_DEV_DM=m
827# CONFIG_DM_DEBUG is not set
762CONFIG_DM_CRYPT=m 828CONFIG_DM_CRYPT=m
763CONFIG_DM_SNAPSHOT=m 829CONFIG_DM_SNAPSHOT=m
764CONFIG_DM_MIRROR=m 830CONFIG_DM_MIRROR=m
@@ -813,6 +879,8 @@ CONFIG_LXT_PHY=m
813CONFIG_CICADA_PHY=m 879CONFIG_CICADA_PHY=m
814CONFIG_VITESSE_PHY=m 880CONFIG_VITESSE_PHY=m
815CONFIG_SMSC_PHY=m 881CONFIG_SMSC_PHY=m
882# CONFIG_BROADCOM_PHY is not set
883# CONFIG_FIXED_PHY is not set
816 884
817# 885#
818# Ethernet (10 or 100Mbit) 886# Ethernet (10 or 100Mbit)
@@ -832,6 +900,7 @@ CONFIG_MII=y
832# CONFIG_HP100 is not set 900# CONFIG_HP100 is not set
833CONFIG_NET_PCI=y 901CONFIG_NET_PCI=y
834CONFIG_PCNET32=y 902CONFIG_PCNET32=y
903# CONFIG_PCNET32_NAPI is not set
835# CONFIG_AMD8111_ETH is not set 904# CONFIG_AMD8111_ETH is not set
836# CONFIG_ADAPTEC_STARFIRE is not set 905# CONFIG_ADAPTEC_STARFIRE is not set
837# CONFIG_B44 is not set 906# CONFIG_B44 is not set
@@ -850,6 +919,7 @@ CONFIG_PCNET32=y
850# CONFIG_TLAN is not set 919# CONFIG_TLAN is not set
851# CONFIG_VIA_RHINE is not set 920# CONFIG_VIA_RHINE is not set
852CONFIG_LAN_SAA9730=y 921CONFIG_LAN_SAA9730=y
922# CONFIG_SC92031 is not set
853 923
854# 924#
855# Ethernet (1000 Mbit) 925# Ethernet (1000 Mbit)
@@ -868,14 +938,18 @@ CONFIG_LAN_SAA9730=y
868# CONFIG_VIA_VELOCITY is not set 938# CONFIG_VIA_VELOCITY is not set
869# CONFIG_TIGON3 is not set 939# CONFIG_TIGON3 is not set
870# CONFIG_BNX2 is not set 940# CONFIG_BNX2 is not set
941CONFIG_QLA3XXX=m
942# CONFIG_ATL1 is not set
871 943
872# 944#
873# Ethernet (10000 Mbit) 945# Ethernet (10000 Mbit)
874# 946#
875# CONFIG_CHELSIO_T1 is not set 947# CONFIG_CHELSIO_T1 is not set
948CONFIG_CHELSIO_T3=m
876# CONFIG_IXGB is not set 949# CONFIG_IXGB is not set
877# CONFIG_S2IO is not set 950# CONFIG_S2IO is not set
878# CONFIG_MYRI10GE is not set 951# CONFIG_MYRI10GE is not set
952CONFIG_NETXEN_NIC=m
879 953
880# 954#
881# Token Ring devices 955# Token Ring devices
@@ -915,6 +989,7 @@ CONFIG_LAN_SAA9730=y
915# Input device support 989# Input device support
916# 990#
917CONFIG_INPUT=y 991CONFIG_INPUT=y
992# CONFIG_INPUT_FF_MEMLESS is not set
918 993
919# 994#
920# Userland interfaces 995# Userland interfaces
@@ -995,10 +1070,6 @@ CONFIG_LEGACY_PTY_COUNT=256
995# CONFIG_DTLK is not set 1070# CONFIG_DTLK is not set
996# CONFIG_R3964 is not set 1071# CONFIG_R3964 is not set
997# CONFIG_APPLICOM is not set 1072# CONFIG_APPLICOM is not set
998
999#
1000# Ftape, the floppy tape device driver
1001#
1002# CONFIG_DRM is not set 1073# CONFIG_DRM is not set
1003# CONFIG_RAW_DRIVER is not set 1074# CONFIG_RAW_DRIVER is not set
1004 1075
@@ -1006,7 +1077,6 @@ CONFIG_LEGACY_PTY_COUNT=256
1006# TPM devices 1077# TPM devices
1007# 1078#
1008# CONFIG_TCG_TPM is not set 1079# CONFIG_TCG_TPM is not set
1009# CONFIG_TELCLOCK is not set
1010 1080
1011# 1081#
1012# I2C support 1082# I2C support
@@ -1031,14 +1101,9 @@ CONFIG_LEGACY_PTY_COUNT=256
1031# CONFIG_HWMON_VID is not set 1101# CONFIG_HWMON_VID is not set
1032 1102
1033# 1103#
1034# Misc devices
1035#
1036
1037#
1038# Multimedia devices 1104# Multimedia devices
1039# 1105#
1040# CONFIG_VIDEO_DEV is not set 1106# CONFIG_VIDEO_DEV is not set
1041CONFIG_VIDEO_V4L2=y
1042 1107
1043# 1108#
1044# Digital Video Broadcasting Devices 1109# Digital Video Broadcasting Devices
@@ -1056,6 +1121,7 @@ CONFIG_VIDEO_V4L2=y
1056# 1121#
1057# CONFIG_VGA_CONSOLE is not set 1122# CONFIG_VGA_CONSOLE is not set
1058CONFIG_DUMMY_CONSOLE=y 1123CONFIG_DUMMY_CONSOLE=y
1124# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1059 1125
1060# 1126#
1061# Sound 1127# Sound
@@ -1063,6 +1129,12 @@ CONFIG_DUMMY_CONSOLE=y
1063# CONFIG_SOUND is not set 1129# CONFIG_SOUND is not set
1064 1130
1065# 1131#
1132# HID Devices
1133#
1134CONFIG_HID=y
1135# CONFIG_HID_DEBUG is not set
1136
1137#
1066# USB support 1138# USB support
1067# 1139#
1068CONFIG_USB_ARCH_HAS_HCD=y 1140CONFIG_USB_ARCH_HAS_HCD=y
@@ -1125,6 +1197,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1125# 1197#
1126 1198
1127# 1199#
1200# Auxiliary Display support
1201#
1202
1203#
1204# Virtualization
1205#
1206
1207#
1128# File systems 1208# File systems
1129# 1209#
1130CONFIG_EXT2_FS=y 1210CONFIG_EXT2_FS=y
@@ -1134,6 +1214,7 @@ CONFIG_EXT3_FS=y
1134CONFIG_EXT3_FS_XATTR=y 1214CONFIG_EXT3_FS_XATTR=y
1135# CONFIG_EXT3_FS_POSIX_ACL is not set 1215# CONFIG_EXT3_FS_POSIX_ACL is not set
1136# CONFIG_EXT3_FS_SECURITY is not set 1216# CONFIG_EXT3_FS_SECURITY is not set
1217# CONFIG_EXT4DEV_FS is not set
1137CONFIG_JBD=y 1218CONFIG_JBD=y
1138# CONFIG_JBD_DEBUG is not set 1219# CONFIG_JBD_DEBUG is not set
1139CONFIG_FS_MBCACHE=y 1220CONFIG_FS_MBCACHE=y
@@ -1154,6 +1235,7 @@ CONFIG_XFS_QUOTA=y
1154CONFIG_XFS_SECURITY=y 1235CONFIG_XFS_SECURITY=y
1155CONFIG_XFS_POSIX_ACL=y 1236CONFIG_XFS_POSIX_ACL=y
1156# CONFIG_XFS_RT is not set 1237# CONFIG_XFS_RT is not set
1238# CONFIG_GFS2_FS is not set
1157# CONFIG_OCFS2_FS is not set 1239# CONFIG_OCFS2_FS is not set
1158CONFIG_MINIX_FS=m 1240CONFIG_MINIX_FS=m
1159CONFIG_ROMFS_FS=m 1241CONFIG_ROMFS_FS=m
@@ -1167,6 +1249,7 @@ CONFIG_DNOTIFY=y
1167CONFIG_AUTOFS_FS=y 1249CONFIG_AUTOFS_FS=y
1168# CONFIG_AUTOFS4_FS is not set 1250# CONFIG_AUTOFS4_FS is not set
1169CONFIG_FUSE_FS=m 1251CONFIG_FUSE_FS=m
1252CONFIG_GENERIC_ACL=y
1170 1253
1171# 1254#
1172# CD-ROM/DVD Filesystems 1255# CD-ROM/DVD Filesystems
@@ -1174,7 +1257,6 @@ CONFIG_FUSE_FS=m
1174CONFIG_ISO9660_FS=m 1257CONFIG_ISO9660_FS=m
1175CONFIG_JOLIET=y 1258CONFIG_JOLIET=y
1176CONFIG_ZISOFS=y 1259CONFIG_ZISOFS=y
1177CONFIG_ZISOFS_FS=m
1178CONFIG_UDF_FS=m 1260CONFIG_UDF_FS=m
1179CONFIG_UDF_NLS=y 1261CONFIG_UDF_NLS=y
1180 1262
@@ -1193,11 +1275,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1193# 1275#
1194CONFIG_PROC_FS=y 1276CONFIG_PROC_FS=y
1195CONFIG_PROC_KCORE=y 1277CONFIG_PROC_KCORE=y
1278CONFIG_PROC_SYSCTL=y
1196CONFIG_SYSFS=y 1279CONFIG_SYSFS=y
1197CONFIG_TMPFS=y 1280CONFIG_TMPFS=y
1281CONFIG_TMPFS_POSIX_ACL=y
1198# CONFIG_HUGETLB_PAGE is not set 1282# CONFIG_HUGETLB_PAGE is not set
1199CONFIG_RAMFS=y 1283CONFIG_RAMFS=y
1200# CONFIG_CONFIGFS_FS is not set 1284CONFIG_CONFIGFS_FS=m
1201 1285
1202# 1286#
1203# Miscellaneous filesystems 1287# Miscellaneous filesystems
@@ -1242,7 +1326,6 @@ CONFIG_SUNRPC=y
1242# CONFIG_RPCSEC_GSS_SPKM3 is not set 1326# CONFIG_RPCSEC_GSS_SPKM3 is not set
1243# CONFIG_SMB_FS is not set 1327# CONFIG_SMB_FS is not set
1244# CONFIG_CIFS is not set 1328# CONFIG_CIFS is not set
1245# CONFIG_CIFS_DEBUG2 is not set
1246# CONFIG_NCP_FS is not set 1329# CONFIG_NCP_FS is not set
1247# CONFIG_CODA_FS is not set 1330# CONFIG_CODA_FS is not set
1248# CONFIG_AFS_FS is not set 1331# CONFIG_AFS_FS is not set
@@ -1299,6 +1382,14 @@ CONFIG_NLS_KOI8_U=m
1299CONFIG_NLS_UTF8=m 1382CONFIG_NLS_UTF8=m
1300 1383
1301# 1384#
1385# Distributed Lock Manager
1386#
1387CONFIG_DLM=m
1388CONFIG_DLM_TCP=y
1389# CONFIG_DLM_SCTP is not set
1390# CONFIG_DLM_DEBUG is not set
1391
1392#
1302# Profiling support 1393# Profiling support
1303# 1394#
1304# CONFIG_PROFILING is not set 1395# CONFIG_PROFILING is not set
@@ -1308,11 +1399,13 @@ CONFIG_NLS_UTF8=m
1308# 1399#
1309CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1400CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1310# CONFIG_PRINTK_TIME is not set 1401# CONFIG_PRINTK_TIME is not set
1402CONFIG_ENABLE_MUST_CHECK=y
1311# CONFIG_MAGIC_SYSRQ is not set 1403# CONFIG_MAGIC_SYSRQ is not set
1312# CONFIG_UNUSED_SYMBOLS is not set 1404# CONFIG_UNUSED_SYMBOLS is not set
1405# CONFIG_DEBUG_FS is not set
1406# CONFIG_HEADERS_CHECK is not set
1313# CONFIG_DEBUG_KERNEL is not set 1407# CONFIG_DEBUG_KERNEL is not set
1314CONFIG_LOG_BUF_SHIFT=14 1408CONFIG_LOG_BUF_SHIFT=14
1315# CONFIG_DEBUG_FS is not set
1316CONFIG_CROSSCOMPILE=y 1409CONFIG_CROSSCOMPILE=y
1317CONFIG_CMDLINE="" 1410CONFIG_CMDLINE=""
1318 1411
@@ -1326,18 +1419,30 @@ CONFIG_CMDLINE=""
1326# Cryptographic options 1419# Cryptographic options
1327# 1420#
1328CONFIG_CRYPTO=y 1421CONFIG_CRYPTO=y
1422CONFIG_CRYPTO_ALGAPI=y
1423CONFIG_CRYPTO_BLKCIPHER=m
1424CONFIG_CRYPTO_HASH=y
1425CONFIG_CRYPTO_MANAGER=y
1329CONFIG_CRYPTO_HMAC=y 1426CONFIG_CRYPTO_HMAC=y
1427CONFIG_CRYPTO_XCBC=m
1330CONFIG_CRYPTO_NULL=m 1428CONFIG_CRYPTO_NULL=m
1331CONFIG_CRYPTO_MD4=m 1429CONFIG_CRYPTO_MD4=m
1332CONFIG_CRYPTO_MD5=m 1430CONFIG_CRYPTO_MD5=y
1333CONFIG_CRYPTO_SHA1=m 1431CONFIG_CRYPTO_SHA1=m
1334CONFIG_CRYPTO_SHA256=m 1432CONFIG_CRYPTO_SHA256=m
1335CONFIG_CRYPTO_SHA512=m 1433CONFIG_CRYPTO_SHA512=m
1336CONFIG_CRYPTO_WP512=m 1434CONFIG_CRYPTO_WP512=m
1337CONFIG_CRYPTO_TGR192=m 1435CONFIG_CRYPTO_TGR192=m
1436CONFIG_CRYPTO_GF128MUL=m
1437CONFIG_CRYPTO_ECB=m
1438CONFIG_CRYPTO_CBC=m
1439CONFIG_CRYPTO_PCBC=m
1440CONFIG_CRYPTO_LRW=m
1338CONFIG_CRYPTO_DES=m 1441CONFIG_CRYPTO_DES=m
1442CONFIG_CRYPTO_FCRYPT=m
1339CONFIG_CRYPTO_BLOWFISH=m 1443CONFIG_CRYPTO_BLOWFISH=m
1340CONFIG_CRYPTO_TWOFISH=m 1444CONFIG_CRYPTO_TWOFISH=m
1445CONFIG_CRYPTO_TWOFISH_COMMON=m
1341CONFIG_CRYPTO_SERPENT=m 1446CONFIG_CRYPTO_SERPENT=m
1342CONFIG_CRYPTO_AES=m 1447CONFIG_CRYPTO_AES=m
1343CONFIG_CRYPTO_CAST5=m 1448CONFIG_CRYPTO_CAST5=m
@@ -1349,6 +1454,7 @@ CONFIG_CRYPTO_ANUBIS=m
1349CONFIG_CRYPTO_DEFLATE=m 1454CONFIG_CRYPTO_DEFLATE=m
1350CONFIG_CRYPTO_MICHAEL_MIC=m 1455CONFIG_CRYPTO_MICHAEL_MIC=m
1351CONFIG_CRYPTO_CRC32C=m 1456CONFIG_CRYPTO_CRC32C=m
1457CONFIG_CRYPTO_CAMELLIA=m
1352# CONFIG_CRYPTO_TEST is not set 1458# CONFIG_CRYPTO_TEST is not set
1353 1459
1354# 1460#
@@ -1358,6 +1464,7 @@ CONFIG_CRYPTO_CRC32C=m
1358# 1464#
1359# Library routines 1465# Library routines
1360# 1466#
1467CONFIG_BITREVERSE=y
1361# CONFIG_CRC_CCITT is not set 1468# CONFIG_CRC_CCITT is not set
1362CONFIG_CRC16=m 1469CONFIG_CRC16=m
1363CONFIG_CRC32=y 1470CONFIG_CRC32=y
@@ -1369,9 +1476,5 @@ CONFIG_TEXTSEARCH_KMP=m
1369CONFIG_TEXTSEARCH_BM=m 1476CONFIG_TEXTSEARCH_BM=m
1370CONFIG_TEXTSEARCH_FSM=m 1477CONFIG_TEXTSEARCH_FSM=m
1371CONFIG_PLIST=y 1478CONFIG_PLIST=y
1372CONFIG_RIO=n 1479CONFIG_HAS_IOMEM=y
1373CONFIG_I2C_OCORES=n 1480CONFIG_HAS_IOPORT=y
1374CONFIG_DEBUG_RT_MUTEXES=n
1375CONFIG_RT_MUTEX_TESTER=n
1376CONFIG_DEBUG_RWSEMS=n
1377CONFIG_DEBUG_LOCKING_API_SELFTESTS=n
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 9554257c6f3a..b4cdd3e7cdfc 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc1 3# Linux kernel version: 2.6.20
4# Wed Oct 11 01:41:41 2006 4# Sun Feb 18 21:27:35 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -40,6 +41,7 @@ CONFIG_MIPS=y
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -78,11 +80,14 @@ CONFIG_SIBYTE_CFE=y
78# CONFIG_SIBYTE_SB1250_PROF is not set 80# CONFIG_SIBYTE_SB1250_PROF is not set
79# CONFIG_SIBYTE_TBPROF is not set 81# CONFIG_SIBYTE_TBPROF is not set
80CONFIG_RWSEM_GENERIC_SPINLOCK=y 82CONFIG_RWSEM_GENERIC_SPINLOCK=y
83# CONFIG_ARCH_HAS_ILOG2_U32 is not set
84# CONFIG_ARCH_HAS_ILOG2_U64 is not set
81CONFIG_GENERIC_FIND_NEXT_BIT=y 85CONFIG_GENERIC_FIND_NEXT_BIT=y
82CONFIG_GENERIC_HWEIGHT=y 86CONFIG_GENERIC_HWEIGHT=y
83CONFIG_GENERIC_CALIBRATE_DELAY=y 87CONFIG_GENERIC_CALIBRATE_DELAY=y
84CONFIG_GENERIC_TIME=y 88CONFIG_GENERIC_TIME=y
85CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 89CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
90# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
86CONFIG_DMA_COHERENT=y 91CONFIG_DMA_COHERENT=y
87CONFIG_CPU_BIG_ENDIAN=y 92CONFIG_CPU_BIG_ENDIAN=y
88# CONFIG_CPU_LITTLE_ENDIAN is not set 93# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -115,6 +120,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
115# CONFIG_CPU_RM9000 is not set 120# CONFIG_CPU_RM9000 is not set
116CONFIG_CPU_SB1=y 121CONFIG_CPU_SB1=y
117CONFIG_SYS_HAS_CPU_SB1=y 122CONFIG_SYS_HAS_CPU_SB1=y
123CONFIG_WEAK_ORDERING=y
118CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 124CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
119CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 125CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
120CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 126CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -150,8 +156,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y
150# CONFIG_SPARSEMEM_STATIC is not set 156# CONFIG_SPARSEMEM_STATIC is not set
151CONFIG_SPLIT_PTLOCK_CPUS=4 157CONFIG_SPLIT_PTLOCK_CPUS=4
152CONFIG_RESOURCES_64BIT=y 158CONFIG_RESOURCES_64BIT=y
159CONFIG_ZONE_DMA_FLAG=1
153CONFIG_SMP=y 160CONFIG_SMP=y
154CONFIG_SYS_SUPPORTS_SMP=y 161CONFIG_SYS_SUPPORTS_SMP=y
162CONFIG_NR_CPUS_DEFAULT_4=y
155CONFIG_NR_CPUS=4 163CONFIG_NR_CPUS=4
156# CONFIG_HZ_48 is not set 164# CONFIG_HZ_48 is not set
157# CONFIG_HZ_100 is not set 165# CONFIG_HZ_100 is not set
@@ -166,6 +174,7 @@ CONFIG_PREEMPT_NONE=y
166# CONFIG_PREEMPT_VOLUNTARY is not set 174# CONFIG_PREEMPT_VOLUNTARY is not set
167# CONFIG_PREEMPT is not set 175# CONFIG_PREEMPT is not set
168# CONFIG_PREEMPT_BKL is not set 176# CONFIG_PREEMPT_BKL is not set
177# CONFIG_KEXEC is not set
169CONFIG_LOCKDEP_SUPPORT=y 178CONFIG_LOCKDEP_SUPPORT=y
170CONFIG_STACKTRACE_SUPPORT=y 179CONFIG_STACKTRACE_SUPPORT=y
171CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 180CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -185,6 +194,7 @@ CONFIG_LOCALVERSION_AUTO=y
185CONFIG_SWAP=y 194CONFIG_SWAP=y
186CONFIG_SYSVIPC=y 195CONFIG_SYSVIPC=y
187# CONFIG_IPC_NS is not set 196# CONFIG_IPC_NS is not set
197CONFIG_SYSVIPC_SYSCTL=y
188# CONFIG_POSIX_MQUEUE is not set 198# CONFIG_POSIX_MQUEUE is not set
189# CONFIG_BSD_PROCESS_ACCT is not set 199# CONFIG_BSD_PROCESS_ACCT is not set
190# CONFIG_TASKSTATS is not set 200# CONFIG_TASKSTATS is not set
@@ -193,6 +203,7 @@ CONFIG_SYSVIPC=y
193CONFIG_IKCONFIG=y 203CONFIG_IKCONFIG=y
194CONFIG_IKCONFIG_PROC=y 204CONFIG_IKCONFIG_PROC=y
195# CONFIG_CPUSETS is not set 205# CONFIG_CPUSETS is not set
206CONFIG_SYSFS_DEPRECATED=y
196# CONFIG_RELAY is not set 207# CONFIG_RELAY is not set
197CONFIG_INITRAMFS_SOURCE="" 208CONFIG_INITRAMFS_SOURCE=""
198# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 209# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -253,7 +264,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
253CONFIG_HW_HAS_PCI=y 264CONFIG_HW_HAS_PCI=y
254CONFIG_PCI=y 265CONFIG_PCI=y
255CONFIG_PCI_DOMAINS=y 266CONFIG_PCI_DOMAINS=y
256# CONFIG_PCI_MULTITHREAD_PROBE is not set
257CONFIG_PCI_DEBUG=y 267CONFIG_PCI_DEBUG=y
258CONFIG_MMU=y 268CONFIG_MMU=y
259 269
@@ -273,11 +283,20 @@ CONFIG_BINFMT_ELF=y
273# CONFIG_BUILD_ELF64 is not set 283# CONFIG_BUILD_ELF64 is not set
274CONFIG_MIPS32_COMPAT=y 284CONFIG_MIPS32_COMPAT=y
275CONFIG_COMPAT=y 285CONFIG_COMPAT=y
286CONFIG_SYSVIPC_COMPAT=y
276CONFIG_MIPS32_O32=y 287CONFIG_MIPS32_O32=y
277CONFIG_MIPS32_N32=y 288CONFIG_MIPS32_N32=y
278CONFIG_BINFMT_ELF32=y 289CONFIG_BINFMT_ELF32=y
279 290
280# 291#
292# Power management options
293#
294CONFIG_PM=y
295# CONFIG_PM_LEGACY is not set
296# CONFIG_PM_DEBUG is not set
297# CONFIG_PM_SYSFS_DEPRECATED is not set
298
299#
281# Networking 300# Networking
282# 301#
283CONFIG_NET=y 302CONFIG_NET=y
@@ -292,7 +311,9 @@ CONFIG_UNIX=y
292CONFIG_XFRM=y 311CONFIG_XFRM=y
293CONFIG_XFRM_USER=m 312CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set 313# CONFIG_XFRM_SUB_POLICY is not set
314CONFIG_XFRM_MIGRATE=y
295CONFIG_NET_KEY=y 315CONFIG_NET_KEY=y
316CONFIG_NET_KEY_MIGRATE=y
296CONFIG_INET=y 317CONFIG_INET=y
297# CONFIG_IP_MULTICAST is not set 318# CONFIG_IP_MULTICAST is not set
298# CONFIG_IP_ADVANCED_ROUTER is not set 319# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -318,6 +339,7 @@ CONFIG_INET_TCP_DIAG=y
318# CONFIG_TCP_CONG_ADVANCED is not set 339# CONFIG_TCP_CONG_ADVANCED is not set
319CONFIG_TCP_CONG_CUBIC=y 340CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic" 341CONFIG_DEFAULT_TCP_CONG="cubic"
342CONFIG_TCP_MD5SIG=y
321# CONFIG_IPV6 is not set 343# CONFIG_IPV6 is not set
322# CONFIG_INET6_XFRM_TUNNEL is not set 344# CONFIG_INET6_XFRM_TUNNEL is not set
323# CONFIG_INET6_TUNNEL is not set 345# CONFIG_INET6_TUNNEL is not set
@@ -374,6 +396,7 @@ CONFIG_NETWORK_SECMARK=y
374CONFIG_STANDALONE=y 396CONFIG_STANDALONE=y
375CONFIG_PREVENT_FIRMWARE_BUILD=y 397CONFIG_PREVENT_FIRMWARE_BUILD=y
376# CONFIG_DEBUG_DRIVER is not set 398# CONFIG_DEBUG_DRIVER is not set
399# CONFIG_DEBUG_DEVRES is not set
377# CONFIG_SYS_HYPERVISOR is not set 400# CONFIG_SYS_HYPERVISOR is not set
378 401
379# 402#
@@ -413,6 +436,12 @@ CONFIG_BLK_DEV_INITRD=y
413# CONFIG_ATA_OVER_ETH is not set 436# CONFIG_ATA_OVER_ETH is not set
414 437
415# 438#
439# Misc devices
440#
441CONFIG_SGI_IOC4=m
442# CONFIG_TIFM_CORE is not set
443
444#
416# ATA/ATAPI/MFM/RLL support 445# ATA/ATAPI/MFM/RLL support
417# 446#
418CONFIG_IDE=y 447CONFIG_IDE=y
@@ -455,6 +484,7 @@ CONFIG_BLK_DEV_CMD64X=y
455# CONFIG_BLK_DEV_JMICRON is not set 484# CONFIG_BLK_DEV_JMICRON is not set
456# CONFIG_BLK_DEV_SC1200 is not set 485# CONFIG_BLK_DEV_SC1200 is not set
457# CONFIG_BLK_DEV_PIIX is not set 486# CONFIG_BLK_DEV_PIIX is not set
487CONFIG_BLK_DEV_IT8213=m
458# CONFIG_BLK_DEV_IT821X is not set 488# CONFIG_BLK_DEV_IT821X is not set
459# CONFIG_BLK_DEV_NS87415 is not set 489# CONFIG_BLK_DEV_NS87415 is not set
460# CONFIG_BLK_DEV_PDC202XX_OLD is not set 490# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -464,6 +494,7 @@ CONFIG_BLK_DEV_CMD64X=y
464# CONFIG_BLK_DEV_SLC90E66 is not set 494# CONFIG_BLK_DEV_SLC90E66 is not set
465# CONFIG_BLK_DEV_TRM290 is not set 495# CONFIG_BLK_DEV_TRM290 is not set
466# CONFIG_BLK_DEV_VIA82CXXX is not set 496# CONFIG_BLK_DEV_VIA82CXXX is not set
497CONFIG_BLK_DEV_TC86C001=m
467# CONFIG_BLK_DEV_IDE_SWARM is not set 498# CONFIG_BLK_DEV_IDE_SWARM is not set
468# CONFIG_IDE_ARM is not set 499# CONFIG_IDE_ARM is not set
469CONFIG_BLK_DEV_IDEDMA=y 500CONFIG_BLK_DEV_IDEDMA=y
@@ -563,9 +594,11 @@ CONFIG_NET_SB1250_MAC=y
563# Ethernet (10000 Mbit) 594# Ethernet (10000 Mbit)
564# 595#
565# CONFIG_CHELSIO_T1 is not set 596# CONFIG_CHELSIO_T1 is not set
597CONFIG_CHELSIO_T3=m
566# CONFIG_IXGB is not set 598# CONFIG_IXGB is not set
567# CONFIG_S2IO is not set 599# CONFIG_S2IO is not set
568# CONFIG_MYRI10GE is not set 600# CONFIG_MYRI10GE is not set
601CONFIG_NETXEN_NIC=m
569 602
570# 603#
571# Token Ring devices 604# Token Ring devices
@@ -627,6 +660,7 @@ CONFIG_SERIAL_NONSTANDARD=y
627# CONFIG_DIGIEPCA is not set 660# CONFIG_DIGIEPCA is not set
628# CONFIG_MOXA_INTELLIO is not set 661# CONFIG_MOXA_INTELLIO is not set
629# CONFIG_MOXA_SMARTIO is not set 662# CONFIG_MOXA_SMARTIO is not set
663CONFIG_MOXA_SMARTIO_NEW=m
630# CONFIG_ISI is not set 664# CONFIG_ISI is not set
631# CONFIG_SYNCLINKMP is not set 665# CONFIG_SYNCLINKMP is not set
632# CONFIG_SYNCLINK_GT is not set 666# CONFIG_SYNCLINK_GT is not set
@@ -667,10 +701,6 @@ CONFIG_GEN_RTC=y
667# CONFIG_DTLK is not set 701# CONFIG_DTLK is not set
668# CONFIG_R3964 is not set 702# CONFIG_R3964 is not set
669# CONFIG_APPLICOM is not set 703# CONFIG_APPLICOM is not set
670
671#
672# Ftape, the floppy tape device driver
673#
674# CONFIG_DRM is not set 704# CONFIG_DRM is not set
675# CONFIG_RAW_DRIVER is not set 705# CONFIG_RAW_DRIVER is not set
676 706
@@ -678,7 +708,6 @@ CONFIG_GEN_RTC=y
678# TPM devices 708# TPM devices
679# 709#
680# CONFIG_TCG_TPM is not set 710# CONFIG_TCG_TPM is not set
681# CONFIG_TELCLOCK is not set
682 711
683# 712#
684# I2C support 713# I2C support
@@ -707,6 +736,7 @@ CONFIG_I2C_CHARDEV=y
707# CONFIG_I2C_NFORCE2 is not set 736# CONFIG_I2C_NFORCE2 is not set
708# CONFIG_I2C_OCORES is not set 737# CONFIG_I2C_OCORES is not set
709# CONFIG_I2C_PARPORT_LIGHT is not set 738# CONFIG_I2C_PARPORT_LIGHT is not set
739# CONFIG_I2C_PASEMI is not set
710# CONFIG_I2C_PROSAVAGE is not set 740# CONFIG_I2C_PROSAVAGE is not set
711# CONFIG_I2C_SAVAGE4 is not set 741# CONFIG_I2C_SAVAGE4 is not set
712CONFIG_I2C_SIBYTE=y 742CONFIG_I2C_SIBYTE=y
@@ -743,6 +773,7 @@ CONFIG_I2C_DEBUG_CHIP=y
743# 773#
744# Dallas's 1-wire bus 774# Dallas's 1-wire bus
745# 775#
776# CONFIG_W1 is not set
746 777
747# 778#
748# Hardware Monitoring support 779# Hardware Monitoring support
@@ -751,11 +782,6 @@ CONFIG_I2C_DEBUG_CHIP=y
751# CONFIG_HWMON_VID is not set 782# CONFIG_HWMON_VID is not set
752 783
753# 784#
754# Misc devices
755#
756# CONFIG_TIFM_CORE is not set
757
758#
759# Multimedia devices 785# Multimedia devices
760# 786#
761# CONFIG_VIDEO_DEV is not set 787# CONFIG_VIDEO_DEV is not set
@@ -840,6 +866,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
840# 866#
841 867
842# 868#
869# Auxiliary Display support
870#
871
872#
873# Virtualization
874#
875
876#
843# File systems 877# File systems
844# 878#
845CONFIG_EXT2_FS=y 879CONFIG_EXT2_FS=y
@@ -848,6 +882,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y
848CONFIG_EXT2_FS_SECURITY=y 882CONFIG_EXT2_FS_SECURITY=y
849# CONFIG_EXT2_FS_XIP is not set 883# CONFIG_EXT2_FS_XIP is not set
850# CONFIG_EXT3_FS is not set 884# CONFIG_EXT3_FS is not set
885# CONFIG_EXT4DEV_FS is not set
851CONFIG_FS_MBCACHE=y 886CONFIG_FS_MBCACHE=y
852# CONFIG_REISERFS_FS is not set 887# CONFIG_REISERFS_FS is not set
853# CONFIG_JFS_FS is not set 888# CONFIG_JFS_FS is not set
@@ -889,7 +924,7 @@ CONFIG_TMPFS=y
889# CONFIG_TMPFS_POSIX_ACL is not set 924# CONFIG_TMPFS_POSIX_ACL is not set
890# CONFIG_HUGETLB_PAGE is not set 925# CONFIG_HUGETLB_PAGE is not set
891CONFIG_RAMFS=y 926CONFIG_RAMFS=y
892# CONFIG_CONFIGFS_FS is not set 927CONFIG_CONFIGFS_FS=m
893 928
894# 929#
895# Miscellaneous filesystems 930# Miscellaneous filesystems
@@ -946,6 +981,10 @@ CONFIG_MSDOS_PARTITION=y
946# 981#
947# Distributed Lock Manager 982# Distributed Lock Manager
948# 983#
984CONFIG_DLM=m
985CONFIG_DLM_TCP=y
986# CONFIG_DLM_SCTP is not set
987# CONFIG_DLM_DEBUG is not set
949 988
950# 989#
951# Profiling support 990# Profiling support
@@ -960,23 +999,25 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
960CONFIG_ENABLE_MUST_CHECK=y 999CONFIG_ENABLE_MUST_CHECK=y
961CONFIG_MAGIC_SYSRQ=y 1000CONFIG_MAGIC_SYSRQ=y
962# CONFIG_UNUSED_SYMBOLS is not set 1001# CONFIG_UNUSED_SYMBOLS is not set
1002# CONFIG_DEBUG_FS is not set
1003# CONFIG_HEADERS_CHECK is not set
963CONFIG_DEBUG_KERNEL=y 1004CONFIG_DEBUG_KERNEL=y
1005# CONFIG_DEBUG_SHIRQ is not set
964CONFIG_LOG_BUF_SHIFT=16 1006CONFIG_LOG_BUF_SHIFT=16
965CONFIG_DETECT_SOFTLOCKUP=y 1007CONFIG_DETECT_SOFTLOCKUP=y
966# CONFIG_SCHEDSTATS is not set 1008# CONFIG_SCHEDSTATS is not set
1009# CONFIG_TIMER_STATS is not set
967# CONFIG_DEBUG_SLAB is not set 1010# CONFIG_DEBUG_SLAB is not set
968# CONFIG_DEBUG_RT_MUTEXES is not set 1011# CONFIG_DEBUG_RT_MUTEXES is not set
969# CONFIG_RT_MUTEX_TESTER is not set 1012# CONFIG_RT_MUTEX_TESTER is not set
970# CONFIG_DEBUG_SPINLOCK is not set 1013# CONFIG_DEBUG_SPINLOCK is not set
971CONFIG_DEBUG_MUTEXES=y 1014CONFIG_DEBUG_MUTEXES=y
972# CONFIG_DEBUG_RWSEMS is not set
973# CONFIG_DEBUG_LOCK_ALLOC is not set 1015# CONFIG_DEBUG_LOCK_ALLOC is not set
974# CONFIG_PROVE_LOCKING is not set 1016# CONFIG_PROVE_LOCKING is not set
975# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1017# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
976# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1018# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
977# CONFIG_DEBUG_KOBJECT is not set 1019# CONFIG_DEBUG_KOBJECT is not set
978# CONFIG_DEBUG_INFO is not set 1020# CONFIG_DEBUG_INFO is not set
979# CONFIG_DEBUG_FS is not set
980# CONFIG_DEBUG_VM is not set 1021# CONFIG_DEBUG_VM is not set
981# CONFIG_DEBUG_LIST is not set 1022# CONFIG_DEBUG_LIST is not set
982CONFIG_FORCED_INLINING=y 1023CONFIG_FORCED_INLINING=y
@@ -1002,8 +1043,9 @@ CONFIG_CRYPTO=y
1002CONFIG_CRYPTO_ALGAPI=y 1043CONFIG_CRYPTO_ALGAPI=y
1003CONFIG_CRYPTO_BLKCIPHER=m 1044CONFIG_CRYPTO_BLKCIPHER=m
1004CONFIG_CRYPTO_HASH=y 1045CONFIG_CRYPTO_HASH=y
1005CONFIG_CRYPTO_MANAGER=m 1046CONFIG_CRYPTO_MANAGER=y
1006CONFIG_CRYPTO_HMAC=y 1047CONFIG_CRYPTO_HMAC=y
1048CONFIG_CRYPTO_XCBC=m
1007CONFIG_CRYPTO_NULL=y 1049CONFIG_CRYPTO_NULL=y
1008CONFIG_CRYPTO_MD4=y 1050CONFIG_CRYPTO_MD4=y
1009CONFIG_CRYPTO_MD5=y 1051CONFIG_CRYPTO_MD5=y
@@ -1012,9 +1054,13 @@ CONFIG_CRYPTO_SHA256=y
1012CONFIG_CRYPTO_SHA512=y 1054CONFIG_CRYPTO_SHA512=y
1013CONFIG_CRYPTO_WP512=m 1055CONFIG_CRYPTO_WP512=m
1014CONFIG_CRYPTO_TGR192=m 1056CONFIG_CRYPTO_TGR192=m
1057CONFIG_CRYPTO_GF128MUL=m
1015CONFIG_CRYPTO_ECB=m 1058CONFIG_CRYPTO_ECB=m
1016CONFIG_CRYPTO_CBC=m 1059CONFIG_CRYPTO_CBC=m
1060CONFIG_CRYPTO_PCBC=m
1061CONFIG_CRYPTO_LRW=m
1017CONFIG_CRYPTO_DES=y 1062CONFIG_CRYPTO_DES=y
1063CONFIG_CRYPTO_FCRYPT=m
1018CONFIG_CRYPTO_BLOWFISH=y 1064CONFIG_CRYPTO_BLOWFISH=y
1019CONFIG_CRYPTO_TWOFISH=y 1065CONFIG_CRYPTO_TWOFISH=y
1020CONFIG_CRYPTO_TWOFISH_COMMON=y 1066CONFIG_CRYPTO_TWOFISH_COMMON=y
@@ -1029,6 +1075,7 @@ CONFIG_CRYPTO_ANUBIS=m
1029CONFIG_CRYPTO_DEFLATE=y 1075CONFIG_CRYPTO_DEFLATE=y
1030CONFIG_CRYPTO_MICHAEL_MIC=y 1076CONFIG_CRYPTO_MICHAEL_MIC=y
1031# CONFIG_CRYPTO_CRC32C is not set 1077# CONFIG_CRYPTO_CRC32C is not set
1078CONFIG_CRYPTO_CAMELLIA=m
1032# CONFIG_CRYPTO_TEST is not set 1079# CONFIG_CRYPTO_TEST is not set
1033 1080
1034# 1081#
@@ -1038,6 +1085,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=y
1038# 1085#
1039# Library routines 1086# Library routines
1040# 1087#
1088CONFIG_BITREVERSE=y
1041# CONFIG_CRC_CCITT is not set 1089# CONFIG_CRC_CCITT is not set
1042# CONFIG_CRC16 is not set 1090# CONFIG_CRC16 is not set
1043CONFIG_CRC32=y 1091CONFIG_CRC32=y
@@ -1045,3 +1093,5 @@ CONFIG_CRC32=y
1045CONFIG_ZLIB_INFLATE=y 1093CONFIG_ZLIB_INFLATE=y
1046CONFIG_ZLIB_DEFLATE=y 1094CONFIG_ZLIB_DEFLATE=y
1047CONFIG_PLIST=y 1095CONFIG_PLIST=y
1096CONFIG_HAS_IOMEM=y
1097CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 49590d443712..b05469e0bcd0 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:24 2006 4# Sun Feb 18 21:27:36 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -70,12 +70,15 @@ CONFIG_MACH_VR41XX=y
70# CONFIG_VICTOR_MPC30X is not set 70# CONFIG_VICTOR_MPC30X is not set
71CONFIG_ZAO_CAPCELLA=y 71CONFIG_ZAO_CAPCELLA=y
72CONFIG_PCI_VR41XX=y 72CONFIG_PCI_VR41XX=y
73# CONFIG_VRC4173 is not set
74CONFIG_RWSEM_GENERIC_SPINLOCK=y 73CONFIG_RWSEM_GENERIC_SPINLOCK=y
74# CONFIG_ARCH_HAS_ILOG2_U32 is not set
75# CONFIG_ARCH_HAS_ILOG2_U64 is not set
75CONFIG_GENERIC_FIND_NEXT_BIT=y 76CONFIG_GENERIC_FIND_NEXT_BIT=y
76CONFIG_GENERIC_HWEIGHT=y 77CONFIG_GENERIC_HWEIGHT=y
77CONFIG_GENERIC_CALIBRATE_DELAY=y 78CONFIG_GENERIC_CALIBRATE_DELAY=y
79CONFIG_GENERIC_TIME=y
78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
81CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
79CONFIG_DMA_NONCOHERENT=y 82CONFIG_DMA_NONCOHERENT=y
80CONFIG_DMA_NEED_PCI_MAP_STATE=y 83CONFIG_DMA_NEED_PCI_MAP_STATE=y
81# CONFIG_CPU_BIG_ENDIAN is not set 84# CONFIG_CPU_BIG_ENDIAN is not set
@@ -108,6 +111,7 @@ CONFIG_CPU_VR41XX=y
108# CONFIG_CPU_SB1 is not set 111# CONFIG_CPU_SB1 is not set
109CONFIG_SYS_HAS_CPU_VR41XX=y 112CONFIG_SYS_HAS_CPU_VR41XX=y
110CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 113CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
114CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 116CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
113 117
@@ -121,8 +125,8 @@ CONFIG_PAGE_SIZE_4KB=y
121# CONFIG_PAGE_SIZE_16KB is not set 125# CONFIG_PAGE_SIZE_16KB is not set
122# CONFIG_PAGE_SIZE_64KB is not set 126# CONFIG_PAGE_SIZE_64KB is not set
123CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
124# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
127CONFIG_CPU_HAS_SYNC=y 131CONFIG_CPU_HAS_SYNC=y
128CONFIG_GENERIC_HARDIRQS=y 132CONFIG_GENERIC_HARDIRQS=y
@@ -137,6 +141,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
139# CONFIG_RESOURCES_64BIT is not set 143# CONFIG_RESOURCES_64BIT is not set
144CONFIG_ZONE_DMA_FLAG=1
140# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -149,6 +154,7 @@ CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -167,15 +173,20 @@ CONFIG_LOCALVERSION=""
167CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 174CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
172CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 185# CONFIG_RELAY is not set
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
181CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -183,12 +194,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 194CONFIG_BUG=y
184CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 197CONFIG_FUTEX=y
188CONFIG_EPOLL=y 198CONFIG_EPOLL=y
189CONFIG_SHMEM=y 199CONFIG_SHMEM=y
190CONFIG_SLAB=y 200CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -206,6 +217,7 @@ CONFIG_KMOD=y
206# 217#
207# Block layer 218# Block layer
208# 219#
220CONFIG_BLOCK=y
209# CONFIG_LBD is not set 221# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -248,6 +260,14 @@ CONFIG_BINFMT_ELF=y
248CONFIG_TRAD_SIGNALS=y 260CONFIG_TRAD_SIGNALS=y
249 261
250# 262#
263# Power management options
264#
265CONFIG_PM=y
266# CONFIG_PM_LEGACY is not set
267# CONFIG_PM_DEBUG is not set
268# CONFIG_PM_SYSFS_DEPRECATED is not set
269
270#
251# Networking 271# Networking
252# 272#
253CONFIG_NET=y 273CONFIG_NET=y
@@ -261,7 +281,10 @@ CONFIG_PACKET_MMAP=y
261CONFIG_UNIX=y 281CONFIG_UNIX=y
262CONFIG_XFRM=y 282CONFIG_XFRM=y
263CONFIG_XFRM_USER=m 283CONFIG_XFRM_USER=m
284# CONFIG_XFRM_SUB_POLICY is not set
285CONFIG_XFRM_MIGRATE=y
264CONFIG_NET_KEY=y 286CONFIG_NET_KEY=y
287CONFIG_NET_KEY_MIGRATE=y
265CONFIG_INET=y 288CONFIG_INET=y
266CONFIG_IP_MULTICAST=y 289CONFIG_IP_MULTICAST=y
267# CONFIG_IP_ADVANCED_ROUTER is not set 290# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -282,10 +305,13 @@ CONFIG_IP_PNP_BOOTP=y
282# CONFIG_INET_TUNNEL is not set 305# CONFIG_INET_TUNNEL is not set
283CONFIG_INET_XFRM_MODE_TRANSPORT=m 306CONFIG_INET_XFRM_MODE_TRANSPORT=m
284CONFIG_INET_XFRM_MODE_TUNNEL=m 307CONFIG_INET_XFRM_MODE_TUNNEL=m
308CONFIG_INET_XFRM_MODE_BEET=m
285CONFIG_INET_DIAG=y 309CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 310CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 311# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_BIC=y 312CONFIG_TCP_CONG_CUBIC=y
313CONFIG_DEFAULT_TCP_CONG="cubic"
314CONFIG_TCP_MD5SIG=y
289# CONFIG_IPV6 is not set 315# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 316# CONFIG_INET6_XFRM_TUNNEL is not set
291# CONFIG_INET6_TUNNEL is not set 317# CONFIG_INET6_TUNNEL is not set
@@ -315,7 +341,6 @@ CONFIG_NETWORK_SECMARK=y
315# CONFIG_ATALK is not set 341# CONFIG_ATALK is not set
316# CONFIG_X25 is not set 342# CONFIG_X25 is not set
317# CONFIG_LAPB is not set 343# CONFIG_LAPB is not set
318# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 344# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 345# CONFIG_WAN_ROUTER is not set
321 346
@@ -378,14 +403,22 @@ CONFIG_CONNECTOR=m
378CONFIG_BLK_DEV_RAM=y 403CONFIG_BLK_DEV_RAM=y
379CONFIG_BLK_DEV_RAM_COUNT=16 404CONFIG_BLK_DEV_RAM_COUNT=16
380CONFIG_BLK_DEV_RAM_SIZE=4096 405CONFIG_BLK_DEV_RAM_SIZE=4096
406CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
381# CONFIG_BLK_DEV_INITRD is not set 407# CONFIG_BLK_DEV_INITRD is not set
382# CONFIG_CDROM_PKTCDVD is not set 408# CONFIG_CDROM_PKTCDVD is not set
383# CONFIG_ATA_OVER_ETH is not set 409# CONFIG_ATA_OVER_ETH is not set
384 410
385# 411#
412# Misc devices
413#
414CONFIG_SGI_IOC4=m
415# CONFIG_TIFM_CORE is not set
416
417#
386# ATA/ATAPI/MFM/RLL support 418# ATA/ATAPI/MFM/RLL support
387# 419#
388CONFIG_IDE=y 420CONFIG_IDE=y
421CONFIG_IDE_MAX_HWIFS=4
389CONFIG_BLK_DEV_IDE=y 422CONFIG_BLK_DEV_IDE=y
390 423
391# 424#
@@ -414,6 +447,12 @@ CONFIG_IDE_GENERIC=y
414# 447#
415# CONFIG_RAID_ATTRS is not set 448# CONFIG_RAID_ATTRS is not set
416# CONFIG_SCSI is not set 449# CONFIG_SCSI is not set
450# CONFIG_SCSI_NETLINK is not set
451
452#
453# Serial ATA (prod) and Parallel ATA (experimental) drivers
454#
455# CONFIG_ATA is not set
417 456
418# 457#
419# Multi-device support (RAID and LVM) 458# Multi-device support (RAID and LVM)
@@ -464,6 +503,8 @@ CONFIG_LXT_PHY=m
464CONFIG_CICADA_PHY=m 503CONFIG_CICADA_PHY=m
465CONFIG_VITESSE_PHY=m 504CONFIG_VITESSE_PHY=m
466CONFIG_SMSC_PHY=m 505CONFIG_SMSC_PHY=m
506# CONFIG_BROADCOM_PHY is not set
507# CONFIG_FIXED_PHY is not set
467 508
468# 509#
469# Ethernet (10 or 100Mbit) 510# Ethernet (10 or 100Mbit)
@@ -504,7 +545,7 @@ CONFIG_8139TOO_PIO=y
504# CONFIG_SUNDANCE is not set 545# CONFIG_SUNDANCE is not set
505# CONFIG_TLAN is not set 546# CONFIG_TLAN is not set
506# CONFIG_VIA_RHINE is not set 547# CONFIG_VIA_RHINE is not set
507# CONFIG_LAN_SAA9730 is not set 548# CONFIG_SC92031 is not set
508 549
509# 550#
510# Ethernet (1000 Mbit) 551# Ethernet (1000 Mbit)
@@ -523,14 +564,18 @@ CONFIG_8139TOO_PIO=y
523# CONFIG_VIA_VELOCITY is not set 564# CONFIG_VIA_VELOCITY is not set
524# CONFIG_TIGON3 is not set 565# CONFIG_TIGON3 is not set
525# CONFIG_BNX2 is not set 566# CONFIG_BNX2 is not set
567CONFIG_QLA3XXX=m
568# CONFIG_ATL1 is not set
526 569
527# 570#
528# Ethernet (10000 Mbit) 571# Ethernet (10000 Mbit)
529# 572#
530# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574CONFIG_CHELSIO_T3=m
531# CONFIG_IXGB is not set 575# CONFIG_IXGB is not set
532# CONFIG_S2IO is not set 576# CONFIG_S2IO is not set
533# CONFIG_MYRI10GE is not set 577# CONFIG_MYRI10GE is not set
578CONFIG_NETXEN_NIC=m
534 579
535# 580#
536# Token Ring devices 581# Token Ring devices
@@ -569,6 +614,7 @@ CONFIG_8139TOO_PIO=y
569# Input device support 614# Input device support
570# 615#
571CONFIG_INPUT=y 616CONFIG_INPUT=y
617# CONFIG_INPUT_FF_MEMLESS is not set
572 618
573# 619#
574# Userland interfaces 620# Userland interfaces
@@ -635,10 +681,6 @@ CONFIG_LEGACY_PTY_COUNT=256
635# CONFIG_DTLK is not set 681# CONFIG_DTLK is not set
636# CONFIG_R3964 is not set 682# CONFIG_R3964 is not set
637# CONFIG_APPLICOM is not set 683# CONFIG_APPLICOM is not set
638
639#
640# Ftape, the floppy tape device driver
641#
642# CONFIG_DRM is not set 684# CONFIG_DRM is not set
643CONFIG_GPIO_VR41XX=y 685CONFIG_GPIO_VR41XX=y
644# CONFIG_RAW_DRIVER is not set 686# CONFIG_RAW_DRIVER is not set
@@ -647,7 +689,6 @@ CONFIG_GPIO_VR41XX=y
647# TPM devices 689# TPM devices
648# 690#
649# CONFIG_TCG_TPM is not set 691# CONFIG_TCG_TPM is not set
650# CONFIG_TELCLOCK is not set
651 692
652# 693#
653# I2C support 694# I2C support
@@ -672,14 +713,9 @@ CONFIG_GPIO_VR41XX=y
672# CONFIG_HWMON_VID is not set 713# CONFIG_HWMON_VID is not set
673 714
674# 715#
675# Misc devices
676#
677
678#
679# Multimedia devices 716# Multimedia devices
680# 717#
681# CONFIG_VIDEO_DEV is not set 718# CONFIG_VIDEO_DEV is not set
682CONFIG_VIDEO_V4L2=y
683 719
684# 720#
685# Digital Video Broadcasting Devices 721# Digital Video Broadcasting Devices
@@ -697,6 +733,7 @@ CONFIG_VIDEO_V4L2=y
697# 733#
698# CONFIG_VGA_CONSOLE is not set 734# CONFIG_VGA_CONSOLE is not set
699CONFIG_DUMMY_CONSOLE=y 735CONFIG_DUMMY_CONSOLE=y
736# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
700 737
701# 738#
702# Sound 739# Sound
@@ -704,6 +741,11 @@ CONFIG_DUMMY_CONSOLE=y
704# CONFIG_SOUND is not set 741# CONFIG_SOUND is not set
705 742
706# 743#
744# HID Devices
745#
746# CONFIG_HID is not set
747
748#
707# USB support 749# USB support
708# 750#
709CONFIG_USB_ARCH_HAS_HCD=y 751CONFIG_USB_ARCH_HAS_HCD=y
@@ -754,6 +796,7 @@ CONFIG_RTC_LIB=y
754CONFIG_RTC_CLASS=y 796CONFIG_RTC_CLASS=y
755CONFIG_RTC_HCTOSYS=y 797CONFIG_RTC_HCTOSYS=y
756CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 798CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
799# CONFIG_RTC_DEBUG is not set
757 800
758# 801#
759# RTC interfaces 802# RTC interfaces
@@ -787,16 +830,26 @@ CONFIG_RTC_DRV_VR41XX=y
787# 830#
788 831
789# 832#
833# Auxiliary Display support
834#
835
836#
837# Virtualization
838#
839
840#
790# File systems 841# File systems
791# 842#
792CONFIG_EXT2_FS=y 843CONFIG_EXT2_FS=y
793# CONFIG_EXT2_FS_XATTR is not set 844# CONFIG_EXT2_FS_XATTR is not set
794# CONFIG_EXT2_FS_XIP is not set 845# CONFIG_EXT2_FS_XIP is not set
795# CONFIG_EXT3_FS is not set 846# CONFIG_EXT3_FS is not set
847# CONFIG_EXT4DEV_FS is not set
796# CONFIG_REISERFS_FS is not set 848# CONFIG_REISERFS_FS is not set
797# CONFIG_JFS_FS is not set 849# CONFIG_JFS_FS is not set
798# CONFIG_FS_POSIX_ACL is not set 850CONFIG_FS_POSIX_ACL=y
799# CONFIG_XFS_FS is not set 851# CONFIG_XFS_FS is not set
852# CONFIG_GFS2_FS is not set
800# CONFIG_OCFS2_FS is not set 853# CONFIG_OCFS2_FS is not set
801# CONFIG_MINIX_FS is not set 854# CONFIG_MINIX_FS is not set
802# CONFIG_ROMFS_FS is not set 855# CONFIG_ROMFS_FS is not set
@@ -807,6 +860,7 @@ CONFIG_DNOTIFY=y
807# CONFIG_AUTOFS_FS is not set 860# CONFIG_AUTOFS_FS is not set
808CONFIG_AUTOFS4_FS=y 861CONFIG_AUTOFS4_FS=y
809CONFIG_FUSE_FS=m 862CONFIG_FUSE_FS=m
863CONFIG_GENERIC_ACL=y
810 864
811# 865#
812# CD-ROM/DVD Filesystems 866# CD-ROM/DVD Filesystems
@@ -826,11 +880,13 @@ CONFIG_FUSE_FS=m
826# 880#
827CONFIG_PROC_FS=y 881CONFIG_PROC_FS=y
828CONFIG_PROC_KCORE=y 882CONFIG_PROC_KCORE=y
883CONFIG_PROC_SYSCTL=y
829CONFIG_SYSFS=y 884CONFIG_SYSFS=y
830CONFIG_TMPFS=y 885CONFIG_TMPFS=y
886CONFIG_TMPFS_POSIX_ACL=y
831# CONFIG_HUGETLB_PAGE is not set 887# CONFIG_HUGETLB_PAGE is not set
832CONFIG_RAMFS=y 888CONFIG_RAMFS=y
833# CONFIG_CONFIGFS_FS is not set 889CONFIG_CONFIGFS_FS=m
834 890
835# 891#
836# Miscellaneous filesystems 892# Miscellaneous filesystems
@@ -868,7 +924,6 @@ CONFIG_SUNRPC=y
868# CONFIG_RPCSEC_GSS_SPKM3 is not set 924# CONFIG_RPCSEC_GSS_SPKM3 is not set
869# CONFIG_SMB_FS is not set 925# CONFIG_SMB_FS is not set
870# CONFIG_CIFS is not set 926# CONFIG_CIFS is not set
871# CONFIG_CIFS_DEBUG2 is not set
872# CONFIG_NCP_FS is not set 927# CONFIG_NCP_FS is not set
873# CONFIG_CODA_FS is not set 928# CONFIG_CODA_FS is not set
874# CONFIG_AFS_FS is not set 929# CONFIG_AFS_FS is not set
@@ -886,6 +941,14 @@ CONFIG_MSDOS_PARTITION=y
886# CONFIG_NLS is not set 941# CONFIG_NLS is not set
887 942
888# 943#
944# Distributed Lock Manager
945#
946CONFIG_DLM=m
947CONFIG_DLM_TCP=y
948# CONFIG_DLM_SCTP is not set
949# CONFIG_DLM_DEBUG is not set
950
951#
889# Profiling support 952# Profiling support
890# 953#
891# CONFIG_PROFILING is not set 954# CONFIG_PROFILING is not set
@@ -895,11 +958,13 @@ CONFIG_MSDOS_PARTITION=y
895# 958#
896CONFIG_TRACE_IRQFLAGS_SUPPORT=y 959CONFIG_TRACE_IRQFLAGS_SUPPORT=y
897# CONFIG_PRINTK_TIME is not set 960# CONFIG_PRINTK_TIME is not set
961CONFIG_ENABLE_MUST_CHECK=y
898# CONFIG_MAGIC_SYSRQ is not set 962# CONFIG_MAGIC_SYSRQ is not set
899# CONFIG_UNUSED_SYMBOLS is not set 963# CONFIG_UNUSED_SYMBOLS is not set
964# CONFIG_DEBUG_FS is not set
965# CONFIG_HEADERS_CHECK is not set
900# CONFIG_DEBUG_KERNEL is not set 966# CONFIG_DEBUG_KERNEL is not set
901CONFIG_LOG_BUF_SHIFT=14 967CONFIG_LOG_BUF_SHIFT=14
902# CONFIG_DEBUG_FS is not set
903CONFIG_CROSSCOMPILE=y 968CONFIG_CROSSCOMPILE=y
904CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" 969CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
905 970
@@ -912,7 +977,44 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
912# 977#
913# Cryptographic options 978# Cryptographic options
914# 979#
915# CONFIG_CRYPTO is not set 980CONFIG_CRYPTO=y
981CONFIG_CRYPTO_ALGAPI=y
982CONFIG_CRYPTO_BLKCIPHER=m
983CONFIG_CRYPTO_HASH=m
984CONFIG_CRYPTO_MANAGER=m
985CONFIG_CRYPTO_HMAC=m
986CONFIG_CRYPTO_XCBC=m
987CONFIG_CRYPTO_NULL=m
988CONFIG_CRYPTO_MD4=m
989CONFIG_CRYPTO_MD5=y
990CONFIG_CRYPTO_SHA1=m
991CONFIG_CRYPTO_SHA256=m
992CONFIG_CRYPTO_SHA512=m
993CONFIG_CRYPTO_WP512=m
994CONFIG_CRYPTO_TGR192=m
995CONFIG_CRYPTO_GF128MUL=m
996CONFIG_CRYPTO_ECB=m
997CONFIG_CRYPTO_CBC=m
998CONFIG_CRYPTO_PCBC=m
999CONFIG_CRYPTO_LRW=m
1000CONFIG_CRYPTO_DES=m
1001CONFIG_CRYPTO_FCRYPT=m
1002CONFIG_CRYPTO_BLOWFISH=m
1003CONFIG_CRYPTO_TWOFISH=m
1004CONFIG_CRYPTO_TWOFISH_COMMON=m
1005CONFIG_CRYPTO_SERPENT=m
1006CONFIG_CRYPTO_AES=m
1007CONFIG_CRYPTO_CAST5=m
1008CONFIG_CRYPTO_CAST6=m
1009CONFIG_CRYPTO_TEA=m
1010CONFIG_CRYPTO_ARC4=m
1011CONFIG_CRYPTO_KHAZAD=m
1012CONFIG_CRYPTO_ANUBIS=m
1013CONFIG_CRYPTO_DEFLATE=m
1014CONFIG_CRYPTO_MICHAEL_MIC=m
1015# CONFIG_CRYPTO_CRC32C is not set
1016CONFIG_CRYPTO_CAMELLIA=m
1017# CONFIG_CRYPTO_TEST is not set
916 1018
917# 1019#
918# Hardware crypto devices 1020# Hardware crypto devices
@@ -921,8 +1023,13 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
921# 1023#
922# Library routines 1024# Library routines
923# 1025#
1026CONFIG_BITREVERSE=y
924# CONFIG_CRC_CCITT is not set 1027# CONFIG_CRC_CCITT is not set
925# CONFIG_CRC16 is not set 1028# CONFIG_CRC16 is not set
926CONFIG_CRC32=y 1029CONFIG_CRC32=y
927# CONFIG_LIBCRC32C is not set 1030# CONFIG_LIBCRC32C is not set
1031CONFIG_ZLIB_INFLATE=m
1032CONFIG_ZLIB_DEFLATE=m
928CONFIG_PLIST=y 1033CONFIG_PLIST=y
1034CONFIG_HAS_IOMEM=y
1035CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 0607fc239087..1a3d776ad1e4 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:25 2006 4# Sun Feb 18 21:27:37 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25CONFIG_MIPS_COBALT=y 26CONFIG_MIPS_COBALT=y
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_COBALT=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +65,14 @@ CONFIG_MIPS_COBALT=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_EARLY_PRINTK=y 66CONFIG_EARLY_PRINTK=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_I8259=y 78CONFIG_I8259=y
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_16KB is not set 121# CONFIG_PAGE_SIZE_16KB is not set
118# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 128CONFIG_CPU_HAS_SYNC=y
@@ -134,6 +138,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 139CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 140# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 142# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 143# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 144# CONFIG_HZ_128 is not set
@@ -146,6 +151,7 @@ CONFIG_HZ=1000
146CONFIG_PREEMPT_NONE=y 151CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 152# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 153# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -164,15 +170,20 @@ CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y 170CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 171CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 172CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y
167# CONFIG_POSIX_MQUEUE is not set 175# CONFIG_POSIX_MQUEUE is not set
168# CONFIG_BSD_PROCESS_ACCT is not set 176# CONFIG_BSD_PROCESS_ACCT is not set
169CONFIG_SYSCTL=y 177# CONFIG_TASKSTATS is not set
178# CONFIG_UTS_NS is not set
170# CONFIG_AUDIT is not set 179# CONFIG_AUDIT is not set
171# CONFIG_IKCONFIG is not set 180# CONFIG_IKCONFIG is not set
181CONFIG_SYSFS_DEPRECATED=y
172CONFIG_RELAY=y 182CONFIG_RELAY=y
173CONFIG_INITRAMFS_SOURCE=""
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 183# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
184CONFIG_SYSCTL=y
175CONFIG_EMBEDDED=y 185CONFIG_EMBEDDED=y
186CONFIG_SYSCTL_SYSCALL=y
176CONFIG_KALLSYMS=y 187CONFIG_KALLSYMS=y
177# CONFIG_KALLSYMS_EXTRA_PASS is not set 188# CONFIG_KALLSYMS_EXTRA_PASS is not set
178CONFIG_HOTPLUG=y 189CONFIG_HOTPLUG=y
@@ -180,12 +191,12 @@ CONFIG_PRINTK=y
180CONFIG_BUG=y 191CONFIG_BUG=y
181CONFIG_ELF_CORE=y 192CONFIG_ELF_CORE=y
182CONFIG_BASE_FULL=y 193CONFIG_BASE_FULL=y
183CONFIG_RT_MUTEXES=y
184CONFIG_FUTEX=y 194CONFIG_FUTEX=y
185CONFIG_EPOLL=y 195CONFIG_EPOLL=y
186CONFIG_SHMEM=y 196CONFIG_SHMEM=y
187CONFIG_SLAB=y 197CONFIG_SLAB=y
188CONFIG_VM_EVENT_COUNTERS=y 198CONFIG_VM_EVENT_COUNTERS=y
199CONFIG_RT_MUTEXES=y
189# CONFIG_TINY_SHMEM is not set 200# CONFIG_TINY_SHMEM is not set
190CONFIG_BASE_SMALL=0 201CONFIG_BASE_SMALL=0
191# CONFIG_SLOB is not set 202# CONFIG_SLOB is not set
@@ -198,6 +209,7 @@ CONFIG_BASE_SMALL=0
198# 209#
199# Block layer 210# Block layer
200# 211#
212CONFIG_BLOCK=y
201# CONFIG_LBD is not set 213# CONFIG_LBD is not set
202# CONFIG_BLK_DEV_IO_TRACE is not set 214# CONFIG_BLK_DEV_IO_TRACE is not set
203# CONFIG_LSF is not set 215# CONFIG_LSF is not set
@@ -240,6 +252,14 @@ CONFIG_BINFMT_ELF=y
240CONFIG_TRAD_SIGNALS=y 252CONFIG_TRAD_SIGNALS=y
241 253
242# 254#
255# Power management options
256#
257CONFIG_PM=y
258# CONFIG_PM_LEGACY is not set
259# CONFIG_PM_DEBUG is not set
260# CONFIG_PM_SYSFS_DEPRECATED is not set
261
262#
243# Networking 263# Networking
244# 264#
245CONFIG_NET=y 265CONFIG_NET=y
@@ -253,7 +273,10 @@ CONFIG_PACKET=y
253CONFIG_UNIX=y 273CONFIG_UNIX=y
254CONFIG_XFRM=y 274CONFIG_XFRM=y
255CONFIG_XFRM_USER=y 275CONFIG_XFRM_USER=y
276# CONFIG_XFRM_SUB_POLICY is not set
277CONFIG_XFRM_MIGRATE=y
256CONFIG_NET_KEY=y 278CONFIG_NET_KEY=y
279CONFIG_NET_KEY_MIGRATE=y
257CONFIG_INET=y 280CONFIG_INET=y
258# CONFIG_IP_MULTICAST is not set 281# CONFIG_IP_MULTICAST is not set
259# CONFIG_IP_ADVANCED_ROUTER is not set 282# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -270,10 +293,13 @@ CONFIG_IP_FIB_HASH=y
270# CONFIG_INET_TUNNEL is not set 293# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_XFRM_MODE_TRANSPORT=y 294CONFIG_INET_XFRM_MODE_TRANSPORT=y
272CONFIG_INET_XFRM_MODE_TUNNEL=y 295CONFIG_INET_XFRM_MODE_TUNNEL=y
296CONFIG_INET_XFRM_MODE_BEET=y
273CONFIG_INET_DIAG=y 297CONFIG_INET_DIAG=y
274CONFIG_INET_TCP_DIAG=y 298CONFIG_INET_TCP_DIAG=y
275# CONFIG_TCP_CONG_ADVANCED is not set 299# CONFIG_TCP_CONG_ADVANCED is not set
276CONFIG_TCP_CONG_BIC=y 300CONFIG_TCP_CONG_CUBIC=y
301CONFIG_DEFAULT_TCP_CONG="cubic"
302CONFIG_TCP_MD5SIG=y
277# CONFIG_IPV6 is not set 303# CONFIG_IPV6 is not set
278# CONFIG_INET6_XFRM_TUNNEL is not set 304# CONFIG_INET6_XFRM_TUNNEL is not set
279# CONFIG_INET6_TUNNEL is not set 305# CONFIG_INET6_TUNNEL is not set
@@ -303,7 +329,6 @@ CONFIG_NETWORK_SECMARK=y
303# CONFIG_ATALK is not set 329# CONFIG_ATALK is not set
304# CONFIG_X25 is not set 330# CONFIG_X25 is not set
305# CONFIG_LAPB is not set 331# CONFIG_LAPB is not set
306# CONFIG_NET_DIVERT is not set
307# CONFIG_ECONET is not set 332# CONFIG_ECONET is not set
308# CONFIG_WAN_ROUTER is not set 333# CONFIG_WAN_ROUTER is not set
309 334
@@ -379,9 +404,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
379CONFIG_ATA_OVER_ETH=y 404CONFIG_ATA_OVER_ETH=y
380 405
381# 406#
407# Misc devices
408#
409CONFIG_SGI_IOC4=y
410# CONFIG_TIFM_CORE is not set
411
412#
382# ATA/ATAPI/MFM/RLL support 413# ATA/ATAPI/MFM/RLL support
383# 414#
384CONFIG_IDE=y 415CONFIG_IDE=y
416CONFIG_IDE_MAX_HWIFS=4
385CONFIG_BLK_DEV_IDE=y 417CONFIG_BLK_DEV_IDE=y
386 418
387# 419#
@@ -417,8 +449,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
417# CONFIG_BLK_DEV_CS5530 is not set 449# CONFIG_BLK_DEV_CS5530 is not set
418# CONFIG_BLK_DEV_HPT34X is not set 450# CONFIG_BLK_DEV_HPT34X is not set
419# CONFIG_BLK_DEV_HPT366 is not set 451# CONFIG_BLK_DEV_HPT366 is not set
452# CONFIG_BLK_DEV_JMICRON is not set
420# CONFIG_BLK_DEV_SC1200 is not set 453# CONFIG_BLK_DEV_SC1200 is not set
421# CONFIG_BLK_DEV_PIIX is not set 454# CONFIG_BLK_DEV_PIIX is not set
455CONFIG_BLK_DEV_IT8213=y
422# CONFIG_BLK_DEV_IT821X is not set 456# CONFIG_BLK_DEV_IT821X is not set
423# CONFIG_BLK_DEV_NS87415 is not set 457# CONFIG_BLK_DEV_NS87415 is not set
424# CONFIG_BLK_DEV_PDC202XX_OLD is not set 458# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -428,6 +462,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
428# CONFIG_BLK_DEV_SLC90E66 is not set 462# CONFIG_BLK_DEV_SLC90E66 is not set
429# CONFIG_BLK_DEV_TRM290 is not set 463# CONFIG_BLK_DEV_TRM290 is not set
430CONFIG_BLK_DEV_VIA82CXXX=y 464CONFIG_BLK_DEV_VIA82CXXX=y
465CONFIG_BLK_DEV_TC86C001=y
431# CONFIG_IDE_ARM is not set 466# CONFIG_IDE_ARM is not set
432CONFIG_BLK_DEV_IDEDMA=y 467CONFIG_BLK_DEV_IDEDMA=y
433# CONFIG_IDEDMA_IVB is not set 468# CONFIG_IDEDMA_IVB is not set
@@ -439,6 +474,12 @@ CONFIG_BLK_DEV_IDEDMA=y
439# 474#
440CONFIG_RAID_ATTRS=y 475CONFIG_RAID_ATTRS=y
441# CONFIG_SCSI is not set 476# CONFIG_SCSI is not set
477# CONFIG_SCSI_NETLINK is not set
478
479#
480# Serial ATA (prod) and Parallel ATA (experimental) drivers
481#
482# CONFIG_ATA is not set
442 483
443# 484#
444# Multi-device support (RAID and LVM) 485# Multi-device support (RAID and LVM)
@@ -489,6 +530,8 @@ CONFIG_LXT_PHY=y
489CONFIG_CICADA_PHY=y 530CONFIG_CICADA_PHY=y
490CONFIG_VITESSE_PHY=y 531CONFIG_VITESSE_PHY=y
491CONFIG_SMSC_PHY=y 532CONFIG_SMSC_PHY=y
533# CONFIG_BROADCOM_PHY is not set
534# CONFIG_FIXED_PHY is not set
492 535
493# 536#
494# Ethernet (10 or 100Mbit) 537# Ethernet (10 or 100Mbit)
@@ -533,14 +576,17 @@ CONFIG_TULIP=y
533# CONFIG_SK98LIN is not set 576# CONFIG_SK98LIN is not set
534# CONFIG_TIGON3 is not set 577# CONFIG_TIGON3 is not set
535# CONFIG_BNX2 is not set 578# CONFIG_BNX2 is not set
579CONFIG_QLA3XXX=y
536 580
537# 581#
538# Ethernet (10000 Mbit) 582# Ethernet (10000 Mbit)
539# 583#
540# CONFIG_CHELSIO_T1 is not set 584# CONFIG_CHELSIO_T1 is not set
585CONFIG_CHELSIO_T3=y
541# CONFIG_IXGB is not set 586# CONFIG_IXGB is not set
542# CONFIG_S2IO is not set 587# CONFIG_S2IO is not set
543# CONFIG_MYRI10GE is not set 588# CONFIG_MYRI10GE is not set
589CONFIG_NETXEN_NIC=y
544 590
545# 591#
546# Token Ring devices 592# Token Ring devices
@@ -579,6 +625,7 @@ CONFIG_TULIP=y
579# Input device support 625# Input device support
580# 626#
581CONFIG_INPUT=y 627CONFIG_INPUT=y
628# CONFIG_INPUT_FF_MEMLESS is not set
582 629
583# 630#
584# Userland interfaces 631# Userland interfaces
@@ -656,10 +703,6 @@ CONFIG_COBALT_LCD=y
656# CONFIG_DTLK is not set 703# CONFIG_DTLK is not set
657# CONFIG_R3964 is not set 704# CONFIG_R3964 is not set
658# CONFIG_APPLICOM is not set 705# CONFIG_APPLICOM is not set
659
660#
661# Ftape, the floppy tape device driver
662#
663# CONFIG_DRM is not set 706# CONFIG_DRM is not set
664# CONFIG_RAW_DRIVER is not set 707# CONFIG_RAW_DRIVER is not set
665 708
@@ -667,7 +710,6 @@ CONFIG_COBALT_LCD=y
667# TPM devices 710# TPM devices
668# 711#
669# CONFIG_TCG_TPM is not set 712# CONFIG_TCG_TPM is not set
670# CONFIG_TELCLOCK is not set
671 713
672# 714#
673# I2C support 715# I2C support
@@ -692,14 +734,9 @@ CONFIG_COBALT_LCD=y
692# CONFIG_HWMON_VID is not set 734# CONFIG_HWMON_VID is not set
693 735
694# 736#
695# Misc devices
696#
697
698#
699# Multimedia devices 737# Multimedia devices
700# 738#
701# CONFIG_VIDEO_DEV is not set 739# CONFIG_VIDEO_DEV is not set
702CONFIG_VIDEO_V4L2=y
703 740
704# 741#
705# Digital Video Broadcasting Devices 742# Digital Video Broadcasting Devices
@@ -717,6 +754,7 @@ CONFIG_VIDEO_V4L2=y
717# 754#
718# CONFIG_VGA_CONSOLE is not set 755# CONFIG_VGA_CONSOLE is not set
719CONFIG_DUMMY_CONSOLE=y 756CONFIG_DUMMY_CONSOLE=y
757# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
720 758
721# 759#
722# Sound 760# Sound
@@ -724,6 +762,11 @@ CONFIG_DUMMY_CONSOLE=y
724# CONFIG_SOUND is not set 762# CONFIG_SOUND is not set
725 763
726# 764#
765# HID Devices
766#
767# CONFIG_HID is not set
768
769#
727# USB support 770# USB support
728# 771#
729CONFIG_USB_ARCH_HAS_HCD=y 772CONFIG_USB_ARCH_HAS_HCD=y
@@ -786,6 +829,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
786# 829#
787 830
788# 831#
832# Auxiliary Display support
833#
834
835#
836# Virtualization
837#
838
839#
789# File systems 840# File systems
790# 841#
791CONFIG_EXT2_FS=y 842CONFIG_EXT2_FS=y
@@ -794,11 +845,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
794CONFIG_EXT2_FS_SECURITY=y 845CONFIG_EXT2_FS_SECURITY=y
795# CONFIG_EXT2_FS_XIP is not set 846# CONFIG_EXT2_FS_XIP is not set
796# CONFIG_EXT3_FS is not set 847# CONFIG_EXT3_FS is not set
848# CONFIG_EXT4DEV_FS is not set
797CONFIG_FS_MBCACHE=y 849CONFIG_FS_MBCACHE=y
798# CONFIG_REISERFS_FS is not set 850# CONFIG_REISERFS_FS is not set
799# CONFIG_JFS_FS is not set 851# CONFIG_JFS_FS is not set
800CONFIG_FS_POSIX_ACL=y 852CONFIG_FS_POSIX_ACL=y
801# CONFIG_XFS_FS is not set 853# CONFIG_XFS_FS is not set
854# CONFIG_GFS2_FS is not set
802# CONFIG_OCFS2_FS is not set 855# CONFIG_OCFS2_FS is not set
803# CONFIG_MINIX_FS is not set 856# CONFIG_MINIX_FS is not set
804# CONFIG_ROMFS_FS is not set 857# CONFIG_ROMFS_FS is not set
@@ -809,6 +862,7 @@ CONFIG_DNOTIFY=y
809# CONFIG_AUTOFS_FS is not set 862# CONFIG_AUTOFS_FS is not set
810# CONFIG_AUTOFS4_FS is not set 863# CONFIG_AUTOFS4_FS is not set
811CONFIG_FUSE_FS=y 864CONFIG_FUSE_FS=y
865CONFIG_GENERIC_ACL=y
812 866
813# 867#
814# CD-ROM/DVD Filesystems 868# CD-ROM/DVD Filesystems
@@ -828,17 +882,20 @@ CONFIG_FUSE_FS=y
828# 882#
829CONFIG_PROC_FS=y 883CONFIG_PROC_FS=y
830CONFIG_PROC_KCORE=y 884CONFIG_PROC_KCORE=y
885CONFIG_PROC_SYSCTL=y
831CONFIG_SYSFS=y 886CONFIG_SYSFS=y
832CONFIG_TMPFS=y 887CONFIG_TMPFS=y
888CONFIG_TMPFS_POSIX_ACL=y
833# CONFIG_HUGETLB_PAGE is not set 889# CONFIG_HUGETLB_PAGE is not set
834CONFIG_RAMFS=y 890CONFIG_RAMFS=y
835# CONFIG_CONFIGFS_FS is not set 891CONFIG_CONFIGFS_FS=y
836 892
837# 893#
838# Miscellaneous filesystems 894# Miscellaneous filesystems
839# 895#
840# CONFIG_ADFS_FS is not set 896# CONFIG_ADFS_FS is not set
841# CONFIG_AFFS_FS is not set 897# CONFIG_AFFS_FS is not set
898# CONFIG_ECRYPT_FS is not set
842# CONFIG_HFS_FS is not set 899# CONFIG_HFS_FS is not set
843# CONFIG_HFSPLUS_FS is not set 900# CONFIG_HFSPLUS_FS is not set
844# CONFIG_BEFS_FS is not set 901# CONFIG_BEFS_FS is not set
@@ -866,7 +923,6 @@ CONFIG_SUNRPC=y
866# CONFIG_RPCSEC_GSS_SPKM3 is not set 923# CONFIG_RPCSEC_GSS_SPKM3 is not set
867# CONFIG_SMB_FS is not set 924# CONFIG_SMB_FS is not set
868# CONFIG_CIFS is not set 925# CONFIG_CIFS is not set
869# CONFIG_CIFS_DEBUG2 is not set
870# CONFIG_NCP_FS is not set 926# CONFIG_NCP_FS is not set
871# CONFIG_CODA_FS is not set 927# CONFIG_CODA_FS is not set
872# CONFIG_AFS_FS is not set 928# CONFIG_AFS_FS is not set
@@ -884,6 +940,14 @@ CONFIG_MSDOS_PARTITION=y
884# CONFIG_NLS is not set 940# CONFIG_NLS is not set
885 941
886# 942#
943# Distributed Lock Manager
944#
945CONFIG_DLM=y
946CONFIG_DLM_TCP=y
947# CONFIG_DLM_SCTP is not set
948# CONFIG_DLM_DEBUG is not set
949
950#
887# Profiling support 951# Profiling support
888# 952#
889# CONFIG_PROFILING is not set 953# CONFIG_PROFILING is not set
@@ -893,12 +957,13 @@ CONFIG_MSDOS_PARTITION=y
893# 957#
894CONFIG_TRACE_IRQFLAGS_SUPPORT=y 958CONFIG_TRACE_IRQFLAGS_SUPPORT=y
895# CONFIG_PRINTK_TIME is not set 959# CONFIG_PRINTK_TIME is not set
960CONFIG_ENABLE_MUST_CHECK=y
896# CONFIG_MAGIC_SYSRQ is not set 961# CONFIG_MAGIC_SYSRQ is not set
897# CONFIG_UNUSED_SYMBOLS is not set 962# CONFIG_UNUSED_SYMBOLS is not set
963# CONFIG_DEBUG_FS is not set
964# CONFIG_HEADERS_CHECK is not set
898# CONFIG_DEBUG_KERNEL is not set 965# CONFIG_DEBUG_KERNEL is not set
899CONFIG_LOG_BUF_SHIFT=14 966CONFIG_LOG_BUF_SHIFT=14
900# CONFIG_DEBUG_FS is not set
901# CONFIG_UNWIND_INFO is not set
902CONFIG_CROSSCOMPILE=y 967CONFIG_CROSSCOMPILE=y
903CONFIG_CMDLINE="" 968CONFIG_CMDLINE=""
904 969
@@ -913,7 +978,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
913# Cryptographic options 978# Cryptographic options
914# 979#
915CONFIG_CRYPTO=y 980CONFIG_CRYPTO=y
981CONFIG_CRYPTO_ALGAPI=y
982CONFIG_CRYPTO_BLKCIPHER=y
983CONFIG_CRYPTO_HASH=y
984CONFIG_CRYPTO_MANAGER=y
916CONFIG_CRYPTO_HMAC=y 985CONFIG_CRYPTO_HMAC=y
986CONFIG_CRYPTO_XCBC=y
917CONFIG_CRYPTO_NULL=y 987CONFIG_CRYPTO_NULL=y
918CONFIG_CRYPTO_MD4=y 988CONFIG_CRYPTO_MD4=y
919CONFIG_CRYPTO_MD5=y 989CONFIG_CRYPTO_MD5=y
@@ -922,9 +992,16 @@ CONFIG_CRYPTO_SHA256=y
922CONFIG_CRYPTO_SHA512=y 992CONFIG_CRYPTO_SHA512=y
923CONFIG_CRYPTO_WP512=y 993CONFIG_CRYPTO_WP512=y
924CONFIG_CRYPTO_TGR192=y 994CONFIG_CRYPTO_TGR192=y
995CONFIG_CRYPTO_GF128MUL=y
996CONFIG_CRYPTO_ECB=y
997CONFIG_CRYPTO_CBC=y
998CONFIG_CRYPTO_PCBC=y
999CONFIG_CRYPTO_LRW=y
925CONFIG_CRYPTO_DES=y 1000CONFIG_CRYPTO_DES=y
1001CONFIG_CRYPTO_FCRYPT=y
926CONFIG_CRYPTO_BLOWFISH=y 1002CONFIG_CRYPTO_BLOWFISH=y
927CONFIG_CRYPTO_TWOFISH=y 1003CONFIG_CRYPTO_TWOFISH=y
1004CONFIG_CRYPTO_TWOFISH_COMMON=y
928CONFIG_CRYPTO_SERPENT=y 1005CONFIG_CRYPTO_SERPENT=y
929CONFIG_CRYPTO_AES=y 1006CONFIG_CRYPTO_AES=y
930CONFIG_CRYPTO_CAST5=y 1007CONFIG_CRYPTO_CAST5=y
@@ -936,6 +1013,7 @@ CONFIG_CRYPTO_ANUBIS=y
936CONFIG_CRYPTO_DEFLATE=y 1013CONFIG_CRYPTO_DEFLATE=y
937CONFIG_CRYPTO_MICHAEL_MIC=y 1014CONFIG_CRYPTO_MICHAEL_MIC=y
938CONFIG_CRYPTO_CRC32C=y 1015CONFIG_CRYPTO_CRC32C=y
1016CONFIG_CRYPTO_CAMELLIA=y
939 1017
940# 1018#
941# Hardware crypto devices 1019# Hardware crypto devices
@@ -944,6 +1022,7 @@ CONFIG_CRYPTO_CRC32C=y
944# 1022#
945# Library routines 1023# Library routines
946# 1024#
1025CONFIG_BITREVERSE=y
947# CONFIG_CRC_CCITT is not set 1026# CONFIG_CRC_CCITT is not set
948CONFIG_CRC16=y 1027CONFIG_CRC16=y
949CONFIG_CRC32=y 1028CONFIG_CRC32=y
@@ -951,3 +1030,5 @@ CONFIG_LIBCRC32C=y
951CONFIG_ZLIB_INFLATE=y 1030CONFIG_ZLIB_INFLATE=y
952CONFIG_ZLIB_DEFLATE=y 1031CONFIG_ZLIB_DEFLATE=y
953CONFIG_PLIST=y 1032CONFIG_PLIST=y
1033CONFIG_HAS_IOMEM=y
1034CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 1a57b3375483..1db19f1bfd4d 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:33 2006 4# Sun Feb 18 21:27:39 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1000=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_DB1000=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +64,19 @@ CONFIG_MIPS_DB1000=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1000=y 81CONFIG_SOC_AU1000=y
77CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -116,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -135,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -147,6 +153,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,15 +172,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 173CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
173CONFIG_RELAY=y 184CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
177CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
178# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -181,12 +193,12 @@ CONFIG_PRINTK=y
181CONFIG_BUG=y 193CONFIG_BUG=y
182CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
183CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
184CONFIG_RT_MUTEXES=y
185CONFIG_FUTEX=y 196CONFIG_FUTEX=y
186CONFIG_EPOLL=y 197CONFIG_EPOLL=y
187CONFIG_SHMEM=y 198CONFIG_SHMEM=y
188CONFIG_SLAB=y 199CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
190# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
191CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
192# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -204,6 +216,7 @@ CONFIG_KMOD=y
204# 216#
205# Block layer 217# Block layer
206# 218#
219CONFIG_BLOCK=y
207# CONFIG_LBD is not set 220# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
209# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -252,6 +265,10 @@ CONFIG_PCMCIA_IOCTL=y
252CONFIG_BINFMT_ELF=y 265CONFIG_BINFMT_ELF=y
253# CONFIG_BINFMT_MISC is not set 266# CONFIG_BINFMT_MISC is not set
254CONFIG_TRAD_SIGNALS=y 267CONFIG_TRAD_SIGNALS=y
268
269#
270# Power management options
271#
255# CONFIG_PM is not set 272# CONFIG_PM is not set
256 273
257# 274#
@@ -268,7 +285,10 @@ CONFIG_PACKET=y
268CONFIG_UNIX=y 285CONFIG_UNIX=y
269CONFIG_XFRM=y 286CONFIG_XFRM=y
270CONFIG_XFRM_USER=m 287CONFIG_XFRM_USER=m
288# CONFIG_XFRM_SUB_POLICY is not set
289CONFIG_XFRM_MIGRATE=y
271CONFIG_NET_KEY=y 290CONFIG_NET_KEY=y
291CONFIG_NET_KEY_MIGRATE=y
272CONFIG_INET=y 292CONFIG_INET=y
273CONFIG_IP_MULTICAST=y 293CONFIG_IP_MULTICAST=y
274# CONFIG_IP_ADVANCED_ROUTER is not set 294# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -289,10 +309,13 @@ CONFIG_IP_PNP_BOOTP=y
289# CONFIG_INET_TUNNEL is not set 309# CONFIG_INET_TUNNEL is not set
290CONFIG_INET_XFRM_MODE_TRANSPORT=m 310CONFIG_INET_XFRM_MODE_TRANSPORT=m
291CONFIG_INET_XFRM_MODE_TUNNEL=m 311CONFIG_INET_XFRM_MODE_TUNNEL=m
312CONFIG_INET_XFRM_MODE_BEET=m
292CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
293CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
294# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
295CONFIG_TCP_CONG_BIC=y 316CONFIG_TCP_CONG_CUBIC=y
317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
296 319
297# 320#
298# IP: Virtual Server Configuration 321# IP: Virtual Server Configuration
@@ -311,15 +334,42 @@ CONFIG_NETFILTER=y
311CONFIG_NETFILTER_NETLINK=m 334CONFIG_NETFILTER_NETLINK=m
312CONFIG_NETFILTER_NETLINK_QUEUE=m 335CONFIG_NETFILTER_NETLINK_QUEUE=m
313CONFIG_NETFILTER_NETLINK_LOG=m 336CONFIG_NETFILTER_NETLINK_LOG=m
314# CONFIG_NF_CONNTRACK is not set 337CONFIG_NF_CONNTRACK_ENABLED=m
338CONFIG_NF_CONNTRACK_SUPPORT=y
339# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
340CONFIG_NF_CONNTRACK=m
341CONFIG_NF_CT_ACCT=y
342CONFIG_NF_CONNTRACK_MARK=y
343CONFIG_NF_CONNTRACK_SECMARK=y
344CONFIG_NF_CONNTRACK_EVENTS=y
345CONFIG_NF_CT_PROTO_GRE=m
346CONFIG_NF_CT_PROTO_SCTP=m
347CONFIG_NF_CONNTRACK_AMANDA=m
348CONFIG_NF_CONNTRACK_FTP=m
349CONFIG_NF_CONNTRACK_H323=m
350CONFIG_NF_CONNTRACK_IRC=m
351# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
352CONFIG_NF_CONNTRACK_PPTP=m
353CONFIG_NF_CONNTRACK_SANE=m
354CONFIG_NF_CONNTRACK_SIP=m
355CONFIG_NF_CONNTRACK_TFTP=m
356CONFIG_NF_CT_NETLINK=m
315CONFIG_NETFILTER_XTABLES=m 357CONFIG_NETFILTER_XTABLES=m
316CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 358CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
317CONFIG_NETFILTER_XT_TARGET_MARK=m 359CONFIG_NETFILTER_XT_TARGET_MARK=m
318CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 360CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
361CONFIG_NETFILTER_XT_TARGET_NFLOG=m
319CONFIG_NETFILTER_XT_TARGET_SECMARK=m 362CONFIG_NETFILTER_XT_TARGET_SECMARK=m
363CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
364CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
320CONFIG_NETFILTER_XT_MATCH_COMMENT=m 365CONFIG_NETFILTER_XT_MATCH_COMMENT=m
366CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
367CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
368CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
321CONFIG_NETFILTER_XT_MATCH_DCCP=m 369CONFIG_NETFILTER_XT_MATCH_DCCP=m
370CONFIG_NETFILTER_XT_MATCH_DSCP=m
322CONFIG_NETFILTER_XT_MATCH_ESP=m 371CONFIG_NETFILTER_XT_MATCH_ESP=m
372CONFIG_NETFILTER_XT_MATCH_HELPER=m
323CONFIG_NETFILTER_XT_MATCH_LENGTH=m 373CONFIG_NETFILTER_XT_MATCH_LENGTH=m
324CONFIG_NETFILTER_XT_MATCH_LIMIT=m 374CONFIG_NETFILTER_XT_MATCH_LIMIT=m
325CONFIG_NETFILTER_XT_MATCH_MAC=m 375CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -330,14 +380,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
330CONFIG_NETFILTER_XT_MATCH_QUOTA=m 380CONFIG_NETFILTER_XT_MATCH_QUOTA=m
331CONFIG_NETFILTER_XT_MATCH_REALM=m 381CONFIG_NETFILTER_XT_MATCH_REALM=m
332CONFIG_NETFILTER_XT_MATCH_SCTP=m 382CONFIG_NETFILTER_XT_MATCH_SCTP=m
383CONFIG_NETFILTER_XT_MATCH_STATE=m
333CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 384CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
334CONFIG_NETFILTER_XT_MATCH_STRING=m 385CONFIG_NETFILTER_XT_MATCH_STRING=m
335CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 386CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
387CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
336 388
337# 389#
338# IP: Netfilter Configuration 390# IP: Netfilter Configuration
339# 391#
340# CONFIG_IP_NF_CONNTRACK is not set 392CONFIG_NF_CONNTRACK_IPV4=m
393CONFIG_NF_CONNTRACK_PROC_COMPAT=y
341# CONFIG_IP_NF_QUEUE is not set 394# CONFIG_IP_NF_QUEUE is not set
342# CONFIG_IP_NF_IPTABLES is not set 395# CONFIG_IP_NF_IPTABLES is not set
343# CONFIG_IP_NF_ARPTABLES is not set 396# CONFIG_IP_NF_ARPTABLES is not set
@@ -365,7 +418,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
365# CONFIG_ATALK is not set 418# CONFIG_ATALK is not set
366# CONFIG_X25 is not set 419# CONFIG_X25 is not set
367# CONFIG_LAPB is not set 420# CONFIG_LAPB is not set
368# CONFIG_NET_DIVERT is not set
369# CONFIG_ECONET is not set 421# CONFIG_ECONET is not set
370# CONFIG_WAN_ROUTER is not set 422# CONFIG_WAN_ROUTER is not set
371 423
@@ -421,11 +473,13 @@ CONFIG_MTD_PARTITIONS=y
421# User Modules And Translation Layers 473# User Modules And Translation Layers
422# 474#
423CONFIG_MTD_CHAR=y 475CONFIG_MTD_CHAR=y
476CONFIG_MTD_BLKDEVS=y
424CONFIG_MTD_BLOCK=y 477CONFIG_MTD_BLOCK=y
425# CONFIG_FTL is not set 478# CONFIG_FTL is not set
426# CONFIG_NFTL is not set 479# CONFIG_NFTL is not set
427# CONFIG_INFTL is not set 480# CONFIG_INFTL is not set
428# CONFIG_RFD_FTL is not set 481# CONFIG_RFD_FTL is not set
482# CONFIG_SSFDC is not set
429 483
430# 484#
431# RAM/ROM/Flash chip drivers 485# RAM/ROM/Flash chip drivers
@@ -510,6 +564,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
510CONFIG_ATA_OVER_ETH=m 564CONFIG_ATA_OVER_ETH=m
511 565
512# 566#
567# Misc devices
568#
569
570#
513# ATA/ATAPI/MFM/RLL support 571# ATA/ATAPI/MFM/RLL support
514# 572#
515# CONFIG_IDE is not set 573# CONFIG_IDE is not set
@@ -519,6 +577,12 @@ CONFIG_ATA_OVER_ETH=m
519# 577#
520CONFIG_RAID_ATTRS=m 578CONFIG_RAID_ATTRS=m
521# CONFIG_SCSI is not set 579# CONFIG_SCSI is not set
580# CONFIG_SCSI_NETLINK is not set
581
582#
583# Serial ATA (prod) and Parallel ATA (experimental) drivers
584#
585# CONFIG_ATA is not set
522 586
523# 587#
524# Multi-device support (RAID and LVM) 588# Multi-device support (RAID and LVM)
@@ -562,6 +626,8 @@ CONFIG_LXT_PHY=m
562CONFIG_CICADA_PHY=m 626CONFIG_CICADA_PHY=m
563CONFIG_VITESSE_PHY=m 627CONFIG_VITESSE_PHY=m
564CONFIG_SMSC_PHY=m 628CONFIG_SMSC_PHY=m
629# CONFIG_BROADCOM_PHY is not set
630# CONFIG_FIXED_PHY is not set
565 631
566# 632#
567# Ethernet (10 or 100Mbit) 633# Ethernet (10 or 100Mbit)
@@ -616,6 +682,7 @@ CONFIG_PPP_DEFLATE=m
616CONFIG_PPP_MPPE=m 682CONFIG_PPP_MPPE=m
617CONFIG_PPPOE=m 683CONFIG_PPPOE=m
618# CONFIG_SLIP is not set 684# CONFIG_SLIP is not set
685CONFIG_SLHC=m
619# CONFIG_SHAPER is not set 686# CONFIG_SHAPER is not set
620# CONFIG_NETCONSOLE is not set 687# CONFIG_NETCONSOLE is not set
621# CONFIG_NETPOLL is not set 688# CONFIG_NETPOLL is not set
@@ -635,6 +702,7 @@ CONFIG_PPPOE=m
635# Input device support 702# Input device support
636# 703#
637CONFIG_INPUT=y 704CONFIG_INPUT=y
705# CONFIG_INPUT_FF_MEMLESS is not set
638 706
639# 707#
640# Userland interfaces 708# Userland interfaces
@@ -714,10 +782,6 @@ CONFIG_LEGACY_PTY_COUNT=256
714# CONFIG_R3964 is not set 782# CONFIG_R3964 is not set
715 783
716# 784#
717# Ftape, the floppy tape device driver
718#
719
720#
721# PCMCIA character devices 785# PCMCIA character devices
722# 786#
723CONFIG_SYNCLINK_CS=m 787CONFIG_SYNCLINK_CS=m
@@ -729,7 +793,6 @@ CONFIG_SYNCLINK_CS=m
729# TPM devices 793# TPM devices
730# 794#
731# CONFIG_TCG_TPM is not set 795# CONFIG_TCG_TPM is not set
732# CONFIG_TELCLOCK is not set
733 796
734# 797#
735# I2C support 798# I2C support
@@ -754,14 +817,9 @@ CONFIG_SYNCLINK_CS=m
754# CONFIG_HWMON_VID is not set 817# CONFIG_HWMON_VID is not set
755 818
756# 819#
757# Misc devices
758#
759
760#
761# Multimedia devices 820# Multimedia devices
762# 821#
763# CONFIG_VIDEO_DEV is not set 822# CONFIG_VIDEO_DEV is not set
764CONFIG_VIDEO_V4L2=y
765 823
766# 824#
767# Digital Video Broadcasting Devices 825# Digital Video Broadcasting Devices
@@ -779,6 +837,7 @@ CONFIG_VIDEO_V4L2=y
779# 837#
780# CONFIG_VGA_CONSOLE is not set 838# CONFIG_VGA_CONSOLE is not set
781CONFIG_DUMMY_CONSOLE=y 839CONFIG_DUMMY_CONSOLE=y
840# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
782 841
783# 842#
784# Sound 843# Sound
@@ -786,6 +845,11 @@ CONFIG_DUMMY_CONSOLE=y
786# CONFIG_SOUND is not set 845# CONFIG_SOUND is not set
787 846
788# 847#
848# HID Devices
849#
850# CONFIG_HID is not set
851
852#
789# USB support 853# USB support
790# 854#
791CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
@@ -847,6 +911,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
847# 911#
848 912
849# 913#
914# Auxiliary Display support
915#
916
917#
918# Virtualization
919#
920
921#
850# File systems 922# File systems
851# 923#
852CONFIG_EXT2_FS=y 924CONFIG_EXT2_FS=y
@@ -858,6 +930,7 @@ CONFIG_EXT3_FS=y
858CONFIG_EXT3_FS_XATTR=y 930CONFIG_EXT3_FS_XATTR=y
859CONFIG_EXT3_FS_POSIX_ACL=y 931CONFIG_EXT3_FS_POSIX_ACL=y
860CONFIG_EXT3_FS_SECURITY=y 932CONFIG_EXT3_FS_SECURITY=y
933# CONFIG_EXT4DEV_FS is not set
861CONFIG_JBD=y 934CONFIG_JBD=y
862# CONFIG_JBD_DEBUG is not set 935# CONFIG_JBD_DEBUG is not set
863CONFIG_FS_MBCACHE=y 936CONFIG_FS_MBCACHE=y
@@ -870,6 +943,7 @@ CONFIG_REISERFS_FS_SECURITY=y
870# CONFIG_JFS_FS is not set 943# CONFIG_JFS_FS is not set
871CONFIG_FS_POSIX_ACL=y 944CONFIG_FS_POSIX_ACL=y
872# CONFIG_XFS_FS is not set 945# CONFIG_XFS_FS is not set
946# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 947# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 948# CONFIG_MINIX_FS is not set
875# CONFIG_ROMFS_FS is not set 949# CONFIG_ROMFS_FS is not set
@@ -880,6 +954,7 @@ CONFIG_DNOTIFY=y
880CONFIG_AUTOFS_FS=m 954CONFIG_AUTOFS_FS=m
881CONFIG_AUTOFS4_FS=m 955CONFIG_AUTOFS4_FS=m
882CONFIG_FUSE_FS=m 956CONFIG_FUSE_FS=m
957CONFIG_GENERIC_ACL=y
883 958
884# 959#
885# CD-ROM/DVD Filesystems 960# CD-ROM/DVD Filesystems
@@ -899,23 +974,25 @@ CONFIG_FUSE_FS=m
899# 974#
900CONFIG_PROC_FS=y 975CONFIG_PROC_FS=y
901CONFIG_PROC_KCORE=y 976CONFIG_PROC_KCORE=y
977CONFIG_PROC_SYSCTL=y
902CONFIG_SYSFS=y 978CONFIG_SYSFS=y
903CONFIG_TMPFS=y 979CONFIG_TMPFS=y
980CONFIG_TMPFS_POSIX_ACL=y
904# CONFIG_HUGETLB_PAGE is not set 981# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y 982CONFIG_RAMFS=y
906# CONFIG_CONFIGFS_FS is not set 983CONFIG_CONFIGFS_FS=m
907 984
908# 985#
909# Miscellaneous filesystems 986# Miscellaneous filesystems
910# 987#
911# CONFIG_ADFS_FS is not set 988# CONFIG_ADFS_FS is not set
912# CONFIG_AFFS_FS is not set 989# CONFIG_AFFS_FS is not set
990# CONFIG_ECRYPT_FS is not set
913# CONFIG_HFS_FS is not set 991# CONFIG_HFS_FS is not set
914# CONFIG_HFSPLUS_FS is not set 992# CONFIG_HFSPLUS_FS is not set
915# CONFIG_BEFS_FS is not set 993# CONFIG_BEFS_FS is not set
916# CONFIG_BFS_FS is not set 994# CONFIG_BFS_FS is not set
917# CONFIG_EFS_FS is not set 995# CONFIG_EFS_FS is not set
918# CONFIG_JFFS_FS is not set
919# CONFIG_JFFS2_FS is not set 996# CONFIG_JFFS2_FS is not set
920CONFIG_CRAMFS=m 997CONFIG_CRAMFS=m
921# CONFIG_VXFS_FS is not set 998# CONFIG_VXFS_FS is not set
@@ -944,7 +1021,6 @@ CONFIG_SUNRPC=y
944CONFIG_SMB_FS=m 1021CONFIG_SMB_FS=m
945# CONFIG_SMB_NLS_DEFAULT is not set 1022# CONFIG_SMB_NLS_DEFAULT is not set
946# CONFIG_CIFS is not set 1023# CONFIG_CIFS is not set
947# CONFIG_CIFS_DEBUG2 is not set
948# CONFIG_NCP_FS is not set 1024# CONFIG_NCP_FS is not set
949# CONFIG_CODA_FS is not set 1025# CONFIG_CODA_FS is not set
950# CONFIG_AFS_FS is not set 1026# CONFIG_AFS_FS is not set
@@ -1001,6 +1077,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1001# CONFIG_NLS_UTF8 is not set 1077# CONFIG_NLS_UTF8 is not set
1002 1078
1003# 1079#
1080# Distributed Lock Manager
1081#
1082CONFIG_DLM=m
1083CONFIG_DLM_TCP=y
1084# CONFIG_DLM_SCTP is not set
1085# CONFIG_DLM_DEBUG is not set
1086
1087#
1004# Profiling support 1088# Profiling support
1005# 1089#
1006# CONFIG_PROFILING is not set 1090# CONFIG_PROFILING is not set
@@ -1010,11 +1094,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1010# 1094#
1011CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1095CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1012# CONFIG_PRINTK_TIME is not set 1096# CONFIG_PRINTK_TIME is not set
1097CONFIG_ENABLE_MUST_CHECK=y
1013# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1014# CONFIG_UNUSED_SYMBOLS is not set 1099# CONFIG_UNUSED_SYMBOLS is not set
1100# CONFIG_DEBUG_FS is not set
1101# CONFIG_HEADERS_CHECK is not set
1015# CONFIG_DEBUG_KERNEL is not set 1102# CONFIG_DEBUG_KERNEL is not set
1016CONFIG_LOG_BUF_SHIFT=14 1103CONFIG_LOG_BUF_SHIFT=14
1017# CONFIG_DEBUG_FS is not set
1018CONFIG_CROSSCOMPILE=y 1104CONFIG_CROSSCOMPILE=y
1019CONFIG_CMDLINE="" 1105CONFIG_CMDLINE=""
1020 1106
@@ -1029,18 +1115,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1029# Cryptographic options 1115# Cryptographic options
1030# 1116#
1031CONFIG_CRYPTO=y 1117CONFIG_CRYPTO=y
1118CONFIG_CRYPTO_ALGAPI=y
1119CONFIG_CRYPTO_BLKCIPHER=m
1120CONFIG_CRYPTO_HASH=y
1121CONFIG_CRYPTO_MANAGER=y
1032CONFIG_CRYPTO_HMAC=y 1122CONFIG_CRYPTO_HMAC=y
1123CONFIG_CRYPTO_XCBC=m
1033CONFIG_CRYPTO_NULL=m 1124CONFIG_CRYPTO_NULL=m
1034CONFIG_CRYPTO_MD4=m 1125CONFIG_CRYPTO_MD4=m
1035CONFIG_CRYPTO_MD5=m 1126CONFIG_CRYPTO_MD5=y
1036CONFIG_CRYPTO_SHA1=m 1127CONFIG_CRYPTO_SHA1=m
1037CONFIG_CRYPTO_SHA256=m 1128CONFIG_CRYPTO_SHA256=m
1038CONFIG_CRYPTO_SHA512=m 1129CONFIG_CRYPTO_SHA512=m
1039CONFIG_CRYPTO_WP512=m 1130CONFIG_CRYPTO_WP512=m
1040CONFIG_CRYPTO_TGR192=m 1131CONFIG_CRYPTO_TGR192=m
1132CONFIG_CRYPTO_GF128MUL=m
1133CONFIG_CRYPTO_ECB=m
1134CONFIG_CRYPTO_CBC=m
1135CONFIG_CRYPTO_PCBC=m
1136CONFIG_CRYPTO_LRW=m
1041CONFIG_CRYPTO_DES=m 1137CONFIG_CRYPTO_DES=m
1138CONFIG_CRYPTO_FCRYPT=m
1042CONFIG_CRYPTO_BLOWFISH=m 1139CONFIG_CRYPTO_BLOWFISH=m
1043CONFIG_CRYPTO_TWOFISH=m 1140CONFIG_CRYPTO_TWOFISH=m
1141CONFIG_CRYPTO_TWOFISH_COMMON=m
1044CONFIG_CRYPTO_SERPENT=m 1142CONFIG_CRYPTO_SERPENT=m
1045CONFIG_CRYPTO_AES=m 1143CONFIG_CRYPTO_AES=m
1046CONFIG_CRYPTO_CAST5=m 1144CONFIG_CRYPTO_CAST5=m
@@ -1052,6 +1150,7 @@ CONFIG_CRYPTO_ANUBIS=m
1052CONFIG_CRYPTO_DEFLATE=m 1150CONFIG_CRYPTO_DEFLATE=m
1053CONFIG_CRYPTO_MICHAEL_MIC=m 1151CONFIG_CRYPTO_MICHAEL_MIC=m
1054CONFIG_CRYPTO_CRC32C=m 1152CONFIG_CRYPTO_CRC32C=m
1153CONFIG_CRYPTO_CAMELLIA=m
1055# CONFIG_CRYPTO_TEST is not set 1154# CONFIG_CRYPTO_TEST is not set
1056 1155
1057# 1156#
@@ -1061,6 +1160,7 @@ CONFIG_CRYPTO_CRC32C=m
1061# 1160#
1062# Library routines 1161# Library routines
1063# 1162#
1163CONFIG_BITREVERSE=y
1064CONFIG_CRC_CCITT=m 1164CONFIG_CRC_CCITT=m
1065CONFIG_CRC16=m 1165CONFIG_CRC16=m
1066CONFIG_CRC32=y 1166CONFIG_CRC32=y
@@ -1072,3 +1172,5 @@ CONFIG_TEXTSEARCH_KMP=m
1072CONFIG_TEXTSEARCH_BM=m 1172CONFIG_TEXTSEARCH_BM=m
1073CONFIG_TEXTSEARCH_FSM=m 1173CONFIG_TEXTSEARCH_FSM=m
1074CONFIG_PLIST=y 1174CONFIG_PLIST=y
1175CONFIG_HAS_IOMEM=y
1176CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 0055ec41f207..529e6ebe2a8d 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:34 2006 4# Sun Feb 18 21:27:39 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1100=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_DB1100=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +64,19 @@ CONFIG_MIPS_DB1100=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1100=y 81CONFIG_SOC_AU1100=y
77CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -116,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -135,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -147,6 +153,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,15 +172,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 173CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
173CONFIG_RELAY=y 184CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
177CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
178# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -181,12 +193,12 @@ CONFIG_PRINTK=y
181CONFIG_BUG=y 193CONFIG_BUG=y
182CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
183CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
184CONFIG_RT_MUTEXES=y
185CONFIG_FUTEX=y 196CONFIG_FUTEX=y
186CONFIG_EPOLL=y 197CONFIG_EPOLL=y
187CONFIG_SHMEM=y 198CONFIG_SHMEM=y
188CONFIG_SLAB=y 199CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
190# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
191CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
192# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -204,6 +216,7 @@ CONFIG_KMOD=y
204# 216#
205# Block layer 217# Block layer
206# 218#
219CONFIG_BLOCK=y
207# CONFIG_LBD is not set 220# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
209# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -241,6 +254,10 @@ CONFIG_MMU=y
241CONFIG_BINFMT_ELF=y 254CONFIG_BINFMT_ELF=y
242# CONFIG_BINFMT_MISC is not set 255# CONFIG_BINFMT_MISC is not set
243CONFIG_TRAD_SIGNALS=y 256CONFIG_TRAD_SIGNALS=y
257
258#
259# Power management options
260#
244# CONFIG_PM is not set 261# CONFIG_PM is not set
245 262
246# 263#
@@ -257,7 +274,10 @@ CONFIG_PACKET=y
257CONFIG_UNIX=y 274CONFIG_UNIX=y
258CONFIG_XFRM=y 275CONFIG_XFRM=y
259CONFIG_XFRM_USER=m 276CONFIG_XFRM_USER=m
277# CONFIG_XFRM_SUB_POLICY is not set
278CONFIG_XFRM_MIGRATE=y
260CONFIG_NET_KEY=y 279CONFIG_NET_KEY=y
280CONFIG_NET_KEY_MIGRATE=y
261CONFIG_INET=y 281CONFIG_INET=y
262CONFIG_IP_MULTICAST=y 282CONFIG_IP_MULTICAST=y
263# CONFIG_IP_ADVANCED_ROUTER is not set 283# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -278,10 +298,13 @@ CONFIG_IP_PNP_BOOTP=y
278# CONFIG_INET_TUNNEL is not set 298# CONFIG_INET_TUNNEL is not set
279CONFIG_INET_XFRM_MODE_TRANSPORT=m 299CONFIG_INET_XFRM_MODE_TRANSPORT=m
280CONFIG_INET_XFRM_MODE_TUNNEL=m 300CONFIG_INET_XFRM_MODE_TUNNEL=m
301CONFIG_INET_XFRM_MODE_BEET=m
281CONFIG_INET_DIAG=y 302CONFIG_INET_DIAG=y
282CONFIG_INET_TCP_DIAG=y 303CONFIG_INET_TCP_DIAG=y
283# CONFIG_TCP_CONG_ADVANCED is not set 304# CONFIG_TCP_CONG_ADVANCED is not set
284CONFIG_TCP_CONG_BIC=y 305CONFIG_TCP_CONG_CUBIC=y
306CONFIG_DEFAULT_TCP_CONG="cubic"
307CONFIG_TCP_MD5SIG=y
285 308
286# 309#
287# IP: Virtual Server Configuration 310# IP: Virtual Server Configuration
@@ -300,15 +323,42 @@ CONFIG_NETFILTER=y
300CONFIG_NETFILTER_NETLINK=m 323CONFIG_NETFILTER_NETLINK=m
301CONFIG_NETFILTER_NETLINK_QUEUE=m 324CONFIG_NETFILTER_NETLINK_QUEUE=m
302CONFIG_NETFILTER_NETLINK_LOG=m 325CONFIG_NETFILTER_NETLINK_LOG=m
303# CONFIG_NF_CONNTRACK is not set 326CONFIG_NF_CONNTRACK_ENABLED=m
327CONFIG_NF_CONNTRACK_SUPPORT=y
328# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
329CONFIG_NF_CONNTRACK=m
330CONFIG_NF_CT_ACCT=y
331CONFIG_NF_CONNTRACK_MARK=y
332CONFIG_NF_CONNTRACK_SECMARK=y
333CONFIG_NF_CONNTRACK_EVENTS=y
334CONFIG_NF_CT_PROTO_GRE=m
335CONFIG_NF_CT_PROTO_SCTP=m
336CONFIG_NF_CONNTRACK_AMANDA=m
337CONFIG_NF_CONNTRACK_FTP=m
338CONFIG_NF_CONNTRACK_H323=m
339CONFIG_NF_CONNTRACK_IRC=m
340# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
341CONFIG_NF_CONNTRACK_PPTP=m
342CONFIG_NF_CONNTRACK_SANE=m
343CONFIG_NF_CONNTRACK_SIP=m
344CONFIG_NF_CONNTRACK_TFTP=m
345CONFIG_NF_CT_NETLINK=m
304CONFIG_NETFILTER_XTABLES=m 346CONFIG_NETFILTER_XTABLES=m
305CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 347CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
306CONFIG_NETFILTER_XT_TARGET_MARK=m 348CONFIG_NETFILTER_XT_TARGET_MARK=m
307CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 349CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
350CONFIG_NETFILTER_XT_TARGET_NFLOG=m
308CONFIG_NETFILTER_XT_TARGET_SECMARK=m 351CONFIG_NETFILTER_XT_TARGET_SECMARK=m
352CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
353CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
309CONFIG_NETFILTER_XT_MATCH_COMMENT=m 354CONFIG_NETFILTER_XT_MATCH_COMMENT=m
355CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
356CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
357CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
310CONFIG_NETFILTER_XT_MATCH_DCCP=m 358CONFIG_NETFILTER_XT_MATCH_DCCP=m
359CONFIG_NETFILTER_XT_MATCH_DSCP=m
311CONFIG_NETFILTER_XT_MATCH_ESP=m 360CONFIG_NETFILTER_XT_MATCH_ESP=m
361CONFIG_NETFILTER_XT_MATCH_HELPER=m
312CONFIG_NETFILTER_XT_MATCH_LENGTH=m 362CONFIG_NETFILTER_XT_MATCH_LENGTH=m
313CONFIG_NETFILTER_XT_MATCH_LIMIT=m 363CONFIG_NETFILTER_XT_MATCH_LIMIT=m
314CONFIG_NETFILTER_XT_MATCH_MAC=m 364CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -319,14 +369,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
319CONFIG_NETFILTER_XT_MATCH_QUOTA=m 369CONFIG_NETFILTER_XT_MATCH_QUOTA=m
320CONFIG_NETFILTER_XT_MATCH_REALM=m 370CONFIG_NETFILTER_XT_MATCH_REALM=m
321CONFIG_NETFILTER_XT_MATCH_SCTP=m 371CONFIG_NETFILTER_XT_MATCH_SCTP=m
372CONFIG_NETFILTER_XT_MATCH_STATE=m
322CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 373CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
323CONFIG_NETFILTER_XT_MATCH_STRING=m 374CONFIG_NETFILTER_XT_MATCH_STRING=m
324CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 375CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
376CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
325 377
326# 378#
327# IP: Netfilter Configuration 379# IP: Netfilter Configuration
328# 380#
329# CONFIG_IP_NF_CONNTRACK is not set 381CONFIG_NF_CONNTRACK_IPV4=m
382CONFIG_NF_CONNTRACK_PROC_COMPAT=y
330# CONFIG_IP_NF_QUEUE is not set 383# CONFIG_IP_NF_QUEUE is not set
331# CONFIG_IP_NF_IPTABLES is not set 384# CONFIG_IP_NF_IPTABLES is not set
332# CONFIG_IP_NF_ARPTABLES is not set 385# CONFIG_IP_NF_ARPTABLES is not set
@@ -354,7 +407,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
354# CONFIG_ATALK is not set 407# CONFIG_ATALK is not set
355# CONFIG_X25 is not set 408# CONFIG_X25 is not set
356# CONFIG_LAPB is not set 409# CONFIG_LAPB is not set
357# CONFIG_NET_DIVERT is not set
358# CONFIG_ECONET is not set 410# CONFIG_ECONET is not set
359# CONFIG_WAN_ROUTER is not set 411# CONFIG_WAN_ROUTER is not set
360 412
@@ -410,11 +462,13 @@ CONFIG_MTD_PARTITIONS=y
410# User Modules And Translation Layers 462# User Modules And Translation Layers
411# 463#
412CONFIG_MTD_CHAR=y 464CONFIG_MTD_CHAR=y
465CONFIG_MTD_BLKDEVS=y
413CONFIG_MTD_BLOCK=y 466CONFIG_MTD_BLOCK=y
414# CONFIG_FTL is not set 467# CONFIG_FTL is not set
415# CONFIG_NFTL is not set 468# CONFIG_NFTL is not set
416# CONFIG_INFTL is not set 469# CONFIG_INFTL is not set
417# CONFIG_RFD_FTL is not set 470# CONFIG_RFD_FTL is not set
471# CONFIG_SSFDC is not set
418 472
419# 473#
420# RAM/ROM/Flash chip drivers 474# RAM/ROM/Flash chip drivers
@@ -499,6 +553,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
499CONFIG_ATA_OVER_ETH=m 553CONFIG_ATA_OVER_ETH=m
500 554
501# 555#
556# Misc devices
557#
558
559#
502# ATA/ATAPI/MFM/RLL support 560# ATA/ATAPI/MFM/RLL support
503# 561#
504# CONFIG_IDE is not set 562# CONFIG_IDE is not set
@@ -508,6 +566,12 @@ CONFIG_ATA_OVER_ETH=m
508# 566#
509CONFIG_RAID_ATTRS=m 567CONFIG_RAID_ATTRS=m
510# CONFIG_SCSI is not set 568# CONFIG_SCSI is not set
569# CONFIG_SCSI_NETLINK is not set
570
571#
572# Serial ATA (prod) and Parallel ATA (experimental) drivers
573#
574# CONFIG_ATA is not set
511 575
512# 576#
513# Multi-device support (RAID and LVM) 577# Multi-device support (RAID and LVM)
@@ -551,6 +615,8 @@ CONFIG_LXT_PHY=m
551CONFIG_CICADA_PHY=m 615CONFIG_CICADA_PHY=m
552CONFIG_VITESSE_PHY=m 616CONFIG_VITESSE_PHY=m
553CONFIG_SMSC_PHY=m 617CONFIG_SMSC_PHY=m
618# CONFIG_BROADCOM_PHY is not set
619# CONFIG_FIXED_PHY is not set
554 620
555# 621#
556# Ethernet (10 or 100Mbit) 622# Ethernet (10 or 100Mbit)
@@ -592,6 +658,7 @@ CONFIG_PPP_DEFLATE=m
592CONFIG_PPP_MPPE=m 658CONFIG_PPP_MPPE=m
593CONFIG_PPPOE=m 659CONFIG_PPPOE=m
594# CONFIG_SLIP is not set 660# CONFIG_SLIP is not set
661CONFIG_SLHC=m
595# CONFIG_SHAPER is not set 662# CONFIG_SHAPER is not set
596# CONFIG_NETCONSOLE is not set 663# CONFIG_NETCONSOLE is not set
597# CONFIG_NETPOLL is not set 664# CONFIG_NETPOLL is not set
@@ -611,6 +678,7 @@ CONFIG_PPPOE=m
611# Input device support 678# Input device support
612# 679#
613CONFIG_INPUT=y 680CONFIG_INPUT=y
681# CONFIG_INPUT_FF_MEMLESS is not set
614 682
615# 683#
616# Userland interfaces 684# Userland interfaces
@@ -687,17 +755,12 @@ CONFIG_LEGACY_PTY_COUNT=256
687# CONFIG_GEN_RTC is not set 755# CONFIG_GEN_RTC is not set
688# CONFIG_DTLK is not set 756# CONFIG_DTLK is not set
689# CONFIG_R3964 is not set 757# CONFIG_R3964 is not set
690
691#
692# Ftape, the floppy tape device driver
693#
694# CONFIG_RAW_DRIVER is not set 758# CONFIG_RAW_DRIVER is not set
695 759
696# 760#
697# TPM devices 761# TPM devices
698# 762#
699# CONFIG_TCG_TPM is not set 763# CONFIG_TCG_TPM is not set
700# CONFIG_TELCLOCK is not set
701 764
702# 765#
703# I2C support 766# I2C support
@@ -722,14 +785,9 @@ CONFIG_LEGACY_PTY_COUNT=256
722# CONFIG_HWMON_VID is not set 785# CONFIG_HWMON_VID is not set
723 786
724# 787#
725# Misc devices
726#
727
728#
729# Multimedia devices 788# Multimedia devices
730# 789#
731# CONFIG_VIDEO_DEV is not set 790# CONFIG_VIDEO_DEV is not set
732CONFIG_VIDEO_V4L2=y
733 791
734# 792#
735# Digital Video Broadcasting Devices 793# Digital Video Broadcasting Devices
@@ -744,6 +802,7 @@ CONFIG_FB=y
744CONFIG_FB_CFB_FILLRECT=y 802CONFIG_FB_CFB_FILLRECT=y
745CONFIG_FB_CFB_COPYAREA=y 803CONFIG_FB_CFB_COPYAREA=y
746CONFIG_FB_CFB_IMAGEBLIT=y 804CONFIG_FB_CFB_IMAGEBLIT=y
805# CONFIG_FB_SVGALIB is not set
747# CONFIG_FB_MACMODES is not set 806# CONFIG_FB_MACMODES is not set
748# CONFIG_FB_BACKLIGHT is not set 807# CONFIG_FB_BACKLIGHT is not set
749# CONFIG_FB_MODE_HELPERS is not set 808# CONFIG_FB_MODE_HELPERS is not set
@@ -786,6 +845,11 @@ CONFIG_LOGO_LINUX_CLUT224=y
786# CONFIG_SOUND is not set 845# CONFIG_SOUND is not set
787 846
788# 847#
848# HID Devices
849#
850# CONFIG_HID is not set
851
852#
789# USB support 853# USB support
790# 854#
791CONFIG_USB_ARCH_HAS_HCD=y 855CONFIG_USB_ARCH_HAS_HCD=y
@@ -847,6 +911,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
847# 911#
848 912
849# 913#
914# Auxiliary Display support
915#
916
917#
918# Virtualization
919#
920
921#
850# File systems 922# File systems
851# 923#
852CONFIG_EXT2_FS=y 924CONFIG_EXT2_FS=y
@@ -858,6 +930,7 @@ CONFIG_EXT3_FS=y
858CONFIG_EXT3_FS_XATTR=y 930CONFIG_EXT3_FS_XATTR=y
859CONFIG_EXT3_FS_POSIX_ACL=y 931CONFIG_EXT3_FS_POSIX_ACL=y
860CONFIG_EXT3_FS_SECURITY=y 932CONFIG_EXT3_FS_SECURITY=y
933# CONFIG_EXT4DEV_FS is not set
861CONFIG_JBD=y 934CONFIG_JBD=y
862# CONFIG_JBD_DEBUG is not set 935# CONFIG_JBD_DEBUG is not set
863CONFIG_FS_MBCACHE=y 936CONFIG_FS_MBCACHE=y
@@ -870,6 +943,7 @@ CONFIG_REISERFS_FS_SECURITY=y
870# CONFIG_JFS_FS is not set 943# CONFIG_JFS_FS is not set
871CONFIG_FS_POSIX_ACL=y 944CONFIG_FS_POSIX_ACL=y
872# CONFIG_XFS_FS is not set 945# CONFIG_XFS_FS is not set
946# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 947# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 948# CONFIG_MINIX_FS is not set
875# CONFIG_ROMFS_FS is not set 949# CONFIG_ROMFS_FS is not set
@@ -880,6 +954,7 @@ CONFIG_DNOTIFY=y
880CONFIG_AUTOFS_FS=m 954CONFIG_AUTOFS_FS=m
881CONFIG_AUTOFS4_FS=m 955CONFIG_AUTOFS4_FS=m
882CONFIG_FUSE_FS=m 956CONFIG_FUSE_FS=m
957CONFIG_GENERIC_ACL=y
883 958
884# 959#
885# CD-ROM/DVD Filesystems 960# CD-ROM/DVD Filesystems
@@ -899,23 +974,25 @@ CONFIG_FUSE_FS=m
899# 974#
900CONFIG_PROC_FS=y 975CONFIG_PROC_FS=y
901CONFIG_PROC_KCORE=y 976CONFIG_PROC_KCORE=y
977CONFIG_PROC_SYSCTL=y
902CONFIG_SYSFS=y 978CONFIG_SYSFS=y
903CONFIG_TMPFS=y 979CONFIG_TMPFS=y
980CONFIG_TMPFS_POSIX_ACL=y
904# CONFIG_HUGETLB_PAGE is not set 981# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y 982CONFIG_RAMFS=y
906# CONFIG_CONFIGFS_FS is not set 983CONFIG_CONFIGFS_FS=m
907 984
908# 985#
909# Miscellaneous filesystems 986# Miscellaneous filesystems
910# 987#
911# CONFIG_ADFS_FS is not set 988# CONFIG_ADFS_FS is not set
912# CONFIG_AFFS_FS is not set 989# CONFIG_AFFS_FS is not set
990# CONFIG_ECRYPT_FS is not set
913# CONFIG_HFS_FS is not set 991# CONFIG_HFS_FS is not set
914# CONFIG_HFSPLUS_FS is not set 992# CONFIG_HFSPLUS_FS is not set
915# CONFIG_BEFS_FS is not set 993# CONFIG_BEFS_FS is not set
916# CONFIG_BFS_FS is not set 994# CONFIG_BFS_FS is not set
917# CONFIG_EFS_FS is not set 995# CONFIG_EFS_FS is not set
918# CONFIG_JFFS_FS is not set
919# CONFIG_JFFS2_FS is not set 996# CONFIG_JFFS2_FS is not set
920CONFIG_CRAMFS=m 997CONFIG_CRAMFS=m
921# CONFIG_VXFS_FS is not set 998# CONFIG_VXFS_FS is not set
@@ -944,7 +1021,6 @@ CONFIG_SUNRPC=y
944CONFIG_SMB_FS=m 1021CONFIG_SMB_FS=m
945# CONFIG_SMB_NLS_DEFAULT is not set 1022# CONFIG_SMB_NLS_DEFAULT is not set
946# CONFIG_CIFS is not set 1023# CONFIG_CIFS is not set
947# CONFIG_CIFS_DEBUG2 is not set
948# CONFIG_NCP_FS is not set 1024# CONFIG_NCP_FS is not set
949# CONFIG_CODA_FS is not set 1025# CONFIG_CODA_FS is not set
950# CONFIG_AFS_FS is not set 1026# CONFIG_AFS_FS is not set
@@ -1001,6 +1077,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1001# CONFIG_NLS_UTF8 is not set 1077# CONFIG_NLS_UTF8 is not set
1002 1078
1003# 1079#
1080# Distributed Lock Manager
1081#
1082CONFIG_DLM=m
1083CONFIG_DLM_TCP=y
1084# CONFIG_DLM_SCTP is not set
1085# CONFIG_DLM_DEBUG is not set
1086
1087#
1004# Profiling support 1088# Profiling support
1005# 1089#
1006# CONFIG_PROFILING is not set 1090# CONFIG_PROFILING is not set
@@ -1010,11 +1094,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1010# 1094#
1011CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1095CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1012# CONFIG_PRINTK_TIME is not set 1096# CONFIG_PRINTK_TIME is not set
1097CONFIG_ENABLE_MUST_CHECK=y
1013# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1014# CONFIG_UNUSED_SYMBOLS is not set 1099# CONFIG_UNUSED_SYMBOLS is not set
1100# CONFIG_DEBUG_FS is not set
1101# CONFIG_HEADERS_CHECK is not set
1015# CONFIG_DEBUG_KERNEL is not set 1102# CONFIG_DEBUG_KERNEL is not set
1016CONFIG_LOG_BUF_SHIFT=14 1103CONFIG_LOG_BUF_SHIFT=14
1017# CONFIG_DEBUG_FS is not set
1018CONFIG_CROSSCOMPILE=y 1104CONFIG_CROSSCOMPILE=y
1019CONFIG_CMDLINE="" 1105CONFIG_CMDLINE=""
1020 1106
@@ -1029,18 +1115,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1029# Cryptographic options 1115# Cryptographic options
1030# 1116#
1031CONFIG_CRYPTO=y 1117CONFIG_CRYPTO=y
1118CONFIG_CRYPTO_ALGAPI=y
1119CONFIG_CRYPTO_BLKCIPHER=m
1120CONFIG_CRYPTO_HASH=y
1121CONFIG_CRYPTO_MANAGER=y
1032CONFIG_CRYPTO_HMAC=y 1122CONFIG_CRYPTO_HMAC=y
1123CONFIG_CRYPTO_XCBC=m
1033CONFIG_CRYPTO_NULL=m 1124CONFIG_CRYPTO_NULL=m
1034CONFIG_CRYPTO_MD4=m 1125CONFIG_CRYPTO_MD4=m
1035CONFIG_CRYPTO_MD5=m 1126CONFIG_CRYPTO_MD5=y
1036CONFIG_CRYPTO_SHA1=m 1127CONFIG_CRYPTO_SHA1=m
1037CONFIG_CRYPTO_SHA256=m 1128CONFIG_CRYPTO_SHA256=m
1038CONFIG_CRYPTO_SHA512=m 1129CONFIG_CRYPTO_SHA512=m
1039CONFIG_CRYPTO_WP512=m 1130CONFIG_CRYPTO_WP512=m
1040CONFIG_CRYPTO_TGR192=m 1131CONFIG_CRYPTO_TGR192=m
1132CONFIG_CRYPTO_GF128MUL=m
1133CONFIG_CRYPTO_ECB=m
1134CONFIG_CRYPTO_CBC=m
1135CONFIG_CRYPTO_PCBC=m
1136CONFIG_CRYPTO_LRW=m
1041CONFIG_CRYPTO_DES=m 1137CONFIG_CRYPTO_DES=m
1138CONFIG_CRYPTO_FCRYPT=m
1042CONFIG_CRYPTO_BLOWFISH=m 1139CONFIG_CRYPTO_BLOWFISH=m
1043CONFIG_CRYPTO_TWOFISH=m 1140CONFIG_CRYPTO_TWOFISH=m
1141CONFIG_CRYPTO_TWOFISH_COMMON=m
1044CONFIG_CRYPTO_SERPENT=m 1142CONFIG_CRYPTO_SERPENT=m
1045CONFIG_CRYPTO_AES=m 1143CONFIG_CRYPTO_AES=m
1046CONFIG_CRYPTO_CAST5=m 1144CONFIG_CRYPTO_CAST5=m
@@ -1052,6 +1150,7 @@ CONFIG_CRYPTO_ANUBIS=m
1052CONFIG_CRYPTO_DEFLATE=m 1150CONFIG_CRYPTO_DEFLATE=m
1053CONFIG_CRYPTO_MICHAEL_MIC=m 1151CONFIG_CRYPTO_MICHAEL_MIC=m
1054CONFIG_CRYPTO_CRC32C=m 1152CONFIG_CRYPTO_CRC32C=m
1153CONFIG_CRYPTO_CAMELLIA=m
1055# CONFIG_CRYPTO_TEST is not set 1154# CONFIG_CRYPTO_TEST is not set
1056 1155
1057# 1156#
@@ -1061,6 +1160,7 @@ CONFIG_CRYPTO_CRC32C=m
1061# 1160#
1062# Library routines 1161# Library routines
1063# 1162#
1163CONFIG_BITREVERSE=y
1064CONFIG_CRC_CCITT=m 1164CONFIG_CRC_CCITT=m
1065CONFIG_CRC16=m 1165CONFIG_CRC16=m
1066CONFIG_CRC32=y 1166CONFIG_CRC32=y
@@ -1072,3 +1172,5 @@ CONFIG_TEXTSEARCH_KMP=m
1072CONFIG_TEXTSEARCH_BM=m 1172CONFIG_TEXTSEARCH_BM=m
1073CONFIG_TEXTSEARCH_FSM=m 1173CONFIG_TEXTSEARCH_FSM=m
1074CONFIG_PLIST=y 1174CONFIG_PLIST=y
1175CONFIG_HAS_IOMEM=y
1176CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index c41823b81be0..9e86dcd3c31e 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:43 2006 4# Sun Feb 18 21:27:40 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1200=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_DB1200=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +64,19 @@ CONFIG_MIPS_DB1200=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_COHERENT=y 75CONFIG_DMA_COHERENT=y
72CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 76CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1200=y 81CONFIG_SOC_AU1200=y
77CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -116,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -135,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -147,6 +153,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,16 +172,21 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 173CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
172CONFIG_IKCONFIG=y 182CONFIG_IKCONFIG=y
173CONFIG_IKCONFIG_PROC=y 183CONFIG_IKCONFIG_PROC=y
184CONFIG_SYSFS_DEPRECATED=y
174# CONFIG_RELAY is not set 185# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -182,12 +194,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 194CONFIG_BUG=y
183CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 197CONFIG_FUTEX=y
187CONFIG_EPOLL=y 198CONFIG_EPOLL=y
188CONFIG_SHMEM=y 199CONFIG_SHMEM=y
189CONFIG_SLAB=y 200CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -205,6 +217,7 @@ CONFIG_KMOD=y
205# 217#
206# Block layer 218# Block layer
207# 219#
220CONFIG_BLOCK=y
208# CONFIG_LBD is not set 221# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -251,6 +264,10 @@ CONFIG_PCMCIA_AU1X00=m
251CONFIG_BINFMT_ELF=y 264CONFIG_BINFMT_ELF=y
252# CONFIG_BINFMT_MISC is not set 265# CONFIG_BINFMT_MISC is not set
253CONFIG_TRAD_SIGNALS=y 266CONFIG_TRAD_SIGNALS=y
267
268#
269# Power management options
270#
254# CONFIG_PM is not set 271# CONFIG_PM is not set
255 272
256# 273#
@@ -267,7 +284,10 @@ CONFIG_PACKET=y
267CONFIG_UNIX=y 284CONFIG_UNIX=y
268CONFIG_XFRM=y 285CONFIG_XFRM=y
269CONFIG_XFRM_USER=m 286CONFIG_XFRM_USER=m
287# CONFIG_XFRM_SUB_POLICY is not set
288CONFIG_XFRM_MIGRATE=y
270CONFIG_NET_KEY=y 289CONFIG_NET_KEY=y
290CONFIG_NET_KEY_MIGRATE=y
271CONFIG_INET=y 291CONFIG_INET=y
272CONFIG_IP_MULTICAST=y 292CONFIG_IP_MULTICAST=y
273# CONFIG_IP_ADVANCED_ROUTER is not set 293# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -285,10 +305,13 @@ CONFIG_IP_FIB_HASH=y
285# CONFIG_INET_TUNNEL is not set 305# CONFIG_INET_TUNNEL is not set
286CONFIG_INET_XFRM_MODE_TRANSPORT=m 306CONFIG_INET_XFRM_MODE_TRANSPORT=m
287CONFIG_INET_XFRM_MODE_TUNNEL=m 307CONFIG_INET_XFRM_MODE_TUNNEL=m
308CONFIG_INET_XFRM_MODE_BEET=m
288CONFIG_INET_DIAG=y 309CONFIG_INET_DIAG=y
289CONFIG_INET_TCP_DIAG=y 310CONFIG_INET_TCP_DIAG=y
290# CONFIG_TCP_CONG_ADVANCED is not set 311# CONFIG_TCP_CONG_ADVANCED is not set
291CONFIG_TCP_CONG_BIC=y 312CONFIG_TCP_CONG_CUBIC=y
313CONFIG_DEFAULT_TCP_CONG="cubic"
314CONFIG_TCP_MD5SIG=y
292 315
293# 316#
294# IP: Virtual Server Configuration 317# IP: Virtual Server Configuration
@@ -305,15 +328,41 @@ CONFIG_NETFILTER=y
305# Core Netfilter Configuration 328# Core Netfilter Configuration
306# 329#
307# CONFIG_NETFILTER_NETLINK is not set 330# CONFIG_NETFILTER_NETLINK is not set
308# CONFIG_NF_CONNTRACK is not set 331CONFIG_NF_CONNTRACK_ENABLED=m
332CONFIG_NF_CONNTRACK_SUPPORT=y
333# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
334CONFIG_NF_CONNTRACK=m
335CONFIG_NF_CT_ACCT=y
336CONFIG_NF_CONNTRACK_MARK=y
337CONFIG_NF_CONNTRACK_SECMARK=y
338CONFIG_NF_CONNTRACK_EVENTS=y
339CONFIG_NF_CT_PROTO_GRE=m
340CONFIG_NF_CT_PROTO_SCTP=m
341CONFIG_NF_CONNTRACK_AMANDA=m
342CONFIG_NF_CONNTRACK_FTP=m
343CONFIG_NF_CONNTRACK_H323=m
344CONFIG_NF_CONNTRACK_IRC=m
345# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
346CONFIG_NF_CONNTRACK_PPTP=m
347CONFIG_NF_CONNTRACK_SANE=m
348CONFIG_NF_CONNTRACK_SIP=m
349CONFIG_NF_CONNTRACK_TFTP=m
309CONFIG_NETFILTER_XTABLES=m 350CONFIG_NETFILTER_XTABLES=m
310CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 351CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
311CONFIG_NETFILTER_XT_TARGET_MARK=m 352CONFIG_NETFILTER_XT_TARGET_MARK=m
312CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
354CONFIG_NETFILTER_XT_TARGET_NFLOG=m
313CONFIG_NETFILTER_XT_TARGET_SECMARK=m 355CONFIG_NETFILTER_XT_TARGET_SECMARK=m
356CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
357CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
314CONFIG_NETFILTER_XT_MATCH_COMMENT=m 358CONFIG_NETFILTER_XT_MATCH_COMMENT=m
359CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
360CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
361CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
315CONFIG_NETFILTER_XT_MATCH_DCCP=m 362CONFIG_NETFILTER_XT_MATCH_DCCP=m
363CONFIG_NETFILTER_XT_MATCH_DSCP=m
316CONFIG_NETFILTER_XT_MATCH_ESP=m 364CONFIG_NETFILTER_XT_MATCH_ESP=m
365CONFIG_NETFILTER_XT_MATCH_HELPER=m
317CONFIG_NETFILTER_XT_MATCH_LENGTH=m 366CONFIG_NETFILTER_XT_MATCH_LENGTH=m
318CONFIG_NETFILTER_XT_MATCH_LIMIT=m 367CONFIG_NETFILTER_XT_MATCH_LIMIT=m
319CONFIG_NETFILTER_XT_MATCH_MAC=m 368CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -324,14 +373,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
324CONFIG_NETFILTER_XT_MATCH_QUOTA=m 373CONFIG_NETFILTER_XT_MATCH_QUOTA=m
325CONFIG_NETFILTER_XT_MATCH_REALM=m 374CONFIG_NETFILTER_XT_MATCH_REALM=m
326CONFIG_NETFILTER_XT_MATCH_SCTP=m 375CONFIG_NETFILTER_XT_MATCH_SCTP=m
376CONFIG_NETFILTER_XT_MATCH_STATE=m
327CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 377CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
328CONFIG_NETFILTER_XT_MATCH_STRING=m 378CONFIG_NETFILTER_XT_MATCH_STRING=m
329CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 379CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
380CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
330 381
331# 382#
332# IP: Netfilter Configuration 383# IP: Netfilter Configuration
333# 384#
334# CONFIG_IP_NF_CONNTRACK is not set 385CONFIG_NF_CONNTRACK_IPV4=m
386CONFIG_NF_CONNTRACK_PROC_COMPAT=y
335# CONFIG_IP_NF_QUEUE is not set 387# CONFIG_IP_NF_QUEUE is not set
336# CONFIG_IP_NF_IPTABLES is not set 388# CONFIG_IP_NF_IPTABLES is not set
337# CONFIG_IP_NF_ARPTABLES is not set 389# CONFIG_IP_NF_ARPTABLES is not set
@@ -359,7 +411,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
359# CONFIG_ATALK is not set 411# CONFIG_ATALK is not set
360# CONFIG_X25 is not set 412# CONFIG_X25 is not set
361# CONFIG_LAPB is not set 413# CONFIG_LAPB is not set
362# CONFIG_NET_DIVERT is not set
363# CONFIG_ECONET is not set 414# CONFIG_ECONET is not set
364# CONFIG_WAN_ROUTER is not set 415# CONFIG_WAN_ROUTER is not set
365 416
@@ -409,11 +460,13 @@ CONFIG_MTD_PARTITIONS=y
409# User Modules And Translation Layers 460# User Modules And Translation Layers
410# 461#
411CONFIG_MTD_CHAR=y 462CONFIG_MTD_CHAR=y
463CONFIG_MTD_BLKDEVS=y
412CONFIG_MTD_BLOCK=y 464CONFIG_MTD_BLOCK=y
413# CONFIG_FTL is not set 465# CONFIG_FTL is not set
414# CONFIG_NFTL is not set 466# CONFIG_NFTL is not set
415# CONFIG_INFTL is not set 467# CONFIG_INFTL is not set
416# CONFIG_RFD_FTL is not set 468# CONFIG_RFD_FTL is not set
469# CONFIG_SSFDC is not set
417 470
418# 471#
419# RAM/ROM/Flash chip drivers 472# RAM/ROM/Flash chip drivers
@@ -499,14 +552,20 @@ CONFIG_BLK_DEV_LOOP=y
499CONFIG_BLK_DEV_RAM=y 552CONFIG_BLK_DEV_RAM=y
500CONFIG_BLK_DEV_RAM_COUNT=16 553CONFIG_BLK_DEV_RAM_COUNT=16
501CONFIG_BLK_DEV_RAM_SIZE=4096 554CONFIG_BLK_DEV_RAM_SIZE=4096
555CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
502# CONFIG_BLK_DEV_INITRD is not set 556# CONFIG_BLK_DEV_INITRD is not set
503# CONFIG_CDROM_PKTCDVD is not set 557# CONFIG_CDROM_PKTCDVD is not set
504# CONFIG_ATA_OVER_ETH is not set 558# CONFIG_ATA_OVER_ETH is not set
505 559
506# 560#
561# Misc devices
562#
563
564#
507# ATA/ATAPI/MFM/RLL support 565# ATA/ATAPI/MFM/RLL support
508# 566#
509CONFIG_IDE=y 567CONFIG_IDE=y
568CONFIG_IDE_MAX_HWIFS=4
510CONFIG_BLK_DEV_IDE=y 569CONFIG_BLK_DEV_IDE=y
511 570
512# 571#
@@ -540,6 +599,8 @@ CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128
540# 599#
541# CONFIG_RAID_ATTRS is not set 600# CONFIG_RAID_ATTRS is not set
542CONFIG_SCSI=y 601CONFIG_SCSI=y
602CONFIG_SCSI_TGT=m
603# CONFIG_SCSI_NETLINK is not set
543CONFIG_SCSI_PROC_FS=y 604CONFIG_SCSI_PROC_FS=y
544 605
545# 606#
@@ -559,20 +620,21 @@ CONFIG_CHR_DEV_SG=y
559CONFIG_SCSI_MULTI_LUN=y 620CONFIG_SCSI_MULTI_LUN=y
560# CONFIG_SCSI_CONSTANTS is not set 621# CONFIG_SCSI_CONSTANTS is not set
561# CONFIG_SCSI_LOGGING is not set 622# CONFIG_SCSI_LOGGING is not set
623CONFIG_SCSI_SCAN_ASYNC=y
562 624
563# 625#
564# SCSI Transport Attributes 626# SCSI Transports
565# 627#
566# CONFIG_SCSI_SPI_ATTRS is not set 628# CONFIG_SCSI_SPI_ATTRS is not set
567# CONFIG_SCSI_FC_ATTRS is not set 629# CONFIG_SCSI_FC_ATTRS is not set
568# CONFIG_SCSI_ISCSI_ATTRS is not set 630# CONFIG_SCSI_ISCSI_ATTRS is not set
569# CONFIG_SCSI_SAS_ATTRS is not set 631# CONFIG_SCSI_SAS_ATTRS is not set
632# CONFIG_SCSI_SAS_LIBSAS is not set
570 633
571# 634#
572# SCSI low-level drivers 635# SCSI low-level drivers
573# 636#
574# CONFIG_ISCSI_TCP is not set 637# CONFIG_ISCSI_TCP is not set
575# CONFIG_SCSI_SATA is not set
576# CONFIG_SCSI_DEBUG is not set 638# CONFIG_SCSI_DEBUG is not set
577 639
578# 640#
@@ -585,6 +647,11 @@ CONFIG_SCSI_MULTI_LUN=y
585# CONFIG_PCMCIA_SYM53C500 is not set 647# CONFIG_PCMCIA_SYM53C500 is not set
586 648
587# 649#
650# Serial ATA (prod) and Parallel ATA (experimental) drivers
651#
652# CONFIG_ATA is not set
653
654#
588# Multi-device support (RAID and LVM) 655# Multi-device support (RAID and LVM)
589# 656#
590# CONFIG_MD is not set 657# CONFIG_MD is not set
@@ -672,6 +739,7 @@ CONFIG_MII=m
672# Input device support 739# Input device support
673# 740#
674CONFIG_INPUT=y 741CONFIG_INPUT=y
742# CONFIG_INPUT_FF_MEMLESS is not set
675 743
676# 744#
677# Userland interfaces 745# Userland interfaces
@@ -751,10 +819,6 @@ CONFIG_LEGACY_PTY_COUNT=256
751# CONFIG_R3964 is not set 819# CONFIG_R3964 is not set
752 820
753# 821#
754# Ftape, the floppy tape device driver
755#
756
757#
758# PCMCIA character devices 822# PCMCIA character devices
759# 823#
760# CONFIG_SYNCLINK_CS is not set 824# CONFIG_SYNCLINK_CS is not set
@@ -766,7 +830,6 @@ CONFIG_LEGACY_PTY_COUNT=256
766# TPM devices 830# TPM devices
767# 831#
768# CONFIG_TCG_TPM is not set 832# CONFIG_TCG_TPM is not set
769# CONFIG_TELCLOCK is not set
770 833
771# 834#
772# I2C support 835# I2C support
@@ -782,6 +845,7 @@ CONFIG_LEGACY_PTY_COUNT=256
782# 845#
783# Dallas's 1-wire bus 846# Dallas's 1-wire bus
784# 847#
848# CONFIG_W1 is not set
785 849
786# 850#
787# Hardware Monitoring support 851# Hardware Monitoring support
@@ -790,14 +854,9 @@ CONFIG_LEGACY_PTY_COUNT=256
790# CONFIG_HWMON_VID is not set 854# CONFIG_HWMON_VID is not set
791 855
792# 856#
793# Misc devices
794#
795
796#
797# Multimedia devices 857# Multimedia devices
798# 858#
799# CONFIG_VIDEO_DEV is not set 859# CONFIG_VIDEO_DEV is not set
800CONFIG_VIDEO_V4L2=y
801 860
802# 861#
803# Digital Video Broadcasting Devices 862# Digital Video Broadcasting Devices
@@ -812,6 +871,7 @@ CONFIG_FB=y
812CONFIG_FB_CFB_FILLRECT=y 871CONFIG_FB_CFB_FILLRECT=y
813CONFIG_FB_CFB_COPYAREA=y 872CONFIG_FB_CFB_COPYAREA=y
814CONFIG_FB_CFB_IMAGEBLIT=y 873CONFIG_FB_CFB_IMAGEBLIT=y
874# CONFIG_FB_SVGALIB is not set
815# CONFIG_FB_MACMODES is not set 875# CONFIG_FB_MACMODES is not set
816# CONFIG_FB_BACKLIGHT is not set 876# CONFIG_FB_BACKLIGHT is not set
817# CONFIG_FB_MODE_HELPERS is not set 877# CONFIG_FB_MODE_HELPERS is not set
@@ -843,6 +903,12 @@ CONFIG_LOGO_LINUX_CLUT224=y
843# CONFIG_SOUND is not set 903# CONFIG_SOUND is not set
844 904
845# 905#
906# HID Devices
907#
908CONFIG_HID=y
909# CONFIG_HID_DEBUG is not set
910
911#
846# USB support 912# USB support
847# 913#
848CONFIG_USB_ARCH_HAS_HCD=y 914CONFIG_USB_ARCH_HAS_HCD=y
@@ -916,6 +982,14 @@ CONFIG_MMC_AU1X=y
916# 982#
917 983
918# 984#
985# Auxiliary Display support
986#
987
988#
989# Virtualization
990#
991
992#
919# File systems 993# File systems
920# 994#
921CONFIG_EXT2_FS=y 995CONFIG_EXT2_FS=y
@@ -927,6 +1001,7 @@ CONFIG_EXT3_FS=y
927CONFIG_EXT3_FS_XATTR=y 1001CONFIG_EXT3_FS_XATTR=y
928CONFIG_EXT3_FS_POSIX_ACL=y 1002CONFIG_EXT3_FS_POSIX_ACL=y
929CONFIG_EXT3_FS_SECURITY=y 1003CONFIG_EXT3_FS_SECURITY=y
1004# CONFIG_EXT4DEV_FS is not set
930CONFIG_JBD=y 1005CONFIG_JBD=y
931# CONFIG_JBD_DEBUG is not set 1006# CONFIG_JBD_DEBUG is not set
932CONFIG_FS_MBCACHE=y 1007CONFIG_FS_MBCACHE=y
@@ -938,6 +1013,7 @@ CONFIG_JFS_FS=y
938# CONFIG_JFS_STATISTICS is not set 1013# CONFIG_JFS_STATISTICS is not set
939CONFIG_FS_POSIX_ACL=y 1014CONFIG_FS_POSIX_ACL=y
940# CONFIG_XFS_FS is not set 1015# CONFIG_XFS_FS is not set
1016# CONFIG_GFS2_FS is not set
941# CONFIG_OCFS2_FS is not set 1017# CONFIG_OCFS2_FS is not set
942# CONFIG_MINIX_FS is not set 1018# CONFIG_MINIX_FS is not set
943# CONFIG_ROMFS_FS is not set 1019# CONFIG_ROMFS_FS is not set
@@ -948,6 +1024,7 @@ CONFIG_DNOTIFY=y
948# CONFIG_AUTOFS_FS is not set 1024# CONFIG_AUTOFS_FS is not set
949# CONFIG_AUTOFS4_FS is not set 1025# CONFIG_AUTOFS4_FS is not set
950# CONFIG_FUSE_FS is not set 1026# CONFIG_FUSE_FS is not set
1027CONFIG_GENERIC_ACL=y
951 1028
952# 1029#
953# CD-ROM/DVD Filesystems 1030# CD-ROM/DVD Filesystems
@@ -955,7 +1032,6 @@ CONFIG_DNOTIFY=y
955CONFIG_ISO9660_FS=m 1032CONFIG_ISO9660_FS=m
956CONFIG_JOLIET=y 1033CONFIG_JOLIET=y
957CONFIG_ZISOFS=y 1034CONFIG_ZISOFS=y
958CONFIG_ZISOFS_FS=m
959CONFIG_UDF_FS=m 1035CONFIG_UDF_FS=m
960CONFIG_UDF_NLS=y 1036CONFIG_UDF_NLS=y
961 1037
@@ -974,23 +1050,25 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
974# 1050#
975CONFIG_PROC_FS=y 1051CONFIG_PROC_FS=y
976CONFIG_PROC_KCORE=y 1052CONFIG_PROC_KCORE=y
1053CONFIG_PROC_SYSCTL=y
977CONFIG_SYSFS=y 1054CONFIG_SYSFS=y
978CONFIG_TMPFS=y 1055CONFIG_TMPFS=y
1056CONFIG_TMPFS_POSIX_ACL=y
979# CONFIG_HUGETLB_PAGE is not set 1057# CONFIG_HUGETLB_PAGE is not set
980CONFIG_RAMFS=y 1058CONFIG_RAMFS=y
981# CONFIG_CONFIGFS_FS is not set 1059CONFIG_CONFIGFS_FS=m
982 1060
983# 1061#
984# Miscellaneous filesystems 1062# Miscellaneous filesystems
985# 1063#
986# CONFIG_ADFS_FS is not set 1064# CONFIG_ADFS_FS is not set
987# CONFIG_AFFS_FS is not set 1065# CONFIG_AFFS_FS is not set
1066# CONFIG_ECRYPT_FS is not set
988# CONFIG_HFS_FS is not set 1067# CONFIG_HFS_FS is not set
989# CONFIG_HFSPLUS_FS is not set 1068# CONFIG_HFSPLUS_FS is not set
990# CONFIG_BEFS_FS is not set 1069# CONFIG_BEFS_FS is not set
991# CONFIG_BFS_FS is not set 1070# CONFIG_BFS_FS is not set
992# CONFIG_EFS_FS is not set 1071# CONFIG_EFS_FS is not set
993# CONFIG_JFFS_FS is not set
994CONFIG_JFFS2_FS=y 1072CONFIG_JFFS2_FS=y
995CONFIG_JFFS2_FS_DEBUG=0 1073CONFIG_JFFS2_FS_DEBUG=0
996CONFIG_JFFS2_FS_WRITEBUFFER=y 1074CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1025,7 +1103,6 @@ CONFIG_SUNRPC=y
1025CONFIG_SMB_FS=y 1103CONFIG_SMB_FS=y
1026# CONFIG_SMB_NLS_DEFAULT is not set 1104# CONFIG_SMB_NLS_DEFAULT is not set
1027# CONFIG_CIFS is not set 1105# CONFIG_CIFS is not set
1028# CONFIG_CIFS_DEBUG2 is not set
1029# CONFIG_NCP_FS is not set 1106# CONFIG_NCP_FS is not set
1030# CONFIG_CODA_FS is not set 1107# CONFIG_CODA_FS is not set
1031# CONFIG_AFS_FS is not set 1108# CONFIG_AFS_FS is not set
@@ -1082,6 +1159,14 @@ CONFIG_NLS_KOI8_U=m
1082CONFIG_NLS_UTF8=m 1159CONFIG_NLS_UTF8=m
1083 1160
1084# 1161#
1162# Distributed Lock Manager
1163#
1164CONFIG_DLM=m
1165CONFIG_DLM_TCP=y
1166# CONFIG_DLM_SCTP is not set
1167# CONFIG_DLM_DEBUG is not set
1168
1169#
1085# Profiling support 1170# Profiling support
1086# 1171#
1087# CONFIG_PROFILING is not set 1172# CONFIG_PROFILING is not set
@@ -1091,11 +1176,13 @@ CONFIG_NLS_UTF8=m
1091# 1176#
1092CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1177CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1093# CONFIG_PRINTK_TIME is not set 1178# CONFIG_PRINTK_TIME is not set
1179CONFIG_ENABLE_MUST_CHECK=y
1094# CONFIG_MAGIC_SYSRQ is not set 1180# CONFIG_MAGIC_SYSRQ is not set
1095# CONFIG_UNUSED_SYMBOLS is not set 1181# CONFIG_UNUSED_SYMBOLS is not set
1182# CONFIG_DEBUG_FS is not set
1183# CONFIG_HEADERS_CHECK is not set
1096# CONFIG_DEBUG_KERNEL is not set 1184# CONFIG_DEBUG_KERNEL is not set
1097CONFIG_LOG_BUF_SHIFT=14 1185CONFIG_LOG_BUF_SHIFT=14
1098# CONFIG_DEBUG_FS is not set
1099CONFIG_CROSSCOMPILE=y 1186CONFIG_CROSSCOMPILE=y
1100CONFIG_CMDLINE="mem=48M" 1187CONFIG_CMDLINE="mem=48M"
1101 1188
@@ -1109,7 +1196,44 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1109# 1196#
1110# Cryptographic options 1197# Cryptographic options
1111# 1198#
1112# CONFIG_CRYPTO is not set 1199CONFIG_CRYPTO=y
1200CONFIG_CRYPTO_ALGAPI=y
1201CONFIG_CRYPTO_BLKCIPHER=m
1202CONFIG_CRYPTO_HASH=m
1203CONFIG_CRYPTO_MANAGER=m
1204CONFIG_CRYPTO_HMAC=m
1205CONFIG_CRYPTO_XCBC=m
1206CONFIG_CRYPTO_NULL=m
1207CONFIG_CRYPTO_MD4=m
1208CONFIG_CRYPTO_MD5=y
1209CONFIG_CRYPTO_SHA1=m
1210CONFIG_CRYPTO_SHA256=m
1211CONFIG_CRYPTO_SHA512=m
1212CONFIG_CRYPTO_WP512=m
1213CONFIG_CRYPTO_TGR192=m
1214CONFIG_CRYPTO_GF128MUL=m
1215CONFIG_CRYPTO_ECB=m
1216CONFIG_CRYPTO_CBC=m
1217CONFIG_CRYPTO_PCBC=m
1218CONFIG_CRYPTO_LRW=m
1219CONFIG_CRYPTO_DES=m
1220CONFIG_CRYPTO_FCRYPT=m
1221CONFIG_CRYPTO_BLOWFISH=m
1222CONFIG_CRYPTO_TWOFISH=m
1223CONFIG_CRYPTO_TWOFISH_COMMON=m
1224CONFIG_CRYPTO_SERPENT=m
1225CONFIG_CRYPTO_AES=m
1226CONFIG_CRYPTO_CAST5=m
1227CONFIG_CRYPTO_CAST6=m
1228CONFIG_CRYPTO_TEA=m
1229CONFIG_CRYPTO_ARC4=m
1230CONFIG_CRYPTO_KHAZAD=m
1231CONFIG_CRYPTO_ANUBIS=m
1232CONFIG_CRYPTO_DEFLATE=m
1233CONFIG_CRYPTO_MICHAEL_MIC=m
1234CONFIG_CRYPTO_CRC32C=m
1235CONFIG_CRYPTO_CAMELLIA=m
1236# CONFIG_CRYPTO_TEST is not set
1113 1237
1114# 1238#
1115# Hardware crypto devices 1239# Hardware crypto devices
@@ -1118,6 +1242,7 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1118# 1242#
1119# Library routines 1243# Library routines
1120# 1244#
1245CONFIG_BITREVERSE=y
1121CONFIG_CRC_CCITT=y 1246CONFIG_CRC_CCITT=y
1122# CONFIG_CRC16 is not set 1247# CONFIG_CRC16 is not set
1123CONFIG_CRC32=y 1248CONFIG_CRC32=y
@@ -1129,3 +1254,5 @@ CONFIG_TEXTSEARCH_KMP=m
1129CONFIG_TEXTSEARCH_BM=m 1254CONFIG_TEXTSEARCH_BM=m
1130CONFIG_TEXTSEARCH_FSM=m 1255CONFIG_TEXTSEARCH_FSM=m
1131CONFIG_PLIST=y 1256CONFIG_PLIST=y
1257CONFIG_HAS_IOMEM=y
1258CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 7d6d92187880..9c944611edaa 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:56 2006 4# Sun Feb 18 21:27:41 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1500=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_DB1500=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +64,20 @@ CONFIG_MIPS_DB1500=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 77CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 78# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 79CONFIG_CPU_LITTLE_ENDIAN=y
80CONFIG_SYS_SUPPORTS_APM_EMULATION=y
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 81CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
77CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 82CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
78CONFIG_SOC_AU1500=y 83CONFIG_SOC_AU1500=y
@@ -118,8 +123,8 @@ CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_64KB is not set 123# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_CPU_HAS_PREFETCH=y 124CONFIG_CPU_HAS_PREFETCH=y
120CONFIG_MIPS_MT_DISABLED=y 125CONFIG_MIPS_MT_DISABLED=y
121# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_MT_SMP is not set 126# CONFIG_MIPS_MT_SMP is not set
127# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_VPE_LOADER is not set 128# CONFIG_MIPS_VPE_LOADER is not set
124CONFIG_64BIT_PHYS_ADDR=y 129CONFIG_64BIT_PHYS_ADDR=y
125CONFIG_CPU_HAS_LLSC=y 130CONFIG_CPU_HAS_LLSC=y
@@ -136,7 +141,8 @@ CONFIG_FLATMEM=y
136CONFIG_FLAT_NODE_MEM_MAP=y 141CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
139# CONFIG_RESOURCES_64BIT is not set 144CONFIG_RESOURCES_64BIT=y
145CONFIG_ZONE_DMA_FLAG=1
140# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -149,6 +155,7 @@ CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 155CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 156# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -167,15 +174,20 @@ CONFIG_LOCALVERSION=""
167CONFIG_LOCALVERSION_AUTO=y 174CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 175CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
172CONFIG_SYSCTL=y 181# CONFIG_TASKSTATS is not set
182# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 184# CONFIG_IKCONFIG is not set
185CONFIG_SYSFS_DEPRECATED=y
175CONFIG_RELAY=y 186CONFIG_RELAY=y
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
181CONFIG_HOTPLUG=y 193CONFIG_HOTPLUG=y
@@ -183,12 +195,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 195CONFIG_BUG=y
184CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 198CONFIG_FUTEX=y
188CONFIG_EPOLL=y 199CONFIG_EPOLL=y
189CONFIG_SHMEM=y 200CONFIG_SHMEM=y
190CONFIG_SLAB=y 201CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -206,6 +218,7 @@ CONFIG_KMOD=y
206# 218#
207# Block layer 219# Block layer
208# 220#
221CONFIG_BLOCK=y
209# CONFIG_LBD is not set 222# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 223# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 224# CONFIG_LSF is not set
@@ -259,6 +272,10 @@ CONFIG_PCMCIA_AU1X00=m
259CONFIG_BINFMT_ELF=y 272CONFIG_BINFMT_ELF=y
260# CONFIG_BINFMT_MISC is not set 273# CONFIG_BINFMT_MISC is not set
261CONFIG_TRAD_SIGNALS=y 274CONFIG_TRAD_SIGNALS=y
275
276#
277# Power management options
278#
262# CONFIG_PM is not set 279# CONFIG_PM is not set
263 280
264# 281#
@@ -275,7 +292,10 @@ CONFIG_PACKET=y
275CONFIG_UNIX=y 292CONFIG_UNIX=y
276CONFIG_XFRM=y 293CONFIG_XFRM=y
277CONFIG_XFRM_USER=m 294CONFIG_XFRM_USER=m
295# CONFIG_XFRM_SUB_POLICY is not set
296CONFIG_XFRM_MIGRATE=y
278CONFIG_NET_KEY=y 297CONFIG_NET_KEY=y
298CONFIG_NET_KEY_MIGRATE=y
279CONFIG_INET=y 299CONFIG_INET=y
280CONFIG_IP_MULTICAST=y 300CONFIG_IP_MULTICAST=y
281# CONFIG_IP_ADVANCED_ROUTER is not set 301# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -296,10 +316,13 @@ CONFIG_IP_PNP_BOOTP=y
296# CONFIG_INET_TUNNEL is not set 316# CONFIG_INET_TUNNEL is not set
297CONFIG_INET_XFRM_MODE_TRANSPORT=m 317CONFIG_INET_XFRM_MODE_TRANSPORT=m
298CONFIG_INET_XFRM_MODE_TUNNEL=m 318CONFIG_INET_XFRM_MODE_TUNNEL=m
319CONFIG_INET_XFRM_MODE_BEET=m
299CONFIG_INET_DIAG=y 320CONFIG_INET_DIAG=y
300CONFIG_INET_TCP_DIAG=y 321CONFIG_INET_TCP_DIAG=y
301# CONFIG_TCP_CONG_ADVANCED is not set 322# CONFIG_TCP_CONG_ADVANCED is not set
302CONFIG_TCP_CONG_BIC=y 323CONFIG_TCP_CONG_CUBIC=y
324CONFIG_DEFAULT_TCP_CONG="cubic"
325CONFIG_TCP_MD5SIG=y
303 326
304# 327#
305# IP: Virtual Server Configuration 328# IP: Virtual Server Configuration
@@ -318,15 +341,42 @@ CONFIG_NETFILTER=y
318CONFIG_NETFILTER_NETLINK=m 341CONFIG_NETFILTER_NETLINK=m
319CONFIG_NETFILTER_NETLINK_QUEUE=m 342CONFIG_NETFILTER_NETLINK_QUEUE=m
320CONFIG_NETFILTER_NETLINK_LOG=m 343CONFIG_NETFILTER_NETLINK_LOG=m
321# CONFIG_NF_CONNTRACK is not set 344CONFIG_NF_CONNTRACK_ENABLED=m
345CONFIG_NF_CONNTRACK_SUPPORT=y
346# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
347CONFIG_NF_CONNTRACK=m
348CONFIG_NF_CT_ACCT=y
349CONFIG_NF_CONNTRACK_MARK=y
350CONFIG_NF_CONNTRACK_SECMARK=y
351CONFIG_NF_CONNTRACK_EVENTS=y
352CONFIG_NF_CT_PROTO_GRE=m
353CONFIG_NF_CT_PROTO_SCTP=m
354CONFIG_NF_CONNTRACK_AMANDA=m
355CONFIG_NF_CONNTRACK_FTP=m
356CONFIG_NF_CONNTRACK_H323=m
357CONFIG_NF_CONNTRACK_IRC=m
358# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
359CONFIG_NF_CONNTRACK_PPTP=m
360CONFIG_NF_CONNTRACK_SANE=m
361CONFIG_NF_CONNTRACK_SIP=m
362CONFIG_NF_CONNTRACK_TFTP=m
363CONFIG_NF_CT_NETLINK=m
322CONFIG_NETFILTER_XTABLES=m 364CONFIG_NETFILTER_XTABLES=m
323CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 365CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
324CONFIG_NETFILTER_XT_TARGET_MARK=m 366CONFIG_NETFILTER_XT_TARGET_MARK=m
325CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 367CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
368CONFIG_NETFILTER_XT_TARGET_NFLOG=m
326CONFIG_NETFILTER_XT_TARGET_SECMARK=m 369CONFIG_NETFILTER_XT_TARGET_SECMARK=m
370CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
371CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
327CONFIG_NETFILTER_XT_MATCH_COMMENT=m 372CONFIG_NETFILTER_XT_MATCH_COMMENT=m
373CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
374CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
375CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
328CONFIG_NETFILTER_XT_MATCH_DCCP=m 376CONFIG_NETFILTER_XT_MATCH_DCCP=m
377CONFIG_NETFILTER_XT_MATCH_DSCP=m
329CONFIG_NETFILTER_XT_MATCH_ESP=m 378CONFIG_NETFILTER_XT_MATCH_ESP=m
379CONFIG_NETFILTER_XT_MATCH_HELPER=m
330CONFIG_NETFILTER_XT_MATCH_LENGTH=m 380CONFIG_NETFILTER_XT_MATCH_LENGTH=m
331CONFIG_NETFILTER_XT_MATCH_LIMIT=m 381CONFIG_NETFILTER_XT_MATCH_LIMIT=m
332CONFIG_NETFILTER_XT_MATCH_MAC=m 382CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -337,14 +387,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
337CONFIG_NETFILTER_XT_MATCH_QUOTA=m 387CONFIG_NETFILTER_XT_MATCH_QUOTA=m
338CONFIG_NETFILTER_XT_MATCH_REALM=m 388CONFIG_NETFILTER_XT_MATCH_REALM=m
339CONFIG_NETFILTER_XT_MATCH_SCTP=m 389CONFIG_NETFILTER_XT_MATCH_SCTP=m
390CONFIG_NETFILTER_XT_MATCH_STATE=m
340CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 391CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
341CONFIG_NETFILTER_XT_MATCH_STRING=m 392CONFIG_NETFILTER_XT_MATCH_STRING=m
342CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 393CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
394CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
343 395
344# 396#
345# IP: Netfilter Configuration 397# IP: Netfilter Configuration
346# 398#
347# CONFIG_IP_NF_CONNTRACK is not set 399CONFIG_NF_CONNTRACK_IPV4=m
400CONFIG_NF_CONNTRACK_PROC_COMPAT=y
348# CONFIG_IP_NF_QUEUE is not set 401# CONFIG_IP_NF_QUEUE is not set
349# CONFIG_IP_NF_IPTABLES is not set 402# CONFIG_IP_NF_IPTABLES is not set
350# CONFIG_IP_NF_ARPTABLES is not set 403# CONFIG_IP_NF_ARPTABLES is not set
@@ -372,7 +425,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
372# CONFIG_ATALK is not set 425# CONFIG_ATALK is not set
373# CONFIG_X25 is not set 426# CONFIG_X25 is not set
374# CONFIG_LAPB is not set 427# CONFIG_LAPB is not set
375# CONFIG_NET_DIVERT is not set
376# CONFIG_ECONET is not set 428# CONFIG_ECONET is not set
377# CONFIG_WAN_ROUTER is not set 429# CONFIG_WAN_ROUTER is not set
378 430
@@ -428,11 +480,13 @@ CONFIG_MTD_PARTITIONS=y
428# User Modules And Translation Layers 480# User Modules And Translation Layers
429# 481#
430CONFIG_MTD_CHAR=y 482CONFIG_MTD_CHAR=y
483CONFIG_MTD_BLKDEVS=y
431CONFIG_MTD_BLOCK=y 484CONFIG_MTD_BLOCK=y
432# CONFIG_FTL is not set 485# CONFIG_FTL is not set
433# CONFIG_NFTL is not set 486# CONFIG_NFTL is not set
434# CONFIG_INFTL is not set 487# CONFIG_INFTL is not set
435# CONFIG_RFD_FTL is not set 488# CONFIG_RFD_FTL is not set
489# CONFIG_SSFDC is not set
436 490
437# 491#
438# RAM/ROM/Flash chip drivers 492# RAM/ROM/Flash chip drivers
@@ -488,6 +542,7 @@ CONFIG_MTD_ALCHEMY=y
488# NAND Flash Device Drivers 542# NAND Flash Device Drivers
489# 543#
490# CONFIG_MTD_NAND is not set 544# CONFIG_MTD_NAND is not set
545# CONFIG_MTD_NAND_CAFE is not set
491 546
492# 547#
493# OneNAND Flash Device Drivers 548# OneNAND Flash Device Drivers
@@ -524,9 +579,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
524CONFIG_ATA_OVER_ETH=m 579CONFIG_ATA_OVER_ETH=m
525 580
526# 581#
582# Misc devices
583#
584CONFIG_SGI_IOC4=m
585# CONFIG_TIFM_CORE is not set
586
587#
527# ATA/ATAPI/MFM/RLL support 588# ATA/ATAPI/MFM/RLL support
528# 589#
529CONFIG_IDE=y 590CONFIG_IDE=y
591CONFIG_IDE_MAX_HWIFS=4
530CONFIG_BLK_DEV_IDE=y 592CONFIG_BLK_DEV_IDE=y
531 593
532# 594#
@@ -536,6 +598,7 @@ CONFIG_BLK_DEV_IDE=y
536CONFIG_BLK_DEV_IDEDISK=y 598CONFIG_BLK_DEV_IDEDISK=y
537# CONFIG_IDEDISK_MULTI_MODE is not set 599# CONFIG_IDEDISK_MULTI_MODE is not set
538CONFIG_BLK_DEV_IDECS=m 600CONFIG_BLK_DEV_IDECS=m
601# CONFIG_BLK_DEV_DELKIN is not set
539# CONFIG_BLK_DEV_IDECD is not set 602# CONFIG_BLK_DEV_IDECD is not set
540# CONFIG_BLK_DEV_IDETAPE is not set 603# CONFIG_BLK_DEV_IDETAPE is not set
541# CONFIG_BLK_DEV_IDEFLOPPY is not set 604# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -556,6 +619,12 @@ CONFIG_BLK_DEV_IDECS=m
556# 619#
557CONFIG_RAID_ATTRS=m 620CONFIG_RAID_ATTRS=m
558# CONFIG_SCSI is not set 621# CONFIG_SCSI is not set
622# CONFIG_SCSI_NETLINK is not set
623
624#
625# Serial ATA (prod) and Parallel ATA (experimental) drivers
626#
627# CONFIG_ATA is not set
559 628
560# 629#
561# Multi-device support (RAID and LVM) 630# Multi-device support (RAID and LVM)
@@ -606,6 +675,8 @@ CONFIG_LXT_PHY=m
606CONFIG_CICADA_PHY=m 675CONFIG_CICADA_PHY=m
607CONFIG_VITESSE_PHY=m 676CONFIG_VITESSE_PHY=m
608CONFIG_SMSC_PHY=m 677CONFIG_SMSC_PHY=m
678# CONFIG_BROADCOM_PHY is not set
679# CONFIG_FIXED_PHY is not set
609 680
610# 681#
611# Ethernet (10 or 100Mbit) 682# Ethernet (10 or 100Mbit)
@@ -643,14 +714,17 @@ CONFIG_MIPS_AU1X00_ENET=y
643# CONFIG_SK98LIN is not set 714# CONFIG_SK98LIN is not set
644# CONFIG_TIGON3 is not set 715# CONFIG_TIGON3 is not set
645# CONFIG_BNX2 is not set 716# CONFIG_BNX2 is not set
717CONFIG_QLA3XXX=m
646 718
647# 719#
648# Ethernet (10000 Mbit) 720# Ethernet (10000 Mbit)
649# 721#
650# CONFIG_CHELSIO_T1 is not set 722# CONFIG_CHELSIO_T1 is not set
723CONFIG_CHELSIO_T3=m
651# CONFIG_IXGB is not set 724# CONFIG_IXGB is not set
652# CONFIG_S2IO is not set 725# CONFIG_S2IO is not set
653# CONFIG_MYRI10GE is not set 726# CONFIG_MYRI10GE is not set
727CONFIG_NETXEN_NIC=m
654 728
655# 729#
656# Token Ring devices 730# Token Ring devices
@@ -683,6 +757,7 @@ CONFIG_PPP_DEFLATE=m
683CONFIG_PPP_MPPE=m 757CONFIG_PPP_MPPE=m
684CONFIG_PPPOE=m 758CONFIG_PPPOE=m
685# CONFIG_SLIP is not set 759# CONFIG_SLIP is not set
760CONFIG_SLHC=m
686# CONFIG_SHAPER is not set 761# CONFIG_SHAPER is not set
687# CONFIG_NETCONSOLE is not set 762# CONFIG_NETCONSOLE is not set
688# CONFIG_NETPOLL is not set 763# CONFIG_NETPOLL is not set
@@ -702,6 +777,7 @@ CONFIG_PPPOE=m
702# Input device support 777# Input device support
703# 778#
704CONFIG_INPUT=y 779CONFIG_INPUT=y
780# CONFIG_INPUT_FF_MEMLESS is not set
705 781
706# 782#
707# Userland interfaces 783# Userland interfaces
@@ -780,10 +856,6 @@ CONFIG_LEGACY_PTY_COUNT=256
780# CONFIG_DTLK is not set 856# CONFIG_DTLK is not set
781# CONFIG_R3964 is not set 857# CONFIG_R3964 is not set
782# CONFIG_APPLICOM is not set 858# CONFIG_APPLICOM is not set
783
784#
785# Ftape, the floppy tape device driver
786#
787# CONFIG_DRM is not set 859# CONFIG_DRM is not set
788 860
789# 861#
@@ -798,7 +870,6 @@ CONFIG_SYNCLINK_CS=m
798# TPM devices 870# TPM devices
799# 871#
800# CONFIG_TCG_TPM is not set 872# CONFIG_TCG_TPM is not set
801# CONFIG_TELCLOCK is not set
802 873
803# 874#
804# I2C support 875# I2C support
@@ -823,14 +894,9 @@ CONFIG_SYNCLINK_CS=m
823# CONFIG_HWMON_VID is not set 894# CONFIG_HWMON_VID is not set
824 895
825# 896#
826# Misc devices
827#
828
829#
830# Multimedia devices 897# Multimedia devices
831# 898#
832# CONFIG_VIDEO_DEV is not set 899# CONFIG_VIDEO_DEV is not set
833CONFIG_VIDEO_V4L2=y
834 900
835# 901#
836# Digital Video Broadcasting Devices 902# Digital Video Broadcasting Devices
@@ -843,6 +909,7 @@ CONFIG_VIDEO_V4L2=y
843# 909#
844# CONFIG_FIRMWARE_EDID is not set 910# CONFIG_FIRMWARE_EDID is not set
845# CONFIG_FB is not set 911# CONFIG_FB is not set
912# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
846 913
847# 914#
848# Sound 915# Sound
@@ -873,7 +940,6 @@ CONFIG_SND_VERBOSE_PROCFS=y
873# Generic devices 940# Generic devices
874# 941#
875CONFIG_SND_AC97_CODEC=m 942CONFIG_SND_AC97_CODEC=m
876CONFIG_SND_AC97_BUS=m
877# CONFIG_SND_DUMMY is not set 943# CONFIG_SND_DUMMY is not set
878CONFIG_SND_VIRMIDI=m 944CONFIG_SND_VIRMIDI=m
879CONFIG_SND_MTPAV=m 945CONFIG_SND_MTPAV=m
@@ -938,6 +1004,7 @@ CONFIG_SND_MTPAV=m
938# CONFIG_SND_VIA82XX_MODEM is not set 1004# CONFIG_SND_VIA82XX_MODEM is not set
939# CONFIG_SND_VX222 is not set 1005# CONFIG_SND_VX222 is not set
940# CONFIG_SND_YMFPCI is not set 1006# CONFIG_SND_YMFPCI is not set
1007# CONFIG_SND_AC97_POWER_SAVE is not set
941 1008
942# 1009#
943# ALSA MIPS devices 1010# ALSA MIPS devices
@@ -956,18 +1023,28 @@ CONFIG_SND_AU1X00=m
956# CONFIG_SND_PDAUDIOCF is not set 1023# CONFIG_SND_PDAUDIOCF is not set
957 1024
958# 1025#
1026# SoC audio support
1027#
1028# CONFIG_SND_SOC is not set
1029
1030#
959# Open Sound System 1031# Open Sound System
960# 1032#
961CONFIG_SOUND_PRIME=y 1033CONFIG_SOUND_PRIME=y
1034# CONFIG_OBSOLETE_OSS is not set
962# CONFIG_SOUND_BT878 is not set 1035# CONFIG_SOUND_BT878 is not set
963# CONFIG_SOUND_EMU10K1 is not set
964# CONFIG_SOUND_FUSION is not set
965# CONFIG_SOUND_ES1371 is not set
966# CONFIG_SOUND_ICH is not set 1036# CONFIG_SOUND_ICH is not set
967# CONFIG_SOUND_TRIDENT is not set 1037# CONFIG_SOUND_TRIDENT is not set
968# CONFIG_SOUND_MSNDCLAS is not set 1038# CONFIG_SOUND_MSNDCLAS is not set
969# CONFIG_SOUND_MSNDPIN is not set 1039# CONFIG_SOUND_MSNDPIN is not set
970# CONFIG_SOUND_VIA82CXXX is not set 1040# CONFIG_SOUND_VIA82CXXX is not set
1041CONFIG_AC97_BUS=m
1042
1043#
1044# HID Devices
1045#
1046CONFIG_HID=y
1047# CONFIG_HID_DEBUG is not set
971 1048
972# 1049#
973# USB support 1050# USB support
@@ -982,7 +1059,6 @@ CONFIG_USB=y
982# Miscellaneous USB options 1059# Miscellaneous USB options
983# 1060#
984# CONFIG_USB_DEVICEFS is not set 1061# CONFIG_USB_DEVICEFS is not set
985# CONFIG_USB_BANDWIDTH is not set
986# CONFIG_USB_DYNAMIC_MINORS is not set 1062# CONFIG_USB_DYNAMIC_MINORS is not set
987# CONFIG_USB_OTG is not set 1063# CONFIG_USB_OTG is not set
988 1064
@@ -992,7 +1068,8 @@ CONFIG_USB=y
992# CONFIG_USB_EHCI_HCD is not set 1068# CONFIG_USB_EHCI_HCD is not set
993# CONFIG_USB_ISP116X_HCD is not set 1069# CONFIG_USB_ISP116X_HCD is not set
994CONFIG_USB_OHCI_HCD=y 1070CONFIG_USB_OHCI_HCD=y
995# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1071# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1072# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
996CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1073CONFIG_USB_OHCI_LITTLE_ENDIAN=y
997# CONFIG_USB_UHCI_HCD is not set 1074# CONFIG_USB_UHCI_HCD is not set
998# CONFIG_USB_SL811_HCD is not set 1075# CONFIG_USB_SL811_HCD is not set
@@ -1010,14 +1087,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1010# 1087#
1011# may also be needed; see USB_STORAGE Help for more information 1088# may also be needed; see USB_STORAGE Help for more information
1012# 1089#
1013# CONFIG_USB_STORAGE is not set
1014# CONFIG_USB_LIBUSUAL is not set 1090# CONFIG_USB_LIBUSUAL is not set
1015 1091
1016# 1092#
1017# USB Input Devices 1093# USB Input Devices
1018# 1094#
1019CONFIG_USB_HID=y 1095CONFIG_USB_HID=y
1020CONFIG_USB_HIDINPUT=y
1021# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1096# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1022# CONFIG_HID_FF is not set 1097# CONFIG_HID_FF is not set
1023# CONFIG_USB_HIDDEV is not set 1098# CONFIG_USB_HIDDEV is not set
@@ -1033,6 +1108,7 @@ CONFIG_USB_YEALINK=m
1033# CONFIG_USB_ATI_REMOTE2 is not set 1108# CONFIG_USB_ATI_REMOTE2 is not set
1034# CONFIG_USB_KEYSPAN_REMOTE is not set 1109# CONFIG_USB_KEYSPAN_REMOTE is not set
1035# CONFIG_USB_APPLETOUCH is not set 1110# CONFIG_USB_APPLETOUCH is not set
1111# CONFIG_USB_GTCO is not set
1036 1112
1037# 1113#
1038# USB Imaging devices 1114# USB Imaging devices
@@ -1046,6 +1122,7 @@ CONFIG_USB_YEALINK=m
1046# CONFIG_USB_KAWETH is not set 1122# CONFIG_USB_KAWETH is not set
1047# CONFIG_USB_PEGASUS is not set 1123# CONFIG_USB_PEGASUS is not set
1048# CONFIG_USB_RTL8150 is not set 1124# CONFIG_USB_RTL8150 is not set
1125# CONFIG_USB_USBNET_MII is not set
1049# CONFIG_USB_USBNET is not set 1126# CONFIG_USB_USBNET is not set
1050CONFIG_USB_MON=y 1127CONFIG_USB_MON=y
1051 1128
@@ -1063,18 +1140,20 @@ CONFIG_USB_MON=y
1063# 1140#
1064# CONFIG_USB_EMI62 is not set 1141# CONFIG_USB_EMI62 is not set
1065# CONFIG_USB_EMI26 is not set 1142# CONFIG_USB_EMI26 is not set
1143# CONFIG_USB_ADUTUX is not set
1066# CONFIG_USB_AUERSWALD is not set 1144# CONFIG_USB_AUERSWALD is not set
1067# CONFIG_USB_RIO500 is not set 1145# CONFIG_USB_RIO500 is not set
1068# CONFIG_USB_LEGOTOWER is not set 1146# CONFIG_USB_LEGOTOWER is not set
1069# CONFIG_USB_LCD is not set 1147# CONFIG_USB_LCD is not set
1070# CONFIG_USB_LED is not set 1148# CONFIG_USB_LED is not set
1071# CONFIG_USB_CY7C63 is not set 1149# CONFIG_USB_CYPRESS_CY7C63 is not set
1072# CONFIG_USB_CYTHERM is not set 1150# CONFIG_USB_CYTHERM is not set
1073# CONFIG_USB_PHIDGETKIT is not set 1151# CONFIG_USB_PHIDGET is not set
1074# CONFIG_USB_PHIDGETSERVO is not set
1075# CONFIG_USB_IDMOUSE is not set 1152# CONFIG_USB_IDMOUSE is not set
1153# CONFIG_USB_FTDI_ELAN is not set
1076# CONFIG_USB_APPLEDISPLAY is not set 1154# CONFIG_USB_APPLEDISPLAY is not set
1077CONFIG_USB_LD=m 1155CONFIG_USB_LD=m
1156# CONFIG_USB_TRANCEVIBRATOR is not set
1078 1157
1079# 1158#
1080# USB DSL modem support 1159# USB DSL modem support
@@ -1131,6 +1210,14 @@ CONFIG_USB_LD=m
1131# 1210#
1132 1211
1133# 1212#
1213# Auxiliary Display support
1214#
1215
1216#
1217# Virtualization
1218#
1219
1220#
1134# File systems 1221# File systems
1135# 1222#
1136CONFIG_EXT2_FS=y 1223CONFIG_EXT2_FS=y
@@ -1142,6 +1229,7 @@ CONFIG_EXT3_FS=y
1142CONFIG_EXT3_FS_XATTR=y 1229CONFIG_EXT3_FS_XATTR=y
1143CONFIG_EXT3_FS_POSIX_ACL=y 1230CONFIG_EXT3_FS_POSIX_ACL=y
1144CONFIG_EXT3_FS_SECURITY=y 1231CONFIG_EXT3_FS_SECURITY=y
1232# CONFIG_EXT4DEV_FS is not set
1145CONFIG_JBD=y 1233CONFIG_JBD=y
1146# CONFIG_JBD_DEBUG is not set 1234# CONFIG_JBD_DEBUG is not set
1147CONFIG_FS_MBCACHE=y 1235CONFIG_FS_MBCACHE=y
@@ -1154,6 +1242,7 @@ CONFIG_REISERFS_FS_SECURITY=y
1154# CONFIG_JFS_FS is not set 1242# CONFIG_JFS_FS is not set
1155CONFIG_FS_POSIX_ACL=y 1243CONFIG_FS_POSIX_ACL=y
1156# CONFIG_XFS_FS is not set 1244# CONFIG_XFS_FS is not set
1245# CONFIG_GFS2_FS is not set
1157# CONFIG_OCFS2_FS is not set 1246# CONFIG_OCFS2_FS is not set
1158# CONFIG_MINIX_FS is not set 1247# CONFIG_MINIX_FS is not set
1159# CONFIG_ROMFS_FS is not set 1248# CONFIG_ROMFS_FS is not set
@@ -1164,6 +1253,7 @@ CONFIG_DNOTIFY=y
1164CONFIG_AUTOFS_FS=m 1253CONFIG_AUTOFS_FS=m
1165CONFIG_AUTOFS4_FS=m 1254CONFIG_AUTOFS4_FS=m
1166CONFIG_FUSE_FS=m 1255CONFIG_FUSE_FS=m
1256CONFIG_GENERIC_ACL=y
1167 1257
1168# 1258#
1169# CD-ROM/DVD Filesystems 1259# CD-ROM/DVD Filesystems
@@ -1183,23 +1273,25 @@ CONFIG_FUSE_FS=m
1183# 1273#
1184CONFIG_PROC_FS=y 1274CONFIG_PROC_FS=y
1185CONFIG_PROC_KCORE=y 1275CONFIG_PROC_KCORE=y
1276CONFIG_PROC_SYSCTL=y
1186CONFIG_SYSFS=y 1277CONFIG_SYSFS=y
1187CONFIG_TMPFS=y 1278CONFIG_TMPFS=y
1279CONFIG_TMPFS_POSIX_ACL=y
1188# CONFIG_HUGETLB_PAGE is not set 1280# CONFIG_HUGETLB_PAGE is not set
1189CONFIG_RAMFS=y 1281CONFIG_RAMFS=y
1190# CONFIG_CONFIGFS_FS is not set 1282CONFIG_CONFIGFS_FS=m
1191 1283
1192# 1284#
1193# Miscellaneous filesystems 1285# Miscellaneous filesystems
1194# 1286#
1195# CONFIG_ADFS_FS is not set 1287# CONFIG_ADFS_FS is not set
1196# CONFIG_AFFS_FS is not set 1288# CONFIG_AFFS_FS is not set
1289# CONFIG_ECRYPT_FS is not set
1197# CONFIG_HFS_FS is not set 1290# CONFIG_HFS_FS is not set
1198# CONFIG_HFSPLUS_FS is not set 1291# CONFIG_HFSPLUS_FS is not set
1199# CONFIG_BEFS_FS is not set 1292# CONFIG_BEFS_FS is not set
1200# CONFIG_BFS_FS is not set 1293# CONFIG_BFS_FS is not set
1201# CONFIG_EFS_FS is not set 1294# CONFIG_EFS_FS is not set
1202# CONFIG_JFFS_FS is not set
1203# CONFIG_JFFS2_FS is not set 1295# CONFIG_JFFS2_FS is not set
1204CONFIG_CRAMFS=m 1296CONFIG_CRAMFS=m
1205# CONFIG_VXFS_FS is not set 1297# CONFIG_VXFS_FS is not set
@@ -1228,7 +1320,6 @@ CONFIG_SUNRPC=y
1228CONFIG_SMB_FS=m 1320CONFIG_SMB_FS=m
1229# CONFIG_SMB_NLS_DEFAULT is not set 1321# CONFIG_SMB_NLS_DEFAULT is not set
1230# CONFIG_CIFS is not set 1322# CONFIG_CIFS is not set
1231# CONFIG_CIFS_DEBUG2 is not set
1232# CONFIG_NCP_FS is not set 1323# CONFIG_NCP_FS is not set
1233# CONFIG_CODA_FS is not set 1324# CONFIG_CODA_FS is not set
1234# CONFIG_AFS_FS is not set 1325# CONFIG_AFS_FS is not set
@@ -1285,6 +1376,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1285# CONFIG_NLS_UTF8 is not set 1376# CONFIG_NLS_UTF8 is not set
1286 1377
1287# 1378#
1379# Distributed Lock Manager
1380#
1381CONFIG_DLM=m
1382CONFIG_DLM_TCP=y
1383# CONFIG_DLM_SCTP is not set
1384# CONFIG_DLM_DEBUG is not set
1385
1386#
1288# Profiling support 1387# Profiling support
1289# 1388#
1290# CONFIG_PROFILING is not set 1389# CONFIG_PROFILING is not set
@@ -1294,11 +1393,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1294# 1393#
1295CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1394CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1296# CONFIG_PRINTK_TIME is not set 1395# CONFIG_PRINTK_TIME is not set
1396CONFIG_ENABLE_MUST_CHECK=y
1297# CONFIG_MAGIC_SYSRQ is not set 1397# CONFIG_MAGIC_SYSRQ is not set
1298# CONFIG_UNUSED_SYMBOLS is not set 1398# CONFIG_UNUSED_SYMBOLS is not set
1399# CONFIG_DEBUG_FS is not set
1400# CONFIG_HEADERS_CHECK is not set
1299# CONFIG_DEBUG_KERNEL is not set 1401# CONFIG_DEBUG_KERNEL is not set
1300CONFIG_LOG_BUF_SHIFT=14 1402CONFIG_LOG_BUF_SHIFT=14
1301# CONFIG_DEBUG_FS is not set
1302CONFIG_CROSSCOMPILE=y 1403CONFIG_CROSSCOMPILE=y
1303CONFIG_CMDLINE="" 1404CONFIG_CMDLINE=""
1304 1405
@@ -1313,18 +1414,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1313# Cryptographic options 1414# Cryptographic options
1314# 1415#
1315CONFIG_CRYPTO=y 1416CONFIG_CRYPTO=y
1417CONFIG_CRYPTO_ALGAPI=y
1418CONFIG_CRYPTO_BLKCIPHER=m
1419CONFIG_CRYPTO_HASH=y
1420CONFIG_CRYPTO_MANAGER=y
1316CONFIG_CRYPTO_HMAC=y 1421CONFIG_CRYPTO_HMAC=y
1422CONFIG_CRYPTO_XCBC=m
1317CONFIG_CRYPTO_NULL=m 1423CONFIG_CRYPTO_NULL=m
1318CONFIG_CRYPTO_MD4=m 1424CONFIG_CRYPTO_MD4=m
1319CONFIG_CRYPTO_MD5=m 1425CONFIG_CRYPTO_MD5=y
1320CONFIG_CRYPTO_SHA1=m 1426CONFIG_CRYPTO_SHA1=m
1321CONFIG_CRYPTO_SHA256=m 1427CONFIG_CRYPTO_SHA256=m
1322CONFIG_CRYPTO_SHA512=m 1428CONFIG_CRYPTO_SHA512=m
1323CONFIG_CRYPTO_WP512=m 1429CONFIG_CRYPTO_WP512=m
1324CONFIG_CRYPTO_TGR192=m 1430CONFIG_CRYPTO_TGR192=m
1431CONFIG_CRYPTO_GF128MUL=m
1432CONFIG_CRYPTO_ECB=m
1433CONFIG_CRYPTO_CBC=m
1434CONFIG_CRYPTO_PCBC=m
1435CONFIG_CRYPTO_LRW=m
1325CONFIG_CRYPTO_DES=m 1436CONFIG_CRYPTO_DES=m
1437CONFIG_CRYPTO_FCRYPT=m
1326CONFIG_CRYPTO_BLOWFISH=m 1438CONFIG_CRYPTO_BLOWFISH=m
1327CONFIG_CRYPTO_TWOFISH=m 1439CONFIG_CRYPTO_TWOFISH=m
1440CONFIG_CRYPTO_TWOFISH_COMMON=m
1328CONFIG_CRYPTO_SERPENT=m 1441CONFIG_CRYPTO_SERPENT=m
1329CONFIG_CRYPTO_AES=m 1442CONFIG_CRYPTO_AES=m
1330CONFIG_CRYPTO_CAST5=m 1443CONFIG_CRYPTO_CAST5=m
@@ -1336,6 +1449,7 @@ CONFIG_CRYPTO_ANUBIS=m
1336CONFIG_CRYPTO_DEFLATE=m 1449CONFIG_CRYPTO_DEFLATE=m
1337CONFIG_CRYPTO_MICHAEL_MIC=m 1450CONFIG_CRYPTO_MICHAEL_MIC=m
1338CONFIG_CRYPTO_CRC32C=m 1451CONFIG_CRYPTO_CRC32C=m
1452CONFIG_CRYPTO_CAMELLIA=m
1339# CONFIG_CRYPTO_TEST is not set 1453# CONFIG_CRYPTO_TEST is not set
1340 1454
1341# 1455#
@@ -1345,6 +1459,7 @@ CONFIG_CRYPTO_CRC32C=m
1345# 1459#
1346# Library routines 1460# Library routines
1347# 1461#
1462CONFIG_BITREVERSE=y
1348CONFIG_CRC_CCITT=m 1463CONFIG_CRC_CCITT=m
1349CONFIG_CRC16=m 1464CONFIG_CRC16=m
1350CONFIG_CRC32=y 1465CONFIG_CRC32=y
@@ -1356,3 +1471,5 @@ CONFIG_TEXTSEARCH_KMP=m
1356CONFIG_TEXTSEARCH_BM=m 1471CONFIG_TEXTSEARCH_BM=m
1357CONFIG_TEXTSEARCH_FSM=m 1472CONFIG_TEXTSEARCH_FSM=m
1358CONFIG_PLIST=y 1473CONFIG_PLIST=y
1474CONFIG_HAS_IOMEM=y
1475CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index c681c91763aa..5b18d5da9858 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:03:59 2006 4# Sun Feb 18 21:27:42 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_DB1550=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_DB1550=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +64,20 @@ CONFIG_MIPS_DB1550=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 77CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 78# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 79CONFIG_CPU_LITTLE_ENDIAN=y
80CONFIG_SYS_SUPPORTS_APM_EMULATION=y
76CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 81CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
77CONFIG_SOC_AU1550=y 82CONFIG_SOC_AU1550=y
78CONFIG_SOC_AU1X00=y 83CONFIG_SOC_AU1X00=y
@@ -117,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_64BIT_PHYS_ADDR=y 128CONFIG_64BIT_PHYS_ADDR=y
124CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -135,7 +140,8 @@ CONFIG_FLATMEM=y
135CONFIG_FLAT_NODE_MEM_MAP=y 140CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 143CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -148,6 +154,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +173,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 174CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 185CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -182,12 +194,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 194CONFIG_BUG=y
183CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 197CONFIG_FUTEX=y
187CONFIG_EPOLL=y 198CONFIG_EPOLL=y
188CONFIG_SHMEM=y 199CONFIG_SHMEM=y
189CONFIG_SLAB=y 200CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -205,6 +217,7 @@ CONFIG_KMOD=y
205# 217#
206# Block layer 218# Block layer
207# 219#
220CONFIG_BLOCK=y
208# CONFIG_LBD is not set 221# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -258,6 +271,10 @@ CONFIG_PCMCIA_AU1X00=m
258CONFIG_BINFMT_ELF=y 271CONFIG_BINFMT_ELF=y
259# CONFIG_BINFMT_MISC is not set 272# CONFIG_BINFMT_MISC is not set
260CONFIG_TRAD_SIGNALS=y 273CONFIG_TRAD_SIGNALS=y
274
275#
276# Power management options
277#
261# CONFIG_PM is not set 278# CONFIG_PM is not set
262 279
263# 280#
@@ -274,7 +291,10 @@ CONFIG_PACKET=y
274CONFIG_UNIX=y 291CONFIG_UNIX=y
275CONFIG_XFRM=y 292CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 293CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set
295CONFIG_XFRM_MIGRATE=y
277CONFIG_NET_KEY=y 296CONFIG_NET_KEY=y
297CONFIG_NET_KEY_MIGRATE=y
278CONFIG_INET=y 298CONFIG_INET=y
279CONFIG_IP_MULTICAST=y 299CONFIG_IP_MULTICAST=y
280# CONFIG_IP_ADVANCED_ROUTER is not set 300# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -295,10 +315,13 @@ CONFIG_IP_PNP_BOOTP=y
295# CONFIG_INET_TUNNEL is not set 315# CONFIG_INET_TUNNEL is not set
296CONFIG_INET_XFRM_MODE_TRANSPORT=m 316CONFIG_INET_XFRM_MODE_TRANSPORT=m
297CONFIG_INET_XFRM_MODE_TUNNEL=m 317CONFIG_INET_XFRM_MODE_TUNNEL=m
318CONFIG_INET_XFRM_MODE_BEET=m
298CONFIG_INET_DIAG=y 319CONFIG_INET_DIAG=y
299CONFIG_INET_TCP_DIAG=y 320CONFIG_INET_TCP_DIAG=y
300# CONFIG_TCP_CONG_ADVANCED is not set 321# CONFIG_TCP_CONG_ADVANCED is not set
301CONFIG_TCP_CONG_BIC=y 322CONFIG_TCP_CONG_CUBIC=y
323CONFIG_DEFAULT_TCP_CONG="cubic"
324CONFIG_TCP_MD5SIG=y
302 325
303# 326#
304# IP: Virtual Server Configuration 327# IP: Virtual Server Configuration
@@ -317,15 +340,42 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 340CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 341CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 342CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_NF_CONNTRACK is not set 343CONFIG_NF_CONNTRACK_ENABLED=m
344CONFIG_NF_CONNTRACK_SUPPORT=y
345# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
346CONFIG_NF_CONNTRACK=m
347CONFIG_NF_CT_ACCT=y
348CONFIG_NF_CONNTRACK_MARK=y
349CONFIG_NF_CONNTRACK_SECMARK=y
350CONFIG_NF_CONNTRACK_EVENTS=y
351CONFIG_NF_CT_PROTO_GRE=m
352CONFIG_NF_CT_PROTO_SCTP=m
353CONFIG_NF_CONNTRACK_AMANDA=m
354CONFIG_NF_CONNTRACK_FTP=m
355CONFIG_NF_CONNTRACK_H323=m
356CONFIG_NF_CONNTRACK_IRC=m
357# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
358CONFIG_NF_CONNTRACK_PPTP=m
359CONFIG_NF_CONNTRACK_SANE=m
360CONFIG_NF_CONNTRACK_SIP=m
361CONFIG_NF_CONNTRACK_TFTP=m
362CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 363CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 364CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_MARK=m 365CONFIG_NETFILTER_XT_TARGET_MARK=m
324CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 366CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
367CONFIG_NETFILTER_XT_TARGET_NFLOG=m
325CONFIG_NETFILTER_XT_TARGET_SECMARK=m 368CONFIG_NETFILTER_XT_TARGET_SECMARK=m
369CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
370CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
326CONFIG_NETFILTER_XT_MATCH_COMMENT=m 371CONFIG_NETFILTER_XT_MATCH_COMMENT=m
372CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
373CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
374CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
327CONFIG_NETFILTER_XT_MATCH_DCCP=m 375CONFIG_NETFILTER_XT_MATCH_DCCP=m
376CONFIG_NETFILTER_XT_MATCH_DSCP=m
328CONFIG_NETFILTER_XT_MATCH_ESP=m 377CONFIG_NETFILTER_XT_MATCH_ESP=m
378CONFIG_NETFILTER_XT_MATCH_HELPER=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 379CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 380CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 381CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -336,14 +386,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 386CONFIG_NETFILTER_XT_MATCH_QUOTA=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 387CONFIG_NETFILTER_XT_MATCH_REALM=m
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 388CONFIG_NETFILTER_XT_MATCH_SCTP=m
389CONFIG_NETFILTER_XT_MATCH_STATE=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 390CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 391CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 392CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
393CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
342 394
343# 395#
344# IP: Netfilter Configuration 396# IP: Netfilter Configuration
345# 397#
346# CONFIG_IP_NF_CONNTRACK is not set 398CONFIG_NF_CONNTRACK_IPV4=m
399CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set 400# CONFIG_IP_NF_QUEUE is not set
348# CONFIG_IP_NF_IPTABLES is not set 401# CONFIG_IP_NF_IPTABLES is not set
349# CONFIG_IP_NF_ARPTABLES is not set 402# CONFIG_IP_NF_ARPTABLES is not set
@@ -371,7 +424,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
371# CONFIG_ATALK is not set 424# CONFIG_ATALK is not set
372# CONFIG_X25 is not set 425# CONFIG_X25 is not set
373# CONFIG_LAPB is not set 426# CONFIG_LAPB is not set
374# CONFIG_NET_DIVERT is not set
375# CONFIG_ECONET is not set 427# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 428# CONFIG_WAN_ROUTER is not set
377 429
@@ -427,11 +479,13 @@ CONFIG_MTD_PARTITIONS=y
427# User Modules And Translation Layers 479# User Modules And Translation Layers
428# 480#
429CONFIG_MTD_CHAR=y 481CONFIG_MTD_CHAR=y
482CONFIG_MTD_BLKDEVS=y
430CONFIG_MTD_BLOCK=y 483CONFIG_MTD_BLOCK=y
431# CONFIG_FTL is not set 484# CONFIG_FTL is not set
432# CONFIG_NFTL is not set 485# CONFIG_NFTL is not set
433# CONFIG_INFTL is not set 486# CONFIG_INFTL is not set
434# CONFIG_RFD_FTL is not set 487# CONFIG_RFD_FTL is not set
488# CONFIG_SSFDC is not set
435 489
436# 490#
437# RAM/ROM/Flash chip drivers 491# RAM/ROM/Flash chip drivers
@@ -492,6 +546,7 @@ CONFIG_MTD_NAND=m
492CONFIG_MTD_NAND_IDS=m 546CONFIG_MTD_NAND_IDS=m
493CONFIG_MTD_NAND_AU1550=m 547CONFIG_MTD_NAND_AU1550=m
494# CONFIG_MTD_NAND_DISKONCHIP is not set 548# CONFIG_MTD_NAND_DISKONCHIP is not set
549# CONFIG_MTD_NAND_CAFE is not set
495# CONFIG_MTD_NAND_NANDSIM is not set 550# CONFIG_MTD_NAND_NANDSIM is not set
496 551
497# 552#
@@ -528,9 +583,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
528CONFIG_ATA_OVER_ETH=m 583CONFIG_ATA_OVER_ETH=m
529 584
530# 585#
586# Misc devices
587#
588CONFIG_SGI_IOC4=m
589# CONFIG_TIFM_CORE is not set
590
591#
531# ATA/ATAPI/MFM/RLL support 592# ATA/ATAPI/MFM/RLL support
532# 593#
533CONFIG_IDE=y 594CONFIG_IDE=y
595CONFIG_IDE_MAX_HWIFS=4
534CONFIG_BLK_DEV_IDE=y 596CONFIG_BLK_DEV_IDE=y
535 597
536# 598#
@@ -540,6 +602,7 @@ CONFIG_BLK_DEV_IDE=y
540CONFIG_BLK_DEV_IDEDISK=y 602CONFIG_BLK_DEV_IDEDISK=y
541# CONFIG_IDEDISK_MULTI_MODE is not set 603# CONFIG_IDEDISK_MULTI_MODE is not set
542CONFIG_BLK_DEV_IDECS=m 604CONFIG_BLK_DEV_IDECS=m
605# CONFIG_BLK_DEV_DELKIN is not set
543# CONFIG_BLK_DEV_IDECD is not set 606# CONFIG_BLK_DEV_IDECD is not set
544# CONFIG_BLK_DEV_IDETAPE is not set 607# CONFIG_BLK_DEV_IDETAPE is not set
545# CONFIG_BLK_DEV_IDEFLOPPY is not set 608# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -567,8 +630,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
567# CONFIG_BLK_DEV_CS5530 is not set 630# CONFIG_BLK_DEV_CS5530 is not set
568# CONFIG_BLK_DEV_HPT34X is not set 631# CONFIG_BLK_DEV_HPT34X is not set
569# CONFIG_BLK_DEV_HPT366 is not set 632# CONFIG_BLK_DEV_HPT366 is not set
633# CONFIG_BLK_DEV_JMICRON is not set
570# CONFIG_BLK_DEV_SC1200 is not set 634# CONFIG_BLK_DEV_SC1200 is not set
571# CONFIG_BLK_DEV_PIIX is not set 635# CONFIG_BLK_DEV_PIIX is not set
636CONFIG_BLK_DEV_IT8213=m
572# CONFIG_BLK_DEV_IT821X is not set 637# CONFIG_BLK_DEV_IT821X is not set
573# CONFIG_BLK_DEV_NS87415 is not set 638# CONFIG_BLK_DEV_NS87415 is not set
574# CONFIG_BLK_DEV_PDC202XX_OLD is not set 639# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -578,6 +643,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
578# CONFIG_BLK_DEV_SLC90E66 is not set 643# CONFIG_BLK_DEV_SLC90E66 is not set
579# CONFIG_BLK_DEV_TRM290 is not set 644# CONFIG_BLK_DEV_TRM290 is not set
580# CONFIG_BLK_DEV_VIA82CXXX is not set 645# CONFIG_BLK_DEV_VIA82CXXX is not set
646CONFIG_BLK_DEV_TC86C001=m
581# CONFIG_IDE_ARM is not set 647# CONFIG_IDE_ARM is not set
582CONFIG_BLK_DEV_IDEDMA=y 648CONFIG_BLK_DEV_IDEDMA=y
583# CONFIG_IDEDMA_IVB is not set 649# CONFIG_IDEDMA_IVB is not set
@@ -589,6 +655,12 @@ CONFIG_BLK_DEV_IDEDMA=y
589# 655#
590CONFIG_RAID_ATTRS=m 656CONFIG_RAID_ATTRS=m
591# CONFIG_SCSI is not set 657# CONFIG_SCSI is not set
658# CONFIG_SCSI_NETLINK is not set
659
660#
661# Serial ATA (prod) and Parallel ATA (experimental) drivers
662#
663# CONFIG_ATA is not set
592 664
593# 665#
594# Multi-device support (RAID and LVM) 666# Multi-device support (RAID and LVM)
@@ -639,6 +711,8 @@ CONFIG_LXT_PHY=m
639CONFIG_CICADA_PHY=m 711CONFIG_CICADA_PHY=m
640CONFIG_VITESSE_PHY=m 712CONFIG_VITESSE_PHY=m
641CONFIG_SMSC_PHY=m 713CONFIG_SMSC_PHY=m
714# CONFIG_BROADCOM_PHY is not set
715# CONFIG_FIXED_PHY is not set
642 716
643# 717#
644# Ethernet (10 or 100Mbit) 718# Ethernet (10 or 100Mbit)
@@ -676,14 +750,17 @@ CONFIG_MIPS_AU1X00_ENET=y
676# CONFIG_SK98LIN is not set 750# CONFIG_SK98LIN is not set
677# CONFIG_TIGON3 is not set 751# CONFIG_TIGON3 is not set
678# CONFIG_BNX2 is not set 752# CONFIG_BNX2 is not set
753CONFIG_QLA3XXX=m
679 754
680# 755#
681# Ethernet (10000 Mbit) 756# Ethernet (10000 Mbit)
682# 757#
683# CONFIG_CHELSIO_T1 is not set 758# CONFIG_CHELSIO_T1 is not set
759CONFIG_CHELSIO_T3=m
684# CONFIG_IXGB is not set 760# CONFIG_IXGB is not set
685# CONFIG_S2IO is not set 761# CONFIG_S2IO is not set
686# CONFIG_MYRI10GE is not set 762# CONFIG_MYRI10GE is not set
763CONFIG_NETXEN_NIC=m
687 764
688# 765#
689# Token Ring devices 766# Token Ring devices
@@ -724,6 +801,7 @@ CONFIG_PPP_DEFLATE=m
724CONFIG_PPP_MPPE=m 801CONFIG_PPP_MPPE=m
725CONFIG_PPPOE=m 802CONFIG_PPPOE=m
726# CONFIG_SLIP is not set 803# CONFIG_SLIP is not set
804CONFIG_SLHC=m
727# CONFIG_SHAPER is not set 805# CONFIG_SHAPER is not set
728# CONFIG_NETCONSOLE is not set 806# CONFIG_NETCONSOLE is not set
729# CONFIG_NETPOLL is not set 807# CONFIG_NETPOLL is not set
@@ -743,6 +821,7 @@ CONFIG_PPPOE=m
743# Input device support 821# Input device support
744# 822#
745CONFIG_INPUT=y 823CONFIG_INPUT=y
824# CONFIG_INPUT_FF_MEMLESS is not set
746 825
747# 826#
748# Userland interfaces 827# Userland interfaces
@@ -821,10 +900,6 @@ CONFIG_LEGACY_PTY_COUNT=256
821# CONFIG_DTLK is not set 900# CONFIG_DTLK is not set
822# CONFIG_R3964 is not set 901# CONFIG_R3964 is not set
823# CONFIG_APPLICOM is not set 902# CONFIG_APPLICOM is not set
824
825#
826# Ftape, the floppy tape device driver
827#
828# CONFIG_DRM is not set 903# CONFIG_DRM is not set
829 904
830# 905#
@@ -839,7 +914,6 @@ CONFIG_SYNCLINK_CS=m
839# TPM devices 914# TPM devices
840# 915#
841# CONFIG_TCG_TPM is not set 916# CONFIG_TCG_TPM is not set
842# CONFIG_TELCLOCK is not set
843 917
844# 918#
845# I2C support 919# I2C support
@@ -864,14 +938,9 @@ CONFIG_SYNCLINK_CS=m
864# CONFIG_HWMON_VID is not set 938# CONFIG_HWMON_VID is not set
865 939
866# 940#
867# Misc devices
868#
869
870#
871# Multimedia devices 941# Multimedia devices
872# 942#
873# CONFIG_VIDEO_DEV is not set 943# CONFIG_VIDEO_DEV is not set
874CONFIG_VIDEO_V4L2=y
875 944
876# 945#
877# Digital Video Broadcasting Devices 946# Digital Video Broadcasting Devices
@@ -883,6 +952,7 @@ CONFIG_VIDEO_V4L2=y
883# 952#
884# CONFIG_FIRMWARE_EDID is not set 953# CONFIG_FIRMWARE_EDID is not set
885# CONFIG_FB is not set 954# CONFIG_FB is not set
955# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
886 956
887# 957#
888# Sound 958# Sound
@@ -890,6 +960,11 @@ CONFIG_VIDEO_V4L2=y
890# CONFIG_SOUND is not set 960# CONFIG_SOUND is not set
891 961
892# 962#
963# HID Devices
964#
965# CONFIG_HID is not set
966
967#
893# USB support 968# USB support
894# 969#
895CONFIG_USB_ARCH_HAS_HCD=y 970CONFIG_USB_ARCH_HAS_HCD=y
@@ -952,6 +1027,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
952# 1027#
953 1028
954# 1029#
1030# Auxiliary Display support
1031#
1032
1033#
1034# Virtualization
1035#
1036
1037#
955# File systems 1038# File systems
956# 1039#
957CONFIG_EXT2_FS=y 1040CONFIG_EXT2_FS=y
@@ -963,6 +1046,7 @@ CONFIG_EXT3_FS=y
963CONFIG_EXT3_FS_XATTR=y 1046CONFIG_EXT3_FS_XATTR=y
964CONFIG_EXT3_FS_POSIX_ACL=y 1047CONFIG_EXT3_FS_POSIX_ACL=y
965CONFIG_EXT3_FS_SECURITY=y 1048CONFIG_EXT3_FS_SECURITY=y
1049# CONFIG_EXT4DEV_FS is not set
966CONFIG_JBD=y 1050CONFIG_JBD=y
967# CONFIG_JBD_DEBUG is not set 1051# CONFIG_JBD_DEBUG is not set
968CONFIG_FS_MBCACHE=y 1052CONFIG_FS_MBCACHE=y
@@ -975,6 +1059,7 @@ CONFIG_REISERFS_FS_SECURITY=y
975# CONFIG_JFS_FS is not set 1059# CONFIG_JFS_FS is not set
976CONFIG_FS_POSIX_ACL=y 1060CONFIG_FS_POSIX_ACL=y
977# CONFIG_XFS_FS is not set 1061# CONFIG_XFS_FS is not set
1062# CONFIG_GFS2_FS is not set
978# CONFIG_OCFS2_FS is not set 1063# CONFIG_OCFS2_FS is not set
979# CONFIG_MINIX_FS is not set 1064# CONFIG_MINIX_FS is not set
980# CONFIG_ROMFS_FS is not set 1065# CONFIG_ROMFS_FS is not set
@@ -985,6 +1070,7 @@ CONFIG_DNOTIFY=y
985CONFIG_AUTOFS_FS=m 1070CONFIG_AUTOFS_FS=m
986CONFIG_AUTOFS4_FS=m 1071CONFIG_AUTOFS4_FS=m
987CONFIG_FUSE_FS=m 1072CONFIG_FUSE_FS=m
1073CONFIG_GENERIC_ACL=y
988 1074
989# 1075#
990# CD-ROM/DVD Filesystems 1076# CD-ROM/DVD Filesystems
@@ -1004,23 +1090,25 @@ CONFIG_FUSE_FS=m
1004# 1090#
1005CONFIG_PROC_FS=y 1091CONFIG_PROC_FS=y
1006CONFIG_PROC_KCORE=y 1092CONFIG_PROC_KCORE=y
1093CONFIG_PROC_SYSCTL=y
1007CONFIG_SYSFS=y 1094CONFIG_SYSFS=y
1008CONFIG_TMPFS=y 1095CONFIG_TMPFS=y
1096CONFIG_TMPFS_POSIX_ACL=y
1009# CONFIG_HUGETLB_PAGE is not set 1097# CONFIG_HUGETLB_PAGE is not set
1010CONFIG_RAMFS=y 1098CONFIG_RAMFS=y
1011# CONFIG_CONFIGFS_FS is not set 1099CONFIG_CONFIGFS_FS=m
1012 1100
1013# 1101#
1014# Miscellaneous filesystems 1102# Miscellaneous filesystems
1015# 1103#
1016# CONFIG_ADFS_FS is not set 1104# CONFIG_ADFS_FS is not set
1017# CONFIG_AFFS_FS is not set 1105# CONFIG_AFFS_FS is not set
1106# CONFIG_ECRYPT_FS is not set
1018# CONFIG_HFS_FS is not set 1107# CONFIG_HFS_FS is not set
1019# CONFIG_HFSPLUS_FS is not set 1108# CONFIG_HFSPLUS_FS is not set
1020# CONFIG_BEFS_FS is not set 1109# CONFIG_BEFS_FS is not set
1021# CONFIG_BFS_FS is not set 1110# CONFIG_BFS_FS is not set
1022# CONFIG_EFS_FS is not set 1111# CONFIG_EFS_FS is not set
1023# CONFIG_JFFS_FS is not set
1024# CONFIG_JFFS2_FS is not set 1112# CONFIG_JFFS2_FS is not set
1025CONFIG_CRAMFS=m 1113CONFIG_CRAMFS=m
1026# CONFIG_VXFS_FS is not set 1114# CONFIG_VXFS_FS is not set
@@ -1049,7 +1137,6 @@ CONFIG_SUNRPC=y
1049CONFIG_SMB_FS=m 1137CONFIG_SMB_FS=m
1050# CONFIG_SMB_NLS_DEFAULT is not set 1138# CONFIG_SMB_NLS_DEFAULT is not set
1051# CONFIG_CIFS is not set 1139# CONFIG_CIFS is not set
1052# CONFIG_CIFS_DEBUG2 is not set
1053# CONFIG_NCP_FS is not set 1140# CONFIG_NCP_FS is not set
1054# CONFIG_CODA_FS is not set 1141# CONFIG_CODA_FS is not set
1055# CONFIG_AFS_FS is not set 1142# CONFIG_AFS_FS is not set
@@ -1106,6 +1193,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1106# CONFIG_NLS_UTF8 is not set 1193# CONFIG_NLS_UTF8 is not set
1107 1194
1108# 1195#
1196# Distributed Lock Manager
1197#
1198CONFIG_DLM=m
1199CONFIG_DLM_TCP=y
1200# CONFIG_DLM_SCTP is not set
1201# CONFIG_DLM_DEBUG is not set
1202
1203#
1109# Profiling support 1204# Profiling support
1110# 1205#
1111# CONFIG_PROFILING is not set 1206# CONFIG_PROFILING is not set
@@ -1115,11 +1210,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1115# 1210#
1116CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1211CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1117# CONFIG_PRINTK_TIME is not set 1212# CONFIG_PRINTK_TIME is not set
1213CONFIG_ENABLE_MUST_CHECK=y
1118# CONFIG_MAGIC_SYSRQ is not set 1214# CONFIG_MAGIC_SYSRQ is not set
1119# CONFIG_UNUSED_SYMBOLS is not set 1215# CONFIG_UNUSED_SYMBOLS is not set
1216# CONFIG_DEBUG_FS is not set
1217# CONFIG_HEADERS_CHECK is not set
1120# CONFIG_DEBUG_KERNEL is not set 1218# CONFIG_DEBUG_KERNEL is not set
1121CONFIG_LOG_BUF_SHIFT=14 1219CONFIG_LOG_BUF_SHIFT=14
1122# CONFIG_DEBUG_FS is not set
1123CONFIG_CROSSCOMPILE=y 1220CONFIG_CROSSCOMPILE=y
1124CONFIG_CMDLINE="" 1221CONFIG_CMDLINE=""
1125 1222
@@ -1134,18 +1231,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1134# Cryptographic options 1231# Cryptographic options
1135# 1232#
1136CONFIG_CRYPTO=y 1233CONFIG_CRYPTO=y
1234CONFIG_CRYPTO_ALGAPI=y
1235CONFIG_CRYPTO_BLKCIPHER=m
1236CONFIG_CRYPTO_HASH=y
1237CONFIG_CRYPTO_MANAGER=y
1137CONFIG_CRYPTO_HMAC=y 1238CONFIG_CRYPTO_HMAC=y
1239CONFIG_CRYPTO_XCBC=m
1138CONFIG_CRYPTO_NULL=m 1240CONFIG_CRYPTO_NULL=m
1139CONFIG_CRYPTO_MD4=m 1241CONFIG_CRYPTO_MD4=m
1140CONFIG_CRYPTO_MD5=m 1242CONFIG_CRYPTO_MD5=y
1141CONFIG_CRYPTO_SHA1=m 1243CONFIG_CRYPTO_SHA1=m
1142CONFIG_CRYPTO_SHA256=m 1244CONFIG_CRYPTO_SHA256=m
1143CONFIG_CRYPTO_SHA512=m 1245CONFIG_CRYPTO_SHA512=m
1144CONFIG_CRYPTO_WP512=m 1246CONFIG_CRYPTO_WP512=m
1145CONFIG_CRYPTO_TGR192=m 1247CONFIG_CRYPTO_TGR192=m
1248CONFIG_CRYPTO_GF128MUL=m
1249CONFIG_CRYPTO_ECB=m
1250CONFIG_CRYPTO_CBC=m
1251CONFIG_CRYPTO_PCBC=m
1252CONFIG_CRYPTO_LRW=m
1146CONFIG_CRYPTO_DES=m 1253CONFIG_CRYPTO_DES=m
1254CONFIG_CRYPTO_FCRYPT=m
1147CONFIG_CRYPTO_BLOWFISH=m 1255CONFIG_CRYPTO_BLOWFISH=m
1148CONFIG_CRYPTO_TWOFISH=m 1256CONFIG_CRYPTO_TWOFISH=m
1257CONFIG_CRYPTO_TWOFISH_COMMON=m
1149CONFIG_CRYPTO_SERPENT=m 1258CONFIG_CRYPTO_SERPENT=m
1150CONFIG_CRYPTO_AES=m 1259CONFIG_CRYPTO_AES=m
1151CONFIG_CRYPTO_CAST5=m 1260CONFIG_CRYPTO_CAST5=m
@@ -1157,6 +1266,7 @@ CONFIG_CRYPTO_ANUBIS=m
1157CONFIG_CRYPTO_DEFLATE=m 1266CONFIG_CRYPTO_DEFLATE=m
1158CONFIG_CRYPTO_MICHAEL_MIC=m 1267CONFIG_CRYPTO_MICHAEL_MIC=m
1159CONFIG_CRYPTO_CRC32C=m 1268CONFIG_CRYPTO_CRC32C=m
1269CONFIG_CRYPTO_CAMELLIA=m
1160# CONFIG_CRYPTO_TEST is not set 1270# CONFIG_CRYPTO_TEST is not set
1161 1271
1162# 1272#
@@ -1166,6 +1276,7 @@ CONFIG_CRYPTO_CRC32C=m
1166# 1276#
1167# Library routines 1277# Library routines
1168# 1278#
1279CONFIG_BITREVERSE=y
1169CONFIG_CRC_CCITT=m 1280CONFIG_CRC_CCITT=m
1170CONFIG_CRC16=m 1281CONFIG_CRC16=m
1171CONFIG_CRC32=y 1282CONFIG_CRC32=y
@@ -1177,3 +1288,5 @@ CONFIG_TEXTSEARCH_KMP=m
1177CONFIG_TEXTSEARCH_BM=m 1288CONFIG_TEXTSEARCH_BM=m
1178CONFIG_TEXTSEARCH_FSM=m 1289CONFIG_TEXTSEARCH_FSM=m
1179CONFIG_PLIST=y 1290CONFIG_PLIST=y
1291CONFIG_HAS_IOMEM=y
1292CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index dd4bb0080211..121018886189 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:00 2006 4# Sun Feb 18 21:27:43 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45CONFIG_DDB5477=y 45CONFIG_DDB5477=y
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +65,14 @@ CONFIG_DDB5477=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_DDB5477_BUS_FREQUENCY=0 66CONFIG_DDB5477_BUS_FREQUENCY=0
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_I8259=y 78CONFIG_I8259=y
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_16KB is not set 121# CONFIG_PAGE_SIZE_16KB is not set
118# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 128CONFIG_CPU_HAS_SYNC=y
@@ -134,6 +138,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 139CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 140# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 142# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 143# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 144# CONFIG_HZ_128 is not set
@@ -146,6 +151,7 @@ CONFIG_HZ=1000
146CONFIG_PREEMPT_NONE=y 151CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 152# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 153# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -164,15 +170,20 @@ CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y 170CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 171CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 172CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y
167# CONFIG_POSIX_MQUEUE is not set 175# CONFIG_POSIX_MQUEUE is not set
168# CONFIG_BSD_PROCESS_ACCT is not set 176# CONFIG_BSD_PROCESS_ACCT is not set
169CONFIG_SYSCTL=y 177# CONFIG_TASKSTATS is not set
178# CONFIG_UTS_NS is not set
170# CONFIG_AUDIT is not set 179# CONFIG_AUDIT is not set
171# CONFIG_IKCONFIG is not set 180# CONFIG_IKCONFIG is not set
181CONFIG_SYSFS_DEPRECATED=y
172CONFIG_RELAY=y 182CONFIG_RELAY=y
173CONFIG_INITRAMFS_SOURCE=""
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 183# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
184CONFIG_SYSCTL=y
175CONFIG_EMBEDDED=y 185CONFIG_EMBEDDED=y
186CONFIG_SYSCTL_SYSCALL=y
176CONFIG_KALLSYMS=y 187CONFIG_KALLSYMS=y
177# CONFIG_KALLSYMS_EXTRA_PASS is not set 188# CONFIG_KALLSYMS_EXTRA_PASS is not set
178CONFIG_HOTPLUG=y 189CONFIG_HOTPLUG=y
@@ -180,12 +191,12 @@ CONFIG_PRINTK=y
180CONFIG_BUG=y 191CONFIG_BUG=y
181CONFIG_ELF_CORE=y 192CONFIG_ELF_CORE=y
182CONFIG_BASE_FULL=y 193CONFIG_BASE_FULL=y
183CONFIG_RT_MUTEXES=y
184CONFIG_FUTEX=y 194CONFIG_FUTEX=y
185CONFIG_EPOLL=y 195CONFIG_EPOLL=y
186CONFIG_SHMEM=y 196CONFIG_SHMEM=y
187CONFIG_SLAB=y 197CONFIG_SLAB=y
188CONFIG_VM_EVENT_COUNTERS=y 198CONFIG_VM_EVENT_COUNTERS=y
199CONFIG_RT_MUTEXES=y
189# CONFIG_TINY_SHMEM is not set 200# CONFIG_TINY_SHMEM is not set
190CONFIG_BASE_SMALL=0 201CONFIG_BASE_SMALL=0
191# CONFIG_SLOB is not set 202# CONFIG_SLOB is not set
@@ -198,6 +209,7 @@ CONFIG_BASE_SMALL=0
198# 209#
199# Block layer 210# Block layer
200# 211#
212CONFIG_BLOCK=y
201# CONFIG_LBD is not set 213# CONFIG_LBD is not set
202# CONFIG_BLK_DEV_IO_TRACE is not set 214# CONFIG_BLK_DEV_IO_TRACE is not set
203# CONFIG_LSF is not set 215# CONFIG_LSF is not set
@@ -240,6 +252,14 @@ CONFIG_BINFMT_ELF=y
240CONFIG_TRAD_SIGNALS=y 252CONFIG_TRAD_SIGNALS=y
241 253
242# 254#
255# Power management options
256#
257CONFIG_PM=y
258# CONFIG_PM_LEGACY is not set
259# CONFIG_PM_DEBUG is not set
260# CONFIG_PM_SYSFS_DEPRECATED is not set
261
262#
243# Networking 263# Networking
244# 264#
245CONFIG_NET=y 265CONFIG_NET=y
@@ -253,7 +273,10 @@ CONFIG_PACKET=y
253CONFIG_UNIX=y 273CONFIG_UNIX=y
254CONFIG_XFRM=y 274CONFIG_XFRM=y
255CONFIG_XFRM_USER=y 275CONFIG_XFRM_USER=y
276# CONFIG_XFRM_SUB_POLICY is not set
277CONFIG_XFRM_MIGRATE=y
256CONFIG_NET_KEY=y 278CONFIG_NET_KEY=y
279CONFIG_NET_KEY_MIGRATE=y
257CONFIG_INET=y 280CONFIG_INET=y
258# CONFIG_IP_MULTICAST is not set 281# CONFIG_IP_MULTICAST is not set
259# CONFIG_IP_ADVANCED_ROUTER is not set 282# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -273,10 +296,13 @@ CONFIG_IP_PNP_BOOTP=y
273# CONFIG_INET_TUNNEL is not set 296# CONFIG_INET_TUNNEL is not set
274CONFIG_INET_XFRM_MODE_TRANSPORT=y 297CONFIG_INET_XFRM_MODE_TRANSPORT=y
275CONFIG_INET_XFRM_MODE_TUNNEL=y 298CONFIG_INET_XFRM_MODE_TUNNEL=y
299CONFIG_INET_XFRM_MODE_BEET=y
276CONFIG_INET_DIAG=y 300CONFIG_INET_DIAG=y
277CONFIG_INET_TCP_DIAG=y 301CONFIG_INET_TCP_DIAG=y
278# CONFIG_TCP_CONG_ADVANCED is not set 302# CONFIG_TCP_CONG_ADVANCED is not set
279CONFIG_TCP_CONG_BIC=y 303CONFIG_TCP_CONG_CUBIC=y
304CONFIG_DEFAULT_TCP_CONG="cubic"
305CONFIG_TCP_MD5SIG=y
280# CONFIG_IPV6 is not set 306# CONFIG_IPV6 is not set
281# CONFIG_INET6_XFRM_TUNNEL is not set 307# CONFIG_INET6_XFRM_TUNNEL is not set
282# CONFIG_INET6_TUNNEL is not set 308# CONFIG_INET6_TUNNEL is not set
@@ -306,7 +332,6 @@ CONFIG_NETWORK_SECMARK=y
306# CONFIG_ATALK is not set 332# CONFIG_ATALK is not set
307# CONFIG_X25 is not set 333# CONFIG_X25 is not set
308# CONFIG_LAPB is not set 334# CONFIG_LAPB is not set
309# CONFIG_NET_DIVERT is not set
310# CONFIG_ECONET is not set 335# CONFIG_ECONET is not set
311# CONFIG_WAN_ROUTER is not set 336# CONFIG_WAN_ROUTER is not set
312 337
@@ -381,6 +406,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
381CONFIG_ATA_OVER_ETH=y 406CONFIG_ATA_OVER_ETH=y
382 407
383# 408#
409# Misc devices
410#
411CONFIG_SGI_IOC4=y
412# CONFIG_TIFM_CORE is not set
413
414#
384# ATA/ATAPI/MFM/RLL support 415# ATA/ATAPI/MFM/RLL support
385# 416#
386# CONFIG_IDE is not set 417# CONFIG_IDE is not set
@@ -390,6 +421,12 @@ CONFIG_ATA_OVER_ETH=y
390# 421#
391CONFIG_RAID_ATTRS=y 422CONFIG_RAID_ATTRS=y
392# CONFIG_SCSI is not set 423# CONFIG_SCSI is not set
424# CONFIG_SCSI_NETLINK is not set
425
426#
427# Serial ATA (prod) and Parallel ATA (experimental) drivers
428#
429# CONFIG_ATA is not set
393 430
394# 431#
395# Multi-device support (RAID and LVM) 432# Multi-device support (RAID and LVM)
@@ -440,6 +477,8 @@ CONFIG_LXT_PHY=y
440CONFIG_CICADA_PHY=y 477CONFIG_CICADA_PHY=y
441CONFIG_VITESSE_PHY=y 478CONFIG_VITESSE_PHY=y
442CONFIG_SMSC_PHY=y 479CONFIG_SMSC_PHY=y
480# CONFIG_BROADCOM_PHY is not set
481# CONFIG_FIXED_PHY is not set
443 482
444# 483#
445# Ethernet (10 or 100Mbit) 484# Ethernet (10 or 100Mbit)
@@ -459,6 +498,7 @@ CONFIG_MII=y
459# CONFIG_HP100 is not set 498# CONFIG_HP100 is not set
460CONFIG_NET_PCI=y 499CONFIG_NET_PCI=y
461CONFIG_PCNET32=y 500CONFIG_PCNET32=y
501# CONFIG_PCNET32_NAPI is not set
462# CONFIG_AMD8111_ETH is not set 502# CONFIG_AMD8111_ETH is not set
463# CONFIG_ADAPTEC_STARFIRE is not set 503# CONFIG_ADAPTEC_STARFIRE is not set
464# CONFIG_B44 is not set 504# CONFIG_B44 is not set
@@ -476,7 +516,7 @@ CONFIG_PCNET32=y
476# CONFIG_SUNDANCE is not set 516# CONFIG_SUNDANCE is not set
477# CONFIG_TLAN is not set 517# CONFIG_TLAN is not set
478# CONFIG_VIA_RHINE is not set 518# CONFIG_VIA_RHINE is not set
479# CONFIG_LAN_SAA9730 is not set 519# CONFIG_SC92031 is not set
480 520
481# 521#
482# Ethernet (1000 Mbit) 522# Ethernet (1000 Mbit)
@@ -495,14 +535,18 @@ CONFIG_PCNET32=y
495# CONFIG_VIA_VELOCITY is not set 535# CONFIG_VIA_VELOCITY is not set
496# CONFIG_TIGON3 is not set 536# CONFIG_TIGON3 is not set
497# CONFIG_BNX2 is not set 537# CONFIG_BNX2 is not set
538CONFIG_QLA3XXX=y
539# CONFIG_ATL1 is not set
498 540
499# 541#
500# Ethernet (10000 Mbit) 542# Ethernet (10000 Mbit)
501# 543#
502# CONFIG_CHELSIO_T1 is not set 544# CONFIG_CHELSIO_T1 is not set
545CONFIG_CHELSIO_T3=y
503# CONFIG_IXGB is not set 546# CONFIG_IXGB is not set
504# CONFIG_S2IO is not set 547# CONFIG_S2IO is not set
505# CONFIG_MYRI10GE is not set 548# CONFIG_MYRI10GE is not set
549CONFIG_NETXEN_NIC=y
506 550
507# 551#
508# Token Ring devices 552# Token Ring devices
@@ -541,6 +585,7 @@ CONFIG_PCNET32=y
541# Input device support 585# Input device support
542# 586#
543CONFIG_INPUT=y 587CONFIG_INPUT=y
588# CONFIG_INPUT_FF_MEMLESS is not set
544 589
545# 590#
546# Userland interfaces 591# Userland interfaces
@@ -618,10 +663,6 @@ CONFIG_LEGACY_PTY_COUNT=256
618# CONFIG_DTLK is not set 663# CONFIG_DTLK is not set
619# CONFIG_R3964 is not set 664# CONFIG_R3964 is not set
620# CONFIG_APPLICOM is not set 665# CONFIG_APPLICOM is not set
621
622#
623# Ftape, the floppy tape device driver
624#
625# CONFIG_DRM is not set 666# CONFIG_DRM is not set
626# CONFIG_RAW_DRIVER is not set 667# CONFIG_RAW_DRIVER is not set
627 668
@@ -629,7 +670,6 @@ CONFIG_LEGACY_PTY_COUNT=256
629# TPM devices 670# TPM devices
630# 671#
631# CONFIG_TCG_TPM is not set 672# CONFIG_TCG_TPM is not set
632# CONFIG_TELCLOCK is not set
633 673
634# 674#
635# I2C support 675# I2C support
@@ -654,14 +694,9 @@ CONFIG_LEGACY_PTY_COUNT=256
654# CONFIG_HWMON_VID is not set 694# CONFIG_HWMON_VID is not set
655 695
656# 696#
657# Misc devices
658#
659
660#
661# Multimedia devices 697# Multimedia devices
662# 698#
663# CONFIG_VIDEO_DEV is not set 699# CONFIG_VIDEO_DEV is not set
664CONFIG_VIDEO_V4L2=y
665 700
666# 701#
667# Digital Video Broadcasting Devices 702# Digital Video Broadcasting Devices
@@ -679,6 +714,7 @@ CONFIG_VIDEO_V4L2=y
679# 714#
680# CONFIG_VGA_CONSOLE is not set 715# CONFIG_VGA_CONSOLE is not set
681CONFIG_DUMMY_CONSOLE=y 716CONFIG_DUMMY_CONSOLE=y
717# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
682 718
683# 719#
684# Sound 720# Sound
@@ -686,6 +722,11 @@ CONFIG_DUMMY_CONSOLE=y
686# CONFIG_SOUND is not set 722# CONFIG_SOUND is not set
687 723
688# 724#
725# HID Devices
726#
727# CONFIG_HID is not set
728
729#
689# USB support 730# USB support
690# 731#
691CONFIG_USB_ARCH_HAS_HCD=y 732CONFIG_USB_ARCH_HAS_HCD=y
@@ -748,16 +789,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
748# 789#
749 790
750# 791#
792# Auxiliary Display support
793#
794
795#
796# Virtualization
797#
798
799#
751# File systems 800# File systems
752# 801#
753CONFIG_EXT2_FS=y 802CONFIG_EXT2_FS=y
754# CONFIG_EXT2_FS_XATTR is not set 803# CONFIG_EXT2_FS_XATTR is not set
755# CONFIG_EXT2_FS_XIP is not set 804# CONFIG_EXT2_FS_XIP is not set
756# CONFIG_EXT3_FS is not set 805# CONFIG_EXT3_FS is not set
806# CONFIG_EXT4DEV_FS is not set
757# CONFIG_REISERFS_FS is not set 807# CONFIG_REISERFS_FS is not set
758# CONFIG_JFS_FS is not set 808# CONFIG_JFS_FS is not set
759# CONFIG_FS_POSIX_ACL is not set 809# CONFIG_FS_POSIX_ACL is not set
760# CONFIG_XFS_FS is not set 810# CONFIG_XFS_FS is not set
811# CONFIG_GFS2_FS is not set
761# CONFIG_OCFS2_FS is not set 812# CONFIG_OCFS2_FS is not set
762# CONFIG_MINIX_FS is not set 813# CONFIG_MINIX_FS is not set
763# CONFIG_ROMFS_FS is not set 814# CONFIG_ROMFS_FS is not set
@@ -787,17 +838,19 @@ CONFIG_FUSE_FS=y
787# 838#
788CONFIG_PROC_FS=y 839CONFIG_PROC_FS=y
789CONFIG_PROC_KCORE=y 840CONFIG_PROC_KCORE=y
841CONFIG_PROC_SYSCTL=y
790CONFIG_SYSFS=y 842CONFIG_SYSFS=y
791# CONFIG_TMPFS is not set 843# CONFIG_TMPFS is not set
792# CONFIG_HUGETLB_PAGE is not set 844# CONFIG_HUGETLB_PAGE is not set
793CONFIG_RAMFS=y 845CONFIG_RAMFS=y
794# CONFIG_CONFIGFS_FS is not set 846CONFIG_CONFIGFS_FS=y
795 847
796# 848#
797# Miscellaneous filesystems 849# Miscellaneous filesystems
798# 850#
799# CONFIG_ADFS_FS is not set 851# CONFIG_ADFS_FS is not set
800# CONFIG_AFFS_FS is not set 852# CONFIG_AFFS_FS is not set
853# CONFIG_ECRYPT_FS is not set
801# CONFIG_HFS_FS is not set 854# CONFIG_HFS_FS is not set
802# CONFIG_HFSPLUS_FS is not set 855# CONFIG_HFSPLUS_FS is not set
803# CONFIG_BEFS_FS is not set 856# CONFIG_BEFS_FS is not set
@@ -829,7 +882,6 @@ CONFIG_SUNRPC=y
829# CONFIG_RPCSEC_GSS_SPKM3 is not set 882# CONFIG_RPCSEC_GSS_SPKM3 is not set
830# CONFIG_SMB_FS is not set 883# CONFIG_SMB_FS is not set
831# CONFIG_CIFS is not set 884# CONFIG_CIFS is not set
832# CONFIG_CIFS_DEBUG2 is not set
833# CONFIG_NCP_FS is not set 885# CONFIG_NCP_FS is not set
834# CONFIG_CODA_FS is not set 886# CONFIG_CODA_FS is not set
835# CONFIG_AFS_FS is not set 887# CONFIG_AFS_FS is not set
@@ -847,6 +899,14 @@ CONFIG_MSDOS_PARTITION=y
847# CONFIG_NLS is not set 899# CONFIG_NLS is not set
848 900
849# 901#
902# Distributed Lock Manager
903#
904CONFIG_DLM=y
905CONFIG_DLM_TCP=y
906# CONFIG_DLM_SCTP is not set
907# CONFIG_DLM_DEBUG is not set
908
909#
850# Profiling support 910# Profiling support
851# 911#
852# CONFIG_PROFILING is not set 912# CONFIG_PROFILING is not set
@@ -856,12 +916,13 @@ CONFIG_MSDOS_PARTITION=y
856# 916#
857CONFIG_TRACE_IRQFLAGS_SUPPORT=y 917CONFIG_TRACE_IRQFLAGS_SUPPORT=y
858# CONFIG_PRINTK_TIME is not set 918# CONFIG_PRINTK_TIME is not set
919CONFIG_ENABLE_MUST_CHECK=y
859# CONFIG_MAGIC_SYSRQ is not set 920# CONFIG_MAGIC_SYSRQ is not set
860# CONFIG_UNUSED_SYMBOLS is not set 921# CONFIG_UNUSED_SYMBOLS is not set
922# CONFIG_DEBUG_FS is not set
923# CONFIG_HEADERS_CHECK is not set
861# CONFIG_DEBUG_KERNEL is not set 924# CONFIG_DEBUG_KERNEL is not set
862CONFIG_LOG_BUF_SHIFT=14 925CONFIG_LOG_BUF_SHIFT=14
863# CONFIG_DEBUG_FS is not set
864# CONFIG_UNWIND_INFO is not set
865CONFIG_CROSSCOMPILE=y 926CONFIG_CROSSCOMPILE=y
866CONFIG_CMDLINE="ip=any" 927CONFIG_CMDLINE="ip=any"
867 928
@@ -876,7 +937,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
876# Cryptographic options 937# Cryptographic options
877# 938#
878CONFIG_CRYPTO=y 939CONFIG_CRYPTO=y
940CONFIG_CRYPTO_ALGAPI=y
941CONFIG_CRYPTO_BLKCIPHER=y
942CONFIG_CRYPTO_HASH=y
943CONFIG_CRYPTO_MANAGER=y
879CONFIG_CRYPTO_HMAC=y 944CONFIG_CRYPTO_HMAC=y
945CONFIG_CRYPTO_XCBC=y
880CONFIG_CRYPTO_NULL=y 946CONFIG_CRYPTO_NULL=y
881CONFIG_CRYPTO_MD4=y 947CONFIG_CRYPTO_MD4=y
882CONFIG_CRYPTO_MD5=y 948CONFIG_CRYPTO_MD5=y
@@ -885,9 +951,16 @@ CONFIG_CRYPTO_SHA256=y
885CONFIG_CRYPTO_SHA512=y 951CONFIG_CRYPTO_SHA512=y
886CONFIG_CRYPTO_WP512=y 952CONFIG_CRYPTO_WP512=y
887CONFIG_CRYPTO_TGR192=y 953CONFIG_CRYPTO_TGR192=y
954CONFIG_CRYPTO_GF128MUL=y
955CONFIG_CRYPTO_ECB=y
956CONFIG_CRYPTO_CBC=y
957CONFIG_CRYPTO_PCBC=y
958CONFIG_CRYPTO_LRW=y
888CONFIG_CRYPTO_DES=y 959CONFIG_CRYPTO_DES=y
960CONFIG_CRYPTO_FCRYPT=y
889CONFIG_CRYPTO_BLOWFISH=y 961CONFIG_CRYPTO_BLOWFISH=y
890CONFIG_CRYPTO_TWOFISH=y 962CONFIG_CRYPTO_TWOFISH=y
963CONFIG_CRYPTO_TWOFISH_COMMON=y
891CONFIG_CRYPTO_SERPENT=y 964CONFIG_CRYPTO_SERPENT=y
892CONFIG_CRYPTO_AES=y 965CONFIG_CRYPTO_AES=y
893CONFIG_CRYPTO_CAST5=y 966CONFIG_CRYPTO_CAST5=y
@@ -899,6 +972,7 @@ CONFIG_CRYPTO_ANUBIS=y
899CONFIG_CRYPTO_DEFLATE=y 972CONFIG_CRYPTO_DEFLATE=y
900CONFIG_CRYPTO_MICHAEL_MIC=y 973CONFIG_CRYPTO_MICHAEL_MIC=y
901CONFIG_CRYPTO_CRC32C=y 974CONFIG_CRYPTO_CRC32C=y
975CONFIG_CRYPTO_CAMELLIA=y
902 976
903# 977#
904# Hardware crypto devices 978# Hardware crypto devices
@@ -907,6 +981,7 @@ CONFIG_CRYPTO_CRC32C=y
907# 981#
908# Library routines 982# Library routines
909# 983#
984CONFIG_BITREVERSE=y
910# CONFIG_CRC_CCITT is not set 985# CONFIG_CRC_CCITT is not set
911CONFIG_CRC16=y 986CONFIG_CRC16=y
912CONFIG_CRC32=y 987CONFIG_CRC32=y
@@ -914,3 +989,5 @@ CONFIG_LIBCRC32C=y
914CONFIG_ZLIB_INFLATE=y 989CONFIG_ZLIB_INFLATE=y
915CONFIG_ZLIB_DEFLATE=y 990CONFIG_ZLIB_DEFLATE=y
916CONFIG_PLIST=y 991CONFIG_PLIST=y
992CONFIG_HAS_IOMEM=y
993CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 8a31ce4be12c..2d717455a82f 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18 3# Linux kernel version: 2.6.20
4# Tue Oct 3 11:57:53 2006 4# Sun Feb 18 21:27:44 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26CONFIG_MACH_DECSTATION=y 27CONFIG_MACH_DECSTATION=y
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MACH_DECSTATION=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +65,14 @@ CONFIG_MACH_DECSTATION=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_EARLY_PRINTK=y 66CONFIG_EARLY_PRINTK=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 78# CONFIG_CPU_BIG_ENDIAN is not set
@@ -116,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_16KB is not set 120# CONFIG_PAGE_SIZE_16KB is not set
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_CPU_HAS_WB=y 126CONFIG_CPU_HAS_WB=y
123CONFIG_GENERIC_HARDIRQS=y 127CONFIG_GENERIC_HARDIRQS=y
@@ -133,6 +137,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 137# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4 138CONFIG_SPLIT_PTLOCK_CPUS=4
135# CONFIG_RESOURCES_64BIT is not set 139# CONFIG_RESOURCES_64BIT is not set
140CONFIG_ZONE_DMA_FLAG=1
136# CONFIG_HZ_48 is not set 141# CONFIG_HZ_48 is not set
137# CONFIG_HZ_100 is not set 142# CONFIG_HZ_100 is not set
138CONFIG_HZ_128=y 143CONFIG_HZ_128=y
@@ -147,6 +152,7 @@ CONFIG_HZ=128
147CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,13 +171,16 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 171CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 172CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 178# CONFIG_TASKSTATS is not set
179# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 181# CONFIG_IKCONFIG is not set
182CONFIG_SYSFS_DEPRECATED=y
173# CONFIG_RELAY is not set 183# CONFIG_RELAY is not set
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
176CONFIG_SYSCTL=y 185CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 186CONFIG_EMBEDDED=y
@@ -246,6 +255,14 @@ CONFIG_BINFMT_ELF=y
246CONFIG_TRAD_SIGNALS=y 255CONFIG_TRAD_SIGNALS=y
247 256
248# 257#
258# Power management options
259#
260CONFIG_PM=y
261# CONFIG_PM_LEGACY is not set
262# CONFIG_PM_DEBUG is not set
263# CONFIG_PM_SYSFS_DEPRECATED is not set
264
265#
249# Networking 266# Networking
250# 267#
251CONFIG_NET=y 268CONFIG_NET=y
@@ -260,7 +277,9 @@ CONFIG_UNIX=y
260CONFIG_XFRM=y 277CONFIG_XFRM=y
261# CONFIG_XFRM_USER is not set 278# CONFIG_XFRM_USER is not set
262# CONFIG_XFRM_SUB_POLICY is not set 279# CONFIG_XFRM_SUB_POLICY is not set
280CONFIG_XFRM_MIGRATE=y
263CONFIG_NET_KEY=m 281CONFIG_NET_KEY=m
282CONFIG_NET_KEY_MIGRATE=y
264CONFIG_INET=y 283CONFIG_INET=y
265CONFIG_IP_MULTICAST=y 284CONFIG_IP_MULTICAST=y
266# CONFIG_IP_ADVANCED_ROUTER is not set 285# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -281,11 +300,13 @@ CONFIG_INET_XFRM_TUNNEL=m
281CONFIG_INET_TUNNEL=m 300CONFIG_INET_TUNNEL=m
282CONFIG_INET_XFRM_MODE_TRANSPORT=m 301CONFIG_INET_XFRM_MODE_TRANSPORT=m
283CONFIG_INET_XFRM_MODE_TUNNEL=m 302CONFIG_INET_XFRM_MODE_TUNNEL=m
303CONFIG_INET_XFRM_MODE_BEET=m
284CONFIG_INET_DIAG=y 304CONFIG_INET_DIAG=y
285CONFIG_INET_TCP_DIAG=y 305CONFIG_INET_TCP_DIAG=y
286# CONFIG_TCP_CONG_ADVANCED is not set 306# CONFIG_TCP_CONG_ADVANCED is not set
287CONFIG_TCP_CONG_CUBIC=y 307CONFIG_TCP_CONG_CUBIC=y
288CONFIG_DEFAULT_TCP_CONG="cubic" 308CONFIG_DEFAULT_TCP_CONG="cubic"
309CONFIG_TCP_MD5SIG=y
289CONFIG_IPV6=m 310CONFIG_IPV6=m
290CONFIG_IPV6_PRIVACY=y 311CONFIG_IPV6_PRIVACY=y
291CONFIG_IPV6_ROUTER_PREF=y 312CONFIG_IPV6_ROUTER_PREF=y
@@ -298,10 +319,12 @@ CONFIG_INET6_XFRM_TUNNEL=m
298CONFIG_INET6_TUNNEL=m 319CONFIG_INET6_TUNNEL=m
299CONFIG_INET6_XFRM_MODE_TRANSPORT=m 320CONFIG_INET6_XFRM_MODE_TRANSPORT=m
300CONFIG_INET6_XFRM_MODE_TUNNEL=m 321CONFIG_INET6_XFRM_MODE_TUNNEL=m
322CONFIG_INET6_XFRM_MODE_BEET=m
301CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m 323CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
324CONFIG_IPV6_SIT=m
302# CONFIG_IPV6_TUNNEL is not set 325# CONFIG_IPV6_TUNNEL is not set
303CONFIG_IPV6_SUBTREES=y
304CONFIG_IPV6_MULTIPLE_TABLES=y 326CONFIG_IPV6_MULTIPLE_TABLES=y
327CONFIG_IPV6_SUBTREES=y
305CONFIG_NETWORK_SECMARK=y 328CONFIG_NETWORK_SECMARK=y
306# CONFIG_NETFILTER is not set 329# CONFIG_NETFILTER is not set
307 330
@@ -389,6 +412,10 @@ CONFIG_BLK_DEV_LOOP=m
389# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
390 413
391# 414#
415# Misc devices
416#
417
418#
392# ATA/ATAPI/MFM/RLL support 419# ATA/ATAPI/MFM/RLL support
393# 420#
394# CONFIG_IDE is not set 421# CONFIG_IDE is not set
@@ -398,6 +425,7 @@ CONFIG_BLK_DEV_LOOP=m
398# 425#
399# CONFIG_RAID_ATTRS is not set 426# CONFIG_RAID_ATTRS is not set
400CONFIG_SCSI=y 427CONFIG_SCSI=y
428CONFIG_SCSI_TGT=m
401# CONFIG_SCSI_NETLINK is not set 429# CONFIG_SCSI_NETLINK is not set
402CONFIG_SCSI_PROC_FS=y 430CONFIG_SCSI_PROC_FS=y
403 431
@@ -418,6 +446,7 @@ CONFIG_CHR_DEV_SG=m
418# CONFIG_SCSI_MULTI_LUN is not set 446# CONFIG_SCSI_MULTI_LUN is not set
419CONFIG_SCSI_CONSTANTS=y 447CONFIG_SCSI_CONSTANTS=y
420# CONFIG_SCSI_LOGGING is not set 448# CONFIG_SCSI_LOGGING is not set
449CONFIG_SCSI_SCAN_ASYNC=y
421 450
422# 451#
423# SCSI Transports 452# SCSI Transports
@@ -502,6 +531,9 @@ CONFIG_DECLANCE=y
502# Wan interfaces 531# Wan interfaces
503# 532#
504# CONFIG_WAN is not set 533# CONFIG_WAN is not set
534CONFIG_FDDI=y
535CONFIG_DEFXX=m
536CONFIG_DEFXX_MMIO=y
505# CONFIG_PPP is not set 537# CONFIG_PPP is not set
506# CONFIG_SLIP is not set 538# CONFIG_SLIP is not set
507# CONFIG_SHAPER is not set 539# CONFIG_SHAPER is not set
@@ -565,17 +597,12 @@ CONFIG_LEGACY_PTY_COUNT=256
565CONFIG_RTC=y 597CONFIG_RTC=y
566# CONFIG_DTLK is not set 598# CONFIG_DTLK is not set
567# CONFIG_R3964 is not set 599# CONFIG_R3964 is not set
568
569#
570# Ftape, the floppy tape device driver
571#
572# CONFIG_RAW_DRIVER is not set 600# CONFIG_RAW_DRIVER is not set
573 601
574# 602#
575# TPM devices 603# TPM devices
576# 604#
577# CONFIG_TCG_TPM is not set 605# CONFIG_TCG_TPM is not set
578# CONFIG_TELCLOCK is not set
579 606
580# 607#
581# I2C support 608# I2C support
@@ -600,14 +627,9 @@ CONFIG_RTC=y
600# CONFIG_HWMON_VID is not set 627# CONFIG_HWMON_VID is not set
601 628
602# 629#
603# Misc devices
604#
605
606#
607# Multimedia devices 630# Multimedia devices
608# 631#
609# CONFIG_VIDEO_DEV is not set 632# CONFIG_VIDEO_DEV is not set
610CONFIG_VIDEO_V4L2=y
611 633
612# 634#
613# Digital Video Broadcasting Devices 635# Digital Video Broadcasting Devices
@@ -622,6 +644,7 @@ CONFIG_FB=y
622CONFIG_FB_CFB_FILLRECT=y 644CONFIG_FB_CFB_FILLRECT=y
623CONFIG_FB_CFB_COPYAREA=y 645CONFIG_FB_CFB_COPYAREA=y
624CONFIG_FB_CFB_IMAGEBLIT=y 646CONFIG_FB_CFB_IMAGEBLIT=y
647# CONFIG_FB_SVGALIB is not set
625# CONFIG_FB_MACMODES is not set 648# CONFIG_FB_MACMODES is not set
626# CONFIG_FB_BACKLIGHT is not set 649# CONFIG_FB_BACKLIGHT is not set
627# CONFIG_FB_MODE_HELPERS is not set 650# CONFIG_FB_MODE_HELPERS is not set
@@ -709,6 +732,14 @@ CONFIG_LOGO_DEC_CLUT224=y
709# 732#
710 733
711# 734#
735# Auxiliary Display support
736#
737
738#
739# Virtualization
740#
741
742#
712# File systems 743# File systems
713# 744#
714CONFIG_EXT2_FS=y 745CONFIG_EXT2_FS=y
@@ -720,6 +751,7 @@ CONFIG_EXT3_FS=y
720CONFIG_EXT3_FS_XATTR=y 751CONFIG_EXT3_FS_XATTR=y
721CONFIG_EXT3_FS_POSIX_ACL=y 752CONFIG_EXT3_FS_POSIX_ACL=y
722CONFIG_EXT3_FS_SECURITY=y 753CONFIG_EXT3_FS_SECURITY=y
754# CONFIG_EXT4DEV_FS is not set
723CONFIG_JBD=y 755CONFIG_JBD=y
724# CONFIG_JBD_DEBUG is not set 756# CONFIG_JBD_DEBUG is not set
725CONFIG_FS_MBCACHE=y 757CONFIG_FS_MBCACHE=y
@@ -727,6 +759,7 @@ CONFIG_FS_MBCACHE=y
727# CONFIG_JFS_FS is not set 759# CONFIG_JFS_FS is not set
728CONFIG_FS_POSIX_ACL=y 760CONFIG_FS_POSIX_ACL=y
729# CONFIG_XFS_FS is not set 761# CONFIG_XFS_FS is not set
762# CONFIG_GFS2_FS is not set
730# CONFIG_OCFS2_FS is not set 763# CONFIG_OCFS2_FS is not set
731# CONFIG_MINIX_FS is not set 764# CONFIG_MINIX_FS is not set
732# CONFIG_ROMFS_FS is not set 765# CONFIG_ROMFS_FS is not set
@@ -737,6 +770,7 @@ CONFIG_DNOTIFY=y
737# CONFIG_AUTOFS_FS is not set 770# CONFIG_AUTOFS_FS is not set
738# CONFIG_AUTOFS4_FS is not set 771# CONFIG_AUTOFS4_FS is not set
739CONFIG_FUSE_FS=m 772CONFIG_FUSE_FS=m
773CONFIG_GENERIC_ACL=y
740 774
741# 775#
742# CD-ROM/DVD Filesystems 776# CD-ROM/DVD Filesystems
@@ -806,7 +840,6 @@ CONFIG_SUNRPC=y
806# CONFIG_CODA_FS is not set 840# CONFIG_CODA_FS is not set
807# CONFIG_AFS_FS is not set 841# CONFIG_AFS_FS is not set
808# CONFIG_9P_FS is not set 842# CONFIG_9P_FS is not set
809CONFIG_GENERIC_ACL=y
810 843
811# 844#
812# Partition Types 845# Partition Types
@@ -835,6 +868,14 @@ CONFIG_ULTRIX_PARTITION=y
835# CONFIG_NLS is not set 868# CONFIG_NLS is not set
836 869
837# 870#
871# Distributed Lock Manager
872#
873CONFIG_DLM=m
874CONFIG_DLM_TCP=y
875# CONFIG_DLM_SCTP is not set
876# CONFIG_DLM_DEBUG is not set
877
878#
838# Profiling support 879# Profiling support
839# 880#
840# CONFIG_PROFILING is not set 881# CONFIG_PROFILING is not set
@@ -847,9 +888,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
847CONFIG_ENABLE_MUST_CHECK=y 888CONFIG_ENABLE_MUST_CHECK=y
848CONFIG_MAGIC_SYSRQ=y 889CONFIG_MAGIC_SYSRQ=y
849# CONFIG_UNUSED_SYMBOLS is not set 890# CONFIG_UNUSED_SYMBOLS is not set
891# CONFIG_DEBUG_FS is not set
892# CONFIG_HEADERS_CHECK is not set
850# CONFIG_DEBUG_KERNEL is not set 893# CONFIG_DEBUG_KERNEL is not set
851CONFIG_LOG_BUF_SHIFT=14 894CONFIG_LOG_BUF_SHIFT=14
852# CONFIG_DEBUG_FS is not set
853CONFIG_CROSSCOMPILE=y 895CONFIG_CROSSCOMPILE=y
854CONFIG_CMDLINE="" 896CONFIG_CMDLINE=""
855 897
@@ -866,19 +908,24 @@ CONFIG_CRYPTO=y
866CONFIG_CRYPTO_ALGAPI=y 908CONFIG_CRYPTO_ALGAPI=y
867CONFIG_CRYPTO_BLKCIPHER=m 909CONFIG_CRYPTO_BLKCIPHER=m
868CONFIG_CRYPTO_HASH=y 910CONFIG_CRYPTO_HASH=y
869CONFIG_CRYPTO_MANAGER=m 911CONFIG_CRYPTO_MANAGER=y
870CONFIG_CRYPTO_HMAC=y 912CONFIG_CRYPTO_HMAC=y
913CONFIG_CRYPTO_XCBC=m
871CONFIG_CRYPTO_NULL=m 914CONFIG_CRYPTO_NULL=m
872CONFIG_CRYPTO_MD4=m 915CONFIG_CRYPTO_MD4=m
873CONFIG_CRYPTO_MD5=m 916CONFIG_CRYPTO_MD5=y
874CONFIG_CRYPTO_SHA1=m 917CONFIG_CRYPTO_SHA1=m
875CONFIG_CRYPTO_SHA256=m 918CONFIG_CRYPTO_SHA256=m
876CONFIG_CRYPTO_SHA512=m 919CONFIG_CRYPTO_SHA512=m
877CONFIG_CRYPTO_WP512=m 920CONFIG_CRYPTO_WP512=m
878CONFIG_CRYPTO_TGR192=m 921CONFIG_CRYPTO_TGR192=m
922CONFIG_CRYPTO_GF128MUL=m
879CONFIG_CRYPTO_ECB=m 923CONFIG_CRYPTO_ECB=m
880CONFIG_CRYPTO_CBC=m 924CONFIG_CRYPTO_CBC=m
925CONFIG_CRYPTO_PCBC=m
926CONFIG_CRYPTO_LRW=m
881CONFIG_CRYPTO_DES=m 927CONFIG_CRYPTO_DES=m
928CONFIG_CRYPTO_FCRYPT=m
882CONFIG_CRYPTO_BLOWFISH=m 929CONFIG_CRYPTO_BLOWFISH=m
883CONFIG_CRYPTO_TWOFISH=m 930CONFIG_CRYPTO_TWOFISH=m
884CONFIG_CRYPTO_TWOFISH_COMMON=m 931CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -893,6 +940,7 @@ CONFIG_CRYPTO_ANUBIS=m
893CONFIG_CRYPTO_DEFLATE=m 940CONFIG_CRYPTO_DEFLATE=m
894CONFIG_CRYPTO_MICHAEL_MIC=m 941CONFIG_CRYPTO_MICHAEL_MIC=m
895CONFIG_CRYPTO_CRC32C=m 942CONFIG_CRYPTO_CRC32C=m
943CONFIG_CRYPTO_CAMELLIA=m
896# CONFIG_CRYPTO_TEST is not set 944# CONFIG_CRYPTO_TEST is not set
897 945
898# 946#
@@ -902,6 +950,7 @@ CONFIG_CRYPTO_CRC32C=m
902# 950#
903# Library routines 951# Library routines
904# 952#
953CONFIG_BITREVERSE=y
905# CONFIG_CRC_CCITT is not set 954# CONFIG_CRC_CCITT is not set
906# CONFIG_CRC16 is not set 955# CONFIG_CRC16 is not set
907CONFIG_CRC32=y 956CONFIG_CRC32=y
@@ -909,3 +958,5 @@ CONFIG_LIBCRC32C=m
909CONFIG_ZLIB_INFLATE=m 958CONFIG_ZLIB_INFLATE=m
910CONFIG_ZLIB_DEFLATE=m 959CONFIG_ZLIB_DEFLATE=m
911CONFIG_PLIST=y 960CONFIG_PLIST=y
961CONFIG_HAS_IOMEM=y
962CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 6fa4f914f6e4..0ee2fbb35f14 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc2 3# Linux kernel version: 2.6.20
4# Tue Jul 25 23:15:03 2006 4# Sun Feb 18 21:27:44 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -70,10 +70,14 @@ CONFIG_CASIO_E55=y
70# CONFIG_VICTOR_MPC30X is not set 70# CONFIG_VICTOR_MPC30X is not set
71# CONFIG_ZAO_CAPCELLA is not set 71# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73# CONFIG_ARCH_HAS_ILOG2_U32 is not set
74# CONFIG_ARCH_HAS_ILOG2_U64 is not set
73CONFIG_GENERIC_FIND_NEXT_BIT=y 75CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y 76CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_GENERIC_TIME=y
76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 79CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
80CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_DMA_NONCOHERENT=y 81CONFIG_DMA_NONCOHERENT=y
78CONFIG_DMA_NEED_PCI_MAP_STATE=y 82CONFIG_DMA_NEED_PCI_MAP_STATE=y
79# CONFIG_CPU_BIG_ENDIAN is not set 83# CONFIG_CPU_BIG_ENDIAN is not set
@@ -106,6 +110,7 @@ CONFIG_CPU_VR41XX=y
106# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y 111CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
113CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 116
@@ -119,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_16KB is not set 124# CONFIG_PAGE_SIZE_16KB is not set
120# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
121CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
122# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
125CONFIG_CPU_HAS_SYNC=y 130CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 131CONFIG_GENERIC_HARDIRQS=y
@@ -135,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -147,6 +153,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,13 +172,17 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 173CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
169CONFIG_SYSCTL=y 178# CONFIG_UTS_NS is not set
170# CONFIG_IKCONFIG is not set 179# CONFIG_IKCONFIG is not set
180CONFIG_SYSFS_DEPRECATED=y
171# CONFIG_RELAY is not set 181# CONFIG_RELAY is not set
172CONFIG_INITRAMFS_SOURCE=""
173# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
183CONFIG_SYSCTL=y
174CONFIG_EMBEDDED=y 184CONFIG_EMBEDDED=y
185CONFIG_SYSCTL_SYSCALL=y
175CONFIG_KALLSYMS=y 186CONFIG_KALLSYMS=y
176# CONFIG_KALLSYMS_EXTRA_PASS is not set 187# CONFIG_KALLSYMS_EXTRA_PASS is not set
177# CONFIG_HOTPLUG is not set 188# CONFIG_HOTPLUG is not set
@@ -179,12 +190,12 @@ CONFIG_PRINTK=y
179CONFIG_BUG=y 190CONFIG_BUG=y
180CONFIG_ELF_CORE=y 191CONFIG_ELF_CORE=y
181CONFIG_BASE_FULL=y 192CONFIG_BASE_FULL=y
182CONFIG_RT_MUTEXES=y
183CONFIG_FUTEX=y 193CONFIG_FUTEX=y
184CONFIG_EPOLL=y 194CONFIG_EPOLL=y
185CONFIG_SHMEM=y 195CONFIG_SHMEM=y
186CONFIG_SLAB=y 196CONFIG_SLAB=y
187CONFIG_VM_EVENT_COUNTERS=y 197CONFIG_VM_EVENT_COUNTERS=y
198CONFIG_RT_MUTEXES=y
188# CONFIG_TINY_SHMEM is not set 199# CONFIG_TINY_SHMEM is not set
189CONFIG_BASE_SMALL=0 200CONFIG_BASE_SMALL=0
190# CONFIG_SLOB is not set 201# CONFIG_SLOB is not set
@@ -202,6 +213,7 @@ CONFIG_KMOD=y
202# 213#
203# Block layer 214# Block layer
204# 215#
216CONFIG_BLOCK=y
205# CONFIG_LBD is not set 217# CONFIG_LBD is not set
206# CONFIG_BLK_DEV_IO_TRACE is not set 218# CONFIG_BLK_DEV_IO_TRACE is not set
207# CONFIG_LSF is not set 219# CONFIG_LSF is not set
@@ -241,6 +253,14 @@ CONFIG_BINFMT_ELF=y
241CONFIG_TRAD_SIGNALS=y 253CONFIG_TRAD_SIGNALS=y
242 254
243# 255#
256# Power management options
257#
258CONFIG_PM=y
259# CONFIG_PM_LEGACY is not set
260# CONFIG_PM_DEBUG is not set
261# CONFIG_PM_SYSFS_DEPRECATED is not set
262
263#
244# Networking 264# Networking
245# 265#
246# CONFIG_NET is not set 266# CONFIG_NET is not set
@@ -288,9 +308,14 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
288# CONFIG_CDROM_PKTCDVD is not set 308# CONFIG_CDROM_PKTCDVD is not set
289 309
290# 310#
311# Misc devices
312#
313
314#
291# ATA/ATAPI/MFM/RLL support 315# ATA/ATAPI/MFM/RLL support
292# 316#
293CONFIG_IDE=y 317CONFIG_IDE=y
318CONFIG_IDE_MAX_HWIFS=4
294CONFIG_BLK_DEV_IDE=y 319CONFIG_BLK_DEV_IDE=y
295 320
296# 321#
@@ -319,6 +344,12 @@ CONFIG_IDE_GENERIC=y
319# 344#
320# CONFIG_RAID_ATTRS is not set 345# CONFIG_RAID_ATTRS is not set
321# CONFIG_SCSI is not set 346# CONFIG_SCSI is not set
347# CONFIG_SCSI_NETLINK is not set
348
349#
350# Serial ATA (prod) and Parallel ATA (experimental) drivers
351#
352# CONFIG_ATA is not set
322 353
323# 354#
324# Old CD-ROM drivers (not SCSI, not IDE) 355# Old CD-ROM drivers (not SCSI, not IDE)
@@ -356,6 +387,7 @@ CONFIG_IDE_GENERIC=y
356# Input device support 387# Input device support
357# 388#
358CONFIG_INPUT=y 389CONFIG_INPUT=y
390# CONFIG_INPUT_FF_MEMLESS is not set
359 391
360# 392#
361# Userland interfaces 393# Userland interfaces
@@ -436,10 +468,6 @@ CONFIG_WATCHDOG=y
436# CONFIG_GEN_RTC is not set 468# CONFIG_GEN_RTC is not set
437# CONFIG_DTLK is not set 469# CONFIG_DTLK is not set
438# CONFIG_R3964 is not set 470# CONFIG_R3964 is not set
439
440#
441# Ftape, the floppy tape device driver
442#
443CONFIG_GPIO_VR41XX=y 471CONFIG_GPIO_VR41XX=y
444# CONFIG_RAW_DRIVER is not set 472# CONFIG_RAW_DRIVER is not set
445 473
@@ -447,7 +475,6 @@ CONFIG_GPIO_VR41XX=y
447# TPM devices 475# TPM devices
448# 476#
449# CONFIG_TCG_TPM is not set 477# CONFIG_TCG_TPM is not set
450# CONFIG_TELCLOCK is not set
451 478
452# 479#
453# I2C support 480# I2C support
@@ -463,6 +490,7 @@ CONFIG_GPIO_VR41XX=y
463# 490#
464# Dallas's 1-wire bus 491# Dallas's 1-wire bus
465# 492#
493# CONFIG_W1 is not set
466 494
467# 495#
468# Hardware Monitoring support 496# Hardware Monitoring support
@@ -471,14 +499,9 @@ CONFIG_GPIO_VR41XX=y
471# CONFIG_HWMON_VID is not set 499# CONFIG_HWMON_VID is not set
472 500
473# 501#
474# Misc devices
475#
476
477#
478# Multimedia devices 502# Multimedia devices
479# 503#
480# CONFIG_VIDEO_DEV is not set 504# CONFIG_VIDEO_DEV is not set
481CONFIG_VIDEO_V4L2=y
482 505
483# 506#
484# Digital Video Broadcasting Devices 507# Digital Video Broadcasting Devices
@@ -496,6 +519,7 @@ CONFIG_VIDEO_V4L2=y
496# CONFIG_VGA_CONSOLE is not set 519# CONFIG_VGA_CONSOLE is not set
497# CONFIG_MDA_CONSOLE is not set 520# CONFIG_MDA_CONSOLE is not set
498CONFIG_DUMMY_CONSOLE=y 521CONFIG_DUMMY_CONSOLE=y
522# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
499 523
500# 524#
501# Sound 525# Sound
@@ -503,6 +527,12 @@ CONFIG_DUMMY_CONSOLE=y
503# CONFIG_SOUND is not set 527# CONFIG_SOUND is not set
504 528
505# 529#
530# HID Devices
531#
532CONFIG_HID=y
533# CONFIG_HID_DEBUG is not set
534
535#
506# USB support 536# USB support
507# 537#
508# CONFIG_USB_ARCH_HAS_HCD is not set 538# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -563,16 +593,26 @@ CONFIG_DUMMY_CONSOLE=y
563# 593#
564 594
565# 595#
596# Auxiliary Display support
597#
598
599#
600# Virtualization
601#
602
603#
566# File systems 604# File systems
567# 605#
568CONFIG_EXT2_FS=y 606CONFIG_EXT2_FS=y
569# CONFIG_EXT2_FS_XATTR is not set 607# CONFIG_EXT2_FS_XATTR is not set
570# CONFIG_EXT2_FS_XIP is not set 608# CONFIG_EXT2_FS_XIP is not set
571# CONFIG_EXT3_FS is not set 609# CONFIG_EXT3_FS is not set
610# CONFIG_EXT4DEV_FS is not set
572# CONFIG_REISERFS_FS is not set 611# CONFIG_REISERFS_FS is not set
573# CONFIG_JFS_FS is not set 612# CONFIG_JFS_FS is not set
574# CONFIG_FS_POSIX_ACL is not set 613CONFIG_FS_POSIX_ACL=y
575# CONFIG_XFS_FS is not set 614# CONFIG_XFS_FS is not set
615# CONFIG_GFS2_FS is not set
576# CONFIG_MINIX_FS is not set 616# CONFIG_MINIX_FS is not set
577# CONFIG_ROMFS_FS is not set 617# CONFIG_ROMFS_FS is not set
578CONFIG_INOTIFY=y 618CONFIG_INOTIFY=y
@@ -582,6 +622,7 @@ CONFIG_DNOTIFY=y
582# CONFIG_AUTOFS_FS is not set 622# CONFIG_AUTOFS_FS is not set
583CONFIG_AUTOFS4_FS=y 623CONFIG_AUTOFS4_FS=y
584CONFIG_FUSE_FS=m 624CONFIG_FUSE_FS=m
625CONFIG_GENERIC_ACL=y
585 626
586# 627#
587# CD-ROM/DVD Filesystems 628# CD-ROM/DVD Filesystems
@@ -601,8 +642,10 @@ CONFIG_FUSE_FS=m
601# 642#
602CONFIG_PROC_FS=y 643CONFIG_PROC_FS=y
603CONFIG_PROC_KCORE=y 644CONFIG_PROC_KCORE=y
645CONFIG_PROC_SYSCTL=y
604CONFIG_SYSFS=y 646CONFIG_SYSFS=y
605CONFIG_TMPFS=y 647CONFIG_TMPFS=y
648CONFIG_TMPFS_POSIX_ACL=y
606# CONFIG_HUGETLB_PAGE is not set 649# CONFIG_HUGETLB_PAGE is not set
607CONFIG_RAMFS=y 650CONFIG_RAMFS=y
608# CONFIG_CONFIGFS_FS is not set 651# CONFIG_CONFIGFS_FS is not set
@@ -645,11 +688,13 @@ CONFIG_MSDOS_PARTITION=y
645# 688#
646CONFIG_TRACE_IRQFLAGS_SUPPORT=y 689CONFIG_TRACE_IRQFLAGS_SUPPORT=y
647# CONFIG_PRINTK_TIME is not set 690# CONFIG_PRINTK_TIME is not set
691CONFIG_ENABLE_MUST_CHECK=y
648# CONFIG_MAGIC_SYSRQ is not set 692# CONFIG_MAGIC_SYSRQ is not set
649# CONFIG_UNUSED_SYMBOLS is not set 693# CONFIG_UNUSED_SYMBOLS is not set
694# CONFIG_DEBUG_FS is not set
695# CONFIG_HEADERS_CHECK is not set
650# CONFIG_DEBUG_KERNEL is not set 696# CONFIG_DEBUG_KERNEL is not set
651CONFIG_LOG_BUF_SHIFT=14 697CONFIG_LOG_BUF_SHIFT=14
652# CONFIG_DEBUG_FS is not set
653CONFIG_CROSSCOMPILE=y 698CONFIG_CROSSCOMPILE=y
654CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" 699CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
655 700
@@ -665,10 +710,6 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
665# CONFIG_CRYPTO is not set 710# CONFIG_CRYPTO is not set
666 711
667# 712#
668# Hardware crypto devices
669#
670
671#
672# Library routines 713# Library routines
673# 714#
674# CONFIG_CRC_CCITT is not set 715# CONFIG_CRC_CCITT is not set
@@ -676,3 +717,5 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
676# CONFIG_CRC32 is not set 717# CONFIG_CRC32 is not set
677# CONFIG_LIBCRC32C is not set 718# CONFIG_LIBCRC32C is not set
678CONFIG_PLIST=y 719CONFIG_PLIST=y
720CONFIG_HAS_IOMEM=y
721CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/emma2rh_defconfig b/arch/mips/configs/emma2rh_defconfig
index 4c9d0405a5df..218fe6e5f2db 100644
--- a/arch/mips/configs/emma2rh_defconfig
+++ b/arch/mips/configs/emma2rh_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:05 2006 4# Sun Feb 18 21:27:46 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MARKEINS=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -116,8 +120,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_16KB is not set 120# CONFIG_PAGE_SIZE_16KB is not set
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_MIPS_MT_DISABLED=y 122CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 123# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 125# CONFIG_MIPS_VPE_LOADER is not set
122# CONFIG_64BIT_PHYS_ADDR is not set 126# CONFIG_64BIT_PHYS_ADDR is not set
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
@@ -134,6 +138,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 139CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 140# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 142# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 143# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 144# CONFIG_HZ_128 is not set
@@ -147,6 +152,7 @@ CONFIG_HZ=1000
147# CONFIG_PREEMPT_VOLUNTARY is not set 152# CONFIG_PREEMPT_VOLUNTARY is not set
148CONFIG_PREEMPT=y 153CONFIG_PREEMPT=y
149CONFIG_PREEMPT_BKL=y 154CONFIG_PREEMPT_BKL=y
155# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,17 +172,22 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169CONFIG_POSIX_MQUEUE=y 177CONFIG_POSIX_MQUEUE=y
170CONFIG_BSD_PROCESS_ACCT=y 178CONFIG_BSD_PROCESS_ACCT=y
171# CONFIG_BSD_PROCESS_ACCT_V3 is not set 179# CONFIG_BSD_PROCESS_ACCT_V3 is not set
172CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
174CONFIG_IKCONFIG=y 183CONFIG_IKCONFIG=y
175CONFIG_IKCONFIG_PROC=y 184CONFIG_IKCONFIG_PROC=y
185CONFIG_SYSFS_DEPRECATED=y
176# CONFIG_RELAY is not set 186# CONFIG_RELAY is not set
177CONFIG_INITRAMFS_SOURCE=""
178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
180CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_HOTPLUG=y 193CONFIG_HOTPLUG=y
@@ -184,12 +195,12 @@ CONFIG_PRINTK=y
184CONFIG_BUG=y 195CONFIG_BUG=y
185CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
187CONFIG_RT_MUTEXES=y
188CONFIG_FUTEX=y 198CONFIG_FUTEX=y
189CONFIG_EPOLL=y 199CONFIG_EPOLL=y
190CONFIG_SHMEM=y 200CONFIG_SHMEM=y
191CONFIG_SLAB=y 201CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
195# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -207,6 +218,7 @@ CONFIG_KMOD=y
207# 218#
208# Block layer 219# Block layer
209# 220#
221CONFIG_BLOCK=y
210CONFIG_LBD=y 222CONFIG_LBD=y
211# CONFIG_BLK_DEV_IO_TRACE is not set 223# CONFIG_BLK_DEV_IO_TRACE is not set
212# CONFIG_LSF is not set 224# CONFIG_LSF is not set
@@ -249,6 +261,14 @@ CONFIG_BINFMT_ELF=y
249CONFIG_TRAD_SIGNALS=y 261CONFIG_TRAD_SIGNALS=y
250 262
251# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
252# Networking 272# Networking
253# 273#
254CONFIG_NET=y 274CONFIG_NET=y
@@ -262,7 +282,10 @@ CONFIG_PACKET_MMAP=y
262CONFIG_UNIX=y 282CONFIG_UNIX=y
263CONFIG_XFRM=y 283CONFIG_XFRM=y
264# CONFIG_XFRM_USER is not set 284# CONFIG_XFRM_USER is not set
285# CONFIG_XFRM_SUB_POLICY is not set
286CONFIG_XFRM_MIGRATE=y
265CONFIG_NET_KEY=y 287CONFIG_NET_KEY=y
288CONFIG_NET_KEY_MIGRATE=y
266CONFIG_INET=y 289CONFIG_INET=y
267CONFIG_IP_MULTICAST=y 290CONFIG_IP_MULTICAST=y
268CONFIG_IP_ADVANCED_ROUTER=y 291CONFIG_IP_ADVANCED_ROUTER=y
@@ -270,7 +293,6 @@ CONFIG_ASK_IP_FIB_HASH=y
270# CONFIG_IP_FIB_TRIE is not set 293# CONFIG_IP_FIB_TRIE is not set
271CONFIG_IP_FIB_HASH=y 294CONFIG_IP_FIB_HASH=y
272CONFIG_IP_MULTIPLE_TABLES=y 295CONFIG_IP_MULTIPLE_TABLES=y
273# CONFIG_IP_ROUTE_FWMARK is not set
274CONFIG_IP_ROUTE_MULTIPATH=y 296CONFIG_IP_ROUTE_MULTIPATH=y
275# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 297# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
276CONFIG_IP_ROUTE_VERBOSE=y 298CONFIG_IP_ROUTE_VERBOSE=y
@@ -287,13 +309,16 @@ CONFIG_SYN_COOKIES=y
287# CONFIG_INET_ESP is not set 309# CONFIG_INET_ESP is not set
288# CONFIG_INET_IPCOMP is not set 310# CONFIG_INET_IPCOMP is not set
289# CONFIG_INET_XFRM_TUNNEL is not set 311# CONFIG_INET_XFRM_TUNNEL is not set
290# CONFIG_INET_TUNNEL is not set 312CONFIG_INET_TUNNEL=m
291CONFIG_INET_XFRM_MODE_TRANSPORT=m 313CONFIG_INET_XFRM_MODE_TRANSPORT=m
292CONFIG_INET_XFRM_MODE_TUNNEL=m 314CONFIG_INET_XFRM_MODE_TUNNEL=m
315CONFIG_INET_XFRM_MODE_BEET=m
293CONFIG_INET_DIAG=y 316CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 317CONFIG_INET_TCP_DIAG=y
295# CONFIG_TCP_CONG_ADVANCED is not set 318# CONFIG_TCP_CONG_ADVANCED is not set
296CONFIG_TCP_CONG_BIC=y 319CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic"
321CONFIG_TCP_MD5SIG=y
297 322
298# 323#
299# IP: Virtual Server Configuration 324# IP: Virtual Server Configuration
@@ -305,11 +330,17 @@ CONFIG_IPV6=m
305# CONFIG_INET6_AH is not set 330# CONFIG_INET6_AH is not set
306# CONFIG_INET6_ESP is not set 331# CONFIG_INET6_ESP is not set
307# CONFIG_INET6_IPCOMP is not set 332# CONFIG_INET6_IPCOMP is not set
333CONFIG_IPV6_MIP6=y
308# CONFIG_INET6_XFRM_TUNNEL is not set 334# CONFIG_INET6_XFRM_TUNNEL is not set
309# CONFIG_INET6_TUNNEL is not set 335# CONFIG_INET6_TUNNEL is not set
310CONFIG_INET6_XFRM_MODE_TRANSPORT=m 336CONFIG_INET6_XFRM_MODE_TRANSPORT=m
311CONFIG_INET6_XFRM_MODE_TUNNEL=m 337CONFIG_INET6_XFRM_MODE_TUNNEL=m
338CONFIG_INET6_XFRM_MODE_BEET=m
339CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
340CONFIG_IPV6_SIT=m
312# CONFIG_IPV6_TUNNEL is not set 341# CONFIG_IPV6_TUNNEL is not set
342CONFIG_IPV6_MULTIPLE_TABLES=y
343CONFIG_IPV6_SUBTREES=y
313CONFIG_NETWORK_SECMARK=y 344CONFIG_NETWORK_SECMARK=y
314CONFIG_NETFILTER=y 345CONFIG_NETFILTER=y
315# CONFIG_NETFILTER_DEBUG is not set 346# CONFIG_NETFILTER_DEBUG is not set
@@ -318,19 +349,125 @@ CONFIG_NETFILTER=y
318# Core Netfilter Configuration 349# Core Netfilter Configuration
319# 350#
320# CONFIG_NETFILTER_NETLINK is not set 351# CONFIG_NETFILTER_NETLINK is not set
321# CONFIG_NF_CONNTRACK is not set 352CONFIG_NF_CONNTRACK_ENABLED=m
322# CONFIG_NETFILTER_XTABLES is not set 353CONFIG_NF_CONNTRACK_SUPPORT=y
354# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
355CONFIG_NF_CONNTRACK=m
356CONFIG_NF_CT_ACCT=y
357CONFIG_NF_CONNTRACK_MARK=y
358CONFIG_NF_CONNTRACK_SECMARK=y
359CONFIG_NF_CONNTRACK_EVENTS=y
360CONFIG_NF_CT_PROTO_GRE=m
361CONFIG_NF_CT_PROTO_SCTP=m
362CONFIG_NF_CONNTRACK_AMANDA=m
363CONFIG_NF_CONNTRACK_FTP=m
364CONFIG_NF_CONNTRACK_H323=m
365CONFIG_NF_CONNTRACK_IRC=m
366# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
367CONFIG_NF_CONNTRACK_PPTP=m
368CONFIG_NF_CONNTRACK_SANE=m
369CONFIG_NF_CONNTRACK_SIP=m
370CONFIG_NF_CONNTRACK_TFTP=m
371CONFIG_NETFILTER_XTABLES=m
372CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
373CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
374CONFIG_NETFILTER_XT_TARGET_DSCP=m
375CONFIG_NETFILTER_XT_TARGET_MARK=m
376CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
377CONFIG_NETFILTER_XT_TARGET_NFLOG=m
378CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
379CONFIG_NETFILTER_XT_TARGET_SECMARK=m
380CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
381CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
382CONFIG_NETFILTER_XT_MATCH_COMMENT=m
383CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
384CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
385CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
386CONFIG_NETFILTER_XT_MATCH_DCCP=m
387CONFIG_NETFILTER_XT_MATCH_DSCP=m
388CONFIG_NETFILTER_XT_MATCH_ESP=m
389CONFIG_NETFILTER_XT_MATCH_HELPER=m
390CONFIG_NETFILTER_XT_MATCH_LENGTH=m
391CONFIG_NETFILTER_XT_MATCH_LIMIT=m
392CONFIG_NETFILTER_XT_MATCH_MAC=m
393CONFIG_NETFILTER_XT_MATCH_MARK=m
394CONFIG_NETFILTER_XT_MATCH_POLICY=m
395CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
396CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
397CONFIG_NETFILTER_XT_MATCH_QUOTA=m
398CONFIG_NETFILTER_XT_MATCH_REALM=m
399CONFIG_NETFILTER_XT_MATCH_SCTP=m
400CONFIG_NETFILTER_XT_MATCH_STATE=m
401CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
402CONFIG_NETFILTER_XT_MATCH_STRING=m
403CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
404CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
323 405
324# 406#
325# IP: Netfilter Configuration 407# IP: Netfilter Configuration
326# 408#
327# CONFIG_IP_NF_CONNTRACK is not set 409CONFIG_NF_CONNTRACK_IPV4=m
410CONFIG_NF_CONNTRACK_PROC_COMPAT=y
328# CONFIG_IP_NF_QUEUE is not set 411# CONFIG_IP_NF_QUEUE is not set
412CONFIG_IP_NF_IPTABLES=m
413CONFIG_IP_NF_MATCH_IPRANGE=m
414CONFIG_IP_NF_MATCH_TOS=m
415CONFIG_IP_NF_MATCH_RECENT=m
416CONFIG_IP_NF_MATCH_ECN=m
417CONFIG_IP_NF_MATCH_AH=m
418CONFIG_IP_NF_MATCH_TTL=m
419CONFIG_IP_NF_MATCH_OWNER=m
420CONFIG_IP_NF_MATCH_ADDRTYPE=m
421CONFIG_IP_NF_FILTER=m
422CONFIG_IP_NF_TARGET_REJECT=m
423CONFIG_IP_NF_TARGET_LOG=m
424CONFIG_IP_NF_TARGET_ULOG=m
425CONFIG_NF_NAT=m
426CONFIG_NF_NAT_NEEDED=y
427CONFIG_IP_NF_TARGET_MASQUERADE=m
428CONFIG_IP_NF_TARGET_REDIRECT=m
429CONFIG_IP_NF_TARGET_NETMAP=m
430CONFIG_IP_NF_TARGET_SAME=m
431CONFIG_NF_NAT_SNMP_BASIC=m
432CONFIG_NF_NAT_PROTO_GRE=m
433CONFIG_NF_NAT_FTP=m
434CONFIG_NF_NAT_IRC=m
435CONFIG_NF_NAT_TFTP=m
436CONFIG_NF_NAT_AMANDA=m
437CONFIG_NF_NAT_PPTP=m
438CONFIG_NF_NAT_H323=m
439CONFIG_NF_NAT_SIP=m
440CONFIG_IP_NF_MANGLE=m
441CONFIG_IP_NF_TARGET_TOS=m
442CONFIG_IP_NF_TARGET_ECN=m
443CONFIG_IP_NF_TARGET_TTL=m
444CONFIG_IP_NF_TARGET_CLUSTERIP=m
445CONFIG_IP_NF_RAW=m
446CONFIG_IP_NF_ARPTABLES=m
447CONFIG_IP_NF_ARPFILTER=m
448CONFIG_IP_NF_ARP_MANGLE=m
329 449
330# 450#
331# IPv6: Netfilter Configuration (EXPERIMENTAL) 451# IPv6: Netfilter Configuration (EXPERIMENTAL)
332# 452#
453CONFIG_NF_CONNTRACK_IPV6=m
333# CONFIG_IP6_NF_QUEUE is not set 454# CONFIG_IP6_NF_QUEUE is not set
455CONFIG_IP6_NF_IPTABLES=m
456CONFIG_IP6_NF_MATCH_RT=m
457CONFIG_IP6_NF_MATCH_OPTS=m
458CONFIG_IP6_NF_MATCH_FRAG=m
459CONFIG_IP6_NF_MATCH_HL=m
460CONFIG_IP6_NF_MATCH_OWNER=m
461CONFIG_IP6_NF_MATCH_IPV6HEADER=m
462CONFIG_IP6_NF_MATCH_AH=m
463CONFIG_IP6_NF_MATCH_MH=m
464CONFIG_IP6_NF_MATCH_EUI64=m
465CONFIG_IP6_NF_FILTER=m
466CONFIG_IP6_NF_TARGET_LOG=m
467CONFIG_IP6_NF_TARGET_REJECT=m
468CONFIG_IP6_NF_MANGLE=m
469CONFIG_IP6_NF_TARGET_HL=m
470CONFIG_IP6_NF_RAW=m
334 471
335# 472#
336# DCCP Configuration (EXPERIMENTAL) 473# DCCP Configuration (EXPERIMENTAL)
@@ -360,7 +497,6 @@ CONFIG_SCTP_HMAC_MD5=y
360# CONFIG_ATALK is not set 497# CONFIG_ATALK is not set
361# CONFIG_X25 is not set 498# CONFIG_X25 is not set
362# CONFIG_LAPB is not set 499# CONFIG_LAPB is not set
363# CONFIG_NET_DIVERT is not set
364# CONFIG_ECONET is not set 500# CONFIG_ECONET is not set
365# CONFIG_WAN_ROUTER is not set 501# CONFIG_WAN_ROUTER is not set
366 502
@@ -368,6 +504,7 @@ CONFIG_SCTP_HMAC_MD5=y
368# QoS and/or fair queueing 504# QoS and/or fair queueing
369# 505#
370# CONFIG_NET_SCHED is not set 506# CONFIG_NET_SCHED is not set
507CONFIG_NET_CLS_ROUTE=y
371 508
372# 509#
373# Network testing 510# Network testing
@@ -377,6 +514,7 @@ CONFIG_SCTP_HMAC_MD5=y
377# CONFIG_IRDA is not set 514# CONFIG_IRDA is not set
378# CONFIG_BT is not set 515# CONFIG_BT is not set
379# CONFIG_IEEE80211 is not set 516# CONFIG_IEEE80211 is not set
517CONFIG_FIB_RULES=y
380 518
381# 519#
382# Device Drivers 520# Device Drivers
@@ -387,7 +525,7 @@ CONFIG_SCTP_HMAC_MD5=y
387# 525#
388CONFIG_STANDALONE=y 526CONFIG_STANDALONE=y
389CONFIG_PREVENT_FIRMWARE_BUILD=y 527CONFIG_PREVENT_FIRMWARE_BUILD=y
390# CONFIG_FW_LOADER is not set 528CONFIG_FW_LOADER=m
391# CONFIG_SYS_HYPERVISOR is not set 529# CONFIG_SYS_HYPERVISOR is not set
392 530
393# 531#
@@ -409,11 +547,13 @@ CONFIG_MTD_CMDLINE_PARTS=y
409# User Modules And Translation Layers 547# User Modules And Translation Layers
410# 548#
411CONFIG_MTD_CHAR=y 549CONFIG_MTD_CHAR=y
550CONFIG_MTD_BLKDEVS=y
412CONFIG_MTD_BLOCK=y 551CONFIG_MTD_BLOCK=y
413# CONFIG_FTL is not set 552# CONFIG_FTL is not set
414# CONFIG_NFTL is not set 553# CONFIG_NFTL is not set
415# CONFIG_INFTL is not set 554# CONFIG_INFTL is not set
416# CONFIG_RFD_FTL is not set 555# CONFIG_RFD_FTL is not set
556# CONFIG_SSFDC is not set
417 557
418# 558#
419# RAM/ROM/Flash chip drivers 559# RAM/ROM/Flash chip drivers
@@ -471,6 +611,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
471# NAND Flash Device Drivers 611# NAND Flash Device Drivers
472# 612#
473# CONFIG_MTD_NAND is not set 613# CONFIG_MTD_NAND is not set
614# CONFIG_MTD_NAND_CAFE is not set
474 615
475# 616#
476# OneNAND Flash Device Drivers 617# OneNAND Flash Device Drivers
@@ -504,6 +645,12 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
504# CONFIG_ATA_OVER_ETH is not set 645# CONFIG_ATA_OVER_ETH is not set
505 646
506# 647#
648# Misc devices
649#
650CONFIG_SGI_IOC4=m
651# CONFIG_TIFM_CORE is not set
652
653#
507# ATA/ATAPI/MFM/RLL support 654# ATA/ATAPI/MFM/RLL support
508# 655#
509# CONFIG_IDE is not set 656# CONFIG_IDE is not set
@@ -513,6 +660,8 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
513# 660#
514# CONFIG_RAID_ATTRS is not set 661# CONFIG_RAID_ATTRS is not set
515CONFIG_SCSI=m 662CONFIG_SCSI=m
663CONFIG_SCSI_TGT=m
664# CONFIG_SCSI_NETLINK is not set
516# CONFIG_SCSI_PROC_FS is not set 665# CONFIG_SCSI_PROC_FS is not set
517 666
518# 667#
@@ -531,14 +680,17 @@ CONFIG_CHR_DEV_SG=m
531# CONFIG_SCSI_MULTI_LUN is not set 680# CONFIG_SCSI_MULTI_LUN is not set
532# CONFIG_SCSI_CONSTANTS is not set 681# CONFIG_SCSI_CONSTANTS is not set
533# CONFIG_SCSI_LOGGING is not set 682# CONFIG_SCSI_LOGGING is not set
683CONFIG_SCSI_SCAN_ASYNC=y
534 684
535# 685#
536# SCSI Transport Attributes 686# SCSI Transports
537# 687#
538# CONFIG_SCSI_SPI_ATTRS is not set 688# CONFIG_SCSI_SPI_ATTRS is not set
539# CONFIG_SCSI_FC_ATTRS is not set 689# CONFIG_SCSI_FC_ATTRS is not set
540# CONFIG_SCSI_ISCSI_ATTRS is not set 690# CONFIG_SCSI_ISCSI_ATTRS is not set
541# CONFIG_SCSI_SAS_ATTRS is not set 691CONFIG_SCSI_SAS_ATTRS=m
692CONFIG_SCSI_SAS_LIBSAS=m
693# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
542 694
543# 695#
544# SCSI low-level drivers 696# SCSI low-level drivers
@@ -551,26 +703,35 @@ CONFIG_CHR_DEV_SG=m
551# CONFIG_SCSI_AIC7XXX is not set 703# CONFIG_SCSI_AIC7XXX is not set
552# CONFIG_SCSI_AIC7XXX_OLD is not set 704# CONFIG_SCSI_AIC7XXX_OLD is not set
553# CONFIG_SCSI_AIC79XX is not set 705# CONFIG_SCSI_AIC79XX is not set
706CONFIG_SCSI_AIC94XX=m
707# CONFIG_AIC94XX_DEBUG is not set
554# CONFIG_SCSI_DPT_I2O is not set 708# CONFIG_SCSI_DPT_I2O is not set
709# CONFIG_SCSI_ARCMSR is not set
555# CONFIG_MEGARAID_NEWGEN is not set 710# CONFIG_MEGARAID_NEWGEN is not set
556# CONFIG_MEGARAID_LEGACY is not set 711# CONFIG_MEGARAID_LEGACY is not set
557# CONFIG_MEGARAID_SAS is not set 712# CONFIG_MEGARAID_SAS is not set
558# CONFIG_SCSI_SATA is not set
559# CONFIG_SCSI_HPTIOP is not set 713# CONFIG_SCSI_HPTIOP is not set
560# CONFIG_SCSI_DMX3191D is not set 714# CONFIG_SCSI_DMX3191D is not set
561# CONFIG_SCSI_FUTURE_DOMAIN is not set 715# CONFIG_SCSI_FUTURE_DOMAIN is not set
562# CONFIG_SCSI_IPS is not set 716# CONFIG_SCSI_IPS is not set
563# CONFIG_SCSI_INITIO is not set 717# CONFIG_SCSI_INITIO is not set
564# CONFIG_SCSI_INIA100 is not set 718# CONFIG_SCSI_INIA100 is not set
719# CONFIG_SCSI_STEX is not set
565# CONFIG_SCSI_SYM53C8XX_2 is not set 720# CONFIG_SCSI_SYM53C8XX_2 is not set
566# CONFIG_SCSI_IPR is not set
567# CONFIG_SCSI_QLOGIC_1280 is not set 721# CONFIG_SCSI_QLOGIC_1280 is not set
568# CONFIG_SCSI_QLA_FC is not set 722# CONFIG_SCSI_QLA_FC is not set
723# CONFIG_SCSI_QLA_ISCSI is not set
569# CONFIG_SCSI_LPFC is not set 724# CONFIG_SCSI_LPFC is not set
570# CONFIG_SCSI_DC395x is not set 725# CONFIG_SCSI_DC395x is not set
571# CONFIG_SCSI_DC390T is not set 726# CONFIG_SCSI_DC390T is not set
572# CONFIG_SCSI_NSP32 is not set 727# CONFIG_SCSI_NSP32 is not set
573# CONFIG_SCSI_DEBUG is not set 728# CONFIG_SCSI_DEBUG is not set
729# CONFIG_SCSI_SRP is not set
730
731#
732# Serial ATA (prod) and Parallel ATA (experimental) drivers
733#
734# CONFIG_ATA is not set
574 735
575# 736#
576# Multi-device support (RAID and LVM) 737# Multi-device support (RAID and LVM)
@@ -649,7 +810,7 @@ CONFIG_NATSEMI=y
649# CONFIG_SUNDANCE is not set 810# CONFIG_SUNDANCE is not set
650# CONFIG_TLAN is not set 811# CONFIG_TLAN is not set
651# CONFIG_VIA_RHINE is not set 812# CONFIG_VIA_RHINE is not set
652# CONFIG_LAN_SAA9730 is not set 813# CONFIG_SC92031 is not set
653 814
654# 815#
655# Ethernet (1000 Mbit) 816# Ethernet (1000 Mbit)
@@ -668,14 +829,18 @@ CONFIG_NATSEMI=y
668# CONFIG_VIA_VELOCITY is not set 829# CONFIG_VIA_VELOCITY is not set
669# CONFIG_TIGON3 is not set 830# CONFIG_TIGON3 is not set
670# CONFIG_BNX2 is not set 831# CONFIG_BNX2 is not set
832CONFIG_QLA3XXX=m
833# CONFIG_ATL1 is not set
671 834
672# 835#
673# Ethernet (10000 Mbit) 836# Ethernet (10000 Mbit)
674# 837#
675# CONFIG_CHELSIO_T1 is not set 838# CONFIG_CHELSIO_T1 is not set
839CONFIG_CHELSIO_T3=m
676# CONFIG_IXGB is not set 840# CONFIG_IXGB is not set
677# CONFIG_S2IO is not set 841# CONFIG_S2IO is not set
678# CONFIG_MYRI10GE is not set 842# CONFIG_MYRI10GE is not set
843CONFIG_NETXEN_NIC=m
679 844
680# 845#
681# Token Ring devices 846# Token Ring devices
@@ -703,6 +868,7 @@ CONFIG_PPP_DEFLATE=m
703# CONFIG_PPP_MPPE is not set 868# CONFIG_PPP_MPPE is not set
704# CONFIG_PPPOE is not set 869# CONFIG_PPPOE is not set
705# CONFIG_SLIP is not set 870# CONFIG_SLIP is not set
871CONFIG_SLHC=m
706# CONFIG_NET_FC is not set 872# CONFIG_NET_FC is not set
707# CONFIG_SHAPER is not set 873# CONFIG_SHAPER is not set
708# CONFIG_NETCONSOLE is not set 874# CONFIG_NETCONSOLE is not set
@@ -723,6 +889,7 @@ CONFIG_PPP_DEFLATE=m
723# Input device support 889# Input device support
724# 890#
725CONFIG_INPUT=y 891CONFIG_INPUT=y
892# CONFIG_INPUT_FF_MEMLESS is not set
726 893
727# 894#
728# Userland interfaces 895# Userland interfaces
@@ -790,10 +957,6 @@ CONFIG_GEN_RTC_X=y
790# CONFIG_DTLK is not set 957# CONFIG_DTLK is not set
791# CONFIG_R3964 is not set 958# CONFIG_R3964 is not set
792# CONFIG_APPLICOM is not set 959# CONFIG_APPLICOM is not set
793
794#
795# Ftape, the floppy tape device driver
796#
797# CONFIG_DRM is not set 960# CONFIG_DRM is not set
798# CONFIG_RAW_DRIVER is not set 961# CONFIG_RAW_DRIVER is not set
799 962
@@ -801,7 +964,6 @@ CONFIG_GEN_RTC_X=y
801# TPM devices 964# TPM devices
802# 965#
803# CONFIG_TCG_TPM is not set 966# CONFIG_TCG_TPM is not set
804# CONFIG_TELCLOCK is not set
805 967
806# 968#
807# I2C support 969# I2C support
@@ -830,6 +992,7 @@ CONFIG_I2C_CHARDEV=y
830# CONFIG_I2C_NFORCE2 is not set 992# CONFIG_I2C_NFORCE2 is not set
831# CONFIG_I2C_OCORES is not set 993# CONFIG_I2C_OCORES is not set
832# CONFIG_I2C_PARPORT_LIGHT is not set 994# CONFIG_I2C_PARPORT_LIGHT is not set
995# CONFIG_I2C_PASEMI is not set
833# CONFIG_I2C_PROSAVAGE is not set 996# CONFIG_I2C_PROSAVAGE is not set
834# CONFIG_I2C_SAVAGE4 is not set 997# CONFIG_I2C_SAVAGE4 is not set
835# CONFIG_I2C_SIS5595 is not set 998# CONFIG_I2C_SIS5595 is not set
@@ -865,6 +1028,7 @@ CONFIG_I2C_DEBUG_BUS=y
865# 1028#
866# Dallas's 1-wire bus 1029# Dallas's 1-wire bus
867# 1030#
1031# CONFIG_W1 is not set
868 1032
869# 1033#
870# Hardware Monitoring support 1034# Hardware Monitoring support
@@ -898,29 +1062,27 @@ CONFIG_HWMON=y
898# CONFIG_SENSORS_LM92 is not set 1062# CONFIG_SENSORS_LM92 is not set
899# CONFIG_SENSORS_MAX1619 is not set 1063# CONFIG_SENSORS_MAX1619 is not set
900# CONFIG_SENSORS_PC87360 is not set 1064# CONFIG_SENSORS_PC87360 is not set
1065# CONFIG_SENSORS_PC87427 is not set
901# CONFIG_SENSORS_SIS5595 is not set 1066# CONFIG_SENSORS_SIS5595 is not set
902# CONFIG_SENSORS_SMSC47M1 is not set 1067# CONFIG_SENSORS_SMSC47M1 is not set
903# CONFIG_SENSORS_SMSC47M192 is not set 1068# CONFIG_SENSORS_SMSC47M192 is not set
904# CONFIG_SENSORS_SMSC47B397 is not set 1069# CONFIG_SENSORS_SMSC47B397 is not set
905# CONFIG_SENSORS_VIA686A is not set 1070# CONFIG_SENSORS_VIA686A is not set
1071# CONFIG_SENSORS_VT1211 is not set
906# CONFIG_SENSORS_VT8231 is not set 1072# CONFIG_SENSORS_VT8231 is not set
907# CONFIG_SENSORS_W83781D is not set 1073# CONFIG_SENSORS_W83781D is not set
908# CONFIG_SENSORS_W83791D is not set 1074# CONFIG_SENSORS_W83791D is not set
909# CONFIG_SENSORS_W83792D is not set 1075# CONFIG_SENSORS_W83792D is not set
1076# CONFIG_SENSORS_W83793 is not set
910# CONFIG_SENSORS_W83L785TS is not set 1077# CONFIG_SENSORS_W83L785TS is not set
911# CONFIG_SENSORS_W83627HF is not set 1078# CONFIG_SENSORS_W83627HF is not set
912# CONFIG_SENSORS_W83627EHF is not set 1079# CONFIG_SENSORS_W83627EHF is not set
913# CONFIG_HWMON_DEBUG_CHIP is not set 1080# CONFIG_HWMON_DEBUG_CHIP is not set
914 1081
915# 1082#
916# Misc devices
917#
918
919#
920# Multimedia devices 1083# Multimedia devices
921# 1084#
922# CONFIG_VIDEO_DEV is not set 1085# CONFIG_VIDEO_DEV is not set
923CONFIG_VIDEO_V4L2=y
924 1086
925# 1087#
926# Digital Video Broadcasting Devices 1088# Digital Video Broadcasting Devices
@@ -932,6 +1094,7 @@ CONFIG_VIDEO_V4L2=y
932# 1094#
933# CONFIG_FIRMWARE_EDID is not set 1095# CONFIG_FIRMWARE_EDID is not set
934# CONFIG_FB is not set 1096# CONFIG_FB is not set
1097# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
935 1098
936# 1099#
937# Sound 1100# Sound
@@ -939,6 +1102,11 @@ CONFIG_VIDEO_V4L2=y
939# CONFIG_SOUND is not set 1102# CONFIG_SOUND is not set
940 1103
941# 1104#
1105# HID Devices
1106#
1107# CONFIG_HID is not set
1108
1109#
942# USB support 1110# USB support
943# 1111#
944CONFIG_USB_ARCH_HAS_HCD=y 1112CONFIG_USB_ARCH_HAS_HCD=y
@@ -1001,6 +1169,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1001# 1169#
1002 1170
1003# 1171#
1172# Auxiliary Display support
1173#
1174
1175#
1176# Virtualization
1177#
1178
1179#
1004# File systems 1180# File systems
1005# 1181#
1006CONFIG_EXT2_FS=y 1182CONFIG_EXT2_FS=y
@@ -1012,6 +1188,7 @@ CONFIG_EXT3_FS=m
1012CONFIG_EXT3_FS_XATTR=y 1188CONFIG_EXT3_FS_XATTR=y
1013# CONFIG_EXT3_FS_POSIX_ACL is not set 1189# CONFIG_EXT3_FS_POSIX_ACL is not set
1014# CONFIG_EXT3_FS_SECURITY is not set 1190# CONFIG_EXT3_FS_SECURITY is not set
1191# CONFIG_EXT4DEV_FS is not set
1015CONFIG_JBD=m 1192CONFIG_JBD=m
1016# CONFIG_JBD_DEBUG is not set 1193# CONFIG_JBD_DEBUG is not set
1017CONFIG_FS_MBCACHE=y 1194CONFIG_FS_MBCACHE=y
@@ -1023,6 +1200,7 @@ CONFIG_XFS_FS=m
1023# CONFIG_XFS_SECURITY is not set 1200# CONFIG_XFS_SECURITY is not set
1024# CONFIG_XFS_POSIX_ACL is not set 1201# CONFIG_XFS_POSIX_ACL is not set
1025# CONFIG_XFS_RT is not set 1202# CONFIG_XFS_RT is not set
1203# CONFIG_GFS2_FS is not set
1026# CONFIG_OCFS2_FS is not set 1204# CONFIG_OCFS2_FS is not set
1027# CONFIG_MINIX_FS is not set 1205# CONFIG_MINIX_FS is not set
1028# CONFIG_ROMFS_FS is not set 1206# CONFIG_ROMFS_FS is not set
@@ -1033,6 +1211,7 @@ CONFIG_INOTIFY_USER=y
1033# CONFIG_AUTOFS_FS is not set 1211# CONFIG_AUTOFS_FS is not set
1034CONFIG_AUTOFS4_FS=m 1212CONFIG_AUTOFS4_FS=m
1035# CONFIG_FUSE_FS is not set 1213# CONFIG_FUSE_FS is not set
1214CONFIG_GENERIC_ACL=y
1036 1215
1037# 1216#
1038# CD-ROM/DVD Filesystems 1217# CD-ROM/DVD Filesystems
@@ -1057,11 +1236,13 @@ CONFIG_NTFS_FS=m
1057# 1236#
1058CONFIG_PROC_FS=y 1237CONFIG_PROC_FS=y
1059CONFIG_PROC_KCORE=y 1238CONFIG_PROC_KCORE=y
1239CONFIG_PROC_SYSCTL=y
1060CONFIG_SYSFS=y 1240CONFIG_SYSFS=y
1061CONFIG_TMPFS=y 1241CONFIG_TMPFS=y
1242CONFIG_TMPFS_POSIX_ACL=y
1062# CONFIG_HUGETLB_PAGE is not set 1243# CONFIG_HUGETLB_PAGE is not set
1063CONFIG_RAMFS=y 1244CONFIG_RAMFS=y
1064# CONFIG_CONFIGFS_FS is not set 1245CONFIG_CONFIGFS_FS=m
1065 1246
1066# 1247#
1067# Miscellaneous filesystems 1248# Miscellaneous filesystems
@@ -1073,7 +1254,6 @@ CONFIG_RAMFS=y
1073# CONFIG_BEFS_FS is not set 1254# CONFIG_BEFS_FS is not set
1074# CONFIG_BFS_FS is not set 1255# CONFIG_BFS_FS is not set
1075# CONFIG_EFS_FS is not set 1256# CONFIG_EFS_FS is not set
1076# CONFIG_JFFS_FS is not set
1077CONFIG_JFFS2_FS=y 1257CONFIG_JFFS2_FS=y
1078CONFIG_JFFS2_FS_DEBUG=0 1258CONFIG_JFFS2_FS_DEBUG=0
1079CONFIG_JFFS2_FS_WRITEBUFFER=y 1259CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1118,7 +1298,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
1118CONFIG_SMB_FS=m 1298CONFIG_SMB_FS=m
1119# CONFIG_SMB_NLS_DEFAULT is not set 1299# CONFIG_SMB_NLS_DEFAULT is not set
1120# CONFIG_CIFS is not set 1300# CONFIG_CIFS is not set
1121# CONFIG_CIFS_DEBUG2 is not set
1122# CONFIG_NCP_FS is not set 1301# CONFIG_NCP_FS is not set
1123# CONFIG_CODA_FS is not set 1302# CONFIG_CODA_FS is not set
1124# CONFIG_AFS_FS is not set 1303# CONFIG_AFS_FS is not set
@@ -1175,6 +1354,14 @@ CONFIG_NLS_ISO8859_1=m
1175CONFIG_NLS_UTF8=m 1354CONFIG_NLS_UTF8=m
1176 1355
1177# 1356#
1357# Distributed Lock Manager
1358#
1359CONFIG_DLM=m
1360CONFIG_DLM_TCP=y
1361# CONFIG_DLM_SCTP is not set
1362# CONFIG_DLM_DEBUG is not set
1363
1364#
1178# Profiling support 1365# Profiling support
1179# 1366#
1180# CONFIG_PROFILING is not set 1367# CONFIG_PROFILING is not set
@@ -1184,11 +1371,13 @@ CONFIG_NLS_UTF8=m
1184# 1371#
1185CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1372CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1186# CONFIG_PRINTK_TIME is not set 1373# CONFIG_PRINTK_TIME is not set
1374CONFIG_ENABLE_MUST_CHECK=y
1187# CONFIG_MAGIC_SYSRQ is not set 1375# CONFIG_MAGIC_SYSRQ is not set
1188# CONFIG_UNUSED_SYMBOLS is not set 1376# CONFIG_UNUSED_SYMBOLS is not set
1377# CONFIG_DEBUG_FS is not set
1378# CONFIG_HEADERS_CHECK is not set
1189# CONFIG_DEBUG_KERNEL is not set 1379# CONFIG_DEBUG_KERNEL is not set
1190CONFIG_LOG_BUF_SHIFT=14 1380CONFIG_LOG_BUF_SHIFT=14
1191# CONFIG_DEBUG_FS is not set
1192CONFIG_CROSSCOMPILE=y 1381CONFIG_CROSSCOMPILE=y
1193CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw" 1382CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw"
1194 1383
@@ -1202,7 +1391,12 @@ CONFIG_CMDLINE="console=ttyS0,115200 mem=192m ip=bootp root=/dev/nfs rw"
1202# Cryptographic options 1391# Cryptographic options
1203# 1392#
1204CONFIG_CRYPTO=y 1393CONFIG_CRYPTO=y
1394CONFIG_CRYPTO_ALGAPI=y
1395CONFIG_CRYPTO_BLKCIPHER=y
1396CONFIG_CRYPTO_HASH=y
1397CONFIG_CRYPTO_MANAGER=y
1205CONFIG_CRYPTO_HMAC=y 1398CONFIG_CRYPTO_HMAC=y
1399CONFIG_CRYPTO_XCBC=m
1206# CONFIG_CRYPTO_NULL is not set 1400# CONFIG_CRYPTO_NULL is not set
1207# CONFIG_CRYPTO_MD4 is not set 1401# CONFIG_CRYPTO_MD4 is not set
1208CONFIG_CRYPTO_MD5=y 1402CONFIG_CRYPTO_MD5=y
@@ -1211,7 +1405,13 @@ CONFIG_CRYPTO_MD5=y
1211# CONFIG_CRYPTO_SHA512 is not set 1405# CONFIG_CRYPTO_SHA512 is not set
1212# CONFIG_CRYPTO_WP512 is not set 1406# CONFIG_CRYPTO_WP512 is not set
1213# CONFIG_CRYPTO_TGR192 is not set 1407# CONFIG_CRYPTO_TGR192 is not set
1408CONFIG_CRYPTO_GF128MUL=m
1409CONFIG_CRYPTO_ECB=m
1410CONFIG_CRYPTO_CBC=y
1411CONFIG_CRYPTO_PCBC=m
1412CONFIG_CRYPTO_LRW=m
1214CONFIG_CRYPTO_DES=y 1413CONFIG_CRYPTO_DES=y
1414CONFIG_CRYPTO_FCRYPT=m
1215# CONFIG_CRYPTO_BLOWFISH is not set 1415# CONFIG_CRYPTO_BLOWFISH is not set
1216# CONFIG_CRYPTO_TWOFISH is not set 1416# CONFIG_CRYPTO_TWOFISH is not set
1217# CONFIG_CRYPTO_SERPENT is not set 1417# CONFIG_CRYPTO_SERPENT is not set
@@ -1225,6 +1425,7 @@ CONFIG_CRYPTO_DES=y
1225# CONFIG_CRYPTO_DEFLATE is not set 1425# CONFIG_CRYPTO_DEFLATE is not set
1226# CONFIG_CRYPTO_MICHAEL_MIC is not set 1426# CONFIG_CRYPTO_MICHAEL_MIC is not set
1227# CONFIG_CRYPTO_CRC32C is not set 1427# CONFIG_CRYPTO_CRC32C is not set
1428CONFIG_CRYPTO_CAMELLIA=m
1228# CONFIG_CRYPTO_TEST is not set 1429# CONFIG_CRYPTO_TEST is not set
1229 1430
1230# 1431#
@@ -1234,10 +1435,17 @@ CONFIG_CRYPTO_DES=y
1234# 1435#
1235# Library routines 1436# Library routines
1236# 1437#
1438CONFIG_BITREVERSE=y
1237CONFIG_CRC_CCITT=m 1439CONFIG_CRC_CCITT=m
1238# CONFIG_CRC16 is not set 1440# CONFIG_CRC16 is not set
1239CONFIG_CRC32=y 1441CONFIG_CRC32=y
1240# CONFIG_LIBCRC32C is not set 1442# CONFIG_LIBCRC32C is not set
1241CONFIG_ZLIB_INFLATE=y 1443CONFIG_ZLIB_INFLATE=y
1242CONFIG_ZLIB_DEFLATE=y 1444CONFIG_ZLIB_DEFLATE=y
1445CONFIG_TEXTSEARCH=y
1446CONFIG_TEXTSEARCH_KMP=m
1447CONFIG_TEXTSEARCH_BM=m
1448CONFIG_TEXTSEARCH_FSM=m
1243CONFIG_PLIST=y 1449CONFIG_PLIST=y
1450CONFIG_HAS_IOMEM=y
1451CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index d5b49735683b..5ad4870ad5eb 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:05 2006 4# Sun Feb 18 21:27:46 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27CONFIG_MIPS_EV64120=y 28CONFIG_MIPS_EV64120=y
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_EV64120=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +65,14 @@ CONFIG_MIPS_EV64120=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_EVB_PCI1 is not set 66# CONFIG_EVB_PCI1 is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_CPU_BIG_ENDIAN=y 78CONFIG_CPU_BIG_ENDIAN=y
@@ -118,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_16KB is not set 122# CONFIG_PAGE_SIZE_16KB is not set
119# CONFIG_PAGE_SIZE_64KB is not set 123# CONFIG_PAGE_SIZE_64KB is not set
120CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
121# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
124# CONFIG_64BIT_PHYS_ADDR is not set 128# CONFIG_64BIT_PHYS_ADDR is not set
125CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -148,6 +153,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +172,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 184CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -182,12 +193,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 193CONFIG_BUG=y
183CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 196CONFIG_FUTEX=y
187CONFIG_EPOLL=y 197CONFIG_EPOLL=y
188CONFIG_SHMEM=y 198CONFIG_SHMEM=y
189CONFIG_SLAB=y 199CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -205,6 +216,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
208# CONFIG_LBD is not set 220# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -247,6 +259,14 @@ CONFIG_BINFMT_ELF=y
247CONFIG_TRAD_SIGNALS=y 259CONFIG_TRAD_SIGNALS=y
248 260
249# 261#
262# Power management options
263#
264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
268
269#
250# Networking 270# Networking
251# 271#
252CONFIG_NET=y 272CONFIG_NET=y
@@ -259,7 +279,10 @@ CONFIG_NET=y
259CONFIG_UNIX=y 279CONFIG_UNIX=y
260CONFIG_XFRM=y 280CONFIG_XFRM=y
261CONFIG_XFRM_USER=m 281CONFIG_XFRM_USER=m
282# CONFIG_XFRM_SUB_POLICY is not set
283CONFIG_XFRM_MIGRATE=y
262CONFIG_NET_KEY=y 284CONFIG_NET_KEY=y
285CONFIG_NET_KEY_MIGRATE=y
263CONFIG_INET=y 286CONFIG_INET=y
264# CONFIG_IP_MULTICAST is not set 287# CONFIG_IP_MULTICAST is not set
265# CONFIG_IP_ADVANCED_ROUTER is not set 288# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +302,13 @@ CONFIG_IP_PNP=y
279# CONFIG_INET_TUNNEL is not set 302# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=m 303CONFIG_INET_XFRM_MODE_TRANSPORT=m
281CONFIG_INET_XFRM_MODE_TUNNEL=m 304CONFIG_INET_XFRM_MODE_TUNNEL=m
305CONFIG_INET_XFRM_MODE_BEET=m
282CONFIG_INET_DIAG=y 306CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 307CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 308# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 309CONFIG_TCP_CONG_CUBIC=y
310CONFIG_DEFAULT_TCP_CONG="cubic"
311CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 312# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 313# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 314# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +338,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 339# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 341# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 342# CONFIG_WAN_ROUTER is not set
318 343
@@ -386,6 +411,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
386CONFIG_ATA_OVER_ETH=m 411CONFIG_ATA_OVER_ETH=m
387 412
388# 413#
414# Misc devices
415#
416CONFIG_SGI_IOC4=m
417# CONFIG_TIFM_CORE is not set
418
419#
389# ATA/ATAPI/MFM/RLL support 420# ATA/ATAPI/MFM/RLL support
390# 421#
391# CONFIG_IDE is not set 422# CONFIG_IDE is not set
@@ -395,6 +426,12 @@ CONFIG_ATA_OVER_ETH=m
395# 426#
396CONFIG_RAID_ATTRS=m 427CONFIG_RAID_ATTRS=m
397# CONFIG_SCSI is not set 428# CONFIG_SCSI is not set
429# CONFIG_SCSI_NETLINK is not set
430
431#
432# Serial ATA (prod) and Parallel ATA (experimental) drivers
433#
434# CONFIG_ATA is not set
398 435
399# 436#
400# Multi-device support (RAID and LVM) 437# Multi-device support (RAID and LVM)
@@ -445,6 +482,8 @@ CONFIG_LXT_PHY=m
445CONFIG_CICADA_PHY=m 482CONFIG_CICADA_PHY=m
446CONFIG_VITESSE_PHY=m 483CONFIG_VITESSE_PHY=m
447CONFIG_SMSC_PHY=m 484CONFIG_SMSC_PHY=m
485# CONFIG_BROADCOM_PHY is not set
486# CONFIG_FIXED_PHY is not set
448 487
449# 488#
450# Ethernet (10 or 100Mbit) 489# Ethernet (10 or 100Mbit)
@@ -480,14 +519,17 @@ CONFIG_NET_ETHERNET=y
480# CONFIG_SK98LIN is not set 519# CONFIG_SK98LIN is not set
481# CONFIG_TIGON3 is not set 520# CONFIG_TIGON3 is not set
482# CONFIG_BNX2 is not set 521# CONFIG_BNX2 is not set
522CONFIG_QLA3XXX=m
483 523
484# 524#
485# Ethernet (10000 Mbit) 525# Ethernet (10000 Mbit)
486# 526#
487# CONFIG_CHELSIO_T1 is not set 527# CONFIG_CHELSIO_T1 is not set
528CONFIG_CHELSIO_T3=m
488# CONFIG_IXGB is not set 529# CONFIG_IXGB is not set
489# CONFIG_S2IO is not set 530# CONFIG_S2IO is not set
490# CONFIG_MYRI10GE is not set 531# CONFIG_MYRI10GE is not set
532CONFIG_NETXEN_NIC=m
491 533
492# 534#
493# Token Ring devices 535# Token Ring devices
@@ -515,6 +557,7 @@ CONFIG_PPP_ASYNC=y
515CONFIG_PPP_MPPE=m 557CONFIG_PPP_MPPE=m
516# CONFIG_PPPOE is not set 558# CONFIG_PPPOE is not set
517# CONFIG_SLIP is not set 559# CONFIG_SLIP is not set
560CONFIG_SLHC=y
518# CONFIG_SHAPER is not set 561# CONFIG_SHAPER is not set
519# CONFIG_NETCONSOLE is not set 562# CONFIG_NETCONSOLE is not set
520# CONFIG_NETPOLL is not set 563# CONFIG_NETPOLL is not set
@@ -534,6 +577,7 @@ CONFIG_PPP_MPPE=m
534# Input device support 577# Input device support
535# 578#
536CONFIG_INPUT=y 579CONFIG_INPUT=y
580# CONFIG_INPUT_FF_MEMLESS is not set
537 581
538# 582#
539# Userland interfaces 583# Userland interfaces
@@ -611,10 +655,6 @@ CONFIG_LEGACY_PTY_COUNT=256
611# CONFIG_DTLK is not set 655# CONFIG_DTLK is not set
612# CONFIG_R3964 is not set 656# CONFIG_R3964 is not set
613# CONFIG_APPLICOM is not set 657# CONFIG_APPLICOM is not set
614
615#
616# Ftape, the floppy tape device driver
617#
618# CONFIG_DRM is not set 658# CONFIG_DRM is not set
619# CONFIG_RAW_DRIVER is not set 659# CONFIG_RAW_DRIVER is not set
620 660
@@ -622,7 +662,6 @@ CONFIG_LEGACY_PTY_COUNT=256
622# TPM devices 662# TPM devices
623# 663#
624# CONFIG_TCG_TPM is not set 664# CONFIG_TCG_TPM is not set
625# CONFIG_TELCLOCK is not set
626 665
627# 666#
628# I2C support 667# I2C support
@@ -647,14 +686,9 @@ CONFIG_LEGACY_PTY_COUNT=256
647# CONFIG_HWMON_VID is not set 686# CONFIG_HWMON_VID is not set
648 687
649# 688#
650# Misc devices
651#
652
653#
654# Multimedia devices 689# Multimedia devices
655# 690#
656# CONFIG_VIDEO_DEV is not set 691# CONFIG_VIDEO_DEV is not set
657CONFIG_VIDEO_V4L2=y
658 692
659# 693#
660# Digital Video Broadcasting Devices 694# Digital Video Broadcasting Devices
@@ -672,6 +706,7 @@ CONFIG_VIDEO_V4L2=y
672# 706#
673# CONFIG_VGA_CONSOLE is not set 707# CONFIG_VGA_CONSOLE is not set
674CONFIG_DUMMY_CONSOLE=y 708CONFIG_DUMMY_CONSOLE=y
709# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
675 710
676# 711#
677# Sound 712# Sound
@@ -679,6 +714,11 @@ CONFIG_DUMMY_CONSOLE=y
679# CONFIG_SOUND is not set 714# CONFIG_SOUND is not set
680 715
681# 716#
717# HID Devices
718#
719# CONFIG_HID is not set
720
721#
682# USB support 722# USB support
683# 723#
684CONFIG_USB_ARCH_HAS_HCD=y 724CONFIG_USB_ARCH_HAS_HCD=y
@@ -741,16 +781,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
741# 781#
742 782
743# 783#
784# Auxiliary Display support
785#
786
787#
788# Virtualization
789#
790
791#
744# File systems 792# File systems
745# 793#
746CONFIG_EXT2_FS=y 794CONFIG_EXT2_FS=y
747# CONFIG_EXT2_FS_XATTR is not set 795# CONFIG_EXT2_FS_XATTR is not set
748# CONFIG_EXT2_FS_XIP is not set 796# CONFIG_EXT2_FS_XIP is not set
749# CONFIG_EXT3_FS is not set 797# CONFIG_EXT3_FS is not set
798# CONFIG_EXT4DEV_FS is not set
750# CONFIG_REISERFS_FS is not set 799# CONFIG_REISERFS_FS is not set
751# CONFIG_JFS_FS is not set 800# CONFIG_JFS_FS is not set
752# CONFIG_FS_POSIX_ACL is not set 801# CONFIG_FS_POSIX_ACL is not set
753# CONFIG_XFS_FS is not set 802# CONFIG_XFS_FS is not set
803# CONFIG_GFS2_FS is not set
754# CONFIG_OCFS2_FS is not set 804# CONFIG_OCFS2_FS is not set
755# CONFIG_MINIX_FS is not set 805# CONFIG_MINIX_FS is not set
756# CONFIG_ROMFS_FS is not set 806# CONFIG_ROMFS_FS is not set
@@ -780,17 +830,19 @@ CONFIG_FUSE_FS=m
780# 830#
781CONFIG_PROC_FS=y 831CONFIG_PROC_FS=y
782CONFIG_PROC_KCORE=y 832CONFIG_PROC_KCORE=y
833CONFIG_PROC_SYSCTL=y
783CONFIG_SYSFS=y 834CONFIG_SYSFS=y
784# CONFIG_TMPFS is not set 835# CONFIG_TMPFS is not set
785# CONFIG_HUGETLB_PAGE is not set 836# CONFIG_HUGETLB_PAGE is not set
786CONFIG_RAMFS=y 837CONFIG_RAMFS=y
787# CONFIG_CONFIGFS_FS is not set 838CONFIG_CONFIGFS_FS=m
788 839
789# 840#
790# Miscellaneous filesystems 841# Miscellaneous filesystems
791# 842#
792# CONFIG_ADFS_FS is not set 843# CONFIG_ADFS_FS is not set
793# CONFIG_AFFS_FS is not set 844# CONFIG_AFFS_FS is not set
845# CONFIG_ECRYPT_FS is not set
794# CONFIG_HFS_FS is not set 846# CONFIG_HFS_FS is not set
795# CONFIG_HFSPLUS_FS is not set 847# CONFIG_HFSPLUS_FS is not set
796# CONFIG_BEFS_FS is not set 848# CONFIG_BEFS_FS is not set
@@ -819,7 +871,6 @@ CONFIG_SUNRPC=y
819# CONFIG_RPCSEC_GSS_SPKM3 is not set 871# CONFIG_RPCSEC_GSS_SPKM3 is not set
820# CONFIG_SMB_FS is not set 872# CONFIG_SMB_FS is not set
821# CONFIG_CIFS is not set 873# CONFIG_CIFS is not set
822# CONFIG_CIFS_DEBUG2 is not set
823# CONFIG_NCP_FS is not set 874# CONFIG_NCP_FS is not set
824# CONFIG_CODA_FS is not set 875# CONFIG_CODA_FS is not set
825# CONFIG_AFS_FS is not set 876# CONFIG_AFS_FS is not set
@@ -837,6 +888,14 @@ CONFIG_MSDOS_PARTITION=y
837# CONFIG_NLS is not set 888# CONFIG_NLS is not set
838 889
839# 890#
891# Distributed Lock Manager
892#
893CONFIG_DLM=m
894CONFIG_DLM_TCP=y
895# CONFIG_DLM_SCTP is not set
896# CONFIG_DLM_DEBUG is not set
897
898#
840# Profiling support 899# Profiling support
841# 900#
842# CONFIG_PROFILING is not set 901# CONFIG_PROFILING is not set
@@ -846,11 +905,13 @@ CONFIG_MSDOS_PARTITION=y
846# 905#
847CONFIG_TRACE_IRQFLAGS_SUPPORT=y 906CONFIG_TRACE_IRQFLAGS_SUPPORT=y
848# CONFIG_PRINTK_TIME is not set 907# CONFIG_PRINTK_TIME is not set
908CONFIG_ENABLE_MUST_CHECK=y
849# CONFIG_MAGIC_SYSRQ is not set 909# CONFIG_MAGIC_SYSRQ is not set
850# CONFIG_UNUSED_SYMBOLS is not set 910# CONFIG_UNUSED_SYMBOLS is not set
911# CONFIG_DEBUG_FS is not set
912# CONFIG_HEADERS_CHECK is not set
851# CONFIG_DEBUG_KERNEL is not set 913# CONFIG_DEBUG_KERNEL is not set
852CONFIG_LOG_BUF_SHIFT=14 914CONFIG_LOG_BUF_SHIFT=14
853# CONFIG_DEBUG_FS is not set
854CONFIG_CROSSCOMPILE=y 915CONFIG_CROSSCOMPILE=y
855CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::" 916CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs rw nfsroot=192.168.1.1:/mnt/disk2/fs.gal ip=192.168.1.211:192.168.1.1:::gt::"
856 917
@@ -865,18 +926,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
865# Cryptographic options 926# Cryptographic options
866# 927#
867CONFIG_CRYPTO=y 928CONFIG_CRYPTO=y
929CONFIG_CRYPTO_ALGAPI=y
930CONFIG_CRYPTO_BLKCIPHER=m
931CONFIG_CRYPTO_HASH=y
932CONFIG_CRYPTO_MANAGER=y
868CONFIG_CRYPTO_HMAC=y 933CONFIG_CRYPTO_HMAC=y
934CONFIG_CRYPTO_XCBC=m
869CONFIG_CRYPTO_NULL=m 935CONFIG_CRYPTO_NULL=m
870CONFIG_CRYPTO_MD4=m 936CONFIG_CRYPTO_MD4=m
871CONFIG_CRYPTO_MD5=m 937CONFIG_CRYPTO_MD5=y
872CONFIG_CRYPTO_SHA1=m 938CONFIG_CRYPTO_SHA1=m
873CONFIG_CRYPTO_SHA256=m 939CONFIG_CRYPTO_SHA256=m
874CONFIG_CRYPTO_SHA512=m 940CONFIG_CRYPTO_SHA512=m
875CONFIG_CRYPTO_WP512=m 941CONFIG_CRYPTO_WP512=m
876CONFIG_CRYPTO_TGR192=m 942CONFIG_CRYPTO_TGR192=m
943CONFIG_CRYPTO_GF128MUL=m
944CONFIG_CRYPTO_ECB=m
945CONFIG_CRYPTO_CBC=m
946CONFIG_CRYPTO_PCBC=m
947CONFIG_CRYPTO_LRW=m
877CONFIG_CRYPTO_DES=m 948CONFIG_CRYPTO_DES=m
949CONFIG_CRYPTO_FCRYPT=m
878CONFIG_CRYPTO_BLOWFISH=m 950CONFIG_CRYPTO_BLOWFISH=m
879CONFIG_CRYPTO_TWOFISH=m 951CONFIG_CRYPTO_TWOFISH=m
952CONFIG_CRYPTO_TWOFISH_COMMON=m
880CONFIG_CRYPTO_SERPENT=m 953CONFIG_CRYPTO_SERPENT=m
881CONFIG_CRYPTO_AES=m 954CONFIG_CRYPTO_AES=m
882CONFIG_CRYPTO_CAST5=m 955CONFIG_CRYPTO_CAST5=m
@@ -888,6 +961,7 @@ CONFIG_CRYPTO_ANUBIS=m
888CONFIG_CRYPTO_DEFLATE=m 961CONFIG_CRYPTO_DEFLATE=m
889CONFIG_CRYPTO_MICHAEL_MIC=m 962CONFIG_CRYPTO_MICHAEL_MIC=m
890CONFIG_CRYPTO_CRC32C=m 963CONFIG_CRYPTO_CRC32C=m
964CONFIG_CRYPTO_CAMELLIA=m
891# CONFIG_CRYPTO_TEST is not set 965# CONFIG_CRYPTO_TEST is not set
892 966
893# 967#
@@ -897,6 +971,7 @@ CONFIG_CRYPTO_CRC32C=m
897# 971#
898# Library routines 972# Library routines
899# 973#
974CONFIG_BITREVERSE=m
900CONFIG_CRC_CCITT=y 975CONFIG_CRC_CCITT=y
901CONFIG_CRC16=m 976CONFIG_CRC16=m
902CONFIG_CRC32=m 977CONFIG_CRC32=m
@@ -904,3 +979,5 @@ CONFIG_LIBCRC32C=m
904CONFIG_ZLIB_INFLATE=m 979CONFIG_ZLIB_INFLATE=m
905CONFIG_ZLIB_DEFLATE=m 980CONFIG_ZLIB_DEFLATE=m
906CONFIG_PLIST=y 981CONFIG_PLIST=y
982CONFIG_HAS_IOMEM=y
983CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/excite_defconfig b/arch/mips/configs/excite_defconfig
index 697140c6562f..5e179fe599b3 100644
--- a/arch/mips/configs/excite_defconfig
+++ b/arch/mips/configs/excite_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:09 2006 4# Sun Feb 18 21:27:47 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -26,8 +27,6 @@ CONFIG_BASLER_EXCITE=y
26# CONFIG_MIPS_COBALT is not set 27# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 28# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MIPS_EV64120 is not set 29# CONFIG_MIPS_EV64120 is not set
29# CONFIG_MIPS_IVR is not set
30# CONFIG_MIPS_ITE8172 is not set
31# CONFIG_MACH_JAZZ is not set 30# CONFIG_MACH_JAZZ is not set
32# CONFIG_LASAT is not set 31# CONFIG_LASAT is not set
33# CONFIG_MIPS_ATLAS is not set 32# CONFIG_MIPS_ATLAS is not set
@@ -43,6 +42,7 @@ CONFIG_BASLER_EXCITE=y
43# CONFIG_MIPS_XXS1500 is not set 42# CONFIG_MIPS_XXS1500 is not set
44# CONFIG_PNX8550_V2PCI is not set 43# CONFIG_PNX8550_V2PCI is not set
45# CONFIG_PNX8550_JBS is not set 44# CONFIG_PNX8550_JBS is not set
45# CONFIG_PNX8550_STB810 is not set
46# CONFIG_DDB5477 is not set 46# CONFIG_DDB5477 is not set
47# CONFIG_MACH_VR41XX is not set 47# CONFIG_MACH_VR41XX is not set
48# CONFIG_PMC_YOSEMITE is not set 48# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +65,14 @@ CONFIG_BASLER_EXCITE=y
65# CONFIG_TOSHIBA_RBTX4927 is not set 65# CONFIG_TOSHIBA_RBTX4927 is not set
66# CONFIG_TOSHIBA_RBTX4938 is not set 66# CONFIG_TOSHIBA_RBTX4938 is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_COHERENT=y 76CONFIG_DMA_COHERENT=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
74# CONFIG_CPU_LITTLE_ENDIAN is not set 78# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -76,6 +80,10 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
76CONFIG_IRQ_CPU=y 80CONFIG_IRQ_CPU=y
77CONFIG_IRQ_CPU_RM7K=y 81CONFIG_IRQ_CPU_RM7K=y
78CONFIG_IRQ_CPU_RM9K=y 82CONFIG_IRQ_CPU_RM9K=y
83CONFIG_MIPS_RM9122=y
84CONFIG_SERIAL_RM9000=y
85CONFIG_GPI_RM9000=y
86CONFIG_WDT_RM9000=y
79CONFIG_MIPS_L1_CACHE_SHIFT=5 87CONFIG_MIPS_L1_CACHE_SHIFT=5
80 88
81# 89#
@@ -101,6 +109,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
101CONFIG_CPU_RM9000=y 109CONFIG_CPU_RM9000=y
102# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
103CONFIG_SYS_HAS_CPU_RM9000=y 111CONFIG_SYS_HAS_CPU_RM9000=y
112CONFIG_WEAK_ORDERING=y
104CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 113CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
105CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 114CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
106CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -117,8 +126,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 126# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 127CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 132# CONFIG_64BIT_PHYS_ADDR is not set
124CONFIG_CPU_HAS_LLSC=y 133CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -149,6 +159,7 @@ CONFIG_HZ=1000
149# CONFIG_PREEMPT_VOLUNTARY is not set 159# CONFIG_PREEMPT_VOLUNTARY is not set
150CONFIG_PREEMPT=y 160CONFIG_PREEMPT=y
151CONFIG_PREEMPT_BKL=y 161CONFIG_PREEMPT_BKL=y
162# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -168,15 +179,20 @@ CONFIG_LOCALVERSION=""
168# CONFIG_LOCALVERSION_AUTO is not set 179# CONFIG_LOCALVERSION_AUTO is not set
169CONFIG_SWAP=y 180CONFIG_SWAP=y
170CONFIG_SYSVIPC=y 181CONFIG_SYSVIPC=y
182# CONFIG_IPC_NS is not set
183CONFIG_SYSVIPC_SYSCTL=y
171CONFIG_POSIX_MQUEUE=y 184CONFIG_POSIX_MQUEUE=y
172# CONFIG_BSD_PROCESS_ACCT is not set 185# CONFIG_BSD_PROCESS_ACCT is not set
173CONFIG_SYSCTL=y 186# CONFIG_TASKSTATS is not set
187# CONFIG_UTS_NS is not set
174# CONFIG_AUDIT is not set 188# CONFIG_AUDIT is not set
175# CONFIG_IKCONFIG is not set 189# CONFIG_IKCONFIG is not set
190CONFIG_SYSFS_DEPRECATED=y
176# CONFIG_RELAY is not set 191# CONFIG_RELAY is not set
177CONFIG_INITRAMFS_SOURCE=""
178CONFIG_CC_OPTIMIZE_FOR_SIZE=y 192CONFIG_CC_OPTIMIZE_FOR_SIZE=y
193CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 194CONFIG_EMBEDDED=y
195CONFIG_SYSCTL_SYSCALL=y
180CONFIG_KALLSYMS=y 196CONFIG_KALLSYMS=y
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 197# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_HOTPLUG=y 198CONFIG_HOTPLUG=y
@@ -184,12 +200,12 @@ CONFIG_PRINTK=y
184CONFIG_BUG=y 200CONFIG_BUG=y
185CONFIG_ELF_CORE=y 201CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 202CONFIG_BASE_FULL=y
187CONFIG_RT_MUTEXES=y
188CONFIG_FUTEX=y 203CONFIG_FUTEX=y
189CONFIG_EPOLL=y 204CONFIG_EPOLL=y
190CONFIG_SHMEM=y 205CONFIG_SHMEM=y
191CONFIG_SLAB=y 206CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 207CONFIG_VM_EVENT_COUNTERS=y
208CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 209# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 210CONFIG_BASE_SMALL=0
195# CONFIG_SLOB is not set 211# CONFIG_SLOB is not set
@@ -207,6 +223,7 @@ CONFIG_KMOD=y
207# 223#
208# Block layer 224# Block layer
209# 225#
226CONFIG_BLOCK=y
210# CONFIG_LBD is not set 227# CONFIG_LBD is not set
211# CONFIG_BLK_DEV_IO_TRACE is not set 228# CONFIG_BLK_DEV_IO_TRACE is not set
212# CONFIG_LSF is not set 229# CONFIG_LSF is not set
@@ -249,6 +266,14 @@ CONFIG_BINFMT_ELF=y
249CONFIG_TRAD_SIGNALS=y 266CONFIG_TRAD_SIGNALS=y
250 267
251# 268#
269# Power management options
270#
271CONFIG_PM=y
272# CONFIG_PM_LEGACY is not set
273# CONFIG_PM_DEBUG is not set
274# CONFIG_PM_SYSFS_DEPRECATED is not set
275
276#
252# Networking 277# Networking
253# 278#
254CONFIG_NET=y 279CONFIG_NET=y
@@ -262,6 +287,8 @@ CONFIG_PACKET_MMAP=y
262CONFIG_UNIX=y 287CONFIG_UNIX=y
263CONFIG_XFRM=y 288CONFIG_XFRM=y
264# CONFIG_XFRM_USER is not set 289# CONFIG_XFRM_USER is not set
290# CONFIG_XFRM_SUB_POLICY is not set
291CONFIG_XFRM_MIGRATE=y
265# CONFIG_NET_KEY is not set 292# CONFIG_NET_KEY is not set
266CONFIG_INET=y 293CONFIG_INET=y
267# CONFIG_IP_MULTICAST is not set 294# CONFIG_IP_MULTICAST is not set
@@ -282,10 +309,13 @@ CONFIG_IP_PNP_DHCP=y
282# CONFIG_INET_TUNNEL is not set 309# CONFIG_INET_TUNNEL is not set
283CONFIG_INET_XFRM_MODE_TRANSPORT=m 310CONFIG_INET_XFRM_MODE_TRANSPORT=m
284CONFIG_INET_XFRM_MODE_TUNNEL=m 311CONFIG_INET_XFRM_MODE_TUNNEL=m
312CONFIG_INET_XFRM_MODE_BEET=m
285CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_BIC=y 316CONFIG_TCP_CONG_CUBIC=y
317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
289# CONFIG_IPV6 is not set 319# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 320# CONFIG_INET6_XFRM_TUNNEL is not set
291# CONFIG_INET6_TUNNEL is not set 321# CONFIG_INET6_TUNNEL is not set
@@ -315,7 +345,6 @@ CONFIG_NETWORK_SECMARK=y
315# CONFIG_ATALK is not set 345# CONFIG_ATALK is not set
316# CONFIG_X25 is not set 346# CONFIG_X25 is not set
317# CONFIG_LAPB is not set 347# CONFIG_LAPB is not set
318# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 348# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 349# CONFIG_WAN_ROUTER is not set
321 350
@@ -342,7 +371,7 @@ CONFIG_NETWORK_SECMARK=y
342# 371#
343CONFIG_STANDALONE=y 372CONFIG_STANDALONE=y
344CONFIG_PREVENT_FIRMWARE_BUILD=y 373CONFIG_PREVENT_FIRMWARE_BUILD=y
345# CONFIG_FW_LOADER is not set 374CONFIG_FW_LOADER=m
346# CONFIG_SYS_HYPERVISOR is not set 375# CONFIG_SYS_HYPERVISOR is not set
347 376
348# 377#
@@ -364,11 +393,13 @@ CONFIG_MTD_PARTITIONS=y
364# User Modules And Translation Layers 393# User Modules And Translation Layers
365# 394#
366CONFIG_MTD_CHAR=y 395CONFIG_MTD_CHAR=y
396CONFIG_MTD_BLKDEVS=y
367CONFIG_MTD_BLOCK=y 397CONFIG_MTD_BLOCK=y
368# CONFIG_FTL is not set 398# CONFIG_FTL is not set
369# CONFIG_NFTL is not set 399# CONFIG_NFTL is not set
370# CONFIG_INFTL is not set 400# CONFIG_INFTL is not set
371# CONFIG_RFD_FTL is not set 401# CONFIG_RFD_FTL is not set
402# CONFIG_SSFDC is not set
372 403
373# 404#
374# RAM/ROM/Flash chip drivers 405# RAM/ROM/Flash chip drivers
@@ -420,6 +451,7 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
420# CONFIG_MTD_NAND_ECC_SMC is not set 451# CONFIG_MTD_NAND_ECC_SMC is not set
421CONFIG_MTD_NAND_IDS=y 452CONFIG_MTD_NAND_IDS=y
422# CONFIG_MTD_NAND_DISKONCHIP is not set 453# CONFIG_MTD_NAND_DISKONCHIP is not set
454# CONFIG_MTD_NAND_CAFE is not set
423# CONFIG_MTD_NAND_NANDSIM is not set 455# CONFIG_MTD_NAND_NANDSIM is not set
424 456
425# 457#
@@ -455,6 +487,12 @@ CONFIG_BLK_DEV_LOOP=m
455# CONFIG_ATA_OVER_ETH is not set 487# CONFIG_ATA_OVER_ETH is not set
456 488
457# 489#
490# Misc devices
491#
492CONFIG_SGI_IOC4=m
493# CONFIG_TIFM_CORE is not set
494
495#
458# ATA/ATAPI/MFM/RLL support 496# ATA/ATAPI/MFM/RLL support
459# 497#
460# CONFIG_IDE is not set 498# CONFIG_IDE is not set
@@ -464,6 +502,8 @@ CONFIG_BLK_DEV_LOOP=m
464# 502#
465# CONFIG_RAID_ATTRS is not set 503# CONFIG_RAID_ATTRS is not set
466CONFIG_SCSI=y 504CONFIG_SCSI=y
505CONFIG_SCSI_TGT=m
506# CONFIG_SCSI_NETLINK is not set
467# CONFIG_SCSI_PROC_FS is not set 507# CONFIG_SCSI_PROC_FS is not set
468 508
469# 509#
@@ -482,14 +522,17 @@ CONFIG_BLK_DEV_SD=y
482# CONFIG_SCSI_MULTI_LUN is not set 522# CONFIG_SCSI_MULTI_LUN is not set
483# CONFIG_SCSI_CONSTANTS is not set 523# CONFIG_SCSI_CONSTANTS is not set
484# CONFIG_SCSI_LOGGING is not set 524# CONFIG_SCSI_LOGGING is not set
525CONFIG_SCSI_SCAN_ASYNC=y
485 526
486# 527#
487# SCSI Transport Attributes 528# SCSI Transports
488# 529#
489# CONFIG_SCSI_SPI_ATTRS is not set 530# CONFIG_SCSI_SPI_ATTRS is not set
490# CONFIG_SCSI_FC_ATTRS is not set 531# CONFIG_SCSI_FC_ATTRS is not set
491# CONFIG_SCSI_ISCSI_ATTRS is not set 532# CONFIG_SCSI_ISCSI_ATTRS is not set
492# CONFIG_SCSI_SAS_ATTRS is not set 533CONFIG_SCSI_SAS_ATTRS=m
534CONFIG_SCSI_SAS_LIBSAS=m
535# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
493 536
494# 537#
495# SCSI low-level drivers 538# SCSI low-level drivers
@@ -502,26 +545,35 @@ CONFIG_BLK_DEV_SD=y
502# CONFIG_SCSI_AIC7XXX is not set 545# CONFIG_SCSI_AIC7XXX is not set
503# CONFIG_SCSI_AIC7XXX_OLD is not set 546# CONFIG_SCSI_AIC7XXX_OLD is not set
504# CONFIG_SCSI_AIC79XX is not set 547# CONFIG_SCSI_AIC79XX is not set
548CONFIG_SCSI_AIC94XX=m
549# CONFIG_AIC94XX_DEBUG is not set
505# CONFIG_SCSI_DPT_I2O is not set 550# CONFIG_SCSI_DPT_I2O is not set
551# CONFIG_SCSI_ARCMSR is not set
506# CONFIG_MEGARAID_NEWGEN is not set 552# CONFIG_MEGARAID_NEWGEN is not set
507# CONFIG_MEGARAID_LEGACY is not set 553# CONFIG_MEGARAID_LEGACY is not set
508# CONFIG_MEGARAID_SAS is not set 554# CONFIG_MEGARAID_SAS is not set
509# CONFIG_SCSI_SATA is not set
510# CONFIG_SCSI_HPTIOP is not set 555# CONFIG_SCSI_HPTIOP is not set
511# CONFIG_SCSI_DMX3191D is not set 556# CONFIG_SCSI_DMX3191D is not set
512# CONFIG_SCSI_FUTURE_DOMAIN is not set 557# CONFIG_SCSI_FUTURE_DOMAIN is not set
513# CONFIG_SCSI_IPS is not set 558# CONFIG_SCSI_IPS is not set
514# CONFIG_SCSI_INITIO is not set 559# CONFIG_SCSI_INITIO is not set
515# CONFIG_SCSI_INIA100 is not set 560# CONFIG_SCSI_INIA100 is not set
561# CONFIG_SCSI_STEX is not set
516# CONFIG_SCSI_SYM53C8XX_2 is not set 562# CONFIG_SCSI_SYM53C8XX_2 is not set
517# CONFIG_SCSI_IPR is not set
518# CONFIG_SCSI_QLOGIC_1280 is not set 563# CONFIG_SCSI_QLOGIC_1280 is not set
519# CONFIG_SCSI_QLA_FC is not set 564# CONFIG_SCSI_QLA_FC is not set
565# CONFIG_SCSI_QLA_ISCSI is not set
520# CONFIG_SCSI_LPFC is not set 566# CONFIG_SCSI_LPFC is not set
521# CONFIG_SCSI_DC395x is not set 567# CONFIG_SCSI_DC395x is not set
522# CONFIG_SCSI_DC390T is not set 568# CONFIG_SCSI_DC390T is not set
523# CONFIG_SCSI_NSP32 is not set 569# CONFIG_SCSI_NSP32 is not set
524# CONFIG_SCSI_DEBUG is not set 570# CONFIG_SCSI_DEBUG is not set
571# CONFIG_SCSI_SRP is not set
572
573#
574# Serial ATA (prod) and Parallel ATA (experimental) drivers
575#
576# CONFIG_ATA is not set
525 577
526# 578#
527# Multi-device support (RAID and LVM) 579# Multi-device support (RAID and LVM)
@@ -585,14 +637,17 @@ CONFIG_NETDEVICES=y
585# CONFIG_SK98LIN is not set 637# CONFIG_SK98LIN is not set
586# CONFIG_TIGON3 is not set 638# CONFIG_TIGON3 is not set
587# CONFIG_BNX2 is not set 639# CONFIG_BNX2 is not set
640CONFIG_QLA3XXX=m
588 641
589# 642#
590# Ethernet (10000 Mbit) 643# Ethernet (10000 Mbit)
591# 644#
592# CONFIG_CHELSIO_T1 is not set 645# CONFIG_CHELSIO_T1 is not set
646CONFIG_CHELSIO_T3=m
593# CONFIG_IXGB is not set 647# CONFIG_IXGB is not set
594# CONFIG_S2IO is not set 648# CONFIG_S2IO is not set
595# CONFIG_MYRI10GE is not set 649# CONFIG_MYRI10GE is not set
650CONFIG_NETXEN_NIC=m
596 651
597# 652#
598# Token Ring devices 653# Token Ring devices
@@ -632,6 +687,7 @@ CONFIG_NETDEVICES=y
632# Input device support 687# Input device support
633# 688#
634CONFIG_INPUT=y 689CONFIG_INPUT=y
690# CONFIG_INPUT_FF_MEMLESS is not set
635 691
636# 692#
637# Userland interfaces 693# Userland interfaces
@@ -707,6 +763,7 @@ CONFIG_WATCHDOG=y
707# Watchdog Device Drivers 763# Watchdog Device Drivers
708# 764#
709# CONFIG_SOFT_WATCHDOG is not set 765# CONFIG_SOFT_WATCHDOG is not set
766CONFIG_WDT_RM9K_GPI=m
710 767
711# 768#
712# PCI-based Watchdog Cards 769# PCI-based Watchdog Cards
@@ -724,10 +781,6 @@ CONFIG_WATCHDOG=y
724# CONFIG_DTLK is not set 781# CONFIG_DTLK is not set
725# CONFIG_R3964 is not set 782# CONFIG_R3964 is not set
726# CONFIG_APPLICOM is not set 783# CONFIG_APPLICOM is not set
727
728#
729# Ftape, the floppy tape device driver
730#
731# CONFIG_DRM is not set 784# CONFIG_DRM is not set
732# CONFIG_RAW_DRIVER is not set 785# CONFIG_RAW_DRIVER is not set
733 786
@@ -735,7 +788,6 @@ CONFIG_WATCHDOG=y
735# TPM devices 788# TPM devices
736# 789#
737# CONFIG_TCG_TPM is not set 790# CONFIG_TCG_TPM is not set
738# CONFIG_TELCLOCK is not set
739 791
740# 792#
741# I2C support 793# I2C support
@@ -751,6 +803,7 @@ CONFIG_WATCHDOG=y
751# 803#
752# Dallas's 1-wire bus 804# Dallas's 1-wire bus
753# 805#
806# CONFIG_W1 is not set
754 807
755# 808#
756# Hardware Monitoring support 809# Hardware Monitoring support
@@ -759,14 +812,9 @@ CONFIG_WATCHDOG=y
759# CONFIG_HWMON_VID is not set 812# CONFIG_HWMON_VID is not set
760 813
761# 814#
762# Misc devices
763#
764
765#
766# Multimedia devices 815# Multimedia devices
767# 816#
768# CONFIG_VIDEO_DEV is not set 817# CONFIG_VIDEO_DEV is not set
769CONFIG_VIDEO_V4L2=y
770 818
771# 819#
772# Digital Video Broadcasting Devices 820# Digital Video Broadcasting Devices
@@ -782,6 +830,7 @@ CONFIG_FB=y
782# CONFIG_FB_CFB_FILLRECT is not set 830# CONFIG_FB_CFB_FILLRECT is not set
783# CONFIG_FB_CFB_COPYAREA is not set 831# CONFIG_FB_CFB_COPYAREA is not set
784# CONFIG_FB_CFB_IMAGEBLIT is not set 832# CONFIG_FB_CFB_IMAGEBLIT is not set
833# CONFIG_FB_SVGALIB is not set
785# CONFIG_FB_MACMODES is not set 834# CONFIG_FB_MACMODES is not set
786# CONFIG_FB_BACKLIGHT is not set 835# CONFIG_FB_BACKLIGHT is not set
787# CONFIG_FB_MODE_HELPERS is not set 836# CONFIG_FB_MODE_HELPERS is not set
@@ -798,6 +847,7 @@ CONFIG_FB=y
798# CONFIG_FB_RADEON is not set 847# CONFIG_FB_RADEON is not set
799# CONFIG_FB_ATY128 is not set 848# CONFIG_FB_ATY128 is not set
800# CONFIG_FB_ATY is not set 849# CONFIG_FB_ATY is not set
850# CONFIG_FB_S3 is not set
801# CONFIG_FB_SAVAGE is not set 851# CONFIG_FB_SAVAGE is not set
802# CONFIG_FB_SIS is not set 852# CONFIG_FB_SIS is not set
803# CONFIG_FB_NEOMAGIC is not set 853# CONFIG_FB_NEOMAGIC is not set
@@ -831,6 +881,12 @@ CONFIG_FONT_8x16=y
831# CONFIG_SOUND is not set 881# CONFIG_SOUND is not set
832 882
833# 883#
884# HID Devices
885#
886CONFIG_HID=y
887# CONFIG_HID_DEBUG is not set
888
889#
834# USB support 890# USB support
835# 891#
836CONFIG_USB_ARCH_HAS_HCD=y 892CONFIG_USB_ARCH_HAS_HCD=y
@@ -843,8 +899,8 @@ CONFIG_USB=y
843# Miscellaneous USB options 899# Miscellaneous USB options
844# 900#
845CONFIG_USB_DEVICEFS=y 901CONFIG_USB_DEVICEFS=y
846# CONFIG_USB_BANDWIDTH is not set
847# CONFIG_USB_DYNAMIC_MINORS is not set 902# CONFIG_USB_DYNAMIC_MINORS is not set
903# CONFIG_USB_SUSPEND is not set
848# CONFIG_USB_OTG is not set 904# CONFIG_USB_OTG is not set
849 905
850# 906#
@@ -854,9 +910,11 @@ CONFIG_USB_EHCI_HCD=y
854# CONFIG_USB_EHCI_SPLIT_ISO is not set 910# CONFIG_USB_EHCI_SPLIT_ISO is not set
855# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 911# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
856# CONFIG_USB_EHCI_TT_NEWSCHED is not set 912# CONFIG_USB_EHCI_TT_NEWSCHED is not set
913# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
857# CONFIG_USB_ISP116X_HCD is not set 914# CONFIG_USB_ISP116X_HCD is not set
858CONFIG_USB_OHCI_HCD=y 915CONFIG_USB_OHCI_HCD=y
859# CONFIG_USB_OHCI_BIG_ENDIAN is not set 916# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
917# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
860CONFIG_USB_OHCI_LITTLE_ENDIAN=y 918CONFIG_USB_OHCI_LITTLE_ENDIAN=y
861# CONFIG_USB_UHCI_HCD is not set 919# CONFIG_USB_UHCI_HCD is not set
862# CONFIG_USB_SL811_HCD is not set 920# CONFIG_USB_SL811_HCD is not set
@@ -884,14 +942,13 @@ CONFIG_USB_STORAGE=y
884# CONFIG_USB_STORAGE_SDDR55 is not set 942# CONFIG_USB_STORAGE_SDDR55 is not set
885# CONFIG_USB_STORAGE_JUMPSHOT is not set 943# CONFIG_USB_STORAGE_JUMPSHOT is not set
886# CONFIG_USB_STORAGE_ALAUDA is not set 944# CONFIG_USB_STORAGE_ALAUDA is not set
887# CONFIG_USB_STORAGE_ONETOUCH is not set 945# CONFIG_USB_STORAGE_KARMA is not set
888# CONFIG_USB_LIBUSUAL is not set 946# CONFIG_USB_LIBUSUAL is not set
889 947
890# 948#
891# USB Input Devices 949# USB Input Devices
892# 950#
893CONFIG_USB_HID=m 951CONFIG_USB_HID=m
894CONFIG_USB_HIDINPUT=y
895# CONFIG_USB_HIDINPUT_POWERBOOK is not set 952# CONFIG_USB_HIDINPUT_POWERBOOK is not set
896# CONFIG_HID_FF is not set 953# CONFIG_HID_FF is not set
897# CONFIG_USB_HIDDEV is not set 954# CONFIG_USB_HIDDEV is not set
@@ -913,6 +970,7 @@ CONFIG_USB_HIDINPUT=y
913# CONFIG_USB_ATI_REMOTE2 is not set 970# CONFIG_USB_ATI_REMOTE2 is not set
914# CONFIG_USB_KEYSPAN_REMOTE is not set 971# CONFIG_USB_KEYSPAN_REMOTE is not set
915# CONFIG_USB_APPLETOUCH is not set 972# CONFIG_USB_APPLETOUCH is not set
973# CONFIG_USB_GTCO is not set
916 974
917# 975#
918# USB Imaging devices 976# USB Imaging devices
@@ -927,6 +985,7 @@ CONFIG_USB_HIDINPUT=y
927# CONFIG_USB_KAWETH is not set 985# CONFIG_USB_KAWETH is not set
928# CONFIG_USB_PEGASUS is not set 986# CONFIG_USB_PEGASUS is not set
929# CONFIG_USB_RTL8150 is not set 987# CONFIG_USB_RTL8150 is not set
988# CONFIG_USB_USBNET_MII is not set
930# CONFIG_USB_USBNET is not set 989# CONFIG_USB_USBNET is not set
931# CONFIG_USB_MON is not set 990# CONFIG_USB_MON is not set
932 991
@@ -944,19 +1003,21 @@ CONFIG_USB_HIDINPUT=y
944# 1003#
945# CONFIG_USB_EMI62 is not set 1004# CONFIG_USB_EMI62 is not set
946# CONFIG_USB_EMI26 is not set 1005# CONFIG_USB_EMI26 is not set
1006# CONFIG_USB_ADUTUX is not set
947# CONFIG_USB_AUERSWALD is not set 1007# CONFIG_USB_AUERSWALD is not set
948# CONFIG_USB_RIO500 is not set 1008# CONFIG_USB_RIO500 is not set
949# CONFIG_USB_LEGOTOWER is not set 1009# CONFIG_USB_LEGOTOWER is not set
950# CONFIG_USB_LCD is not set 1010# CONFIG_USB_LCD is not set
951# CONFIG_USB_LED is not set 1011# CONFIG_USB_LED is not set
952# CONFIG_USB_CY7C63 is not set 1012# CONFIG_USB_CYPRESS_CY7C63 is not set
953# CONFIG_USB_CYTHERM is not set 1013# CONFIG_USB_CYTHERM is not set
954# CONFIG_USB_PHIDGETKIT is not set 1014# CONFIG_USB_PHIDGET is not set
955# CONFIG_USB_PHIDGETSERVO is not set
956# CONFIG_USB_IDMOUSE is not set 1015# CONFIG_USB_IDMOUSE is not set
1016# CONFIG_USB_FTDI_ELAN is not set
957# CONFIG_USB_APPLEDISPLAY is not set 1017# CONFIG_USB_APPLEDISPLAY is not set
958# CONFIG_USB_SISUSBVGA is not set 1018# CONFIG_USB_SISUSBVGA is not set
959# CONFIG_USB_LD is not set 1019# CONFIG_USB_LD is not set
1020# CONFIG_USB_TRANCEVIBRATOR is not set
960# CONFIG_USB_TEST is not set 1021# CONFIG_USB_TEST is not set
961 1022
962# 1023#
@@ -1014,16 +1075,26 @@ CONFIG_USB_HIDINPUT=y
1014# 1075#
1015 1076
1016# 1077#
1078# Auxiliary Display support
1079#
1080
1081#
1082# Virtualization
1083#
1084
1085#
1017# File systems 1086# File systems
1018# 1087#
1019CONFIG_EXT2_FS=y 1088CONFIG_EXT2_FS=y
1020# CONFIG_EXT2_FS_XATTR is not set 1089# CONFIG_EXT2_FS_XATTR is not set
1021# CONFIG_EXT2_FS_XIP is not set 1090# CONFIG_EXT2_FS_XIP is not set
1022# CONFIG_EXT3_FS is not set 1091# CONFIG_EXT3_FS is not set
1092# CONFIG_EXT4DEV_FS is not set
1023# CONFIG_REISERFS_FS is not set 1093# CONFIG_REISERFS_FS is not set
1024# CONFIG_JFS_FS is not set 1094# CONFIG_JFS_FS is not set
1025# CONFIG_FS_POSIX_ACL is not set 1095CONFIG_FS_POSIX_ACL=y
1026# CONFIG_XFS_FS is not set 1096# CONFIG_XFS_FS is not set
1097# CONFIG_GFS2_FS is not set
1027# CONFIG_OCFS2_FS is not set 1098# CONFIG_OCFS2_FS is not set
1028# CONFIG_MINIX_FS is not set 1099# CONFIG_MINIX_FS is not set
1029# CONFIG_ROMFS_FS is not set 1100# CONFIG_ROMFS_FS is not set
@@ -1034,6 +1105,7 @@ CONFIG_INOTIFY_USER=y
1034# CONFIG_AUTOFS_FS is not set 1105# CONFIG_AUTOFS_FS is not set
1035# CONFIG_AUTOFS4_FS is not set 1106# CONFIG_AUTOFS4_FS is not set
1036# CONFIG_FUSE_FS is not set 1107# CONFIG_FUSE_FS is not set
1108CONFIG_GENERIC_ACL=y
1037 1109
1038# 1110#
1039# CD-ROM/DVD Filesystems 1111# CD-ROM/DVD Filesystems
@@ -1056,11 +1128,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1056# 1128#
1057CONFIG_PROC_FS=y 1129CONFIG_PROC_FS=y
1058CONFIG_PROC_KCORE=y 1130CONFIG_PROC_KCORE=y
1131CONFIG_PROC_SYSCTL=y
1059CONFIG_SYSFS=y 1132CONFIG_SYSFS=y
1060CONFIG_TMPFS=y 1133CONFIG_TMPFS=y
1134CONFIG_TMPFS_POSIX_ACL=y
1061# CONFIG_HUGETLB_PAGE is not set 1135# CONFIG_HUGETLB_PAGE is not set
1062CONFIG_RAMFS=y 1136CONFIG_RAMFS=y
1063# CONFIG_CONFIGFS_FS is not set 1137CONFIG_CONFIGFS_FS=m
1064 1138
1065# 1139#
1066# Miscellaneous filesystems 1140# Miscellaneous filesystems
@@ -1072,7 +1146,6 @@ CONFIG_RAMFS=y
1072# CONFIG_BEFS_FS is not set 1146# CONFIG_BEFS_FS is not set
1073# CONFIG_BFS_FS is not set 1147# CONFIG_BFS_FS is not set
1074# CONFIG_EFS_FS is not set 1148# CONFIG_EFS_FS is not set
1075# CONFIG_JFFS_FS is not set
1076CONFIG_JFFS2_FS=y 1149CONFIG_JFFS2_FS=y
1077CONFIG_JFFS2_FS_DEBUG=0 1150CONFIG_JFFS2_FS_DEBUG=0
1078CONFIG_JFFS2_FS_WRITEBUFFER=y 1151CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1107,7 +1180,6 @@ CONFIG_SUNRPC=y
1107# CONFIG_RPCSEC_GSS_SPKM3 is not set 1180# CONFIG_RPCSEC_GSS_SPKM3 is not set
1108# CONFIG_SMB_FS is not set 1181# CONFIG_SMB_FS is not set
1109# CONFIG_CIFS is not set 1182# CONFIG_CIFS is not set
1110# CONFIG_CIFS_DEBUG2 is not set
1111# CONFIG_NCP_FS is not set 1183# CONFIG_NCP_FS is not set
1112# CONFIG_CODA_FS is not set 1184# CONFIG_CODA_FS is not set
1113# CONFIG_AFS_FS is not set 1185# CONFIG_AFS_FS is not set
@@ -1179,6 +1251,14 @@ CONFIG_NLS_ISO8859_1=m
1179# CONFIG_NLS_UTF8 is not set 1251# CONFIG_NLS_UTF8 is not set
1180 1252
1181# 1253#
1254# Distributed Lock Manager
1255#
1256CONFIG_DLM=m
1257CONFIG_DLM_TCP=y
1258# CONFIG_DLM_SCTP is not set
1259# CONFIG_DLM_DEBUG is not set
1260
1261#
1182# Profiling support 1262# Profiling support
1183# 1263#
1184# CONFIG_PROFILING is not set 1264# CONFIG_PROFILING is not set
@@ -1188,11 +1268,13 @@ CONFIG_NLS_ISO8859_1=m
1188# 1268#
1189CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1269CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1190# CONFIG_PRINTK_TIME is not set 1270# CONFIG_PRINTK_TIME is not set
1271CONFIG_ENABLE_MUST_CHECK=y
1191# CONFIG_MAGIC_SYSRQ is not set 1272# CONFIG_MAGIC_SYSRQ is not set
1192# CONFIG_UNUSED_SYMBOLS is not set 1273# CONFIG_UNUSED_SYMBOLS is not set
1274# CONFIG_DEBUG_FS is not set
1275# CONFIG_HEADERS_CHECK is not set
1193# CONFIG_DEBUG_KERNEL is not set 1276# CONFIG_DEBUG_KERNEL is not set
1194CONFIG_LOG_BUF_SHIFT=14 1277CONFIG_LOG_BUF_SHIFT=14
1195# CONFIG_DEBUG_FS is not set
1196CONFIG_CROSSCOMPILE=y 1278CONFIG_CROSSCOMPILE=y
1197CONFIG_CMDLINE="" 1279CONFIG_CMDLINE=""
1198 1280
@@ -1206,16 +1288,27 @@ CONFIG_CMDLINE=""
1206# Cryptographic options 1288# Cryptographic options
1207# 1289#
1208CONFIG_CRYPTO=y 1290CONFIG_CRYPTO=y
1291CONFIG_CRYPTO_ALGAPI=y
1292CONFIG_CRYPTO_BLKCIPHER=m
1293CONFIG_CRYPTO_HASH=m
1294CONFIG_CRYPTO_MANAGER=m
1209# CONFIG_CRYPTO_HMAC is not set 1295# CONFIG_CRYPTO_HMAC is not set
1296CONFIG_CRYPTO_XCBC=m
1210# CONFIG_CRYPTO_NULL is not set 1297# CONFIG_CRYPTO_NULL is not set
1211# CONFIG_CRYPTO_MD4 is not set 1298# CONFIG_CRYPTO_MD4 is not set
1212# CONFIG_CRYPTO_MD5 is not set 1299CONFIG_CRYPTO_MD5=y
1213# CONFIG_CRYPTO_SHA1 is not set 1300# CONFIG_CRYPTO_SHA1 is not set
1214# CONFIG_CRYPTO_SHA256 is not set 1301# CONFIG_CRYPTO_SHA256 is not set
1215# CONFIG_CRYPTO_SHA512 is not set 1302# CONFIG_CRYPTO_SHA512 is not set
1216# CONFIG_CRYPTO_WP512 is not set 1303# CONFIG_CRYPTO_WP512 is not set
1217# CONFIG_CRYPTO_TGR192 is not set 1304# CONFIG_CRYPTO_TGR192 is not set
1305CONFIG_CRYPTO_GF128MUL=m
1306CONFIG_CRYPTO_ECB=m
1307CONFIG_CRYPTO_CBC=m
1308CONFIG_CRYPTO_PCBC=m
1309CONFIG_CRYPTO_LRW=m
1218# CONFIG_CRYPTO_DES is not set 1310# CONFIG_CRYPTO_DES is not set
1311CONFIG_CRYPTO_FCRYPT=m
1219# CONFIG_CRYPTO_BLOWFISH is not set 1312# CONFIG_CRYPTO_BLOWFISH is not set
1220# CONFIG_CRYPTO_TWOFISH is not set 1313# CONFIG_CRYPTO_TWOFISH is not set
1221# CONFIG_CRYPTO_SERPENT is not set 1314# CONFIG_CRYPTO_SERPENT is not set
@@ -1229,6 +1322,7 @@ CONFIG_CRYPTO=y
1229# CONFIG_CRYPTO_DEFLATE is not set 1322# CONFIG_CRYPTO_DEFLATE is not set
1230# CONFIG_CRYPTO_MICHAEL_MIC is not set 1323# CONFIG_CRYPTO_MICHAEL_MIC is not set
1231# CONFIG_CRYPTO_CRC32C is not set 1324# CONFIG_CRYPTO_CRC32C is not set
1325CONFIG_CRYPTO_CAMELLIA=m
1232# CONFIG_CRYPTO_TEST is not set 1326# CONFIG_CRYPTO_TEST is not set
1233 1327
1234# 1328#
@@ -1238,6 +1332,7 @@ CONFIG_CRYPTO=y
1238# 1332#
1239# Library routines 1333# Library routines
1240# 1334#
1335CONFIG_BITREVERSE=y
1241# CONFIG_CRC_CCITT is not set 1336# CONFIG_CRC_CCITT is not set
1242# CONFIG_CRC16 is not set 1337# CONFIG_CRC16 is not set
1243CONFIG_CRC32=y 1338CONFIG_CRC32=y
@@ -1245,3 +1340,5 @@ CONFIG_CRC32=y
1245CONFIG_ZLIB_INFLATE=y 1340CONFIG_ZLIB_INFLATE=y
1246CONFIG_ZLIB_DEFLATE=y 1341CONFIG_ZLIB_DEFLATE=y
1247CONFIG_PLIST=y 1342CONFIG_PLIST=y
1343CONFIG_HAS_IOMEM=y
1344CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index f9812d1e4579..864de219eb67 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:10 2006 4# Sun Feb 18 21:27:48 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,13 +64,18 @@ CONFIG_SGI_IP22=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 75CONFIG_ARC=y
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
78CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
74CONFIG_CPU_BIG_ENDIAN=y 79CONFIG_CPU_BIG_ENDIAN=y
75# CONFIG_CPU_LITTLE_ENDIAN is not set 80# CONFIG_CPU_LITTLE_ENDIAN is not set
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 81CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -123,8 +128,8 @@ CONFIG_PAGE_SIZE_4KB=y
123CONFIG_BOARD_SCACHE=y 128CONFIG_BOARD_SCACHE=y
124CONFIG_IP22_CPU_SCACHE=y 129CONFIG_IP22_CPU_SCACHE=y
125CONFIG_MIPS_MT_DISABLED=y 130CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 131# CONFIG_MIPS_MT_SMP is not set
132# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 133# CONFIG_MIPS_VPE_LOADER is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 134# CONFIG_64BIT_PHYS_ADDR is not set
130CONFIG_CPU_HAS_LLSC=y 135CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -153,6 +159,7 @@ CONFIG_HZ=1000
153# CONFIG_PREEMPT_NONE is not set 159# CONFIG_PREEMPT_NONE is not set
154CONFIG_PREEMPT_VOLUNTARY=y 160CONFIG_PREEMPT_VOLUNTARY=y
155# CONFIG_PREEMPT is not set 161# CONFIG_PREEMPT is not set
162# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +178,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 178CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 179CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 183# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 184# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 185# CONFIG_TASKSTATS is not set
186# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
178CONFIG_IKCONFIG=y 188CONFIG_IKCONFIG=y
179CONFIG_IKCONFIG_PROC=y 189CONFIG_IKCONFIG_PROC=y
190CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 191CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 192# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
193CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 194CONFIG_EMBEDDED=y
195CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 196CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 197# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 198# CONFIG_HOTPLUG is not set
@@ -188,12 +200,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 200CONFIG_BUG=y
189CONFIG_ELF_CORE=y 201CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 202CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 203CONFIG_FUTEX=y
193CONFIG_EPOLL=y 204CONFIG_EPOLL=y
194CONFIG_SHMEM=y 205CONFIG_SHMEM=y
195CONFIG_SLAB=y 206CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 207CONFIG_VM_EVENT_COUNTERS=y
208CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 209# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 210CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 211# CONFIG_SLOB is not set
@@ -211,6 +223,7 @@ CONFIG_KMOD=y
211# 223#
212# Block layer 224# Block layer
213# 225#
226CONFIG_BLOCK=y
214# CONFIG_LBD is not set 227# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 228# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 229# CONFIG_LSF is not set
@@ -238,7 +251,6 @@ CONFIG_MMU=y
238# 251#
239# PCCARD (PCMCIA/CardBus) support 252# PCCARD (PCMCIA/CardBus) support
240# 253#
241# CONFIG_PCCARD is not set
242 254
243# 255#
244# PCI Hotplug Support 256# PCI Hotplug Support
@@ -252,6 +264,14 @@ CONFIG_BINFMT_MISC=m
252CONFIG_TRAD_SIGNALS=y 264CONFIG_TRAD_SIGNALS=y
253 265
254# 266#
267# Power management options
268#
269CONFIG_PM=y
270# CONFIG_PM_LEGACY is not set
271# CONFIG_PM_DEBUG is not set
272# CONFIG_PM_SYSFS_DEPRECATED is not set
273
274#
255# Networking 275# Networking
256# 276#
257CONFIG_NET=y 277CONFIG_NET=y
@@ -265,7 +285,10 @@ CONFIG_PACKET_MMAP=y
265CONFIG_UNIX=y 285CONFIG_UNIX=y
266CONFIG_XFRM=y 286CONFIG_XFRM=y
267CONFIG_XFRM_USER=m 287CONFIG_XFRM_USER=m
288# CONFIG_XFRM_SUB_POLICY is not set
289CONFIG_XFRM_MIGRATE=y
268CONFIG_NET_KEY=y 290CONFIG_NET_KEY=y
291CONFIG_NET_KEY_MIGRATE=y
269CONFIG_INET=y 292CONFIG_INET=y
270CONFIG_IP_MULTICAST=y 293CONFIG_IP_MULTICAST=y
271# CONFIG_IP_ADVANCED_ROUTER is not set 294# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -286,10 +309,13 @@ CONFIG_INET_XFRM_TUNNEL=m
286CONFIG_INET_TUNNEL=m 309CONFIG_INET_TUNNEL=m
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 310CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 311CONFIG_INET_XFRM_MODE_TUNNEL=m
312CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 316CONFIG_TCP_CONG_CUBIC=y
317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
293 319
294# 320#
295# IP: Virtual Server Configuration 321# IP: Virtual Server Configuration
@@ -331,11 +357,17 @@ CONFIG_IPV6_ROUTE_INFO=y
331CONFIG_INET6_AH=m 357CONFIG_INET6_AH=m
332CONFIG_INET6_ESP=m 358CONFIG_INET6_ESP=m
333CONFIG_INET6_IPCOMP=m 359CONFIG_INET6_IPCOMP=m
360CONFIG_IPV6_MIP6=y
334CONFIG_INET6_XFRM_TUNNEL=m 361CONFIG_INET6_XFRM_TUNNEL=m
335CONFIG_INET6_TUNNEL=m 362CONFIG_INET6_TUNNEL=m
336CONFIG_INET6_XFRM_MODE_TRANSPORT=m 363CONFIG_INET6_XFRM_MODE_TRANSPORT=m
337CONFIG_INET6_XFRM_MODE_TUNNEL=m 364CONFIG_INET6_XFRM_MODE_TUNNEL=m
365CONFIG_INET6_XFRM_MODE_BEET=m
366CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
367CONFIG_IPV6_SIT=m
338CONFIG_IPV6_TUNNEL=m 368CONFIG_IPV6_TUNNEL=m
369CONFIG_IPV6_MULTIPLE_TABLES=y
370CONFIG_IPV6_SUBTREES=y
339CONFIG_NETWORK_SECMARK=y 371CONFIG_NETWORK_SECMARK=y
340CONFIG_NETFILTER=y 372CONFIG_NETFILTER=y
341# CONFIG_NETFILTER_DEBUG is not set 373# CONFIG_NETFILTER_DEBUG is not set
@@ -346,19 +378,43 @@ CONFIG_NETFILTER=y
346CONFIG_NETFILTER_NETLINK=m 378CONFIG_NETFILTER_NETLINK=m
347CONFIG_NETFILTER_NETLINK_QUEUE=m 379CONFIG_NETFILTER_NETLINK_QUEUE=m
348CONFIG_NETFILTER_NETLINK_LOG=m 380CONFIG_NETFILTER_NETLINK_LOG=m
381CONFIG_NF_CONNTRACK_ENABLED=m
382CONFIG_NF_CONNTRACK_SUPPORT=y
383# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
384CONFIG_NF_CONNTRACK=m
385CONFIG_NF_CT_ACCT=y
386CONFIG_NF_CONNTRACK_MARK=y
387CONFIG_NF_CONNTRACK_SECMARK=y
388CONFIG_NF_CONNTRACK_EVENTS=y
389CONFIG_NF_CT_PROTO_GRE=m
390CONFIG_NF_CT_PROTO_SCTP=m
391CONFIG_NF_CONNTRACK_AMANDA=m
392CONFIG_NF_CONNTRACK_FTP=m
393CONFIG_NF_CONNTRACK_H323=m
394CONFIG_NF_CONNTRACK_IRC=m
395# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
396CONFIG_NF_CONNTRACK_PPTP=m
397CONFIG_NF_CONNTRACK_SANE=m
398CONFIG_NF_CONNTRACK_SIP=m
399CONFIG_NF_CONNTRACK_TFTP=m
400CONFIG_NF_CT_NETLINK=m
349CONFIG_NETFILTER_XTABLES=m 401CONFIG_NETFILTER_XTABLES=m
350CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 402CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
351CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 403CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
404CONFIG_NETFILTER_XT_TARGET_DSCP=m
352CONFIG_NETFILTER_XT_TARGET_MARK=m 405CONFIG_NETFILTER_XT_TARGET_MARK=m
353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 406CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
407CONFIG_NETFILTER_XT_TARGET_NFLOG=m
354CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 408CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
355CONFIG_NETFILTER_XT_TARGET_SECMARK=m 409CONFIG_NETFILTER_XT_TARGET_SECMARK=m
356CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 410CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
411CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
357CONFIG_NETFILTER_XT_MATCH_COMMENT=m 412CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 413CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
359CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 414CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 415CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
361CONFIG_NETFILTER_XT_MATCH_DCCP=m 416CONFIG_NETFILTER_XT_MATCH_DCCP=m
417CONFIG_NETFILTER_XT_MATCH_DSCP=m
362CONFIG_NETFILTER_XT_MATCH_ESP=m 418CONFIG_NETFILTER_XT_MATCH_ESP=m
363CONFIG_NETFILTER_XT_MATCH_HELPER=m 419CONFIG_NETFILTER_XT_MATCH_HELPER=m
364CONFIG_NETFILTER_XT_MATCH_LENGTH=m 420CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -375,60 +431,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
375CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 431CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
376CONFIG_NETFILTER_XT_MATCH_STRING=m 432CONFIG_NETFILTER_XT_MATCH_STRING=m
377CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 433CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
434CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
378 435
379# 436#
380# IP: Netfilter Configuration 437# IP: Netfilter Configuration
381# 438#
382CONFIG_IP_NF_CONNTRACK=m 439CONFIG_NF_CONNTRACK_IPV4=m
383CONFIG_IP_NF_CT_ACCT=y 440CONFIG_NF_CONNTRACK_PROC_COMPAT=y
384CONFIG_IP_NF_CONNTRACK_MARK=y
385CONFIG_IP_NF_CONNTRACK_SECMARK=y
386CONFIG_IP_NF_CONNTRACK_EVENTS=y
387CONFIG_IP_NF_CONNTRACK_NETLINK=m
388# CONFIG_IP_NF_CT_PROTO_SCTP is not set
389CONFIG_IP_NF_FTP=m
390CONFIG_IP_NF_IRC=m
391# CONFIG_IP_NF_NETBIOS_NS is not set
392CONFIG_IP_NF_TFTP=m
393CONFIG_IP_NF_AMANDA=m
394CONFIG_IP_NF_PPTP=m
395CONFIG_IP_NF_H323=m
396CONFIG_IP_NF_SIP=m
397CONFIG_IP_NF_QUEUE=m 441CONFIG_IP_NF_QUEUE=m
398CONFIG_IP_NF_IPTABLES=m 442CONFIG_IP_NF_IPTABLES=m
399CONFIG_IP_NF_MATCH_IPRANGE=m 443CONFIG_IP_NF_MATCH_IPRANGE=m
400CONFIG_IP_NF_MATCH_TOS=m 444CONFIG_IP_NF_MATCH_TOS=m
401CONFIG_IP_NF_MATCH_RECENT=m 445CONFIG_IP_NF_MATCH_RECENT=m
402CONFIG_IP_NF_MATCH_ECN=m 446CONFIG_IP_NF_MATCH_ECN=m
403CONFIG_IP_NF_MATCH_DSCP=m
404CONFIG_IP_NF_MATCH_AH=m 447CONFIG_IP_NF_MATCH_AH=m
405CONFIG_IP_NF_MATCH_TTL=m 448CONFIG_IP_NF_MATCH_TTL=m
406CONFIG_IP_NF_MATCH_OWNER=m 449CONFIG_IP_NF_MATCH_OWNER=m
407CONFIG_IP_NF_MATCH_ADDRTYPE=m 450CONFIG_IP_NF_MATCH_ADDRTYPE=m
408CONFIG_IP_NF_MATCH_HASHLIMIT=m
409CONFIG_IP_NF_FILTER=m 451CONFIG_IP_NF_FILTER=m
410CONFIG_IP_NF_TARGET_REJECT=m 452CONFIG_IP_NF_TARGET_REJECT=m
411CONFIG_IP_NF_TARGET_LOG=m 453CONFIG_IP_NF_TARGET_LOG=m
412CONFIG_IP_NF_TARGET_ULOG=m 454CONFIG_IP_NF_TARGET_ULOG=m
413CONFIG_IP_NF_TARGET_TCPMSS=m 455CONFIG_NF_NAT=m
414CONFIG_IP_NF_NAT=m 456CONFIG_NF_NAT_NEEDED=y
415CONFIG_IP_NF_NAT_NEEDED=y
416CONFIG_IP_NF_TARGET_MASQUERADE=m 457CONFIG_IP_NF_TARGET_MASQUERADE=m
417CONFIG_IP_NF_TARGET_REDIRECT=m 458CONFIG_IP_NF_TARGET_REDIRECT=m
418CONFIG_IP_NF_TARGET_NETMAP=m 459CONFIG_IP_NF_TARGET_NETMAP=m
419CONFIG_IP_NF_TARGET_SAME=m 460CONFIG_IP_NF_TARGET_SAME=m
420CONFIG_IP_NF_NAT_SNMP_BASIC=m 461CONFIG_NF_NAT_SNMP_BASIC=m
421CONFIG_IP_NF_NAT_IRC=m 462CONFIG_NF_NAT_PROTO_GRE=m
422CONFIG_IP_NF_NAT_FTP=m 463CONFIG_NF_NAT_FTP=m
423CONFIG_IP_NF_NAT_TFTP=m 464CONFIG_NF_NAT_IRC=m
424CONFIG_IP_NF_NAT_AMANDA=m 465CONFIG_NF_NAT_TFTP=m
425CONFIG_IP_NF_NAT_PPTP=m 466CONFIG_NF_NAT_AMANDA=m
426CONFIG_IP_NF_NAT_H323=m 467CONFIG_NF_NAT_PPTP=m
427CONFIG_IP_NF_NAT_SIP=m 468CONFIG_NF_NAT_H323=m
469CONFIG_NF_NAT_SIP=m
428CONFIG_IP_NF_MANGLE=m 470CONFIG_IP_NF_MANGLE=m
429CONFIG_IP_NF_TARGET_TOS=m 471CONFIG_IP_NF_TARGET_TOS=m
430CONFIG_IP_NF_TARGET_ECN=m 472CONFIG_IP_NF_TARGET_ECN=m
431CONFIG_IP_NF_TARGET_DSCP=m
432CONFIG_IP_NF_TARGET_TTL=m 473CONFIG_IP_NF_TARGET_TTL=m
433CONFIG_IP_NF_TARGET_CLUSTERIP=m 474CONFIG_IP_NF_TARGET_CLUSTERIP=m
434CONFIG_IP_NF_RAW=m 475CONFIG_IP_NF_RAW=m
@@ -439,6 +480,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
439# 480#
440# IPv6: Netfilter Configuration (EXPERIMENTAL) 481# IPv6: Netfilter Configuration (EXPERIMENTAL)
441# 482#
483CONFIG_NF_CONNTRACK_IPV6=m
442CONFIG_IP6_NF_QUEUE=m 484CONFIG_IP6_NF_QUEUE=m
443CONFIG_IP6_NF_IPTABLES=m 485CONFIG_IP6_NF_IPTABLES=m
444CONFIG_IP6_NF_MATCH_RT=m 486CONFIG_IP6_NF_MATCH_RT=m
@@ -448,6 +490,7 @@ CONFIG_IP6_NF_MATCH_HL=m
448CONFIG_IP6_NF_MATCH_OWNER=m 490CONFIG_IP6_NF_MATCH_OWNER=m
449CONFIG_IP6_NF_MATCH_IPV6HEADER=m 491CONFIG_IP6_NF_MATCH_IPV6HEADER=m
450CONFIG_IP6_NF_MATCH_AH=m 492CONFIG_IP6_NF_MATCH_AH=m
493CONFIG_IP6_NF_MATCH_MH=m
451CONFIG_IP6_NF_MATCH_EUI64=m 494CONFIG_IP6_NF_MATCH_EUI64=m
452CONFIG_IP6_NF_FILTER=m 495CONFIG_IP6_NF_FILTER=m
453CONFIG_IP6_NF_TARGET_LOG=m 496CONFIG_IP6_NF_TARGET_LOG=m
@@ -484,7 +527,6 @@ CONFIG_SCTP_HMAC_MD5=y
484# CONFIG_ATALK is not set 527# CONFIG_ATALK is not set
485# CONFIG_X25 is not set 528# CONFIG_X25 is not set
486# CONFIG_LAPB is not set 529# CONFIG_LAPB is not set
487CONFIG_NET_DIVERT=y
488# CONFIG_ECONET is not set 530# CONFIG_ECONET is not set
489# CONFIG_WAN_ROUTER is not set 531# CONFIG_WAN_ROUTER is not set
490 532
@@ -492,6 +534,7 @@ CONFIG_NET_DIVERT=y
492# QoS and/or fair queueing 534# QoS and/or fair queueing
493# 535#
494CONFIG_NET_SCHED=y 536CONFIG_NET_SCHED=y
537CONFIG_NET_SCH_FIFO=y
495# CONFIG_NET_SCH_CLK_JIFFIES is not set 538# CONFIG_NET_SCH_CLK_JIFFIES is not set
496CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 539CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
497# CONFIG_NET_SCH_CLK_CPU is not set 540# CONFIG_NET_SCH_CLK_CPU is not set
@@ -546,6 +589,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
546CONFIG_IEEE80211_SOFTMAC=m 589CONFIG_IEEE80211_SOFTMAC=m
547# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 590# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
548CONFIG_WIRELESS_EXT=y 591CONFIG_WIRELESS_EXT=y
592CONFIG_FIB_RULES=y
549 593
550# 594#
551# Device Drivers 595# Device Drivers
@@ -556,7 +600,6 @@ CONFIG_WIRELESS_EXT=y
556# 600#
557CONFIG_STANDALONE=y 601CONFIG_STANDALONE=y
558CONFIG_PREVENT_FIRMWARE_BUILD=y 602CONFIG_PREVENT_FIRMWARE_BUILD=y
559# CONFIG_FW_LOADER is not set
560# CONFIG_SYS_HYPERVISOR is not set 603# CONFIG_SYS_HYPERVISOR is not set
561 604
562# 605#
@@ -592,6 +635,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
592CONFIG_ATA_OVER_ETH=m 635CONFIG_ATA_OVER_ETH=m
593 636
594# 637#
638# Misc devices
639#
640
641#
595# ATA/ATAPI/MFM/RLL support 642# ATA/ATAPI/MFM/RLL support
596# 643#
597# CONFIG_IDE is not set 644# CONFIG_IDE is not set
@@ -601,6 +648,8 @@ CONFIG_ATA_OVER_ETH=m
601# 648#
602CONFIG_RAID_ATTRS=m 649CONFIG_RAID_ATTRS=m
603CONFIG_SCSI=y 650CONFIG_SCSI=y
651CONFIG_SCSI_TGT=m
652# CONFIG_SCSI_NETLINK is not set
604CONFIG_SCSI_PROC_FS=y 653CONFIG_SCSI_PROC_FS=y
605 654
606# 655#
@@ -620,24 +669,30 @@ CONFIG_CHR_DEV_SCH=m
620# CONFIG_SCSI_MULTI_LUN is not set 669# CONFIG_SCSI_MULTI_LUN is not set
621CONFIG_SCSI_CONSTANTS=y 670CONFIG_SCSI_CONSTANTS=y
622# CONFIG_SCSI_LOGGING is not set 671# CONFIG_SCSI_LOGGING is not set
672CONFIG_SCSI_SCAN_ASYNC=y
623 673
624# 674#
625# SCSI Transport Attributes 675# SCSI Transports
626# 676#
627CONFIG_SCSI_SPI_ATTRS=m 677CONFIG_SCSI_SPI_ATTRS=m
628# CONFIG_SCSI_FC_ATTRS is not set 678# CONFIG_SCSI_FC_ATTRS is not set
629CONFIG_SCSI_ISCSI_ATTRS=m 679CONFIG_SCSI_ISCSI_ATTRS=m
630CONFIG_SCSI_SAS_ATTRS=m 680CONFIG_SCSI_SAS_ATTRS=m
681# CONFIG_SCSI_SAS_LIBSAS is not set
631 682
632# 683#
633# SCSI low-level drivers 684# SCSI low-level drivers
634# 685#
635CONFIG_ISCSI_TCP=m 686CONFIG_ISCSI_TCP=m
636CONFIG_SGIWD93_SCSI=y 687CONFIG_SGIWD93_SCSI=y
637# CONFIG_SCSI_SATA is not set
638# CONFIG_SCSI_DEBUG is not set 688# CONFIG_SCSI_DEBUG is not set
639 689
640# 690#
691# Serial ATA (prod) and Parallel ATA (experimental) drivers
692#
693# CONFIG_ATA is not set
694
695#
641# Multi-device support (RAID and LVM) 696# Multi-device support (RAID and LVM)
642# 697#
643# CONFIG_MD is not set 698# CONFIG_MD is not set
@@ -679,6 +734,8 @@ CONFIG_LXT_PHY=m
679CONFIG_CICADA_PHY=m 734CONFIG_CICADA_PHY=m
680# CONFIG_VITESSE_PHY is not set 735# CONFIG_VITESSE_PHY is not set
681# CONFIG_SMSC_PHY is not set 736# CONFIG_SMSC_PHY is not set
737# CONFIG_BROADCOM_PHY is not set
738# CONFIG_FIXED_PHY is not set
682 739
683# 740#
684# Ethernet (10 or 100Mbit) 741# Ethernet (10 or 100Mbit)
@@ -730,6 +787,7 @@ CONFIG_SGISEEQ=y
730# Input device support 787# Input device support
731# 788#
732CONFIG_INPUT=y 789CONFIG_INPUT=y
790# CONFIG_INPUT_FF_MEMLESS is not set
733 791
734# 792#
735# Userland interfaces 793# Userland interfaces
@@ -752,6 +810,7 @@ CONFIG_KEYBOARD_ATKBD=y
752# CONFIG_KEYBOARD_LKKBD is not set 810# CONFIG_KEYBOARD_LKKBD is not set
753# CONFIG_KEYBOARD_XTKBD is not set 811# CONFIG_KEYBOARD_XTKBD is not set
754# CONFIG_KEYBOARD_NEWTON is not set 812# CONFIG_KEYBOARD_NEWTON is not set
813# CONFIG_KEYBOARD_STOWAWAY is not set
755CONFIG_INPUT_MOUSE=y 814CONFIG_INPUT_MOUSE=y
756CONFIG_MOUSE_PS2=m 815CONFIG_MOUSE_PS2=m
757CONFIG_MOUSE_SERIAL=m 816CONFIG_MOUSE_SERIAL=m
@@ -815,10 +874,6 @@ CONFIG_SGI_DS1286=m
815# CONFIG_GEN_RTC is not set 874# CONFIG_GEN_RTC is not set
816# CONFIG_DTLK is not set 875# CONFIG_DTLK is not set
817# CONFIG_R3964 is not set 876# CONFIG_R3964 is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822CONFIG_RAW_DRIVER=m 877CONFIG_RAW_DRIVER=m
823CONFIG_MAX_RAW_DEVS=256 878CONFIG_MAX_RAW_DEVS=256
824 879
@@ -826,7 +881,6 @@ CONFIG_MAX_RAW_DEVS=256
826# TPM devices 881# TPM devices
827# 882#
828# CONFIG_TCG_TPM is not set 883# CONFIG_TCG_TPM is not set
829# CONFIG_TELCLOCK is not set
830 884
831# 885#
832# I2C support 886# I2C support
@@ -851,14 +905,9 @@ CONFIG_MAX_RAW_DEVS=256
851# CONFIG_HWMON_VID is not set 905# CONFIG_HWMON_VID is not set
852 906
853# 907#
854# Misc devices
855#
856
857#
858# Multimedia devices 908# Multimedia devices
859# 909#
860# CONFIG_VIDEO_DEV is not set 910# CONFIG_VIDEO_DEV is not set
861CONFIG_VIDEO_V4L2=y
862 911
863# 912#
864# Digital Video Broadcasting Devices 913# Digital Video Broadcasting Devices
@@ -887,6 +936,7 @@ CONFIG_LOGO=y
887# CONFIG_LOGO_LINUX_VGA16 is not set 936# CONFIG_LOGO_LINUX_VGA16 is not set
888# CONFIG_LOGO_LINUX_CLUT224 is not set 937# CONFIG_LOGO_LINUX_CLUT224 is not set
889CONFIG_LOGO_SGI_CLUT224=y 938CONFIG_LOGO_SGI_CLUT224=y
939# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
890 940
891# 941#
892# Sound 942# Sound
@@ -894,6 +944,12 @@ CONFIG_LOGO_SGI_CLUT224=y
894# CONFIG_SOUND is not set 944# CONFIG_SOUND is not set
895 945
896# 946#
947# HID Devices
948#
949CONFIG_HID=y
950# CONFIG_HID_DEBUG is not set
951
952#
897# USB support 953# USB support
898# 954#
899# CONFIG_USB_ARCH_HAS_HCD is not set 955# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -954,6 +1010,14 @@ CONFIG_LOGO_SGI_CLUT224=y
954# 1010#
955 1011
956# 1012#
1013# Auxiliary Display support
1014#
1015
1016#
1017# Virtualization
1018#
1019
1020#
957# File systems 1021# File systems
958# 1022#
959CONFIG_EXT2_FS=m 1023CONFIG_EXT2_FS=m
@@ -963,6 +1027,7 @@ CONFIG_EXT3_FS=y
963CONFIG_EXT3_FS_XATTR=y 1027CONFIG_EXT3_FS_XATTR=y
964CONFIG_EXT3_FS_POSIX_ACL=y 1028CONFIG_EXT3_FS_POSIX_ACL=y
965CONFIG_EXT3_FS_SECURITY=y 1029CONFIG_EXT3_FS_SECURITY=y
1030# CONFIG_EXT4DEV_FS is not set
966CONFIG_JBD=y 1031CONFIG_JBD=y
967# CONFIG_JBD_DEBUG is not set 1032# CONFIG_JBD_DEBUG is not set
968CONFIG_FS_MBCACHE=y 1033CONFIG_FS_MBCACHE=y
@@ -974,6 +1039,7 @@ CONFIG_XFS_QUOTA=y
974CONFIG_XFS_SECURITY=y 1039CONFIG_XFS_SECURITY=y
975# CONFIG_XFS_POSIX_ACL is not set 1040# CONFIG_XFS_POSIX_ACL is not set
976# CONFIG_XFS_RT is not set 1041# CONFIG_XFS_RT is not set
1042# CONFIG_GFS2_FS is not set
977# CONFIG_OCFS2_FS is not set 1043# CONFIG_OCFS2_FS is not set
978CONFIG_MINIX_FS=m 1044CONFIG_MINIX_FS=m
979# CONFIG_ROMFS_FS is not set 1045# CONFIG_ROMFS_FS is not set
@@ -987,6 +1053,7 @@ CONFIG_DNOTIFY=y
987CONFIG_AUTOFS_FS=m 1053CONFIG_AUTOFS_FS=m
988CONFIG_AUTOFS4_FS=m 1054CONFIG_AUTOFS4_FS=m
989CONFIG_FUSE_FS=m 1055CONFIG_FUSE_FS=m
1056CONFIG_GENERIC_ACL=y
990 1057
991# 1058#
992# CD-ROM/DVD Filesystems 1059# CD-ROM/DVD Filesystems
@@ -994,7 +1061,6 @@ CONFIG_FUSE_FS=m
994CONFIG_ISO9660_FS=m 1061CONFIG_ISO9660_FS=m
995CONFIG_JOLIET=y 1062CONFIG_JOLIET=y
996CONFIG_ZISOFS=y 1063CONFIG_ZISOFS=y
997CONFIG_ZISOFS_FS=m
998CONFIG_UDF_FS=m 1064CONFIG_UDF_FS=m
999CONFIG_UDF_NLS=y 1065CONFIG_UDF_NLS=y
1000 1066
@@ -1013,17 +1079,20 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1013# 1079#
1014CONFIG_PROC_FS=y 1080CONFIG_PROC_FS=y
1015CONFIG_PROC_KCORE=y 1081CONFIG_PROC_KCORE=y
1082CONFIG_PROC_SYSCTL=y
1016CONFIG_SYSFS=y 1083CONFIG_SYSFS=y
1017CONFIG_TMPFS=y 1084CONFIG_TMPFS=y
1085CONFIG_TMPFS_POSIX_ACL=y
1018# CONFIG_HUGETLB_PAGE is not set 1086# CONFIG_HUGETLB_PAGE is not set
1019CONFIG_RAMFS=y 1087CONFIG_RAMFS=y
1020# CONFIG_CONFIGFS_FS is not set 1088CONFIG_CONFIGFS_FS=m
1021 1089
1022# 1090#
1023# Miscellaneous filesystems 1091# Miscellaneous filesystems
1024# 1092#
1025# CONFIG_ADFS_FS is not set 1093# CONFIG_ADFS_FS is not set
1026# CONFIG_AFFS_FS is not set 1094# CONFIG_AFFS_FS is not set
1095# CONFIG_ECRYPT_FS is not set
1027# CONFIG_HFS_FS is not set 1096# CONFIG_HFS_FS is not set
1028# CONFIG_HFSPLUS_FS is not set 1097# CONFIG_HFSPLUS_FS is not set
1029# CONFIG_BEFS_FS is not set 1098# CONFIG_BEFS_FS is not set
@@ -1142,6 +1211,14 @@ CONFIG_NLS_KOI8_U=m
1142CONFIG_NLS_UTF8=m 1211CONFIG_NLS_UTF8=m
1143 1212
1144# 1213#
1214# Distributed Lock Manager
1215#
1216CONFIG_DLM=m
1217CONFIG_DLM_TCP=y
1218# CONFIG_DLM_SCTP is not set
1219# CONFIG_DLM_DEBUG is not set
1220
1221#
1145# Profiling support 1222# Profiling support
1146# 1223#
1147# CONFIG_PROFILING is not set 1224# CONFIG_PROFILING is not set
@@ -1151,11 +1228,13 @@ CONFIG_NLS_UTF8=m
1151# 1228#
1152CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1229CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1153# CONFIG_PRINTK_TIME is not set 1230# CONFIG_PRINTK_TIME is not set
1231CONFIG_ENABLE_MUST_CHECK=y
1154# CONFIG_MAGIC_SYSRQ is not set 1232# CONFIG_MAGIC_SYSRQ is not set
1155# CONFIG_UNUSED_SYMBOLS is not set 1233# CONFIG_UNUSED_SYMBOLS is not set
1234# CONFIG_DEBUG_FS is not set
1235# CONFIG_HEADERS_CHECK is not set
1156# CONFIG_DEBUG_KERNEL is not set 1236# CONFIG_DEBUG_KERNEL is not set
1157CONFIG_LOG_BUF_SHIFT=14 1237CONFIG_LOG_BUF_SHIFT=14
1158# CONFIG_DEBUG_FS is not set
1159CONFIG_CROSSCOMPILE=y 1238CONFIG_CROSSCOMPILE=y
1160CONFIG_CMDLINE="" 1239CONFIG_CMDLINE=""
1161 1240
@@ -1170,18 +1249,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1170# Cryptographic options 1249# Cryptographic options
1171# 1250#
1172CONFIG_CRYPTO=y 1251CONFIG_CRYPTO=y
1252CONFIG_CRYPTO_ALGAPI=y
1253CONFIG_CRYPTO_BLKCIPHER=m
1254CONFIG_CRYPTO_HASH=y
1255CONFIG_CRYPTO_MANAGER=y
1173CONFIG_CRYPTO_HMAC=y 1256CONFIG_CRYPTO_HMAC=y
1257CONFIG_CRYPTO_XCBC=m
1174CONFIG_CRYPTO_NULL=m 1258CONFIG_CRYPTO_NULL=m
1175CONFIG_CRYPTO_MD4=m 1259CONFIG_CRYPTO_MD4=m
1176CONFIG_CRYPTO_MD5=m 1260CONFIG_CRYPTO_MD5=y
1177CONFIG_CRYPTO_SHA1=m 1261CONFIG_CRYPTO_SHA1=m
1178CONFIG_CRYPTO_SHA256=m 1262CONFIG_CRYPTO_SHA256=m
1179CONFIG_CRYPTO_SHA512=m 1263CONFIG_CRYPTO_SHA512=m
1180CONFIG_CRYPTO_WP512=m 1264CONFIG_CRYPTO_WP512=m
1181CONFIG_CRYPTO_TGR192=m 1265CONFIG_CRYPTO_TGR192=m
1266CONFIG_CRYPTO_GF128MUL=m
1267CONFIG_CRYPTO_ECB=m
1268CONFIG_CRYPTO_CBC=m
1269CONFIG_CRYPTO_PCBC=m
1270CONFIG_CRYPTO_LRW=m
1182CONFIG_CRYPTO_DES=m 1271CONFIG_CRYPTO_DES=m
1272CONFIG_CRYPTO_FCRYPT=m
1183CONFIG_CRYPTO_BLOWFISH=m 1273CONFIG_CRYPTO_BLOWFISH=m
1184CONFIG_CRYPTO_TWOFISH=m 1274CONFIG_CRYPTO_TWOFISH=m
1275CONFIG_CRYPTO_TWOFISH_COMMON=m
1185CONFIG_CRYPTO_SERPENT=m 1276CONFIG_CRYPTO_SERPENT=m
1186CONFIG_CRYPTO_AES=m 1277CONFIG_CRYPTO_AES=m
1187CONFIG_CRYPTO_CAST5=m 1278CONFIG_CRYPTO_CAST5=m
@@ -1193,6 +1284,7 @@ CONFIG_CRYPTO_ANUBIS=m
1193CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1194CONFIG_CRYPTO_MICHAEL_MIC=m 1285CONFIG_CRYPTO_MICHAEL_MIC=m
1195CONFIG_CRYPTO_CRC32C=m 1286CONFIG_CRYPTO_CRC32C=m
1287CONFIG_CRYPTO_CAMELLIA=m
1196# CONFIG_CRYPTO_TEST is not set 1288# CONFIG_CRYPTO_TEST is not set
1197 1289
1198# 1290#
@@ -1202,6 +1294,7 @@ CONFIG_CRYPTO_CRC32C=m
1202# 1294#
1203# Library routines 1295# Library routines
1204# 1296#
1297CONFIG_BITREVERSE=m
1205# CONFIG_CRC_CCITT is not set 1298# CONFIG_CRC_CCITT is not set
1206CONFIG_CRC16=m 1299CONFIG_CRC16=m
1207CONFIG_CRC32=m 1300CONFIG_CRC32=m
@@ -1213,3 +1306,5 @@ CONFIG_TEXTSEARCH_KMP=m
1213CONFIG_TEXTSEARCH_BM=m 1306CONFIG_TEXTSEARCH_BM=m
1214CONFIG_TEXTSEARCH_FSM=m 1307CONFIG_TEXTSEARCH_FSM=m
1215CONFIG_PLIST=y 1308CONFIG_PLIST=y
1309CONFIG_HAS_IOMEM=y
1310CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index f21186c12d81..7b2f5f8397a2 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:10 2006 4# Sun Feb 18 21:27:49 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -70,10 +70,14 @@ CONFIG_SGI_SN_M_MODE=y
70# CONFIG_REPLICATE_EXHANDLERS is not set 70# CONFIG_REPLICATE_EXHANDLERS is not set
71CONFIG_EARLY_PRINTK=y 71CONFIG_EARLY_PRINTK=y
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73# CONFIG_ARCH_HAS_ILOG2_U32 is not set
74# CONFIG_ARCH_HAS_ILOG2_U64 is not set
73CONFIG_GENERIC_FIND_NEXT_BIT=y 75CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y 76CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_GENERIC_TIME=y
76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 79CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
80CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_ARC=y 81CONFIG_ARC=y
78CONFIG_DMA_IP27=y 82CONFIG_DMA_IP27=y
79CONFIG_CPU_BIG_ENDIAN=y 83CONFIG_CPU_BIG_ENDIAN=y
@@ -121,8 +125,8 @@ CONFIG_PAGE_SIZE_4KB=y
121# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
122CONFIG_CPU_HAS_PREFETCH=y 126CONFIG_CPU_HAS_PREFETCH=y
123CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
124# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
127CONFIG_CPU_HAS_LLSC=y 131CONFIG_CPU_HAS_LLSC=y
128CONFIG_CPU_HAS_SYNC=y 132CONFIG_CPU_HAS_SYNC=y
@@ -145,8 +149,10 @@ CONFIG_NEED_MULTIPLE_NODES=y
145CONFIG_SPLIT_PTLOCK_CPUS=4 149CONFIG_SPLIT_PTLOCK_CPUS=4
146CONFIG_MIGRATION=y 150CONFIG_MIGRATION=y
147CONFIG_RESOURCES_64BIT=y 151CONFIG_RESOURCES_64BIT=y
152CONFIG_ZONE_DMA_FLAG=1
148CONFIG_SMP=y 153CONFIG_SMP=y
149CONFIG_SYS_SUPPORTS_SMP=y 154CONFIG_SYS_SUPPORTS_SMP=y
155CONFIG_NR_CPUS_DEFAULT_64=y
150CONFIG_NR_CPUS=64 156CONFIG_NR_CPUS=64
151# CONFIG_HZ_48 is not set 157# CONFIG_HZ_48 is not set
152# CONFIG_HZ_100 is not set 158# CONFIG_HZ_100 is not set
@@ -162,6 +168,7 @@ CONFIG_PREEMPT_NONE=y
162# CONFIG_PREEMPT is not set 168# CONFIG_PREEMPT is not set
163CONFIG_PREEMPT_BKL=y 169CONFIG_PREEMPT_BKL=y
164# CONFIG_MIPS_INSANE_LARGE is not set 170# CONFIG_MIPS_INSANE_LARGE is not set
171# CONFIG_KEXEC is not set
165CONFIG_LOCKDEP_SUPPORT=y 172CONFIG_LOCKDEP_SUPPORT=y
166CONFIG_STACKTRACE_SUPPORT=y 173CONFIG_STACKTRACE_SUPPORT=y
167CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 174CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -180,17 +187,22 @@ CONFIG_LOCALVERSION=""
180CONFIG_LOCALVERSION_AUTO=y 187CONFIG_LOCALVERSION_AUTO=y
181CONFIG_SWAP=y 188CONFIG_SWAP=y
182CONFIG_SYSVIPC=y 189CONFIG_SYSVIPC=y
190# CONFIG_IPC_NS is not set
191CONFIG_SYSVIPC_SYSCTL=y
183CONFIG_POSIX_MQUEUE=y 192CONFIG_POSIX_MQUEUE=y
184# CONFIG_BSD_PROCESS_ACCT is not set 193# CONFIG_BSD_PROCESS_ACCT is not set
185CONFIG_SYSCTL=y 194# CONFIG_TASKSTATS is not set
195# CONFIG_UTS_NS is not set
186# CONFIG_AUDIT is not set 196# CONFIG_AUDIT is not set
187CONFIG_IKCONFIG=y 197CONFIG_IKCONFIG=y
188CONFIG_IKCONFIG_PROC=y 198CONFIG_IKCONFIG_PROC=y
189CONFIG_CPUSETS=y 199CONFIG_CPUSETS=y
200CONFIG_SYSFS_DEPRECATED=y
190CONFIG_RELAY=y 201CONFIG_RELAY=y
191CONFIG_INITRAMFS_SOURCE=""
192# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 202# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
203CONFIG_SYSCTL=y
193CONFIG_EMBEDDED=y 204CONFIG_EMBEDDED=y
205CONFIG_SYSCTL_SYSCALL=y
194CONFIG_KALLSYMS=y 206CONFIG_KALLSYMS=y
195# CONFIG_KALLSYMS_EXTRA_PASS is not set 207# CONFIG_KALLSYMS_EXTRA_PASS is not set
196CONFIG_HOTPLUG=y 208CONFIG_HOTPLUG=y
@@ -198,12 +210,12 @@ CONFIG_PRINTK=y
198CONFIG_BUG=y 210CONFIG_BUG=y
199CONFIG_ELF_CORE=y 211CONFIG_ELF_CORE=y
200CONFIG_BASE_FULL=y 212CONFIG_BASE_FULL=y
201CONFIG_RT_MUTEXES=y
202CONFIG_FUTEX=y 213CONFIG_FUTEX=y
203CONFIG_EPOLL=y 214CONFIG_EPOLL=y
204CONFIG_SHMEM=y 215CONFIG_SHMEM=y
205CONFIG_SLAB=y 216CONFIG_SLAB=y
206CONFIG_VM_EVENT_COUNTERS=y 217CONFIG_VM_EVENT_COUNTERS=y
218CONFIG_RT_MUTEXES=y
207# CONFIG_TINY_SHMEM is not set 219# CONFIG_TINY_SHMEM is not set
208CONFIG_BASE_SMALL=0 220CONFIG_BASE_SMALL=0
209# CONFIG_SLOB is not set 221# CONFIG_SLOB is not set
@@ -222,6 +234,7 @@ CONFIG_STOP_MACHINE=y
222# 234#
223# Block layer 235# Block layer
224# 236#
237CONFIG_BLOCK=y
225# CONFIG_BLK_DEV_IO_TRACE is not set 238# CONFIG_BLK_DEV_IO_TRACE is not set
226 239
227# 240#
@@ -263,11 +276,20 @@ CONFIG_BINFMT_ELF=y
263# CONFIG_BUILD_ELF64 is not set 276# CONFIG_BUILD_ELF64 is not set
264CONFIG_MIPS32_COMPAT=y 277CONFIG_MIPS32_COMPAT=y
265CONFIG_COMPAT=y 278CONFIG_COMPAT=y
279CONFIG_SYSVIPC_COMPAT=y
266CONFIG_MIPS32_O32=y 280CONFIG_MIPS32_O32=y
267CONFIG_MIPS32_N32=y 281CONFIG_MIPS32_N32=y
268CONFIG_BINFMT_ELF32=y 282CONFIG_BINFMT_ELF32=y
269 283
270# 284#
285# Power management options
286#
287CONFIG_PM=y
288# CONFIG_PM_LEGACY is not set
289# CONFIG_PM_DEBUG is not set
290# CONFIG_PM_SYSFS_DEPRECATED is not set
291
292#
271# Networking 293# Networking
272# 294#
273CONFIG_NET=y 295CONFIG_NET=y
@@ -281,7 +303,10 @@ CONFIG_PACKET_MMAP=y
281CONFIG_UNIX=y 303CONFIG_UNIX=y
282CONFIG_XFRM=y 304CONFIG_XFRM=y
283CONFIG_XFRM_USER=m 305CONFIG_XFRM_USER=m
306# CONFIG_XFRM_SUB_POLICY is not set
307CONFIG_XFRM_MIGRATE=y
284CONFIG_NET_KEY=y 308CONFIG_NET_KEY=y
309CONFIG_NET_KEY_MIGRATE=y
285CONFIG_INET=y 310CONFIG_INET=y
286CONFIG_IP_MULTICAST=y 311CONFIG_IP_MULTICAST=y
287# CONFIG_IP_ADVANCED_ROUTER is not set 312# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -302,10 +327,13 @@ CONFIG_IP_PNP=y
302# CONFIG_INET_TUNNEL is not set 327# CONFIG_INET_TUNNEL is not set
303CONFIG_INET_XFRM_MODE_TRANSPORT=m 328CONFIG_INET_XFRM_MODE_TRANSPORT=m
304CONFIG_INET_XFRM_MODE_TUNNEL=m 329CONFIG_INET_XFRM_MODE_TUNNEL=m
330CONFIG_INET_XFRM_MODE_BEET=m
305CONFIG_INET_DIAG=y 331CONFIG_INET_DIAG=y
306CONFIG_INET_TCP_DIAG=y 332CONFIG_INET_TCP_DIAG=y
307# CONFIG_TCP_CONG_ADVANCED is not set 333# CONFIG_TCP_CONG_ADVANCED is not set
308CONFIG_TCP_CONG_BIC=y 334CONFIG_TCP_CONG_CUBIC=y
335CONFIG_DEFAULT_TCP_CONG="cubic"
336CONFIG_TCP_MD5SIG=y
309# CONFIG_IPV6 is not set 337# CONFIG_IPV6 is not set
310# CONFIG_INET6_XFRM_TUNNEL is not set 338# CONFIG_INET6_XFRM_TUNNEL is not set
311# CONFIG_INET6_TUNNEL is not set 339# CONFIG_INET6_TUNNEL is not set
@@ -335,7 +363,6 @@ CONFIG_NETWORK_SECMARK=y
335# CONFIG_ATALK is not set 363# CONFIG_ATALK is not set
336# CONFIG_X25 is not set 364# CONFIG_X25 is not set
337# CONFIG_LAPB is not set 365# CONFIG_LAPB is not set
338# CONFIG_NET_DIVERT is not set
339# CONFIG_ECONET is not set 366# CONFIG_ECONET is not set
340# CONFIG_WAN_ROUTER is not set 367# CONFIG_WAN_ROUTER is not set
341 368
@@ -343,6 +370,7 @@ CONFIG_NETWORK_SECMARK=y
343# QoS and/or fair queueing 370# QoS and/or fair queueing
344# 371#
345CONFIG_NET_SCHED=y 372CONFIG_NET_SCHED=y
373CONFIG_NET_SCH_FIFO=y
346# CONFIG_NET_SCH_CLK_JIFFIES is not set 374# CONFIG_NET_SCH_CLK_JIFFIES is not set
347CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 375CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
348# CONFIG_NET_SCH_CLK_CPU is not set 376# CONFIG_NET_SCH_CLK_CPU is not set
@@ -374,6 +402,7 @@ CONFIG_NET_CLS_ROUTE=y
374CONFIG_NET_CLS_FW=m 402CONFIG_NET_CLS_FW=m
375CONFIG_NET_CLS_U32=m 403CONFIG_NET_CLS_U32=m
376# CONFIG_CLS_U32_PERF is not set 404# CONFIG_CLS_U32_PERF is not set
405CONFIG_CLS_U32_MARK=y
377CONFIG_NET_CLS_RSVP=m 406CONFIG_NET_CLS_RSVP=m
378CONFIG_NET_CLS_RSVP6=m 407CONFIG_NET_CLS_RSVP6=m
379# CONFIG_NET_EMATCH is not set 408# CONFIG_NET_EMATCH is not set
@@ -448,6 +477,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
448CONFIG_ATA_OVER_ETH=m 477CONFIG_ATA_OVER_ETH=m
449 478
450# 479#
480# Misc devices
481#
482CONFIG_SGI_IOC4=m
483# CONFIG_TIFM_CORE is not set
484
485#
451# ATA/ATAPI/MFM/RLL support 486# ATA/ATAPI/MFM/RLL support
452# 487#
453# CONFIG_IDE is not set 488# CONFIG_IDE is not set
@@ -457,6 +492,8 @@ CONFIG_ATA_OVER_ETH=m
457# 492#
458CONFIG_RAID_ATTRS=m 493CONFIG_RAID_ATTRS=m
459CONFIG_SCSI=y 494CONFIG_SCSI=y
495CONFIG_SCSI_TGT=m
496CONFIG_SCSI_NETLINK=y
460CONFIG_SCSI_PROC_FS=y 497CONFIG_SCSI_PROC_FS=y
461 498
462# 499#
@@ -476,14 +513,17 @@ CONFIG_CHR_DEV_SCH=m
476# CONFIG_SCSI_MULTI_LUN is not set 513# CONFIG_SCSI_MULTI_LUN is not set
477CONFIG_SCSI_CONSTANTS=y 514CONFIG_SCSI_CONSTANTS=y
478CONFIG_SCSI_LOGGING=y 515CONFIG_SCSI_LOGGING=y
516CONFIG_SCSI_SCAN_ASYNC=y
479 517
480# 518#
481# SCSI Transport Attributes 519# SCSI Transports
482# 520#
483CONFIG_SCSI_SPI_ATTRS=y 521CONFIG_SCSI_SPI_ATTRS=y
484CONFIG_SCSI_FC_ATTRS=y 522CONFIG_SCSI_FC_ATTRS=y
485CONFIG_SCSI_ISCSI_ATTRS=m 523CONFIG_SCSI_ISCSI_ATTRS=m
486CONFIG_SCSI_SAS_ATTRS=m 524CONFIG_SCSI_SAS_ATTRS=m
525CONFIG_SCSI_SAS_LIBSAS=m
526# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
487 527
488# 528#
489# SCSI low-level drivers 529# SCSI low-level drivers
@@ -496,24 +536,33 @@ CONFIG_SCSI_SAS_ATTRS=m
496# CONFIG_SCSI_AIC7XXX is not set 536# CONFIG_SCSI_AIC7XXX is not set
497# CONFIG_SCSI_AIC7XXX_OLD is not set 537# CONFIG_SCSI_AIC7XXX_OLD is not set
498# CONFIG_SCSI_AIC79XX is not set 538# CONFIG_SCSI_AIC79XX is not set
539CONFIG_SCSI_AIC94XX=m
540# CONFIG_AIC94XX_DEBUG is not set
541# CONFIG_SCSI_ARCMSR is not set
499# CONFIG_MEGARAID_NEWGEN is not set 542# CONFIG_MEGARAID_NEWGEN is not set
500# CONFIG_MEGARAID_LEGACY is not set 543# CONFIG_MEGARAID_LEGACY is not set
501# CONFIG_MEGARAID_SAS is not set 544# CONFIG_MEGARAID_SAS is not set
502# CONFIG_SCSI_SATA is not set
503# CONFIG_SCSI_HPTIOP is not set 545# CONFIG_SCSI_HPTIOP is not set
504# CONFIG_SCSI_DMX3191D is not set 546# CONFIG_SCSI_DMX3191D is not set
505# CONFIG_SCSI_FUTURE_DOMAIN is not set 547# CONFIG_SCSI_FUTURE_DOMAIN is not set
506# CONFIG_SCSI_IPS is not set 548# CONFIG_SCSI_IPS is not set
507# CONFIG_SCSI_INITIO is not set 549# CONFIG_SCSI_INITIO is not set
508# CONFIG_SCSI_INIA100 is not set 550# CONFIG_SCSI_INIA100 is not set
551# CONFIG_SCSI_STEX is not set
509# CONFIG_SCSI_SYM53C8XX_2 is not set 552# CONFIG_SCSI_SYM53C8XX_2 is not set
510# CONFIG_SCSI_IPR is not set
511CONFIG_SCSI_QLOGIC_1280=y 553CONFIG_SCSI_QLOGIC_1280=y
512# CONFIG_SCSI_QLA_FC is not set 554# CONFIG_SCSI_QLA_FC is not set
555# CONFIG_SCSI_QLA_ISCSI is not set
513# CONFIG_SCSI_LPFC is not set 556# CONFIG_SCSI_LPFC is not set
514# CONFIG_SCSI_DC395x is not set 557# CONFIG_SCSI_DC395x is not set
515# CONFIG_SCSI_DC390T is not set 558# CONFIG_SCSI_DC390T is not set
516# CONFIG_SCSI_DEBUG is not set 559# CONFIG_SCSI_DEBUG is not set
560# CONFIG_SCSI_SRP is not set
561
562#
563# Serial ATA (prod) and Parallel ATA (experimental) drivers
564#
565# CONFIG_ATA is not set
517 566
518# 567#
519# Multi-device support (RAID and LVM) 568# Multi-device support (RAID and LVM)
@@ -529,6 +578,7 @@ CONFIG_MD_RAID5_RESHAPE=y
529CONFIG_MD_MULTIPATH=m 578CONFIG_MD_MULTIPATH=m
530CONFIG_MD_FAULTY=m 579CONFIG_MD_FAULTY=m
531CONFIG_BLK_DEV_DM=m 580CONFIG_BLK_DEV_DM=m
581# CONFIG_DM_DEBUG is not set
532CONFIG_DM_CRYPT=m 582CONFIG_DM_CRYPT=m
533CONFIG_DM_SNAPSHOT=m 583CONFIG_DM_SNAPSHOT=m
534CONFIG_DM_MIRROR=m 584CONFIG_DM_MIRROR=m
@@ -583,6 +633,8 @@ CONFIG_LXT_PHY=m
583CONFIG_CICADA_PHY=m 633CONFIG_CICADA_PHY=m
584CONFIG_VITESSE_PHY=m 634CONFIG_VITESSE_PHY=m
585CONFIG_SMSC_PHY=m 635CONFIG_SMSC_PHY=m
636# CONFIG_BROADCOM_PHY is not set
637# CONFIG_FIXED_PHY is not set
586 638
587# 639#
588# Ethernet (10 or 100Mbit) 640# Ethernet (10 or 100Mbit)
@@ -619,14 +671,17 @@ CONFIG_SGI_IOC3_ETH=y
619# CONFIG_SK98LIN is not set 671# CONFIG_SK98LIN is not set
620# CONFIG_TIGON3 is not set 672# CONFIG_TIGON3 is not set
621# CONFIG_BNX2 is not set 673# CONFIG_BNX2 is not set
674CONFIG_QLA3XXX=m
622 675
623# 676#
624# Ethernet (10000 Mbit) 677# Ethernet (10000 Mbit)
625# 678#
626# CONFIG_CHELSIO_T1 is not set 679# CONFIG_CHELSIO_T1 is not set
680CONFIG_CHELSIO_T3=m
627# CONFIG_IXGB is not set 681# CONFIG_IXGB is not set
628# CONFIG_S2IO is not set 682# CONFIG_S2IO is not set
629# CONFIG_MYRI10GE is not set 683# CONFIG_MYRI10GE is not set
684CONFIG_NETXEN_NIC=m
630 685
631# 686#
632# Token Ring devices 687# Token Ring devices
@@ -724,10 +779,6 @@ CONFIG_SGI_IP27_RTC=y
724# CONFIG_DTLK is not set 779# CONFIG_DTLK is not set
725# CONFIG_R3964 is not set 780# CONFIG_R3964 is not set
726# CONFIG_APPLICOM is not set 781# CONFIG_APPLICOM is not set
727
728#
729# Ftape, the floppy tape device driver
730#
731# CONFIG_DRM is not set 782# CONFIG_DRM is not set
732# CONFIG_RAW_DRIVER is not set 783# CONFIG_RAW_DRIVER is not set
733 784
@@ -735,7 +786,6 @@ CONFIG_SGI_IP27_RTC=y
735# TPM devices 786# TPM devices
736# 787#
737# CONFIG_TCG_TPM is not set 788# CONFIG_TCG_TPM is not set
738# CONFIG_TELCLOCK is not set
739 789
740# 790#
741# I2C support 791# I2C support
@@ -760,14 +810,9 @@ CONFIG_SGI_IP27_RTC=y
760# CONFIG_HWMON_VID is not set 810# CONFIG_HWMON_VID is not set
761 811
762# 812#
763# Misc devices
764#
765
766#
767# Multimedia devices 813# Multimedia devices
768# 814#
769# CONFIG_VIDEO_DEV is not set 815# CONFIG_VIDEO_DEV is not set
770CONFIG_VIDEO_V4L2=y
771 816
772# 817#
773# Digital Video Broadcasting Devices 818# Digital Video Broadcasting Devices
@@ -779,6 +824,7 @@ CONFIG_VIDEO_V4L2=y
779# 824#
780# CONFIG_FIRMWARE_EDID is not set 825# CONFIG_FIRMWARE_EDID is not set
781# CONFIG_FB is not set 826# CONFIG_FB is not set
827# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
782 828
783# 829#
784# Sound 830# Sound
@@ -848,6 +894,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
848# 894#
849 895
850# 896#
897# Auxiliary Display support
898#
899
900#
901# Virtualization
902#
903
904#
851# File systems 905# File systems
852# 906#
853CONFIG_EXT2_FS=y 907CONFIG_EXT2_FS=y
@@ -859,6 +913,7 @@ CONFIG_EXT3_FS=y
859CONFIG_EXT3_FS_XATTR=y 913CONFIG_EXT3_FS_XATTR=y
860CONFIG_EXT3_FS_POSIX_ACL=y 914CONFIG_EXT3_FS_POSIX_ACL=y
861CONFIG_EXT3_FS_SECURITY=y 915CONFIG_EXT3_FS_SECURITY=y
916# CONFIG_EXT4DEV_FS is not set
862CONFIG_JBD=y 917CONFIG_JBD=y
863CONFIG_JBD_DEBUG=y 918CONFIG_JBD_DEBUG=y
864CONFIG_FS_MBCACHE=y 919CONFIG_FS_MBCACHE=y
@@ -870,6 +925,7 @@ CONFIG_XFS_QUOTA=y
870CONFIG_XFS_SECURITY=y 925CONFIG_XFS_SECURITY=y
871CONFIG_XFS_POSIX_ACL=y 926CONFIG_XFS_POSIX_ACL=y
872# CONFIG_XFS_RT is not set 927# CONFIG_XFS_RT is not set
928# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 929# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 930# CONFIG_MINIX_FS is not set
875# CONFIG_ROMFS_FS is not set 931# CONFIG_ROMFS_FS is not set
@@ -881,6 +937,7 @@ CONFIG_DNOTIFY=y
881CONFIG_AUTOFS_FS=m 937CONFIG_AUTOFS_FS=m
882# CONFIG_AUTOFS4_FS is not set 938# CONFIG_AUTOFS4_FS is not set
883CONFIG_FUSE_FS=m 939CONFIG_FUSE_FS=m
940CONFIG_GENERIC_ACL=y
884 941
885# 942#
886# CD-ROM/DVD Filesystems 943# CD-ROM/DVD Filesystems
@@ -900,17 +957,20 @@ CONFIG_FUSE_FS=m
900# 957#
901CONFIG_PROC_FS=y 958CONFIG_PROC_FS=y
902CONFIG_PROC_KCORE=y 959CONFIG_PROC_KCORE=y
960CONFIG_PROC_SYSCTL=y
903CONFIG_SYSFS=y 961CONFIG_SYSFS=y
904CONFIG_TMPFS=y 962CONFIG_TMPFS=y
963CONFIG_TMPFS_POSIX_ACL=y
905# CONFIG_HUGETLB_PAGE is not set 964# CONFIG_HUGETLB_PAGE is not set
906CONFIG_RAMFS=y 965CONFIG_RAMFS=y
907# CONFIG_CONFIGFS_FS is not set 966CONFIG_CONFIGFS_FS=m
908 967
909# 968#
910# Miscellaneous filesystems 969# Miscellaneous filesystems
911# 970#
912# CONFIG_ADFS_FS is not set 971# CONFIG_ADFS_FS is not set
913# CONFIG_AFFS_FS is not set 972# CONFIG_AFFS_FS is not set
973# CONFIG_ECRYPT_FS is not set
914# CONFIG_HFS_FS is not set 974# CONFIG_HFS_FS is not set
915# CONFIG_HFSPLUS_FS is not set 975# CONFIG_HFSPLUS_FS is not set
916# CONFIG_BEFS_FS is not set 976# CONFIG_BEFS_FS is not set
@@ -942,7 +1002,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
942# CONFIG_RPCSEC_GSS_SPKM3 is not set 1002# CONFIG_RPCSEC_GSS_SPKM3 is not set
943# CONFIG_SMB_FS is not set 1003# CONFIG_SMB_FS is not set
944# CONFIG_CIFS is not set 1004# CONFIG_CIFS is not set
945# CONFIG_CIFS_DEBUG2 is not set
946# CONFIG_NCP_FS is not set 1005# CONFIG_NCP_FS is not set
947# CONFIG_CODA_FS is not set 1006# CONFIG_CODA_FS is not set
948# CONFIG_AFS_FS is not set 1007# CONFIG_AFS_FS is not set
@@ -975,6 +1034,14 @@ CONFIG_SGI_PARTITION=y
975# CONFIG_NLS is not set 1034# CONFIG_NLS is not set
976 1035
977# 1036#
1037# Distributed Lock Manager
1038#
1039CONFIG_DLM=m
1040CONFIG_DLM_TCP=y
1041# CONFIG_DLM_SCTP is not set
1042# CONFIG_DLM_DEBUG is not set
1043
1044#
978# Profiling support 1045# Profiling support
979# 1046#
980# CONFIG_PROFILING is not set 1047# CONFIG_PROFILING is not set
@@ -984,11 +1051,13 @@ CONFIG_SGI_PARTITION=y
984# 1051#
985CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1052CONFIG_TRACE_IRQFLAGS_SUPPORT=y
986# CONFIG_PRINTK_TIME is not set 1053# CONFIG_PRINTK_TIME is not set
1054CONFIG_ENABLE_MUST_CHECK=y
987# CONFIG_MAGIC_SYSRQ is not set 1055# CONFIG_MAGIC_SYSRQ is not set
988# CONFIG_UNUSED_SYMBOLS is not set 1056# CONFIG_UNUSED_SYMBOLS is not set
1057# CONFIG_DEBUG_FS is not set
1058# CONFIG_HEADERS_CHECK is not set
989# CONFIG_DEBUG_KERNEL is not set 1059# CONFIG_DEBUG_KERNEL is not set
990CONFIG_LOG_BUF_SHIFT=15 1060CONFIG_LOG_BUF_SHIFT=15
991# CONFIG_DEBUG_FS is not set
992CONFIG_CROSSCOMPILE=y 1061CONFIG_CROSSCOMPILE=y
993CONFIG_CMDLINE="" 1062CONFIG_CMDLINE=""
994 1063
@@ -1003,7 +1072,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1003# Cryptographic options 1072# Cryptographic options
1004# 1073#
1005CONFIG_CRYPTO=y 1074CONFIG_CRYPTO=y
1075CONFIG_CRYPTO_ALGAPI=y
1076CONFIG_CRYPTO_BLKCIPHER=y
1077CONFIG_CRYPTO_HASH=y
1078CONFIG_CRYPTO_MANAGER=y
1006CONFIG_CRYPTO_HMAC=y 1079CONFIG_CRYPTO_HMAC=y
1080CONFIG_CRYPTO_XCBC=m
1007CONFIG_CRYPTO_NULL=m 1081CONFIG_CRYPTO_NULL=m
1008CONFIG_CRYPTO_MD4=m 1082CONFIG_CRYPTO_MD4=m
1009CONFIG_CRYPTO_MD5=y 1083CONFIG_CRYPTO_MD5=y
@@ -1012,9 +1086,16 @@ CONFIG_CRYPTO_SHA256=m
1012CONFIG_CRYPTO_SHA512=m 1086CONFIG_CRYPTO_SHA512=m
1013CONFIG_CRYPTO_WP512=m 1087CONFIG_CRYPTO_WP512=m
1014CONFIG_CRYPTO_TGR192=m 1088CONFIG_CRYPTO_TGR192=m
1089CONFIG_CRYPTO_GF128MUL=m
1090CONFIG_CRYPTO_ECB=m
1091CONFIG_CRYPTO_CBC=y
1092CONFIG_CRYPTO_PCBC=m
1093CONFIG_CRYPTO_LRW=m
1015CONFIG_CRYPTO_DES=y 1094CONFIG_CRYPTO_DES=y
1095CONFIG_CRYPTO_FCRYPT=m
1016CONFIG_CRYPTO_BLOWFISH=m 1096CONFIG_CRYPTO_BLOWFISH=m
1017CONFIG_CRYPTO_TWOFISH=m 1097CONFIG_CRYPTO_TWOFISH=m
1098CONFIG_CRYPTO_TWOFISH_COMMON=m
1018CONFIG_CRYPTO_SERPENT=m 1099CONFIG_CRYPTO_SERPENT=m
1019CONFIG_CRYPTO_AES=m 1100CONFIG_CRYPTO_AES=m
1020CONFIG_CRYPTO_CAST5=m 1101CONFIG_CRYPTO_CAST5=m
@@ -1026,6 +1107,7 @@ CONFIG_CRYPTO_ANUBIS=m
1026CONFIG_CRYPTO_DEFLATE=m 1107CONFIG_CRYPTO_DEFLATE=m
1027CONFIG_CRYPTO_MICHAEL_MIC=m 1108CONFIG_CRYPTO_MICHAEL_MIC=m
1028CONFIG_CRYPTO_CRC32C=m 1109CONFIG_CRYPTO_CRC32C=m
1110CONFIG_CRYPTO_CAMELLIA=m
1029# CONFIG_CRYPTO_TEST is not set 1111# CONFIG_CRYPTO_TEST is not set
1030 1112
1031# 1113#
@@ -1035,6 +1117,7 @@ CONFIG_CRYPTO_CRC32C=m
1035# 1117#
1036# Library routines 1118# Library routines
1037# 1119#
1120CONFIG_BITREVERSE=y
1038# CONFIG_CRC_CCITT is not set 1121# CONFIG_CRC_CCITT is not set
1039CONFIG_CRC16=m 1122CONFIG_CRC16=m
1040CONFIG_CRC32=y 1123CONFIG_CRC32=y
@@ -1042,3 +1125,5 @@ CONFIG_LIBCRC32C=m
1042CONFIG_ZLIB_INFLATE=m 1125CONFIG_ZLIB_INFLATE=m
1043CONFIG_ZLIB_DEFLATE=m 1126CONFIG_ZLIB_DEFLATE=m
1044CONFIG_PLIST=y 1127CONFIG_PLIST=y
1128CONFIG_HAS_IOMEM=y
1129CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 61e069a0f1aa..14398e8a1768 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:11 2006 4# Sun Feb 18 21:27:50 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +64,17 @@ CONFIG_SGI_IP32=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 75CONFIG_ARC=y
72CONFIG_DMA_IP32=y
73CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
74CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
75CONFIG_OWN_DMA=y
76CONFIG_CPU_BIG_ENDIAN=y 78CONFIG_CPU_BIG_ENDIAN=y
77# CONFIG_CPU_LITTLE_ENDIAN is not set 79# CONFIG_CPU_LITTLE_ENDIAN is not set
78CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 80CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -124,8 +126,8 @@ CONFIG_BOARD_SCACHE=y
124CONFIG_R5000_CPU_SCACHE=y 126CONFIG_R5000_CPU_SCACHE=y
125CONFIG_RM7000_CPU_SCACHE=y 127CONFIG_RM7000_CPU_SCACHE=y
126CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
127# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
129# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
130CONFIG_CPU_HAS_LLSC=y 132CONFIG_CPU_HAS_LLSC=y
131CONFIG_CPU_HAS_SYNC=y 133CONFIG_CPU_HAS_SYNC=y
@@ -141,6 +143,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 143# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 144CONFIG_SPLIT_PTLOCK_CPUS=4
143CONFIG_RESOURCES_64BIT=y 145CONFIG_RESOURCES_64BIT=y
146CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -153,6 +156,7 @@ CONFIG_HZ=1000
153# CONFIG_PREEMPT_NONE is not set 156# CONFIG_PREEMPT_NONE is not set
154CONFIG_PREEMPT_VOLUNTARY=y 157CONFIG_PREEMPT_VOLUNTARY=y
155# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
159# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 160CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 161CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 162CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +175,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 175CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 176CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 180# CONFIG_POSIX_MQUEUE is not set
175CONFIG_BSD_PROCESS_ACCT=y 181CONFIG_BSD_PROCESS_ACCT=y
176# CONFIG_BSD_PROCESS_ACCT_V3 is not set 182# CONFIG_BSD_PROCESS_ACCT_V3 is not set
177CONFIG_SYSCTL=y 183# CONFIG_TASKSTATS is not set
184# CONFIG_UTS_NS is not set
178# CONFIG_AUDIT is not set 185# CONFIG_AUDIT is not set
179# CONFIG_IKCONFIG is not set 186# CONFIG_IKCONFIG is not set
187CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 188CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 189# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
190CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 191CONFIG_EMBEDDED=y
192CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 193CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 194# CONFIG_KALLSYMS_EXTRA_PASS is not set
186CONFIG_HOTPLUG=y 195CONFIG_HOTPLUG=y
@@ -188,12 +197,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 197CONFIG_BUG=y
189CONFIG_ELF_CORE=y 198CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 199CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 200CONFIG_FUTEX=y
193CONFIG_EPOLL=y 201CONFIG_EPOLL=y
194CONFIG_SHMEM=y 202CONFIG_SHMEM=y
195CONFIG_SLAB=y 203CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 204CONFIG_VM_EVENT_COUNTERS=y
205CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 206# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 207CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 208# CONFIG_SLOB is not set
@@ -206,6 +215,7 @@ CONFIG_BASE_SMALL=0
206# 215#
207# Block layer 216# Block layer
208# 217#
218CONFIG_BLOCK=y
209# CONFIG_BLK_DEV_IO_TRACE is not set 219# CONFIG_BLK_DEV_IO_TRACE is not set
210 220
211# 221#
@@ -246,11 +256,20 @@ CONFIG_BINFMT_MISC=y
246# CONFIG_BUILD_ELF64 is not set 256# CONFIG_BUILD_ELF64 is not set
247CONFIG_MIPS32_COMPAT=y 257CONFIG_MIPS32_COMPAT=y
248CONFIG_COMPAT=y 258CONFIG_COMPAT=y
259CONFIG_SYSVIPC_COMPAT=y
249CONFIG_MIPS32_O32=y 260CONFIG_MIPS32_O32=y
250# CONFIG_MIPS32_N32 is not set 261# CONFIG_MIPS32_N32 is not set
251CONFIG_BINFMT_ELF32=y 262CONFIG_BINFMT_ELF32=y
252 263
253# 264#
265# Power management options
266#
267CONFIG_PM=y
268# CONFIG_PM_LEGACY is not set
269# CONFIG_PM_DEBUG is not set
270# CONFIG_PM_SYSFS_DEPRECATED is not set
271
272#
254# Networking 273# Networking
255# 274#
256CONFIG_NET=y 275CONFIG_NET=y
@@ -264,7 +283,10 @@ CONFIG_PACKET_MMAP=y
264CONFIG_UNIX=y 283CONFIG_UNIX=y
265CONFIG_XFRM=y 284CONFIG_XFRM=y
266CONFIG_XFRM_USER=y 285CONFIG_XFRM_USER=y
286# CONFIG_XFRM_SUB_POLICY is not set
287CONFIG_XFRM_MIGRATE=y
267CONFIG_NET_KEY=y 288CONFIG_NET_KEY=y
289CONFIG_NET_KEY_MIGRATE=y
268CONFIG_INET=y 290CONFIG_INET=y
269# CONFIG_IP_MULTICAST is not set 291# CONFIG_IP_MULTICAST is not set
270# CONFIG_IP_ADVANCED_ROUTER is not set 292# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -284,10 +306,13 @@ CONFIG_IP_PNP_BOOTP=y
284# CONFIG_INET_TUNNEL is not set 306# CONFIG_INET_TUNNEL is not set
285CONFIG_INET_XFRM_MODE_TRANSPORT=y 307CONFIG_INET_XFRM_MODE_TRANSPORT=y
286CONFIG_INET_XFRM_MODE_TUNNEL=y 308CONFIG_INET_XFRM_MODE_TUNNEL=y
309CONFIG_INET_XFRM_MODE_BEET=y
287CONFIG_INET_DIAG=y 310CONFIG_INET_DIAG=y
288CONFIG_INET_TCP_DIAG=y 311CONFIG_INET_TCP_DIAG=y
289# CONFIG_TCP_CONG_ADVANCED is not set 312# CONFIG_TCP_CONG_ADVANCED is not set
290CONFIG_TCP_CONG_BIC=y 313CONFIG_TCP_CONG_CUBIC=y
314CONFIG_DEFAULT_TCP_CONG="cubic"
315CONFIG_TCP_MD5SIG=y
291# CONFIG_IPV6 is not set 316# CONFIG_IPV6 is not set
292# CONFIG_INET6_XFRM_TUNNEL is not set 317# CONFIG_INET6_XFRM_TUNNEL is not set
293# CONFIG_INET6_TUNNEL is not set 318# CONFIG_INET6_TUNNEL is not set
@@ -317,7 +342,6 @@ CONFIG_NETWORK_SECMARK=y
317# CONFIG_ATALK is not set 342# CONFIG_ATALK is not set
318# CONFIG_X25 is not set 343# CONFIG_X25 is not set
319# CONFIG_LAPB is not set 344# CONFIG_LAPB is not set
320# CONFIG_NET_DIVERT is not set
321# CONFIG_ECONET is not set 345# CONFIG_ECONET is not set
322# CONFIG_WAN_ROUTER is not set 346# CONFIG_WAN_ROUTER is not set
323 347
@@ -393,6 +417,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
393CONFIG_ATA_OVER_ETH=y 417CONFIG_ATA_OVER_ETH=y
394 418
395# 419#
420# Misc devices
421#
422CONFIG_SGI_IOC4=y
423# CONFIG_TIFM_CORE is not set
424
425#
396# ATA/ATAPI/MFM/RLL support 426# ATA/ATAPI/MFM/RLL support
397# 427#
398# CONFIG_IDE is not set 428# CONFIG_IDE is not set
@@ -402,6 +432,8 @@ CONFIG_ATA_OVER_ETH=y
402# 432#
403CONFIG_RAID_ATTRS=y 433CONFIG_RAID_ATTRS=y
404CONFIG_SCSI=y 434CONFIG_SCSI=y
435CONFIG_SCSI_TGT=y
436CONFIG_SCSI_NETLINK=y
405CONFIG_SCSI_PROC_FS=y 437CONFIG_SCSI_PROC_FS=y
406 438
407# 439#
@@ -421,14 +453,17 @@ CONFIG_CHR_DEV_SG=y
421CONFIG_SCSI_MULTI_LUN=y 453CONFIG_SCSI_MULTI_LUN=y
422CONFIG_SCSI_CONSTANTS=y 454CONFIG_SCSI_CONSTANTS=y
423CONFIG_SCSI_LOGGING=y 455CONFIG_SCSI_LOGGING=y
456CONFIG_SCSI_SCAN_ASYNC=y
424 457
425# 458#
426# SCSI Transport Attributes 459# SCSI Transports
427# 460#
428CONFIG_SCSI_SPI_ATTRS=y 461CONFIG_SCSI_SPI_ATTRS=y
429CONFIG_SCSI_FC_ATTRS=y 462CONFIG_SCSI_FC_ATTRS=y
430# CONFIG_SCSI_ISCSI_ATTRS is not set 463# CONFIG_SCSI_ISCSI_ATTRS is not set
431CONFIG_SCSI_SAS_ATTRS=y 464CONFIG_SCSI_SAS_ATTRS=y
465CONFIG_SCSI_SAS_LIBSAS=y
466# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
432 467
433# 468#
434# SCSI low-level drivers 469# SCSI low-level drivers
@@ -446,24 +481,33 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
446CONFIG_AIC7XXX_REG_PRETTY_PRINT=y 481CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
447# CONFIG_SCSI_AIC7XXX_OLD is not set 482# CONFIG_SCSI_AIC7XXX_OLD is not set
448# CONFIG_SCSI_AIC79XX is not set 483# CONFIG_SCSI_AIC79XX is not set
484CONFIG_SCSI_AIC94XX=y
485# CONFIG_AIC94XX_DEBUG is not set
486# CONFIG_SCSI_ARCMSR is not set
449# CONFIG_MEGARAID_NEWGEN is not set 487# CONFIG_MEGARAID_NEWGEN is not set
450# CONFIG_MEGARAID_LEGACY is not set 488# CONFIG_MEGARAID_LEGACY is not set
451# CONFIG_MEGARAID_SAS is not set 489# CONFIG_MEGARAID_SAS is not set
452# CONFIG_SCSI_SATA is not set
453# CONFIG_SCSI_HPTIOP is not set 490# CONFIG_SCSI_HPTIOP is not set
454# CONFIG_SCSI_DMX3191D is not set 491# CONFIG_SCSI_DMX3191D is not set
455# CONFIG_SCSI_FUTURE_DOMAIN is not set 492# CONFIG_SCSI_FUTURE_DOMAIN is not set
456# CONFIG_SCSI_IPS is not set 493# CONFIG_SCSI_IPS is not set
457# CONFIG_SCSI_INITIO is not set 494# CONFIG_SCSI_INITIO is not set
458# CONFIG_SCSI_INIA100 is not set 495# CONFIG_SCSI_INIA100 is not set
496# CONFIG_SCSI_STEX is not set
459# CONFIG_SCSI_SYM53C8XX_2 is not set 497# CONFIG_SCSI_SYM53C8XX_2 is not set
460# CONFIG_SCSI_IPR is not set
461# CONFIG_SCSI_QLOGIC_1280 is not set 498# CONFIG_SCSI_QLOGIC_1280 is not set
462# CONFIG_SCSI_QLA_FC is not set 499# CONFIG_SCSI_QLA_FC is not set
500# CONFIG_SCSI_QLA_ISCSI is not set
463# CONFIG_SCSI_LPFC is not set 501# CONFIG_SCSI_LPFC is not set
464# CONFIG_SCSI_DC395x is not set 502# CONFIG_SCSI_DC395x is not set
465# CONFIG_SCSI_DC390T is not set 503# CONFIG_SCSI_DC390T is not set
466# CONFIG_SCSI_DEBUG is not set 504# CONFIG_SCSI_DEBUG is not set
505# CONFIG_SCSI_SRP is not set
506
507#
508# Serial ATA (prod) and Parallel ATA (experimental) drivers
509#
510# CONFIG_ATA is not set
467 511
468# 512#
469# Multi-device support (RAID and LVM) 513# Multi-device support (RAID and LVM)
@@ -517,6 +561,8 @@ CONFIG_LXT_PHY=y
517CONFIG_CICADA_PHY=y 561CONFIG_CICADA_PHY=y
518CONFIG_VITESSE_PHY=y 562CONFIG_VITESSE_PHY=y
519CONFIG_SMSC_PHY=y 563CONFIG_SMSC_PHY=y
564# CONFIG_BROADCOM_PHY is not set
565# CONFIG_FIXED_PHY is not set
520 566
521# 567#
522# Ethernet (10 or 100Mbit) 568# Ethernet (10 or 100Mbit)
@@ -553,14 +599,17 @@ CONFIG_SGI_O2MACE_ETH=y
553# CONFIG_SK98LIN is not set 599# CONFIG_SK98LIN is not set
554# CONFIG_TIGON3 is not set 600# CONFIG_TIGON3 is not set
555# CONFIG_BNX2 is not set 601# CONFIG_BNX2 is not set
602CONFIG_QLA3XXX=y
556 603
557# 604#
558# Ethernet (10000 Mbit) 605# Ethernet (10000 Mbit)
559# 606#
560# CONFIG_CHELSIO_T1 is not set 607# CONFIG_CHELSIO_T1 is not set
608CONFIG_CHELSIO_T3=y
561# CONFIG_IXGB is not set 609# CONFIG_IXGB is not set
562# CONFIG_S2IO is not set 610# CONFIG_S2IO is not set
563# CONFIG_MYRI10GE is not set 611# CONFIG_MYRI10GE is not set
612CONFIG_NETXEN_NIC=y
564 613
565# 614#
566# Token Ring devices 615# Token Ring devices
@@ -600,6 +649,7 @@ CONFIG_SGI_O2MACE_ETH=y
600# Input device support 649# Input device support
601# 650#
602CONFIG_INPUT=y 651CONFIG_INPUT=y
652# CONFIG_INPUT_FF_MEMLESS is not set
603 653
604# 654#
605# Userland interfaces 655# Userland interfaces
@@ -678,10 +728,6 @@ CONFIG_LEGACY_PTY_COUNT=256
678# CONFIG_DTLK is not set 728# CONFIG_DTLK is not set
679# CONFIG_R3964 is not set 729# CONFIG_R3964 is not set
680# CONFIG_APPLICOM is not set 730# CONFIG_APPLICOM is not set
681
682#
683# Ftape, the floppy tape device driver
684#
685# CONFIG_DRM is not set 731# CONFIG_DRM is not set
686# CONFIG_RAW_DRIVER is not set 732# CONFIG_RAW_DRIVER is not set
687 733
@@ -689,7 +735,6 @@ CONFIG_LEGACY_PTY_COUNT=256
689# TPM devices 735# TPM devices
690# 736#
691# CONFIG_TCG_TPM is not set 737# CONFIG_TCG_TPM is not set
692# CONFIG_TELCLOCK is not set
693 738
694# 739#
695# I2C support 740# I2C support
@@ -714,14 +759,9 @@ CONFIG_LEGACY_PTY_COUNT=256
714# CONFIG_HWMON_VID is not set 759# CONFIG_HWMON_VID is not set
715 760
716# 761#
717# Misc devices
718#
719
720#
721# Multimedia devices 762# Multimedia devices
722# 763#
723# CONFIG_VIDEO_DEV is not set 764# CONFIG_VIDEO_DEV is not set
724CONFIG_VIDEO_V4L2=y
725 765
726# 766#
727# Digital Video Broadcasting Devices 767# Digital Video Broadcasting Devices
@@ -739,6 +779,7 @@ CONFIG_VIDEO_V4L2=y
739# 779#
740# CONFIG_VGA_CONSOLE is not set 780# CONFIG_VGA_CONSOLE is not set
741CONFIG_DUMMY_CONSOLE=y 781CONFIG_DUMMY_CONSOLE=y
782# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
742 783
743# 784#
744# Sound 785# Sound
@@ -746,6 +787,12 @@ CONFIG_DUMMY_CONSOLE=y
746# CONFIG_SOUND is not set 787# CONFIG_SOUND is not set
747 788
748# 789#
790# HID Devices
791#
792CONFIG_HID=y
793# CONFIG_HID_DEBUG is not set
794
795#
749# USB support 796# USB support
750# 797#
751CONFIG_USB_ARCH_HAS_HCD=y 798CONFIG_USB_ARCH_HAS_HCD=y
@@ -808,16 +855,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
808# 855#
809 856
810# 857#
858# Auxiliary Display support
859#
860
861#
862# Virtualization
863#
864
865#
811# File systems 866# File systems
812# 867#
813CONFIG_EXT2_FS=y 868CONFIG_EXT2_FS=y
814# CONFIG_EXT2_FS_XATTR is not set 869# CONFIG_EXT2_FS_XATTR is not set
815# CONFIG_EXT2_FS_XIP is not set 870# CONFIG_EXT2_FS_XIP is not set
816# CONFIG_EXT3_FS is not set 871# CONFIG_EXT3_FS is not set
872# CONFIG_EXT4DEV_FS is not set
817# CONFIG_REISERFS_FS is not set 873# CONFIG_REISERFS_FS is not set
818# CONFIG_JFS_FS is not set 874# CONFIG_JFS_FS is not set
819# CONFIG_FS_POSIX_ACL is not set 875CONFIG_FS_POSIX_ACL=y
820# CONFIG_XFS_FS is not set 876# CONFIG_XFS_FS is not set
877# CONFIG_GFS2_FS is not set
821# CONFIG_OCFS2_FS is not set 878# CONFIG_OCFS2_FS is not set
822# CONFIG_MINIX_FS is not set 879# CONFIG_MINIX_FS is not set
823# CONFIG_ROMFS_FS is not set 880# CONFIG_ROMFS_FS is not set
@@ -828,6 +885,7 @@ CONFIG_DNOTIFY=y
828# CONFIG_AUTOFS_FS is not set 885# CONFIG_AUTOFS_FS is not set
829# CONFIG_AUTOFS4_FS is not set 886# CONFIG_AUTOFS4_FS is not set
830CONFIG_FUSE_FS=y 887CONFIG_FUSE_FS=y
888CONFIG_GENERIC_ACL=y
831 889
832# 890#
833# CD-ROM/DVD Filesystems 891# CD-ROM/DVD Filesystems
@@ -847,17 +905,20 @@ CONFIG_FUSE_FS=y
847# 905#
848CONFIG_PROC_FS=y 906CONFIG_PROC_FS=y
849CONFIG_PROC_KCORE=y 907CONFIG_PROC_KCORE=y
908CONFIG_PROC_SYSCTL=y
850CONFIG_SYSFS=y 909CONFIG_SYSFS=y
851CONFIG_TMPFS=y 910CONFIG_TMPFS=y
911CONFIG_TMPFS_POSIX_ACL=y
852# CONFIG_HUGETLB_PAGE is not set 912# CONFIG_HUGETLB_PAGE is not set
853CONFIG_RAMFS=y 913CONFIG_RAMFS=y
854# CONFIG_CONFIGFS_FS is not set 914CONFIG_CONFIGFS_FS=y
855 915
856# 916#
857# Miscellaneous filesystems 917# Miscellaneous filesystems
858# 918#
859# CONFIG_ADFS_FS is not set 919# CONFIG_ADFS_FS is not set
860# CONFIG_AFFS_FS is not set 920# CONFIG_AFFS_FS is not set
921# CONFIG_ECRYPT_FS is not set
861# CONFIG_HFS_FS is not set 922# CONFIG_HFS_FS is not set
862# CONFIG_HFSPLUS_FS is not set 923# CONFIG_HFSPLUS_FS is not set
863# CONFIG_BEFS_FS is not set 924# CONFIG_BEFS_FS is not set
@@ -888,7 +949,6 @@ CONFIG_SUNRPC=y
888# CONFIG_RPCSEC_GSS_SPKM3 is not set 949# CONFIG_RPCSEC_GSS_SPKM3 is not set
889# CONFIG_SMB_FS is not set 950# CONFIG_SMB_FS is not set
890# CONFIG_CIFS is not set 951# CONFIG_CIFS is not set
891# CONFIG_CIFS_DEBUG2 is not set
892# CONFIG_NCP_FS is not set 952# CONFIG_NCP_FS is not set
893# CONFIG_CODA_FS is not set 953# CONFIG_CODA_FS is not set
894# CONFIG_AFS_FS is not set 954# CONFIG_AFS_FS is not set
@@ -917,6 +977,14 @@ CONFIG_SGI_PARTITION=y
917# CONFIG_NLS is not set 977# CONFIG_NLS is not set
918 978
919# 979#
980# Distributed Lock Manager
981#
982CONFIG_DLM=y
983CONFIG_DLM_TCP=y
984# CONFIG_DLM_SCTP is not set
985# CONFIG_DLM_DEBUG is not set
986
987#
920# Profiling support 988# Profiling support
921# 989#
922# CONFIG_PROFILING is not set 990# CONFIG_PROFILING is not set
@@ -926,12 +994,13 @@ CONFIG_SGI_PARTITION=y
926# 994#
927CONFIG_TRACE_IRQFLAGS_SUPPORT=y 995CONFIG_TRACE_IRQFLAGS_SUPPORT=y
928# CONFIG_PRINTK_TIME is not set 996# CONFIG_PRINTK_TIME is not set
997CONFIG_ENABLE_MUST_CHECK=y
929# CONFIG_MAGIC_SYSRQ is not set 998# CONFIG_MAGIC_SYSRQ is not set
930# CONFIG_UNUSED_SYMBOLS is not set 999# CONFIG_UNUSED_SYMBOLS is not set
1000# CONFIG_DEBUG_FS is not set
1001# CONFIG_HEADERS_CHECK is not set
931# CONFIG_DEBUG_KERNEL is not set 1002# CONFIG_DEBUG_KERNEL is not set
932CONFIG_LOG_BUF_SHIFT=14 1003CONFIG_LOG_BUF_SHIFT=14
933# CONFIG_DEBUG_FS is not set
934# CONFIG_UNWIND_INFO is not set
935CONFIG_CROSSCOMPILE=y 1004CONFIG_CROSSCOMPILE=y
936CONFIG_CMDLINE="" 1005CONFIG_CMDLINE=""
937 1006
@@ -946,7 +1015,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
946# Cryptographic options 1015# Cryptographic options
947# 1016#
948CONFIG_CRYPTO=y 1017CONFIG_CRYPTO=y
1018CONFIG_CRYPTO_ALGAPI=y
1019CONFIG_CRYPTO_BLKCIPHER=y
1020CONFIG_CRYPTO_HASH=y
1021CONFIG_CRYPTO_MANAGER=y
949CONFIG_CRYPTO_HMAC=y 1022CONFIG_CRYPTO_HMAC=y
1023CONFIG_CRYPTO_XCBC=y
950CONFIG_CRYPTO_NULL=y 1024CONFIG_CRYPTO_NULL=y
951CONFIG_CRYPTO_MD4=y 1025CONFIG_CRYPTO_MD4=y
952CONFIG_CRYPTO_MD5=y 1026CONFIG_CRYPTO_MD5=y
@@ -955,9 +1029,16 @@ CONFIG_CRYPTO_SHA256=y
955CONFIG_CRYPTO_SHA512=y 1029CONFIG_CRYPTO_SHA512=y
956CONFIG_CRYPTO_WP512=y 1030CONFIG_CRYPTO_WP512=y
957CONFIG_CRYPTO_TGR192=y 1031CONFIG_CRYPTO_TGR192=y
1032CONFIG_CRYPTO_GF128MUL=y
1033CONFIG_CRYPTO_ECB=y
1034CONFIG_CRYPTO_CBC=y
1035CONFIG_CRYPTO_PCBC=y
1036CONFIG_CRYPTO_LRW=y
958CONFIG_CRYPTO_DES=y 1037CONFIG_CRYPTO_DES=y
1038CONFIG_CRYPTO_FCRYPT=y
959CONFIG_CRYPTO_BLOWFISH=y 1039CONFIG_CRYPTO_BLOWFISH=y
960CONFIG_CRYPTO_TWOFISH=y 1040CONFIG_CRYPTO_TWOFISH=y
1041CONFIG_CRYPTO_TWOFISH_COMMON=y
961CONFIG_CRYPTO_SERPENT=y 1042CONFIG_CRYPTO_SERPENT=y
962CONFIG_CRYPTO_AES=y 1043CONFIG_CRYPTO_AES=y
963CONFIG_CRYPTO_CAST5=y 1044CONFIG_CRYPTO_CAST5=y
@@ -969,6 +1050,7 @@ CONFIG_CRYPTO_ANUBIS=y
969CONFIG_CRYPTO_DEFLATE=y 1050CONFIG_CRYPTO_DEFLATE=y
970CONFIG_CRYPTO_MICHAEL_MIC=y 1051CONFIG_CRYPTO_MICHAEL_MIC=y
971CONFIG_CRYPTO_CRC32C=y 1052CONFIG_CRYPTO_CRC32C=y
1053CONFIG_CRYPTO_CAMELLIA=y
972 1054
973# 1055#
974# Hardware crypto devices 1056# Hardware crypto devices
@@ -977,6 +1059,7 @@ CONFIG_CRYPTO_CRC32C=y
977# 1059#
978# Library routines 1060# Library routines
979# 1061#
1062CONFIG_BITREVERSE=y
980# CONFIG_CRC_CCITT is not set 1063# CONFIG_CRC_CCITT is not set
981CONFIG_CRC16=y 1064CONFIG_CRC16=y
982CONFIG_CRC32=y 1065CONFIG_CRC32=y
@@ -984,3 +1067,5 @@ CONFIG_LIBCRC32C=y
984CONFIG_ZLIB_INFLATE=y 1067CONFIG_ZLIB_INFLATE=y
985CONFIG_ZLIB_DEFLATE=y 1068CONFIG_ZLIB_DEFLATE=y
986CONFIG_PLIST=y 1069CONFIG_PLIST=y
1070CONFIG_HAS_IOMEM=y
1071CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 88966666f4c6..b38978794a5a 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:12 2006 4# Sun Feb 18 21:27:51 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MOMENCO_JAGUAR_ATX=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,10 +65,14 @@ CONFIG_MOMENCO_JAGUAR_ATX=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_JAGUAR_DMALOW=y 66CONFIG_JAGUAR_DMALOW=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
74CONFIG_LIMITED_DMA=y 78CONFIG_LIMITED_DMA=y
@@ -106,6 +110,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
106CONFIG_CPU_RM9000=y 110CONFIG_CPU_RM9000=y
107# CONFIG_CPU_SB1 is not set 111# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_RM9000=y 112CONFIG_SYS_HAS_CPU_RM9000=y
113CONFIG_WEAK_ORDERING=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 114CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
110CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 115CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 116CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -124,8 +129,8 @@ CONFIG_BOARD_SCACHE=y
124CONFIG_RM7000_CPU_SCACHE=y 129CONFIG_RM7000_CPU_SCACHE=y
125CONFIG_CPU_HAS_PREFETCH=y 130CONFIG_CPU_HAS_PREFETCH=y
126CONFIG_MIPS_MT_DISABLED=y 131CONFIG_MIPS_MT_DISABLED=y
127# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_MT_SMP is not set 132# CONFIG_MIPS_MT_SMP is not set
133# CONFIG_MIPS_MT_SMTC is not set
129# CONFIG_MIPS_VPE_LOADER is not set 134# CONFIG_MIPS_VPE_LOADER is not set
130# CONFIG_64BIT_PHYS_ADDR is not set 135# CONFIG_64BIT_PHYS_ADDR is not set
131CONFIG_CPU_HAS_LLSC=y 136CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -171,14 +177,19 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 177CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 178CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_BSD_PROCESS_ACCT is not set 182# CONFIG_BSD_PROCESS_ACCT is not set
175CONFIG_SYSCTL=y 183# CONFIG_TASKSTATS is not set
184# CONFIG_UTS_NS is not set
176# CONFIG_AUDIT is not set 185# CONFIG_AUDIT is not set
177CONFIG_IKCONFIG=y 186CONFIG_IKCONFIG=y
178CONFIG_IKCONFIG_PROC=y 187CONFIG_IKCONFIG_PROC=y
188CONFIG_SYSFS_DEPRECATED=y
179CONFIG_RELAY=y 189CONFIG_RELAY=y
180CONFIG_INITRAMFS_SOURCE="" 190CONFIG_SYSCTL=y
181CONFIG_EMBEDDED=y 191CONFIG_EMBEDDED=y
192CONFIG_SYSCTL_SYSCALL=y
182CONFIG_KALLSYMS=y 193CONFIG_KALLSYMS=y
183# CONFIG_KALLSYMS_EXTRA_PASS is not set 194# CONFIG_KALLSYMS_EXTRA_PASS is not set
184CONFIG_HOTPLUG=y 195CONFIG_HOTPLUG=y
@@ -186,12 +197,12 @@ CONFIG_PRINTK=y
186CONFIG_BUG=y 197CONFIG_BUG=y
187CONFIG_ELF_CORE=y 198CONFIG_ELF_CORE=y
188CONFIG_BASE_FULL=y 199CONFIG_BASE_FULL=y
189CONFIG_RT_MUTEXES=y
190CONFIG_FUTEX=y 200CONFIG_FUTEX=y
191CONFIG_EPOLL=y 201CONFIG_EPOLL=y
192CONFIG_SHMEM=y 202CONFIG_SHMEM=y
193CONFIG_SLAB=y 203CONFIG_SLAB=y
194CONFIG_VM_EVENT_COUNTERS=y 204CONFIG_VM_EVENT_COUNTERS=y
205CONFIG_RT_MUTEXES=y
195# CONFIG_TINY_SHMEM is not set 206# CONFIG_TINY_SHMEM is not set
196CONFIG_BASE_SMALL=0 207CONFIG_BASE_SMALL=0
197# CONFIG_SLOB is not set 208# CONFIG_SLOB is not set
@@ -208,6 +219,7 @@ CONFIG_KMOD=y
208# 219#
209# Block layer 220# Block layer
210# 221#
222CONFIG_BLOCK=y
211# CONFIG_LBD is not set 223# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 224# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 225# CONFIG_LSF is not set
@@ -249,6 +261,14 @@ CONFIG_BINFMT_ELF=y
249CONFIG_TRAD_SIGNALS=y 261CONFIG_TRAD_SIGNALS=y
250 262
251# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
252# Networking 272# Networking
253# 273#
254CONFIG_NET=y 274CONFIG_NET=y
@@ -277,13 +297,15 @@ CONFIG_IP_PNP_BOOTP=y
277# CONFIG_INET_ESP is not set 297# CONFIG_INET_ESP is not set
278# CONFIG_INET_IPCOMP is not set 298# CONFIG_INET_IPCOMP is not set
279# CONFIG_INET_XFRM_TUNNEL is not set 299# CONFIG_INET_XFRM_TUNNEL is not set
280# CONFIG_INET_TUNNEL is not set 300CONFIG_INET_TUNNEL=m
281CONFIG_INET_XFRM_MODE_TRANSPORT=m 301CONFIG_INET_XFRM_MODE_TRANSPORT=m
282CONFIG_INET_XFRM_MODE_TUNNEL=m 302CONFIG_INET_XFRM_MODE_TUNNEL=m
303CONFIG_INET_XFRM_MODE_BEET=m
283CONFIG_INET_DIAG=y 304CONFIG_INET_DIAG=y
284CONFIG_INET_TCP_DIAG=y 305CONFIG_INET_TCP_DIAG=y
285# CONFIG_TCP_CONG_ADVANCED is not set 306# CONFIG_TCP_CONG_ADVANCED is not set
286CONFIG_TCP_CONG_BIC=y 307CONFIG_TCP_CONG_CUBIC=y
308CONFIG_DEFAULT_TCP_CONG="cubic"
287CONFIG_IPV6=m 309CONFIG_IPV6=m
288CONFIG_IPV6_PRIVACY=y 310CONFIG_IPV6_PRIVACY=y
289CONFIG_IPV6_ROUTER_PREF=y 311CONFIG_IPV6_ROUTER_PREF=y
@@ -294,6 +316,8 @@ CONFIG_INET6_XFRM_TUNNEL=m
294CONFIG_INET6_TUNNEL=m 316CONFIG_INET6_TUNNEL=m
295CONFIG_INET6_XFRM_MODE_TRANSPORT=m 317CONFIG_INET6_XFRM_MODE_TRANSPORT=m
296CONFIG_INET6_XFRM_MODE_TUNNEL=m 318CONFIG_INET6_XFRM_MODE_TUNNEL=m
319CONFIG_INET6_XFRM_MODE_BEET=m
320CONFIG_IPV6_SIT=m
297CONFIG_IPV6_TUNNEL=m 321CONFIG_IPV6_TUNNEL=m
298CONFIG_NETWORK_SECMARK=y 322CONFIG_NETWORK_SECMARK=y
299# CONFIG_NETFILTER is not set 323# CONFIG_NETFILTER is not set
@@ -369,6 +393,11 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
369CONFIG_ATA_OVER_ETH=m 393CONFIG_ATA_OVER_ETH=m
370 394
371# 395#
396# Misc devices
397#
398CONFIG_SGI_IOC4=m
399
400#
372# ATA/ATAPI/MFM/RLL support 401# ATA/ATAPI/MFM/RLL support
373# 402#
374# CONFIG_IDE is not set 403# CONFIG_IDE is not set
@@ -378,6 +407,12 @@ CONFIG_ATA_OVER_ETH=m
378# 407#
379CONFIG_RAID_ATTRS=m 408CONFIG_RAID_ATTRS=m
380# CONFIG_SCSI is not set 409# CONFIG_SCSI is not set
410# CONFIG_SCSI_NETLINK is not set
411
412#
413# Serial ATA (prod) and Parallel ATA (experimental) drivers
414#
415# CONFIG_ATA is not set
381 416
382# 417#
383# Multi-device support (RAID and LVM) 418# Multi-device support (RAID and LVM)
@@ -428,6 +463,8 @@ CONFIG_LXT_PHY=m
428CONFIG_CICADA_PHY=m 463CONFIG_CICADA_PHY=m
429CONFIG_VITESSE_PHY=m 464CONFIG_VITESSE_PHY=m
430CONFIG_SMSC_PHY=m 465CONFIG_SMSC_PHY=m
466# CONFIG_BROADCOM_PHY is not set
467# CONFIG_FIXED_PHY is not set
431 468
432# 469#
433# Ethernet (10 or 100Mbit) 470# Ethernet (10 or 100Mbit)
@@ -475,6 +512,7 @@ CONFIG_EEPRO100=y
475# CONFIG_R8169 is not set 512# CONFIG_R8169 is not set
476# CONFIG_SIS190 is not set 513# CONFIG_SIS190 is not set
477# CONFIG_SKGE is not set 514# CONFIG_SKGE is not set
515# CONFIG_SKY2 is not set
478# CONFIG_SK98LIN is not set 516# CONFIG_SK98LIN is not set
479# CONFIG_VIA_VELOCITY is not set 517# CONFIG_VIA_VELOCITY is not set
480# CONFIG_TIGON3 is not set 518# CONFIG_TIGON3 is not set
@@ -483,14 +521,17 @@ CONFIG_MV643XX_ETH=y
483CONFIG_MV643XX_ETH_0=y 521CONFIG_MV643XX_ETH_0=y
484CONFIG_MV643XX_ETH_1=y 522CONFIG_MV643XX_ETH_1=y
485CONFIG_MV643XX_ETH_2=y 523CONFIG_MV643XX_ETH_2=y
524CONFIG_QLA3XXX=m
486 525
487# 526#
488# Ethernet (10000 Mbit) 527# Ethernet (10000 Mbit)
489# 528#
490# CONFIG_CHELSIO_T1 is not set 529# CONFIG_CHELSIO_T1 is not set
530CONFIG_CHELSIO_T3=m
491# CONFIG_IXGB is not set 531# CONFIG_IXGB is not set
492# CONFIG_S2IO is not set 532# CONFIG_S2IO is not set
493# CONFIG_MYRI10GE is not set 533# CONFIG_MYRI10GE is not set
534CONFIG_NETXEN_NIC=m
494 535
495# 536#
496# Token Ring devices 537# Token Ring devices
@@ -574,10 +615,6 @@ CONFIG_LEGACY_PTY_COUNT=256
574# CONFIG_DTLK is not set 615# CONFIG_DTLK is not set
575# CONFIG_R3964 is not set 616# CONFIG_R3964 is not set
576# CONFIG_APPLICOM is not set 617# CONFIG_APPLICOM is not set
577
578#
579# Ftape, the floppy tape device driver
580#
581# CONFIG_DRM is not set 618# CONFIG_DRM is not set
582# CONFIG_RAW_DRIVER is not set 619# CONFIG_RAW_DRIVER is not set
583 620
@@ -608,14 +645,9 @@ CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_HWMON_VID is not set 645# CONFIG_HWMON_VID is not set
609 646
610# 647#
611# Misc devices
612#
613
614#
615# Multimedia devices 648# Multimedia devices
616# 649#
617# CONFIG_VIDEO_DEV is not set 650# CONFIG_VIDEO_DEV is not set
618CONFIG_VIDEO_V4L2=y
619 651
620# 652#
621# Digital Video Broadcasting Devices 653# Digital Video Broadcasting Devices
@@ -627,6 +659,7 @@ CONFIG_VIDEO_V4L2=y
627# 659#
628# CONFIG_FIRMWARE_EDID is not set 660# CONFIG_FIRMWARE_EDID is not set
629# CONFIG_FB is not set 661# CONFIG_FB is not set
662# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
630 663
631# 664#
632# Sound 665# Sound
@@ -695,14 +728,23 @@ CONFIG_USB_ARCH_HAS_EHCI=y
695# 728#
696 729
697# 730#
731# Auxiliary Display support
732#
733
734#
735# Virtualization
736#
737
738#
698# File systems 739# File systems
699# 740#
700# CONFIG_EXT2_FS is not set 741# CONFIG_EXT2_FS is not set
701# CONFIG_EXT3_FS is not set 742# CONFIG_EXT3_FS is not set
702# CONFIG_REISERFS_FS is not set 743# CONFIG_REISERFS_FS is not set
703# CONFIG_JFS_FS is not set 744# CONFIG_JFS_FS is not set
704# CONFIG_FS_POSIX_ACL is not set 745CONFIG_FS_POSIX_ACL=y
705# CONFIG_XFS_FS is not set 746# CONFIG_XFS_FS is not set
747# CONFIG_OCFS2_FS is not set
706# CONFIG_MINIX_FS is not set 748# CONFIG_MINIX_FS is not set
707# CONFIG_ROMFS_FS is not set 749# CONFIG_ROMFS_FS is not set
708CONFIG_INOTIFY=y 750CONFIG_INOTIFY=y
@@ -712,6 +754,7 @@ CONFIG_DNOTIFY=y
712# CONFIG_AUTOFS_FS is not set 754# CONFIG_AUTOFS_FS is not set
713# CONFIG_AUTOFS4_FS is not set 755# CONFIG_AUTOFS4_FS is not set
714CONFIG_FUSE_FS=m 756CONFIG_FUSE_FS=m
757CONFIG_GENERIC_ACL=y
715 758
716# 759#
717# CD-ROM/DVD Filesystems 760# CD-ROM/DVD Filesystems
@@ -731,8 +774,10 @@ CONFIG_FUSE_FS=m
731# 774#
732CONFIG_PROC_FS=y 775CONFIG_PROC_FS=y
733CONFIG_PROC_KCORE=y 776CONFIG_PROC_KCORE=y
777CONFIG_PROC_SYSCTL=y
734CONFIG_SYSFS=y 778CONFIG_SYSFS=y
735CONFIG_TMPFS=y 779CONFIG_TMPFS=y
780CONFIG_TMPFS_POSIX_ACL=y
736# CONFIG_HUGETLB_PAGE is not set 781# CONFIG_HUGETLB_PAGE is not set
737CONFIG_RAMFS=y 782CONFIG_RAMFS=y
738 783
@@ -752,6 +797,7 @@ CONFIG_RAMFS=y
752# 797#
753CONFIG_NFS_FS=y 798CONFIG_NFS_FS=y
754# CONFIG_NFS_V3 is not set 799# CONFIG_NFS_V3 is not set
800# CONFIG_NFS_DIRECTIO is not set
755# CONFIG_NFSD is not set 801# CONFIG_NFSD is not set
756CONFIG_ROOT_NFS=y 802CONFIG_ROOT_NFS=y
757CONFIG_LOCKD=y 803CONFIG_LOCKD=y
@@ -759,7 +805,6 @@ CONFIG_NFS_COMMON=y
759CONFIG_SUNRPC=y 805CONFIG_SUNRPC=y
760# CONFIG_SMB_FS is not set 806# CONFIG_SMB_FS is not set
761# CONFIG_CIFS is not set 807# CONFIG_CIFS is not set
762# CONFIG_CIFS_DEBUG2 is not set
763# CONFIG_NCP_FS is not set 808# CONFIG_NCP_FS is not set
764# CONFIG_CODA_FS is not set 809# CONFIG_CODA_FS is not set
765 810
@@ -779,11 +824,13 @@ CONFIG_MSDOS_PARTITION=y
779# 824#
780CONFIG_TRACE_IRQFLAGS_SUPPORT=y 825CONFIG_TRACE_IRQFLAGS_SUPPORT=y
781# CONFIG_PRINTK_TIME is not set 826# CONFIG_PRINTK_TIME is not set
827CONFIG_ENABLE_MUST_CHECK=y
782# CONFIG_MAGIC_SYSRQ is not set 828# CONFIG_MAGIC_SYSRQ is not set
783# CONFIG_UNUSED_SYMBOLS is not set 829# CONFIG_UNUSED_SYMBOLS is not set
830# CONFIG_DEBUG_FS is not set
831# CONFIG_HEADERS_CHECK is not set
784# CONFIG_DEBUG_KERNEL is not set 832# CONFIG_DEBUG_KERNEL is not set
785CONFIG_LOG_BUF_SHIFT=14 833CONFIG_LOG_BUF_SHIFT=14
786# CONFIG_DEBUG_FS is not set
787CONFIG_CROSSCOMPILE=y 834CONFIG_CROSSCOMPILE=y
788CONFIG_CMDLINE="" 835CONFIG_CMDLINE=""
789 836
@@ -798,6 +845,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
798# Cryptographic options 845# Cryptographic options
799# 846#
800CONFIG_CRYPTO=y 847CONFIG_CRYPTO=y
848CONFIG_CRYPTO_ALGAPI=y
849CONFIG_CRYPTO_BLKCIPHER=m
850CONFIG_CRYPTO_HASH=y
851CONFIG_CRYPTO_MANAGER=y
801CONFIG_CRYPTO_HMAC=y 852CONFIG_CRYPTO_HMAC=y
802CONFIG_CRYPTO_NULL=m 853CONFIG_CRYPTO_NULL=m
803CONFIG_CRYPTO_MD4=m 854CONFIG_CRYPTO_MD4=m
@@ -807,9 +858,14 @@ CONFIG_CRYPTO_SHA256=m
807CONFIG_CRYPTO_SHA512=m 858CONFIG_CRYPTO_SHA512=m
808CONFIG_CRYPTO_WP512=m 859CONFIG_CRYPTO_WP512=m
809CONFIG_CRYPTO_TGR192=m 860CONFIG_CRYPTO_TGR192=m
861CONFIG_CRYPTO_ECB=m
862CONFIG_CRYPTO_CBC=m
863CONFIG_CRYPTO_PCBC=m
810CONFIG_CRYPTO_DES=m 864CONFIG_CRYPTO_DES=m
865CONFIG_CRYPTO_FCRYPT=m
811CONFIG_CRYPTO_BLOWFISH=m 866CONFIG_CRYPTO_BLOWFISH=m
812CONFIG_CRYPTO_TWOFISH=m 867CONFIG_CRYPTO_TWOFISH=m
868CONFIG_CRYPTO_TWOFISH_COMMON=m
813CONFIG_CRYPTO_SERPENT=m 869CONFIG_CRYPTO_SERPENT=m
814CONFIG_CRYPTO_AES=m 870CONFIG_CRYPTO_AES=m
815CONFIG_CRYPTO_CAST5=m 871CONFIG_CRYPTO_CAST5=m
@@ -821,6 +877,7 @@ CONFIG_CRYPTO_ANUBIS=m
821CONFIG_CRYPTO_DEFLATE=m 877CONFIG_CRYPTO_DEFLATE=m
822CONFIG_CRYPTO_MICHAEL_MIC=m 878CONFIG_CRYPTO_MICHAEL_MIC=m
823CONFIG_CRYPTO_CRC32C=m 879CONFIG_CRYPTO_CRC32C=m
880CONFIG_CRYPTO_CAMELLIA=m
824# CONFIG_CRYPTO_TEST is not set 881# CONFIG_CRYPTO_TEST is not set
825 882
826# 883#
@@ -830,6 +887,7 @@ CONFIG_CRYPTO_CRC32C=m
830# 887#
831# Library routines 888# Library routines
832# 889#
890CONFIG_BITREVERSE=m
833# CONFIG_CRC_CCITT is not set 891# CONFIG_CRC_CCITT is not set
834CONFIG_CRC16=m 892CONFIG_CRC16=m
835CONFIG_CRC32=m 893CONFIG_CRC32=m
@@ -837,3 +895,5 @@ CONFIG_LIBCRC32C=m
837CONFIG_ZLIB_INFLATE=m 895CONFIG_ZLIB_INFLATE=m
838CONFIG_ZLIB_DEFLATE=m 896CONFIG_ZLIB_DEFLATE=m
839CONFIG_PLIST=y 897CONFIG_PLIST=y
898CONFIG_HAS_IOMEM=y
899CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig
index 835764d834f7..dacf0a618d57 100644
--- a/arch/mips/configs/jazz_defconfig
+++ b/arch/mips/configs/jazz_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc1 3# Linux kernel version: 2.6.20
4# Sun Oct 8 19:03:07 2006 4# Sun Feb 18 21:27:52 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -40,6 +41,7 @@ CONFIG_MACH_JAZZ=y
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -65,11 +67,14 @@ CONFIG_MACH_JAZZ=y
65# CONFIG_MIPS_MAGNUM_4000 is not set 67# CONFIG_MIPS_MAGNUM_4000 is not set
66CONFIG_OLIVETTI_M700=y 68CONFIG_OLIVETTI_M700=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 69CONFIG_RWSEM_GENERIC_SPINLOCK=y
70# CONFIG_ARCH_HAS_ILOG2_U32 is not set
71# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 72CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 73CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 74CONFIG_GENERIC_CALIBRATE_DELAY=y
71CONFIG_GENERIC_TIME=y 75CONFIG_GENERIC_TIME=y
72CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
77CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
73CONFIG_ARC=y 78CONFIG_ARC=y
74CONFIG_ARCH_MAY_HAVE_PC_FDC=y 79CONFIG_ARCH_MAY_HAVE_PC_FDC=y
75CONFIG_DMA_NONCOHERENT=y 80CONFIG_DMA_NONCOHERENT=y
@@ -140,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
140# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
141CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
142# CONFIG_RESOURCES_64BIT is not set 147# CONFIG_RESOURCES_64BIT is not set
148CONFIG_ZONE_DMA_FLAG=1
143# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
144CONFIG_HZ_100=y 150CONFIG_HZ_100=y
145# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -152,6 +158,7 @@ CONFIG_HZ=100
152# CONFIG_PREEMPT_NONE is not set 158# CONFIG_PREEMPT_NONE is not set
153CONFIG_PREEMPT_VOLUNTARY=y 159CONFIG_PREEMPT_VOLUNTARY=y
154# CONFIG_PREEMPT is not set 160# CONFIG_PREEMPT is not set
161# CONFIG_KEXEC is not set
155CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
156CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,6 +178,7 @@ CONFIG_LOCALVERSION_AUTO=y
171CONFIG_SWAP=y 178CONFIG_SWAP=y
172CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set 180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
174CONFIG_POSIX_MQUEUE=y 182CONFIG_POSIX_MQUEUE=y
175CONFIG_BSD_PROCESS_ACCT=y 183CONFIG_BSD_PROCESS_ACCT=y
176# CONFIG_BSD_PROCESS_ACCT_V3 is not set 184# CONFIG_BSD_PROCESS_ACCT_V3 is not set
@@ -179,8 +187,8 @@ CONFIG_BSD_PROCESS_ACCT=y
179# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
180CONFIG_IKCONFIG=y 188CONFIG_IKCONFIG=y
181CONFIG_IKCONFIG_PROC=y 189CONFIG_IKCONFIG_PROC=y
190CONFIG_SYSFS_DEPRECATED=y
182CONFIG_RELAY=y 191CONFIG_RELAY=y
183CONFIG_INITRAMFS_SOURCE=""
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 192# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y 193CONFIG_SYSCTL=y
186CONFIG_EMBEDDED=y 194CONFIG_EMBEDDED=y
@@ -257,6 +265,14 @@ CONFIG_BINFMT_MISC=m
257CONFIG_TRAD_SIGNALS=y 265CONFIG_TRAD_SIGNALS=y
258 266
259# 267#
268# Power management options
269#
270CONFIG_PM=y
271# CONFIG_PM_LEGACY is not set
272# CONFIG_PM_DEBUG is not set
273# CONFIG_PM_SYSFS_DEPRECATED is not set
274
275#
260# Networking 276# Networking
261# 277#
262CONFIG_NET=y 278CONFIG_NET=y
@@ -271,7 +287,9 @@ CONFIG_UNIX=y
271CONFIG_XFRM=y 287CONFIG_XFRM=y
272# CONFIG_XFRM_USER is not set 288# CONFIG_XFRM_USER is not set
273# CONFIG_XFRM_SUB_POLICY is not set 289# CONFIG_XFRM_SUB_POLICY is not set
290CONFIG_XFRM_MIGRATE=y
274CONFIG_NET_KEY=m 291CONFIG_NET_KEY=m
292CONFIG_NET_KEY_MIGRATE=y
275CONFIG_INET=y 293CONFIG_INET=y
276CONFIG_IP_MULTICAST=y 294CONFIG_IP_MULTICAST=y
277# CONFIG_IP_ADVANCED_ROUTER is not set 295# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -298,6 +316,7 @@ CONFIG_INET_TCP_DIAG=y
298# CONFIG_TCP_CONG_ADVANCED is not set 316# CONFIG_TCP_CONG_ADVANCED is not set
299CONFIG_TCP_CONG_CUBIC=y 317CONFIG_TCP_CONG_CUBIC=y
300CONFIG_DEFAULT_TCP_CONG="cubic" 318CONFIG_DEFAULT_TCP_CONG="cubic"
319CONFIG_TCP_MD5SIG=y
301 320
302# 321#
303# IP: Virtual Server Configuration 322# IP: Virtual Server Configuration
@@ -317,8 +336,8 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
317CONFIG_INET6_XFRM_MODE_TUNNEL=m 336CONFIG_INET6_XFRM_MODE_TUNNEL=m
318CONFIG_INET6_XFRM_MODE_BEET=m 337CONFIG_INET6_XFRM_MODE_BEET=m
319# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 338# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
339CONFIG_IPV6_SIT=m
320CONFIG_IPV6_TUNNEL=m 340CONFIG_IPV6_TUNNEL=m
321# CONFIG_IPV6_SUBTREES is not set
322# CONFIG_IPV6_MULTIPLE_TABLES is not set 341# CONFIG_IPV6_MULTIPLE_TABLES is not set
323CONFIG_NETWORK_SECMARK=y 342CONFIG_NETWORK_SECMARK=y
324CONFIG_NETFILTER=y 343CONFIG_NETFILTER=y
@@ -331,16 +350,39 @@ CONFIG_BRIDGE_NETFILTER=y
331CONFIG_NETFILTER_NETLINK=m 350CONFIG_NETFILTER_NETLINK=m
332CONFIG_NETFILTER_NETLINK_QUEUE=m 351CONFIG_NETFILTER_NETLINK_QUEUE=m
333CONFIG_NETFILTER_NETLINK_LOG=m 352CONFIG_NETFILTER_NETLINK_LOG=m
353CONFIG_NF_CONNTRACK_ENABLED=m
354CONFIG_NF_CONNTRACK_SUPPORT=y
355# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
356CONFIG_NF_CONNTRACK=m
357CONFIG_NF_CT_ACCT=y
358CONFIG_NF_CONNTRACK_MARK=y
359CONFIG_NF_CONNTRACK_SECMARK=y
360CONFIG_NF_CONNTRACK_EVENTS=y
361CONFIG_NF_CT_PROTO_GRE=m
362CONFIG_NF_CT_PROTO_SCTP=m
363CONFIG_NF_CONNTRACK_AMANDA=m
364CONFIG_NF_CONNTRACK_FTP=m
365CONFIG_NF_CONNTRACK_H323=m
366CONFIG_NF_CONNTRACK_IRC=m
367# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
368CONFIG_NF_CONNTRACK_PPTP=m
369CONFIG_NF_CONNTRACK_SANE=m
370CONFIG_NF_CONNTRACK_SIP=m
371CONFIG_NF_CONNTRACK_TFTP=m
372CONFIG_NF_CT_NETLINK=m
334CONFIG_NETFILTER_XTABLES=m 373CONFIG_NETFILTER_XTABLES=m
335CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 374CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
336CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 375CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
337# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 376# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
338CONFIG_NETFILTER_XT_TARGET_MARK=m 377CONFIG_NETFILTER_XT_TARGET_MARK=m
339CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 378CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
379CONFIG_NETFILTER_XT_TARGET_NFLOG=m
340CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 380CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
341CONFIG_NETFILTER_XT_TARGET_SECMARK=m 381CONFIG_NETFILTER_XT_TARGET_SECMARK=m
342# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 382# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
383CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
343CONFIG_NETFILTER_XT_MATCH_COMMENT=m 384CONFIG_NETFILTER_XT_MATCH_COMMENT=m
385CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
344CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 386CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
345CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 387CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
346CONFIG_NETFILTER_XT_MATCH_DCCP=m 388CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -362,25 +404,13 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
362CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 404CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
363CONFIG_NETFILTER_XT_MATCH_STRING=m 405CONFIG_NETFILTER_XT_MATCH_STRING=m
364CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 406CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
407CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
365 408
366# 409#
367# IP: Netfilter Configuration 410# IP: Netfilter Configuration
368# 411#
369CONFIG_IP_NF_CONNTRACK=m 412CONFIG_NF_CONNTRACK_IPV4=m
370# CONFIG_IP_NF_CT_ACCT is not set 413CONFIG_NF_CONNTRACK_PROC_COMPAT=y
371CONFIG_IP_NF_CONNTRACK_MARK=y
372CONFIG_IP_NF_CONNTRACK_SECMARK=y
373CONFIG_IP_NF_CONNTRACK_EVENTS=y
374CONFIG_IP_NF_CONNTRACK_NETLINK=m
375CONFIG_IP_NF_CT_PROTO_SCTP=m
376CONFIG_IP_NF_FTP=m
377CONFIG_IP_NF_IRC=m
378# CONFIG_IP_NF_NETBIOS_NS is not set
379CONFIG_IP_NF_TFTP=m
380CONFIG_IP_NF_AMANDA=m
381CONFIG_IP_NF_PPTP=m
382CONFIG_IP_NF_H323=m
383CONFIG_IP_NF_SIP=m
384CONFIG_IP_NF_QUEUE=m 414CONFIG_IP_NF_QUEUE=m
385CONFIG_IP_NF_IPTABLES=m 415CONFIG_IP_NF_IPTABLES=m
386CONFIG_IP_NF_MATCH_IPRANGE=m 416CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -391,26 +421,25 @@ CONFIG_IP_NF_MATCH_AH=m
391CONFIG_IP_NF_MATCH_TTL=m 421CONFIG_IP_NF_MATCH_TTL=m
392CONFIG_IP_NF_MATCH_OWNER=m 422CONFIG_IP_NF_MATCH_OWNER=m
393CONFIG_IP_NF_MATCH_ADDRTYPE=m 423CONFIG_IP_NF_MATCH_ADDRTYPE=m
394CONFIG_IP_NF_MATCH_HASHLIMIT=m
395CONFIG_IP_NF_FILTER=m 424CONFIG_IP_NF_FILTER=m
396CONFIG_IP_NF_TARGET_REJECT=m 425CONFIG_IP_NF_TARGET_REJECT=m
397CONFIG_IP_NF_TARGET_LOG=m 426CONFIG_IP_NF_TARGET_LOG=m
398CONFIG_IP_NF_TARGET_ULOG=m 427CONFIG_IP_NF_TARGET_ULOG=m
399CONFIG_IP_NF_TARGET_TCPMSS=m 428CONFIG_NF_NAT=m
400CONFIG_IP_NF_NAT=m 429CONFIG_NF_NAT_NEEDED=y
401CONFIG_IP_NF_NAT_NEEDED=y
402CONFIG_IP_NF_TARGET_MASQUERADE=m 430CONFIG_IP_NF_TARGET_MASQUERADE=m
403CONFIG_IP_NF_TARGET_REDIRECT=m 431CONFIG_IP_NF_TARGET_REDIRECT=m
404CONFIG_IP_NF_TARGET_NETMAP=m 432CONFIG_IP_NF_TARGET_NETMAP=m
405CONFIG_IP_NF_TARGET_SAME=m 433CONFIG_IP_NF_TARGET_SAME=m
406CONFIG_IP_NF_NAT_SNMP_BASIC=m 434CONFIG_NF_NAT_SNMP_BASIC=m
407CONFIG_IP_NF_NAT_IRC=m 435CONFIG_NF_NAT_PROTO_GRE=m
408CONFIG_IP_NF_NAT_FTP=m 436CONFIG_NF_NAT_FTP=m
409CONFIG_IP_NF_NAT_TFTP=m 437CONFIG_NF_NAT_IRC=m
410CONFIG_IP_NF_NAT_AMANDA=m 438CONFIG_NF_NAT_TFTP=m
411CONFIG_IP_NF_NAT_PPTP=m 439CONFIG_NF_NAT_AMANDA=m
412CONFIG_IP_NF_NAT_H323=m 440CONFIG_NF_NAT_PPTP=m
413CONFIG_IP_NF_NAT_SIP=m 441CONFIG_NF_NAT_H323=m
442CONFIG_NF_NAT_SIP=m
414CONFIG_IP_NF_MANGLE=m 443CONFIG_IP_NF_MANGLE=m
415CONFIG_IP_NF_TARGET_TOS=m 444CONFIG_IP_NF_TARGET_TOS=m
416CONFIG_IP_NF_TARGET_ECN=m 445CONFIG_IP_NF_TARGET_ECN=m
@@ -424,6 +453,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
424# 453#
425# IPv6: Netfilter Configuration (EXPERIMENTAL) 454# IPv6: Netfilter Configuration (EXPERIMENTAL)
426# 455#
456CONFIG_NF_CONNTRACK_IPV6=m
427CONFIG_IP6_NF_QUEUE=m 457CONFIG_IP6_NF_QUEUE=m
428CONFIG_IP6_NF_IPTABLES=m 458CONFIG_IP6_NF_IPTABLES=m
429CONFIG_IP6_NF_MATCH_RT=m 459CONFIG_IP6_NF_MATCH_RT=m
@@ -433,6 +463,7 @@ CONFIG_IP6_NF_MATCH_HL=m
433CONFIG_IP6_NF_MATCH_OWNER=m 463CONFIG_IP6_NF_MATCH_OWNER=m
434CONFIG_IP6_NF_MATCH_IPV6HEADER=m 464CONFIG_IP6_NF_MATCH_IPV6HEADER=m
435CONFIG_IP6_NF_MATCH_AH=m 465CONFIG_IP6_NF_MATCH_AH=m
466CONFIG_IP6_NF_MATCH_MH=m
436CONFIG_IP6_NF_MATCH_EUI64=m 467CONFIG_IP6_NF_MATCH_EUI64=m
437CONFIG_IP6_NF_FILTER=m 468CONFIG_IP6_NF_FILTER=m
438CONFIG_IP6_NF_TARGET_LOG=m 469CONFIG_IP6_NF_TARGET_LOG=m
@@ -502,6 +533,7 @@ CONFIG_LLC=m
502# QoS and/or fair queueing 533# QoS and/or fair queueing
503# 534#
504CONFIG_NET_SCHED=y 535CONFIG_NET_SCHED=y
536CONFIG_NET_SCH_FIFO=y
505CONFIG_NET_SCH_CLK_JIFFIES=y 537CONFIG_NET_SCH_CLK_JIFFIES=y
506# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 538# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
507# CONFIG_NET_SCH_CLK_CPU is not set 539# CONFIG_NET_SCH_CLK_CPU is not set
@@ -620,7 +652,6 @@ CONFIG_PARPORT_1284=y
620# 652#
621CONFIG_BLK_DEV_FD=m 653CONFIG_BLK_DEV_FD=m
622CONFIG_PARIDE=m 654CONFIG_PARIDE=m
623CONFIG_PARIDE_PARPORT=m
624 655
625# 656#
626# Parallel IDE high-level drivers 657# Parallel IDE high-level drivers
@@ -665,6 +696,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
665CONFIG_ATA_OVER_ETH=m 696CONFIG_ATA_OVER_ETH=m
666 697
667# 698#
699# Misc devices
700#
701
702#
668# ATA/ATAPI/MFM/RLL support 703# ATA/ATAPI/MFM/RLL support
669# 704#
670# CONFIG_IDE is not set 705# CONFIG_IDE is not set
@@ -674,6 +709,7 @@ CONFIG_ATA_OVER_ETH=m
674# 709#
675CONFIG_RAID_ATTRS=m 710CONFIG_RAID_ATTRS=m
676CONFIG_SCSI=y 711CONFIG_SCSI=y
712CONFIG_SCSI_TGT=m
677CONFIG_SCSI_NETLINK=y 713CONFIG_SCSI_NETLINK=y
678CONFIG_SCSI_PROC_FS=y 714CONFIG_SCSI_PROC_FS=y
679 715
@@ -694,6 +730,7 @@ CONFIG_BLK_DEV_SR_VENDOR=y
694# CONFIG_SCSI_MULTI_LUN is not set 730# CONFIG_SCSI_MULTI_LUN is not set
695CONFIG_SCSI_CONSTANTS=y 731CONFIG_SCSI_CONSTANTS=y
696# CONFIG_SCSI_LOGGING is not set 732# CONFIG_SCSI_LOGGING is not set
733CONFIG_SCSI_SCAN_ASYNC=y
697 734
698# 735#
699# SCSI Transports 736# SCSI Transports
@@ -802,6 +839,7 @@ CONFIG_LXT_PHY=m
802CONFIG_CICADA_PHY=m 839CONFIG_CICADA_PHY=m
803CONFIG_VITESSE_PHY=m 840CONFIG_VITESSE_PHY=m
804CONFIG_SMSC_PHY=m 841CONFIG_SMSC_PHY=m
842# CONFIG_BROADCOM_PHY is not set
805# CONFIG_FIXED_PHY is not set 843# CONFIG_FIXED_PHY is not set
806 844
807# 845#
@@ -832,7 +870,6 @@ CONFIG_NET_PCI=y
832# CONFIG_AC3200 is not set 870# CONFIG_AC3200 is not set
833# CONFIG_APRICOT is not set 871# CONFIG_APRICOT is not set
834# CONFIG_CS89x0 is not set 872# CONFIG_CS89x0 is not set
835# CONFIG_LAN_SAA9730 is not set
836# CONFIG_NET_POCKET is not set 873# CONFIG_NET_POCKET is not set
837 874
838# 875#
@@ -972,17 +1009,12 @@ CONFIG_RTC=m
972# CONFIG_GEN_RTC is not set 1009# CONFIG_GEN_RTC is not set
973# CONFIG_DTLK is not set 1010# CONFIG_DTLK is not set
974# CONFIG_R3964 is not set 1011# CONFIG_R3964 is not set
975
976#
977# Ftape, the floppy tape device driver
978#
979# CONFIG_RAW_DRIVER is not set 1012# CONFIG_RAW_DRIVER is not set
980 1013
981# 1014#
982# TPM devices 1015# TPM devices
983# 1016#
984# CONFIG_TCG_TPM is not set 1017# CONFIG_TCG_TPM is not set
985# CONFIG_TELCLOCK is not set
986 1018
987# 1019#
988# I2C support 1020# I2C support
@@ -1019,11 +1051,6 @@ CONFIG_W1_CON=y
1019# CONFIG_HWMON_VID is not set 1051# CONFIG_HWMON_VID is not set
1020 1052
1021# 1053#
1022# Misc devices
1023#
1024# CONFIG_TIFM_CORE is not set
1025
1026#
1027# Multimedia devices 1054# Multimedia devices
1028# 1055#
1029# CONFIG_VIDEO_DEV is not set 1056# CONFIG_VIDEO_DEV is not set
@@ -1054,6 +1081,12 @@ CONFIG_DUMMY_CONSOLE=y
1054# CONFIG_SOUND is not set 1081# CONFIG_SOUND is not set
1055 1082
1056# 1083#
1084# HID Devices
1085#
1086CONFIG_HID=y
1087# CONFIG_HID_DEBUG is not set
1088
1089#
1057# USB support 1090# USB support
1058# 1091#
1059# CONFIG_USB_ARCH_HAS_HCD is not set 1092# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -1114,6 +1147,15 @@ CONFIG_DUMMY_CONSOLE=y
1114# 1147#
1115 1148
1116# 1149#
1150# Auxiliary Display support
1151#
1152# CONFIG_KS0108 is not set
1153
1154#
1155# Virtualization
1156#
1157
1158#
1117# File systems 1159# File systems
1118# 1160#
1119CONFIG_EXT2_FS=m 1161CONFIG_EXT2_FS=m
@@ -1123,6 +1165,7 @@ CONFIG_EXT3_FS=y
1123CONFIG_EXT3_FS_XATTR=y 1165CONFIG_EXT3_FS_XATTR=y
1124# CONFIG_EXT3_FS_POSIX_ACL is not set 1166# CONFIG_EXT3_FS_POSIX_ACL is not set
1125# CONFIG_EXT3_FS_SECURITY is not set 1167# CONFIG_EXT3_FS_SECURITY is not set
1168# CONFIG_EXT4DEV_FS is not set
1126CONFIG_JBD=y 1169CONFIG_JBD=y
1127# CONFIG_JBD_DEBUG is not set 1170# CONFIG_JBD_DEBUG is not set
1128CONFIG_FS_MBCACHE=y 1171CONFIG_FS_MBCACHE=y
@@ -1158,7 +1201,6 @@ CONFIG_FUSE_FS=m
1158CONFIG_ISO9660_FS=m 1201CONFIG_ISO9660_FS=m
1159CONFIG_JOLIET=y 1202CONFIG_JOLIET=y
1160CONFIG_ZISOFS=y 1203CONFIG_ZISOFS=y
1161CONFIG_ZISOFS_FS=m
1162CONFIG_UDF_FS=m 1204CONFIG_UDF_FS=m
1163CONFIG_UDF_NLS=y 1205CONFIG_UDF_NLS=y
1164 1206
@@ -1185,7 +1227,7 @@ CONFIG_TMPFS=y
1185# CONFIG_TMPFS_POSIX_ACL is not set 1227# CONFIG_TMPFS_POSIX_ACL is not set
1186# CONFIG_HUGETLB_PAGE is not set 1228# CONFIG_HUGETLB_PAGE is not set
1187CONFIG_RAMFS=y 1229CONFIG_RAMFS=y
1188# CONFIG_CONFIGFS_FS is not set 1230CONFIG_CONFIGFS_FS=m
1189 1231
1190# 1232#
1191# Miscellaneous filesystems 1233# Miscellaneous filesystems
@@ -1321,6 +1363,10 @@ CONFIG_NLS_UTF8=m
1321# 1363#
1322# Distributed Lock Manager 1364# Distributed Lock Manager
1323# 1365#
1366CONFIG_DLM=m
1367CONFIG_DLM_TCP=y
1368# CONFIG_DLM_SCTP is not set
1369# CONFIG_DLM_DEBUG is not set
1324 1370
1325# 1371#
1326# Profiling support 1372# Profiling support
@@ -1335,9 +1381,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1335CONFIG_ENABLE_MUST_CHECK=y 1381CONFIG_ENABLE_MUST_CHECK=y
1336# CONFIG_MAGIC_SYSRQ is not set 1382# CONFIG_MAGIC_SYSRQ is not set
1337# CONFIG_UNUSED_SYMBOLS is not set 1383# CONFIG_UNUSED_SYMBOLS is not set
1384# CONFIG_DEBUG_FS is not set
1385# CONFIG_HEADERS_CHECK is not set
1338# CONFIG_DEBUG_KERNEL is not set 1386# CONFIG_DEBUG_KERNEL is not set
1339CONFIG_LOG_BUF_SHIFT=14 1387CONFIG_LOG_BUF_SHIFT=14
1340# CONFIG_DEBUG_FS is not set
1341CONFIG_CROSSCOMPILE=y 1388CONFIG_CROSSCOMPILE=y
1342CONFIG_CMDLINE="" 1389CONFIG_CMDLINE=""
1343 1390
@@ -1355,19 +1402,24 @@ CONFIG_CRYPTO=y
1355CONFIG_CRYPTO_ALGAPI=y 1402CONFIG_CRYPTO_ALGAPI=y
1356CONFIG_CRYPTO_BLKCIPHER=m 1403CONFIG_CRYPTO_BLKCIPHER=m
1357CONFIG_CRYPTO_HASH=y 1404CONFIG_CRYPTO_HASH=y
1358CONFIG_CRYPTO_MANAGER=m 1405CONFIG_CRYPTO_MANAGER=y
1359CONFIG_CRYPTO_HMAC=y 1406CONFIG_CRYPTO_HMAC=y
1407CONFIG_CRYPTO_XCBC=m
1360CONFIG_CRYPTO_NULL=m 1408CONFIG_CRYPTO_NULL=m
1361CONFIG_CRYPTO_MD4=m 1409CONFIG_CRYPTO_MD4=m
1362CONFIG_CRYPTO_MD5=m 1410CONFIG_CRYPTO_MD5=y
1363CONFIG_CRYPTO_SHA1=m 1411CONFIG_CRYPTO_SHA1=m
1364CONFIG_CRYPTO_SHA256=m 1412CONFIG_CRYPTO_SHA256=m
1365CONFIG_CRYPTO_SHA512=m 1413CONFIG_CRYPTO_SHA512=m
1366CONFIG_CRYPTO_WP512=m 1414CONFIG_CRYPTO_WP512=m
1367CONFIG_CRYPTO_TGR192=m 1415CONFIG_CRYPTO_TGR192=m
1416CONFIG_CRYPTO_GF128MUL=m
1368CONFIG_CRYPTO_ECB=m 1417CONFIG_CRYPTO_ECB=m
1369CONFIG_CRYPTO_CBC=m 1418CONFIG_CRYPTO_CBC=m
1419CONFIG_CRYPTO_PCBC=m
1420CONFIG_CRYPTO_LRW=m
1370CONFIG_CRYPTO_DES=m 1421CONFIG_CRYPTO_DES=m
1422CONFIG_CRYPTO_FCRYPT=m
1371CONFIG_CRYPTO_BLOWFISH=m 1423CONFIG_CRYPTO_BLOWFISH=m
1372CONFIG_CRYPTO_TWOFISH=m 1424CONFIG_CRYPTO_TWOFISH=m
1373CONFIG_CRYPTO_TWOFISH_COMMON=m 1425CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1382,6 +1434,7 @@ CONFIG_CRYPTO_ANUBIS=m
1382CONFIG_CRYPTO_DEFLATE=m 1434CONFIG_CRYPTO_DEFLATE=m
1383CONFIG_CRYPTO_MICHAEL_MIC=m 1435CONFIG_CRYPTO_MICHAEL_MIC=m
1384CONFIG_CRYPTO_CRC32C=m 1436CONFIG_CRYPTO_CRC32C=m
1437CONFIG_CRYPTO_CAMELLIA=m
1385# CONFIG_CRYPTO_TEST is not set 1438# CONFIG_CRYPTO_TEST is not set
1386 1439
1387# 1440#
@@ -1391,6 +1444,7 @@ CONFIG_CRYPTO_CRC32C=m
1391# 1444#
1392# Library routines 1445# Library routines
1393# 1446#
1447CONFIG_BITREVERSE=y
1394CONFIG_CRC_CCITT=m 1448CONFIG_CRC_CCITT=m
1395CONFIG_CRC16=m 1449CONFIG_CRC16=m
1396CONFIG_CRC32=y 1450CONFIG_CRC32=y
@@ -1402,3 +1456,5 @@ CONFIG_TEXTSEARCH_KMP=m
1402CONFIG_TEXTSEARCH_BM=m 1456CONFIG_TEXTSEARCH_BM=m
1403CONFIG_TEXTSEARCH_FSM=m 1457CONFIG_TEXTSEARCH_FSM=m
1404CONFIG_PLIST=y 1458CONFIG_PLIST=y
1459CONFIG_HAS_IOMEM=y
1460CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 50fd9557e646..29ed772455f1 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:12 2006 4# Sun Feb 18 21:27:53 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +64,20 @@ CONFIG_TOSHIBA_JMR3927=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
74# CONFIG_CPU_LITTLE_ENDIAN is not set 78# CONFIG_CPU_LITTLE_ENDIAN is not set
75CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 79CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_MIPS_TX3927=y 81CONFIG_MIPS_TX3927=y
77CONFIG_SWAP_IO_SPACE=y 82CONFIG_SWAP_IO_SPACE=y
78CONFIG_MIPS_L1_CACHE_SHIFT=5 83CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -114,8 +119,8 @@ CONFIG_PAGE_SIZE_4KB=y
114# CONFIG_PAGE_SIZE_16KB is not set 119# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set 120# CONFIG_PAGE_SIZE_64KB is not set
116CONFIG_MIPS_MT_DISABLED=y 121CONFIG_MIPS_MT_DISABLED=y
117# CONFIG_MIPS_MT_SMTC is not set
118# CONFIG_MIPS_MT_SMP is not set 122# CONFIG_MIPS_MT_SMP is not set
123# CONFIG_MIPS_MT_SMTC is not set
119# CONFIG_MIPS_VPE_LOADER is not set 124# CONFIG_MIPS_VPE_LOADER is not set
120CONFIG_CPU_HAS_SYNC=y 125CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
@@ -130,6 +135,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
130# CONFIG_SPARSEMEM_STATIC is not set 135# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4 136CONFIG_SPLIT_PTLOCK_CPUS=4
132# CONFIG_RESOURCES_64BIT is not set 137# CONFIG_RESOURCES_64BIT is not set
138CONFIG_ZONE_DMA_FLAG=1
133# CONFIG_HZ_48 is not set 139# CONFIG_HZ_48 is not set
134# CONFIG_HZ_100 is not set 140# CONFIG_HZ_100 is not set
135# CONFIG_HZ_128 is not set 141# CONFIG_HZ_128 is not set
@@ -143,6 +149,7 @@ CONFIG_PREEMPT_NONE=y
143# CONFIG_PREEMPT_VOLUNTARY is not set 149# CONFIG_PREEMPT_VOLUNTARY is not set
144# CONFIG_PREEMPT is not set 150# CONFIG_PREEMPT is not set
145CONFIG_RTC_DS1742=y 151CONFIG_RTC_DS1742=y
152# CONFIG_KEXEC is not set
146CONFIG_LOCKDEP_SUPPORT=y 153CONFIG_LOCKDEP_SUPPORT=y
147CONFIG_STACKTRACE_SUPPORT=y 154CONFIG_STACKTRACE_SUPPORT=y
148CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 155CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -161,15 +168,20 @@ CONFIG_LOCALVERSION=""
161CONFIG_LOCALVERSION_AUTO=y 168CONFIG_LOCALVERSION_AUTO=y
162CONFIG_SWAP=y 169CONFIG_SWAP=y
163CONFIG_SYSVIPC=y 170CONFIG_SYSVIPC=y
171# CONFIG_IPC_NS is not set
172CONFIG_SYSVIPC_SYSCTL=y
164# CONFIG_POSIX_MQUEUE is not set 173# CONFIG_POSIX_MQUEUE is not set
165# CONFIG_BSD_PROCESS_ACCT is not set 174# CONFIG_BSD_PROCESS_ACCT is not set
166CONFIG_SYSCTL=y 175# CONFIG_TASKSTATS is not set
176# CONFIG_UTS_NS is not set
167# CONFIG_AUDIT is not set 177# CONFIG_AUDIT is not set
168# CONFIG_IKCONFIG is not set 178# CONFIG_IKCONFIG is not set
179CONFIG_SYSFS_DEPRECATED=y
169CONFIG_RELAY=y 180CONFIG_RELAY=y
170CONFIG_INITRAMFS_SOURCE=""
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 181# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
182CONFIG_SYSCTL=y
172CONFIG_EMBEDDED=y 183CONFIG_EMBEDDED=y
184CONFIG_SYSCTL_SYSCALL=y
173CONFIG_KALLSYMS=y 185CONFIG_KALLSYMS=y
174# CONFIG_KALLSYMS_EXTRA_PASS is not set 186# CONFIG_KALLSYMS_EXTRA_PASS is not set
175CONFIG_HOTPLUG=y 187CONFIG_HOTPLUG=y
@@ -177,12 +189,12 @@ CONFIG_PRINTK=y
177CONFIG_BUG=y 189CONFIG_BUG=y
178CONFIG_ELF_CORE=y 190CONFIG_ELF_CORE=y
179CONFIG_BASE_FULL=y 191CONFIG_BASE_FULL=y
180CONFIG_RT_MUTEXES=y
181CONFIG_FUTEX=y 192CONFIG_FUTEX=y
182CONFIG_EPOLL=y 193CONFIG_EPOLL=y
183CONFIG_SHMEM=y 194CONFIG_SHMEM=y
184CONFIG_SLAB=y 195CONFIG_SLAB=y
185CONFIG_VM_EVENT_COUNTERS=y 196CONFIG_VM_EVENT_COUNTERS=y
197CONFIG_RT_MUTEXES=y
186# CONFIG_TINY_SHMEM is not set 198# CONFIG_TINY_SHMEM is not set
187CONFIG_BASE_SMALL=0 199CONFIG_BASE_SMALL=0
188# CONFIG_SLOB is not set 200# CONFIG_SLOB is not set
@@ -195,6 +207,7 @@ CONFIG_BASE_SMALL=0
195# 207#
196# Block layer 208# Block layer
197# 209#
210CONFIG_BLOCK=y
198# CONFIG_LBD is not set 211# CONFIG_LBD is not set
199# CONFIG_BLK_DEV_IO_TRACE is not set 212# CONFIG_BLK_DEV_IO_TRACE is not set
200# CONFIG_LSF is not set 213# CONFIG_LSF is not set
@@ -237,6 +250,14 @@ CONFIG_BINFMT_ELF=y
237CONFIG_TRAD_SIGNALS=y 250CONFIG_TRAD_SIGNALS=y
238 251
239# 252#
253# Power management options
254#
255CONFIG_PM=y
256# CONFIG_PM_LEGACY is not set
257# CONFIG_PM_DEBUG is not set
258# CONFIG_PM_SYSFS_DEPRECATED is not set
259
260#
240# Networking 261# Networking
241# 262#
242CONFIG_NET=y 263CONFIG_NET=y
@@ -250,7 +271,10 @@ CONFIG_PACKET=y
250CONFIG_UNIX=y 271CONFIG_UNIX=y
251CONFIG_XFRM=y 272CONFIG_XFRM=y
252CONFIG_XFRM_USER=y 273CONFIG_XFRM_USER=y
274# CONFIG_XFRM_SUB_POLICY is not set
275CONFIG_XFRM_MIGRATE=y
253CONFIG_NET_KEY=y 276CONFIG_NET_KEY=y
277CONFIG_NET_KEY_MIGRATE=y
254CONFIG_INET=y 278CONFIG_INET=y
255# CONFIG_IP_MULTICAST is not set 279# CONFIG_IP_MULTICAST is not set
256# CONFIG_IP_ADVANCED_ROUTER is not set 280# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -270,10 +294,13 @@ CONFIG_IP_PNP_BOOTP=y
270# CONFIG_INET_TUNNEL is not set 294# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_XFRM_MODE_TRANSPORT=y 295CONFIG_INET_XFRM_MODE_TRANSPORT=y
272CONFIG_INET_XFRM_MODE_TUNNEL=y 296CONFIG_INET_XFRM_MODE_TUNNEL=y
297CONFIG_INET_XFRM_MODE_BEET=y
273CONFIG_INET_DIAG=y 298CONFIG_INET_DIAG=y
274CONFIG_INET_TCP_DIAG=y 299CONFIG_INET_TCP_DIAG=y
275# CONFIG_TCP_CONG_ADVANCED is not set 300# CONFIG_TCP_CONG_ADVANCED is not set
276CONFIG_TCP_CONG_BIC=y 301CONFIG_TCP_CONG_CUBIC=y
302CONFIG_DEFAULT_TCP_CONG="cubic"
303CONFIG_TCP_MD5SIG=y
277# CONFIG_IPV6 is not set 304# CONFIG_IPV6 is not set
278# CONFIG_INET6_XFRM_TUNNEL is not set 305# CONFIG_INET6_XFRM_TUNNEL is not set
279# CONFIG_INET6_TUNNEL is not set 306# CONFIG_INET6_TUNNEL is not set
@@ -303,7 +330,6 @@ CONFIG_NETWORK_SECMARK=y
303# CONFIG_ATALK is not set 330# CONFIG_ATALK is not set
304# CONFIG_X25 is not set 331# CONFIG_X25 is not set
305# CONFIG_LAPB is not set 332# CONFIG_LAPB is not set
306# CONFIG_NET_DIVERT is not set
307# CONFIG_ECONET is not set 333# CONFIG_ECONET is not set
308# CONFIG_WAN_ROUTER is not set 334# CONFIG_WAN_ROUTER is not set
309 335
@@ -378,6 +404,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
378CONFIG_ATA_OVER_ETH=y 404CONFIG_ATA_OVER_ETH=y
379 405
380# 406#
407# Misc devices
408#
409CONFIG_SGI_IOC4=y
410# CONFIG_TIFM_CORE is not set
411
412#
381# ATA/ATAPI/MFM/RLL support 413# ATA/ATAPI/MFM/RLL support
382# 414#
383# CONFIG_IDE is not set 415# CONFIG_IDE is not set
@@ -387,6 +419,12 @@ CONFIG_ATA_OVER_ETH=y
387# 419#
388CONFIG_RAID_ATTRS=y 420CONFIG_RAID_ATTRS=y
389# CONFIG_SCSI is not set 421# CONFIG_SCSI is not set
422# CONFIG_SCSI_NETLINK is not set
423
424#
425# Serial ATA (prod) and Parallel ATA (experimental) drivers
426#
427# CONFIG_ATA is not set
390 428
391# 429#
392# Multi-device support (RAID and LVM) 430# Multi-device support (RAID and LVM)
@@ -437,6 +475,8 @@ CONFIG_LXT_PHY=y
437CONFIG_CICADA_PHY=y 475CONFIG_CICADA_PHY=y
438CONFIG_VITESSE_PHY=y 476CONFIG_VITESSE_PHY=y
439CONFIG_SMSC_PHY=y 477CONFIG_SMSC_PHY=y
478# CONFIG_BROADCOM_PHY is not set
479# CONFIG_FIXED_PHY is not set
440 480
441# 481#
442# Ethernet (10 or 100Mbit) 482# Ethernet (10 or 100Mbit)
@@ -472,14 +512,17 @@ CONFIG_NET_ETHERNET=y
472# CONFIG_SK98LIN is not set 512# CONFIG_SK98LIN is not set
473# CONFIG_TIGON3 is not set 513# CONFIG_TIGON3 is not set
474# CONFIG_BNX2 is not set 514# CONFIG_BNX2 is not set
515CONFIG_QLA3XXX=y
475 516
476# 517#
477# Ethernet (10000 Mbit) 518# Ethernet (10000 Mbit)
478# 519#
479# CONFIG_CHELSIO_T1 is not set 520# CONFIG_CHELSIO_T1 is not set
521CONFIG_CHELSIO_T3=y
480# CONFIG_IXGB is not set 522# CONFIG_IXGB is not set
481# CONFIG_S2IO is not set 523# CONFIG_S2IO is not set
482# CONFIG_MYRI10GE is not set 524# CONFIG_MYRI10GE is not set
525CONFIG_NETXEN_NIC=y
483 526
484# 527#
485# Token Ring devices 528# Token Ring devices
@@ -518,6 +561,7 @@ CONFIG_NET_ETHERNET=y
518# Input device support 561# Input device support
519# 562#
520CONFIG_INPUT=y 563CONFIG_INPUT=y
564# CONFIG_INPUT_FF_MEMLESS is not set
521 565
522# 566#
523# Userland interfaces 567# Userland interfaces
@@ -565,6 +609,7 @@ CONFIG_SERIAL_NONSTANDARD=y
565# CONFIG_DIGIEPCA is not set 609# CONFIG_DIGIEPCA is not set
566# CONFIG_MOXA_INTELLIO is not set 610# CONFIG_MOXA_INTELLIO is not set
567# CONFIG_MOXA_SMARTIO is not set 611# CONFIG_MOXA_SMARTIO is not set
612CONFIG_MOXA_SMARTIO_NEW=y
568# CONFIG_ISI is not set 613# CONFIG_ISI is not set
569# CONFIG_SYNCLINKMP is not set 614# CONFIG_SYNCLINKMP is not set
570# CONFIG_SYNCLINK_GT is not set 615# CONFIG_SYNCLINK_GT is not set
@@ -586,6 +631,7 @@ CONFIG_SERIAL_NONSTANDARD=y
586CONFIG_SERIAL_CORE=y 631CONFIG_SERIAL_CORE=y
587CONFIG_SERIAL_TXX9=y 632CONFIG_SERIAL_TXX9=y
588CONFIG_HAS_TXX9_SERIAL=y 633CONFIG_HAS_TXX9_SERIAL=y
634CONFIG_SERIAL_TXX9_NR_UARTS=6
589# CONFIG_SERIAL_TXX9_CONSOLE is not set 635# CONFIG_SERIAL_TXX9_CONSOLE is not set
590# CONFIG_SERIAL_TXX9_STDSERIAL is not set 636# CONFIG_SERIAL_TXX9_STDSERIAL is not set
591# CONFIG_SERIAL_JSM is not set 637# CONFIG_SERIAL_JSM is not set
@@ -608,10 +654,6 @@ CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_DTLK is not set 654# CONFIG_DTLK is not set
609# CONFIG_R3964 is not set 655# CONFIG_R3964 is not set
610# CONFIG_APPLICOM is not set 656# CONFIG_APPLICOM is not set
611
612#
613# Ftape, the floppy tape device driver
614#
615# CONFIG_DRM is not set 657# CONFIG_DRM is not set
616# CONFIG_RAW_DRIVER is not set 658# CONFIG_RAW_DRIVER is not set
617 659
@@ -619,7 +661,6 @@ CONFIG_LEGACY_PTY_COUNT=256
619# TPM devices 661# TPM devices
620# 662#
621# CONFIG_TCG_TPM is not set 663# CONFIG_TCG_TPM is not set
622# CONFIG_TELCLOCK is not set
623 664
624# 665#
625# I2C support 666# I2C support
@@ -644,14 +685,9 @@ CONFIG_LEGACY_PTY_COUNT=256
644# CONFIG_HWMON_VID is not set 685# CONFIG_HWMON_VID is not set
645 686
646# 687#
647# Misc devices
648#
649
650#
651# Multimedia devices 688# Multimedia devices
652# 689#
653# CONFIG_VIDEO_DEV is not set 690# CONFIG_VIDEO_DEV is not set
654CONFIG_VIDEO_V4L2=y
655 691
656# 692#
657# Digital Video Broadcasting Devices 693# Digital Video Broadcasting Devices
@@ -666,6 +702,7 @@ CONFIG_FB=y
666# CONFIG_FB_CFB_FILLRECT is not set 702# CONFIG_FB_CFB_FILLRECT is not set
667# CONFIG_FB_CFB_COPYAREA is not set 703# CONFIG_FB_CFB_COPYAREA is not set
668# CONFIG_FB_CFB_IMAGEBLIT is not set 704# CONFIG_FB_CFB_IMAGEBLIT is not set
705# CONFIG_FB_SVGALIB is not set
669# CONFIG_FB_MACMODES is not set 706# CONFIG_FB_MACMODES is not set
670# CONFIG_FB_BACKLIGHT is not set 707# CONFIG_FB_BACKLIGHT is not set
671# CONFIG_FB_MODE_HELPERS is not set 708# CONFIG_FB_MODE_HELPERS is not set
@@ -682,6 +719,7 @@ CONFIG_FB=y
682# CONFIG_FB_RADEON is not set 719# CONFIG_FB_RADEON is not set
683# CONFIG_FB_ATY128 is not set 720# CONFIG_FB_ATY128 is not set
684# CONFIG_FB_ATY is not set 721# CONFIG_FB_ATY is not set
722# CONFIG_FB_S3 is not set
685# CONFIG_FB_SAVAGE is not set 723# CONFIG_FB_SAVAGE is not set
686# CONFIG_FB_SIS is not set 724# CONFIG_FB_SIS is not set
687# CONFIG_FB_NEOMAGIC is not set 725# CONFIG_FB_NEOMAGIC is not set
@@ -711,6 +749,11 @@ CONFIG_DUMMY_CONSOLE=y
711# CONFIG_SOUND is not set 749# CONFIG_SOUND is not set
712 750
713# 751#
752# HID Devices
753#
754# CONFIG_HID is not set
755
756#
714# USB support 757# USB support
715# 758#
716CONFIG_USB_ARCH_HAS_HCD=y 759CONFIG_USB_ARCH_HAS_HCD=y
@@ -773,14 +816,24 @@ CONFIG_USB_ARCH_HAS_EHCI=y
773# 816#
774 817
775# 818#
819# Auxiliary Display support
820#
821
822#
823# Virtualization
824#
825
826#
776# File systems 827# File systems
777# 828#
778# CONFIG_EXT2_FS is not set 829# CONFIG_EXT2_FS is not set
779# CONFIG_EXT3_FS is not set 830# CONFIG_EXT3_FS is not set
831# CONFIG_EXT4DEV_FS is not set
780# CONFIG_REISERFS_FS is not set 832# CONFIG_REISERFS_FS is not set
781# CONFIG_JFS_FS is not set 833# CONFIG_JFS_FS is not set
782# CONFIG_FS_POSIX_ACL is not set 834# CONFIG_FS_POSIX_ACL is not set
783# CONFIG_XFS_FS is not set 835# CONFIG_XFS_FS is not set
836# CONFIG_GFS2_FS is not set
784# CONFIG_OCFS2_FS is not set 837# CONFIG_OCFS2_FS is not set
785# CONFIG_MINIX_FS is not set 838# CONFIG_MINIX_FS is not set
786# CONFIG_ROMFS_FS is not set 839# CONFIG_ROMFS_FS is not set
@@ -810,17 +863,19 @@ CONFIG_FUSE_FS=y
810# 863#
811CONFIG_PROC_FS=y 864CONFIG_PROC_FS=y
812CONFIG_PROC_KCORE=y 865CONFIG_PROC_KCORE=y
866CONFIG_PROC_SYSCTL=y
813CONFIG_SYSFS=y 867CONFIG_SYSFS=y
814# CONFIG_TMPFS is not set 868# CONFIG_TMPFS is not set
815# CONFIG_HUGETLB_PAGE is not set 869# CONFIG_HUGETLB_PAGE is not set
816CONFIG_RAMFS=y 870CONFIG_RAMFS=y
817# CONFIG_CONFIGFS_FS is not set 871CONFIG_CONFIGFS_FS=y
818 872
819# 873#
820# Miscellaneous filesystems 874# Miscellaneous filesystems
821# 875#
822# CONFIG_ADFS_FS is not set 876# CONFIG_ADFS_FS is not set
823# CONFIG_AFFS_FS is not set 877# CONFIG_AFFS_FS is not set
878# CONFIG_ECRYPT_FS is not set
824# CONFIG_HFS_FS is not set 879# CONFIG_HFS_FS is not set
825# CONFIG_HFSPLUS_FS is not set 880# CONFIG_HFSPLUS_FS is not set
826# CONFIG_BEFS_FS is not set 881# CONFIG_BEFS_FS is not set
@@ -849,7 +904,6 @@ CONFIG_SUNRPC=y
849# CONFIG_RPCSEC_GSS_SPKM3 is not set 904# CONFIG_RPCSEC_GSS_SPKM3 is not set
850# CONFIG_SMB_FS is not set 905# CONFIG_SMB_FS is not set
851# CONFIG_CIFS is not set 906# CONFIG_CIFS is not set
852# CONFIG_CIFS_DEBUG2 is not set
853# CONFIG_NCP_FS is not set 907# CONFIG_NCP_FS is not set
854# CONFIG_CODA_FS is not set 908# CONFIG_CODA_FS is not set
855# CONFIG_AFS_FS is not set 909# CONFIG_AFS_FS is not set
@@ -867,6 +921,14 @@ CONFIG_MSDOS_PARTITION=y
867# CONFIG_NLS is not set 921# CONFIG_NLS is not set
868 922
869# 923#
924# Distributed Lock Manager
925#
926CONFIG_DLM=y
927CONFIG_DLM_TCP=y
928# CONFIG_DLM_SCTP is not set
929# CONFIG_DLM_DEBUG is not set
930
931#
870# Profiling support 932# Profiling support
871# 933#
872# CONFIG_PROFILING is not set 934# CONFIG_PROFILING is not set
@@ -876,12 +938,13 @@ CONFIG_MSDOS_PARTITION=y
876# 938#
877CONFIG_TRACE_IRQFLAGS_SUPPORT=y 939CONFIG_TRACE_IRQFLAGS_SUPPORT=y
878# CONFIG_PRINTK_TIME is not set 940# CONFIG_PRINTK_TIME is not set
941CONFIG_ENABLE_MUST_CHECK=y
879# CONFIG_MAGIC_SYSRQ is not set 942# CONFIG_MAGIC_SYSRQ is not set
880# CONFIG_UNUSED_SYMBOLS is not set 943# CONFIG_UNUSED_SYMBOLS is not set
944# CONFIG_DEBUG_FS is not set
945# CONFIG_HEADERS_CHECK is not set
881# CONFIG_DEBUG_KERNEL is not set 946# CONFIG_DEBUG_KERNEL is not set
882CONFIG_LOG_BUF_SHIFT=14 947CONFIG_LOG_BUF_SHIFT=14
883# CONFIG_DEBUG_FS is not set
884# CONFIG_UNWIND_INFO is not set
885CONFIG_CROSSCOMPILE=y 948CONFIG_CROSSCOMPILE=y
886CONFIG_CMDLINE="" 949CONFIG_CMDLINE=""
887 950
@@ -896,7 +959,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
896# Cryptographic options 959# Cryptographic options
897# 960#
898CONFIG_CRYPTO=y 961CONFIG_CRYPTO=y
962CONFIG_CRYPTO_ALGAPI=y
963CONFIG_CRYPTO_BLKCIPHER=y
964CONFIG_CRYPTO_HASH=y
965CONFIG_CRYPTO_MANAGER=y
899CONFIG_CRYPTO_HMAC=y 966CONFIG_CRYPTO_HMAC=y
967CONFIG_CRYPTO_XCBC=y
900CONFIG_CRYPTO_NULL=y 968CONFIG_CRYPTO_NULL=y
901CONFIG_CRYPTO_MD4=y 969CONFIG_CRYPTO_MD4=y
902CONFIG_CRYPTO_MD5=y 970CONFIG_CRYPTO_MD5=y
@@ -905,9 +973,16 @@ CONFIG_CRYPTO_SHA256=y
905CONFIG_CRYPTO_SHA512=y 973CONFIG_CRYPTO_SHA512=y
906CONFIG_CRYPTO_WP512=y 974CONFIG_CRYPTO_WP512=y
907CONFIG_CRYPTO_TGR192=y 975CONFIG_CRYPTO_TGR192=y
976CONFIG_CRYPTO_GF128MUL=y
977CONFIG_CRYPTO_ECB=y
978CONFIG_CRYPTO_CBC=y
979CONFIG_CRYPTO_PCBC=y
980CONFIG_CRYPTO_LRW=y
908CONFIG_CRYPTO_DES=y 981CONFIG_CRYPTO_DES=y
982CONFIG_CRYPTO_FCRYPT=y
909CONFIG_CRYPTO_BLOWFISH=y 983CONFIG_CRYPTO_BLOWFISH=y
910CONFIG_CRYPTO_TWOFISH=y 984CONFIG_CRYPTO_TWOFISH=y
985CONFIG_CRYPTO_TWOFISH_COMMON=y
911CONFIG_CRYPTO_SERPENT=y 986CONFIG_CRYPTO_SERPENT=y
912CONFIG_CRYPTO_AES=y 987CONFIG_CRYPTO_AES=y
913CONFIG_CRYPTO_CAST5=y 988CONFIG_CRYPTO_CAST5=y
@@ -919,6 +994,7 @@ CONFIG_CRYPTO_ANUBIS=y
919CONFIG_CRYPTO_DEFLATE=y 994CONFIG_CRYPTO_DEFLATE=y
920CONFIG_CRYPTO_MICHAEL_MIC=y 995CONFIG_CRYPTO_MICHAEL_MIC=y
921CONFIG_CRYPTO_CRC32C=y 996CONFIG_CRYPTO_CRC32C=y
997CONFIG_CRYPTO_CAMELLIA=y
922 998
923# 999#
924# Hardware crypto devices 1000# Hardware crypto devices
@@ -927,6 +1003,7 @@ CONFIG_CRYPTO_CRC32C=y
927# 1003#
928# Library routines 1004# Library routines
929# 1005#
1006CONFIG_BITREVERSE=y
930# CONFIG_CRC_CCITT is not set 1007# CONFIG_CRC_CCITT is not set
931CONFIG_CRC16=y 1008CONFIG_CRC16=y
932CONFIG_CRC32=y 1009CONFIG_CRC32=y
@@ -934,3 +1011,5 @@ CONFIG_LIBCRC32C=y
934CONFIG_ZLIB_INFLATE=y 1011CONFIG_ZLIB_INFLATE=y
935CONFIG_ZLIB_DEFLATE=y 1012CONFIG_ZLIB_DEFLATE=y
936CONFIG_PLIST=y 1013CONFIG_PLIST=y
1014CONFIG_HAS_IOMEM=y
1015CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 05f539f84f58..a1437b34e18f 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:12 2006 4# Sun Feb 18 21:27:54 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31CONFIG_LASAT=y 30CONFIG_LASAT=y
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_LASAT=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -68,10 +68,14 @@ CONFIG_PICVUE_PROC=y
68CONFIG_DS1603=y 68CONFIG_DS1603=y
69CONFIG_LASAT_SYSCTL=y 69CONFIG_LASAT_SYSCTL=y
70CONFIG_RWSEM_GENERIC_SPINLOCK=y 70CONFIG_RWSEM_GENERIC_SPINLOCK=y
71# CONFIG_ARCH_HAS_ILOG2_U32 is not set
72# CONFIG_ARCH_HAS_ILOG2_U64 is not set
71CONFIG_GENERIC_FIND_NEXT_BIT=y 73CONFIG_GENERIC_FIND_NEXT_BIT=y
72CONFIG_GENERIC_HWEIGHT=y 74CONFIG_GENERIC_HWEIGHT=y
73CONFIG_GENERIC_CALIBRATE_DELAY=y 75CONFIG_GENERIC_CALIBRATE_DELAY=y
76CONFIG_GENERIC_TIME=y
74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 77CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
78CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
75CONFIG_DMA_NONCOHERENT=y 79CONFIG_DMA_NONCOHERENT=y
76CONFIG_DMA_NEED_PCI_MAP_STATE=y 80CONFIG_DMA_NEED_PCI_MAP_STATE=y
77CONFIG_MIPS_NILE4=y 81CONFIG_MIPS_NILE4=y
@@ -121,8 +125,8 @@ CONFIG_PAGE_SIZE_4KB=y
121CONFIG_BOARD_SCACHE=y 125CONFIG_BOARD_SCACHE=y
122CONFIG_R5000_CPU_SCACHE=y 126CONFIG_R5000_CPU_SCACHE=y
123CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
124# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
127# CONFIG_64BIT_PHYS_ADDR is not set 131# CONFIG_64BIT_PHYS_ADDR is not set
128CONFIG_CPU_HAS_LLSC=y 132CONFIG_CPU_HAS_LLSC=y
@@ -139,6 +143,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 143# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 144CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 145# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -151,6 +156,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 156CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 157# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
159# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 160CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 161CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 162CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,15 +175,20 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 175CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y 176CONFIG_SWAP=y
171CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 180# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 182# CONFIG_TASKSTATS is not set
183# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 185# CONFIG_IKCONFIG is not set
186CONFIG_SYSFS_DEPRECATED=y
177CONFIG_RELAY=y 187CONFIG_RELAY=y
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
189CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
191CONFIG_SYSCTL_SYSCALL=y
181CONFIG_KALLSYMS=y 192CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set 193# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y 194CONFIG_HOTPLUG=y
@@ -185,12 +196,12 @@ CONFIG_PRINTK=y
185CONFIG_BUG=y 196CONFIG_BUG=y
186CONFIG_ELF_CORE=y 197CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 198CONFIG_BASE_FULL=y
188CONFIG_RT_MUTEXES=y
189CONFIG_FUTEX=y 199CONFIG_FUTEX=y
190CONFIG_EPOLL=y 200CONFIG_EPOLL=y
191CONFIG_SHMEM=y 201CONFIG_SHMEM=y
192CONFIG_SLAB=y 202CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 203CONFIG_VM_EVENT_COUNTERS=y
204CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 205# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 206CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set 207# CONFIG_SLOB is not set
@@ -208,6 +219,7 @@ CONFIG_KMOD=y
208# 219#
209# Block layer 220# Block layer
210# 221#
222CONFIG_BLOCK=y
211# CONFIG_LBD is not set 223# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 224# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 225# CONFIG_LSF is not set
@@ -250,6 +262,14 @@ CONFIG_BINFMT_ELF=y
250CONFIG_TRAD_SIGNALS=y 262CONFIG_TRAD_SIGNALS=y
251 263
252# 264#
265# Power management options
266#
267CONFIG_PM=y
268# CONFIG_PM_LEGACY is not set
269# CONFIG_PM_DEBUG is not set
270# CONFIG_PM_SYSFS_DEPRECATED is not set
271
272#
253# Networking 273# Networking
254# 274#
255CONFIG_NET=y 275CONFIG_NET=y
@@ -262,7 +282,10 @@ CONFIG_NET=y
262CONFIG_UNIX=y 282CONFIG_UNIX=y
263CONFIG_XFRM=y 283CONFIG_XFRM=y
264CONFIG_XFRM_USER=m 284CONFIG_XFRM_USER=m
285# CONFIG_XFRM_SUB_POLICY is not set
286CONFIG_XFRM_MIGRATE=y
265CONFIG_NET_KEY=y 287CONFIG_NET_KEY=y
288CONFIG_NET_KEY_MIGRATE=y
266CONFIG_INET=y 289CONFIG_INET=y
267# CONFIG_IP_MULTICAST is not set 290# CONFIG_IP_MULTICAST is not set
268# CONFIG_IP_ADVANCED_ROUTER is not set 291# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +302,13 @@ CONFIG_IP_FIB_HASH=y
279# CONFIG_INET_TUNNEL is not set 302# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=m 303CONFIG_INET_XFRM_MODE_TRANSPORT=m
281CONFIG_INET_XFRM_MODE_TUNNEL=m 304CONFIG_INET_XFRM_MODE_TUNNEL=m
305CONFIG_INET_XFRM_MODE_BEET=m
282CONFIG_INET_DIAG=y 306CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 307CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 308# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 309CONFIG_TCP_CONG_CUBIC=y
310CONFIG_DEFAULT_TCP_CONG="cubic"
311CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 312# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 313# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 314# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +338,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 339# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 341# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 342# CONFIG_WAN_ROUTER is not set
318 343
@@ -367,11 +392,13 @@ CONFIG_MTD_PARTITIONS=y
367# User Modules And Translation Layers 392# User Modules And Translation Layers
368# 393#
369CONFIG_MTD_CHAR=y 394CONFIG_MTD_CHAR=y
395CONFIG_MTD_BLKDEVS=y
370CONFIG_MTD_BLOCK=y 396CONFIG_MTD_BLOCK=y
371# CONFIG_FTL is not set 397# CONFIG_FTL is not set
372# CONFIG_NFTL is not set 398# CONFIG_NFTL is not set
373# CONFIG_INFTL is not set 399# CONFIG_INFTL is not set
374# CONFIG_RFD_FTL is not set 400# CONFIG_RFD_FTL is not set
401# CONFIG_SSFDC is not set
375 402
376# 403#
377# RAM/ROM/Flash chip drivers 404# RAM/ROM/Flash chip drivers
@@ -427,6 +454,7 @@ CONFIG_MTD_LASAT=y
427# NAND Flash Device Drivers 454# NAND Flash Device Drivers
428# 455#
429# CONFIG_MTD_NAND is not set 456# CONFIG_MTD_NAND is not set
457# CONFIG_MTD_NAND_CAFE is not set
430 458
431# 459#
432# OneNAND Flash Device Drivers 460# OneNAND Flash Device Drivers
@@ -461,9 +489,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
461CONFIG_ATA_OVER_ETH=m 489CONFIG_ATA_OVER_ETH=m
462 490
463# 491#
492# Misc devices
493#
494CONFIG_SGI_IOC4=m
495# CONFIG_TIFM_CORE is not set
496
497#
464# ATA/ATAPI/MFM/RLL support 498# ATA/ATAPI/MFM/RLL support
465# 499#
466CONFIG_IDE=y 500CONFIG_IDE=y
501CONFIG_IDE_MAX_HWIFS=4
467CONFIG_BLK_DEV_IDE=y 502CONFIG_BLK_DEV_IDE=y
468 503
469# 504#
@@ -500,8 +535,10 @@ CONFIG_BLK_DEV_CMD64X=y
500# CONFIG_BLK_DEV_CS5530 is not set 535# CONFIG_BLK_DEV_CS5530 is not set
501# CONFIG_BLK_DEV_HPT34X is not set 536# CONFIG_BLK_DEV_HPT34X is not set
502# CONFIG_BLK_DEV_HPT366 is not set 537# CONFIG_BLK_DEV_HPT366 is not set
538# CONFIG_BLK_DEV_JMICRON is not set
503# CONFIG_BLK_DEV_SC1200 is not set 539# CONFIG_BLK_DEV_SC1200 is not set
504# CONFIG_BLK_DEV_PIIX is not set 540# CONFIG_BLK_DEV_PIIX is not set
541CONFIG_BLK_DEV_IT8213=m
505# CONFIG_BLK_DEV_IT821X is not set 542# CONFIG_BLK_DEV_IT821X is not set
506# CONFIG_BLK_DEV_NS87415 is not set 543# CONFIG_BLK_DEV_NS87415 is not set
507# CONFIG_BLK_DEV_PDC202XX_OLD is not set 544# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -511,6 +548,7 @@ CONFIG_BLK_DEV_CMD64X=y
511# CONFIG_BLK_DEV_SLC90E66 is not set 548# CONFIG_BLK_DEV_SLC90E66 is not set
512# CONFIG_BLK_DEV_TRM290 is not set 549# CONFIG_BLK_DEV_TRM290 is not set
513# CONFIG_BLK_DEV_VIA82CXXX is not set 550# CONFIG_BLK_DEV_VIA82CXXX is not set
551CONFIG_BLK_DEV_TC86C001=m
514# CONFIG_IDE_ARM is not set 552# CONFIG_IDE_ARM is not set
515CONFIG_BLK_DEV_IDEDMA=y 553CONFIG_BLK_DEV_IDEDMA=y
516# CONFIG_IDEDMA_IVB is not set 554# CONFIG_IDEDMA_IVB is not set
@@ -522,6 +560,12 @@ CONFIG_IDEDMA_AUTO=y
522# 560#
523CONFIG_RAID_ATTRS=m 561CONFIG_RAID_ATTRS=m
524# CONFIG_SCSI is not set 562# CONFIG_SCSI is not set
563# CONFIG_SCSI_NETLINK is not set
564
565#
566# Serial ATA (prod) and Parallel ATA (experimental) drivers
567#
568# CONFIG_ATA is not set
525 569
526# 570#
527# Multi-device support (RAID and LVM) 571# Multi-device support (RAID and LVM)
@@ -572,6 +616,8 @@ CONFIG_LXT_PHY=m
572CONFIG_CICADA_PHY=m 616CONFIG_CICADA_PHY=m
573CONFIG_VITESSE_PHY=m 617CONFIG_VITESSE_PHY=m
574CONFIG_SMSC_PHY=m 618CONFIG_SMSC_PHY=m
619# CONFIG_BROADCOM_PHY is not set
620# CONFIG_FIXED_PHY is not set
575 621
576# 622#
577# Ethernet (10 or 100Mbit) 623# Ethernet (10 or 100Mbit)
@@ -607,14 +653,17 @@ CONFIG_NET_ETHERNET=y
607# CONFIG_SK98LIN is not set 653# CONFIG_SK98LIN is not set
608# CONFIG_TIGON3 is not set 654# CONFIG_TIGON3 is not set
609# CONFIG_BNX2 is not set 655# CONFIG_BNX2 is not set
656CONFIG_QLA3XXX=m
610 657
611# 658#
612# Ethernet (10000 Mbit) 659# Ethernet (10000 Mbit)
613# 660#
614# CONFIG_CHELSIO_T1 is not set 661# CONFIG_CHELSIO_T1 is not set
662CONFIG_CHELSIO_T3=m
615# CONFIG_IXGB is not set 663# CONFIG_IXGB is not set
616# CONFIG_S2IO is not set 664# CONFIG_S2IO is not set
617# CONFIG_MYRI10GE is not set 665# CONFIG_MYRI10GE is not set
666CONFIG_NETXEN_NIC=m
618 667
619# 668#
620# Token Ring devices 669# Token Ring devices
@@ -653,6 +702,7 @@ CONFIG_NET_ETHERNET=y
653# Input device support 702# Input device support
654# 703#
655CONFIG_INPUT=y 704CONFIG_INPUT=y
705# CONFIG_INPUT_FF_MEMLESS is not set
656 706
657# 707#
658# Userland interfaces 708# Userland interfaces
@@ -730,10 +780,6 @@ CONFIG_LEGACY_PTY_COUNT=256
730# CONFIG_DTLK is not set 780# CONFIG_DTLK is not set
731# CONFIG_R3964 is not set 781# CONFIG_R3964 is not set
732# CONFIG_APPLICOM is not set 782# CONFIG_APPLICOM is not set
733
734#
735# Ftape, the floppy tape device driver
736#
737# CONFIG_DRM is not set 783# CONFIG_DRM is not set
738# CONFIG_RAW_DRIVER is not set 784# CONFIG_RAW_DRIVER is not set
739 785
@@ -741,7 +787,6 @@ CONFIG_LEGACY_PTY_COUNT=256
741# TPM devices 787# TPM devices
742# 788#
743# CONFIG_TCG_TPM is not set 789# CONFIG_TCG_TPM is not set
744# CONFIG_TELCLOCK is not set
745 790
746# 791#
747# I2C support 792# I2C support
@@ -766,14 +811,9 @@ CONFIG_LEGACY_PTY_COUNT=256
766# CONFIG_HWMON_VID is not set 811# CONFIG_HWMON_VID is not set
767 812
768# 813#
769# Misc devices
770#
771
772#
773# Multimedia devices 814# Multimedia devices
774# 815#
775# CONFIG_VIDEO_DEV is not set 816# CONFIG_VIDEO_DEV is not set
776CONFIG_VIDEO_V4L2=y
777 817
778# 818#
779# Digital Video Broadcasting Devices 819# Digital Video Broadcasting Devices
@@ -791,6 +831,7 @@ CONFIG_VIDEO_V4L2=y
791# 831#
792# CONFIG_VGA_CONSOLE is not set 832# CONFIG_VGA_CONSOLE is not set
793CONFIG_DUMMY_CONSOLE=y 833CONFIG_DUMMY_CONSOLE=y
834# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
794 835
795# 836#
796# Sound 837# Sound
@@ -798,6 +839,11 @@ CONFIG_DUMMY_CONSOLE=y
798# CONFIG_SOUND is not set 839# CONFIG_SOUND is not set
799 840
800# 841#
842# HID Devices
843#
844# CONFIG_HID is not set
845
846#
801# USB support 847# USB support
802# 848#
803CONFIG_USB_ARCH_HAS_HCD=y 849CONFIG_USB_ARCH_HAS_HCD=y
@@ -860,6 +906,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
860# 906#
861 907
862# 908#
909# Auxiliary Display support
910#
911
912#
913# Virtualization
914#
915
916#
863# File systems 917# File systems
864# 918#
865CONFIG_EXT2_FS=y 919CONFIG_EXT2_FS=y
@@ -869,13 +923,15 @@ CONFIG_EXT3_FS=y
869CONFIG_EXT3_FS_XATTR=y 923CONFIG_EXT3_FS_XATTR=y
870# CONFIG_EXT3_FS_POSIX_ACL is not set 924# CONFIG_EXT3_FS_POSIX_ACL is not set
871CONFIG_EXT3_FS_SECURITY=y 925CONFIG_EXT3_FS_SECURITY=y
926# CONFIG_EXT4DEV_FS is not set
872CONFIG_JBD=y 927CONFIG_JBD=y
873# CONFIG_JBD_DEBUG is not set 928# CONFIG_JBD_DEBUG is not set
874CONFIG_FS_MBCACHE=y 929CONFIG_FS_MBCACHE=y
875# CONFIG_REISERFS_FS is not set 930# CONFIG_REISERFS_FS is not set
876# CONFIG_JFS_FS is not set 931# CONFIG_JFS_FS is not set
877# CONFIG_FS_POSIX_ACL is not set 932CONFIG_FS_POSIX_ACL=y
878# CONFIG_XFS_FS is not set 933# CONFIG_XFS_FS is not set
934# CONFIG_GFS2_FS is not set
879# CONFIG_OCFS2_FS is not set 935# CONFIG_OCFS2_FS is not set
880# CONFIG_MINIX_FS is not set 936# CONFIG_MINIX_FS is not set
881# CONFIG_ROMFS_FS is not set 937# CONFIG_ROMFS_FS is not set
@@ -886,6 +942,7 @@ CONFIG_DNOTIFY=y
886# CONFIG_AUTOFS_FS is not set 942# CONFIG_AUTOFS_FS is not set
887# CONFIG_AUTOFS4_FS is not set 943# CONFIG_AUTOFS4_FS is not set
888CONFIG_FUSE_FS=m 944CONFIG_FUSE_FS=m
945CONFIG_GENERIC_ACL=y
889 946
890# 947#
891# CD-ROM/DVD Filesystems 948# CD-ROM/DVD Filesystems
@@ -905,23 +962,25 @@ CONFIG_FUSE_FS=m
905# 962#
906CONFIG_PROC_FS=y 963CONFIG_PROC_FS=y
907CONFIG_PROC_KCORE=y 964CONFIG_PROC_KCORE=y
965CONFIG_PROC_SYSCTL=y
908CONFIG_SYSFS=y 966CONFIG_SYSFS=y
909CONFIG_TMPFS=y 967CONFIG_TMPFS=y
968CONFIG_TMPFS_POSIX_ACL=y
910# CONFIG_HUGETLB_PAGE is not set 969# CONFIG_HUGETLB_PAGE is not set
911CONFIG_RAMFS=y 970CONFIG_RAMFS=y
912# CONFIG_CONFIGFS_FS is not set 971CONFIG_CONFIGFS_FS=m
913 972
914# 973#
915# Miscellaneous filesystems 974# Miscellaneous filesystems
916# 975#
917# CONFIG_ADFS_FS is not set 976# CONFIG_ADFS_FS is not set
918# CONFIG_AFFS_FS is not set 977# CONFIG_AFFS_FS is not set
978# CONFIG_ECRYPT_FS is not set
919# CONFIG_HFS_FS is not set 979# CONFIG_HFS_FS is not set
920# CONFIG_HFSPLUS_FS is not set 980# CONFIG_HFSPLUS_FS is not set
921# CONFIG_BEFS_FS is not set 981# CONFIG_BEFS_FS is not set
922# CONFIG_BFS_FS is not set 982# CONFIG_BFS_FS is not set
923# CONFIG_EFS_FS is not set 983# CONFIG_EFS_FS is not set
924# CONFIG_JFFS_FS is not set
925# CONFIG_JFFS2_FS is not set 984# CONFIG_JFFS2_FS is not set
926# CONFIG_CRAMFS is not set 985# CONFIG_CRAMFS is not set
927# CONFIG_VXFS_FS is not set 986# CONFIG_VXFS_FS is not set
@@ -947,7 +1006,6 @@ CONFIG_SUNRPC=y
947# CONFIG_RPCSEC_GSS_SPKM3 is not set 1006# CONFIG_RPCSEC_GSS_SPKM3 is not set
948# CONFIG_SMB_FS is not set 1007# CONFIG_SMB_FS is not set
949# CONFIG_CIFS is not set 1008# CONFIG_CIFS is not set
950# CONFIG_CIFS_DEBUG2 is not set
951# CONFIG_NCP_FS is not set 1009# CONFIG_NCP_FS is not set
952# CONFIG_CODA_FS is not set 1010# CONFIG_CODA_FS is not set
953# CONFIG_AFS_FS is not set 1011# CONFIG_AFS_FS is not set
@@ -965,6 +1023,14 @@ CONFIG_MSDOS_PARTITION=y
965# CONFIG_NLS is not set 1023# CONFIG_NLS is not set
966 1024
967# 1025#
1026# Distributed Lock Manager
1027#
1028CONFIG_DLM=m
1029CONFIG_DLM_TCP=y
1030# CONFIG_DLM_SCTP is not set
1031# CONFIG_DLM_DEBUG is not set
1032
1033#
968# Profiling support 1034# Profiling support
969# 1035#
970# CONFIG_PROFILING is not set 1036# CONFIG_PROFILING is not set
@@ -974,11 +1040,13 @@ CONFIG_MSDOS_PARTITION=y
974# 1040#
975CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1041CONFIG_TRACE_IRQFLAGS_SUPPORT=y
976# CONFIG_PRINTK_TIME is not set 1042# CONFIG_PRINTK_TIME is not set
1043CONFIG_ENABLE_MUST_CHECK=y
977# CONFIG_MAGIC_SYSRQ is not set 1044# CONFIG_MAGIC_SYSRQ is not set
978# CONFIG_UNUSED_SYMBOLS is not set 1045# CONFIG_UNUSED_SYMBOLS is not set
1046# CONFIG_DEBUG_FS is not set
1047# CONFIG_HEADERS_CHECK is not set
979# CONFIG_DEBUG_KERNEL is not set 1048# CONFIG_DEBUG_KERNEL is not set
980CONFIG_LOG_BUF_SHIFT=14 1049CONFIG_LOG_BUF_SHIFT=14
981# CONFIG_DEBUG_FS is not set
982CONFIG_CROSSCOMPILE=y 1050CONFIG_CROSSCOMPILE=y
983CONFIG_CMDLINE="" 1051CONFIG_CMDLINE=""
984 1052
@@ -993,18 +1061,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
993# Cryptographic options 1061# Cryptographic options
994# 1062#
995CONFIG_CRYPTO=y 1063CONFIG_CRYPTO=y
1064CONFIG_CRYPTO_ALGAPI=y
1065CONFIG_CRYPTO_BLKCIPHER=m
1066CONFIG_CRYPTO_HASH=y
1067CONFIG_CRYPTO_MANAGER=y
996CONFIG_CRYPTO_HMAC=y 1068CONFIG_CRYPTO_HMAC=y
1069CONFIG_CRYPTO_XCBC=m
997CONFIG_CRYPTO_NULL=m 1070CONFIG_CRYPTO_NULL=m
998CONFIG_CRYPTO_MD4=m 1071CONFIG_CRYPTO_MD4=m
999CONFIG_CRYPTO_MD5=m 1072CONFIG_CRYPTO_MD5=y
1000CONFIG_CRYPTO_SHA1=m 1073CONFIG_CRYPTO_SHA1=m
1001CONFIG_CRYPTO_SHA256=m 1074CONFIG_CRYPTO_SHA256=m
1002CONFIG_CRYPTO_SHA512=m 1075CONFIG_CRYPTO_SHA512=m
1003CONFIG_CRYPTO_WP512=m 1076CONFIG_CRYPTO_WP512=m
1004CONFIG_CRYPTO_TGR192=m 1077CONFIG_CRYPTO_TGR192=m
1078CONFIG_CRYPTO_GF128MUL=m
1079CONFIG_CRYPTO_ECB=m
1080CONFIG_CRYPTO_CBC=m
1081CONFIG_CRYPTO_PCBC=m
1082CONFIG_CRYPTO_LRW=m
1005CONFIG_CRYPTO_DES=m 1083CONFIG_CRYPTO_DES=m
1084CONFIG_CRYPTO_FCRYPT=m
1006CONFIG_CRYPTO_BLOWFISH=m 1085CONFIG_CRYPTO_BLOWFISH=m
1007CONFIG_CRYPTO_TWOFISH=m 1086CONFIG_CRYPTO_TWOFISH=m
1087CONFIG_CRYPTO_TWOFISH_COMMON=m
1008CONFIG_CRYPTO_SERPENT=m 1088CONFIG_CRYPTO_SERPENT=m
1009CONFIG_CRYPTO_AES=m 1089CONFIG_CRYPTO_AES=m
1010CONFIG_CRYPTO_CAST5=m 1090CONFIG_CRYPTO_CAST5=m
@@ -1016,6 +1096,7 @@ CONFIG_CRYPTO_ANUBIS=m
1016CONFIG_CRYPTO_DEFLATE=m 1096CONFIG_CRYPTO_DEFLATE=m
1017CONFIG_CRYPTO_MICHAEL_MIC=m 1097CONFIG_CRYPTO_MICHAEL_MIC=m
1018CONFIG_CRYPTO_CRC32C=m 1098CONFIG_CRYPTO_CRC32C=m
1099CONFIG_CRYPTO_CAMELLIA=m
1019# CONFIG_CRYPTO_TEST is not set 1100# CONFIG_CRYPTO_TEST is not set
1020 1101
1021# 1102#
@@ -1025,6 +1106,7 @@ CONFIG_CRYPTO_CRC32C=m
1025# 1106#
1026# Library routines 1107# Library routines
1027# 1108#
1109CONFIG_BITREVERSE=y
1028# CONFIG_CRC_CCITT is not set 1110# CONFIG_CRC_CCITT is not set
1029CONFIG_CRC16=m 1111CONFIG_CRC16=m
1030CONFIG_CRC32=y 1112CONFIG_CRC32=y
@@ -1032,3 +1114,5 @@ CONFIG_LIBCRC32C=m
1032CONFIG_ZLIB_INFLATE=m 1114CONFIG_ZLIB_INFLATE=m
1033CONFIG_ZLIB_DEFLATE=m 1115CONFIG_ZLIB_DEFLATE=m
1034CONFIG_PLIST=y 1116CONFIG_PLIST=y
1117CONFIG_HAS_IOMEM=y
1118CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 96e941084c04..8d21bb96349e 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc1 3# Linux kernel version: 2.6.20
4# Fri Oct 6 17:34:55 2006 4# Sun Feb 18 21:27:55 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -40,6 +41,7 @@ CONFIG_MIPS_MALTA=y
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -62,11 +64,14 @@ CONFIG_MIPS_MALTA=y
62# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
63# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
64CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
65CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
66CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_GENERIC_TIME=y 72CONFIG_GENERIC_TIME=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
70CONFIG_ARCH_MAY_HAVE_PC_FDC=y 75CONFIG_ARCH_MAY_HAVE_PC_FDC=y
71CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -132,8 +137,8 @@ CONFIG_BOARD_SCACHE=y
132CONFIG_MIPS_CPU_SCACHE=y 137CONFIG_MIPS_CPU_SCACHE=y
133CONFIG_CPU_HAS_PREFETCH=y 138CONFIG_CPU_HAS_PREFETCH=y
134# CONFIG_MIPS_MT_DISABLED is not set 139# CONFIG_MIPS_MT_DISABLED is not set
135# CONFIG_MIPS_MT_SMTC is not set
136CONFIG_MIPS_MT_SMP=y 140CONFIG_MIPS_MT_SMP=y
141# CONFIG_MIPS_MT_SMTC is not set
137# CONFIG_MIPS_VPE_LOADER is not set 142# CONFIG_MIPS_VPE_LOADER is not set
138CONFIG_MIPS_MT=y 143CONFIG_MIPS_MT=y
139CONFIG_SYS_SUPPORTS_MULTITHREADING=y 144CONFIG_SYS_SUPPORTS_MULTITHREADING=y
@@ -157,6 +162,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
157# CONFIG_SPARSEMEM_STATIC is not set 162# CONFIG_SPARSEMEM_STATIC is not set
158CONFIG_SPLIT_PTLOCK_CPUS=4 163CONFIG_SPLIT_PTLOCK_CPUS=4
159# CONFIG_RESOURCES_64BIT is not set 164# CONFIG_RESOURCES_64BIT is not set
165CONFIG_ZONE_DMA_FLAG=1
160CONFIG_SMP=y 166CONFIG_SMP=y
161CONFIG_SYS_SUPPORTS_SMP=y 167CONFIG_SYS_SUPPORTS_SMP=y
162CONFIG_NR_CPUS=2 168CONFIG_NR_CPUS=2
@@ -173,6 +179,7 @@ CONFIG_PREEMPT_NONE=y
173# CONFIG_PREEMPT_VOLUNTARY is not set 179# CONFIG_PREEMPT_VOLUNTARY is not set
174# CONFIG_PREEMPT is not set 180# CONFIG_PREEMPT is not set
175CONFIG_PREEMPT_BKL=y 181CONFIG_PREEMPT_BKL=y
182# CONFIG_KEXEC is not set
176CONFIG_LOCKDEP_SUPPORT=y 183CONFIG_LOCKDEP_SUPPORT=y
177CONFIG_STACKTRACE_SUPPORT=y 184CONFIG_STACKTRACE_SUPPORT=y
178CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 185CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -192,6 +199,7 @@ CONFIG_LOCALVERSION_AUTO=y
192CONFIG_SWAP=y 199CONFIG_SWAP=y
193CONFIG_SYSVIPC=y 200CONFIG_SYSVIPC=y
194# CONFIG_IPC_NS is not set 201# CONFIG_IPC_NS is not set
202CONFIG_SYSVIPC_SYSCTL=y
195# CONFIG_POSIX_MQUEUE is not set 203# CONFIG_POSIX_MQUEUE is not set
196# CONFIG_BSD_PROCESS_ACCT is not set 204# CONFIG_BSD_PROCESS_ACCT is not set
197# CONFIG_TASKSTATS is not set 205# CONFIG_TASKSTATS is not set
@@ -199,8 +207,8 @@ CONFIG_SYSVIPC=y
199# CONFIG_AUDIT is not set 207# CONFIG_AUDIT is not set
200# CONFIG_IKCONFIG is not set 208# CONFIG_IKCONFIG is not set
201# CONFIG_CPUSETS is not set 209# CONFIG_CPUSETS is not set
210CONFIG_SYSFS_DEPRECATED=y
202CONFIG_RELAY=y 211CONFIG_RELAY=y
203CONFIG_INITRAMFS_SOURCE=""
204# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 212# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
205CONFIG_SYSCTL=y 213CONFIG_SYSCTL=y
206CONFIG_EMBEDDED=y 214CONFIG_EMBEDDED=y
@@ -259,7 +267,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
259# 267#
260CONFIG_HW_HAS_PCI=y 268CONFIG_HW_HAS_PCI=y
261CONFIG_PCI=y 269CONFIG_PCI=y
262# CONFIG_PCI_MULTITHREAD_PROBE is not set
263CONFIG_MMU=y 270CONFIG_MMU=y
264 271
265# 272#
@@ -280,6 +287,14 @@ CONFIG_BINFMT_ELF=y
280CONFIG_TRAD_SIGNALS=y 287CONFIG_TRAD_SIGNALS=y
281 288
282# 289#
290# Power management options
291#
292CONFIG_PM=y
293# CONFIG_PM_LEGACY is not set
294# CONFIG_PM_DEBUG is not set
295# CONFIG_PM_SYSFS_DEPRECATED is not set
296
297#
283# Networking 298# Networking
284# 299#
285CONFIG_NET=y 300CONFIG_NET=y
@@ -294,7 +309,9 @@ CONFIG_UNIX=y
294CONFIG_XFRM=y 309CONFIG_XFRM=y
295CONFIG_XFRM_USER=m 310CONFIG_XFRM_USER=m
296# CONFIG_XFRM_SUB_POLICY is not set 311# CONFIG_XFRM_SUB_POLICY is not set
312CONFIG_XFRM_MIGRATE=y
297CONFIG_NET_KEY=y 313CONFIG_NET_KEY=y
314CONFIG_NET_KEY_MIGRATE=y
298CONFIG_INET=y 315CONFIG_INET=y
299CONFIG_IP_MULTICAST=y 316CONFIG_IP_MULTICAST=y
300CONFIG_IP_ADVANCED_ROUTER=y 317CONFIG_IP_ADVANCED_ROUTER=y
@@ -302,7 +319,6 @@ CONFIG_ASK_IP_FIB_HASH=y
302# CONFIG_IP_FIB_TRIE is not set 319# CONFIG_IP_FIB_TRIE is not set
303CONFIG_IP_FIB_HASH=y 320CONFIG_IP_FIB_HASH=y
304CONFIG_IP_MULTIPLE_TABLES=y 321CONFIG_IP_MULTIPLE_TABLES=y
305CONFIG_IP_ROUTE_FWMARK=y
306CONFIG_IP_ROUTE_MULTIPATH=y 322CONFIG_IP_ROUTE_MULTIPATH=y
307# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 323# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
308CONFIG_IP_ROUTE_VERBOSE=y 324CONFIG_IP_ROUTE_VERBOSE=y
@@ -331,6 +347,7 @@ CONFIG_INET_TCP_DIAG=y
331# CONFIG_TCP_CONG_ADVANCED is not set 347# CONFIG_TCP_CONG_ADVANCED is not set
332CONFIG_TCP_CONG_CUBIC=y 348CONFIG_TCP_CONG_CUBIC=y
333CONFIG_DEFAULT_TCP_CONG="cubic" 349CONFIG_DEFAULT_TCP_CONG="cubic"
350CONFIG_TCP_MD5SIG=y
334 351
335# 352#
336# IP: Virtual Server Configuration 353# IP: Virtual Server Configuration
@@ -379,8 +396,8 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
379CONFIG_INET6_XFRM_MODE_TUNNEL=m 396CONFIG_INET6_XFRM_MODE_TUNNEL=m
380CONFIG_INET6_XFRM_MODE_BEET=m 397CONFIG_INET6_XFRM_MODE_BEET=m
381# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 398# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
399CONFIG_IPV6_SIT=m
382CONFIG_IPV6_TUNNEL=m 400CONFIG_IPV6_TUNNEL=m
383# CONFIG_IPV6_SUBTREES is not set
384# CONFIG_IPV6_MULTIPLE_TABLES is not set 401# CONFIG_IPV6_MULTIPLE_TABLES is not set
385CONFIG_NETWORK_SECMARK=y 402CONFIG_NETWORK_SECMARK=y
386CONFIG_NETFILTER=y 403CONFIG_NETFILTER=y
@@ -393,15 +410,37 @@ CONFIG_BRIDGE_NETFILTER=y
393CONFIG_NETFILTER_NETLINK=m 410CONFIG_NETFILTER_NETLINK=m
394CONFIG_NETFILTER_NETLINK_QUEUE=m 411CONFIG_NETFILTER_NETLINK_QUEUE=m
395CONFIG_NETFILTER_NETLINK_LOG=m 412CONFIG_NETFILTER_NETLINK_LOG=m
413CONFIG_NF_CONNTRACK_ENABLED=m
414CONFIG_NF_CONNTRACK_SUPPORT=y
415# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
416CONFIG_NF_CONNTRACK=m
417CONFIG_NF_CT_ACCT=y
418CONFIG_NF_CONNTRACK_MARK=y
419CONFIG_NF_CONNTRACK_SECMARK=y
420CONFIG_NF_CONNTRACK_EVENTS=y
421CONFIG_NF_CT_PROTO_GRE=m
422CONFIG_NF_CT_PROTO_SCTP=m
423CONFIG_NF_CONNTRACK_AMANDA=m
424CONFIG_NF_CONNTRACK_FTP=m
425CONFIG_NF_CONNTRACK_H323=m
426CONFIG_NF_CONNTRACK_IRC=m
427# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
428CONFIG_NF_CONNTRACK_PPTP=m
429CONFIG_NF_CONNTRACK_SANE=m
430CONFIG_NF_CONNTRACK_SIP=m
431CONFIG_NF_CONNTRACK_TFTP=m
432CONFIG_NF_CT_NETLINK=m
396CONFIG_NETFILTER_XTABLES=m 433CONFIG_NETFILTER_XTABLES=m
397CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 434CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
398CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 435CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
399# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 436# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
400CONFIG_NETFILTER_XT_TARGET_MARK=m 437CONFIG_NETFILTER_XT_TARGET_MARK=m
401CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 438CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
439CONFIG_NETFILTER_XT_TARGET_NFLOG=m
402CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 440CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
403CONFIG_NETFILTER_XT_TARGET_SECMARK=m 441CONFIG_NETFILTER_XT_TARGET_SECMARK=m
404# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 442# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
443CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
405CONFIG_NETFILTER_XT_MATCH_COMMENT=m 444CONFIG_NETFILTER_XT_MATCH_COMMENT=m
406CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 445CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
407CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 446CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -425,25 +464,13 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
425CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 464CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
426CONFIG_NETFILTER_XT_MATCH_STRING=m 465CONFIG_NETFILTER_XT_MATCH_STRING=m
427CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 466CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
467CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
428 468
429# 469#
430# IP: Netfilter Configuration 470# IP: Netfilter Configuration
431# 471#
432CONFIG_IP_NF_CONNTRACK=m 472CONFIG_NF_CONNTRACK_IPV4=m
433CONFIG_IP_NF_CT_ACCT=y 473CONFIG_NF_CONNTRACK_PROC_COMPAT=y
434CONFIG_IP_NF_CONNTRACK_MARK=y
435CONFIG_IP_NF_CONNTRACK_SECMARK=y
436CONFIG_IP_NF_CONNTRACK_EVENTS=y
437CONFIG_IP_NF_CONNTRACK_NETLINK=m
438CONFIG_IP_NF_CT_PROTO_SCTP=m
439CONFIG_IP_NF_FTP=m
440CONFIG_IP_NF_IRC=m
441# CONFIG_IP_NF_NETBIOS_NS is not set
442CONFIG_IP_NF_TFTP=m
443CONFIG_IP_NF_AMANDA=m
444CONFIG_IP_NF_PPTP=m
445CONFIG_IP_NF_H323=m
446CONFIG_IP_NF_SIP=m
447CONFIG_IP_NF_QUEUE=m 474CONFIG_IP_NF_QUEUE=m
448CONFIG_IP_NF_IPTABLES=m 475CONFIG_IP_NF_IPTABLES=m
449CONFIG_IP_NF_MATCH_IPRANGE=m 476CONFIG_IP_NF_MATCH_IPRANGE=m
@@ -454,26 +481,25 @@ CONFIG_IP_NF_MATCH_AH=m
454CONFIG_IP_NF_MATCH_TTL=m 481CONFIG_IP_NF_MATCH_TTL=m
455CONFIG_IP_NF_MATCH_OWNER=m 482CONFIG_IP_NF_MATCH_OWNER=m
456CONFIG_IP_NF_MATCH_ADDRTYPE=m 483CONFIG_IP_NF_MATCH_ADDRTYPE=m
457CONFIG_IP_NF_MATCH_HASHLIMIT=m
458CONFIG_IP_NF_FILTER=m 484CONFIG_IP_NF_FILTER=m
459CONFIG_IP_NF_TARGET_REJECT=m 485CONFIG_IP_NF_TARGET_REJECT=m
460CONFIG_IP_NF_TARGET_LOG=m 486CONFIG_IP_NF_TARGET_LOG=m
461CONFIG_IP_NF_TARGET_ULOG=m 487CONFIG_IP_NF_TARGET_ULOG=m
462CONFIG_IP_NF_TARGET_TCPMSS=m 488CONFIG_NF_NAT=m
463CONFIG_IP_NF_NAT=m 489CONFIG_NF_NAT_NEEDED=y
464CONFIG_IP_NF_NAT_NEEDED=y
465CONFIG_IP_NF_TARGET_MASQUERADE=m 490CONFIG_IP_NF_TARGET_MASQUERADE=m
466CONFIG_IP_NF_TARGET_REDIRECT=m 491CONFIG_IP_NF_TARGET_REDIRECT=m
467CONFIG_IP_NF_TARGET_NETMAP=m 492CONFIG_IP_NF_TARGET_NETMAP=m
468CONFIG_IP_NF_TARGET_SAME=m 493CONFIG_IP_NF_TARGET_SAME=m
469CONFIG_IP_NF_NAT_SNMP_BASIC=m 494CONFIG_NF_NAT_SNMP_BASIC=m
470CONFIG_IP_NF_NAT_IRC=m 495CONFIG_NF_NAT_PROTO_GRE=m
471CONFIG_IP_NF_NAT_FTP=m 496CONFIG_NF_NAT_FTP=m
472CONFIG_IP_NF_NAT_TFTP=m 497CONFIG_NF_NAT_IRC=m
473CONFIG_IP_NF_NAT_AMANDA=m 498CONFIG_NF_NAT_TFTP=m
474CONFIG_IP_NF_NAT_PPTP=m 499CONFIG_NF_NAT_AMANDA=m
475CONFIG_IP_NF_NAT_H323=m 500CONFIG_NF_NAT_PPTP=m
476CONFIG_IP_NF_NAT_SIP=m 501CONFIG_NF_NAT_H323=m
502CONFIG_NF_NAT_SIP=m
477CONFIG_IP_NF_MANGLE=m 503CONFIG_IP_NF_MANGLE=m
478CONFIG_IP_NF_TARGET_TOS=m 504CONFIG_IP_NF_TARGET_TOS=m
479CONFIG_IP_NF_TARGET_ECN=m 505CONFIG_IP_NF_TARGET_ECN=m
@@ -487,6 +513,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
487# 513#
488# IPv6: Netfilter Configuration (EXPERIMENTAL) 514# IPv6: Netfilter Configuration (EXPERIMENTAL)
489# 515#
516CONFIG_NF_CONNTRACK_IPV6=m
490CONFIG_IP6_NF_QUEUE=m 517CONFIG_IP6_NF_QUEUE=m
491CONFIG_IP6_NF_IPTABLES=m 518CONFIG_IP6_NF_IPTABLES=m
492CONFIG_IP6_NF_MATCH_RT=m 519CONFIG_IP6_NF_MATCH_RT=m
@@ -496,6 +523,7 @@ CONFIG_IP6_NF_MATCH_HL=m
496CONFIG_IP6_NF_MATCH_OWNER=m 523CONFIG_IP6_NF_MATCH_OWNER=m
497CONFIG_IP6_NF_MATCH_IPV6HEADER=m 524CONFIG_IP6_NF_MATCH_IPV6HEADER=m
498CONFIG_IP6_NF_MATCH_AH=m 525CONFIG_IP6_NF_MATCH_AH=m
526CONFIG_IP6_NF_MATCH_MH=m
499CONFIG_IP6_NF_MATCH_EUI64=m 527CONFIG_IP6_NF_MATCH_EUI64=m
500CONFIG_IP6_NF_FILTER=m 528CONFIG_IP6_NF_FILTER=m
501CONFIG_IP6_NF_TARGET_LOG=m 529CONFIG_IP6_NF_TARGET_LOG=m
@@ -568,6 +596,7 @@ CONFIG_IPDDP_DECAP=y
568# QoS and/or fair queueing 596# QoS and/or fair queueing
569# 597#
570CONFIG_NET_SCHED=y 598CONFIG_NET_SCHED=y
599CONFIG_NET_SCH_FIFO=y
571CONFIG_NET_SCH_CLK_JIFFIES=y 600CONFIG_NET_SCH_CLK_JIFFIES=y
572# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 601# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
573# CONFIG_NET_SCH_CLK_CPU is not set 602# CONFIG_NET_SCH_CLK_CPU is not set
@@ -655,6 +684,7 @@ CONFIG_MTD_PARTITIONS=y
655# User Modules And Translation Layers 684# User Modules And Translation Layers
656# 685#
657CONFIG_MTD_CHAR=y 686CONFIG_MTD_CHAR=y
687CONFIG_MTD_BLKDEVS=y
658CONFIG_MTD_BLOCK=y 688CONFIG_MTD_BLOCK=y
659# CONFIG_FTL is not set 689# CONFIG_FTL is not set
660# CONFIG_NFTL is not set 690# CONFIG_NFTL is not set
@@ -718,6 +748,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
718# NAND Flash Device Drivers 748# NAND Flash Device Drivers
719# 749#
720# CONFIG_MTD_NAND is not set 750# CONFIG_MTD_NAND is not set
751# CONFIG_MTD_NAND_CAFE is not set
721 752
722# 753#
723# OneNAND Flash Device Drivers 754# OneNAND Flash Device Drivers
@@ -757,6 +788,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
757CONFIG_ATA_OVER_ETH=m 788CONFIG_ATA_OVER_ETH=m
758 789
759# 790#
791# Misc devices
792#
793CONFIG_SGI_IOC4=m
794# CONFIG_TIFM_CORE is not set
795
796#
760# ATA/ATAPI/MFM/RLL support 797# ATA/ATAPI/MFM/RLL support
761# 798#
762CONFIG_IDE=y 799CONFIG_IDE=y
@@ -801,6 +838,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
801# CONFIG_BLK_DEV_JMICRON is not set 838# CONFIG_BLK_DEV_JMICRON is not set
802# CONFIG_BLK_DEV_SC1200 is not set 839# CONFIG_BLK_DEV_SC1200 is not set
803CONFIG_BLK_DEV_PIIX=y 840CONFIG_BLK_DEV_PIIX=y
841CONFIG_BLK_DEV_IT8213=m
804# CONFIG_BLK_DEV_IT821X is not set 842# CONFIG_BLK_DEV_IT821X is not set
805# CONFIG_BLK_DEV_NS87415 is not set 843# CONFIG_BLK_DEV_NS87415 is not set
806# CONFIG_BLK_DEV_PDC202XX_OLD is not set 844# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -810,6 +848,7 @@ CONFIG_BLK_DEV_PIIX=y
810# CONFIG_BLK_DEV_SLC90E66 is not set 848# CONFIG_BLK_DEV_SLC90E66 is not set
811# CONFIG_BLK_DEV_TRM290 is not set 849# CONFIG_BLK_DEV_TRM290 is not set
812# CONFIG_BLK_DEV_VIA82CXXX is not set 850# CONFIG_BLK_DEV_VIA82CXXX is not set
851CONFIG_BLK_DEV_TC86C001=m
813# CONFIG_IDE_ARM is not set 852# CONFIG_IDE_ARM is not set
814CONFIG_BLK_DEV_IDEDMA=y 853CONFIG_BLK_DEV_IDEDMA=y
815# CONFIG_IDEDMA_IVB is not set 854# CONFIG_IDEDMA_IVB is not set
@@ -821,6 +860,7 @@ CONFIG_IDEDMA_AUTO=y
821# 860#
822CONFIG_RAID_ATTRS=m 861CONFIG_RAID_ATTRS=m
823CONFIG_SCSI=m 862CONFIG_SCSI=m
863CONFIG_SCSI_TGT=m
824CONFIG_SCSI_NETLINK=y 864CONFIG_SCSI_NETLINK=y
825CONFIG_SCSI_PROC_FS=y 865CONFIG_SCSI_PROC_FS=y
826 866
@@ -841,6 +881,7 @@ CONFIG_CHR_DEV_SG=m
841CONFIG_SCSI_MULTI_LUN=y 881CONFIG_SCSI_MULTI_LUN=y
842CONFIG_SCSI_CONSTANTS=y 882CONFIG_SCSI_CONSTANTS=y
843CONFIG_SCSI_LOGGING=y 883CONFIG_SCSI_LOGGING=y
884CONFIG_SCSI_SCAN_ASYNC=y
844 885
845# 886#
846# SCSI Transports 887# SCSI Transports
@@ -889,6 +930,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
889# CONFIG_SCSI_DC390T is not set 930# CONFIG_SCSI_DC390T is not set
890# CONFIG_SCSI_NSP32 is not set 931# CONFIG_SCSI_NSP32 is not set
891# CONFIG_SCSI_DEBUG is not set 932# CONFIG_SCSI_DEBUG is not set
933# CONFIG_SCSI_SRP is not set
892 934
893# 935#
894# Serial ATA (prod) and Parallel ATA (experimental) drivers 936# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -964,6 +1006,7 @@ CONFIG_LXT_PHY=m
964CONFIG_CICADA_PHY=m 1006CONFIG_CICADA_PHY=m
965CONFIG_VITESSE_PHY=m 1007CONFIG_VITESSE_PHY=m
966CONFIG_SMSC_PHY=m 1008CONFIG_SMSC_PHY=m
1009# CONFIG_BROADCOM_PHY is not set
967# CONFIG_FIXED_PHY is not set 1010# CONFIG_FIXED_PHY is not set
968 1011
969# 1012#
@@ -1002,7 +1045,7 @@ CONFIG_PCNET32=y
1002# CONFIG_SUNDANCE is not set 1045# CONFIG_SUNDANCE is not set
1003# CONFIG_TLAN is not set 1046# CONFIG_TLAN is not set
1004# CONFIG_VIA_RHINE is not set 1047# CONFIG_VIA_RHINE is not set
1005# CONFIG_LAN_SAA9730 is not set 1048# CONFIG_SC92031 is not set
1006 1049
1007# 1050#
1008# Ethernet (1000 Mbit) 1051# Ethernet (1000 Mbit)
@@ -1022,14 +1065,17 @@ CONFIG_PCNET32=y
1022# CONFIG_TIGON3 is not set 1065# CONFIG_TIGON3 is not set
1023# CONFIG_BNX2 is not set 1066# CONFIG_BNX2 is not set
1024# CONFIG_QLA3XXX is not set 1067# CONFIG_QLA3XXX is not set
1068# CONFIG_ATL1 is not set
1025 1069
1026# 1070#
1027# Ethernet (10000 Mbit) 1071# Ethernet (10000 Mbit)
1028# 1072#
1029# CONFIG_CHELSIO_T1 is not set 1073# CONFIG_CHELSIO_T1 is not set
1074CONFIG_CHELSIO_T3=m
1030# CONFIG_IXGB is not set 1075# CONFIG_IXGB is not set
1031# CONFIG_S2IO is not set 1076# CONFIG_S2IO is not set
1032# CONFIG_MYRI10GE is not set 1077# CONFIG_MYRI10GE is not set
1078CONFIG_NETXEN_NIC=m
1033 1079
1034# 1080#
1035# Token Ring devices 1081# Token Ring devices
@@ -1146,10 +1192,6 @@ CONFIG_RTC=y
1146# CONFIG_DTLK is not set 1192# CONFIG_DTLK is not set
1147# CONFIG_R3964 is not set 1193# CONFIG_R3964 is not set
1148# CONFIG_APPLICOM is not set 1194# CONFIG_APPLICOM is not set
1149
1150#
1151# Ftape, the floppy tape device driver
1152#
1153# CONFIG_DRM is not set 1195# CONFIG_DRM is not set
1154# CONFIG_RAW_DRIVER is not set 1196# CONFIG_RAW_DRIVER is not set
1155 1197
@@ -1157,7 +1199,6 @@ CONFIG_RTC=y
1157# TPM devices 1199# TPM devices
1158# 1200#
1159# CONFIG_TCG_TPM is not set 1201# CONFIG_TCG_TPM is not set
1160# CONFIG_TELCLOCK is not set
1161 1202
1162# 1203#
1163# I2C support 1204# I2C support
@@ -1182,11 +1223,6 @@ CONFIG_RTC=y
1182# CONFIG_HWMON_VID is not set 1223# CONFIG_HWMON_VID is not set
1183 1224
1184# 1225#
1185# Misc devices
1186#
1187# CONFIG_TIFM_CORE is not set
1188
1189#
1190# Multimedia devices 1226# Multimedia devices
1191# 1227#
1192# CONFIG_VIDEO_DEV is not set 1228# CONFIG_VIDEO_DEV is not set
@@ -1215,6 +1251,12 @@ CONFIG_DUMMY_CONSOLE=y
1215# CONFIG_SOUND is not set 1251# CONFIG_SOUND is not set
1216 1252
1217# 1253#
1254# HID Devices
1255#
1256CONFIG_HID=m
1257# CONFIG_HID_DEBUG is not set
1258
1259#
1218# USB support 1260# USB support
1219# 1261#
1220CONFIG_USB_ARCH_HAS_HCD=y 1262CONFIG_USB_ARCH_HAS_HCD=y
@@ -1277,6 +1319,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1277# 1319#
1278 1320
1279# 1321#
1322# Auxiliary Display support
1323#
1324
1325#
1326# Virtualization
1327#
1328
1329#
1280# File systems 1330# File systems
1281# 1331#
1282CONFIG_EXT2_FS=y 1332CONFIG_EXT2_FS=y
@@ -1286,6 +1336,7 @@ CONFIG_EXT3_FS=y
1286CONFIG_EXT3_FS_XATTR=y 1336CONFIG_EXT3_FS_XATTR=y
1287# CONFIG_EXT3_FS_POSIX_ACL is not set 1337# CONFIG_EXT3_FS_POSIX_ACL is not set
1288# CONFIG_EXT3_FS_SECURITY is not set 1338# CONFIG_EXT3_FS_SECURITY is not set
1339# CONFIG_EXT4DEV_FS is not set
1289CONFIG_JBD=y 1340CONFIG_JBD=y
1290# CONFIG_JBD_DEBUG is not set 1341# CONFIG_JBD_DEBUG is not set
1291CONFIG_FS_MBCACHE=y 1342CONFIG_FS_MBCACHE=y
@@ -1327,7 +1378,6 @@ CONFIG_FUSE_FS=m
1327CONFIG_ISO9660_FS=m 1378CONFIG_ISO9660_FS=m
1328CONFIG_JOLIET=y 1379CONFIG_JOLIET=y
1329CONFIG_ZISOFS=y 1380CONFIG_ZISOFS=y
1330CONFIG_ZISOFS_FS=m
1331CONFIG_UDF_FS=m 1381CONFIG_UDF_FS=m
1332CONFIG_UDF_NLS=y 1382CONFIG_UDF_NLS=y
1333 1383
@@ -1365,6 +1415,20 @@ CONFIG_BEFS_FS=m
1365# CONFIG_BEFS_DEBUG is not set 1415# CONFIG_BEFS_DEBUG is not set
1366CONFIG_BFS_FS=m 1416CONFIG_BFS_FS=m
1367CONFIG_EFS_FS=m 1417CONFIG_EFS_FS=m
1418CONFIG_JFFS2_FS=m
1419CONFIG_JFFS2_FS_DEBUG=0
1420CONFIG_JFFS2_FS_WRITEBUFFER=y
1421# CONFIG_JFFS2_SUMMARY is not set
1422CONFIG_JFFS2_FS_XATTR=y
1423CONFIG_JFFS2_FS_POSIX_ACL=y
1424CONFIG_JFFS2_FS_SECURITY=y
1425CONFIG_JFFS2_COMPRESSION_OPTIONS=y
1426CONFIG_JFFS2_ZLIB=y
1427CONFIG_JFFS2_RTIME=y
1428CONFIG_JFFS2_RUBIN=y
1429# CONFIG_JFFS2_CMODE_NONE is not set
1430CONFIG_JFFS2_CMODE_PRIORITY=y
1431# CONFIG_JFFS2_CMODE_SIZE is not set
1368CONFIG_CRAMFS=m 1432CONFIG_CRAMFS=m
1369CONFIG_VXFS_FS=m 1433CONFIG_VXFS_FS=m
1370# CONFIG_HPFS_FS is not set 1434# CONFIG_HPFS_FS is not set
@@ -1470,9 +1534,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1470CONFIG_ENABLE_MUST_CHECK=y 1534CONFIG_ENABLE_MUST_CHECK=y
1471# CONFIG_MAGIC_SYSRQ is not set 1535# CONFIG_MAGIC_SYSRQ is not set
1472# CONFIG_UNUSED_SYMBOLS is not set 1536# CONFIG_UNUSED_SYMBOLS is not set
1537# CONFIG_DEBUG_FS is not set
1538# CONFIG_HEADERS_CHECK is not set
1473# CONFIG_DEBUG_KERNEL is not set 1539# CONFIG_DEBUG_KERNEL is not set
1474CONFIG_LOG_BUF_SHIFT=15 1540CONFIG_LOG_BUF_SHIFT=15
1475# CONFIG_DEBUG_FS is not set
1476CONFIG_CROSSCOMPILE=y 1541CONFIG_CROSSCOMPILE=y
1477CONFIG_CMDLINE="" 1542CONFIG_CMDLINE=""
1478 1543
@@ -1489,19 +1554,24 @@ CONFIG_CRYPTO=y
1489CONFIG_CRYPTO_ALGAPI=y 1554CONFIG_CRYPTO_ALGAPI=y
1490CONFIG_CRYPTO_BLKCIPHER=m 1555CONFIG_CRYPTO_BLKCIPHER=m
1491CONFIG_CRYPTO_HASH=y 1556CONFIG_CRYPTO_HASH=y
1492CONFIG_CRYPTO_MANAGER=m 1557CONFIG_CRYPTO_MANAGER=y
1493CONFIG_CRYPTO_HMAC=y 1558CONFIG_CRYPTO_HMAC=y
1559CONFIG_CRYPTO_XCBC=m
1494CONFIG_CRYPTO_NULL=m 1560CONFIG_CRYPTO_NULL=m
1495CONFIG_CRYPTO_MD4=m 1561CONFIG_CRYPTO_MD4=m
1496CONFIG_CRYPTO_MD5=m 1562CONFIG_CRYPTO_MD5=y
1497CONFIG_CRYPTO_SHA1=m 1563CONFIG_CRYPTO_SHA1=m
1498CONFIG_CRYPTO_SHA256=m 1564CONFIG_CRYPTO_SHA256=m
1499CONFIG_CRYPTO_SHA512=m 1565CONFIG_CRYPTO_SHA512=m
1500CONFIG_CRYPTO_WP512=m 1566CONFIG_CRYPTO_WP512=m
1501CONFIG_CRYPTO_TGR192=m 1567CONFIG_CRYPTO_TGR192=m
1568CONFIG_CRYPTO_GF128MUL=m
1502CONFIG_CRYPTO_ECB=m 1569CONFIG_CRYPTO_ECB=m
1503CONFIG_CRYPTO_CBC=m 1570CONFIG_CRYPTO_CBC=m
1571CONFIG_CRYPTO_PCBC=m
1572CONFIG_CRYPTO_LRW=m
1504CONFIG_CRYPTO_DES=m 1573CONFIG_CRYPTO_DES=m
1574CONFIG_CRYPTO_FCRYPT=m
1505CONFIG_CRYPTO_BLOWFISH=m 1575CONFIG_CRYPTO_BLOWFISH=m
1506CONFIG_CRYPTO_TWOFISH=m 1576CONFIG_CRYPTO_TWOFISH=m
1507CONFIG_CRYPTO_TWOFISH_COMMON=m 1577CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1516,6 +1586,7 @@ CONFIG_CRYPTO_ANUBIS=m
1516CONFIG_CRYPTO_DEFLATE=m 1586CONFIG_CRYPTO_DEFLATE=m
1517CONFIG_CRYPTO_MICHAEL_MIC=m 1587CONFIG_CRYPTO_MICHAEL_MIC=m
1518CONFIG_CRYPTO_CRC32C=m 1588CONFIG_CRYPTO_CRC32C=m
1589CONFIG_CRYPTO_CAMELLIA=m
1519# CONFIG_CRYPTO_TEST is not set 1590# CONFIG_CRYPTO_TEST is not set
1520 1591
1521# 1592#
@@ -1525,6 +1596,7 @@ CONFIG_CRYPTO_CRC32C=m
1525# 1596#
1526# Library routines 1597# Library routines
1527# 1598#
1599CONFIG_BITREVERSE=y
1528# CONFIG_CRC_CCITT is not set 1600# CONFIG_CRC_CCITT is not set
1529CONFIG_CRC16=m 1601CONFIG_CRC16=m
1530CONFIG_CRC32=y 1602CONFIG_CRC32=y
@@ -1536,3 +1608,5 @@ CONFIG_TEXTSEARCH_KMP=m
1536CONFIG_TEXTSEARCH_BM=m 1608CONFIG_TEXTSEARCH_BM=m
1537CONFIG_TEXTSEARCH_FSM=m 1609CONFIG_TEXTSEARCH_FSM=m
1538CONFIG_PLIST=y 1610CONFIG_PLIST=y
1611CONFIG_HAS_IOMEM=y
1612CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index 03efcfd0503b..2acb99bf2eca 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:13 2006 4# Sun Feb 18 21:27:56 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_SIM=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MIPS_SIM=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
@@ -117,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 127# CONFIG_64BIT_PHYS_ADDR is not set
124CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -148,6 +153,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +172,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 173CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
174# CONFIG_RELAY is not set 184# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_ALL is not set 190# CONFIG_KALLSYMS_ALL is not set
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -183,12 +194,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 194CONFIG_BUG=y
184CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 197CONFIG_FUTEX=y
188CONFIG_EPOLL=y 198CONFIG_EPOLL=y
189CONFIG_SHMEM=y 199CONFIG_SHMEM=y
190CONFIG_SLAB=y 200CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -206,6 +217,7 @@ CONFIG_KMOD=y
206# 217#
207# Block layer 218# Block layer
208# 219#
220CONFIG_BLOCK=y
209# CONFIG_LBD is not set 221# CONFIG_LBD is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
211 223
@@ -244,6 +256,13 @@ CONFIG_BINFMT_ELF=y
244CONFIG_TRAD_SIGNALS=y 256CONFIG_TRAD_SIGNALS=y
245 257
246# 258#
259# Power management options
260#
261CONFIG_PM=y
262# CONFIG_PM_LEGACY is not set
263# CONFIG_PM_DEBUG is not set
264
265#
247# Networking 266# Networking
248# 267#
249CONFIG_NET=y 268CONFIG_NET=y
@@ -257,7 +276,10 @@ CONFIG_PACKET_MMAP=y
257CONFIG_UNIX=y 276CONFIG_UNIX=y
258CONFIG_XFRM=y 277CONFIG_XFRM=y
259# CONFIG_XFRM_USER is not set 278# CONFIG_XFRM_USER is not set
279# CONFIG_XFRM_SUB_POLICY is not set
280CONFIG_XFRM_MIGRATE=y
260CONFIG_NET_KEY=y 281CONFIG_NET_KEY=y
282CONFIG_NET_KEY_MIGRATE=y
261CONFIG_INET=y 283CONFIG_INET=y
262CONFIG_IP_MULTICAST=y 284CONFIG_IP_MULTICAST=y
263CONFIG_IP_ADVANCED_ROUTER=y 285CONFIG_IP_ADVANCED_ROUTER=y
@@ -286,10 +308,13 @@ CONFIG_SYN_COOKIES=y
286# CONFIG_INET_TUNNEL is not set 308# CONFIG_INET_TUNNEL is not set
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 309CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 310CONFIG_INET_XFRM_MODE_TUNNEL=m
311CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 312CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 313CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 314# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 315CONFIG_TCP_CONG_CUBIC=y
316CONFIG_DEFAULT_TCP_CONG="cubic"
317CONFIG_TCP_MD5SIG=y
293# CONFIG_IPV6 is not set 318# CONFIG_IPV6 is not set
294# CONFIG_INET6_XFRM_TUNNEL is not set 319# CONFIG_INET6_XFRM_TUNNEL is not set
295# CONFIG_INET6_TUNNEL is not set 320# CONFIG_INET6_TUNNEL is not set
@@ -324,7 +349,6 @@ CONFIG_SCTP_HMAC_MD5=y
324# CONFIG_ATALK is not set 349# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 350# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 351# CONFIG_LAPB is not set
327CONFIG_NET_DIVERT=y
328# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
330 354
@@ -332,6 +356,7 @@ CONFIG_NET_DIVERT=y
332# QoS and/or fair queueing 356# QoS and/or fair queueing
333# 357#
334CONFIG_NET_SCHED=y 358CONFIG_NET_SCHED=y
359CONFIG_NET_SCH_FIFO=y
335CONFIG_NET_SCH_CLK_JIFFIES=y 360CONFIG_NET_SCH_CLK_JIFFIES=y
336# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 361# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
337# CONFIG_NET_SCH_CLK_CPU is not set 362# CONFIG_NET_SCH_CLK_CPU is not set
@@ -377,6 +402,7 @@ CONFIG_NET_ESTIMATOR=y
377# CONFIG_IRDA is not set 402# CONFIG_IRDA is not set
378# CONFIG_BT is not set 403# CONFIG_BT is not set
379# CONFIG_IEEE80211 is not set 404# CONFIG_IEEE80211 is not set
405CONFIG_FIB_RULES=y
380 406
381# 407#
382# Device Drivers 408# Device Drivers
@@ -389,6 +415,7 @@ CONFIG_NET_ESTIMATOR=y
389# CONFIG_PREVENT_FIRMWARE_BUILD is not set 415# CONFIG_PREVENT_FIRMWARE_BUILD is not set
390# CONFIG_FW_LOADER is not set 416# CONFIG_FW_LOADER is not set
391# CONFIG_DEBUG_DRIVER is not set 417# CONFIG_DEBUG_DRIVER is not set
418# CONFIG_DEBUG_DEVRES is not set
392# CONFIG_SYS_HYPERVISOR is not set 419# CONFIG_SYS_HYPERVISOR is not set
393 420
394# 421#
@@ -423,6 +450,10 @@ CONFIG_BLK_DEV_NBD=y
423# CONFIG_ATA_OVER_ETH is not set 450# CONFIG_ATA_OVER_ETH is not set
424 451
425# 452#
453# Misc devices
454#
455
456#
426# ATA/ATAPI/MFM/RLL support 457# ATA/ATAPI/MFM/RLL support
427# 458#
428# CONFIG_IDE is not set 459# CONFIG_IDE is not set
@@ -432,6 +463,12 @@ CONFIG_BLK_DEV_NBD=y
432# 463#
433# CONFIG_RAID_ATTRS is not set 464# CONFIG_RAID_ATTRS is not set
434# CONFIG_SCSI is not set 465# CONFIG_SCSI is not set
466# CONFIG_SCSI_NETLINK is not set
467
468#
469# Serial ATA (prod) and Parallel ATA (experimental) drivers
470#
471# CONFIG_ATA is not set
435 472
436# 473#
437# Multi-device support (RAID and LVM) 474# Multi-device support (RAID and LVM)
@@ -468,7 +505,6 @@ CONFIG_NETDEVICES=y
468# Ethernet (10 or 100Mbit) 505# Ethernet (10 or 100Mbit)
469# 506#
470# CONFIG_NET_ETHERNET is not set 507# CONFIG_NET_ETHERNET is not set
471# CONFIG_MIPS_SIM_NET is not set
472 508
473# 509#
474# Ethernet (1000 Mbit) 510# Ethernet (1000 Mbit)
@@ -512,6 +548,7 @@ CONFIG_NETDEVICES=y
512# Input device support 548# Input device support
513# 549#
514CONFIG_INPUT=y 550CONFIG_INPUT=y
551# CONFIG_INPUT_FF_MEMLESS is not set
515 552
516# 553#
517# Userland interfaces 554# Userland interfaces
@@ -579,17 +616,12 @@ CONFIG_LEGACY_PTY_COUNT=256
579# CONFIG_GEN_RTC is not set 616# CONFIG_GEN_RTC is not set
580# CONFIG_DTLK is not set 617# CONFIG_DTLK is not set
581# CONFIG_R3964 is not set 618# CONFIG_R3964 is not set
582
583#
584# Ftape, the floppy tape device driver
585#
586# CONFIG_RAW_DRIVER is not set 619# CONFIG_RAW_DRIVER is not set
587 620
588# 621#
589# TPM devices 622# TPM devices
590# 623#
591# CONFIG_TCG_TPM is not set 624# CONFIG_TCG_TPM is not set
592# CONFIG_TELCLOCK is not set
593 625
594# 626#
595# I2C support 627# I2C support
@@ -605,6 +637,7 @@ CONFIG_LEGACY_PTY_COUNT=256
605# 637#
606# Dallas's 1-wire bus 638# Dallas's 1-wire bus
607# 639#
640# CONFIG_W1 is not set
608 641
609# 642#
610# Hardware Monitoring support 643# Hardware Monitoring support
@@ -613,14 +646,9 @@ CONFIG_LEGACY_PTY_COUNT=256
613# CONFIG_HWMON_VID is not set 646# CONFIG_HWMON_VID is not set
614 647
615# 648#
616# Misc devices
617#
618
619#
620# Multimedia devices 649# Multimedia devices
621# 650#
622# CONFIG_VIDEO_DEV is not set 651# CONFIG_VIDEO_DEV is not set
623CONFIG_VIDEO_V4L2=y
624 652
625# 653#
626# Digital Video Broadcasting Devices 654# Digital Video Broadcasting Devices
@@ -639,6 +667,11 @@ CONFIG_VIDEO_V4L2=y
639# CONFIG_SOUND is not set 667# CONFIG_SOUND is not set
640 668
641# 669#
670# HID Devices
671#
672# CONFIG_HID is not set
673
674#
642# USB support 675# USB support
643# 676#
644# CONFIG_USB_ARCH_HAS_HCD is not set 677# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -699,16 +732,26 @@ CONFIG_VIDEO_V4L2=y
699# 732#
700 733
701# 734#
735# Auxiliary Display support
736#
737
738#
739# Virtualization
740#
741
742#
702# File systems 743# File systems
703# 744#
704CONFIG_EXT2_FS=y 745CONFIG_EXT2_FS=y
705# CONFIG_EXT2_FS_XATTR is not set 746# CONFIG_EXT2_FS_XATTR is not set
706# CONFIG_EXT2_FS_XIP is not set 747# CONFIG_EXT2_FS_XIP is not set
707# CONFIG_EXT3_FS is not set 748# CONFIG_EXT3_FS is not set
749# CONFIG_EXT4DEV_FS is not set
708# CONFIG_REISERFS_FS is not set 750# CONFIG_REISERFS_FS is not set
709# CONFIG_JFS_FS is not set 751# CONFIG_JFS_FS is not set
710# CONFIG_FS_POSIX_ACL is not set 752# CONFIG_FS_POSIX_ACL is not set
711# CONFIG_XFS_FS is not set 753# CONFIG_XFS_FS is not set
754# CONFIG_GFS2_FS is not set
712# CONFIG_MINIX_FS is not set 755# CONFIG_MINIX_FS is not set
713CONFIG_ROMFS_FS=y 756CONFIG_ROMFS_FS=y
714# CONFIG_INOTIFY is not set 757# CONFIG_INOTIFY is not set
@@ -736,6 +779,7 @@ CONFIG_ROMFS_FS=y
736# 779#
737CONFIG_PROC_FS=y 780CONFIG_PROC_FS=y
738# CONFIG_PROC_KCORE is not set 781# CONFIG_PROC_KCORE is not set
782CONFIG_PROC_SYSCTL=y
739# CONFIG_SYSFS is not set 783# CONFIG_SYSFS is not set
740# CONFIG_TMPFS is not set 784# CONFIG_TMPFS is not set
741# CONFIG_HUGETLB_PAGE is not set 785# CONFIG_HUGETLB_PAGE is not set
@@ -776,7 +820,6 @@ CONFIG_SUNRPC=y
776# CONFIG_RPCSEC_GSS_SPKM3 is not set 820# CONFIG_RPCSEC_GSS_SPKM3 is not set
777# CONFIG_SMB_FS is not set 821# CONFIG_SMB_FS is not set
778# CONFIG_CIFS is not set 822# CONFIG_CIFS is not set
779# CONFIG_CIFS_DEBUG2 is not set
780# CONFIG_NCP_FS is not set 823# CONFIG_NCP_FS is not set
781# CONFIG_CODA_FS is not set 824# CONFIG_CODA_FS is not set
782# CONFIG_AFS_FS is not set 825# CONFIG_AFS_FS is not set
@@ -794,6 +837,10 @@ CONFIG_MSDOS_PARTITION=y
794# CONFIG_NLS is not set 837# CONFIG_NLS is not set
795 838
796# 839#
840# Distributed Lock Manager
841#
842
843#
797# Profiling support 844# Profiling support
798# 845#
799# CONFIG_PROFILING is not set 846# CONFIG_PROFILING is not set
@@ -803,23 +850,29 @@ CONFIG_MSDOS_PARTITION=y
803# 850#
804CONFIG_TRACE_IRQFLAGS_SUPPORT=y 851CONFIG_TRACE_IRQFLAGS_SUPPORT=y
805# CONFIG_PRINTK_TIME is not set 852# CONFIG_PRINTK_TIME is not set
853CONFIG_ENABLE_MUST_CHECK=y
806# CONFIG_MAGIC_SYSRQ is not set 854# CONFIG_MAGIC_SYSRQ is not set
807# CONFIG_UNUSED_SYMBOLS is not set 855# CONFIG_UNUSED_SYMBOLS is not set
856# CONFIG_HEADERS_CHECK is not set
808CONFIG_DEBUG_KERNEL=y 857CONFIG_DEBUG_KERNEL=y
858# CONFIG_DEBUG_SHIRQ is not set
809CONFIG_LOG_BUF_SHIFT=14 859CONFIG_LOG_BUF_SHIFT=14
810# CONFIG_DETECT_SOFTLOCKUP is not set 860# CONFIG_DETECT_SOFTLOCKUP is not set
811# CONFIG_SCHEDSTATS is not set 861# CONFIG_SCHEDSTATS is not set
862# CONFIG_TIMER_STATS is not set
812# CONFIG_DEBUG_SLAB is not set 863# CONFIG_DEBUG_SLAB is not set
813# CONFIG_DEBUG_RT_MUTEXES is not set 864# CONFIG_DEBUG_RT_MUTEXES is not set
814# CONFIG_RT_MUTEX_TESTER is not set 865# CONFIG_RT_MUTEX_TESTER is not set
815# CONFIG_DEBUG_SPINLOCK is not set 866# CONFIG_DEBUG_SPINLOCK is not set
816CONFIG_DEBUG_MUTEXES=y 867CONFIG_DEBUG_MUTEXES=y
817# CONFIG_DEBUG_RWSEMS is not set 868# CONFIG_DEBUG_LOCK_ALLOC is not set
869# CONFIG_PROVE_LOCKING is not set
818# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 870# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
819# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 871# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
820# CONFIG_DEBUG_KOBJECT is not set 872# CONFIG_DEBUG_KOBJECT is not set
821CONFIG_DEBUG_INFO=y 873CONFIG_DEBUG_INFO=y
822# CONFIG_DEBUG_VM is not set 874# CONFIG_DEBUG_VM is not set
875# CONFIG_DEBUG_LIST is not set
823CONFIG_FORCED_INLINING=y 876CONFIG_FORCED_INLINING=y
824# CONFIG_RCU_TORTURE_TEST is not set 877# CONFIG_RCU_TORTURE_TEST is not set
825CONFIG_CROSSCOMPILE=y 878CONFIG_CROSSCOMPILE=y
@@ -838,7 +891,12 @@ CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
838# Cryptographic options 891# Cryptographic options
839# 892#
840CONFIG_CRYPTO=y 893CONFIG_CRYPTO=y
894CONFIG_CRYPTO_ALGAPI=y
895CONFIG_CRYPTO_BLKCIPHER=m
896CONFIG_CRYPTO_HASH=y
897CONFIG_CRYPTO_MANAGER=y
841CONFIG_CRYPTO_HMAC=y 898CONFIG_CRYPTO_HMAC=y
899CONFIG_CRYPTO_XCBC=m
842# CONFIG_CRYPTO_NULL is not set 900# CONFIG_CRYPTO_NULL is not set
843# CONFIG_CRYPTO_MD4 is not set 901# CONFIG_CRYPTO_MD4 is not set
844CONFIG_CRYPTO_MD5=y 902CONFIG_CRYPTO_MD5=y
@@ -847,7 +905,13 @@ CONFIG_CRYPTO_MD5=y
847# CONFIG_CRYPTO_SHA512 is not set 905# CONFIG_CRYPTO_SHA512 is not set
848# CONFIG_CRYPTO_WP512 is not set 906# CONFIG_CRYPTO_WP512 is not set
849# CONFIG_CRYPTO_TGR192 is not set 907# CONFIG_CRYPTO_TGR192 is not set
908CONFIG_CRYPTO_GF128MUL=m
909CONFIG_CRYPTO_ECB=m
910CONFIG_CRYPTO_CBC=m
911CONFIG_CRYPTO_PCBC=m
912CONFIG_CRYPTO_LRW=m
850# CONFIG_CRYPTO_DES is not set 913# CONFIG_CRYPTO_DES is not set
914CONFIG_CRYPTO_FCRYPT=m
851# CONFIG_CRYPTO_BLOWFISH is not set 915# CONFIG_CRYPTO_BLOWFISH is not set
852# CONFIG_CRYPTO_TWOFISH is not set 916# CONFIG_CRYPTO_TWOFISH is not set
853# CONFIG_CRYPTO_SERPENT is not set 917# CONFIG_CRYPTO_SERPENT is not set
@@ -861,6 +925,7 @@ CONFIG_CRYPTO_MD5=y
861# CONFIG_CRYPTO_DEFLATE is not set 925# CONFIG_CRYPTO_DEFLATE is not set
862# CONFIG_CRYPTO_MICHAEL_MIC is not set 926# CONFIG_CRYPTO_MICHAEL_MIC is not set
863# CONFIG_CRYPTO_CRC32C is not set 927# CONFIG_CRYPTO_CRC32C is not set
928CONFIG_CRYPTO_CAMELLIA=m
864# CONFIG_CRYPTO_TEST is not set 929# CONFIG_CRYPTO_TEST is not set
865 930
866# 931#
@@ -870,8 +935,11 @@ CONFIG_CRYPTO_MD5=y
870# 935#
871# Library routines 936# Library routines
872# 937#
938CONFIG_BITREVERSE=y
873# CONFIG_CRC_CCITT is not set 939# CONFIG_CRC_CCITT is not set
874CONFIG_CRC16=y 940CONFIG_CRC16=y
875CONFIG_CRC32=y 941CONFIG_CRC32=y
876# CONFIG_LIBCRC32C is not set 942# CONFIG_LIBCRC32C is not set
877CONFIG_PLIST=y 943CONFIG_PLIST=y
944CONFIG_HAS_IOMEM=y
945CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index e4221aafbc4c..d52a5a4877da 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc2 3# Linux kernel version: 2.6.20
4# Tue Jul 25 23:16:46 2006 4# Sun Feb 18 21:27:56 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -71,10 +71,14 @@ CONFIG_VICTOR_MPC30X=y
71# CONFIG_ZAO_CAPCELLA is not set 71# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_PCI_VR41XX=y 72CONFIG_PCI_VR41XX=y
73CONFIG_RWSEM_GENERIC_SPINLOCK=y 73CONFIG_RWSEM_GENERIC_SPINLOCK=y
74# CONFIG_ARCH_HAS_ILOG2_U32 is not set
75# CONFIG_ARCH_HAS_ILOG2_U64 is not set
74CONFIG_GENERIC_FIND_NEXT_BIT=y 76CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y 77CONFIG_GENERIC_HWEIGHT=y
76CONFIG_GENERIC_CALIBRATE_DELAY=y 78CONFIG_GENERIC_CALIBRATE_DELAY=y
79CONFIG_GENERIC_TIME=y
77CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
81CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
78CONFIG_DMA_NONCOHERENT=y 82CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 83CONFIG_DMA_NEED_PCI_MAP_STATE=y
80# CONFIG_CPU_BIG_ENDIAN is not set 84# CONFIG_CPU_BIG_ENDIAN is not set
@@ -107,6 +111,7 @@ CONFIG_CPU_VR41XX=y
107# CONFIG_CPU_SB1 is not set 111# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_VR41XX=y 112CONFIG_SYS_HAS_CPU_VR41XX=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 113CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
114CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 116CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 117
@@ -120,8 +125,8 @@ CONFIG_PAGE_SIZE_4KB=y
120# CONFIG_PAGE_SIZE_16KB is not set 125# CONFIG_PAGE_SIZE_16KB is not set
121# CONFIG_PAGE_SIZE_64KB is not set 126# CONFIG_PAGE_SIZE_64KB is not set
122CONFIG_MIPS_MT_DISABLED=y 127CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_MT_SMP is not set 128# CONFIG_MIPS_MT_SMP is not set
129# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set 130# CONFIG_MIPS_VPE_LOADER is not set
126CONFIG_CPU_HAS_SYNC=y 131CONFIG_CPU_HAS_SYNC=y
127CONFIG_GENERIC_HARDIRQS=y 132CONFIG_GENERIC_HARDIRQS=y
@@ -136,6 +141,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 143# CONFIG_RESOURCES_64BIT is not set
144CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -148,6 +154,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,16 +173,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 174CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
171# CONFIG_TASKSTATS is not set 180# CONFIG_TASKSTATS is not set
172CONFIG_SYSCTL=y 181# CONFIG_UTS_NS is not set
173# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
175CONFIG_RELAY=y 185CONFIG_RELAY=y
176CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
181CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -183,12 +194,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 194CONFIG_BUG=y
184CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 197CONFIG_FUTEX=y
188CONFIG_EPOLL=y 198CONFIG_EPOLL=y
189CONFIG_SHMEM=y 199CONFIG_SHMEM=y
190CONFIG_SLAB=y 200CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -206,6 +217,7 @@ CONFIG_KMOD=y
206# 217#
207# Block layer 218# Block layer
208# 219#
220CONFIG_BLOCK=y
209# CONFIG_LBD is not set 221# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -261,6 +273,14 @@ CONFIG_BINFMT_ELF=y
261CONFIG_TRAD_SIGNALS=y 273CONFIG_TRAD_SIGNALS=y
262 274
263# 275#
276# Power management options
277#
278CONFIG_PM=y
279# CONFIG_PM_LEGACY is not set
280# CONFIG_PM_DEBUG is not set
281# CONFIG_PM_SYSFS_DEPRECATED is not set
282
283#
264# Networking 284# Networking
265# 285#
266CONFIG_NET=y 286CONFIG_NET=y
@@ -274,7 +294,10 @@ CONFIG_PACKET_MMAP=y
274CONFIG_UNIX=y 294CONFIG_UNIX=y
275CONFIG_XFRM=y 295CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 296CONFIG_XFRM_USER=m
297# CONFIG_XFRM_SUB_POLICY is not set
298CONFIG_XFRM_MIGRATE=y
277CONFIG_NET_KEY=y 299CONFIG_NET_KEY=y
300CONFIG_NET_KEY_MIGRATE=y
278CONFIG_INET=y 301CONFIG_INET=y
279CONFIG_IP_MULTICAST=y 302CONFIG_IP_MULTICAST=y
280# CONFIG_IP_ADVANCED_ROUTER is not set 303# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -292,10 +315,13 @@ CONFIG_IP_FIB_HASH=y
292# CONFIG_INET_TUNNEL is not set 315# CONFIG_INET_TUNNEL is not set
293CONFIG_INET_XFRM_MODE_TRANSPORT=m 316CONFIG_INET_XFRM_MODE_TRANSPORT=m
294CONFIG_INET_XFRM_MODE_TUNNEL=m 317CONFIG_INET_XFRM_MODE_TUNNEL=m
318CONFIG_INET_XFRM_MODE_BEET=m
295CONFIG_INET_DIAG=y 319CONFIG_INET_DIAG=y
296CONFIG_INET_TCP_DIAG=y 320CONFIG_INET_TCP_DIAG=y
297# CONFIG_TCP_CONG_ADVANCED is not set 321# CONFIG_TCP_CONG_ADVANCED is not set
298CONFIG_TCP_CONG_BIC=y 322CONFIG_TCP_CONG_CUBIC=y
323CONFIG_DEFAULT_TCP_CONG="cubic"
324CONFIG_TCP_MD5SIG=y
299# CONFIG_IPV6 is not set 325# CONFIG_IPV6 is not set
300# CONFIG_INET6_XFRM_TUNNEL is not set 326# CONFIG_INET6_XFRM_TUNNEL is not set
301# CONFIG_INET6_TUNNEL is not set 327# CONFIG_INET6_TUNNEL is not set
@@ -325,7 +351,6 @@ CONFIG_NETWORK_SECMARK=y
325# CONFIG_ATALK is not set 351# CONFIG_ATALK is not set
326# CONFIG_X25 is not set 352# CONFIG_X25 is not set
327# CONFIG_LAPB is not set 353# CONFIG_LAPB is not set
328# CONFIG_NET_DIVERT is not set
329# CONFIG_ECONET is not set 354# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 355# CONFIG_WAN_ROUTER is not set
331 356
@@ -399,9 +424,16 @@ CONFIG_CONNECTOR=m
399CONFIG_ATA_OVER_ETH=m 424CONFIG_ATA_OVER_ETH=m
400 425
401# 426#
427# Misc devices
428#
429CONFIG_SGI_IOC4=m
430# CONFIG_TIFM_CORE is not set
431
432#
402# ATA/ATAPI/MFM/RLL support 433# ATA/ATAPI/MFM/RLL support
403# 434#
404CONFIG_IDE=y 435CONFIG_IDE=y
436CONFIG_IDE_MAX_HWIFS=4
405CONFIG_BLK_DEV_IDE=y 437CONFIG_BLK_DEV_IDE=y
406 438
407# 439#
@@ -431,6 +463,12 @@ CONFIG_IDE_GENERIC=y
431# 463#
432# CONFIG_RAID_ATTRS is not set 464# CONFIG_RAID_ATTRS is not set
433# CONFIG_SCSI is not set 465# CONFIG_SCSI is not set
466# CONFIG_SCSI_NETLINK is not set
467
468#
469# Serial ATA (prod) and Parallel ATA (experimental) drivers
470#
471# CONFIG_ATA is not set
434 472
435# 473#
436# Multi-device support (RAID and LVM) 474# Multi-device support (RAID and LVM)
@@ -492,14 +530,17 @@ CONFIG_MII=m
492# CONFIG_SK98LIN is not set 530# CONFIG_SK98LIN is not set
493# CONFIG_TIGON3 is not set 531# CONFIG_TIGON3 is not set
494# CONFIG_BNX2 is not set 532# CONFIG_BNX2 is not set
533CONFIG_QLA3XXX=m
495 534
496# 535#
497# Ethernet (10000 Mbit) 536# Ethernet (10000 Mbit)
498# 537#
499# CONFIG_CHELSIO_T1 is not set 538# CONFIG_CHELSIO_T1 is not set
539CONFIG_CHELSIO_T3=m
500# CONFIG_IXGB is not set 540# CONFIG_IXGB is not set
501# CONFIG_S2IO is not set 541# CONFIG_S2IO is not set
502# CONFIG_MYRI10GE is not set 542# CONFIG_MYRI10GE is not set
543CONFIG_NETXEN_NIC=m
503 544
504# 545#
505# Token Ring devices 546# Token Ring devices
@@ -594,6 +635,7 @@ CONFIG_PCMCIA_AXNET=m
594# Input device support 635# Input device support
595# 636#
596CONFIG_INPUT=y 637CONFIG_INPUT=y
638# CONFIG_INPUT_FF_MEMLESS is not set
597 639
598# 640#
599# Userland interfaces 641# Userland interfaces
@@ -665,10 +707,6 @@ CONFIG_LEGACY_PTY_COUNT=256
665# CONFIG_DTLK is not set 707# CONFIG_DTLK is not set
666# CONFIG_R3964 is not set 708# CONFIG_R3964 is not set
667# CONFIG_APPLICOM is not set 709# CONFIG_APPLICOM is not set
668
669#
670# Ftape, the floppy tape device driver
671#
672# CONFIG_DRM is not set 710# CONFIG_DRM is not set
673 711
674# 712#
@@ -684,7 +722,6 @@ CONFIG_LEGACY_PTY_COUNT=256
684# TPM devices 722# TPM devices
685# 723#
686# CONFIG_TCG_TPM is not set 724# CONFIG_TCG_TPM is not set
687# CONFIG_TELCLOCK is not set
688 725
689# 726#
690# I2C support 727# I2C support
@@ -709,14 +746,9 @@ CONFIG_LEGACY_PTY_COUNT=256
709# CONFIG_HWMON_VID is not set 746# CONFIG_HWMON_VID is not set
710 747
711# 748#
712# Misc devices
713#
714
715#
716# Multimedia devices 749# Multimedia devices
717# 750#
718# CONFIG_VIDEO_DEV is not set 751# CONFIG_VIDEO_DEV is not set
719CONFIG_VIDEO_V4L2=y
720 752
721# 753#
722# Digital Video Broadcasting Devices 754# Digital Video Broadcasting Devices
@@ -735,6 +767,7 @@ CONFIG_VIDEO_V4L2=y
735# 767#
736# CONFIG_VGA_CONSOLE is not set 768# CONFIG_VGA_CONSOLE is not set
737CONFIG_DUMMY_CONSOLE=y 769CONFIG_DUMMY_CONSOLE=y
770# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
738 771
739# 772#
740# Sound 773# Sound
@@ -742,6 +775,12 @@ CONFIG_DUMMY_CONSOLE=y
742# CONFIG_SOUND is not set 775# CONFIG_SOUND is not set
743 776
744# 777#
778# HID Devices
779#
780CONFIG_HID=y
781# CONFIG_HID_DEBUG is not set
782
783#
745# USB support 784# USB support
746# 785#
747CONFIG_USB_ARCH_HAS_HCD=y 786CONFIG_USB_ARCH_HAS_HCD=y
@@ -754,8 +793,8 @@ CONFIG_USB=m
754# Miscellaneous USB options 793# Miscellaneous USB options
755# 794#
756CONFIG_USB_DEVICEFS=y 795CONFIG_USB_DEVICEFS=y
757# CONFIG_USB_BANDWIDTH is not set
758# CONFIG_USB_DYNAMIC_MINORS is not set 796# CONFIG_USB_DYNAMIC_MINORS is not set
797# CONFIG_USB_SUSPEND is not set
759# CONFIG_USB_OTG is not set 798# CONFIG_USB_OTG is not set
760 799
761# 800#
@@ -764,7 +803,8 @@ CONFIG_USB_DEVICEFS=y
764# CONFIG_USB_EHCI_HCD is not set 803# CONFIG_USB_EHCI_HCD is not set
765# CONFIG_USB_ISP116X_HCD is not set 804# CONFIG_USB_ISP116X_HCD is not set
766CONFIG_USB_OHCI_HCD=m 805CONFIG_USB_OHCI_HCD=m
767# CONFIG_USB_OHCI_BIG_ENDIAN is not set 806# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
807# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
768CONFIG_USB_OHCI_LITTLE_ENDIAN=y 808CONFIG_USB_OHCI_LITTLE_ENDIAN=y
769# CONFIG_USB_UHCI_HCD is not set 809# CONFIG_USB_UHCI_HCD is not set
770# CONFIG_USB_SL811_HCD is not set 810# CONFIG_USB_SL811_HCD is not set
@@ -782,7 +822,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
782# 822#
783# may also be needed; see USB_STORAGE Help for more information 823# may also be needed; see USB_STORAGE Help for more information
784# 824#
785# CONFIG_USB_STORAGE is not set
786# CONFIG_USB_LIBUSUAL is not set 825# CONFIG_USB_LIBUSUAL is not set
787 826
788# 827#
@@ -807,6 +846,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
807# CONFIG_USB_ATI_REMOTE2 is not set 846# CONFIG_USB_ATI_REMOTE2 is not set
808# CONFIG_USB_KEYSPAN_REMOTE is not set 847# CONFIG_USB_KEYSPAN_REMOTE is not set
809# CONFIG_USB_APPLETOUCH is not set 848# CONFIG_USB_APPLETOUCH is not set
849# CONFIG_USB_GTCO is not set
810 850
811# 851#
812# USB Imaging devices 852# USB Imaging devices
@@ -820,6 +860,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
820# CONFIG_USB_KAWETH is not set 860# CONFIG_USB_KAWETH is not set
821CONFIG_USB_PEGASUS=m 861CONFIG_USB_PEGASUS=m
822# CONFIG_USB_RTL8150 is not set 862# CONFIG_USB_RTL8150 is not set
863# CONFIG_USB_USBNET_MII is not set
823# CONFIG_USB_USBNET is not set 864# CONFIG_USB_USBNET is not set
824# CONFIG_USB_MON is not set 865# CONFIG_USB_MON is not set
825 866
@@ -837,6 +878,7 @@ CONFIG_USB_PEGASUS=m
837# 878#
838# CONFIG_USB_EMI62 is not set 879# CONFIG_USB_EMI62 is not set
839# CONFIG_USB_EMI26 is not set 880# CONFIG_USB_EMI26 is not set
881# CONFIG_USB_ADUTUX is not set
840# CONFIG_USB_AUERSWALD is not set 882# CONFIG_USB_AUERSWALD is not set
841# CONFIG_USB_RIO500 is not set 883# CONFIG_USB_RIO500 is not set
842# CONFIG_USB_LEGOTOWER is not set 884# CONFIG_USB_LEGOTOWER is not set
@@ -844,11 +886,12 @@ CONFIG_USB_PEGASUS=m
844# CONFIG_USB_LED is not set 886# CONFIG_USB_LED is not set
845# CONFIG_USB_CYPRESS_CY7C63 is not set 887# CONFIG_USB_CYPRESS_CY7C63 is not set
846# CONFIG_USB_CYTHERM is not set 888# CONFIG_USB_CYTHERM is not set
847# CONFIG_USB_PHIDGETKIT is not set 889# CONFIG_USB_PHIDGET is not set
848# CONFIG_USB_PHIDGETSERVO is not set
849# CONFIG_USB_IDMOUSE is not set 890# CONFIG_USB_IDMOUSE is not set
891# CONFIG_USB_FTDI_ELAN is not set
850# CONFIG_USB_APPLEDISPLAY is not set 892# CONFIG_USB_APPLEDISPLAY is not set
851# CONFIG_USB_LD is not set 893# CONFIG_USB_LD is not set
894# CONFIG_USB_TRANCEVIBRATOR is not set
852# CONFIG_USB_TEST is not set 895# CONFIG_USB_TEST is not set
853 896
854# 897#
@@ -906,16 +949,26 @@ CONFIG_USB_PEGASUS=m
906# 949#
907 950
908# 951#
952# Auxiliary Display support
953#
954
955#
956# Virtualization
957#
958
959#
909# File systems 960# File systems
910# 961#
911CONFIG_EXT2_FS=y 962CONFIG_EXT2_FS=y
912# CONFIG_EXT2_FS_XATTR is not set 963# CONFIG_EXT2_FS_XATTR is not set
913# CONFIG_EXT2_FS_XIP is not set 964# CONFIG_EXT2_FS_XIP is not set
914# CONFIG_EXT3_FS is not set 965# CONFIG_EXT3_FS is not set
966# CONFIG_EXT4DEV_FS is not set
915# CONFIG_REISERFS_FS is not set 967# CONFIG_REISERFS_FS is not set
916# CONFIG_JFS_FS is not set 968# CONFIG_JFS_FS is not set
917# CONFIG_FS_POSIX_ACL is not set 969# CONFIG_FS_POSIX_ACL is not set
918# CONFIG_XFS_FS is not set 970# CONFIG_XFS_FS is not set
971# CONFIG_GFS2_FS is not set
919# CONFIG_OCFS2_FS is not set 972# CONFIG_OCFS2_FS is not set
920# CONFIG_MINIX_FS is not set 973# CONFIG_MINIX_FS is not set
921# CONFIG_ROMFS_FS is not set 974# CONFIG_ROMFS_FS is not set
@@ -945,17 +998,19 @@ CONFIG_FUSE_FS=m
945# 998#
946CONFIG_PROC_FS=y 999CONFIG_PROC_FS=y
947CONFIG_PROC_KCORE=y 1000CONFIG_PROC_KCORE=y
1001CONFIG_PROC_SYSCTL=y
948CONFIG_SYSFS=y 1002CONFIG_SYSFS=y
949# CONFIG_TMPFS is not set 1003# CONFIG_TMPFS is not set
950# CONFIG_HUGETLB_PAGE is not set 1004# CONFIG_HUGETLB_PAGE is not set
951CONFIG_RAMFS=y 1005CONFIG_RAMFS=y
952# CONFIG_CONFIGFS_FS is not set 1006CONFIG_CONFIGFS_FS=m
953 1007
954# 1008#
955# Miscellaneous filesystems 1009# Miscellaneous filesystems
956# 1010#
957# CONFIG_ADFS_FS is not set 1011# CONFIG_ADFS_FS is not set
958# CONFIG_AFFS_FS is not set 1012# CONFIG_AFFS_FS is not set
1013# CONFIG_ECRYPT_FS is not set
959# CONFIG_HFS_FS is not set 1014# CONFIG_HFS_FS is not set
960# CONFIG_HFSPLUS_FS is not set 1015# CONFIG_HFSPLUS_FS is not set
961# CONFIG_BEFS_FS is not set 1016# CONFIG_BEFS_FS is not set
@@ -1000,6 +1055,14 @@ CONFIG_MSDOS_PARTITION=y
1000# CONFIG_NLS is not set 1055# CONFIG_NLS is not set
1001 1056
1002# 1057#
1058# Distributed Lock Manager
1059#
1060CONFIG_DLM=m
1061CONFIG_DLM_TCP=y
1062# CONFIG_DLM_SCTP is not set
1063# CONFIG_DLM_DEBUG is not set
1064
1065#
1003# Profiling support 1066# Profiling support
1004# 1067#
1005# CONFIG_PROFILING is not set 1068# CONFIG_PROFILING is not set
@@ -1009,11 +1072,13 @@ CONFIG_MSDOS_PARTITION=y
1009# 1072#
1010CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1073CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1011# CONFIG_PRINTK_TIME is not set 1074# CONFIG_PRINTK_TIME is not set
1075CONFIG_ENABLE_MUST_CHECK=y
1012# CONFIG_MAGIC_SYSRQ is not set 1076# CONFIG_MAGIC_SYSRQ is not set
1013# CONFIG_UNUSED_SYMBOLS is not set 1077# CONFIG_UNUSED_SYMBOLS is not set
1078# CONFIG_DEBUG_FS is not set
1079# CONFIG_HEADERS_CHECK is not set
1014# CONFIG_DEBUG_KERNEL is not set 1080# CONFIG_DEBUG_KERNEL is not set
1015CONFIG_LOG_BUF_SHIFT=14 1081CONFIG_LOG_BUF_SHIFT=14
1016# CONFIG_DEBUG_FS is not set
1017CONFIG_CROSSCOMPILE=y 1082CONFIG_CROSSCOMPILE=y
1018CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" 1083CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73"
1019 1084
@@ -1028,18 +1093,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1028# Cryptographic options 1093# Cryptographic options
1029# 1094#
1030CONFIG_CRYPTO=y 1095CONFIG_CRYPTO=y
1096CONFIG_CRYPTO_ALGAPI=y
1097CONFIG_CRYPTO_BLKCIPHER=m
1098CONFIG_CRYPTO_HASH=y
1099CONFIG_CRYPTO_MANAGER=y
1031CONFIG_CRYPTO_HMAC=y 1100CONFIG_CRYPTO_HMAC=y
1101CONFIG_CRYPTO_XCBC=m
1032CONFIG_CRYPTO_NULL=m 1102CONFIG_CRYPTO_NULL=m
1033CONFIG_CRYPTO_MD4=m 1103CONFIG_CRYPTO_MD4=m
1034CONFIG_CRYPTO_MD5=m 1104CONFIG_CRYPTO_MD5=y
1035CONFIG_CRYPTO_SHA1=m 1105CONFIG_CRYPTO_SHA1=m
1036CONFIG_CRYPTO_SHA256=m 1106CONFIG_CRYPTO_SHA256=m
1037CONFIG_CRYPTO_SHA512=m 1107CONFIG_CRYPTO_SHA512=m
1038CONFIG_CRYPTO_WP512=m 1108CONFIG_CRYPTO_WP512=m
1039CONFIG_CRYPTO_TGR192=m 1109CONFIG_CRYPTO_TGR192=m
1110CONFIG_CRYPTO_GF128MUL=m
1111CONFIG_CRYPTO_ECB=m
1112CONFIG_CRYPTO_CBC=m
1113CONFIG_CRYPTO_PCBC=m
1114CONFIG_CRYPTO_LRW=m
1040CONFIG_CRYPTO_DES=m 1115CONFIG_CRYPTO_DES=m
1116CONFIG_CRYPTO_FCRYPT=m
1041CONFIG_CRYPTO_BLOWFISH=m 1117CONFIG_CRYPTO_BLOWFISH=m
1042CONFIG_CRYPTO_TWOFISH=m 1118CONFIG_CRYPTO_TWOFISH=m
1119CONFIG_CRYPTO_TWOFISH_COMMON=m
1043CONFIG_CRYPTO_SERPENT=m 1120CONFIG_CRYPTO_SERPENT=m
1044CONFIG_CRYPTO_AES=m 1121CONFIG_CRYPTO_AES=m
1045CONFIG_CRYPTO_CAST5=m 1122CONFIG_CRYPTO_CAST5=m
@@ -1051,6 +1128,7 @@ CONFIG_CRYPTO_ANUBIS=m
1051CONFIG_CRYPTO_DEFLATE=m 1128CONFIG_CRYPTO_DEFLATE=m
1052CONFIG_CRYPTO_MICHAEL_MIC=m 1129CONFIG_CRYPTO_MICHAEL_MIC=m
1053CONFIG_CRYPTO_CRC32C=m 1130CONFIG_CRYPTO_CRC32C=m
1131CONFIG_CRYPTO_CAMELLIA=m
1054# CONFIG_CRYPTO_TEST is not set 1132# CONFIG_CRYPTO_TEST is not set
1055 1133
1056# 1134#
@@ -1060,6 +1138,7 @@ CONFIG_CRYPTO_CRC32C=m
1060# 1138#
1061# Library routines 1139# Library routines
1062# 1140#
1141CONFIG_BITREVERSE=y
1063# CONFIG_CRC_CCITT is not set 1142# CONFIG_CRC_CCITT is not set
1064CONFIG_CRC16=m 1143CONFIG_CRC16=m
1065CONFIG_CRC32=y 1144CONFIG_CRC32=y
@@ -1067,3 +1146,5 @@ CONFIG_LIBCRC32C=m
1067CONFIG_ZLIB_INFLATE=m 1146CONFIG_ZLIB_INFLATE=m
1068CONFIG_ZLIB_DEFLATE=m 1147CONFIG_ZLIB_DEFLATE=m
1069CONFIG_PLIST=y 1148CONFIG_PLIST=y
1149CONFIG_HAS_IOMEM=y
1150CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index 32b1afdd1c20..746106b88bab 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:15 2006 4# Sun Feb 18 21:27:58 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MOMENCO_OCELOT_3=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MOMENCO_OCELOT_3=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -104,6 +108,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
104CONFIG_CPU_RM9000=y 108CONFIG_CPU_RM9000=y
105# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_RM9000=y 110CONFIG_SYS_HAS_CPU_RM9000=y
111CONFIG_WEAK_ORDERING=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 113CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -122,8 +127,8 @@ CONFIG_BOARD_SCACHE=y
122CONFIG_RM7000_CPU_SCACHE=y 127CONFIG_RM7000_CPU_SCACHE=y
123CONFIG_CPU_HAS_PREFETCH=y 128CONFIG_CPU_HAS_PREFETCH=y
124CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
125# CONFIG_MIPS_MT_SMTC is not set
126# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
128# CONFIG_64BIT_PHYS_ADDR is not set 133# CONFIG_64BIT_PHYS_ADDR is not set
129CONFIG_CPU_HAS_LLSC=y 134CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -153,6 +159,7 @@ CONFIG_HZ=1000
153CONFIG_PREEMPT_NONE=y 159CONFIG_PREEMPT_NONE=y
154# CONFIG_PREEMPT_VOLUNTARY is not set 160# CONFIG_PREEMPT_VOLUNTARY is not set
155# CONFIG_PREEMPT is not set 161# CONFIG_PREEMPT is not set
162# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +178,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 178CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 179CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 183# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 184# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 185# CONFIG_TASKSTATS is not set
186# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
178CONFIG_IKCONFIG=y 188CONFIG_IKCONFIG=y
179CONFIG_IKCONFIG_PROC=y 189CONFIG_IKCONFIG_PROC=y
190CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 191CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 192# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
193CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 194CONFIG_EMBEDDED=y
195CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 196CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 197# CONFIG_KALLSYMS_EXTRA_PASS is not set
186CONFIG_HOTPLUG=y 198CONFIG_HOTPLUG=y
@@ -188,12 +200,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 200CONFIG_BUG=y
189CONFIG_ELF_CORE=y 201CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 202CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 203CONFIG_FUTEX=y
193CONFIG_EPOLL=y 204CONFIG_EPOLL=y
194CONFIG_SHMEM=y 205CONFIG_SHMEM=y
195CONFIG_SLAB=y 206CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 207CONFIG_VM_EVENT_COUNTERS=y
208CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 209# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 210CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 211# CONFIG_SLOB is not set
@@ -211,6 +223,7 @@ CONFIG_KMOD=y
211# 223#
212# Block layer 224# Block layer
213# 225#
226CONFIG_BLOCK=y
214# CONFIG_LBD is not set 227# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 228# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 229# CONFIG_LSF is not set
@@ -253,6 +266,14 @@ CONFIG_BINFMT_ELF=y
253CONFIG_TRAD_SIGNALS=y 266CONFIG_TRAD_SIGNALS=y
254 267
255# 268#
269# Power management options
270#
271CONFIG_PM=y
272# CONFIG_PM_LEGACY is not set
273# CONFIG_PM_DEBUG is not set
274# CONFIG_PM_SYSFS_DEPRECATED is not set
275
276#
256# Networking 277# Networking
257# 278#
258CONFIG_NET=y 279CONFIG_NET=y
@@ -266,7 +287,10 @@ CONFIG_PACKET=y
266CONFIG_UNIX=y 287CONFIG_UNIX=y
267CONFIG_XFRM=y 288CONFIG_XFRM=y
268# CONFIG_XFRM_USER is not set 289# CONFIG_XFRM_USER is not set
290# CONFIG_XFRM_SUB_POLICY is not set
291CONFIG_XFRM_MIGRATE=y
269CONFIG_NET_KEY=y 292CONFIG_NET_KEY=y
293CONFIG_NET_KEY_MIGRATE=y
270CONFIG_INET=y 294CONFIG_INET=y
271# CONFIG_IP_MULTICAST is not set 295# CONFIG_IP_MULTICAST is not set
272# CONFIG_IP_ADVANCED_ROUTER is not set 296# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -283,13 +307,16 @@ CONFIG_IP_PNP_BOOTP=y
283# CONFIG_INET_ESP is not set 307# CONFIG_INET_ESP is not set
284# CONFIG_INET_IPCOMP is not set 308# CONFIG_INET_IPCOMP is not set
285# CONFIG_INET_XFRM_TUNNEL is not set 309# CONFIG_INET_XFRM_TUNNEL is not set
286# CONFIG_INET_TUNNEL is not set 310CONFIG_INET_TUNNEL=m
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 311CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 312CONFIG_INET_XFRM_MODE_TUNNEL=m
313CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 314CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 315CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 316# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 317CONFIG_TCP_CONG_CUBIC=y
318CONFIG_DEFAULT_TCP_CONG="cubic"
319CONFIG_TCP_MD5SIG=y
293 320
294# 321#
295# IP: Virtual Server Configuration 322# IP: Virtual Server Configuration
@@ -302,11 +329,17 @@ CONFIG_IPV6_ROUTE_INFO=y
302# CONFIG_INET6_AH is not set 329# CONFIG_INET6_AH is not set
303# CONFIG_INET6_ESP is not set 330# CONFIG_INET6_ESP is not set
304# CONFIG_INET6_IPCOMP is not set 331# CONFIG_INET6_IPCOMP is not set
332CONFIG_IPV6_MIP6=y
305# CONFIG_INET6_XFRM_TUNNEL is not set 333# CONFIG_INET6_XFRM_TUNNEL is not set
306# CONFIG_INET6_TUNNEL is not set 334# CONFIG_INET6_TUNNEL is not set
307CONFIG_INET6_XFRM_MODE_TRANSPORT=m 335CONFIG_INET6_XFRM_MODE_TRANSPORT=m
308CONFIG_INET6_XFRM_MODE_TUNNEL=m 336CONFIG_INET6_XFRM_MODE_TUNNEL=m
337CONFIG_INET6_XFRM_MODE_BEET=m
338CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
339CONFIG_IPV6_SIT=m
309# CONFIG_IPV6_TUNNEL is not set 340# CONFIG_IPV6_TUNNEL is not set
341CONFIG_IPV6_MULTIPLE_TABLES=y
342CONFIG_IPV6_SUBTREES=y
310CONFIG_NETWORK_SECMARK=y 343CONFIG_NETWORK_SECMARK=y
311CONFIG_NETFILTER=y 344CONFIG_NETFILTER=y
312# CONFIG_NETFILTER_DEBUG is not set 345# CONFIG_NETFILTER_DEBUG is not set
@@ -317,15 +350,42 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 350CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 351CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 352CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_NF_CONNTRACK is not set 353CONFIG_NF_CONNTRACK_ENABLED=m
354CONFIG_NF_CONNTRACK_SUPPORT=y
355# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
356CONFIG_NF_CONNTRACK=m
357CONFIG_NF_CT_ACCT=y
358CONFIG_NF_CONNTRACK_MARK=y
359CONFIG_NF_CONNTRACK_SECMARK=y
360CONFIG_NF_CONNTRACK_EVENTS=y
361CONFIG_NF_CT_PROTO_GRE=m
362CONFIG_NF_CT_PROTO_SCTP=m
363CONFIG_NF_CONNTRACK_AMANDA=m
364CONFIG_NF_CONNTRACK_FTP=m
365CONFIG_NF_CONNTRACK_H323=m
366CONFIG_NF_CONNTRACK_IRC=m
367# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
368CONFIG_NF_CONNTRACK_PPTP=m
369CONFIG_NF_CONNTRACK_SANE=m
370CONFIG_NF_CONNTRACK_SIP=m
371CONFIG_NF_CONNTRACK_TFTP=m
372CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 373CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 374CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_MARK=m 375CONFIG_NETFILTER_XT_TARGET_MARK=m
324CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 376CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
377CONFIG_NETFILTER_XT_TARGET_NFLOG=m
325CONFIG_NETFILTER_XT_TARGET_SECMARK=m 378CONFIG_NETFILTER_XT_TARGET_SECMARK=m
379CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
380CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
326CONFIG_NETFILTER_XT_MATCH_COMMENT=m 381CONFIG_NETFILTER_XT_MATCH_COMMENT=m
382CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
383CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
384CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
327CONFIG_NETFILTER_XT_MATCH_DCCP=m 385CONFIG_NETFILTER_XT_MATCH_DCCP=m
386CONFIG_NETFILTER_XT_MATCH_DSCP=m
328CONFIG_NETFILTER_XT_MATCH_ESP=m 387CONFIG_NETFILTER_XT_MATCH_ESP=m
388CONFIG_NETFILTER_XT_MATCH_HELPER=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 389CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 390CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 391CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -336,14 +396,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 396CONFIG_NETFILTER_XT_MATCH_QUOTA=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 397CONFIG_NETFILTER_XT_MATCH_REALM=m
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 398CONFIG_NETFILTER_XT_MATCH_SCTP=m
399CONFIG_NETFILTER_XT_MATCH_STATE=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 400CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 401CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 402CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
403CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
342 404
343# 405#
344# IP: Netfilter Configuration 406# IP: Netfilter Configuration
345# 407#
346# CONFIG_IP_NF_CONNTRACK is not set 408CONFIG_NF_CONNTRACK_IPV4=m
409CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set 410# CONFIG_IP_NF_QUEUE is not set
348# CONFIG_IP_NF_IPTABLES is not set 411# CONFIG_IP_NF_IPTABLES is not set
349# CONFIG_IP_NF_ARPTABLES is not set 412# CONFIG_IP_NF_ARPTABLES is not set
@@ -351,6 +414,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
351# 414#
352# IPv6: Netfilter Configuration (EXPERIMENTAL) 415# IPv6: Netfilter Configuration (EXPERIMENTAL)
353# 416#
417CONFIG_NF_CONNTRACK_IPV6=m
354# CONFIG_IP6_NF_QUEUE is not set 418# CONFIG_IP6_NF_QUEUE is not set
355# CONFIG_IP6_NF_IPTABLES is not set 419# CONFIG_IP6_NF_IPTABLES is not set
356 420
@@ -377,7 +441,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
377# CONFIG_ATALK is not set 441# CONFIG_ATALK is not set
378# CONFIG_X25 is not set 442# CONFIG_X25 is not set
379# CONFIG_LAPB is not set 443# CONFIG_LAPB is not set
380# CONFIG_NET_DIVERT is not set
381# CONFIG_ECONET is not set 444# CONFIG_ECONET is not set
382# CONFIG_WAN_ROUTER is not set 445# CONFIG_WAN_ROUTER is not set
383 446
@@ -401,6 +464,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
401CONFIG_IEEE80211_SOFTMAC=m 464CONFIG_IEEE80211_SOFTMAC=m
402# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 465# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
403CONFIG_WIRELESS_EXT=y 466CONFIG_WIRELESS_EXT=y
467CONFIG_FIB_RULES=y
404 468
405# 469#
406# Device Drivers 470# Device Drivers
@@ -451,6 +515,12 @@ CONFIG_BLK_DEV_LOOP=y
451CONFIG_ATA_OVER_ETH=m 515CONFIG_ATA_OVER_ETH=m
452 516
453# 517#
518# Misc devices
519#
520CONFIG_SGI_IOC4=m
521# CONFIG_TIFM_CORE is not set
522
523#
454# ATA/ATAPI/MFM/RLL support 524# ATA/ATAPI/MFM/RLL support
455# 525#
456# CONFIG_IDE is not set 526# CONFIG_IDE is not set
@@ -460,6 +530,8 @@ CONFIG_ATA_OVER_ETH=m
460# 530#
461CONFIG_RAID_ATTRS=m 531CONFIG_RAID_ATTRS=m
462CONFIG_SCSI=m 532CONFIG_SCSI=m
533CONFIG_SCSI_TGT=m
534CONFIG_SCSI_NETLINK=y
463CONFIG_SCSI_PROC_FS=y 535CONFIG_SCSI_PROC_FS=y
464 536
465# 537#
@@ -478,14 +550,17 @@ CONFIG_SCSI_PROC_FS=y
478# CONFIG_SCSI_MULTI_LUN is not set 550# CONFIG_SCSI_MULTI_LUN is not set
479# CONFIG_SCSI_CONSTANTS is not set 551# CONFIG_SCSI_CONSTANTS is not set
480# CONFIG_SCSI_LOGGING is not set 552# CONFIG_SCSI_LOGGING is not set
553CONFIG_SCSI_SCAN_ASYNC=y
481 554
482# 555#
483# SCSI Transport Attributes 556# SCSI Transports
484# 557#
485# CONFIG_SCSI_SPI_ATTRS is not set 558# CONFIG_SCSI_SPI_ATTRS is not set
486CONFIG_SCSI_FC_ATTRS=m 559CONFIG_SCSI_FC_ATTRS=m
487CONFIG_SCSI_ISCSI_ATTRS=m 560CONFIG_SCSI_ISCSI_ATTRS=m
488CONFIG_SCSI_SAS_ATTRS=m 561CONFIG_SCSI_SAS_ATTRS=m
562CONFIG_SCSI_SAS_LIBSAS=m
563# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
489 564
490# 565#
491# SCSI low-level drivers 566# SCSI low-level drivers
@@ -498,26 +573,35 @@ CONFIG_ISCSI_TCP=m
498# CONFIG_SCSI_AIC7XXX is not set 573# CONFIG_SCSI_AIC7XXX is not set
499# CONFIG_SCSI_AIC7XXX_OLD is not set 574# CONFIG_SCSI_AIC7XXX_OLD is not set
500# CONFIG_SCSI_AIC79XX is not set 575# CONFIG_SCSI_AIC79XX is not set
576CONFIG_SCSI_AIC94XX=m
577# CONFIG_AIC94XX_DEBUG is not set
501# CONFIG_SCSI_DPT_I2O is not set 578# CONFIG_SCSI_DPT_I2O is not set
579# CONFIG_SCSI_ARCMSR is not set
502# CONFIG_MEGARAID_NEWGEN is not set 580# CONFIG_MEGARAID_NEWGEN is not set
503# CONFIG_MEGARAID_LEGACY is not set 581# CONFIG_MEGARAID_LEGACY is not set
504# CONFIG_MEGARAID_SAS is not set 582# CONFIG_MEGARAID_SAS is not set
505# CONFIG_SCSI_SATA is not set
506# CONFIG_SCSI_HPTIOP is not set 583# CONFIG_SCSI_HPTIOP is not set
507# CONFIG_SCSI_DMX3191D is not set 584# CONFIG_SCSI_DMX3191D is not set
508# CONFIG_SCSI_FUTURE_DOMAIN is not set 585# CONFIG_SCSI_FUTURE_DOMAIN is not set
509# CONFIG_SCSI_IPS is not set 586# CONFIG_SCSI_IPS is not set
510# CONFIG_SCSI_INITIO is not set 587# CONFIG_SCSI_INITIO is not set
511# CONFIG_SCSI_INIA100 is not set 588# CONFIG_SCSI_INIA100 is not set
589# CONFIG_SCSI_STEX is not set
512# CONFIG_SCSI_SYM53C8XX_2 is not set 590# CONFIG_SCSI_SYM53C8XX_2 is not set
513# CONFIG_SCSI_IPR is not set
514# CONFIG_SCSI_QLOGIC_1280 is not set 591# CONFIG_SCSI_QLOGIC_1280 is not set
515# CONFIG_SCSI_QLA_FC is not set 592# CONFIG_SCSI_QLA_FC is not set
593# CONFIG_SCSI_QLA_ISCSI is not set
516# CONFIG_SCSI_LPFC is not set 594# CONFIG_SCSI_LPFC is not set
517# CONFIG_SCSI_DC395x is not set 595# CONFIG_SCSI_DC395x is not set
518# CONFIG_SCSI_DC390T is not set 596# CONFIG_SCSI_DC390T is not set
519# CONFIG_SCSI_NSP32 is not set 597# CONFIG_SCSI_NSP32 is not set
520# CONFIG_SCSI_DEBUG is not set 598# CONFIG_SCSI_DEBUG is not set
599# CONFIG_SCSI_SRP is not set
600
601#
602# Serial ATA (prod) and Parallel ATA (experimental) drivers
603#
604# CONFIG_ATA is not set
521 605
522# 606#
523# Multi-device support (RAID and LVM) 607# Multi-device support (RAID and LVM)
@@ -571,6 +655,8 @@ CONFIG_LXT_PHY=m
571CONFIG_CICADA_PHY=m 655CONFIG_CICADA_PHY=m
572CONFIG_VITESSE_PHY=m 656CONFIG_VITESSE_PHY=m
573CONFIG_SMSC_PHY=m 657CONFIG_SMSC_PHY=m
658# CONFIG_BROADCOM_PHY is not set
659# CONFIG_FIXED_PHY is not set
574 660
575# 661#
576# Ethernet (10 or 100Mbit) 662# Ethernet (10 or 100Mbit)
@@ -607,7 +693,7 @@ CONFIG_E100=y
607# CONFIG_SUNDANCE is not set 693# CONFIG_SUNDANCE is not set
608# CONFIG_TLAN is not set 694# CONFIG_TLAN is not set
609# CONFIG_VIA_RHINE is not set 695# CONFIG_VIA_RHINE is not set
610# CONFIG_LAN_SAA9730 is not set 696# CONFIG_SC92031 is not set
611 697
612# 698#
613# Ethernet (1000 Mbit) 699# Ethernet (1000 Mbit)
@@ -630,14 +716,18 @@ CONFIG_MV643XX_ETH=y
630CONFIG_MV643XX_ETH_0=y 716CONFIG_MV643XX_ETH_0=y
631CONFIG_MV643XX_ETH_1=y 717CONFIG_MV643XX_ETH_1=y
632CONFIG_MV643XX_ETH_2=y 718CONFIG_MV643XX_ETH_2=y
719CONFIG_QLA3XXX=m
720# CONFIG_ATL1 is not set
633 721
634# 722#
635# Ethernet (10000 Mbit) 723# Ethernet (10000 Mbit)
636# 724#
637# CONFIG_CHELSIO_T1 is not set 725# CONFIG_CHELSIO_T1 is not set
726CONFIG_CHELSIO_T3=m
638# CONFIG_IXGB is not set 727# CONFIG_IXGB is not set
639# CONFIG_S2IO is not set 728# CONFIG_S2IO is not set
640# CONFIG_MYRI10GE is not set 729# CONFIG_MYRI10GE is not set
730CONFIG_NETXEN_NIC=m
641 731
642# 732#
643# Token Ring devices 733# Token Ring devices
@@ -665,6 +755,7 @@ CONFIG_PPP_DEFLATE=m
665CONFIG_PPP_MPPE=m 755CONFIG_PPP_MPPE=m
666CONFIG_PPPOE=m 756CONFIG_PPPOE=m
667# CONFIG_SLIP is not set 757# CONFIG_SLIP is not set
758CONFIG_SLHC=m
668# CONFIG_NET_FC is not set 759# CONFIG_NET_FC is not set
669# CONFIG_SHAPER is not set 760# CONFIG_SHAPER is not set
670# CONFIG_NETCONSOLE is not set 761# CONFIG_NETCONSOLE is not set
@@ -685,6 +776,7 @@ CONFIG_PPPOE=m
685# Input device support 776# Input device support
686# 777#
687CONFIG_INPUT=y 778CONFIG_INPUT=y
779# CONFIG_INPUT_FF_MEMLESS is not set
688 780
689# 781#
690# Userland interfaces 782# Userland interfaces
@@ -758,10 +850,6 @@ CONFIG_RTC=y
758# CONFIG_DTLK is not set 850# CONFIG_DTLK is not set
759# CONFIG_R3964 is not set 851# CONFIG_R3964 is not set
760# CONFIG_APPLICOM is not set 852# CONFIG_APPLICOM is not set
761
762#
763# Ftape, the floppy tape device driver
764#
765# CONFIG_DRM is not set 853# CONFIG_DRM is not set
766# CONFIG_RAW_DRIVER is not set 854# CONFIG_RAW_DRIVER is not set
767 855
@@ -769,7 +857,6 @@ CONFIG_RTC=y
769# TPM devices 857# TPM devices
770# 858#
771# CONFIG_TCG_TPM is not set 859# CONFIG_TCG_TPM is not set
772# CONFIG_TELCLOCK is not set
773 860
774# 861#
775# I2C support 862# I2C support
@@ -794,14 +881,9 @@ CONFIG_RTC=y
794# CONFIG_HWMON_VID is not set 881# CONFIG_HWMON_VID is not set
795 882
796# 883#
797# Misc devices
798#
799
800#
801# Multimedia devices 884# Multimedia devices
802# 885#
803# CONFIG_VIDEO_DEV is not set 886# CONFIG_VIDEO_DEV is not set
804CONFIG_VIDEO_V4L2=y
805 887
806# 888#
807# Digital Video Broadcasting Devices 889# Digital Video Broadcasting Devices
@@ -816,6 +898,7 @@ CONFIG_FB=y
816# CONFIG_FB_CFB_FILLRECT is not set 898# CONFIG_FB_CFB_FILLRECT is not set
817# CONFIG_FB_CFB_COPYAREA is not set 899# CONFIG_FB_CFB_COPYAREA is not set
818# CONFIG_FB_CFB_IMAGEBLIT is not set 900# CONFIG_FB_CFB_IMAGEBLIT is not set
901# CONFIG_FB_SVGALIB is not set
819# CONFIG_FB_MACMODES is not set 902# CONFIG_FB_MACMODES is not set
820# CONFIG_FB_BACKLIGHT is not set 903# CONFIG_FB_BACKLIGHT is not set
821CONFIG_FB_MODE_HELPERS=y 904CONFIG_FB_MODE_HELPERS=y
@@ -832,6 +915,7 @@ CONFIG_FB_MODE_HELPERS=y
832# CONFIG_FB_RADEON is not set 915# CONFIG_FB_RADEON is not set
833# CONFIG_FB_ATY128 is not set 916# CONFIG_FB_ATY128 is not set
834# CONFIG_FB_ATY is not set 917# CONFIG_FB_ATY is not set
918# CONFIG_FB_S3 is not set
835# CONFIG_FB_SAVAGE is not set 919# CONFIG_FB_SAVAGE is not set
836# CONFIG_FB_SIS is not set 920# CONFIG_FB_SIS is not set
837# CONFIG_FB_NEOMAGIC is not set 921# CONFIG_FB_NEOMAGIC is not set
@@ -868,6 +952,12 @@ CONFIG_LOGO_LINUX_CLUT224=y
868# CONFIG_SOUND is not set 952# CONFIG_SOUND is not set
869 953
870# 954#
955# HID Devices
956#
957CONFIG_HID=y
958# CONFIG_HID_DEBUG is not set
959
960#
871# USB support 961# USB support
872# 962#
873CONFIG_USB_ARCH_HAS_HCD=y 963CONFIG_USB_ARCH_HAS_HCD=y
@@ -930,6 +1020,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
930# 1020#
931 1021
932# 1022#
1023# Auxiliary Display support
1024#
1025
1026#
1027# Virtualization
1028#
1029
1030#
933# File systems 1031# File systems
934# 1032#
935CONFIG_EXT2_FS=y 1033CONFIG_EXT2_FS=y
@@ -939,6 +1037,7 @@ CONFIG_EXT3_FS=m
939CONFIG_EXT3_FS_XATTR=y 1037CONFIG_EXT3_FS_XATTR=y
940# CONFIG_EXT3_FS_POSIX_ACL is not set 1038# CONFIG_EXT3_FS_POSIX_ACL is not set
941# CONFIG_EXT3_FS_SECURITY is not set 1039# CONFIG_EXT3_FS_SECURITY is not set
1040# CONFIG_EXT4DEV_FS is not set
942CONFIG_JBD=m 1041CONFIG_JBD=m
943# CONFIG_JBD_DEBUG is not set 1042# CONFIG_JBD_DEBUG is not set
944CONFIG_FS_MBCACHE=y 1043CONFIG_FS_MBCACHE=y
@@ -947,12 +1046,13 @@ CONFIG_REISERFS_FS=m
947# CONFIG_REISERFS_PROC_INFO is not set 1046# CONFIG_REISERFS_PROC_INFO is not set
948# CONFIG_REISERFS_FS_XATTR is not set 1047# CONFIG_REISERFS_FS_XATTR is not set
949# CONFIG_JFS_FS is not set 1048# CONFIG_JFS_FS is not set
950# CONFIG_FS_POSIX_ACL is not set 1049CONFIG_FS_POSIX_ACL=y
951CONFIG_XFS_FS=m 1050CONFIG_XFS_FS=m
952# CONFIG_XFS_QUOTA is not set 1051# CONFIG_XFS_QUOTA is not set
953# CONFIG_XFS_SECURITY is not set 1052# CONFIG_XFS_SECURITY is not set
954# CONFIG_XFS_POSIX_ACL is not set 1053# CONFIG_XFS_POSIX_ACL is not set
955# CONFIG_XFS_RT is not set 1054# CONFIG_XFS_RT is not set
1055# CONFIG_GFS2_FS is not set
956# CONFIG_OCFS2_FS is not set 1056# CONFIG_OCFS2_FS is not set
957# CONFIG_MINIX_FS is not set 1057# CONFIG_MINIX_FS is not set
958# CONFIG_ROMFS_FS is not set 1058# CONFIG_ROMFS_FS is not set
@@ -963,6 +1063,7 @@ CONFIG_DNOTIFY=y
963CONFIG_AUTOFS_FS=y 1063CONFIG_AUTOFS_FS=y
964CONFIG_AUTOFS4_FS=m 1064CONFIG_AUTOFS4_FS=m
965CONFIG_FUSE_FS=m 1065CONFIG_FUSE_FS=m
1066CONFIG_GENERIC_ACL=y
966 1067
967# 1068#
968# CD-ROM/DVD Filesystems 1069# CD-ROM/DVD Filesystems
@@ -982,11 +1083,13 @@ CONFIG_FUSE_FS=m
982# 1083#
983CONFIG_PROC_FS=y 1084CONFIG_PROC_FS=y
984CONFIG_PROC_KCORE=y 1085CONFIG_PROC_KCORE=y
1086CONFIG_PROC_SYSCTL=y
985CONFIG_SYSFS=y 1087CONFIG_SYSFS=y
986CONFIG_TMPFS=y 1088CONFIG_TMPFS=y
1089CONFIG_TMPFS_POSIX_ACL=y
987# CONFIG_HUGETLB_PAGE is not set 1090# CONFIG_HUGETLB_PAGE is not set
988CONFIG_RAMFS=y 1091CONFIG_RAMFS=y
989# CONFIG_CONFIGFS_FS is not set 1092CONFIG_CONFIGFS_FS=m
990 1093
991# 1094#
992# Miscellaneous filesystems 1095# Miscellaneous filesystems
@@ -1029,7 +1132,6 @@ CONFIG_SUNRPC=y
1029CONFIG_SMB_FS=m 1132CONFIG_SMB_FS=m
1030# CONFIG_SMB_NLS_DEFAULT is not set 1133# CONFIG_SMB_NLS_DEFAULT is not set
1031# CONFIG_CIFS is not set 1134# CONFIG_CIFS is not set
1032# CONFIG_CIFS_DEBUG2 is not set
1033# CONFIG_NCP_FS is not set 1135# CONFIG_NCP_FS is not set
1034# CONFIG_CODA_FS is not set 1136# CONFIG_CODA_FS is not set
1035# CONFIG_AFS_FS is not set 1137# CONFIG_AFS_FS is not set
@@ -1086,6 +1188,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1086# CONFIG_NLS_UTF8 is not set 1188# CONFIG_NLS_UTF8 is not set
1087 1189
1088# 1190#
1191# Distributed Lock Manager
1192#
1193CONFIG_DLM=m
1194CONFIG_DLM_TCP=y
1195# CONFIG_DLM_SCTP is not set
1196# CONFIG_DLM_DEBUG is not set
1197
1198#
1089# Profiling support 1199# Profiling support
1090# 1200#
1091# CONFIG_PROFILING is not set 1201# CONFIG_PROFILING is not set
@@ -1095,11 +1205,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1095# 1205#
1096CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1206CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1097# CONFIG_PRINTK_TIME is not set 1207# CONFIG_PRINTK_TIME is not set
1208CONFIG_ENABLE_MUST_CHECK=y
1098# CONFIG_MAGIC_SYSRQ is not set 1209# CONFIG_MAGIC_SYSRQ is not set
1099# CONFIG_UNUSED_SYMBOLS is not set 1210# CONFIG_UNUSED_SYMBOLS is not set
1211# CONFIG_DEBUG_FS is not set
1212# CONFIG_HEADERS_CHECK is not set
1100# CONFIG_DEBUG_KERNEL is not set 1213# CONFIG_DEBUG_KERNEL is not set
1101CONFIG_LOG_BUF_SHIFT=14 1214CONFIG_LOG_BUF_SHIFT=14
1102# CONFIG_DEBUG_FS is not set
1103CONFIG_CROSSCOMPILE=y 1215CONFIG_CROSSCOMPILE=y
1104CONFIG_CMDLINE="ip=any root=nfs" 1216CONFIG_CMDLINE="ip=any root=nfs"
1105 1217
@@ -1113,18 +1225,30 @@ CONFIG_CMDLINE="ip=any root=nfs"
1113# Cryptographic options 1225# Cryptographic options
1114# 1226#
1115CONFIG_CRYPTO=y 1227CONFIG_CRYPTO=y
1228CONFIG_CRYPTO_ALGAPI=y
1229CONFIG_CRYPTO_BLKCIPHER=m
1230CONFIG_CRYPTO_HASH=y
1231CONFIG_CRYPTO_MANAGER=y
1116CONFIG_CRYPTO_HMAC=y 1232CONFIG_CRYPTO_HMAC=y
1233CONFIG_CRYPTO_XCBC=m
1117CONFIG_CRYPTO_NULL=m 1234CONFIG_CRYPTO_NULL=m
1118CONFIG_CRYPTO_MD4=m 1235CONFIG_CRYPTO_MD4=m
1119CONFIG_CRYPTO_MD5=m 1236CONFIG_CRYPTO_MD5=y
1120CONFIG_CRYPTO_SHA1=m 1237CONFIG_CRYPTO_SHA1=m
1121CONFIG_CRYPTO_SHA256=m 1238CONFIG_CRYPTO_SHA256=m
1122CONFIG_CRYPTO_SHA512=m 1239CONFIG_CRYPTO_SHA512=m
1123CONFIG_CRYPTO_WP512=m 1240CONFIG_CRYPTO_WP512=m
1124CONFIG_CRYPTO_TGR192=m 1241CONFIG_CRYPTO_TGR192=m
1242CONFIG_CRYPTO_GF128MUL=m
1243CONFIG_CRYPTO_ECB=m
1244CONFIG_CRYPTO_CBC=m
1245CONFIG_CRYPTO_PCBC=m
1246CONFIG_CRYPTO_LRW=m
1125CONFIG_CRYPTO_DES=m 1247CONFIG_CRYPTO_DES=m
1248CONFIG_CRYPTO_FCRYPT=m
1126CONFIG_CRYPTO_BLOWFISH=m 1249CONFIG_CRYPTO_BLOWFISH=m
1127CONFIG_CRYPTO_TWOFISH=m 1250CONFIG_CRYPTO_TWOFISH=m
1251CONFIG_CRYPTO_TWOFISH_COMMON=m
1128CONFIG_CRYPTO_SERPENT=m 1252CONFIG_CRYPTO_SERPENT=m
1129CONFIG_CRYPTO_AES=m 1253CONFIG_CRYPTO_AES=m
1130CONFIG_CRYPTO_CAST5=m 1254CONFIG_CRYPTO_CAST5=m
@@ -1136,6 +1260,7 @@ CONFIG_CRYPTO_ANUBIS=m
1136CONFIG_CRYPTO_DEFLATE=m 1260CONFIG_CRYPTO_DEFLATE=m
1137CONFIG_CRYPTO_MICHAEL_MIC=m 1261CONFIG_CRYPTO_MICHAEL_MIC=m
1138CONFIG_CRYPTO_CRC32C=m 1262CONFIG_CRYPTO_CRC32C=m
1263CONFIG_CRYPTO_CAMELLIA=m
1139# CONFIG_CRYPTO_TEST is not set 1264# CONFIG_CRYPTO_TEST is not set
1140 1265
1141# 1266#
@@ -1145,6 +1270,7 @@ CONFIG_CRYPTO_CRC32C=m
1145# 1270#
1146# Library routines 1271# Library routines
1147# 1272#
1273CONFIG_BITREVERSE=y
1148CONFIG_CRC_CCITT=m 1274CONFIG_CRC_CCITT=m
1149CONFIG_CRC16=m 1275CONFIG_CRC16=m
1150CONFIG_CRC32=y 1276CONFIG_CRC32=y
@@ -1156,3 +1282,5 @@ CONFIG_TEXTSEARCH_KMP=m
1156CONFIG_TEXTSEARCH_BM=m 1282CONFIG_TEXTSEARCH_BM=m
1157CONFIG_TEXTSEARCH_FSM=m 1283CONFIG_TEXTSEARCH_FSM=m
1158CONFIG_PLIST=y 1284CONFIG_PLIST=y
1285CONFIG_HAS_IOMEM=y
1286CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index ebe75c1c71af..4b32b270df39 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:16 2006 4# Sun Feb 18 21:27:58 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MOMENCO_OCELOT_C=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MOMENCO_OCELOT_C=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -120,8 +124,8 @@ CONFIG_BOARD_SCACHE=y
120CONFIG_RM7000_CPU_SCACHE=y 124CONFIG_RM7000_CPU_SCACHE=y
121CONFIG_CPU_HAS_PREFETCH=y 125CONFIG_CPU_HAS_PREFETCH=y
122CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
126CONFIG_CPU_HAS_LLSC=y 130CONFIG_CPU_HAS_LLSC=y
127CONFIG_CPU_HAS_SYNC=y 131CONFIG_CPU_HAS_SYNC=y
@@ -138,6 +142,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
138# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
139CONFIG_SPLIT_PTLOCK_CPUS=4 143CONFIG_SPLIT_PTLOCK_CPUS=4
140CONFIG_RESOURCES_64BIT=y 144CONFIG_RESOURCES_64BIT=y
145CONFIG_ZONE_DMA_FLAG=1
141# CONFIG_HZ_48 is not set 146# CONFIG_HZ_48 is not set
142# CONFIG_HZ_100 is not set 147# CONFIG_HZ_100 is not set
143# CONFIG_HZ_128 is not set 148# CONFIG_HZ_128 is not set
@@ -150,6 +155,7 @@ CONFIG_HZ=1000
150CONFIG_PREEMPT_NONE=y 155CONFIG_PREEMPT_NONE=y
151# CONFIG_PREEMPT_VOLUNTARY is not set 156# CONFIG_PREEMPT_VOLUNTARY is not set
152# CONFIG_PREEMPT is not set 157# CONFIG_PREEMPT is not set
158# CONFIG_KEXEC is not set
153CONFIG_LOCKDEP_SUPPORT=y 159CONFIG_LOCKDEP_SUPPORT=y
154CONFIG_STACKTRACE_SUPPORT=y 160CONFIG_STACKTRACE_SUPPORT=y
155CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 161CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -168,15 +174,20 @@ CONFIG_LOCALVERSION=""
168CONFIG_LOCALVERSION_AUTO=y 174CONFIG_LOCALVERSION_AUTO=y
169CONFIG_SWAP=y 175CONFIG_SWAP=y
170CONFIG_SYSVIPC=y 176CONFIG_SYSVIPC=y
177# CONFIG_IPC_NS is not set
178CONFIG_SYSVIPC_SYSCTL=y
171# CONFIG_POSIX_MQUEUE is not set 179# CONFIG_POSIX_MQUEUE is not set
172# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
173CONFIG_SYSCTL=y 181# CONFIG_TASKSTATS is not set
182# CONFIG_UTS_NS is not set
174# CONFIG_AUDIT is not set 183# CONFIG_AUDIT is not set
175# CONFIG_IKCONFIG is not set 184# CONFIG_IKCONFIG is not set
185CONFIG_SYSFS_DEPRECATED=y
176CONFIG_RELAY=y 186CONFIG_RELAY=y
177CONFIG_INITRAMFS_SOURCE=""
178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 189CONFIG_EMBEDDED=y
190CONFIG_SYSCTL_SYSCALL=y
180CONFIG_KALLSYMS=y 191CONFIG_KALLSYMS=y
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 192# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_HOTPLUG=y 193CONFIG_HOTPLUG=y
@@ -184,12 +195,12 @@ CONFIG_PRINTK=y
184CONFIG_BUG=y 195CONFIG_BUG=y
185CONFIG_ELF_CORE=y 196CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 197CONFIG_BASE_FULL=y
187CONFIG_RT_MUTEXES=y
188CONFIG_FUTEX=y 198CONFIG_FUTEX=y
189CONFIG_EPOLL=y 199CONFIG_EPOLL=y
190CONFIG_SHMEM=y 200CONFIG_SHMEM=y
191CONFIG_SLAB=y 201CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 202CONFIG_VM_EVENT_COUNTERS=y
203CONFIG_RT_MUTEXES=y
193# CONFIG_TINY_SHMEM is not set 204# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 205CONFIG_BASE_SMALL=0
195# CONFIG_SLOB is not set 206# CONFIG_SLOB is not set
@@ -202,6 +213,7 @@ CONFIG_BASE_SMALL=0
202# 213#
203# Block layer 214# Block layer
204# 215#
216CONFIG_BLOCK=y
205# CONFIG_BLK_DEV_IO_TRACE is not set 217# CONFIG_BLK_DEV_IO_TRACE is not set
206 218
207# 219#
@@ -242,11 +254,20 @@ CONFIG_BINFMT_ELF=y
242# CONFIG_BUILD_ELF64 is not set 254# CONFIG_BUILD_ELF64 is not set
243CONFIG_MIPS32_COMPAT=y 255CONFIG_MIPS32_COMPAT=y
244CONFIG_COMPAT=y 256CONFIG_COMPAT=y
257CONFIG_SYSVIPC_COMPAT=y
245CONFIG_MIPS32_O32=y 258CONFIG_MIPS32_O32=y
246CONFIG_MIPS32_N32=y 259CONFIG_MIPS32_N32=y
247CONFIG_BINFMT_ELF32=y 260CONFIG_BINFMT_ELF32=y
248 261
249# 262#
263# Power management options
264#
265CONFIG_PM=y
266# CONFIG_PM_LEGACY is not set
267# CONFIG_PM_DEBUG is not set
268# CONFIG_PM_SYSFS_DEPRECATED is not set
269
270#
250# Networking 271# Networking
251# 272#
252CONFIG_NET=y 273CONFIG_NET=y
@@ -259,7 +280,10 @@ CONFIG_NET=y
259CONFIG_UNIX=y 280CONFIG_UNIX=y
260CONFIG_XFRM=y 281CONFIG_XFRM=y
261CONFIG_XFRM_USER=y 282CONFIG_XFRM_USER=y
283# CONFIG_XFRM_SUB_POLICY is not set
284CONFIG_XFRM_MIGRATE=y
262CONFIG_NET_KEY=y 285CONFIG_NET_KEY=y
286CONFIG_NET_KEY_MIGRATE=y
263CONFIG_INET=y 287CONFIG_INET=y
264# CONFIG_IP_MULTICAST is not set 288# CONFIG_IP_MULTICAST is not set
265# CONFIG_IP_ADVANCED_ROUTER is not set 289# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +303,13 @@ CONFIG_IP_PNP_DHCP=y
279# CONFIG_INET_TUNNEL is not set 303# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=y 304CONFIG_INET_XFRM_MODE_TRANSPORT=y
281CONFIG_INET_XFRM_MODE_TUNNEL=y 305CONFIG_INET_XFRM_MODE_TUNNEL=y
306CONFIG_INET_XFRM_MODE_BEET=y
282CONFIG_INET_DIAG=y 307CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 308CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 309# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 310CONFIG_TCP_CONG_CUBIC=y
311CONFIG_DEFAULT_TCP_CONG="cubic"
312CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 313# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 314# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 315# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +339,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 339# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 340# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 341# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 342# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 343# CONFIG_WAN_ROUTER is not set
318 344
@@ -387,6 +413,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
387CONFIG_ATA_OVER_ETH=y 413CONFIG_ATA_OVER_ETH=y
388 414
389# 415#
416# Misc devices
417#
418CONFIG_SGI_IOC4=y
419# CONFIG_TIFM_CORE is not set
420
421#
390# ATA/ATAPI/MFM/RLL support 422# ATA/ATAPI/MFM/RLL support
391# 423#
392# CONFIG_IDE is not set 424# CONFIG_IDE is not set
@@ -396,6 +428,12 @@ CONFIG_ATA_OVER_ETH=y
396# 428#
397CONFIG_RAID_ATTRS=y 429CONFIG_RAID_ATTRS=y
398# CONFIG_SCSI is not set 430# CONFIG_SCSI is not set
431# CONFIG_SCSI_NETLINK is not set
432
433#
434# Serial ATA (prod) and Parallel ATA (experimental) drivers
435#
436# CONFIG_ATA is not set
399 437
400# 438#
401# Multi-device support (RAID and LVM) 439# Multi-device support (RAID and LVM)
@@ -446,6 +484,8 @@ CONFIG_LXT_PHY=y
446CONFIG_CICADA_PHY=y 484CONFIG_CICADA_PHY=y
447CONFIG_VITESSE_PHY=y 485CONFIG_VITESSE_PHY=y
448CONFIG_SMSC_PHY=y 486CONFIG_SMSC_PHY=y
487# CONFIG_BROADCOM_PHY is not set
488# CONFIG_FIXED_PHY is not set
449 489
450# 490#
451# Ethernet (10 or 100Mbit) 491# Ethernet (10 or 100Mbit)
@@ -482,14 +522,17 @@ CONFIG_NET_ETHERNET=y
482# CONFIG_TIGON3 is not set 522# CONFIG_TIGON3 is not set
483# CONFIG_BNX2 is not set 523# CONFIG_BNX2 is not set
484# CONFIG_MV643XX_ETH is not set 524# CONFIG_MV643XX_ETH is not set
525CONFIG_QLA3XXX=y
485 526
486# 527#
487# Ethernet (10000 Mbit) 528# Ethernet (10000 Mbit)
488# 529#
489# CONFIG_CHELSIO_T1 is not set 530# CONFIG_CHELSIO_T1 is not set
531CONFIG_CHELSIO_T3=y
490# CONFIG_IXGB is not set 532# CONFIG_IXGB is not set
491# CONFIG_S2IO is not set 533# CONFIG_S2IO is not set
492# CONFIG_MYRI10GE is not set 534# CONFIG_MYRI10GE is not set
535CONFIG_NETXEN_NIC=y
493 536
494# 537#
495# Token Ring devices 538# Token Ring devices
@@ -528,6 +571,7 @@ CONFIG_NET_ETHERNET=y
528# Input device support 571# Input device support
529# 572#
530CONFIG_INPUT=y 573CONFIG_INPUT=y
574# CONFIG_INPUT_FF_MEMLESS is not set
531 575
532# 576#
533# Userland interfaces 577# Userland interfaces
@@ -605,10 +649,6 @@ CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_DTLK is not set 649# CONFIG_DTLK is not set
606# CONFIG_R3964 is not set 650# CONFIG_R3964 is not set
607# CONFIG_APPLICOM is not set 651# CONFIG_APPLICOM is not set
608
609#
610# Ftape, the floppy tape device driver
611#
612# CONFIG_DRM is not set 652# CONFIG_DRM is not set
613# CONFIG_RAW_DRIVER is not set 653# CONFIG_RAW_DRIVER is not set
614 654
@@ -616,7 +656,6 @@ CONFIG_LEGACY_PTY_COUNT=256
616# TPM devices 656# TPM devices
617# 657#
618# CONFIG_TCG_TPM is not set 658# CONFIG_TCG_TPM is not set
619# CONFIG_TELCLOCK is not set
620 659
621# 660#
622# I2C support 661# I2C support
@@ -641,14 +680,9 @@ CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_HWMON_VID is not set 680# CONFIG_HWMON_VID is not set
642 681
643# 682#
644# Misc devices
645#
646
647#
648# Multimedia devices 683# Multimedia devices
649# 684#
650# CONFIG_VIDEO_DEV is not set 685# CONFIG_VIDEO_DEV is not set
651CONFIG_VIDEO_V4L2=y
652 686
653# 687#
654# Digital Video Broadcasting Devices 688# Digital Video Broadcasting Devices
@@ -666,6 +700,7 @@ CONFIG_VIDEO_V4L2=y
666# 700#
667# CONFIG_VGA_CONSOLE is not set 701# CONFIG_VGA_CONSOLE is not set
668CONFIG_DUMMY_CONSOLE=y 702CONFIG_DUMMY_CONSOLE=y
703# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
669 704
670# 705#
671# Sound 706# Sound
@@ -673,6 +708,11 @@ CONFIG_DUMMY_CONSOLE=y
673# CONFIG_SOUND is not set 708# CONFIG_SOUND is not set
674 709
675# 710#
711# HID Devices
712#
713# CONFIG_HID is not set
714
715#
676# USB support 716# USB support
677# 717#
678CONFIG_USB_ARCH_HAS_HCD=y 718CONFIG_USB_ARCH_HAS_HCD=y
@@ -735,16 +775,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
735# 775#
736 776
737# 777#
778# Auxiliary Display support
779#
780
781#
782# Virtualization
783#
784
785#
738# File systems 786# File systems
739# 787#
740CONFIG_EXT2_FS=y 788CONFIG_EXT2_FS=y
741# CONFIG_EXT2_FS_XATTR is not set 789# CONFIG_EXT2_FS_XATTR is not set
742# CONFIG_EXT2_FS_XIP is not set 790# CONFIG_EXT2_FS_XIP is not set
743# CONFIG_EXT3_FS is not set 791# CONFIG_EXT3_FS is not set
792# CONFIG_EXT4DEV_FS is not set
744# CONFIG_REISERFS_FS is not set 793# CONFIG_REISERFS_FS is not set
745# CONFIG_JFS_FS is not set 794# CONFIG_JFS_FS is not set
746# CONFIG_FS_POSIX_ACL is not set 795CONFIG_FS_POSIX_ACL=y
747# CONFIG_XFS_FS is not set 796# CONFIG_XFS_FS is not set
797# CONFIG_GFS2_FS is not set
748# CONFIG_OCFS2_FS is not set 798# CONFIG_OCFS2_FS is not set
749# CONFIG_MINIX_FS is not set 799# CONFIG_MINIX_FS is not set
750# CONFIG_ROMFS_FS is not set 800# CONFIG_ROMFS_FS is not set
@@ -755,6 +805,7 @@ CONFIG_DNOTIFY=y
755# CONFIG_AUTOFS_FS is not set 805# CONFIG_AUTOFS_FS is not set
756# CONFIG_AUTOFS4_FS is not set 806# CONFIG_AUTOFS4_FS is not set
757CONFIG_FUSE_FS=y 807CONFIG_FUSE_FS=y
808CONFIG_GENERIC_ACL=y
758 809
759# 810#
760# CD-ROM/DVD Filesystems 811# CD-ROM/DVD Filesystems
@@ -774,17 +825,20 @@ CONFIG_FUSE_FS=y
774# 825#
775CONFIG_PROC_FS=y 826CONFIG_PROC_FS=y
776CONFIG_PROC_KCORE=y 827CONFIG_PROC_KCORE=y
828CONFIG_PROC_SYSCTL=y
777CONFIG_SYSFS=y 829CONFIG_SYSFS=y
778CONFIG_TMPFS=y 830CONFIG_TMPFS=y
831CONFIG_TMPFS_POSIX_ACL=y
779# CONFIG_HUGETLB_PAGE is not set 832# CONFIG_HUGETLB_PAGE is not set
780CONFIG_RAMFS=y 833CONFIG_RAMFS=y
781# CONFIG_CONFIGFS_FS is not set 834CONFIG_CONFIGFS_FS=y
782 835
783# 836#
784# Miscellaneous filesystems 837# Miscellaneous filesystems
785# 838#
786# CONFIG_ADFS_FS is not set 839# CONFIG_ADFS_FS is not set
787# CONFIG_AFFS_FS is not set 840# CONFIG_AFFS_FS is not set
841# CONFIG_ECRYPT_FS is not set
788# CONFIG_HFS_FS is not set 842# CONFIG_HFS_FS is not set
789# CONFIG_HFSPLUS_FS is not set 843# CONFIG_HFSPLUS_FS is not set
790# CONFIG_BEFS_FS is not set 844# CONFIG_BEFS_FS is not set
@@ -816,7 +870,6 @@ CONFIG_SUNRPC=y
816# CONFIG_RPCSEC_GSS_SPKM3 is not set 870# CONFIG_RPCSEC_GSS_SPKM3 is not set
817# CONFIG_SMB_FS is not set 871# CONFIG_SMB_FS is not set
818# CONFIG_CIFS is not set 872# CONFIG_CIFS is not set
819# CONFIG_CIFS_DEBUG2 is not set
820# CONFIG_NCP_FS is not set 873# CONFIG_NCP_FS is not set
821# CONFIG_CODA_FS is not set 874# CONFIG_CODA_FS is not set
822# CONFIG_AFS_FS is not set 875# CONFIG_AFS_FS is not set
@@ -834,6 +887,14 @@ CONFIG_MSDOS_PARTITION=y
834# CONFIG_NLS is not set 887# CONFIG_NLS is not set
835 888
836# 889#
890# Distributed Lock Manager
891#
892CONFIG_DLM=y
893CONFIG_DLM_TCP=y
894# CONFIG_DLM_SCTP is not set
895# CONFIG_DLM_DEBUG is not set
896
897#
837# Profiling support 898# Profiling support
838# 899#
839# CONFIG_PROFILING is not set 900# CONFIG_PROFILING is not set
@@ -843,12 +904,13 @@ CONFIG_MSDOS_PARTITION=y
843# 904#
844CONFIG_TRACE_IRQFLAGS_SUPPORT=y 905CONFIG_TRACE_IRQFLAGS_SUPPORT=y
845# CONFIG_PRINTK_TIME is not set 906# CONFIG_PRINTK_TIME is not set
907CONFIG_ENABLE_MUST_CHECK=y
846# CONFIG_MAGIC_SYSRQ is not set 908# CONFIG_MAGIC_SYSRQ is not set
847# CONFIG_UNUSED_SYMBOLS is not set 909# CONFIG_UNUSED_SYMBOLS is not set
910# CONFIG_DEBUG_FS is not set
911# CONFIG_HEADERS_CHECK is not set
848# CONFIG_DEBUG_KERNEL is not set 912# CONFIG_DEBUG_KERNEL is not set
849CONFIG_LOG_BUF_SHIFT=14 913CONFIG_LOG_BUF_SHIFT=14
850# CONFIG_DEBUG_FS is not set
851# CONFIG_UNWIND_INFO is not set
852CONFIG_CROSSCOMPILE=y 914CONFIG_CROSSCOMPILE=y
853CONFIG_CMDLINE="" 915CONFIG_CMDLINE=""
854 916
@@ -863,7 +925,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
863# Cryptographic options 925# Cryptographic options
864# 926#
865CONFIG_CRYPTO=y 927CONFIG_CRYPTO=y
928CONFIG_CRYPTO_ALGAPI=y
929CONFIG_CRYPTO_BLKCIPHER=y
930CONFIG_CRYPTO_HASH=y
931CONFIG_CRYPTO_MANAGER=y
866CONFIG_CRYPTO_HMAC=y 932CONFIG_CRYPTO_HMAC=y
933CONFIG_CRYPTO_XCBC=y
867CONFIG_CRYPTO_NULL=y 934CONFIG_CRYPTO_NULL=y
868CONFIG_CRYPTO_MD4=y 935CONFIG_CRYPTO_MD4=y
869CONFIG_CRYPTO_MD5=y 936CONFIG_CRYPTO_MD5=y
@@ -872,9 +939,16 @@ CONFIG_CRYPTO_SHA256=y
872CONFIG_CRYPTO_SHA512=y 939CONFIG_CRYPTO_SHA512=y
873CONFIG_CRYPTO_WP512=y 940CONFIG_CRYPTO_WP512=y
874CONFIG_CRYPTO_TGR192=y 941CONFIG_CRYPTO_TGR192=y
942CONFIG_CRYPTO_GF128MUL=y
943CONFIG_CRYPTO_ECB=y
944CONFIG_CRYPTO_CBC=y
945CONFIG_CRYPTO_PCBC=y
946CONFIG_CRYPTO_LRW=y
875CONFIG_CRYPTO_DES=y 947CONFIG_CRYPTO_DES=y
948CONFIG_CRYPTO_FCRYPT=y
876CONFIG_CRYPTO_BLOWFISH=y 949CONFIG_CRYPTO_BLOWFISH=y
877CONFIG_CRYPTO_TWOFISH=y 950CONFIG_CRYPTO_TWOFISH=y
951CONFIG_CRYPTO_TWOFISH_COMMON=y
878CONFIG_CRYPTO_SERPENT=y 952CONFIG_CRYPTO_SERPENT=y
879CONFIG_CRYPTO_AES=y 953CONFIG_CRYPTO_AES=y
880CONFIG_CRYPTO_CAST5=y 954CONFIG_CRYPTO_CAST5=y
@@ -886,6 +960,7 @@ CONFIG_CRYPTO_ANUBIS=y
886CONFIG_CRYPTO_DEFLATE=y 960CONFIG_CRYPTO_DEFLATE=y
887CONFIG_CRYPTO_MICHAEL_MIC=y 961CONFIG_CRYPTO_MICHAEL_MIC=y
888CONFIG_CRYPTO_CRC32C=y 962CONFIG_CRYPTO_CRC32C=y
963CONFIG_CRYPTO_CAMELLIA=y
889 964
890# 965#
891# Hardware crypto devices 966# Hardware crypto devices
@@ -894,6 +969,7 @@ CONFIG_CRYPTO_CRC32C=y
894# 969#
895# Library routines 970# Library routines
896# 971#
972CONFIG_BITREVERSE=y
897# CONFIG_CRC_CCITT is not set 973# CONFIG_CRC_CCITT is not set
898CONFIG_CRC16=y 974CONFIG_CRC16=y
899CONFIG_CRC32=y 975CONFIG_CRC32=y
@@ -901,3 +977,5 @@ CONFIG_LIBCRC32C=y
901CONFIG_ZLIB_INFLATE=y 977CONFIG_ZLIB_INFLATE=y
902CONFIG_ZLIB_DEFLATE=y 978CONFIG_ZLIB_DEFLATE=y
903CONFIG_PLIST=y 979CONFIG_PLIST=y
980CONFIG_HAS_IOMEM=y
981CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 5a9603c12902..674631b09c99 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:16 2006 4# Sun Feb 18 21:27:59 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MOMENCO_OCELOT=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MOMENCO_OCELOT=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -123,8 +127,8 @@ CONFIG_BOARD_SCACHE=y
123CONFIG_RM7000_CPU_SCACHE=y 127CONFIG_RM7000_CPU_SCACHE=y
124CONFIG_CPU_HAS_PREFETCH=y 128CONFIG_CPU_HAS_PREFETCH=y
125CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 133# CONFIG_64BIT_PHYS_ADDR is not set
130CONFIG_CPU_HAS_LLSC=y 134CONFIG_CPU_HAS_LLSC=y
@@ -142,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
142# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
143CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
144# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
145# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
146# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
147# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -154,6 +159,7 @@ CONFIG_HZ=1000
154CONFIG_PREEMPT_NONE=y 159CONFIG_PREEMPT_NONE=y
155# CONFIG_PREEMPT_VOLUNTARY is not set 160# CONFIG_PREEMPT_VOLUNTARY is not set
156# CONFIG_PREEMPT is not set 161# CONFIG_PREEMPT is not set
162# CONFIG_KEXEC is not set
157CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
158CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -172,15 +178,20 @@ CONFIG_LOCALVERSION=""
172CONFIG_LOCALVERSION_AUTO=y 178CONFIG_LOCALVERSION_AUTO=y
173CONFIG_SWAP=y 179CONFIG_SWAP=y
174CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
175# CONFIG_POSIX_MQUEUE is not set 183# CONFIG_POSIX_MQUEUE is not set
176# CONFIG_BSD_PROCESS_ACCT is not set 184# CONFIG_BSD_PROCESS_ACCT is not set
177CONFIG_SYSCTL=y 185# CONFIG_TASKSTATS is not set
186# CONFIG_UTS_NS is not set
178# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
179# CONFIG_IKCONFIG is not set 188# CONFIG_IKCONFIG is not set
189CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 190CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 191# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
192CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 193CONFIG_EMBEDDED=y
194CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 195CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 196# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 197# CONFIG_HOTPLUG is not set
@@ -188,12 +199,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 199CONFIG_BUG=y
189CONFIG_ELF_CORE=y 200CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 201CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 202CONFIG_FUTEX=y
193CONFIG_EPOLL=y 203CONFIG_EPOLL=y
194CONFIG_SHMEM=y 204CONFIG_SHMEM=y
195CONFIG_SLAB=y 205CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 206CONFIG_VM_EVENT_COUNTERS=y
207CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 208# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 209CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 210# CONFIG_SLOB is not set
@@ -206,6 +217,7 @@ CONFIG_BASE_SMALL=0
206# 217#
207# Block layer 218# Block layer
208# 219#
220CONFIG_BLOCK=y
209# CONFIG_LBD is not set 221# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -233,7 +245,6 @@ CONFIG_MMU=y
233# 245#
234# PCCARD (PCMCIA/CardBus) support 246# PCCARD (PCMCIA/CardBus) support
235# 247#
236# CONFIG_PCCARD is not set
237 248
238# 249#
239# PCI Hotplug Support 250# PCI Hotplug Support
@@ -247,6 +258,14 @@ CONFIG_BINFMT_ELF=y
247CONFIG_TRAD_SIGNALS=y 258CONFIG_TRAD_SIGNALS=y
248 259
249# 260#
261# Power management options
262#
263CONFIG_PM=y
264# CONFIG_PM_LEGACY is not set
265# CONFIG_PM_DEBUG is not set
266# CONFIG_PM_SYSFS_DEPRECATED is not set
267
268#
250# Networking 269# Networking
251# 270#
252CONFIG_NET=y 271CONFIG_NET=y
@@ -259,7 +278,10 @@ CONFIG_NET=y
259CONFIG_UNIX=y 278CONFIG_UNIX=y
260CONFIG_XFRM=y 279CONFIG_XFRM=y
261CONFIG_XFRM_USER=y 280CONFIG_XFRM_USER=y
281# CONFIG_XFRM_SUB_POLICY is not set
282CONFIG_XFRM_MIGRATE=y
262CONFIG_NET_KEY=y 283CONFIG_NET_KEY=y
284CONFIG_NET_KEY_MIGRATE=y
263CONFIG_INET=y 285CONFIG_INET=y
264# CONFIG_IP_MULTICAST is not set 286# CONFIG_IP_MULTICAST is not set
265# CONFIG_IP_ADVANCED_ROUTER is not set 287# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -279,10 +301,13 @@ CONFIG_IP_PNP_BOOTP=y
279# CONFIG_INET_TUNNEL is not set 301# CONFIG_INET_TUNNEL is not set
280CONFIG_INET_XFRM_MODE_TRANSPORT=y 302CONFIG_INET_XFRM_MODE_TRANSPORT=y
281CONFIG_INET_XFRM_MODE_TUNNEL=y 303CONFIG_INET_XFRM_MODE_TUNNEL=y
304CONFIG_INET_XFRM_MODE_BEET=y
282CONFIG_INET_DIAG=y 305CONFIG_INET_DIAG=y
283CONFIG_INET_TCP_DIAG=y 306CONFIG_INET_TCP_DIAG=y
284# CONFIG_TCP_CONG_ADVANCED is not set 307# CONFIG_TCP_CONG_ADVANCED is not set
285CONFIG_TCP_CONG_BIC=y 308CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic"
310CONFIG_TCP_MD5SIG=y
286# CONFIG_IPV6 is not set 311# CONFIG_IPV6 is not set
287# CONFIG_INET6_XFRM_TUNNEL is not set 312# CONFIG_INET6_XFRM_TUNNEL is not set
288# CONFIG_INET6_TUNNEL is not set 313# CONFIG_INET6_TUNNEL is not set
@@ -312,7 +337,6 @@ CONFIG_NETWORK_SECMARK=y
312# CONFIG_ATALK is not set 337# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 338# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 339# CONFIG_LAPB is not set
315# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
318 342
@@ -345,7 +369,6 @@ CONFIG_WIRELESS_EXT=y
345# 369#
346CONFIG_STANDALONE=y 370CONFIG_STANDALONE=y
347CONFIG_PREVENT_FIRMWARE_BUILD=y 371CONFIG_PREVENT_FIRMWARE_BUILD=y
348# CONFIG_FW_LOADER is not set
349# CONFIG_SYS_HYPERVISOR is not set 372# CONFIG_SYS_HYPERVISOR is not set
350 373
351# 374#
@@ -382,6 +405,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
382CONFIG_ATA_OVER_ETH=y 405CONFIG_ATA_OVER_ETH=y
383 406
384# 407#
408# Misc devices
409#
410
411#
385# ATA/ATAPI/MFM/RLL support 412# ATA/ATAPI/MFM/RLL support
386# 413#
387# CONFIG_IDE is not set 414# CONFIG_IDE is not set
@@ -391,6 +418,12 @@ CONFIG_ATA_OVER_ETH=y
391# 418#
392CONFIG_RAID_ATTRS=y 419CONFIG_RAID_ATTRS=y
393# CONFIG_SCSI is not set 420# CONFIG_SCSI is not set
421# CONFIG_SCSI_NETLINK is not set
422
423#
424# Serial ATA (prod) and Parallel ATA (experimental) drivers
425#
426# CONFIG_ATA is not set
394 427
395# 428#
396# Multi-device support (RAID and LVM) 429# Multi-device support (RAID and LVM)
@@ -434,6 +467,8 @@ CONFIG_LXT_PHY=y
434CONFIG_CICADA_PHY=y 467CONFIG_CICADA_PHY=y
435CONFIG_VITESSE_PHY=y 468CONFIG_VITESSE_PHY=y
436CONFIG_SMSC_PHY=y 469CONFIG_SMSC_PHY=y
470# CONFIG_BROADCOM_PHY is not set
471# CONFIG_FIXED_PHY is not set
437 472
438# 473#
439# Ethernet (10 or 100Mbit) 474# Ethernet (10 or 100Mbit)
@@ -484,6 +519,7 @@ CONFIG_NET_ETHERNET=y
484# Input device support 519# Input device support
485# 520#
486CONFIG_INPUT=y 521CONFIG_INPUT=y
522# CONFIG_INPUT_FF_MEMLESS is not set
487 523
488# 524#
489# Userland interfaces 525# Userland interfaces
@@ -557,17 +593,12 @@ CONFIG_LEGACY_PTY_COUNT=256
557# CONFIG_GEN_RTC is not set 593# CONFIG_GEN_RTC is not set
558# CONFIG_DTLK is not set 594# CONFIG_DTLK is not set
559# CONFIG_R3964 is not set 595# CONFIG_R3964 is not set
560
561#
562# Ftape, the floppy tape device driver
563#
564# CONFIG_RAW_DRIVER is not set 596# CONFIG_RAW_DRIVER is not set
565 597
566# 598#
567# TPM devices 599# TPM devices
568# 600#
569# CONFIG_TCG_TPM is not set 601# CONFIG_TCG_TPM is not set
570# CONFIG_TELCLOCK is not set
571 602
572# 603#
573# I2C support 604# I2C support
@@ -592,14 +623,9 @@ CONFIG_LEGACY_PTY_COUNT=256
592# CONFIG_HWMON_VID is not set 623# CONFIG_HWMON_VID is not set
593 624
594# 625#
595# Misc devices
596#
597
598#
599# Multimedia devices 626# Multimedia devices
600# 627#
601# CONFIG_VIDEO_DEV is not set 628# CONFIG_VIDEO_DEV is not set
602CONFIG_VIDEO_V4L2=y
603 629
604# 630#
605# Digital Video Broadcasting Devices 631# Digital Video Broadcasting Devices
@@ -617,6 +643,7 @@ CONFIG_VIDEO_V4L2=y
617# 643#
618# CONFIG_VGA_CONSOLE is not set 644# CONFIG_VGA_CONSOLE is not set
619CONFIG_DUMMY_CONSOLE=y 645CONFIG_DUMMY_CONSOLE=y
646# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
620 647
621# 648#
622# Sound 649# Sound
@@ -624,6 +651,11 @@ CONFIG_DUMMY_CONSOLE=y
624# CONFIG_SOUND is not set 651# CONFIG_SOUND is not set
625 652
626# 653#
654# HID Devices
655#
656# CONFIG_HID is not set
657
658#
627# USB support 659# USB support
628# 660#
629# CONFIG_USB_ARCH_HAS_HCD is not set 661# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -684,16 +716,26 @@ CONFIG_DUMMY_CONSOLE=y
684# 716#
685 717
686# 718#
719# Auxiliary Display support
720#
721
722#
723# Virtualization
724#
725
726#
687# File systems 727# File systems
688# 728#
689CONFIG_EXT2_FS=y 729CONFIG_EXT2_FS=y
690# CONFIG_EXT2_FS_XATTR is not set 730# CONFIG_EXT2_FS_XATTR is not set
691# CONFIG_EXT2_FS_XIP is not set 731# CONFIG_EXT2_FS_XIP is not set
692# CONFIG_EXT3_FS is not set 732# CONFIG_EXT3_FS is not set
733# CONFIG_EXT4DEV_FS is not set
693# CONFIG_REISERFS_FS is not set 734# CONFIG_REISERFS_FS is not set
694# CONFIG_JFS_FS is not set 735# CONFIG_JFS_FS is not set
695# CONFIG_FS_POSIX_ACL is not set 736CONFIG_FS_POSIX_ACL=y
696# CONFIG_XFS_FS is not set 737# CONFIG_XFS_FS is not set
738# CONFIG_GFS2_FS is not set
697# CONFIG_OCFS2_FS is not set 739# CONFIG_OCFS2_FS is not set
698# CONFIG_MINIX_FS is not set 740# CONFIG_MINIX_FS is not set
699# CONFIG_ROMFS_FS is not set 741# CONFIG_ROMFS_FS is not set
@@ -704,6 +746,7 @@ CONFIG_DNOTIFY=y
704# CONFIG_AUTOFS_FS is not set 746# CONFIG_AUTOFS_FS is not set
705# CONFIG_AUTOFS4_FS is not set 747# CONFIG_AUTOFS4_FS is not set
706CONFIG_FUSE_FS=y 748CONFIG_FUSE_FS=y
749CONFIG_GENERIC_ACL=y
707 750
708# 751#
709# CD-ROM/DVD Filesystems 752# CD-ROM/DVD Filesystems
@@ -723,17 +766,20 @@ CONFIG_FUSE_FS=y
723# 766#
724CONFIG_PROC_FS=y 767CONFIG_PROC_FS=y
725CONFIG_PROC_KCORE=y 768CONFIG_PROC_KCORE=y
769CONFIG_PROC_SYSCTL=y
726CONFIG_SYSFS=y 770CONFIG_SYSFS=y
727CONFIG_TMPFS=y 771CONFIG_TMPFS=y
772CONFIG_TMPFS_POSIX_ACL=y
728# CONFIG_HUGETLB_PAGE is not set 773# CONFIG_HUGETLB_PAGE is not set
729CONFIG_RAMFS=y 774CONFIG_RAMFS=y
730# CONFIG_CONFIGFS_FS is not set 775CONFIG_CONFIGFS_FS=y
731 776
732# 777#
733# Miscellaneous filesystems 778# Miscellaneous filesystems
734# 779#
735# CONFIG_ADFS_FS is not set 780# CONFIG_ADFS_FS is not set
736# CONFIG_AFFS_FS is not set 781# CONFIG_AFFS_FS is not set
782# CONFIG_ECRYPT_FS is not set
737# CONFIG_HFS_FS is not set 783# CONFIG_HFS_FS is not set
738# CONFIG_HFSPLUS_FS is not set 784# CONFIG_HFSPLUS_FS is not set
739# CONFIG_BEFS_FS is not set 785# CONFIG_BEFS_FS is not set
@@ -765,7 +811,6 @@ CONFIG_SUNRPC=y
765# CONFIG_RPCSEC_GSS_SPKM3 is not set 811# CONFIG_RPCSEC_GSS_SPKM3 is not set
766# CONFIG_SMB_FS is not set 812# CONFIG_SMB_FS is not set
767# CONFIG_CIFS is not set 813# CONFIG_CIFS is not set
768# CONFIG_CIFS_DEBUG2 is not set
769# CONFIG_NCP_FS is not set 814# CONFIG_NCP_FS is not set
770# CONFIG_CODA_FS is not set 815# CONFIG_CODA_FS is not set
771# CONFIG_AFS_FS is not set 816# CONFIG_AFS_FS is not set
@@ -783,6 +828,14 @@ CONFIG_MSDOS_PARTITION=y
783# CONFIG_NLS is not set 828# CONFIG_NLS is not set
784 829
785# 830#
831# Distributed Lock Manager
832#
833CONFIG_DLM=y
834CONFIG_DLM_TCP=y
835# CONFIG_DLM_SCTP is not set
836# CONFIG_DLM_DEBUG is not set
837
838#
786# Profiling support 839# Profiling support
787# 840#
788# CONFIG_PROFILING is not set 841# CONFIG_PROFILING is not set
@@ -792,12 +845,13 @@ CONFIG_MSDOS_PARTITION=y
792# 845#
793CONFIG_TRACE_IRQFLAGS_SUPPORT=y 846CONFIG_TRACE_IRQFLAGS_SUPPORT=y
794# CONFIG_PRINTK_TIME is not set 847# CONFIG_PRINTK_TIME is not set
848CONFIG_ENABLE_MUST_CHECK=y
795# CONFIG_MAGIC_SYSRQ is not set 849# CONFIG_MAGIC_SYSRQ is not set
796# CONFIG_UNUSED_SYMBOLS is not set 850# CONFIG_UNUSED_SYMBOLS is not set
851# CONFIG_DEBUG_FS is not set
852# CONFIG_HEADERS_CHECK is not set
797# CONFIG_DEBUG_KERNEL is not set 853# CONFIG_DEBUG_KERNEL is not set
798CONFIG_LOG_BUF_SHIFT=14 854CONFIG_LOG_BUF_SHIFT=14
799# CONFIG_DEBUG_FS is not set
800# CONFIG_UNWIND_INFO is not set
801CONFIG_CROSSCOMPILE=y 855CONFIG_CROSSCOMPILE=y
802CONFIG_CMDLINE="" 856CONFIG_CMDLINE=""
803 857
@@ -812,7 +866,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
812# Cryptographic options 866# Cryptographic options
813# 867#
814CONFIG_CRYPTO=y 868CONFIG_CRYPTO=y
869CONFIG_CRYPTO_ALGAPI=y
870CONFIG_CRYPTO_BLKCIPHER=y
871CONFIG_CRYPTO_HASH=y
872CONFIG_CRYPTO_MANAGER=y
815CONFIG_CRYPTO_HMAC=y 873CONFIG_CRYPTO_HMAC=y
874CONFIG_CRYPTO_XCBC=y
816CONFIG_CRYPTO_NULL=y 875CONFIG_CRYPTO_NULL=y
817CONFIG_CRYPTO_MD4=y 876CONFIG_CRYPTO_MD4=y
818CONFIG_CRYPTO_MD5=y 877CONFIG_CRYPTO_MD5=y
@@ -821,9 +880,16 @@ CONFIG_CRYPTO_SHA256=y
821CONFIG_CRYPTO_SHA512=y 880CONFIG_CRYPTO_SHA512=y
822CONFIG_CRYPTO_WP512=y 881CONFIG_CRYPTO_WP512=y
823CONFIG_CRYPTO_TGR192=y 882CONFIG_CRYPTO_TGR192=y
883CONFIG_CRYPTO_GF128MUL=y
884CONFIG_CRYPTO_ECB=y
885CONFIG_CRYPTO_CBC=y
886CONFIG_CRYPTO_PCBC=y
887CONFIG_CRYPTO_LRW=y
824CONFIG_CRYPTO_DES=y 888CONFIG_CRYPTO_DES=y
889CONFIG_CRYPTO_FCRYPT=y
825CONFIG_CRYPTO_BLOWFISH=y 890CONFIG_CRYPTO_BLOWFISH=y
826CONFIG_CRYPTO_TWOFISH=y 891CONFIG_CRYPTO_TWOFISH=y
892CONFIG_CRYPTO_TWOFISH_COMMON=y
827CONFIG_CRYPTO_SERPENT=y 893CONFIG_CRYPTO_SERPENT=y
828CONFIG_CRYPTO_AES=y 894CONFIG_CRYPTO_AES=y
829CONFIG_CRYPTO_CAST5=y 895CONFIG_CRYPTO_CAST5=y
@@ -835,6 +901,7 @@ CONFIG_CRYPTO_ANUBIS=y
835CONFIG_CRYPTO_DEFLATE=y 901CONFIG_CRYPTO_DEFLATE=y
836CONFIG_CRYPTO_MICHAEL_MIC=y 902CONFIG_CRYPTO_MICHAEL_MIC=y
837CONFIG_CRYPTO_CRC32C=y 903CONFIG_CRYPTO_CRC32C=y
904CONFIG_CRYPTO_CAMELLIA=y
838 905
839# 906#
840# Hardware crypto devices 907# Hardware crypto devices
@@ -843,6 +910,7 @@ CONFIG_CRYPTO_CRC32C=y
843# 910#
844# Library routines 911# Library routines
845# 912#
913CONFIG_BITREVERSE=y
846# CONFIG_CRC_CCITT is not set 914# CONFIG_CRC_CCITT is not set
847CONFIG_CRC16=y 915CONFIG_CRC16=y
848CONFIG_CRC32=y 916CONFIG_CRC32=y
@@ -850,3 +918,5 @@ CONFIG_LIBCRC32C=y
850CONFIG_ZLIB_INFLATE=y 918CONFIG_ZLIB_INFLATE=y
851CONFIG_ZLIB_DEFLATE=y 919CONFIG_ZLIB_DEFLATE=y
852CONFIG_PLIST=y 920CONFIG_PLIST=y
921CONFIG_HAS_IOMEM=y
922CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index 46a942c253cf..260026392347 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:16 2006 4# Sun Feb 18 21:28:00 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MOMENCO_OCELOT_G=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MOMENCO_OCELOT_G=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -106,15 +110,14 @@ CONFIG_CPU_RM7000=y
106# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_RM7000=y 111CONFIG_SYS_HAS_CPU_RM7000=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
109CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 115
113# 116#
114# Kernel type 117# Kernel type
115# 118#
116# CONFIG_32BIT is not set 119CONFIG_32BIT=y
117CONFIG_64BIT=y 120# CONFIG_64BIT is not set
118CONFIG_PAGE_SIZE_4KB=y 121CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_8KB is not set 122# CONFIG_PAGE_SIZE_8KB is not set
120# CONFIG_PAGE_SIZE_16KB is not set 123# CONFIG_PAGE_SIZE_16KB is not set
@@ -123,9 +126,10 @@ CONFIG_BOARD_SCACHE=y
123CONFIG_RM7000_CPU_SCACHE=y 126CONFIG_RM7000_CPU_SCACHE=y
124CONFIG_CPU_HAS_PREFETCH=y 127CONFIG_CPU_HAS_PREFETCH=y
125CONFIG_MIPS_MT_DISABLED=y 128CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 129# CONFIG_MIPS_MT_SMP is not set
130# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 131# CONFIG_MIPS_VPE_LOADER is not set
132# CONFIG_64BIT_PHYS_ADDR is not set
129CONFIG_CPU_HAS_LLSC=y 133CONFIG_CPU_HAS_LLSC=y
130CONFIG_CPU_HAS_SYNC=y 134CONFIG_CPU_HAS_SYNC=y
131CONFIG_GENERIC_HARDIRQS=y 135CONFIG_GENERIC_HARDIRQS=y
@@ -141,6 +145,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 145# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 146CONFIG_SPLIT_PTLOCK_CPUS=4
143CONFIG_RESOURCES_64BIT=y 147CONFIG_RESOURCES_64BIT=y
148CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 149# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 150# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 151# CONFIG_HZ_128 is not set
@@ -153,6 +158,7 @@ CONFIG_HZ=1000
153CONFIG_PREEMPT_NONE=y 158CONFIG_PREEMPT_NONE=y
154# CONFIG_PREEMPT_VOLUNTARY is not set 159# CONFIG_PREEMPT_VOLUNTARY is not set
155# CONFIG_PREEMPT is not set 160# CONFIG_PREEMPT is not set
161# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 162CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 163CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 164CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,15 +177,20 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 177CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 178CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 179CONFIG_SYSVIPC=y
180# CONFIG_IPC_NS is not set
181CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 182# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 183# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 184# CONFIG_TASKSTATS is not set
185# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 186# CONFIG_AUDIT is not set
178# CONFIG_IKCONFIG is not set 187# CONFIG_IKCONFIG is not set
188CONFIG_SYSFS_DEPRECATED=y
179CONFIG_RELAY=y 189CONFIG_RELAY=y
180CONFIG_INITRAMFS_SOURCE=""
181# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 190# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
191CONFIG_SYSCTL=y
182CONFIG_EMBEDDED=y 192CONFIG_EMBEDDED=y
193CONFIG_SYSCTL_SYSCALL=y
183CONFIG_KALLSYMS=y 194CONFIG_KALLSYMS=y
184# CONFIG_KALLSYMS_EXTRA_PASS is not set 195# CONFIG_KALLSYMS_EXTRA_PASS is not set
185CONFIG_HOTPLUG=y 196CONFIG_HOTPLUG=y
@@ -187,12 +198,12 @@ CONFIG_PRINTK=y
187CONFIG_BUG=y 198CONFIG_BUG=y
188CONFIG_ELF_CORE=y 199CONFIG_ELF_CORE=y
189CONFIG_BASE_FULL=y 200CONFIG_BASE_FULL=y
190CONFIG_RT_MUTEXES=y
191CONFIG_FUTEX=y 201CONFIG_FUTEX=y
192CONFIG_EPOLL=y 202CONFIG_EPOLL=y
193CONFIG_SHMEM=y 203CONFIG_SHMEM=y
194CONFIG_SLAB=y 204CONFIG_SLAB=y
195CONFIG_VM_EVENT_COUNTERS=y 205CONFIG_VM_EVENT_COUNTERS=y
206CONFIG_RT_MUTEXES=y
196# CONFIG_TINY_SHMEM is not set 207# CONFIG_TINY_SHMEM is not set
197CONFIG_BASE_SMALL=0 208CONFIG_BASE_SMALL=0
198# CONFIG_SLOB is not set 209# CONFIG_SLOB is not set
@@ -205,7 +216,10 @@ CONFIG_BASE_SMALL=0
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
220# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
222CONFIG_LSF=y
209 223
210# 224#
211# IO Schedulers 225# IO Schedulers
@@ -242,12 +256,15 @@ CONFIG_MMU=y
242# 256#
243CONFIG_BINFMT_ELF=y 257CONFIG_BINFMT_ELF=y
244# CONFIG_BINFMT_MISC is not set 258# CONFIG_BINFMT_MISC is not set
245# CONFIG_BUILD_ELF64 is not set 259CONFIG_TRAD_SIGNALS=y
246CONFIG_MIPS32_COMPAT=y 260
247CONFIG_COMPAT=y 261#
248CONFIG_MIPS32_O32=y 262# Power management options
249CONFIG_MIPS32_N32=y 263#
250CONFIG_BINFMT_ELF32=y 264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
251 268
252# 269#
253# Networking 270# Networking
@@ -262,7 +279,10 @@ CONFIG_NET=y
262CONFIG_UNIX=y 279CONFIG_UNIX=y
263CONFIG_XFRM=y 280CONFIG_XFRM=y
264CONFIG_XFRM_USER=y 281CONFIG_XFRM_USER=y
282# CONFIG_XFRM_SUB_POLICY is not set
283CONFIG_XFRM_MIGRATE=y
265CONFIG_NET_KEY=y 284CONFIG_NET_KEY=y
285CONFIG_NET_KEY_MIGRATE=y
266CONFIG_INET=y 286CONFIG_INET=y
267# CONFIG_IP_MULTICAST is not set 287# CONFIG_IP_MULTICAST is not set
268# CONFIG_IP_ADVANCED_ROUTER is not set 288# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -282,10 +302,13 @@ CONFIG_IP_PNP_DHCP=y
282# CONFIG_INET_TUNNEL is not set 302# CONFIG_INET_TUNNEL is not set
283CONFIG_INET_XFRM_MODE_TRANSPORT=y 303CONFIG_INET_XFRM_MODE_TRANSPORT=y
284CONFIG_INET_XFRM_MODE_TUNNEL=y 304CONFIG_INET_XFRM_MODE_TUNNEL=y
305CONFIG_INET_XFRM_MODE_BEET=y
285CONFIG_INET_DIAG=y 306CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 307CONFIG_INET_TCP_DIAG=y
287# CONFIG_TCP_CONG_ADVANCED is not set 308# CONFIG_TCP_CONG_ADVANCED is not set
288CONFIG_TCP_CONG_BIC=y 309CONFIG_TCP_CONG_CUBIC=y
310CONFIG_DEFAULT_TCP_CONG="cubic"
311CONFIG_TCP_MD5SIG=y
289# CONFIG_IPV6 is not set 312# CONFIG_IPV6 is not set
290# CONFIG_INET6_XFRM_TUNNEL is not set 313# CONFIG_INET6_XFRM_TUNNEL is not set
291# CONFIG_INET6_TUNNEL is not set 314# CONFIG_INET6_TUNNEL is not set
@@ -315,7 +338,6 @@ CONFIG_NETWORK_SECMARK=y
315# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
316# CONFIG_X25 is not set 339# CONFIG_X25 is not set
317# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
318# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 341# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 342# CONFIG_WAN_ROUTER is not set
321 343
@@ -390,6 +412,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
390CONFIG_ATA_OVER_ETH=y 412CONFIG_ATA_OVER_ETH=y
391 413
392# 414#
415# Misc devices
416#
417CONFIG_SGI_IOC4=y
418# CONFIG_TIFM_CORE is not set
419
420#
393# ATA/ATAPI/MFM/RLL support 421# ATA/ATAPI/MFM/RLL support
394# 422#
395# CONFIG_IDE is not set 423# CONFIG_IDE is not set
@@ -399,6 +427,12 @@ CONFIG_ATA_OVER_ETH=y
399# 427#
400CONFIG_RAID_ATTRS=y 428CONFIG_RAID_ATTRS=y
401# CONFIG_SCSI is not set 429# CONFIG_SCSI is not set
430# CONFIG_SCSI_NETLINK is not set
431
432#
433# Serial ATA (prod) and Parallel ATA (experimental) drivers
434#
435# CONFIG_ATA is not set
402 436
403# 437#
404# Multi-device support (RAID and LVM) 438# Multi-device support (RAID and LVM)
@@ -449,6 +483,8 @@ CONFIG_LXT_PHY=y
449CONFIG_CICADA_PHY=y 483CONFIG_CICADA_PHY=y
450CONFIG_VITESSE_PHY=y 484CONFIG_VITESSE_PHY=y
451CONFIG_SMSC_PHY=y 485CONFIG_SMSC_PHY=y
486# CONFIG_BROADCOM_PHY is not set
487# CONFIG_FIXED_PHY is not set
452 488
453# 489#
454# Ethernet (10 or 100Mbit) 490# Ethernet (10 or 100Mbit)
@@ -485,14 +521,17 @@ CONFIG_GALILEO_64240_ETH=y
485# CONFIG_SK98LIN is not set 521# CONFIG_SK98LIN is not set
486# CONFIG_TIGON3 is not set 522# CONFIG_TIGON3 is not set
487# CONFIG_BNX2 is not set 523# CONFIG_BNX2 is not set
524CONFIG_QLA3XXX=y
488 525
489# 526#
490# Ethernet (10000 Mbit) 527# Ethernet (10000 Mbit)
491# 528#
492# CONFIG_CHELSIO_T1 is not set 529# CONFIG_CHELSIO_T1 is not set
530CONFIG_CHELSIO_T3=y
493# CONFIG_IXGB is not set 531# CONFIG_IXGB is not set
494# CONFIG_S2IO is not set 532# CONFIG_S2IO is not set
495# CONFIG_MYRI10GE is not set 533# CONFIG_MYRI10GE is not set
534CONFIG_NETXEN_NIC=y
496 535
497# 536#
498# Token Ring devices 537# Token Ring devices
@@ -531,6 +570,7 @@ CONFIG_GALILEO_64240_ETH=y
531# Input device support 570# Input device support
532# 571#
533CONFIG_INPUT=y 572CONFIG_INPUT=y
573# CONFIG_INPUT_FF_MEMLESS is not set
534 574
535# 575#
536# Userland interfaces 576# Userland interfaces
@@ -608,10 +648,6 @@ CONFIG_LEGACY_PTY_COUNT=256
608# CONFIG_DTLK is not set 648# CONFIG_DTLK is not set
609# CONFIG_R3964 is not set 649# CONFIG_R3964 is not set
610# CONFIG_APPLICOM is not set 650# CONFIG_APPLICOM is not set
611
612#
613# Ftape, the floppy tape device driver
614#
615# CONFIG_DRM is not set 651# CONFIG_DRM is not set
616# CONFIG_RAW_DRIVER is not set 652# CONFIG_RAW_DRIVER is not set
617 653
@@ -619,7 +655,6 @@ CONFIG_LEGACY_PTY_COUNT=256
619# TPM devices 655# TPM devices
620# 656#
621# CONFIG_TCG_TPM is not set 657# CONFIG_TCG_TPM is not set
622# CONFIG_TELCLOCK is not set
623 658
624# 659#
625# I2C support 660# I2C support
@@ -644,14 +679,9 @@ CONFIG_LEGACY_PTY_COUNT=256
644# CONFIG_HWMON_VID is not set 679# CONFIG_HWMON_VID is not set
645 680
646# 681#
647# Misc devices
648#
649
650#
651# Multimedia devices 682# Multimedia devices
652# 683#
653# CONFIG_VIDEO_DEV is not set 684# CONFIG_VIDEO_DEV is not set
654CONFIG_VIDEO_V4L2=y
655 685
656# 686#
657# Digital Video Broadcasting Devices 687# Digital Video Broadcasting Devices
@@ -669,6 +699,7 @@ CONFIG_VIDEO_V4L2=y
669# 699#
670# CONFIG_VGA_CONSOLE is not set 700# CONFIG_VGA_CONSOLE is not set
671CONFIG_DUMMY_CONSOLE=y 701CONFIG_DUMMY_CONSOLE=y
702# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
672 703
673# 704#
674# Sound 705# Sound
@@ -676,6 +707,11 @@ CONFIG_DUMMY_CONSOLE=y
676# CONFIG_SOUND is not set 707# CONFIG_SOUND is not set
677 708
678# 709#
710# HID Devices
711#
712# CONFIG_HID is not set
713
714#
679# USB support 715# USB support
680# 716#
681CONFIG_USB_ARCH_HAS_HCD=y 717CONFIG_USB_ARCH_HAS_HCD=y
@@ -738,16 +774,26 @@ CONFIG_USB_ARCH_HAS_EHCI=y
738# 774#
739 775
740# 776#
777# Auxiliary Display support
778#
779
780#
781# Virtualization
782#
783
784#
741# File systems 785# File systems
742# 786#
743CONFIG_EXT2_FS=y 787CONFIG_EXT2_FS=y
744# CONFIG_EXT2_FS_XATTR is not set 788# CONFIG_EXT2_FS_XATTR is not set
745# CONFIG_EXT2_FS_XIP is not set 789# CONFIG_EXT2_FS_XIP is not set
746# CONFIG_EXT3_FS is not set 790# CONFIG_EXT3_FS is not set
791# CONFIG_EXT4DEV_FS is not set
747# CONFIG_REISERFS_FS is not set 792# CONFIG_REISERFS_FS is not set
748# CONFIG_JFS_FS is not set 793# CONFIG_JFS_FS is not set
749# CONFIG_FS_POSIX_ACL is not set 794CONFIG_FS_POSIX_ACL=y
750# CONFIG_XFS_FS is not set 795# CONFIG_XFS_FS is not set
796# CONFIG_GFS2_FS is not set
751# CONFIG_OCFS2_FS is not set 797# CONFIG_OCFS2_FS is not set
752# CONFIG_MINIX_FS is not set 798# CONFIG_MINIX_FS is not set
753# CONFIG_ROMFS_FS is not set 799# CONFIG_ROMFS_FS is not set
@@ -758,6 +804,7 @@ CONFIG_DNOTIFY=y
758# CONFIG_AUTOFS_FS is not set 804# CONFIG_AUTOFS_FS is not set
759# CONFIG_AUTOFS4_FS is not set 805# CONFIG_AUTOFS4_FS is not set
760CONFIG_FUSE_FS=y 806CONFIG_FUSE_FS=y
807CONFIG_GENERIC_ACL=y
761 808
762# 809#
763# CD-ROM/DVD Filesystems 810# CD-ROM/DVD Filesystems
@@ -777,17 +824,20 @@ CONFIG_FUSE_FS=y
777# 824#
778CONFIG_PROC_FS=y 825CONFIG_PROC_FS=y
779CONFIG_PROC_KCORE=y 826CONFIG_PROC_KCORE=y
827CONFIG_PROC_SYSCTL=y
780CONFIG_SYSFS=y 828CONFIG_SYSFS=y
781CONFIG_TMPFS=y 829CONFIG_TMPFS=y
830CONFIG_TMPFS_POSIX_ACL=y
782# CONFIG_HUGETLB_PAGE is not set 831# CONFIG_HUGETLB_PAGE is not set
783CONFIG_RAMFS=y 832CONFIG_RAMFS=y
784# CONFIG_CONFIGFS_FS is not set 833CONFIG_CONFIGFS_FS=y
785 834
786# 835#
787# Miscellaneous filesystems 836# Miscellaneous filesystems
788# 837#
789# CONFIG_ADFS_FS is not set 838# CONFIG_ADFS_FS is not set
790# CONFIG_AFFS_FS is not set 839# CONFIG_AFFS_FS is not set
840# CONFIG_ECRYPT_FS is not set
791# CONFIG_HFS_FS is not set 841# CONFIG_HFS_FS is not set
792# CONFIG_HFSPLUS_FS is not set 842# CONFIG_HFSPLUS_FS is not set
793# CONFIG_BEFS_FS is not set 843# CONFIG_BEFS_FS is not set
@@ -819,7 +869,6 @@ CONFIG_SUNRPC=y
819# CONFIG_RPCSEC_GSS_SPKM3 is not set 869# CONFIG_RPCSEC_GSS_SPKM3 is not set
820# CONFIG_SMB_FS is not set 870# CONFIG_SMB_FS is not set
821# CONFIG_CIFS is not set 871# CONFIG_CIFS is not set
822# CONFIG_CIFS_DEBUG2 is not set
823# CONFIG_NCP_FS is not set 872# CONFIG_NCP_FS is not set
824# CONFIG_CODA_FS is not set 873# CONFIG_CODA_FS is not set
825# CONFIG_AFS_FS is not set 874# CONFIG_AFS_FS is not set
@@ -837,6 +886,14 @@ CONFIG_MSDOS_PARTITION=y
837# CONFIG_NLS is not set 886# CONFIG_NLS is not set
838 887
839# 888#
889# Distributed Lock Manager
890#
891CONFIG_DLM=y
892CONFIG_DLM_TCP=y
893# CONFIG_DLM_SCTP is not set
894# CONFIG_DLM_DEBUG is not set
895
896#
840# Profiling support 897# Profiling support
841# 898#
842# CONFIG_PROFILING is not set 899# CONFIG_PROFILING is not set
@@ -846,12 +903,13 @@ CONFIG_MSDOS_PARTITION=y
846# 903#
847CONFIG_TRACE_IRQFLAGS_SUPPORT=y 904CONFIG_TRACE_IRQFLAGS_SUPPORT=y
848# CONFIG_PRINTK_TIME is not set 905# CONFIG_PRINTK_TIME is not set
906CONFIG_ENABLE_MUST_CHECK=y
849# CONFIG_MAGIC_SYSRQ is not set 907# CONFIG_MAGIC_SYSRQ is not set
850# CONFIG_UNUSED_SYMBOLS is not set 908# CONFIG_UNUSED_SYMBOLS is not set
909# CONFIG_DEBUG_FS is not set
910# CONFIG_HEADERS_CHECK is not set
851# CONFIG_DEBUG_KERNEL is not set 911# CONFIG_DEBUG_KERNEL is not set
852CONFIG_LOG_BUF_SHIFT=14 912CONFIG_LOG_BUF_SHIFT=14
853# CONFIG_DEBUG_FS is not set
854# CONFIG_UNWIND_INFO is not set
855CONFIG_CROSSCOMPILE=y 913CONFIG_CROSSCOMPILE=y
856CONFIG_CMDLINE="" 914CONFIG_CMDLINE=""
857 915
@@ -866,7 +924,12 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
866# Cryptographic options 924# Cryptographic options
867# 925#
868CONFIG_CRYPTO=y 926CONFIG_CRYPTO=y
927CONFIG_CRYPTO_ALGAPI=y
928CONFIG_CRYPTO_BLKCIPHER=y
929CONFIG_CRYPTO_HASH=y
930CONFIG_CRYPTO_MANAGER=y
869CONFIG_CRYPTO_HMAC=y 931CONFIG_CRYPTO_HMAC=y
932CONFIG_CRYPTO_XCBC=y
870CONFIG_CRYPTO_NULL=y 933CONFIG_CRYPTO_NULL=y
871CONFIG_CRYPTO_MD4=y 934CONFIG_CRYPTO_MD4=y
872CONFIG_CRYPTO_MD5=y 935CONFIG_CRYPTO_MD5=y
@@ -875,9 +938,16 @@ CONFIG_CRYPTO_SHA256=y
875CONFIG_CRYPTO_SHA512=y 938CONFIG_CRYPTO_SHA512=y
876CONFIG_CRYPTO_WP512=y 939CONFIG_CRYPTO_WP512=y
877CONFIG_CRYPTO_TGR192=y 940CONFIG_CRYPTO_TGR192=y
941CONFIG_CRYPTO_GF128MUL=y
942CONFIG_CRYPTO_ECB=y
943CONFIG_CRYPTO_CBC=y
944CONFIG_CRYPTO_PCBC=y
945CONFIG_CRYPTO_LRW=y
878CONFIG_CRYPTO_DES=y 946CONFIG_CRYPTO_DES=y
947CONFIG_CRYPTO_FCRYPT=y
879CONFIG_CRYPTO_BLOWFISH=y 948CONFIG_CRYPTO_BLOWFISH=y
880CONFIG_CRYPTO_TWOFISH=y 949CONFIG_CRYPTO_TWOFISH=y
950CONFIG_CRYPTO_TWOFISH_COMMON=y
881CONFIG_CRYPTO_SERPENT=y 951CONFIG_CRYPTO_SERPENT=y
882CONFIG_CRYPTO_AES=y 952CONFIG_CRYPTO_AES=y
883CONFIG_CRYPTO_CAST5=y 953CONFIG_CRYPTO_CAST5=y
@@ -889,6 +959,7 @@ CONFIG_CRYPTO_ANUBIS=y
889CONFIG_CRYPTO_DEFLATE=y 959CONFIG_CRYPTO_DEFLATE=y
890CONFIG_CRYPTO_MICHAEL_MIC=y 960CONFIG_CRYPTO_MICHAEL_MIC=y
891CONFIG_CRYPTO_CRC32C=y 961CONFIG_CRYPTO_CRC32C=y
962CONFIG_CRYPTO_CAMELLIA=y
892 963
893# 964#
894# Hardware crypto devices 965# Hardware crypto devices
@@ -897,6 +968,7 @@ CONFIG_CRYPTO_CRC32C=y
897# 968#
898# Library routines 969# Library routines
899# 970#
971CONFIG_BITREVERSE=y
900# CONFIG_CRC_CCITT is not set 972# CONFIG_CRC_CCITT is not set
901CONFIG_CRC16=y 973CONFIG_CRC16=y
902CONFIG_CRC32=y 974CONFIG_CRC32=y
@@ -904,3 +976,5 @@ CONFIG_LIBCRC32C=y
904CONFIG_ZLIB_INFLATE=y 976CONFIG_ZLIB_INFLATE=y
905CONFIG_ZLIB_DEFLATE=y 977CONFIG_ZLIB_DEFLATE=y
906CONFIG_PLIST=y 978CONFIG_PLIST=y
979CONFIG_HAS_IOMEM=y
980CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 7d3c688181d5..05a33a2aeb25 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:17 2006 4# Sun Feb 18 21:28:01 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_PB1100=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_PB1100=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +64,19 @@ CONFIG_MIPS_PB1100=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1100=y 81CONFIG_SOC_AU1100=y
77CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -117,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_64BIT_PHYS_ADDR=y 128CONFIG_64BIT_PHYS_ADDR=y
124CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +141,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 143# CONFIG_RESOURCES_64BIT is not set
144CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -148,6 +154,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +173,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 174CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 185CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -182,12 +194,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 194CONFIG_BUG=y
183CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 197CONFIG_FUTEX=y
187CONFIG_EPOLL=y 198CONFIG_EPOLL=y
188CONFIG_SHMEM=y 199CONFIG_SHMEM=y
189CONFIG_SLAB=y 200CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -205,6 +217,7 @@ CONFIG_KMOD=y
205# 217#
206# Block layer 218# Block layer
207# 219#
220CONFIG_BLOCK=y
208# CONFIG_LBD is not set 221# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -253,6 +266,10 @@ CONFIG_PCMCIA_IOCTL=y
253CONFIG_BINFMT_ELF=y 266CONFIG_BINFMT_ELF=y
254# CONFIG_BINFMT_MISC is not set 267# CONFIG_BINFMT_MISC is not set
255CONFIG_TRAD_SIGNALS=y 268CONFIG_TRAD_SIGNALS=y
269
270#
271# Power management options
272#
256# CONFIG_PM is not set 273# CONFIG_PM is not set
257 274
258# 275#
@@ -269,7 +286,10 @@ CONFIG_PACKET=y
269CONFIG_UNIX=y 286CONFIG_UNIX=y
270CONFIG_XFRM=y 287CONFIG_XFRM=y
271CONFIG_XFRM_USER=m 288CONFIG_XFRM_USER=m
289# CONFIG_XFRM_SUB_POLICY is not set
290CONFIG_XFRM_MIGRATE=y
272CONFIG_NET_KEY=y 291CONFIG_NET_KEY=y
292CONFIG_NET_KEY_MIGRATE=y
273CONFIG_INET=y 293CONFIG_INET=y
274CONFIG_IP_MULTICAST=y 294CONFIG_IP_MULTICAST=y
275# CONFIG_IP_ADVANCED_ROUTER is not set 295# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -290,10 +310,13 @@ CONFIG_IP_PNP_BOOTP=y
290# CONFIG_INET_TUNNEL is not set 310# CONFIG_INET_TUNNEL is not set
291CONFIG_INET_XFRM_MODE_TRANSPORT=m 311CONFIG_INET_XFRM_MODE_TRANSPORT=m
292CONFIG_INET_XFRM_MODE_TUNNEL=m 312CONFIG_INET_XFRM_MODE_TUNNEL=m
313CONFIG_INET_XFRM_MODE_BEET=m
293CONFIG_INET_DIAG=y 314CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 315CONFIG_INET_TCP_DIAG=y
295# CONFIG_TCP_CONG_ADVANCED is not set 316# CONFIG_TCP_CONG_ADVANCED is not set
296CONFIG_TCP_CONG_BIC=y 317CONFIG_TCP_CONG_CUBIC=y
318CONFIG_DEFAULT_TCP_CONG="cubic"
319CONFIG_TCP_MD5SIG=y
297 320
298# 321#
299# IP: Virtual Server Configuration 322# IP: Virtual Server Configuration
@@ -312,15 +335,42 @@ CONFIG_NETFILTER=y
312CONFIG_NETFILTER_NETLINK=m 335CONFIG_NETFILTER_NETLINK=m
313CONFIG_NETFILTER_NETLINK_QUEUE=m 336CONFIG_NETFILTER_NETLINK_QUEUE=m
314CONFIG_NETFILTER_NETLINK_LOG=m 337CONFIG_NETFILTER_NETLINK_LOG=m
315# CONFIG_NF_CONNTRACK is not set 338CONFIG_NF_CONNTRACK_ENABLED=m
339CONFIG_NF_CONNTRACK_SUPPORT=y
340# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
341CONFIG_NF_CONNTRACK=m
342CONFIG_NF_CT_ACCT=y
343CONFIG_NF_CONNTRACK_MARK=y
344CONFIG_NF_CONNTRACK_SECMARK=y
345CONFIG_NF_CONNTRACK_EVENTS=y
346CONFIG_NF_CT_PROTO_GRE=m
347CONFIG_NF_CT_PROTO_SCTP=m
348CONFIG_NF_CONNTRACK_AMANDA=m
349CONFIG_NF_CONNTRACK_FTP=m
350CONFIG_NF_CONNTRACK_H323=m
351CONFIG_NF_CONNTRACK_IRC=m
352# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
353CONFIG_NF_CONNTRACK_PPTP=m
354CONFIG_NF_CONNTRACK_SANE=m
355CONFIG_NF_CONNTRACK_SIP=m
356CONFIG_NF_CONNTRACK_TFTP=m
357CONFIG_NF_CT_NETLINK=m
316CONFIG_NETFILTER_XTABLES=m 358CONFIG_NETFILTER_XTABLES=m
317CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 359CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
318CONFIG_NETFILTER_XT_TARGET_MARK=m 360CONFIG_NETFILTER_XT_TARGET_MARK=m
319CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 361CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
362CONFIG_NETFILTER_XT_TARGET_NFLOG=m
320CONFIG_NETFILTER_XT_TARGET_SECMARK=m 363CONFIG_NETFILTER_XT_TARGET_SECMARK=m
364CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
365CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
321CONFIG_NETFILTER_XT_MATCH_COMMENT=m 366CONFIG_NETFILTER_XT_MATCH_COMMENT=m
367CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
368CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
369CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
322CONFIG_NETFILTER_XT_MATCH_DCCP=m 370CONFIG_NETFILTER_XT_MATCH_DCCP=m
371CONFIG_NETFILTER_XT_MATCH_DSCP=m
323CONFIG_NETFILTER_XT_MATCH_ESP=m 372CONFIG_NETFILTER_XT_MATCH_ESP=m
373CONFIG_NETFILTER_XT_MATCH_HELPER=m
324CONFIG_NETFILTER_XT_MATCH_LENGTH=m 374CONFIG_NETFILTER_XT_MATCH_LENGTH=m
325CONFIG_NETFILTER_XT_MATCH_LIMIT=m 375CONFIG_NETFILTER_XT_MATCH_LIMIT=m
326CONFIG_NETFILTER_XT_MATCH_MAC=m 376CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -331,14 +381,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
331CONFIG_NETFILTER_XT_MATCH_QUOTA=m 381CONFIG_NETFILTER_XT_MATCH_QUOTA=m
332CONFIG_NETFILTER_XT_MATCH_REALM=m 382CONFIG_NETFILTER_XT_MATCH_REALM=m
333CONFIG_NETFILTER_XT_MATCH_SCTP=m 383CONFIG_NETFILTER_XT_MATCH_SCTP=m
384CONFIG_NETFILTER_XT_MATCH_STATE=m
334CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 385CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
335CONFIG_NETFILTER_XT_MATCH_STRING=m 386CONFIG_NETFILTER_XT_MATCH_STRING=m
336CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 387CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
388CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
337 389
338# 390#
339# IP: Netfilter Configuration 391# IP: Netfilter Configuration
340# 392#
341# CONFIG_IP_NF_CONNTRACK is not set 393CONFIG_NF_CONNTRACK_IPV4=m
394CONFIG_NF_CONNTRACK_PROC_COMPAT=y
342# CONFIG_IP_NF_QUEUE is not set 395# CONFIG_IP_NF_QUEUE is not set
343# CONFIG_IP_NF_IPTABLES is not set 396# CONFIG_IP_NF_IPTABLES is not set
344# CONFIG_IP_NF_ARPTABLES is not set 397# CONFIG_IP_NF_ARPTABLES is not set
@@ -366,7 +419,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
366# CONFIG_ATALK is not set 419# CONFIG_ATALK is not set
367# CONFIG_X25 is not set 420# CONFIG_X25 is not set
368# CONFIG_LAPB is not set 421# CONFIG_LAPB is not set
369# CONFIG_NET_DIVERT is not set
370# CONFIG_ECONET is not set 422# CONFIG_ECONET is not set
371# CONFIG_WAN_ROUTER is not set 423# CONFIG_WAN_ROUTER is not set
372 424
@@ -422,11 +474,13 @@ CONFIG_MTD_PARTITIONS=y
422# User Modules And Translation Layers 474# User Modules And Translation Layers
423# 475#
424CONFIG_MTD_CHAR=y 476CONFIG_MTD_CHAR=y
477CONFIG_MTD_BLKDEVS=y
425CONFIG_MTD_BLOCK=y 478CONFIG_MTD_BLOCK=y
426# CONFIG_FTL is not set 479# CONFIG_FTL is not set
427# CONFIG_NFTL is not set 480# CONFIG_NFTL is not set
428# CONFIG_INFTL is not set 481# CONFIG_INFTL is not set
429# CONFIG_RFD_FTL is not set 482# CONFIG_RFD_FTL is not set
483# CONFIG_SSFDC is not set
430 484
431# 485#
432# RAM/ROM/Flash chip drivers 486# RAM/ROM/Flash chip drivers
@@ -511,6 +565,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
511CONFIG_ATA_OVER_ETH=m 565CONFIG_ATA_OVER_ETH=m
512 566
513# 567#
568# Misc devices
569#
570
571#
514# ATA/ATAPI/MFM/RLL support 572# ATA/ATAPI/MFM/RLL support
515# 573#
516# CONFIG_IDE is not set 574# CONFIG_IDE is not set
@@ -520,6 +578,12 @@ CONFIG_ATA_OVER_ETH=m
520# 578#
521CONFIG_RAID_ATTRS=m 579CONFIG_RAID_ATTRS=m
522# CONFIG_SCSI is not set 580# CONFIG_SCSI is not set
581# CONFIG_SCSI_NETLINK is not set
582
583#
584# Serial ATA (prod) and Parallel ATA (experimental) drivers
585#
586# CONFIG_ATA is not set
523 587
524# 588#
525# Multi-device support (RAID and LVM) 589# Multi-device support (RAID and LVM)
@@ -563,6 +627,8 @@ CONFIG_LXT_PHY=m
563CONFIG_CICADA_PHY=m 627CONFIG_CICADA_PHY=m
564CONFIG_VITESSE_PHY=m 628CONFIG_VITESSE_PHY=m
565CONFIG_SMSC_PHY=m 629CONFIG_SMSC_PHY=m
630# CONFIG_BROADCOM_PHY is not set
631# CONFIG_FIXED_PHY is not set
566 632
567# 633#
568# Ethernet (10 or 100Mbit) 634# Ethernet (10 or 100Mbit)
@@ -609,6 +675,7 @@ CONFIG_PPP_DEFLATE=m
609CONFIG_PPP_MPPE=m 675CONFIG_PPP_MPPE=m
610CONFIG_PPPOE=m 676CONFIG_PPPOE=m
611# CONFIG_SLIP is not set 677# CONFIG_SLIP is not set
678CONFIG_SLHC=m
612# CONFIG_SHAPER is not set 679# CONFIG_SHAPER is not set
613# CONFIG_NETCONSOLE is not set 680# CONFIG_NETCONSOLE is not set
614# CONFIG_NETPOLL is not set 681# CONFIG_NETPOLL is not set
@@ -628,6 +695,7 @@ CONFIG_PPPOE=m
628# Input device support 695# Input device support
629# 696#
630CONFIG_INPUT=y 697CONFIG_INPUT=y
698# CONFIG_INPUT_FF_MEMLESS is not set
631 699
632# 700#
633# Userland interfaces 701# Userland interfaces
@@ -707,10 +775,6 @@ CONFIG_LEGACY_PTY_COUNT=256
707# CONFIG_R3964 is not set 775# CONFIG_R3964 is not set
708 776
709# 777#
710# Ftape, the floppy tape device driver
711#
712
713#
714# PCMCIA character devices 778# PCMCIA character devices
715# 779#
716CONFIG_SYNCLINK_CS=m 780CONFIG_SYNCLINK_CS=m
@@ -722,7 +786,6 @@ CONFIG_SYNCLINK_CS=m
722# TPM devices 786# TPM devices
723# 787#
724# CONFIG_TCG_TPM is not set 788# CONFIG_TCG_TPM is not set
725# CONFIG_TELCLOCK is not set
726 789
727# 790#
728# I2C support 791# I2C support
@@ -747,14 +810,9 @@ CONFIG_SYNCLINK_CS=m
747# CONFIG_HWMON_VID is not set 810# CONFIG_HWMON_VID is not set
748 811
749# 812#
750# Misc devices
751#
752
753#
754# Multimedia devices 813# Multimedia devices
755# 814#
756# CONFIG_VIDEO_DEV is not set 815# CONFIG_VIDEO_DEV is not set
757CONFIG_VIDEO_V4L2=y
758 816
759# 817#
760# Digital Video Broadcasting Devices 818# Digital Video Broadcasting Devices
@@ -772,6 +830,7 @@ CONFIG_VIDEO_V4L2=y
772# 830#
773# CONFIG_VGA_CONSOLE is not set 831# CONFIG_VGA_CONSOLE is not set
774CONFIG_DUMMY_CONSOLE=y 832CONFIG_DUMMY_CONSOLE=y
833# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
775 834
776# 835#
777# Sound 836# Sound
@@ -779,6 +838,11 @@ CONFIG_DUMMY_CONSOLE=y
779# CONFIG_SOUND is not set 838# CONFIG_SOUND is not set
780 839
781# 840#
841# HID Devices
842#
843# CONFIG_HID is not set
844
845#
782# USB support 846# USB support
783# 847#
784CONFIG_USB_ARCH_HAS_HCD=y 848CONFIG_USB_ARCH_HAS_HCD=y
@@ -840,6 +904,14 @@ CONFIG_USB_ARCH_HAS_OHCI=y
840# 904#
841 905
842# 906#
907# Auxiliary Display support
908#
909
910#
911# Virtualization
912#
913
914#
843# File systems 915# File systems
844# 916#
845CONFIG_EXT2_FS=y 917CONFIG_EXT2_FS=y
@@ -851,6 +923,7 @@ CONFIG_EXT3_FS=y
851CONFIG_EXT3_FS_XATTR=y 923CONFIG_EXT3_FS_XATTR=y
852CONFIG_EXT3_FS_POSIX_ACL=y 924CONFIG_EXT3_FS_POSIX_ACL=y
853CONFIG_EXT3_FS_SECURITY=y 925CONFIG_EXT3_FS_SECURITY=y
926# CONFIG_EXT4DEV_FS is not set
854CONFIG_JBD=y 927CONFIG_JBD=y
855# CONFIG_JBD_DEBUG is not set 928# CONFIG_JBD_DEBUG is not set
856CONFIG_FS_MBCACHE=y 929CONFIG_FS_MBCACHE=y
@@ -863,6 +936,7 @@ CONFIG_REISERFS_FS_SECURITY=y
863# CONFIG_JFS_FS is not set 936# CONFIG_JFS_FS is not set
864CONFIG_FS_POSIX_ACL=y 937CONFIG_FS_POSIX_ACL=y
865# CONFIG_XFS_FS is not set 938# CONFIG_XFS_FS is not set
939# CONFIG_GFS2_FS is not set
866# CONFIG_OCFS2_FS is not set 940# CONFIG_OCFS2_FS is not set
867# CONFIG_MINIX_FS is not set 941# CONFIG_MINIX_FS is not set
868# CONFIG_ROMFS_FS is not set 942# CONFIG_ROMFS_FS is not set
@@ -873,6 +947,7 @@ CONFIG_DNOTIFY=y
873CONFIG_AUTOFS_FS=m 947CONFIG_AUTOFS_FS=m
874CONFIG_AUTOFS4_FS=m 948CONFIG_AUTOFS4_FS=m
875CONFIG_FUSE_FS=m 949CONFIG_FUSE_FS=m
950CONFIG_GENERIC_ACL=y
876 951
877# 952#
878# CD-ROM/DVD Filesystems 953# CD-ROM/DVD Filesystems
@@ -892,23 +967,25 @@ CONFIG_FUSE_FS=m
892# 967#
893CONFIG_PROC_FS=y 968CONFIG_PROC_FS=y
894CONFIG_PROC_KCORE=y 969CONFIG_PROC_KCORE=y
970CONFIG_PROC_SYSCTL=y
895CONFIG_SYSFS=y 971CONFIG_SYSFS=y
896CONFIG_TMPFS=y 972CONFIG_TMPFS=y
973CONFIG_TMPFS_POSIX_ACL=y
897# CONFIG_HUGETLB_PAGE is not set 974# CONFIG_HUGETLB_PAGE is not set
898CONFIG_RAMFS=y 975CONFIG_RAMFS=y
899# CONFIG_CONFIGFS_FS is not set 976CONFIG_CONFIGFS_FS=m
900 977
901# 978#
902# Miscellaneous filesystems 979# Miscellaneous filesystems
903# 980#
904# CONFIG_ADFS_FS is not set 981# CONFIG_ADFS_FS is not set
905# CONFIG_AFFS_FS is not set 982# CONFIG_AFFS_FS is not set
983# CONFIG_ECRYPT_FS is not set
906# CONFIG_HFS_FS is not set 984# CONFIG_HFS_FS is not set
907# CONFIG_HFSPLUS_FS is not set 985# CONFIG_HFSPLUS_FS is not set
908# CONFIG_BEFS_FS is not set 986# CONFIG_BEFS_FS is not set
909# CONFIG_BFS_FS is not set 987# CONFIG_BFS_FS is not set
910# CONFIG_EFS_FS is not set 988# CONFIG_EFS_FS is not set
911# CONFIG_JFFS_FS is not set
912# CONFIG_JFFS2_FS is not set 989# CONFIG_JFFS2_FS is not set
913CONFIG_CRAMFS=m 990CONFIG_CRAMFS=m
914# CONFIG_VXFS_FS is not set 991# CONFIG_VXFS_FS is not set
@@ -937,7 +1014,6 @@ CONFIG_SUNRPC=y
937CONFIG_SMB_FS=m 1014CONFIG_SMB_FS=m
938# CONFIG_SMB_NLS_DEFAULT is not set 1015# CONFIG_SMB_NLS_DEFAULT is not set
939# CONFIG_CIFS is not set 1016# CONFIG_CIFS is not set
940# CONFIG_CIFS_DEBUG2 is not set
941# CONFIG_NCP_FS is not set 1017# CONFIG_NCP_FS is not set
942# CONFIG_CODA_FS is not set 1018# CONFIG_CODA_FS is not set
943# CONFIG_AFS_FS is not set 1019# CONFIG_AFS_FS is not set
@@ -994,6 +1070,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
994# CONFIG_NLS_UTF8 is not set 1070# CONFIG_NLS_UTF8 is not set
995 1071
996# 1072#
1073# Distributed Lock Manager
1074#
1075CONFIG_DLM=m
1076CONFIG_DLM_TCP=y
1077# CONFIG_DLM_SCTP is not set
1078# CONFIG_DLM_DEBUG is not set
1079
1080#
997# Profiling support 1081# Profiling support
998# 1082#
999# CONFIG_PROFILING is not set 1083# CONFIG_PROFILING is not set
@@ -1003,11 +1087,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1003# 1087#
1004CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1088CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1005# CONFIG_PRINTK_TIME is not set 1089# CONFIG_PRINTK_TIME is not set
1090CONFIG_ENABLE_MUST_CHECK=y
1006# CONFIG_MAGIC_SYSRQ is not set 1091# CONFIG_MAGIC_SYSRQ is not set
1007# CONFIG_UNUSED_SYMBOLS is not set 1092# CONFIG_UNUSED_SYMBOLS is not set
1093# CONFIG_DEBUG_FS is not set
1094# CONFIG_HEADERS_CHECK is not set
1008# CONFIG_DEBUG_KERNEL is not set 1095# CONFIG_DEBUG_KERNEL is not set
1009CONFIG_LOG_BUF_SHIFT=14 1096CONFIG_LOG_BUF_SHIFT=14
1010# CONFIG_DEBUG_FS is not set
1011CONFIG_CROSSCOMPILE=y 1097CONFIG_CROSSCOMPILE=y
1012CONFIG_CMDLINE="" 1098CONFIG_CMDLINE=""
1013 1099
@@ -1022,18 +1108,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1022# Cryptographic options 1108# Cryptographic options
1023# 1109#
1024CONFIG_CRYPTO=y 1110CONFIG_CRYPTO=y
1111CONFIG_CRYPTO_ALGAPI=y
1112CONFIG_CRYPTO_BLKCIPHER=m
1113CONFIG_CRYPTO_HASH=y
1114CONFIG_CRYPTO_MANAGER=y
1025CONFIG_CRYPTO_HMAC=y 1115CONFIG_CRYPTO_HMAC=y
1116CONFIG_CRYPTO_XCBC=m
1026CONFIG_CRYPTO_NULL=m 1117CONFIG_CRYPTO_NULL=m
1027CONFIG_CRYPTO_MD4=m 1118CONFIG_CRYPTO_MD4=m
1028CONFIG_CRYPTO_MD5=m 1119CONFIG_CRYPTO_MD5=y
1029CONFIG_CRYPTO_SHA1=m 1120CONFIG_CRYPTO_SHA1=m
1030CONFIG_CRYPTO_SHA256=m 1121CONFIG_CRYPTO_SHA256=m
1031CONFIG_CRYPTO_SHA512=m 1122CONFIG_CRYPTO_SHA512=m
1032CONFIG_CRYPTO_WP512=m 1123CONFIG_CRYPTO_WP512=m
1033CONFIG_CRYPTO_TGR192=m 1124CONFIG_CRYPTO_TGR192=m
1125CONFIG_CRYPTO_GF128MUL=m
1126CONFIG_CRYPTO_ECB=m
1127CONFIG_CRYPTO_CBC=m
1128CONFIG_CRYPTO_PCBC=m
1129CONFIG_CRYPTO_LRW=m
1034CONFIG_CRYPTO_DES=m 1130CONFIG_CRYPTO_DES=m
1131CONFIG_CRYPTO_FCRYPT=m
1035CONFIG_CRYPTO_BLOWFISH=m 1132CONFIG_CRYPTO_BLOWFISH=m
1036CONFIG_CRYPTO_TWOFISH=m 1133CONFIG_CRYPTO_TWOFISH=m
1134CONFIG_CRYPTO_TWOFISH_COMMON=m
1037CONFIG_CRYPTO_SERPENT=m 1135CONFIG_CRYPTO_SERPENT=m
1038CONFIG_CRYPTO_AES=m 1136CONFIG_CRYPTO_AES=m
1039CONFIG_CRYPTO_CAST5=m 1137CONFIG_CRYPTO_CAST5=m
@@ -1045,6 +1143,7 @@ CONFIG_CRYPTO_ANUBIS=m
1045CONFIG_CRYPTO_DEFLATE=m 1143CONFIG_CRYPTO_DEFLATE=m
1046CONFIG_CRYPTO_MICHAEL_MIC=m 1144CONFIG_CRYPTO_MICHAEL_MIC=m
1047CONFIG_CRYPTO_CRC32C=m 1145CONFIG_CRYPTO_CRC32C=m
1146CONFIG_CRYPTO_CAMELLIA=m
1048# CONFIG_CRYPTO_TEST is not set 1147# CONFIG_CRYPTO_TEST is not set
1049 1148
1050# 1149#
@@ -1054,6 +1153,7 @@ CONFIG_CRYPTO_CRC32C=m
1054# 1153#
1055# Library routines 1154# Library routines
1056# 1155#
1156CONFIG_BITREVERSE=y
1057CONFIG_CRC_CCITT=m 1157CONFIG_CRC_CCITT=m
1058CONFIG_CRC16=m 1158CONFIG_CRC16=m
1059CONFIG_CRC32=y 1159CONFIG_CRC32=y
@@ -1065,3 +1165,5 @@ CONFIG_TEXTSEARCH_KMP=m
1065CONFIG_TEXTSEARCH_BM=m 1165CONFIG_TEXTSEARCH_BM=m
1066CONFIG_TEXTSEARCH_FSM=m 1166CONFIG_TEXTSEARCH_FSM=m
1067CONFIG_PLIST=y 1167CONFIG_PLIST=y
1168CONFIG_HAS_IOMEM=y
1169CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index a77805af0819..34a6bee589bd 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:17 2006 4# Sun Feb 18 21:28:02 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_PB1500=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_PB1500=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,14 +64,19 @@ CONFIG_MIPS_PB1500=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
74CONFIG_CPU_LITTLE_ENDIAN=y 78CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_APM_EMULATION=y
75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
76CONFIG_SOC_AU1500=y 81CONFIG_SOC_AU1500=y
77CONFIG_SOC_AU1X00=y 82CONFIG_SOC_AU1X00=y
@@ -116,8 +121,8 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
117CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
118CONFIG_MIPS_MT_DISABLED=y 123CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMTC is not set
120# CONFIG_MIPS_MT_SMP is not set 124# CONFIG_MIPS_MT_SMP is not set
125# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set 126# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_64BIT_PHYS_ADDR=y 127CONFIG_64BIT_PHYS_ADDR=y
123CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
@@ -134,7 +139,8 @@ CONFIG_FLATMEM=y
134CONFIG_FLAT_NODE_MEM_MAP=y 139CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 142CONFIG_RESOURCES_64BIT=y
143CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -147,6 +153,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,15 +172,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 173CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 179# CONFIG_TASKSTATS is not set
180# CONFIG_UTS_NS is not set
171# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
172# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
173CONFIG_RELAY=y 184CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
177CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
178# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -181,12 +193,12 @@ CONFIG_PRINTK=y
181CONFIG_BUG=y 193CONFIG_BUG=y
182CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
183CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
184CONFIG_RT_MUTEXES=y
185CONFIG_FUTEX=y 196CONFIG_FUTEX=y
186CONFIG_EPOLL=y 197CONFIG_EPOLL=y
187CONFIG_SHMEM=y 198CONFIG_SHMEM=y
188CONFIG_SLAB=y 199CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
190# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
191CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
192# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -204,6 +216,7 @@ CONFIG_KMOD=y
204# 216#
205# Block layer 217# Block layer
206# 218#
219CONFIG_BLOCK=y
207# CONFIG_LBD is not set 220# CONFIG_LBD is not set
208# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
209# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -258,6 +271,10 @@ CONFIG_PCCARD_NONSTATIC=m
258CONFIG_BINFMT_ELF=y 271CONFIG_BINFMT_ELF=y
259# CONFIG_BINFMT_MISC is not set 272# CONFIG_BINFMT_MISC is not set
260CONFIG_TRAD_SIGNALS=y 273CONFIG_TRAD_SIGNALS=y
274
275#
276# Power management options
277#
261# CONFIG_PM is not set 278# CONFIG_PM is not set
262 279
263# 280#
@@ -274,7 +291,10 @@ CONFIG_PACKET=y
274CONFIG_UNIX=y 291CONFIG_UNIX=y
275CONFIG_XFRM=y 292CONFIG_XFRM=y
276CONFIG_XFRM_USER=m 293CONFIG_XFRM_USER=m
294# CONFIG_XFRM_SUB_POLICY is not set
295CONFIG_XFRM_MIGRATE=y
277CONFIG_NET_KEY=y 296CONFIG_NET_KEY=y
297CONFIG_NET_KEY_MIGRATE=y
278CONFIG_INET=y 298CONFIG_INET=y
279CONFIG_IP_MULTICAST=y 299CONFIG_IP_MULTICAST=y
280# CONFIG_IP_ADVANCED_ROUTER is not set 300# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -295,10 +315,13 @@ CONFIG_IP_PNP_BOOTP=y
295# CONFIG_INET_TUNNEL is not set 315# CONFIG_INET_TUNNEL is not set
296CONFIG_INET_XFRM_MODE_TRANSPORT=m 316CONFIG_INET_XFRM_MODE_TRANSPORT=m
297CONFIG_INET_XFRM_MODE_TUNNEL=m 317CONFIG_INET_XFRM_MODE_TUNNEL=m
318CONFIG_INET_XFRM_MODE_BEET=m
298CONFIG_INET_DIAG=y 319CONFIG_INET_DIAG=y
299CONFIG_INET_TCP_DIAG=y 320CONFIG_INET_TCP_DIAG=y
300# CONFIG_TCP_CONG_ADVANCED is not set 321# CONFIG_TCP_CONG_ADVANCED is not set
301CONFIG_TCP_CONG_BIC=y 322CONFIG_TCP_CONG_CUBIC=y
323CONFIG_DEFAULT_TCP_CONG="cubic"
324CONFIG_TCP_MD5SIG=y
302 325
303# 326#
304# IP: Virtual Server Configuration 327# IP: Virtual Server Configuration
@@ -317,15 +340,42 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 340CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 341CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 342CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_NF_CONNTRACK is not set 343CONFIG_NF_CONNTRACK_ENABLED=m
344CONFIG_NF_CONNTRACK_SUPPORT=y
345# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
346CONFIG_NF_CONNTRACK=m
347CONFIG_NF_CT_ACCT=y
348CONFIG_NF_CONNTRACK_MARK=y
349CONFIG_NF_CONNTRACK_SECMARK=y
350CONFIG_NF_CONNTRACK_EVENTS=y
351CONFIG_NF_CT_PROTO_GRE=m
352CONFIG_NF_CT_PROTO_SCTP=m
353CONFIG_NF_CONNTRACK_AMANDA=m
354CONFIG_NF_CONNTRACK_FTP=m
355CONFIG_NF_CONNTRACK_H323=m
356CONFIG_NF_CONNTRACK_IRC=m
357# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
358CONFIG_NF_CONNTRACK_PPTP=m
359CONFIG_NF_CONNTRACK_SANE=m
360CONFIG_NF_CONNTRACK_SIP=m
361CONFIG_NF_CONNTRACK_TFTP=m
362CONFIG_NF_CT_NETLINK=m
321CONFIG_NETFILTER_XTABLES=m 363CONFIG_NETFILTER_XTABLES=m
322CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 364CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
323CONFIG_NETFILTER_XT_TARGET_MARK=m 365CONFIG_NETFILTER_XT_TARGET_MARK=m
324CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 366CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
367CONFIG_NETFILTER_XT_TARGET_NFLOG=m
325CONFIG_NETFILTER_XT_TARGET_SECMARK=m 368CONFIG_NETFILTER_XT_TARGET_SECMARK=m
369CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
370CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
326CONFIG_NETFILTER_XT_MATCH_COMMENT=m 371CONFIG_NETFILTER_XT_MATCH_COMMENT=m
372CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
373CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
374CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
327CONFIG_NETFILTER_XT_MATCH_DCCP=m 375CONFIG_NETFILTER_XT_MATCH_DCCP=m
376CONFIG_NETFILTER_XT_MATCH_DSCP=m
328CONFIG_NETFILTER_XT_MATCH_ESP=m 377CONFIG_NETFILTER_XT_MATCH_ESP=m
378CONFIG_NETFILTER_XT_MATCH_HELPER=m
329CONFIG_NETFILTER_XT_MATCH_LENGTH=m 379CONFIG_NETFILTER_XT_MATCH_LENGTH=m
330CONFIG_NETFILTER_XT_MATCH_LIMIT=m 380CONFIG_NETFILTER_XT_MATCH_LIMIT=m
331CONFIG_NETFILTER_XT_MATCH_MAC=m 381CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -336,14 +386,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
336CONFIG_NETFILTER_XT_MATCH_QUOTA=m 386CONFIG_NETFILTER_XT_MATCH_QUOTA=m
337CONFIG_NETFILTER_XT_MATCH_REALM=m 387CONFIG_NETFILTER_XT_MATCH_REALM=m
338CONFIG_NETFILTER_XT_MATCH_SCTP=m 388CONFIG_NETFILTER_XT_MATCH_SCTP=m
389CONFIG_NETFILTER_XT_MATCH_STATE=m
339CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 390CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
340CONFIG_NETFILTER_XT_MATCH_STRING=m 391CONFIG_NETFILTER_XT_MATCH_STRING=m
341CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 392CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
393CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
342 394
343# 395#
344# IP: Netfilter Configuration 396# IP: Netfilter Configuration
345# 397#
346# CONFIG_IP_NF_CONNTRACK is not set 398CONFIG_NF_CONNTRACK_IPV4=m
399CONFIG_NF_CONNTRACK_PROC_COMPAT=y
347# CONFIG_IP_NF_QUEUE is not set 400# CONFIG_IP_NF_QUEUE is not set
348# CONFIG_IP_NF_IPTABLES is not set 401# CONFIG_IP_NF_IPTABLES is not set
349# CONFIG_IP_NF_ARPTABLES is not set 402# CONFIG_IP_NF_ARPTABLES is not set
@@ -371,7 +424,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
371# CONFIG_ATALK is not set 424# CONFIG_ATALK is not set
372# CONFIG_X25 is not set 425# CONFIG_X25 is not set
373# CONFIG_LAPB is not set 426# CONFIG_LAPB is not set
374# CONFIG_NET_DIVERT is not set
375# CONFIG_ECONET is not set 427# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 428# CONFIG_WAN_ROUTER is not set
377 429
@@ -427,11 +479,13 @@ CONFIG_MTD_PARTITIONS=y
427# User Modules And Translation Layers 479# User Modules And Translation Layers
428# 480#
429CONFIG_MTD_CHAR=y 481CONFIG_MTD_CHAR=y
482CONFIG_MTD_BLKDEVS=y
430CONFIG_MTD_BLOCK=y 483CONFIG_MTD_BLOCK=y
431# CONFIG_FTL is not set 484# CONFIG_FTL is not set
432# CONFIG_NFTL is not set 485# CONFIG_NFTL is not set
433# CONFIG_INFTL is not set 486# CONFIG_INFTL is not set
434# CONFIG_RFD_FTL is not set 487# CONFIG_RFD_FTL is not set
488# CONFIG_SSFDC is not set
435 489
436# 490#
437# RAM/ROM/Flash chip drivers 491# RAM/ROM/Flash chip drivers
@@ -487,6 +541,7 @@ CONFIG_MTD_ALCHEMY=y
487# NAND Flash Device Drivers 541# NAND Flash Device Drivers
488# 542#
489# CONFIG_MTD_NAND is not set 543# CONFIG_MTD_NAND is not set
544# CONFIG_MTD_NAND_CAFE is not set
490 545
491# 546#
492# OneNAND Flash Device Drivers 547# OneNAND Flash Device Drivers
@@ -522,9 +577,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
522CONFIG_ATA_OVER_ETH=m 577CONFIG_ATA_OVER_ETH=m
523 578
524# 579#
580# Misc devices
581#
582CONFIG_SGI_IOC4=m
583# CONFIG_TIFM_CORE is not set
584
585#
525# ATA/ATAPI/MFM/RLL support 586# ATA/ATAPI/MFM/RLL support
526# 587#
527CONFIG_IDE=y 588CONFIG_IDE=y
589CONFIG_IDE_MAX_HWIFS=4
528CONFIG_BLK_DEV_IDE=y 590CONFIG_BLK_DEV_IDE=y
529 591
530# 592#
@@ -534,6 +596,7 @@ CONFIG_BLK_DEV_IDE=y
534CONFIG_BLK_DEV_IDEDISK=y 596CONFIG_BLK_DEV_IDEDISK=y
535# CONFIG_IDEDISK_MULTI_MODE is not set 597# CONFIG_IDEDISK_MULTI_MODE is not set
536CONFIG_BLK_DEV_IDECS=m 598CONFIG_BLK_DEV_IDECS=m
599# CONFIG_BLK_DEV_DELKIN is not set
537# CONFIG_BLK_DEV_IDECD is not set 600# CONFIG_BLK_DEV_IDECD is not set
538# CONFIG_BLK_DEV_IDETAPE is not set 601# CONFIG_BLK_DEV_IDETAPE is not set
539# CONFIG_BLK_DEV_IDEFLOPPY is not set 602# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -561,8 +624,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
561# CONFIG_BLK_DEV_CS5530 is not set 624# CONFIG_BLK_DEV_CS5530 is not set
562# CONFIG_BLK_DEV_HPT34X is not set 625# CONFIG_BLK_DEV_HPT34X is not set
563CONFIG_BLK_DEV_HPT366=y 626CONFIG_BLK_DEV_HPT366=y
627# CONFIG_BLK_DEV_JMICRON is not set
564# CONFIG_BLK_DEV_SC1200 is not set 628# CONFIG_BLK_DEV_SC1200 is not set
565# CONFIG_BLK_DEV_PIIX is not set 629# CONFIG_BLK_DEV_PIIX is not set
630CONFIG_BLK_DEV_IT8213=m
566# CONFIG_BLK_DEV_IT821X is not set 631# CONFIG_BLK_DEV_IT821X is not set
567# CONFIG_BLK_DEV_NS87415 is not set 632# CONFIG_BLK_DEV_NS87415 is not set
568# CONFIG_BLK_DEV_PDC202XX_OLD is not set 633# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -572,6 +637,7 @@ CONFIG_BLK_DEV_HPT366=y
572# CONFIG_BLK_DEV_SLC90E66 is not set 637# CONFIG_BLK_DEV_SLC90E66 is not set
573# CONFIG_BLK_DEV_TRM290 is not set 638# CONFIG_BLK_DEV_TRM290 is not set
574# CONFIG_BLK_DEV_VIA82CXXX is not set 639# CONFIG_BLK_DEV_VIA82CXXX is not set
640CONFIG_BLK_DEV_TC86C001=m
575# CONFIG_IDE_ARM is not set 641# CONFIG_IDE_ARM is not set
576CONFIG_BLK_DEV_IDEDMA=y 642CONFIG_BLK_DEV_IDEDMA=y
577# CONFIG_IDEDMA_IVB is not set 643# CONFIG_IDEDMA_IVB is not set
@@ -583,6 +649,12 @@ CONFIG_BLK_DEV_IDEDMA=y
583# 649#
584CONFIG_RAID_ATTRS=m 650CONFIG_RAID_ATTRS=m
585# CONFIG_SCSI is not set 651# CONFIG_SCSI is not set
652# CONFIG_SCSI_NETLINK is not set
653
654#
655# Serial ATA (prod) and Parallel ATA (experimental) drivers
656#
657# CONFIG_ATA is not set
586 658
587# 659#
588# Multi-device support (RAID and LVM) 660# Multi-device support (RAID and LVM)
@@ -633,6 +705,8 @@ CONFIG_LXT_PHY=m
633CONFIG_CICADA_PHY=m 705CONFIG_CICADA_PHY=m
634CONFIG_VITESSE_PHY=m 706CONFIG_VITESSE_PHY=m
635CONFIG_SMSC_PHY=m 707CONFIG_SMSC_PHY=m
708# CONFIG_BROADCOM_PHY is not set
709# CONFIG_FIXED_PHY is not set
636 710
637# 711#
638# Ethernet (10 or 100Mbit) 712# Ethernet (10 or 100Mbit)
@@ -670,14 +744,17 @@ CONFIG_MIPS_AU1X00_ENET=y
670# CONFIG_SK98LIN is not set 744# CONFIG_SK98LIN is not set
671# CONFIG_TIGON3 is not set 745# CONFIG_TIGON3 is not set
672# CONFIG_BNX2 is not set 746# CONFIG_BNX2 is not set
747CONFIG_QLA3XXX=m
673 748
674# 749#
675# Ethernet (10000 Mbit) 750# Ethernet (10000 Mbit)
676# 751#
677# CONFIG_CHELSIO_T1 is not set 752# CONFIG_CHELSIO_T1 is not set
753CONFIG_CHELSIO_T3=m
678# CONFIG_IXGB is not set 754# CONFIG_IXGB is not set
679# CONFIG_S2IO is not set 755# CONFIG_S2IO is not set
680# CONFIG_MYRI10GE is not set 756# CONFIG_MYRI10GE is not set
757CONFIG_NETXEN_NIC=m
681 758
682# 759#
683# Token Ring devices 760# Token Ring devices
@@ -718,6 +795,7 @@ CONFIG_PPP_DEFLATE=m
718CONFIG_PPP_MPPE=m 795CONFIG_PPP_MPPE=m
719CONFIG_PPPOE=m 796CONFIG_PPPOE=m
720# CONFIG_SLIP is not set 797# CONFIG_SLIP is not set
798CONFIG_SLHC=m
721# CONFIG_SHAPER is not set 799# CONFIG_SHAPER is not set
722# CONFIG_NETCONSOLE is not set 800# CONFIG_NETCONSOLE is not set
723# CONFIG_NETPOLL is not set 801# CONFIG_NETPOLL is not set
@@ -737,6 +815,7 @@ CONFIG_PPPOE=m
737# Input device support 815# Input device support
738# 816#
739CONFIG_INPUT=y 817CONFIG_INPUT=y
818# CONFIG_INPUT_FF_MEMLESS is not set
740 819
741# 820#
742# Userland interfaces 821# Userland interfaces
@@ -815,10 +894,6 @@ CONFIG_LEGACY_PTY_COUNT=256
815# CONFIG_DTLK is not set 894# CONFIG_DTLK is not set
816# CONFIG_R3964 is not set 895# CONFIG_R3964 is not set
817# CONFIG_APPLICOM is not set 896# CONFIG_APPLICOM is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822# CONFIG_DRM is not set 897# CONFIG_DRM is not set
823 898
824# 899#
@@ -833,7 +908,6 @@ CONFIG_SYNCLINK_CS=m
833# TPM devices 908# TPM devices
834# 909#
835# CONFIG_TCG_TPM is not set 910# CONFIG_TCG_TPM is not set
836# CONFIG_TELCLOCK is not set
837 911
838# 912#
839# I2C support 913# I2C support
@@ -858,14 +932,9 @@ CONFIG_SYNCLINK_CS=m
858# CONFIG_HWMON_VID is not set 932# CONFIG_HWMON_VID is not set
859 933
860# 934#
861# Misc devices
862#
863
864#
865# Multimedia devices 935# Multimedia devices
866# 936#
867# CONFIG_VIDEO_DEV is not set 937# CONFIG_VIDEO_DEV is not set
868CONFIG_VIDEO_V4L2=y
869 938
870# 939#
871# Digital Video Broadcasting Devices 940# Digital Video Broadcasting Devices
@@ -877,6 +946,7 @@ CONFIG_VIDEO_V4L2=y
877# 946#
878# CONFIG_FIRMWARE_EDID is not set 947# CONFIG_FIRMWARE_EDID is not set
879# CONFIG_FB is not set 948# CONFIG_FB is not set
949# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
880 950
881# 951#
882# Sound 952# Sound
@@ -884,6 +954,11 @@ CONFIG_VIDEO_V4L2=y
884# CONFIG_SOUND is not set 954# CONFIG_SOUND is not set
885 955
886# 956#
957# HID Devices
958#
959# CONFIG_HID is not set
960
961#
887# USB support 962# USB support
888# 963#
889CONFIG_USB_ARCH_HAS_HCD=y 964CONFIG_USB_ARCH_HAS_HCD=y
@@ -946,6 +1021,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
946# 1021#
947 1022
948# 1023#
1024# Auxiliary Display support
1025#
1026
1027#
1028# Virtualization
1029#
1030
1031#
949# File systems 1032# File systems
950# 1033#
951CONFIG_EXT2_FS=y 1034CONFIG_EXT2_FS=y
@@ -957,6 +1040,7 @@ CONFIG_EXT3_FS=y
957CONFIG_EXT3_FS_XATTR=y 1040CONFIG_EXT3_FS_XATTR=y
958CONFIG_EXT3_FS_POSIX_ACL=y 1041CONFIG_EXT3_FS_POSIX_ACL=y
959CONFIG_EXT3_FS_SECURITY=y 1042CONFIG_EXT3_FS_SECURITY=y
1043# CONFIG_EXT4DEV_FS is not set
960CONFIG_JBD=y 1044CONFIG_JBD=y
961# CONFIG_JBD_DEBUG is not set 1045# CONFIG_JBD_DEBUG is not set
962CONFIG_FS_MBCACHE=y 1046CONFIG_FS_MBCACHE=y
@@ -969,6 +1053,7 @@ CONFIG_REISERFS_FS_SECURITY=y
969# CONFIG_JFS_FS is not set 1053# CONFIG_JFS_FS is not set
970CONFIG_FS_POSIX_ACL=y 1054CONFIG_FS_POSIX_ACL=y
971# CONFIG_XFS_FS is not set 1055# CONFIG_XFS_FS is not set
1056# CONFIG_GFS2_FS is not set
972# CONFIG_OCFS2_FS is not set 1057# CONFIG_OCFS2_FS is not set
973# CONFIG_MINIX_FS is not set 1058# CONFIG_MINIX_FS is not set
974# CONFIG_ROMFS_FS is not set 1059# CONFIG_ROMFS_FS is not set
@@ -979,6 +1064,7 @@ CONFIG_DNOTIFY=y
979CONFIG_AUTOFS_FS=m 1064CONFIG_AUTOFS_FS=m
980CONFIG_AUTOFS4_FS=m 1065CONFIG_AUTOFS4_FS=m
981CONFIG_FUSE_FS=m 1066CONFIG_FUSE_FS=m
1067CONFIG_GENERIC_ACL=y
982 1068
983# 1069#
984# CD-ROM/DVD Filesystems 1070# CD-ROM/DVD Filesystems
@@ -998,23 +1084,25 @@ CONFIG_FUSE_FS=m
998# 1084#
999CONFIG_PROC_FS=y 1085CONFIG_PROC_FS=y
1000CONFIG_PROC_KCORE=y 1086CONFIG_PROC_KCORE=y
1087CONFIG_PROC_SYSCTL=y
1001CONFIG_SYSFS=y 1088CONFIG_SYSFS=y
1002CONFIG_TMPFS=y 1089CONFIG_TMPFS=y
1090CONFIG_TMPFS_POSIX_ACL=y
1003# CONFIG_HUGETLB_PAGE is not set 1091# CONFIG_HUGETLB_PAGE is not set
1004CONFIG_RAMFS=y 1092CONFIG_RAMFS=y
1005# CONFIG_CONFIGFS_FS is not set 1093CONFIG_CONFIGFS_FS=m
1006 1094
1007# 1095#
1008# Miscellaneous filesystems 1096# Miscellaneous filesystems
1009# 1097#
1010# CONFIG_ADFS_FS is not set 1098# CONFIG_ADFS_FS is not set
1011# CONFIG_AFFS_FS is not set 1099# CONFIG_AFFS_FS is not set
1100# CONFIG_ECRYPT_FS is not set
1012# CONFIG_HFS_FS is not set 1101# CONFIG_HFS_FS is not set
1013# CONFIG_HFSPLUS_FS is not set 1102# CONFIG_HFSPLUS_FS is not set
1014# CONFIG_BEFS_FS is not set 1103# CONFIG_BEFS_FS is not set
1015# CONFIG_BFS_FS is not set 1104# CONFIG_BFS_FS is not set
1016# CONFIG_EFS_FS is not set 1105# CONFIG_EFS_FS is not set
1017# CONFIG_JFFS_FS is not set
1018# CONFIG_JFFS2_FS is not set 1106# CONFIG_JFFS2_FS is not set
1019CONFIG_CRAMFS=m 1107CONFIG_CRAMFS=m
1020# CONFIG_VXFS_FS is not set 1108# CONFIG_VXFS_FS is not set
@@ -1043,7 +1131,6 @@ CONFIG_SUNRPC=y
1043CONFIG_SMB_FS=m 1131CONFIG_SMB_FS=m
1044# CONFIG_SMB_NLS_DEFAULT is not set 1132# CONFIG_SMB_NLS_DEFAULT is not set
1045# CONFIG_CIFS is not set 1133# CONFIG_CIFS is not set
1046# CONFIG_CIFS_DEBUG2 is not set
1047# CONFIG_NCP_FS is not set 1134# CONFIG_NCP_FS is not set
1048# CONFIG_CODA_FS is not set 1135# CONFIG_CODA_FS is not set
1049# CONFIG_AFS_FS is not set 1136# CONFIG_AFS_FS is not set
@@ -1100,6 +1187,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1100# CONFIG_NLS_UTF8 is not set 1187# CONFIG_NLS_UTF8 is not set
1101 1188
1102# 1189#
1190# Distributed Lock Manager
1191#
1192CONFIG_DLM=m
1193CONFIG_DLM_TCP=y
1194# CONFIG_DLM_SCTP is not set
1195# CONFIG_DLM_DEBUG is not set
1196
1197#
1103# Profiling support 1198# Profiling support
1104# 1199#
1105# CONFIG_PROFILING is not set 1200# CONFIG_PROFILING is not set
@@ -1109,11 +1204,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1109# 1204#
1110CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1205CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1111# CONFIG_PRINTK_TIME is not set 1206# CONFIG_PRINTK_TIME is not set
1207CONFIG_ENABLE_MUST_CHECK=y
1112# CONFIG_MAGIC_SYSRQ is not set 1208# CONFIG_MAGIC_SYSRQ is not set
1113# CONFIG_UNUSED_SYMBOLS is not set 1209# CONFIG_UNUSED_SYMBOLS is not set
1210# CONFIG_DEBUG_FS is not set
1211# CONFIG_HEADERS_CHECK is not set
1114# CONFIG_DEBUG_KERNEL is not set 1212# CONFIG_DEBUG_KERNEL is not set
1115CONFIG_LOG_BUF_SHIFT=14 1213CONFIG_LOG_BUF_SHIFT=14
1116# CONFIG_DEBUG_FS is not set
1117CONFIG_CROSSCOMPILE=y 1214CONFIG_CROSSCOMPILE=y
1118CONFIG_CMDLINE="" 1215CONFIG_CMDLINE=""
1119 1216
@@ -1128,18 +1225,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1128# Cryptographic options 1225# Cryptographic options
1129# 1226#
1130CONFIG_CRYPTO=y 1227CONFIG_CRYPTO=y
1228CONFIG_CRYPTO_ALGAPI=y
1229CONFIG_CRYPTO_BLKCIPHER=m
1230CONFIG_CRYPTO_HASH=y
1231CONFIG_CRYPTO_MANAGER=y
1131CONFIG_CRYPTO_HMAC=y 1232CONFIG_CRYPTO_HMAC=y
1233CONFIG_CRYPTO_XCBC=m
1132CONFIG_CRYPTO_NULL=m 1234CONFIG_CRYPTO_NULL=m
1133CONFIG_CRYPTO_MD4=m 1235CONFIG_CRYPTO_MD4=m
1134CONFIG_CRYPTO_MD5=m 1236CONFIG_CRYPTO_MD5=y
1135CONFIG_CRYPTO_SHA1=m 1237CONFIG_CRYPTO_SHA1=m
1136CONFIG_CRYPTO_SHA256=m 1238CONFIG_CRYPTO_SHA256=m
1137CONFIG_CRYPTO_SHA512=m 1239CONFIG_CRYPTO_SHA512=m
1138CONFIG_CRYPTO_WP512=m 1240CONFIG_CRYPTO_WP512=m
1139CONFIG_CRYPTO_TGR192=m 1241CONFIG_CRYPTO_TGR192=m
1242CONFIG_CRYPTO_GF128MUL=m
1243CONFIG_CRYPTO_ECB=m
1244CONFIG_CRYPTO_CBC=m
1245CONFIG_CRYPTO_PCBC=m
1246CONFIG_CRYPTO_LRW=m
1140CONFIG_CRYPTO_DES=m 1247CONFIG_CRYPTO_DES=m
1248CONFIG_CRYPTO_FCRYPT=m
1141CONFIG_CRYPTO_BLOWFISH=m 1249CONFIG_CRYPTO_BLOWFISH=m
1142CONFIG_CRYPTO_TWOFISH=m 1250CONFIG_CRYPTO_TWOFISH=m
1251CONFIG_CRYPTO_TWOFISH_COMMON=m
1143CONFIG_CRYPTO_SERPENT=m 1252CONFIG_CRYPTO_SERPENT=m
1144CONFIG_CRYPTO_AES=m 1253CONFIG_CRYPTO_AES=m
1145CONFIG_CRYPTO_CAST5=m 1254CONFIG_CRYPTO_CAST5=m
@@ -1151,6 +1260,7 @@ CONFIG_CRYPTO_ANUBIS=m
1151CONFIG_CRYPTO_DEFLATE=m 1260CONFIG_CRYPTO_DEFLATE=m
1152CONFIG_CRYPTO_MICHAEL_MIC=m 1261CONFIG_CRYPTO_MICHAEL_MIC=m
1153CONFIG_CRYPTO_CRC32C=m 1262CONFIG_CRYPTO_CRC32C=m
1263CONFIG_CRYPTO_CAMELLIA=m
1154# CONFIG_CRYPTO_TEST is not set 1264# CONFIG_CRYPTO_TEST is not set
1155 1265
1156# 1266#
@@ -1160,6 +1270,7 @@ CONFIG_CRYPTO_CRC32C=m
1160# 1270#
1161# Library routines 1271# Library routines
1162# 1272#
1273CONFIG_BITREVERSE=y
1163CONFIG_CRC_CCITT=m 1274CONFIG_CRC_CCITT=m
1164CONFIG_CRC16=m 1275CONFIG_CRC16=m
1165CONFIG_CRC32=y 1276CONFIG_CRC32=y
@@ -1171,3 +1282,5 @@ CONFIG_TEXTSEARCH_KMP=m
1171CONFIG_TEXTSEARCH_BM=m 1282CONFIG_TEXTSEARCH_BM=m
1172CONFIG_TEXTSEARCH_FSM=m 1283CONFIG_TEXTSEARCH_FSM=m
1173CONFIG_PLIST=y 1284CONFIG_PLIST=y
1285CONFIG_HAS_IOMEM=y
1286CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 8318d74d6adb..e3bff462e62e 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:17 2006 4# Sun Feb 18 21:28:03 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS_PB1550=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_PB1550=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,15 +64,20 @@ CONFIG_MIPS_PB1550=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 77CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 78# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 79CONFIG_CPU_LITTLE_ENDIAN=y
80CONFIG_SYS_SUPPORTS_APM_EMULATION=y
76CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 81CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
77CONFIG_SOC_AU1550=y 82CONFIG_SOC_AU1550=y
78CONFIG_SOC_AU1X00=y 83CONFIG_SOC_AU1X00=y
@@ -117,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_64BIT_PHYS_ADDR=y 128CONFIG_64BIT_PHYS_ADDR=y
124CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -135,7 +140,8 @@ CONFIG_FLATMEM=y
135CONFIG_FLAT_NODE_MEM_MAP=y 140CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 143CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 145# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 146# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 147# CONFIG_HZ_128 is not set
@@ -148,6 +154,7 @@ CONFIG_HZ=1000
148CONFIG_PREEMPT_NONE=y 154CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 155# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 156# CONFIG_PREEMPT is not set
157# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 158CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 159CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -166,15 +173,20 @@ CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y 173CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 174CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 175CONFIG_SYSVIPC=y
176# CONFIG_IPC_NS is not set
177CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 178# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 179# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 180# CONFIG_TASKSTATS is not set
181# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 182# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 183# CONFIG_IKCONFIG is not set
184CONFIG_SYSFS_DEPRECATED=y
174CONFIG_RELAY=y 185CONFIG_RELAY=y
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 192CONFIG_HOTPLUG=y
@@ -182,12 +194,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 194CONFIG_BUG=y
183CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 197CONFIG_FUTEX=y
187CONFIG_EPOLL=y 198CONFIG_EPOLL=y
188CONFIG_SHMEM=y 199CONFIG_SHMEM=y
189CONFIG_SLAB=y 200CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -205,6 +217,7 @@ CONFIG_KMOD=y
205# 217#
206# Block layer 218# Block layer
207# 219#
220CONFIG_BLOCK=y
208# CONFIG_LBD is not set 221# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 222# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 223# CONFIG_LSF is not set
@@ -259,6 +272,10 @@ CONFIG_PCCARD_NONSTATIC=m
259CONFIG_BINFMT_ELF=y 272CONFIG_BINFMT_ELF=y
260# CONFIG_BINFMT_MISC is not set 273# CONFIG_BINFMT_MISC is not set
261CONFIG_TRAD_SIGNALS=y 274CONFIG_TRAD_SIGNALS=y
275
276#
277# Power management options
278#
262# CONFIG_PM is not set 279# CONFIG_PM is not set
263 280
264# 281#
@@ -275,7 +292,10 @@ CONFIG_PACKET=y
275CONFIG_UNIX=y 292CONFIG_UNIX=y
276CONFIG_XFRM=y 293CONFIG_XFRM=y
277CONFIG_XFRM_USER=m 294CONFIG_XFRM_USER=m
295# CONFIG_XFRM_SUB_POLICY is not set
296CONFIG_XFRM_MIGRATE=y
278CONFIG_NET_KEY=y 297CONFIG_NET_KEY=y
298CONFIG_NET_KEY_MIGRATE=y
279CONFIG_INET=y 299CONFIG_INET=y
280CONFIG_IP_MULTICAST=y 300CONFIG_IP_MULTICAST=y
281# CONFIG_IP_ADVANCED_ROUTER is not set 301# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -296,10 +316,13 @@ CONFIG_IP_PNP_BOOTP=y
296# CONFIG_INET_TUNNEL is not set 316# CONFIG_INET_TUNNEL is not set
297CONFIG_INET_XFRM_MODE_TRANSPORT=m 317CONFIG_INET_XFRM_MODE_TRANSPORT=m
298CONFIG_INET_XFRM_MODE_TUNNEL=m 318CONFIG_INET_XFRM_MODE_TUNNEL=m
319CONFIG_INET_XFRM_MODE_BEET=m
299CONFIG_INET_DIAG=y 320CONFIG_INET_DIAG=y
300CONFIG_INET_TCP_DIAG=y 321CONFIG_INET_TCP_DIAG=y
301# CONFIG_TCP_CONG_ADVANCED is not set 322# CONFIG_TCP_CONG_ADVANCED is not set
302CONFIG_TCP_CONG_BIC=y 323CONFIG_TCP_CONG_CUBIC=y
324CONFIG_DEFAULT_TCP_CONG="cubic"
325CONFIG_TCP_MD5SIG=y
303 326
304# 327#
305# IP: Virtual Server Configuration 328# IP: Virtual Server Configuration
@@ -318,15 +341,42 @@ CONFIG_NETFILTER=y
318CONFIG_NETFILTER_NETLINK=m 341CONFIG_NETFILTER_NETLINK=m
319CONFIG_NETFILTER_NETLINK_QUEUE=m 342CONFIG_NETFILTER_NETLINK_QUEUE=m
320CONFIG_NETFILTER_NETLINK_LOG=m 343CONFIG_NETFILTER_NETLINK_LOG=m
321# CONFIG_NF_CONNTRACK is not set 344CONFIG_NF_CONNTRACK_ENABLED=m
345CONFIG_NF_CONNTRACK_SUPPORT=y
346# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
347CONFIG_NF_CONNTRACK=m
348CONFIG_NF_CT_ACCT=y
349CONFIG_NF_CONNTRACK_MARK=y
350CONFIG_NF_CONNTRACK_SECMARK=y
351CONFIG_NF_CONNTRACK_EVENTS=y
352CONFIG_NF_CT_PROTO_GRE=m
353CONFIG_NF_CT_PROTO_SCTP=m
354CONFIG_NF_CONNTRACK_AMANDA=m
355CONFIG_NF_CONNTRACK_FTP=m
356CONFIG_NF_CONNTRACK_H323=m
357CONFIG_NF_CONNTRACK_IRC=m
358# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
359CONFIG_NF_CONNTRACK_PPTP=m
360CONFIG_NF_CONNTRACK_SANE=m
361CONFIG_NF_CONNTRACK_SIP=m
362CONFIG_NF_CONNTRACK_TFTP=m
363CONFIG_NF_CT_NETLINK=m
322CONFIG_NETFILTER_XTABLES=m 364CONFIG_NETFILTER_XTABLES=m
323CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 365CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
324CONFIG_NETFILTER_XT_TARGET_MARK=m 366CONFIG_NETFILTER_XT_TARGET_MARK=m
325CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 367CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
368CONFIG_NETFILTER_XT_TARGET_NFLOG=m
326CONFIG_NETFILTER_XT_TARGET_SECMARK=m 369CONFIG_NETFILTER_XT_TARGET_SECMARK=m
370CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
371CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
327CONFIG_NETFILTER_XT_MATCH_COMMENT=m 372CONFIG_NETFILTER_XT_MATCH_COMMENT=m
373CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
374CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
375CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
328CONFIG_NETFILTER_XT_MATCH_DCCP=m 376CONFIG_NETFILTER_XT_MATCH_DCCP=m
377CONFIG_NETFILTER_XT_MATCH_DSCP=m
329CONFIG_NETFILTER_XT_MATCH_ESP=m 378CONFIG_NETFILTER_XT_MATCH_ESP=m
379CONFIG_NETFILTER_XT_MATCH_HELPER=m
330CONFIG_NETFILTER_XT_MATCH_LENGTH=m 380CONFIG_NETFILTER_XT_MATCH_LENGTH=m
331CONFIG_NETFILTER_XT_MATCH_LIMIT=m 381CONFIG_NETFILTER_XT_MATCH_LIMIT=m
332CONFIG_NETFILTER_XT_MATCH_MAC=m 382CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -337,14 +387,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
337CONFIG_NETFILTER_XT_MATCH_QUOTA=m 387CONFIG_NETFILTER_XT_MATCH_QUOTA=m
338CONFIG_NETFILTER_XT_MATCH_REALM=m 388CONFIG_NETFILTER_XT_MATCH_REALM=m
339CONFIG_NETFILTER_XT_MATCH_SCTP=m 389CONFIG_NETFILTER_XT_MATCH_SCTP=m
390CONFIG_NETFILTER_XT_MATCH_STATE=m
340CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 391CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
341CONFIG_NETFILTER_XT_MATCH_STRING=m 392CONFIG_NETFILTER_XT_MATCH_STRING=m
342CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 393CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
394CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
343 395
344# 396#
345# IP: Netfilter Configuration 397# IP: Netfilter Configuration
346# 398#
347# CONFIG_IP_NF_CONNTRACK is not set 399CONFIG_NF_CONNTRACK_IPV4=m
400CONFIG_NF_CONNTRACK_PROC_COMPAT=y
348# CONFIG_IP_NF_QUEUE is not set 401# CONFIG_IP_NF_QUEUE is not set
349# CONFIG_IP_NF_IPTABLES is not set 402# CONFIG_IP_NF_IPTABLES is not set
350# CONFIG_IP_NF_ARPTABLES is not set 403# CONFIG_IP_NF_ARPTABLES is not set
@@ -372,7 +425,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
372# CONFIG_ATALK is not set 425# CONFIG_ATALK is not set
373# CONFIG_X25 is not set 426# CONFIG_X25 is not set
374# CONFIG_LAPB is not set 427# CONFIG_LAPB is not set
375# CONFIG_NET_DIVERT is not set
376# CONFIG_ECONET is not set 428# CONFIG_ECONET is not set
377# CONFIG_WAN_ROUTER is not set 429# CONFIG_WAN_ROUTER is not set
378 430
@@ -428,11 +480,13 @@ CONFIG_MTD_PARTITIONS=y
428# User Modules And Translation Layers 480# User Modules And Translation Layers
429# 481#
430CONFIG_MTD_CHAR=y 482CONFIG_MTD_CHAR=y
483CONFIG_MTD_BLKDEVS=y
431CONFIG_MTD_BLOCK=y 484CONFIG_MTD_BLOCK=y
432# CONFIG_FTL is not set 485# CONFIG_FTL is not set
433# CONFIG_NFTL is not set 486# CONFIG_NFTL is not set
434# CONFIG_INFTL is not set 487# CONFIG_INFTL is not set
435# CONFIG_RFD_FTL is not set 488# CONFIG_RFD_FTL is not set
489# CONFIG_SSFDC is not set
436 490
437# 491#
438# RAM/ROM/Flash chip drivers 492# RAM/ROM/Flash chip drivers
@@ -488,6 +542,7 @@ CONFIG_MTD_ALCHEMY=y
488# NAND Flash Device Drivers 542# NAND Flash Device Drivers
489# 543#
490# CONFIG_MTD_NAND is not set 544# CONFIG_MTD_NAND is not set
545# CONFIG_MTD_NAND_CAFE is not set
491 546
492# 547#
493# OneNAND Flash Device Drivers 548# OneNAND Flash Device Drivers
@@ -523,9 +578,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
523CONFIG_ATA_OVER_ETH=m 578CONFIG_ATA_OVER_ETH=m
524 579
525# 580#
581# Misc devices
582#
583CONFIG_SGI_IOC4=m
584# CONFIG_TIFM_CORE is not set
585
586#
526# ATA/ATAPI/MFM/RLL support 587# ATA/ATAPI/MFM/RLL support
527# 588#
528CONFIG_IDE=y 589CONFIG_IDE=y
590CONFIG_IDE_MAX_HWIFS=4
529CONFIG_BLK_DEV_IDE=y 591CONFIG_BLK_DEV_IDE=y
530 592
531# 593#
@@ -535,6 +597,7 @@ CONFIG_BLK_DEV_IDE=y
535CONFIG_BLK_DEV_IDEDISK=y 597CONFIG_BLK_DEV_IDEDISK=y
536# CONFIG_IDEDISK_MULTI_MODE is not set 598# CONFIG_IDEDISK_MULTI_MODE is not set
537CONFIG_BLK_DEV_IDECS=m 599CONFIG_BLK_DEV_IDECS=m
600# CONFIG_BLK_DEV_DELKIN is not set
538# CONFIG_BLK_DEV_IDECD is not set 601# CONFIG_BLK_DEV_IDECD is not set
539# CONFIG_BLK_DEV_IDETAPE is not set 602# CONFIG_BLK_DEV_IDETAPE is not set
540# CONFIG_BLK_DEV_IDEFLOPPY is not set 603# CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -562,8 +625,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
562# CONFIG_BLK_DEV_CS5530 is not set 625# CONFIG_BLK_DEV_CS5530 is not set
563# CONFIG_BLK_DEV_HPT34X is not set 626# CONFIG_BLK_DEV_HPT34X is not set
564CONFIG_BLK_DEV_HPT366=y 627CONFIG_BLK_DEV_HPT366=y
628# CONFIG_BLK_DEV_JMICRON is not set
565# CONFIG_BLK_DEV_SC1200 is not set 629# CONFIG_BLK_DEV_SC1200 is not set
566# CONFIG_BLK_DEV_PIIX is not set 630# CONFIG_BLK_DEV_PIIX is not set
631CONFIG_BLK_DEV_IT8213=m
567# CONFIG_BLK_DEV_IT821X is not set 632# CONFIG_BLK_DEV_IT821X is not set
568# CONFIG_BLK_DEV_NS87415 is not set 633# CONFIG_BLK_DEV_NS87415 is not set
569# CONFIG_BLK_DEV_PDC202XX_OLD is not set 634# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -573,6 +638,7 @@ CONFIG_BLK_DEV_HPT366=y
573# CONFIG_BLK_DEV_SLC90E66 is not set 638# CONFIG_BLK_DEV_SLC90E66 is not set
574# CONFIG_BLK_DEV_TRM290 is not set 639# CONFIG_BLK_DEV_TRM290 is not set
575# CONFIG_BLK_DEV_VIA82CXXX is not set 640# CONFIG_BLK_DEV_VIA82CXXX is not set
641CONFIG_BLK_DEV_TC86C001=m
576# CONFIG_IDE_ARM is not set 642# CONFIG_IDE_ARM is not set
577CONFIG_BLK_DEV_IDEDMA=y 643CONFIG_BLK_DEV_IDEDMA=y
578# CONFIG_IDEDMA_IVB is not set 644# CONFIG_IDEDMA_IVB is not set
@@ -584,6 +650,12 @@ CONFIG_BLK_DEV_IDEDMA=y
584# 650#
585CONFIG_RAID_ATTRS=m 651CONFIG_RAID_ATTRS=m
586# CONFIG_SCSI is not set 652# CONFIG_SCSI is not set
653# CONFIG_SCSI_NETLINK is not set
654
655#
656# Serial ATA (prod) and Parallel ATA (experimental) drivers
657#
658# CONFIG_ATA is not set
587 659
588# 660#
589# Multi-device support (RAID and LVM) 661# Multi-device support (RAID and LVM)
@@ -634,6 +706,8 @@ CONFIG_LXT_PHY=m
634CONFIG_CICADA_PHY=m 706CONFIG_CICADA_PHY=m
635CONFIG_VITESSE_PHY=m 707CONFIG_VITESSE_PHY=m
636CONFIG_SMSC_PHY=m 708CONFIG_SMSC_PHY=m
709# CONFIG_BROADCOM_PHY is not set
710# CONFIG_FIXED_PHY is not set
637 711
638# 712#
639# Ethernet (10 or 100Mbit) 713# Ethernet (10 or 100Mbit)
@@ -671,14 +745,17 @@ CONFIG_MIPS_AU1X00_ENET=y
671# CONFIG_SK98LIN is not set 745# CONFIG_SK98LIN is not set
672# CONFIG_TIGON3 is not set 746# CONFIG_TIGON3 is not set
673# CONFIG_BNX2 is not set 747# CONFIG_BNX2 is not set
748CONFIG_QLA3XXX=m
674 749
675# 750#
676# Ethernet (10000 Mbit) 751# Ethernet (10000 Mbit)
677# 752#
678# CONFIG_CHELSIO_T1 is not set 753# CONFIG_CHELSIO_T1 is not set
754CONFIG_CHELSIO_T3=m
679# CONFIG_IXGB is not set 755# CONFIG_IXGB is not set
680# CONFIG_S2IO is not set 756# CONFIG_S2IO is not set
681# CONFIG_MYRI10GE is not set 757# CONFIG_MYRI10GE is not set
758CONFIG_NETXEN_NIC=m
682 759
683# 760#
684# Token Ring devices 761# Token Ring devices
@@ -711,6 +788,7 @@ CONFIG_PPP_DEFLATE=m
711CONFIG_PPP_MPPE=m 788CONFIG_PPP_MPPE=m
712CONFIG_PPPOE=m 789CONFIG_PPPOE=m
713# CONFIG_SLIP is not set 790# CONFIG_SLIP is not set
791CONFIG_SLHC=m
714# CONFIG_SHAPER is not set 792# CONFIG_SHAPER is not set
715# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
716# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
@@ -730,6 +808,7 @@ CONFIG_PPPOE=m
730# Input device support 808# Input device support
731# 809#
732CONFIG_INPUT=y 810CONFIG_INPUT=y
811# CONFIG_INPUT_FF_MEMLESS is not set
733 812
734# 813#
735# Userland interfaces 814# Userland interfaces
@@ -808,10 +887,6 @@ CONFIG_LEGACY_PTY_COUNT=256
808# CONFIG_DTLK is not set 887# CONFIG_DTLK is not set
809# CONFIG_R3964 is not set 888# CONFIG_R3964 is not set
810# CONFIG_APPLICOM is not set 889# CONFIG_APPLICOM is not set
811
812#
813# Ftape, the floppy tape device driver
814#
815# CONFIG_DRM is not set 890# CONFIG_DRM is not set
816 891
817# 892#
@@ -826,7 +901,6 @@ CONFIG_SYNCLINK_CS=m
826# TPM devices 901# TPM devices
827# 902#
828# CONFIG_TCG_TPM is not set 903# CONFIG_TCG_TPM is not set
829# CONFIG_TELCLOCK is not set
830 904
831# 905#
832# I2C support 906# I2C support
@@ -851,14 +925,9 @@ CONFIG_SYNCLINK_CS=m
851# CONFIG_HWMON_VID is not set 925# CONFIG_HWMON_VID is not set
852 926
853# 927#
854# Misc devices
855#
856
857#
858# Multimedia devices 928# Multimedia devices
859# 929#
860# CONFIG_VIDEO_DEV is not set 930# CONFIG_VIDEO_DEV is not set
861CONFIG_VIDEO_V4L2=y
862 931
863# 932#
864# Digital Video Broadcasting Devices 933# Digital Video Broadcasting Devices
@@ -870,6 +939,7 @@ CONFIG_VIDEO_V4L2=y
870# 939#
871# CONFIG_FIRMWARE_EDID is not set 940# CONFIG_FIRMWARE_EDID is not set
872# CONFIG_FB is not set 941# CONFIG_FB is not set
942# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
873 943
874# 944#
875# Sound 945# Sound
@@ -877,6 +947,11 @@ CONFIG_VIDEO_V4L2=y
877# CONFIG_SOUND is not set 947# CONFIG_SOUND is not set
878 948
879# 949#
950# HID Devices
951#
952# CONFIG_HID is not set
953
954#
880# USB support 955# USB support
881# 956#
882CONFIG_USB_ARCH_HAS_HCD=y 957CONFIG_USB_ARCH_HAS_HCD=y
@@ -939,6 +1014,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
939# 1014#
940 1015
941# 1016#
1017# Auxiliary Display support
1018#
1019
1020#
1021# Virtualization
1022#
1023
1024#
942# File systems 1025# File systems
943# 1026#
944CONFIG_EXT2_FS=y 1027CONFIG_EXT2_FS=y
@@ -950,6 +1033,7 @@ CONFIG_EXT3_FS=y
950CONFIG_EXT3_FS_XATTR=y 1033CONFIG_EXT3_FS_XATTR=y
951CONFIG_EXT3_FS_POSIX_ACL=y 1034CONFIG_EXT3_FS_POSIX_ACL=y
952CONFIG_EXT3_FS_SECURITY=y 1035CONFIG_EXT3_FS_SECURITY=y
1036# CONFIG_EXT4DEV_FS is not set
953CONFIG_JBD=y 1037CONFIG_JBD=y
954# CONFIG_JBD_DEBUG is not set 1038# CONFIG_JBD_DEBUG is not set
955CONFIG_FS_MBCACHE=y 1039CONFIG_FS_MBCACHE=y
@@ -962,6 +1046,7 @@ CONFIG_REISERFS_FS_SECURITY=y
962# CONFIG_JFS_FS is not set 1046# CONFIG_JFS_FS is not set
963CONFIG_FS_POSIX_ACL=y 1047CONFIG_FS_POSIX_ACL=y
964# CONFIG_XFS_FS is not set 1048# CONFIG_XFS_FS is not set
1049# CONFIG_GFS2_FS is not set
965# CONFIG_OCFS2_FS is not set 1050# CONFIG_OCFS2_FS is not set
966# CONFIG_MINIX_FS is not set 1051# CONFIG_MINIX_FS is not set
967# CONFIG_ROMFS_FS is not set 1052# CONFIG_ROMFS_FS is not set
@@ -972,6 +1057,7 @@ CONFIG_DNOTIFY=y
972CONFIG_AUTOFS_FS=m 1057CONFIG_AUTOFS_FS=m
973CONFIG_AUTOFS4_FS=m 1058CONFIG_AUTOFS4_FS=m
974CONFIG_FUSE_FS=m 1059CONFIG_FUSE_FS=m
1060CONFIG_GENERIC_ACL=y
975 1061
976# 1062#
977# CD-ROM/DVD Filesystems 1063# CD-ROM/DVD Filesystems
@@ -991,23 +1077,25 @@ CONFIG_FUSE_FS=m
991# 1077#
992CONFIG_PROC_FS=y 1078CONFIG_PROC_FS=y
993CONFIG_PROC_KCORE=y 1079CONFIG_PROC_KCORE=y
1080CONFIG_PROC_SYSCTL=y
994CONFIG_SYSFS=y 1081CONFIG_SYSFS=y
995CONFIG_TMPFS=y 1082CONFIG_TMPFS=y
1083CONFIG_TMPFS_POSIX_ACL=y
996# CONFIG_HUGETLB_PAGE is not set 1084# CONFIG_HUGETLB_PAGE is not set
997CONFIG_RAMFS=y 1085CONFIG_RAMFS=y
998# CONFIG_CONFIGFS_FS is not set 1086CONFIG_CONFIGFS_FS=m
999 1087
1000# 1088#
1001# Miscellaneous filesystems 1089# Miscellaneous filesystems
1002# 1090#
1003# CONFIG_ADFS_FS is not set 1091# CONFIG_ADFS_FS is not set
1004# CONFIG_AFFS_FS is not set 1092# CONFIG_AFFS_FS is not set
1093# CONFIG_ECRYPT_FS is not set
1005# CONFIG_HFS_FS is not set 1094# CONFIG_HFS_FS is not set
1006# CONFIG_HFSPLUS_FS is not set 1095# CONFIG_HFSPLUS_FS is not set
1007# CONFIG_BEFS_FS is not set 1096# CONFIG_BEFS_FS is not set
1008# CONFIG_BFS_FS is not set 1097# CONFIG_BFS_FS is not set
1009# CONFIG_EFS_FS is not set 1098# CONFIG_EFS_FS is not set
1010# CONFIG_JFFS_FS is not set
1011# CONFIG_JFFS2_FS is not set 1099# CONFIG_JFFS2_FS is not set
1012CONFIG_CRAMFS=m 1100CONFIG_CRAMFS=m
1013# CONFIG_VXFS_FS is not set 1101# CONFIG_VXFS_FS is not set
@@ -1036,7 +1124,6 @@ CONFIG_SUNRPC=y
1036CONFIG_SMB_FS=m 1124CONFIG_SMB_FS=m
1037# CONFIG_SMB_NLS_DEFAULT is not set 1125# CONFIG_SMB_NLS_DEFAULT is not set
1038# CONFIG_CIFS is not set 1126# CONFIG_CIFS is not set
1039# CONFIG_CIFS_DEBUG2 is not set
1040# CONFIG_NCP_FS is not set 1127# CONFIG_NCP_FS is not set
1041# CONFIG_CODA_FS is not set 1128# CONFIG_CODA_FS is not set
1042# CONFIG_AFS_FS is not set 1129# CONFIG_AFS_FS is not set
@@ -1093,6 +1180,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1093# CONFIG_NLS_UTF8 is not set 1180# CONFIG_NLS_UTF8 is not set
1094 1181
1095# 1182#
1183# Distributed Lock Manager
1184#
1185CONFIG_DLM=m
1186CONFIG_DLM_TCP=y
1187# CONFIG_DLM_SCTP is not set
1188# CONFIG_DLM_DEBUG is not set
1189
1190#
1096# Profiling support 1191# Profiling support
1097# 1192#
1098# CONFIG_PROFILING is not set 1193# CONFIG_PROFILING is not set
@@ -1102,11 +1197,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1102# 1197#
1103CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1198CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1104# CONFIG_PRINTK_TIME is not set 1199# CONFIG_PRINTK_TIME is not set
1200CONFIG_ENABLE_MUST_CHECK=y
1105# CONFIG_MAGIC_SYSRQ is not set 1201# CONFIG_MAGIC_SYSRQ is not set
1106# CONFIG_UNUSED_SYMBOLS is not set 1202# CONFIG_UNUSED_SYMBOLS is not set
1203# CONFIG_DEBUG_FS is not set
1204# CONFIG_HEADERS_CHECK is not set
1107# CONFIG_DEBUG_KERNEL is not set 1205# CONFIG_DEBUG_KERNEL is not set
1108CONFIG_LOG_BUF_SHIFT=14 1206CONFIG_LOG_BUF_SHIFT=14
1109# CONFIG_DEBUG_FS is not set
1110CONFIG_CROSSCOMPILE=y 1207CONFIG_CROSSCOMPILE=y
1111CONFIG_CMDLINE="" 1208CONFIG_CMDLINE=""
1112 1209
@@ -1121,18 +1218,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1121# Cryptographic options 1218# Cryptographic options
1122# 1219#
1123CONFIG_CRYPTO=y 1220CONFIG_CRYPTO=y
1221CONFIG_CRYPTO_ALGAPI=y
1222CONFIG_CRYPTO_BLKCIPHER=m
1223CONFIG_CRYPTO_HASH=y
1224CONFIG_CRYPTO_MANAGER=y
1124CONFIG_CRYPTO_HMAC=y 1225CONFIG_CRYPTO_HMAC=y
1226CONFIG_CRYPTO_XCBC=m
1125CONFIG_CRYPTO_NULL=m 1227CONFIG_CRYPTO_NULL=m
1126CONFIG_CRYPTO_MD4=m 1228CONFIG_CRYPTO_MD4=m
1127CONFIG_CRYPTO_MD5=m 1229CONFIG_CRYPTO_MD5=y
1128CONFIG_CRYPTO_SHA1=m 1230CONFIG_CRYPTO_SHA1=m
1129CONFIG_CRYPTO_SHA256=m 1231CONFIG_CRYPTO_SHA256=m
1130CONFIG_CRYPTO_SHA512=m 1232CONFIG_CRYPTO_SHA512=m
1131CONFIG_CRYPTO_WP512=m 1233CONFIG_CRYPTO_WP512=m
1132CONFIG_CRYPTO_TGR192=m 1234CONFIG_CRYPTO_TGR192=m
1235CONFIG_CRYPTO_GF128MUL=m
1236CONFIG_CRYPTO_ECB=m
1237CONFIG_CRYPTO_CBC=m
1238CONFIG_CRYPTO_PCBC=m
1239CONFIG_CRYPTO_LRW=m
1133CONFIG_CRYPTO_DES=m 1240CONFIG_CRYPTO_DES=m
1241CONFIG_CRYPTO_FCRYPT=m
1134CONFIG_CRYPTO_BLOWFISH=m 1242CONFIG_CRYPTO_BLOWFISH=m
1135CONFIG_CRYPTO_TWOFISH=m 1243CONFIG_CRYPTO_TWOFISH=m
1244CONFIG_CRYPTO_TWOFISH_COMMON=m
1136CONFIG_CRYPTO_SERPENT=m 1245CONFIG_CRYPTO_SERPENT=m
1137CONFIG_CRYPTO_AES=m 1246CONFIG_CRYPTO_AES=m
1138CONFIG_CRYPTO_CAST5=m 1247CONFIG_CRYPTO_CAST5=m
@@ -1144,6 +1253,7 @@ CONFIG_CRYPTO_ANUBIS=m
1144CONFIG_CRYPTO_DEFLATE=m 1253CONFIG_CRYPTO_DEFLATE=m
1145CONFIG_CRYPTO_MICHAEL_MIC=m 1254CONFIG_CRYPTO_MICHAEL_MIC=m
1146CONFIG_CRYPTO_CRC32C=m 1255CONFIG_CRYPTO_CRC32C=m
1256CONFIG_CRYPTO_CAMELLIA=m
1147# CONFIG_CRYPTO_TEST is not set 1257# CONFIG_CRYPTO_TEST is not set
1148 1258
1149# 1259#
@@ -1153,6 +1263,7 @@ CONFIG_CRYPTO_CRC32C=m
1153# 1263#
1154# Library routines 1264# Library routines
1155# 1265#
1266CONFIG_BITREVERSE=y
1156CONFIG_CRC_CCITT=m 1267CONFIG_CRC_CCITT=m
1157CONFIG_CRC16=m 1268CONFIG_CRC16=m
1158CONFIG_CRC32=y 1269CONFIG_CRC32=y
@@ -1164,3 +1275,5 @@ CONFIG_TEXTSEARCH_KMP=m
1164CONFIG_TEXTSEARCH_BM=m 1275CONFIG_TEXTSEARCH_BM=m
1165CONFIG_TEXTSEARCH_FSM=m 1276CONFIG_TEXTSEARCH_FSM=m
1166CONFIG_PLIST=y 1277CONFIG_PLIST=y
1278CONFIG_HAS_IOMEM=y
1279CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index fcb8fea3052c..009b3f87b44e 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc2 3# Linux kernel version: 2.6.20
4# Sat Oct 14 23:01:16 2006 4# Sun Feb 18 21:28:04 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -40,6 +41,7 @@ CONFIG_MIPS=y
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
42CONFIG_PNX8550_JBS=y 43CONFIG_PNX8550_JBS=y
44# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -62,11 +64,14 @@ CONFIG_PNX8550_JBS=y
62# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
63# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
64CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
65CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
66CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_GENERIC_TIME=y 72CONFIG_GENERIC_TIME=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
70CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
71CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
72# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
@@ -134,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -146,6 +152,7 @@ CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,6 +172,7 @@ CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 172CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
167# CONFIG_IPC_NS is not set 174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 178# CONFIG_TASKSTATS is not set
@@ -172,6 +180,7 @@ CONFIG_SYSVIPC=y
172# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
173CONFIG_IKCONFIG=y 181CONFIG_IKCONFIG=y
174CONFIG_IKCONFIG_PROC=y 182CONFIG_IKCONFIG_PROC=y
183CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 184# CONFIG_RELAY is not set
176CONFIG_INITRAMFS_SOURCE="" 185CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -231,7 +240,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
231# 240#
232CONFIG_HW_HAS_PCI=y 241CONFIG_HW_HAS_PCI=y
233CONFIG_PCI=y 242CONFIG_PCI=y
234# CONFIG_PCI_MULTITHREAD_PROBE is not set
235# CONFIG_PCI_DEBUG is not set 243# CONFIG_PCI_DEBUG is not set
236CONFIG_MMU=y 244CONFIG_MMU=y
237 245
@@ -253,6 +261,14 @@ CONFIG_BINFMT_ELF=y
253CONFIG_TRAD_SIGNALS=y 261CONFIG_TRAD_SIGNALS=y
254 262
255# 263#
264# Power management options
265#
266CONFIG_PM=y
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270
271#
256# Networking 272# Networking
257# 273#
258CONFIG_NET=y 274CONFIG_NET=y
@@ -267,6 +283,7 @@ CONFIG_UNIX=y
267CONFIG_XFRM=y 283CONFIG_XFRM=y
268# CONFIG_XFRM_USER is not set 284# CONFIG_XFRM_USER is not set
269# CONFIG_XFRM_SUB_POLICY is not set 285# CONFIG_XFRM_SUB_POLICY is not set
286CONFIG_XFRM_MIGRATE=y
270# CONFIG_NET_KEY is not set 287# CONFIG_NET_KEY is not set
271CONFIG_INET=y 288CONFIG_INET=y
272# CONFIG_IP_MULTICAST is not set 289# CONFIG_IP_MULTICAST is not set
@@ -293,6 +310,7 @@ CONFIG_INET_TCP_DIAG=y
293# CONFIG_TCP_CONG_ADVANCED is not set 310# CONFIG_TCP_CONG_ADVANCED is not set
294CONFIG_TCP_CONG_CUBIC=y 311CONFIG_TCP_CONG_CUBIC=y
295CONFIG_DEFAULT_TCP_CONG="cubic" 312CONFIG_DEFAULT_TCP_CONG="cubic"
313CONFIG_TCP_MD5SIG=y
296# CONFIG_IPV6 is not set 314# CONFIG_IPV6 is not set
297# CONFIG_INET6_XFRM_TUNNEL is not set 315# CONFIG_INET6_XFRM_TUNNEL is not set
298# CONFIG_INET6_TUNNEL is not set 316# CONFIG_INET6_TUNNEL is not set
@@ -350,6 +368,7 @@ CONFIG_STANDALONE=y
350CONFIG_PREVENT_FIRMWARE_BUILD=y 368CONFIG_PREVENT_FIRMWARE_BUILD=y
351CONFIG_FW_LOADER=y 369CONFIG_FW_LOADER=y
352# CONFIG_DEBUG_DRIVER is not set 370# CONFIG_DEBUG_DRIVER is not set
371# CONFIG_DEBUG_DEVRES is not set
353# CONFIG_SYS_HYPERVISOR is not set 372# CONFIG_SYS_HYPERVISOR is not set
354 373
355# 374#
@@ -393,6 +412,12 @@ CONFIG_BLK_DEV_INITRD=y
393# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
394 413
395# 414#
415# Misc devices
416#
417CONFIG_SGI_IOC4=m
418# CONFIG_TIFM_CORE is not set
419
420#
396# ATA/ATAPI/MFM/RLL support 421# ATA/ATAPI/MFM/RLL support
397# 422#
398CONFIG_IDE=y 423CONFIG_IDE=y
@@ -436,6 +461,7 @@ CONFIG_BLK_DEV_HPT366=y
436# CONFIG_BLK_DEV_JMICRON is not set 461# CONFIG_BLK_DEV_JMICRON is not set
437# CONFIG_BLK_DEV_SC1200 is not set 462# CONFIG_BLK_DEV_SC1200 is not set
438# CONFIG_BLK_DEV_PIIX is not set 463# CONFIG_BLK_DEV_PIIX is not set
464CONFIG_BLK_DEV_IT8213=m
439# CONFIG_BLK_DEV_IT821X is not set 465# CONFIG_BLK_DEV_IT821X is not set
440# CONFIG_BLK_DEV_NS87415 is not set 466# CONFIG_BLK_DEV_NS87415 is not set
441# CONFIG_BLK_DEV_PDC202XX_OLD is not set 467# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -445,6 +471,7 @@ CONFIG_BLK_DEV_HPT366=y
445# CONFIG_BLK_DEV_SLC90E66 is not set 471# CONFIG_BLK_DEV_SLC90E66 is not set
446# CONFIG_BLK_DEV_TRM290 is not set 472# CONFIG_BLK_DEV_TRM290 is not set
447# CONFIG_BLK_DEV_VIA82CXXX is not set 473# CONFIG_BLK_DEV_VIA82CXXX is not set
474CONFIG_BLK_DEV_TC86C001=m
448# CONFIG_IDE_ARM is not set 475# CONFIG_IDE_ARM is not set
449CONFIG_BLK_DEV_IDEDMA=y 476CONFIG_BLK_DEV_IDEDMA=y
450# CONFIG_IDEDMA_IVB is not set 477# CONFIG_IDEDMA_IVB is not set
@@ -456,6 +483,7 @@ CONFIG_BLK_DEV_IDEDMA=y
456# 483#
457# CONFIG_RAID_ATTRS is not set 484# CONFIG_RAID_ATTRS is not set
458CONFIG_SCSI=y 485CONFIG_SCSI=y
486CONFIG_SCSI_TGT=m
459CONFIG_SCSI_NETLINK=y 487CONFIG_SCSI_NETLINK=y
460CONFIG_SCSI_PROC_FS=y 488CONFIG_SCSI_PROC_FS=y
461 489
@@ -475,6 +503,7 @@ CONFIG_BLK_DEV_SD=y
475# CONFIG_SCSI_MULTI_LUN is not set 503# CONFIG_SCSI_MULTI_LUN is not set
476CONFIG_SCSI_CONSTANTS=y 504CONFIG_SCSI_CONSTANTS=y
477# CONFIG_SCSI_LOGGING is not set 505# CONFIG_SCSI_LOGGING is not set
506CONFIG_SCSI_SCAN_ASYNC=y
478 507
479# 508#
480# SCSI Transports 509# SCSI Transports
@@ -518,6 +547,7 @@ CONFIG_ISCSI_TCP=m
518# CONFIG_SCSI_DC390T is not set 547# CONFIG_SCSI_DC390T is not set
519# CONFIG_SCSI_NSP32 is not set 548# CONFIG_SCSI_NSP32 is not set
520# CONFIG_SCSI_DEBUG is not set 549# CONFIG_SCSI_DEBUG is not set
550# CONFIG_SCSI_SRP is not set
521 551
522# 552#
523# Serial ATA (prod) and Parallel ATA (experimental) drivers 553# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -605,7 +635,7 @@ CONFIG_8139TOO_8129=y
605# CONFIG_SUNDANCE is not set 635# CONFIG_SUNDANCE is not set
606# CONFIG_TLAN is not set 636# CONFIG_TLAN is not set
607# CONFIG_VIA_RHINE is not set 637# CONFIG_VIA_RHINE is not set
608# CONFIG_LAN_SAA9730 is not set 638# CONFIG_SC92031 is not set
609 639
610# 640#
611# Ethernet (1000 Mbit) 641# Ethernet (1000 Mbit)
@@ -625,14 +655,17 @@ CONFIG_8139TOO_8129=y
625# CONFIG_TIGON3 is not set 655# CONFIG_TIGON3 is not set
626# CONFIG_BNX2 is not set 656# CONFIG_BNX2 is not set
627# CONFIG_QLA3XXX is not set 657# CONFIG_QLA3XXX is not set
658# CONFIG_ATL1 is not set
628 659
629# 660#
630# Ethernet (10000 Mbit) 661# Ethernet (10000 Mbit)
631# 662#
632# CONFIG_CHELSIO_T1 is not set 663# CONFIG_CHELSIO_T1 is not set
664CONFIG_CHELSIO_T3=m
633# CONFIG_IXGB is not set 665# CONFIG_IXGB is not set
634# CONFIG_S2IO is not set 666# CONFIG_S2IO is not set
635# CONFIG_MYRI10GE is not set 667# CONFIG_MYRI10GE is not set
668CONFIG_NETXEN_NIC=m
636 669
637# 670#
638# Token Ring devices 671# Token Ring devices
@@ -720,7 +753,10 @@ CONFIG_HW_CONSOLE=y
720# 753#
721# Non-8250 serial port support 754# Non-8250 serial port support
722# 755#
723# CONFIG_SERIAL_IP3106 is not set 756CONFIG_SERIAL_PNX8XXX=y
757CONFIG_SERIAL_PNX8XXX_CONSOLE=y
758CONFIG_SERIAL_CORE=y
759CONFIG_SERIAL_CORE_CONSOLE=y
724# CONFIG_SERIAL_JSM is not set 760# CONFIG_SERIAL_JSM is not set
725CONFIG_UNIX98_PTYS=y 761CONFIG_UNIX98_PTYS=y
726CONFIG_LEGACY_PTYS=y 762CONFIG_LEGACY_PTYS=y
@@ -741,10 +777,6 @@ CONFIG_HW_RANDOM=y
741# CONFIG_DTLK is not set 777# CONFIG_DTLK is not set
742# CONFIG_R3964 is not set 778# CONFIG_R3964 is not set
743# CONFIG_APPLICOM is not set 779# CONFIG_APPLICOM is not set
744
745#
746# Ftape, the floppy tape device driver
747#
748# CONFIG_DRM is not set 780# CONFIG_DRM is not set
749# CONFIG_RAW_DRIVER is not set 781# CONFIG_RAW_DRIVER is not set
750 782
@@ -752,7 +784,6 @@ CONFIG_HW_RANDOM=y
752# TPM devices 784# TPM devices
753# 785#
754# CONFIG_TCG_TPM is not set 786# CONFIG_TCG_TPM is not set
755# CONFIG_TELCLOCK is not set
756 787
757# 788#
758# I2C support 789# I2C support
@@ -768,6 +799,7 @@ CONFIG_HW_RANDOM=y
768# 799#
769# Dallas's 1-wire bus 800# Dallas's 1-wire bus
770# 801#
802# CONFIG_W1 is not set
771 803
772# 804#
773# Hardware Monitoring support 805# Hardware Monitoring support
@@ -776,15 +808,11 @@ CONFIG_HWMON=y
776# CONFIG_HWMON_VID is not set 808# CONFIG_HWMON_VID is not set
777# CONFIG_SENSORS_ABITUGURU is not set 809# CONFIG_SENSORS_ABITUGURU is not set
778# CONFIG_SENSORS_F71805F is not set 810# CONFIG_SENSORS_F71805F is not set
811# CONFIG_SENSORS_PC87427 is not set
779# CONFIG_SENSORS_VT1211 is not set 812# CONFIG_SENSORS_VT1211 is not set
780# CONFIG_HWMON_DEBUG_CHIP is not set 813# CONFIG_HWMON_DEBUG_CHIP is not set
781 814
782# 815#
783# Misc devices
784#
785# CONFIG_TIFM_CORE is not set
786
787#
788# Multimedia devices 816# Multimedia devices
789# 817#
790# CONFIG_VIDEO_DEV is not set 818# CONFIG_VIDEO_DEV is not set
@@ -814,6 +842,11 @@ CONFIG_DUMMY_CONSOLE=y
814# CONFIG_SOUND is not set 842# CONFIG_SOUND is not set
815 843
816# 844#
845# HID Devices
846#
847# CONFIG_HID is not set
848
849#
817# USB support 850# USB support
818# 851#
819CONFIG_USB_ARCH_HAS_HCD=y 852CONFIG_USB_ARCH_HAS_HCD=y
@@ -826,8 +859,8 @@ CONFIG_USB=y
826# Miscellaneous USB options 859# Miscellaneous USB options
827# 860#
828# CONFIG_USB_DEVICEFS is not set 861# CONFIG_USB_DEVICEFS is not set
829# CONFIG_USB_BANDWIDTH is not set
830# CONFIG_USB_DYNAMIC_MINORS is not set 862# CONFIG_USB_DYNAMIC_MINORS is not set
863# CONFIG_USB_SUSPEND is not set
831# CONFIG_USB_OTG is not set 864# CONFIG_USB_OTG is not set
832 865
833# 866#
@@ -836,7 +869,8 @@ CONFIG_USB=y
836# CONFIG_USB_EHCI_HCD is not set 869# CONFIG_USB_EHCI_HCD is not set
837# CONFIG_USB_ISP116X_HCD is not set 870# CONFIG_USB_ISP116X_HCD is not set
838CONFIG_USB_OHCI_HCD=y 871CONFIG_USB_OHCI_HCD=y
839# CONFIG_USB_OHCI_BIG_ENDIAN is not set 872# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
873# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
840CONFIG_USB_OHCI_LITTLE_ENDIAN=y 874CONFIG_USB_OHCI_LITTLE_ENDIAN=y
841# CONFIG_USB_UHCI_HCD is not set 875# CONFIG_USB_UHCI_HCD is not set
842# CONFIG_USB_SL811_HCD is not set 876# CONFIG_USB_SL811_HCD is not set
@@ -890,7 +924,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
890# CONFIG_USB_ATI_REMOTE2 is not set 924# CONFIG_USB_ATI_REMOTE2 is not set
891# CONFIG_USB_KEYSPAN_REMOTE is not set 925# CONFIG_USB_KEYSPAN_REMOTE is not set
892# CONFIG_USB_APPLETOUCH is not set 926# CONFIG_USB_APPLETOUCH is not set
893# CONFIG_USB_TRANCEVIBRATOR is not set 927# CONFIG_USB_GTCO is not set
894 928
895# 929#
896# USB Imaging devices 930# USB Imaging devices
@@ -905,6 +939,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
905# CONFIG_USB_KAWETH is not set 939# CONFIG_USB_KAWETH is not set
906# CONFIG_USB_PEGASUS is not set 940# CONFIG_USB_PEGASUS is not set
907# CONFIG_USB_RTL8150 is not set 941# CONFIG_USB_RTL8150 is not set
942# CONFIG_USB_USBNET_MII is not set
908# CONFIG_USB_USBNET is not set 943# CONFIG_USB_USBNET is not set
909CONFIG_USB_MON=y 944CONFIG_USB_MON=y
910 945
@@ -935,6 +970,7 @@ CONFIG_USB_MON=y
935# CONFIG_USB_FTDI_ELAN is not set 970# CONFIG_USB_FTDI_ELAN is not set
936# CONFIG_USB_APPLEDISPLAY is not set 971# CONFIG_USB_APPLEDISPLAY is not set
937# CONFIG_USB_LD is not set 972# CONFIG_USB_LD is not set
973# CONFIG_USB_TRANCEVIBRATOR is not set
938 974
939# 975#
940# USB DSL modem support 976# USB DSL modem support
@@ -991,6 +1027,14 @@ CONFIG_USB_MON=y
991# 1027#
992 1028
993# 1029#
1030# Auxiliary Display support
1031#
1032
1033#
1034# Virtualization
1035#
1036
1037#
994# File systems 1038# File systems
995# 1039#
996CONFIG_EXT2_FS=y 1040CONFIG_EXT2_FS=y
@@ -1041,7 +1085,7 @@ CONFIG_TMPFS=y
1041# CONFIG_TMPFS_POSIX_ACL is not set 1085# CONFIG_TMPFS_POSIX_ACL is not set
1042# CONFIG_HUGETLB_PAGE is not set 1086# CONFIG_HUGETLB_PAGE is not set
1043CONFIG_RAMFS=y 1087CONFIG_RAMFS=y
1044# CONFIG_CONFIGFS_FS is not set 1088CONFIG_CONFIGFS_FS=m
1045 1089
1046# 1090#
1047# Miscellaneous filesystems 1091# Miscellaneous filesystems
@@ -1137,6 +1181,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1137# CONFIG_NLS_UTF8 is not set 1181# CONFIG_NLS_UTF8 is not set
1138 1182
1139# 1183#
1184# Distributed Lock Manager
1185#
1186CONFIG_DLM=m
1187CONFIG_DLM_TCP=y
1188# CONFIG_DLM_SCTP is not set
1189# CONFIG_DLM_DEBUG is not set
1190
1191#
1140# Profiling support 1192# Profiling support
1141# 1193#
1142# CONFIG_PROFILING is not set 1194# CONFIG_PROFILING is not set
@@ -1149,28 +1201,29 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1149CONFIG_ENABLE_MUST_CHECK=y 1201CONFIG_ENABLE_MUST_CHECK=y
1150CONFIG_MAGIC_SYSRQ=y 1202CONFIG_MAGIC_SYSRQ=y
1151# CONFIG_UNUSED_SYMBOLS is not set 1203# CONFIG_UNUSED_SYMBOLS is not set
1204# CONFIG_DEBUG_FS is not set
1205# CONFIG_HEADERS_CHECK is not set
1152CONFIG_DEBUG_KERNEL=y 1206CONFIG_DEBUG_KERNEL=y
1207# CONFIG_DEBUG_SHIRQ is not set
1153CONFIG_LOG_BUF_SHIFT=14 1208CONFIG_LOG_BUF_SHIFT=14
1154CONFIG_DETECT_SOFTLOCKUP=y 1209CONFIG_DETECT_SOFTLOCKUP=y
1155# CONFIG_SCHEDSTATS is not set 1210# CONFIG_SCHEDSTATS is not set
1211# CONFIG_TIMER_STATS is not set
1156CONFIG_DEBUG_SLAB=y 1212CONFIG_DEBUG_SLAB=y
1157# CONFIG_DEBUG_SLAB_LEAK is not set 1213# CONFIG_DEBUG_SLAB_LEAK is not set
1158# CONFIG_DEBUG_RT_MUTEXES is not set 1214# CONFIG_DEBUG_RT_MUTEXES is not set
1159# CONFIG_RT_MUTEX_TESTER is not set 1215# CONFIG_RT_MUTEX_TESTER is not set
1160# CONFIG_DEBUG_SPINLOCK is not set 1216# CONFIG_DEBUG_SPINLOCK is not set
1161CONFIG_DEBUG_MUTEXES=y 1217CONFIG_DEBUG_MUTEXES=y
1162# CONFIG_DEBUG_RWSEMS is not set
1163# CONFIG_DEBUG_LOCK_ALLOC is not set 1218# CONFIG_DEBUG_LOCK_ALLOC is not set
1164# CONFIG_PROVE_LOCKING is not set 1219# CONFIG_PROVE_LOCKING is not set
1165# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1220# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1166# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1221# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1167# CONFIG_DEBUG_KOBJECT is not set 1222# CONFIG_DEBUG_KOBJECT is not set
1168# CONFIG_DEBUG_INFO is not set 1223# CONFIG_DEBUG_INFO is not set
1169# CONFIG_DEBUG_FS is not set
1170# CONFIG_DEBUG_VM is not set 1224# CONFIG_DEBUG_VM is not set
1171# CONFIG_DEBUG_LIST is not set 1225# CONFIG_DEBUG_LIST is not set
1172CONFIG_FORCED_INLINING=y 1226CONFIG_FORCED_INLINING=y
1173# CONFIG_HEADERS_CHECK is not set
1174# CONFIG_RCU_TORTURE_TEST is not set 1227# CONFIG_RCU_TORTURE_TEST is not set
1175CONFIG_CROSSCOMPILE=y 1228CONFIG_CROSSCOMPILE=y
1176CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1229CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
@@ -1189,21 +1242,27 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1189# Cryptographic options 1242# Cryptographic options
1190# 1243#
1191CONFIG_CRYPTO=y 1244CONFIG_CRYPTO=y
1192CONFIG_CRYPTO_ALGAPI=m 1245CONFIG_CRYPTO_ALGAPI=y
1193CONFIG_CRYPTO_BLKCIPHER=m 1246CONFIG_CRYPTO_BLKCIPHER=m
1247CONFIG_CRYPTO_HASH=m
1194CONFIG_CRYPTO_MANAGER=m 1248CONFIG_CRYPTO_MANAGER=m
1195# CONFIG_CRYPTO_HMAC is not set 1249# CONFIG_CRYPTO_HMAC is not set
1250CONFIG_CRYPTO_XCBC=m
1196# CONFIG_CRYPTO_NULL is not set 1251# CONFIG_CRYPTO_NULL is not set
1197# CONFIG_CRYPTO_MD4 is not set 1252# CONFIG_CRYPTO_MD4 is not set
1198CONFIG_CRYPTO_MD5=m 1253CONFIG_CRYPTO_MD5=y
1199# CONFIG_CRYPTO_SHA1 is not set 1254# CONFIG_CRYPTO_SHA1 is not set
1200# CONFIG_CRYPTO_SHA256 is not set 1255# CONFIG_CRYPTO_SHA256 is not set
1201# CONFIG_CRYPTO_SHA512 is not set 1256# CONFIG_CRYPTO_SHA512 is not set
1202# CONFIG_CRYPTO_WP512 is not set 1257# CONFIG_CRYPTO_WP512 is not set
1203# CONFIG_CRYPTO_TGR192 is not set 1258# CONFIG_CRYPTO_TGR192 is not set
1259CONFIG_CRYPTO_GF128MUL=m
1204CONFIG_CRYPTO_ECB=m 1260CONFIG_CRYPTO_ECB=m
1205CONFIG_CRYPTO_CBC=m 1261CONFIG_CRYPTO_CBC=m
1262CONFIG_CRYPTO_PCBC=m
1263CONFIG_CRYPTO_LRW=m
1206# CONFIG_CRYPTO_DES is not set 1264# CONFIG_CRYPTO_DES is not set
1265CONFIG_CRYPTO_FCRYPT=m
1207# CONFIG_CRYPTO_BLOWFISH is not set 1266# CONFIG_CRYPTO_BLOWFISH is not set
1208# CONFIG_CRYPTO_TWOFISH is not set 1267# CONFIG_CRYPTO_TWOFISH is not set
1209# CONFIG_CRYPTO_SERPENT is not set 1268# CONFIG_CRYPTO_SERPENT is not set
@@ -1217,6 +1276,7 @@ CONFIG_CRYPTO_CBC=m
1217# CONFIG_CRYPTO_DEFLATE is not set 1276# CONFIG_CRYPTO_DEFLATE is not set
1218# CONFIG_CRYPTO_MICHAEL_MIC is not set 1277# CONFIG_CRYPTO_MICHAEL_MIC is not set
1219CONFIG_CRYPTO_CRC32C=m 1278CONFIG_CRYPTO_CRC32C=m
1279CONFIG_CRYPTO_CAMELLIA=m
1220# CONFIG_CRYPTO_TEST is not set 1280# CONFIG_CRYPTO_TEST is not set
1221 1281
1222# 1282#
@@ -1226,8 +1286,11 @@ CONFIG_CRYPTO_CRC32C=m
1226# 1286#
1227# Library routines 1287# Library routines
1228# 1288#
1289CONFIG_BITREVERSE=y
1229CONFIG_CRC_CCITT=m 1290CONFIG_CRC_CCITT=m
1230# CONFIG_CRC16 is not set 1291# CONFIG_CRC16 is not set
1231CONFIG_CRC32=y 1292CONFIG_CRC32=y
1232CONFIG_LIBCRC32C=m 1293CONFIG_LIBCRC32C=m
1233CONFIG_PLIST=y 1294CONFIG_PLIST=y
1295CONFIG_HAS_IOMEM=y
1296CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pnx8550-stb810_defconfig b/arch/mips/configs/pnx8550-stb810_defconfig
index f38a2c123037..5bd377bdbb2c 100644
--- a/arch/mips/configs/pnx8550-stb810_defconfig
+++ b/arch/mips/configs/pnx8550-stb810_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19 3# Linux kernel version: 2.6.20
4# Thu Dec 7 16:35:12 2006 4# Sun Feb 18 21:28:04 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -58,17 +59,19 @@ CONFIG_PNX8550_STB810=y
58# CONFIG_SIBYTE_LITTLESUR is not set 59# CONFIG_SIBYTE_LITTLESUR is not set
59# CONFIG_SIBYTE_CRHINE is not set 60# CONFIG_SIBYTE_CRHINE is not set
60# CONFIG_SIBYTE_CRHONE is not set 61# CONFIG_SIBYTE_CRHONE is not set
61# CONFIG_SNI_RM200_PCI is not set 62# CONFIG_SNI_RM is not set
62# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
63# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
64# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
65# CONFIG_KEXEC is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
70CONFIG_GENERIC_TIME=y 72CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
72CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
74# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
@@ -136,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
139# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -148,6 +152,7 @@ CONFIG_HZ=250
148CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
151CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
152CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
153CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -167,6 +172,7 @@ CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y 172CONFIG_SWAP=y
168CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
169# CONFIG_IPC_NS is not set 174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
172# CONFIG_TASKSTATS is not set 178# CONFIG_TASKSTATS is not set
@@ -234,7 +240,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
234# 240#
235CONFIG_HW_HAS_PCI=y 241CONFIG_HW_HAS_PCI=y
236CONFIG_PCI=y 242CONFIG_PCI=y
237# CONFIG_PCI_MULTITHREAD_PROBE is not set
238# CONFIG_PCI_DEBUG is not set 243# CONFIG_PCI_DEBUG is not set
239CONFIG_MMU=y 244CONFIG_MMU=y
240 245
@@ -254,6 +259,14 @@ CONFIG_BINFMT_ELF=y
254CONFIG_TRAD_SIGNALS=y 259CONFIG_TRAD_SIGNALS=y
255 260
256# 261#
262# Power management options
263#
264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
268
269#
257# Networking 270# Networking
258# 271#
259CONFIG_NET=y 272CONFIG_NET=y
@@ -268,6 +281,7 @@ CONFIG_UNIX=y
268CONFIG_XFRM=y 281CONFIG_XFRM=y
269# CONFIG_XFRM_USER is not set 282# CONFIG_XFRM_USER is not set
270# CONFIG_XFRM_SUB_POLICY is not set 283# CONFIG_XFRM_SUB_POLICY is not set
284CONFIG_XFRM_MIGRATE=y
271# CONFIG_NET_KEY is not set 285# CONFIG_NET_KEY is not set
272CONFIG_INET=y 286CONFIG_INET=y
273# CONFIG_IP_MULTICAST is not set 287# CONFIG_IP_MULTICAST is not set
@@ -351,6 +365,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
351CONFIG_STANDALONE=y 365CONFIG_STANDALONE=y
352CONFIG_PREVENT_FIRMWARE_BUILD=y 366CONFIG_PREVENT_FIRMWARE_BUILD=y
353# CONFIG_DEBUG_DRIVER is not set 367# CONFIG_DEBUG_DRIVER is not set
368# CONFIG_DEBUG_DEVRES is not set
354# CONFIG_SYS_HYPERVISOR is not set 369# CONFIG_SYS_HYPERVISOR is not set
355 370
356# 371#
@@ -443,6 +458,7 @@ CONFIG_BLK_DEV_HPT366=y
443# CONFIG_BLK_DEV_JMICRON is not set 458# CONFIG_BLK_DEV_JMICRON is not set
444# CONFIG_BLK_DEV_SC1200 is not set 459# CONFIG_BLK_DEV_SC1200 is not set
445# CONFIG_BLK_DEV_PIIX is not set 460# CONFIG_BLK_DEV_PIIX is not set
461CONFIG_BLK_DEV_IT8213=m
446# CONFIG_BLK_DEV_IT821X is not set 462# CONFIG_BLK_DEV_IT821X is not set
447# CONFIG_BLK_DEV_NS87415 is not set 463# CONFIG_BLK_DEV_NS87415 is not set
448# CONFIG_BLK_DEV_PDC202XX_OLD is not set 464# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -452,6 +468,7 @@ CONFIG_BLK_DEV_HPT366=y
452# CONFIG_BLK_DEV_SLC90E66 is not set 468# CONFIG_BLK_DEV_SLC90E66 is not set
453# CONFIG_BLK_DEV_TRM290 is not set 469# CONFIG_BLK_DEV_TRM290 is not set
454# CONFIG_BLK_DEV_VIA82CXXX is not set 470# CONFIG_BLK_DEV_VIA82CXXX is not set
471CONFIG_BLK_DEV_TC86C001=m
455# CONFIG_IDE_ARM is not set 472# CONFIG_IDE_ARM is not set
456CONFIG_BLK_DEV_IDEDMA=y 473CONFIG_BLK_DEV_IDEDMA=y
457# CONFIG_IDEDMA_IVB is not set 474# CONFIG_IDEDMA_IVB is not set
@@ -463,6 +480,7 @@ CONFIG_BLK_DEV_IDEDMA=y
463# 480#
464# CONFIG_RAID_ATTRS is not set 481# CONFIG_RAID_ATTRS is not set
465CONFIG_SCSI=y 482CONFIG_SCSI=y
483CONFIG_SCSI_TGT=m
466# CONFIG_SCSI_NETLINK is not set 484# CONFIG_SCSI_NETLINK is not set
467CONFIG_SCSI_PROC_FS=y 485CONFIG_SCSI_PROC_FS=y
468 486
@@ -482,6 +500,7 @@ CONFIG_BLK_DEV_SD=y
482# CONFIG_SCSI_MULTI_LUN is not set 500# CONFIG_SCSI_MULTI_LUN is not set
483CONFIG_SCSI_CONSTANTS=y 501CONFIG_SCSI_CONSTANTS=y
484# CONFIG_SCSI_LOGGING is not set 502# CONFIG_SCSI_LOGGING is not set
503CONFIG_SCSI_SCAN_ASYNC=y
485 504
486# 505#
487# SCSI Transports 506# SCSI Transports
@@ -525,6 +544,7 @@ CONFIG_ISCSI_TCP=m
525# CONFIG_SCSI_DC390T is not set 544# CONFIG_SCSI_DC390T is not set
526# CONFIG_SCSI_NSP32 is not set 545# CONFIG_SCSI_NSP32 is not set
527# CONFIG_SCSI_DEBUG is not set 546# CONFIG_SCSI_DEBUG is not set
547# CONFIG_SCSI_SRP is not set
528 548
529# 549#
530# Serial ATA (prod) and Parallel ATA (experimental) drivers 550# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -608,6 +628,7 @@ CONFIG_NATSEMI=y
608# CONFIG_SUNDANCE is not set 628# CONFIG_SUNDANCE is not set
609# CONFIG_TLAN is not set 629# CONFIG_TLAN is not set
610# CONFIG_VIA_RHINE is not set 630# CONFIG_VIA_RHINE is not set
631# CONFIG_SC92031 is not set
611 632
612# 633#
613# Ethernet (1000 Mbit) 634# Ethernet (1000 Mbit)
@@ -627,11 +648,13 @@ CONFIG_NATSEMI=y
627# CONFIG_TIGON3 is not set 648# CONFIG_TIGON3 is not set
628# CONFIG_BNX2 is not set 649# CONFIG_BNX2 is not set
629# CONFIG_QLA3XXX is not set 650# CONFIG_QLA3XXX is not set
651# CONFIG_ATL1 is not set
630 652
631# 653#
632# Ethernet (10000 Mbit) 654# Ethernet (10000 Mbit)
633# 655#
634# CONFIG_CHELSIO_T1 is not set 656# CONFIG_CHELSIO_T1 is not set
657CONFIG_CHELSIO_T3=m
635# CONFIG_IXGB is not set 658# CONFIG_IXGB is not set
636# CONFIG_S2IO is not set 659# CONFIG_S2IO is not set
637# CONFIG_MYRI10GE is not set 660# CONFIG_MYRI10GE is not set
@@ -775,6 +798,7 @@ CONFIG_HWMON=y
775# CONFIG_HWMON_VID is not set 798# CONFIG_HWMON_VID is not set
776# CONFIG_SENSORS_ABITUGURU is not set 799# CONFIG_SENSORS_ABITUGURU is not set
777# CONFIG_SENSORS_F71805F is not set 800# CONFIG_SENSORS_F71805F is not set
801# CONFIG_SENSORS_PC87427 is not set
778# CONFIG_SENSORS_VT1211 is not set 802# CONFIG_SENSORS_VT1211 is not set
779# CONFIG_HWMON_DEBUG_CHIP is not set 803# CONFIG_HWMON_DEBUG_CHIP is not set
780 804
@@ -808,6 +832,11 @@ CONFIG_DUMMY_CONSOLE=y
808# CONFIG_SOUND is not set 832# CONFIG_SOUND is not set
809 833
810# 834#
835# HID Devices
836#
837# CONFIG_HID is not set
838
839#
811# USB support 840# USB support
812# 841#
813CONFIG_USB_ARCH_HAS_HCD=y 842CONFIG_USB_ARCH_HAS_HCD=y
@@ -820,9 +849,8 @@ CONFIG_USB=y
820# Miscellaneous USB options 849# Miscellaneous USB options
821# 850#
822# CONFIG_USB_DEVICEFS is not set 851# CONFIG_USB_DEVICEFS is not set
823# CONFIG_USB_BANDWIDTH is not set
824# CONFIG_USB_DYNAMIC_MINORS is not set 852# CONFIG_USB_DYNAMIC_MINORS is not set
825# CONFIG_USB_MULTITHREAD_PROBE is not set 853# CONFIG_USB_SUSPEND is not set
826# CONFIG_USB_OTG is not set 854# CONFIG_USB_OTG is not set
827 855
828# 856#
@@ -831,7 +859,8 @@ CONFIG_USB=y
831# CONFIG_USB_EHCI_HCD is not set 859# CONFIG_USB_EHCI_HCD is not set
832# CONFIG_USB_ISP116X_HCD is not set 860# CONFIG_USB_ISP116X_HCD is not set
833CONFIG_USB_OHCI_HCD=y 861CONFIG_USB_OHCI_HCD=y
834# CONFIG_USB_OHCI_BIG_ENDIAN is not set 862# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
863# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
835CONFIG_USB_OHCI_LITTLE_ENDIAN=y 864CONFIG_USB_OHCI_LITTLE_ENDIAN=y
836# CONFIG_USB_UHCI_HCD is not set 865# CONFIG_USB_UHCI_HCD is not set
837# CONFIG_USB_SL811_HCD is not set 866# CONFIG_USB_SL811_HCD is not set
@@ -885,6 +914,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
885# CONFIG_USB_ATI_REMOTE2 is not set 914# CONFIG_USB_ATI_REMOTE2 is not set
886# CONFIG_USB_KEYSPAN_REMOTE is not set 915# CONFIG_USB_KEYSPAN_REMOTE is not set
887# CONFIG_USB_APPLETOUCH is not set 916# CONFIG_USB_APPLETOUCH is not set
917# CONFIG_USB_GTCO is not set
888 918
889# 919#
890# USB Imaging devices 920# USB Imaging devices
@@ -987,6 +1017,14 @@ CONFIG_USB_MON=y
987# 1017#
988 1018
989# 1019#
1020# Auxiliary Display support
1021#
1022
1023#
1024# Virtualization
1025#
1026
1027#
990# File systems 1028# File systems
991# 1029#
992CONFIG_EXT2_FS=y 1030CONFIG_EXT2_FS=y
@@ -1037,7 +1075,7 @@ CONFIG_TMPFS=y
1037# CONFIG_TMPFS_POSIX_ACL is not set 1075# CONFIG_TMPFS_POSIX_ACL is not set
1038# CONFIG_HUGETLB_PAGE is not set 1076# CONFIG_HUGETLB_PAGE is not set
1039CONFIG_RAMFS=y 1077CONFIG_RAMFS=y
1040# CONFIG_CONFIGFS_FS is not set 1078CONFIG_CONFIGFS_FS=m
1041 1079
1042# 1080#
1043# Miscellaneous filesystems 1081# Miscellaneous filesystems
@@ -1133,6 +1171,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1133# CONFIG_NLS_UTF8 is not set 1171# CONFIG_NLS_UTF8 is not set
1134 1172
1135# 1173#
1174# Distributed Lock Manager
1175#
1176CONFIG_DLM=m
1177CONFIG_DLM_TCP=y
1178# CONFIG_DLM_SCTP is not set
1179# CONFIG_DLM_DEBUG is not set
1180
1181#
1136# Profiling support 1182# Profiling support
1137# 1183#
1138# CONFIG_PROFILING is not set 1184# CONFIG_PROFILING is not set
@@ -1145,28 +1191,29 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1145CONFIG_ENABLE_MUST_CHECK=y 1191CONFIG_ENABLE_MUST_CHECK=y
1146CONFIG_MAGIC_SYSRQ=y 1192CONFIG_MAGIC_SYSRQ=y
1147# CONFIG_UNUSED_SYMBOLS is not set 1193# CONFIG_UNUSED_SYMBOLS is not set
1194# CONFIG_DEBUG_FS is not set
1195CONFIG_HEADERS_CHECK=y
1148CONFIG_DEBUG_KERNEL=y 1196CONFIG_DEBUG_KERNEL=y
1197# CONFIG_DEBUG_SHIRQ is not set
1149CONFIG_LOG_BUF_SHIFT=14 1198CONFIG_LOG_BUF_SHIFT=14
1150CONFIG_DETECT_SOFTLOCKUP=y 1199CONFIG_DETECT_SOFTLOCKUP=y
1151# CONFIG_SCHEDSTATS is not set 1200# CONFIG_SCHEDSTATS is not set
1201# CONFIG_TIMER_STATS is not set
1152CONFIG_DEBUG_SLAB=y 1202CONFIG_DEBUG_SLAB=y
1153# CONFIG_DEBUG_SLAB_LEAK is not set 1203# CONFIG_DEBUG_SLAB_LEAK is not set
1154# CONFIG_DEBUG_RT_MUTEXES is not set 1204# CONFIG_DEBUG_RT_MUTEXES is not set
1155# CONFIG_RT_MUTEX_TESTER is not set 1205# CONFIG_RT_MUTEX_TESTER is not set
1156# CONFIG_DEBUG_SPINLOCK is not set 1206# CONFIG_DEBUG_SPINLOCK is not set
1157# CONFIG_DEBUG_MUTEXES is not set 1207# CONFIG_DEBUG_MUTEXES is not set
1158# CONFIG_DEBUG_RWSEMS is not set
1159# CONFIG_DEBUG_LOCK_ALLOC is not set 1208# CONFIG_DEBUG_LOCK_ALLOC is not set
1160# CONFIG_PROVE_LOCKING is not set 1209# CONFIG_PROVE_LOCKING is not set
1161# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1210# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1162# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 1211# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1163# CONFIG_DEBUG_KOBJECT is not set 1212# CONFIG_DEBUG_KOBJECT is not set
1164# CONFIG_DEBUG_INFO is not set 1213# CONFIG_DEBUG_INFO is not set
1165# CONFIG_DEBUG_FS is not set
1166# CONFIG_DEBUG_VM is not set 1214# CONFIG_DEBUG_VM is not set
1167# CONFIG_DEBUG_LIST is not set 1215# CONFIG_DEBUG_LIST is not set
1168CONFIG_FORCED_INLINING=y 1216CONFIG_FORCED_INLINING=y
1169CONFIG_HEADERS_CHECK=y
1170# CONFIG_RCU_TORTURE_TEST is not set 1217# CONFIG_RCU_TORTURE_TEST is not set
1171CONFIG_CROSSCOMPILE=y 1218CONFIG_CROSSCOMPILE=y
1172CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1219CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
@@ -1187,8 +1234,10 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1187CONFIG_CRYPTO=y 1234CONFIG_CRYPTO=y
1188CONFIG_CRYPTO_ALGAPI=m 1235CONFIG_CRYPTO_ALGAPI=m
1189CONFIG_CRYPTO_BLKCIPHER=m 1236CONFIG_CRYPTO_BLKCIPHER=m
1237CONFIG_CRYPTO_HASH=m
1190CONFIG_CRYPTO_MANAGER=m 1238CONFIG_CRYPTO_MANAGER=m
1191# CONFIG_CRYPTO_HMAC is not set 1239# CONFIG_CRYPTO_HMAC is not set
1240CONFIG_CRYPTO_XCBC=m
1192# CONFIG_CRYPTO_NULL is not set 1241# CONFIG_CRYPTO_NULL is not set
1193# CONFIG_CRYPTO_MD4 is not set 1242# CONFIG_CRYPTO_MD4 is not set
1194CONFIG_CRYPTO_MD5=m 1243CONFIG_CRYPTO_MD5=m
@@ -1197,9 +1246,13 @@ CONFIG_CRYPTO_MD5=m
1197# CONFIG_CRYPTO_SHA512 is not set 1246# CONFIG_CRYPTO_SHA512 is not set
1198# CONFIG_CRYPTO_WP512 is not set 1247# CONFIG_CRYPTO_WP512 is not set
1199# CONFIG_CRYPTO_TGR192 is not set 1248# CONFIG_CRYPTO_TGR192 is not set
1249CONFIG_CRYPTO_GF128MUL=m
1200CONFIG_CRYPTO_ECB=m 1250CONFIG_CRYPTO_ECB=m
1201CONFIG_CRYPTO_CBC=m 1251CONFIG_CRYPTO_CBC=m
1252CONFIG_CRYPTO_PCBC=m
1253CONFIG_CRYPTO_LRW=m
1202# CONFIG_CRYPTO_DES is not set 1254# CONFIG_CRYPTO_DES is not set
1255CONFIG_CRYPTO_FCRYPT=m
1203# CONFIG_CRYPTO_BLOWFISH is not set 1256# CONFIG_CRYPTO_BLOWFISH is not set
1204# CONFIG_CRYPTO_TWOFISH is not set 1257# CONFIG_CRYPTO_TWOFISH is not set
1205# CONFIG_CRYPTO_SERPENT is not set 1258# CONFIG_CRYPTO_SERPENT is not set
@@ -1213,6 +1266,7 @@ CONFIG_CRYPTO_CBC=m
1213# CONFIG_CRYPTO_DEFLATE is not set 1266# CONFIG_CRYPTO_DEFLATE is not set
1214# CONFIG_CRYPTO_MICHAEL_MIC is not set 1267# CONFIG_CRYPTO_MICHAEL_MIC is not set
1215CONFIG_CRYPTO_CRC32C=m 1268CONFIG_CRYPTO_CRC32C=m
1269CONFIG_CRYPTO_CAMELLIA=m
1216# CONFIG_CRYPTO_TEST is not set 1270# CONFIG_CRYPTO_TEST is not set
1217 1271
1218# 1272#
@@ -1222,8 +1276,11 @@ CONFIG_CRYPTO_CRC32C=m
1222# 1276#
1223# Library routines 1277# Library routines
1224# 1278#
1279CONFIG_BITREVERSE=y
1225CONFIG_CRC_CCITT=m 1280CONFIG_CRC_CCITT=m
1226# CONFIG_CRC16 is not set 1281# CONFIG_CRC16 is not set
1227CONFIG_CRC32=y 1282CONFIG_CRC32=y
1228CONFIG_LIBCRC32C=m 1283CONFIG_LIBCRC32C=m
1229CONFIG_PLIST=y 1284CONFIG_PLIST=y
1285CONFIG_HAS_IOMEM=y
1286CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 5bc3248e50e4..cc694709ba65 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc2 3# Linux kernel version: 2.6.20
4# Sat Oct 14 23:12:15 2006 4# Sun Feb 18 21:28:06 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -40,6 +41,7 @@ CONFIG_MIPS=y
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41CONFIG_PNX8550_V2PCI=y 42CONFIG_PNX8550_V2PCI=y
42# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
44# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
45# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -62,11 +64,14 @@ CONFIG_PNX8550_V2PCI=y
62# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
63# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
64CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
65CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
66CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_GENERIC_TIME=y 72CONFIG_GENERIC_TIME=y
69CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
70CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
71CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
72# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
@@ -134,6 +139,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
134# CONFIG_SPARSEMEM_STATIC is not set 139# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4 140CONFIG_SPLIT_PTLOCK_CPUS=4
136# CONFIG_RESOURCES_64BIT is not set 141# CONFIG_RESOURCES_64BIT is not set
142CONFIG_ZONE_DMA_FLAG=1
137# CONFIG_HZ_48 is not set 143# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 144# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 145# CONFIG_HZ_128 is not set
@@ -146,6 +152,7 @@ CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 153# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 154# CONFIG_PREEMPT is not set
155# CONFIG_KEXEC is not set
149CONFIG_LOCKDEP_SUPPORT=y 156CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 157CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,6 +172,7 @@ CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 172CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 173CONFIG_SYSVIPC=y
167# CONFIG_IPC_NS is not set 174# CONFIG_IPC_NS is not set
175CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 176# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 177# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 178# CONFIG_TASKSTATS is not set
@@ -172,6 +180,7 @@ CONFIG_SYSVIPC=y
172# CONFIG_AUDIT is not set 180# CONFIG_AUDIT is not set
173CONFIG_IKCONFIG=y 181CONFIG_IKCONFIG=y
174CONFIG_IKCONFIG_PROC=y 182CONFIG_IKCONFIG_PROC=y
183CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 184# CONFIG_RELAY is not set
176CONFIG_INITRAMFS_SOURCE="" 185CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -230,7 +239,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
230# 239#
231CONFIG_HW_HAS_PCI=y 240CONFIG_HW_HAS_PCI=y
232CONFIG_PCI=y 241CONFIG_PCI=y
233# CONFIG_PCI_MULTITHREAD_PROBE is not set
234CONFIG_MMU=y 242CONFIG_MMU=y
235 243
236# 244#
@@ -251,6 +259,14 @@ CONFIG_BINFMT_ELF=y
251CONFIG_TRAD_SIGNALS=y 259CONFIG_TRAD_SIGNALS=y
252 260
253# 261#
262# Power management options
263#
264CONFIG_PM=y
265# CONFIG_PM_LEGACY is not set
266# CONFIG_PM_DEBUG is not set
267# CONFIG_PM_SYSFS_DEPRECATED is not set
268
269#
254# Networking 270# Networking
255# 271#
256CONFIG_NET=y 272CONFIG_NET=y
@@ -265,6 +281,7 @@ CONFIG_UNIX=y
265CONFIG_XFRM=y 281CONFIG_XFRM=y
266# CONFIG_XFRM_USER is not set 282# CONFIG_XFRM_USER is not set
267# CONFIG_XFRM_SUB_POLICY is not set 283# CONFIG_XFRM_SUB_POLICY is not set
284CONFIG_XFRM_MIGRATE=y
268# CONFIG_NET_KEY is not set 285# CONFIG_NET_KEY is not set
269CONFIG_INET=y 286CONFIG_INET=y
270# CONFIG_IP_MULTICAST is not set 287# CONFIG_IP_MULTICAST is not set
@@ -282,7 +299,7 @@ CONFIG_IP_PNP=y
282# CONFIG_INET_ESP is not set 299# CONFIG_INET_ESP is not set
283# CONFIG_INET_IPCOMP is not set 300# CONFIG_INET_IPCOMP is not set
284# CONFIG_INET_XFRM_TUNNEL is not set 301# CONFIG_INET_XFRM_TUNNEL is not set
285# CONFIG_INET_TUNNEL is not set 302CONFIG_INET_TUNNEL=m
286CONFIG_INET_XFRM_MODE_TRANSPORT=y 303CONFIG_INET_XFRM_MODE_TRANSPORT=y
287CONFIG_INET_XFRM_MODE_TUNNEL=y 304CONFIG_INET_XFRM_MODE_TUNNEL=y
288CONFIG_INET_XFRM_MODE_BEET=y 305CONFIG_INET_XFRM_MODE_BEET=y
@@ -291,6 +308,7 @@ CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 308# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_CUBIC=y 309CONFIG_TCP_CONG_CUBIC=y
293CONFIG_DEFAULT_TCP_CONG="cubic" 310CONFIG_DEFAULT_TCP_CONG="cubic"
311CONFIG_TCP_MD5SIG=y
294 312
295# 313#
296# IP: Virtual Server Configuration 314# IP: Virtual Server Configuration
@@ -312,7 +330,6 @@ CONFIG_INET6_XFRM_MODE_BEET=m
312# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set 330# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
313CONFIG_IPV6_SIT=m 331CONFIG_IPV6_SIT=m
314# CONFIG_IPV6_TUNNEL is not set 332# CONFIG_IPV6_TUNNEL is not set
315# CONFIG_IPV6_SUBTREES is not set
316# CONFIG_IPV6_MULTIPLE_TABLES is not set 333# CONFIG_IPV6_MULTIPLE_TABLES is not set
317# CONFIG_NETWORK_SECMARK is not set 334# CONFIG_NETWORK_SECMARK is not set
318CONFIG_NETFILTER=y 335CONFIG_NETFILTER=y
@@ -322,15 +339,38 @@ CONFIG_NETFILTER=y
322# Core Netfilter Configuration 339# Core Netfilter Configuration
323# 340#
324# CONFIG_NETFILTER_NETLINK is not set 341# CONFIG_NETFILTER_NETLINK is not set
325# CONFIG_NF_CONNTRACK is not set 342CONFIG_NF_CONNTRACK_ENABLED=m
343CONFIG_NF_CONNTRACK_SUPPORT=y
344# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
345CONFIG_NF_CONNTRACK=m
346CONFIG_NF_CT_ACCT=y
347CONFIG_NF_CONNTRACK_MARK=y
348CONFIG_NF_CONNTRACK_EVENTS=y
349CONFIG_NF_CT_PROTO_GRE=m
350CONFIG_NF_CT_PROTO_SCTP=m
351CONFIG_NF_CONNTRACK_AMANDA=m
352CONFIG_NF_CONNTRACK_FTP=m
353CONFIG_NF_CONNTRACK_H323=m
354CONFIG_NF_CONNTRACK_IRC=m
355# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
356CONFIG_NF_CONNTRACK_PPTP=m
357CONFIG_NF_CONNTRACK_SANE=m
358CONFIG_NF_CONNTRACK_SIP=m
359CONFIG_NF_CONNTRACK_TFTP=m
326CONFIG_NETFILTER_XTABLES=m 360CONFIG_NETFILTER_XTABLES=m
327CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 361CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
328CONFIG_NETFILTER_XT_TARGET_MARK=m 362CONFIG_NETFILTER_XT_TARGET_MARK=m
329CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 363CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
364CONFIG_NETFILTER_XT_TARGET_NFLOG=m
365CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
330CONFIG_NETFILTER_XT_MATCH_COMMENT=m 366CONFIG_NETFILTER_XT_MATCH_COMMENT=m
367CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
368CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
369CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
331CONFIG_NETFILTER_XT_MATCH_DCCP=m 370CONFIG_NETFILTER_XT_MATCH_DCCP=m
332# CONFIG_NETFILTER_XT_MATCH_DSCP is not set 371# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
333CONFIG_NETFILTER_XT_MATCH_ESP=m 372CONFIG_NETFILTER_XT_MATCH_ESP=m
373CONFIG_NETFILTER_XT_MATCH_HELPER=m
334CONFIG_NETFILTER_XT_MATCH_LENGTH=m 374CONFIG_NETFILTER_XT_MATCH_LENGTH=m
335CONFIG_NETFILTER_XT_MATCH_LIMIT=m 375CONFIG_NETFILTER_XT_MATCH_LIMIT=m
336CONFIG_NETFILTER_XT_MATCH_MAC=m 376CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -341,14 +381,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
341# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set 381# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
342CONFIG_NETFILTER_XT_MATCH_REALM=m 382CONFIG_NETFILTER_XT_MATCH_REALM=m
343CONFIG_NETFILTER_XT_MATCH_SCTP=m 383CONFIG_NETFILTER_XT_MATCH_SCTP=m
384CONFIG_NETFILTER_XT_MATCH_STATE=m
344# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set 385# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
345CONFIG_NETFILTER_XT_MATCH_STRING=m 386CONFIG_NETFILTER_XT_MATCH_STRING=m
346CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 387CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
388CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
347 389
348# 390#
349# IP: Netfilter Configuration 391# IP: Netfilter Configuration
350# 392#
351# CONFIG_IP_NF_CONNTRACK is not set 393CONFIG_NF_CONNTRACK_IPV4=m
394CONFIG_NF_CONNTRACK_PROC_COMPAT=y
352# CONFIG_IP_NF_QUEUE is not set 395# CONFIG_IP_NF_QUEUE is not set
353# CONFIG_IP_NF_IPTABLES is not set 396# CONFIG_IP_NF_IPTABLES is not set
354# CONFIG_IP_NF_ARPTABLES is not set 397# CONFIG_IP_NF_ARPTABLES is not set
@@ -356,6 +399,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
356# 399#
357# IPv6: Netfilter Configuration (EXPERIMENTAL) 400# IPv6: Netfilter Configuration (EXPERIMENTAL)
358# 401#
402CONFIG_NF_CONNTRACK_IPV6=m
359# CONFIG_IP6_NF_QUEUE is not set 403# CONFIG_IP6_NF_QUEUE is not set
360# CONFIG_IP6_NF_IPTABLES is not set 404# CONFIG_IP6_NF_IPTABLES is not set
361 405
@@ -453,6 +497,12 @@ CONFIG_BLK_DEV_INITRD=y
453# CONFIG_ATA_OVER_ETH is not set 497# CONFIG_ATA_OVER_ETH is not set
454 498
455# 499#
500# Misc devices
501#
502CONFIG_SGI_IOC4=m
503# CONFIG_TIFM_CORE is not set
504
505#
456# ATA/ATAPI/MFM/RLL support 506# ATA/ATAPI/MFM/RLL support
457# 507#
458CONFIG_IDE=y 508CONFIG_IDE=y
@@ -497,6 +547,7 @@ CONFIG_BLK_DEV_CMD64X=y
497# CONFIG_BLK_DEV_JMICRON is not set 547# CONFIG_BLK_DEV_JMICRON is not set
498# CONFIG_BLK_DEV_SC1200 is not set 548# CONFIG_BLK_DEV_SC1200 is not set
499# CONFIG_BLK_DEV_PIIX is not set 549# CONFIG_BLK_DEV_PIIX is not set
550CONFIG_BLK_DEV_IT8213=m
500# CONFIG_BLK_DEV_IT821X is not set 551# CONFIG_BLK_DEV_IT821X is not set
501# CONFIG_BLK_DEV_NS87415 is not set 552# CONFIG_BLK_DEV_NS87415 is not set
502# CONFIG_BLK_DEV_PDC202XX_OLD is not set 553# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -506,6 +557,7 @@ CONFIG_BLK_DEV_CMD64X=y
506# CONFIG_BLK_DEV_SLC90E66 is not set 557# CONFIG_BLK_DEV_SLC90E66 is not set
507# CONFIG_BLK_DEV_TRM290 is not set 558# CONFIG_BLK_DEV_TRM290 is not set
508# CONFIG_BLK_DEV_VIA82CXXX is not set 559# CONFIG_BLK_DEV_VIA82CXXX is not set
560CONFIG_BLK_DEV_TC86C001=m
509# CONFIG_IDE_ARM is not set 561# CONFIG_IDE_ARM is not set
510CONFIG_BLK_DEV_IDEDMA=y 562CONFIG_BLK_DEV_IDEDMA=y
511# CONFIG_IDEDMA_IVB is not set 563# CONFIG_IDEDMA_IVB is not set
@@ -517,6 +569,7 @@ CONFIG_IDEDMA_AUTO=y
517# 569#
518# CONFIG_RAID_ATTRS is not set 570# CONFIG_RAID_ATTRS is not set
519CONFIG_SCSI=y 571CONFIG_SCSI=y
572CONFIG_SCSI_TGT=m
520CONFIG_SCSI_NETLINK=y 573CONFIG_SCSI_NETLINK=y
521CONFIG_SCSI_PROC_FS=y 574CONFIG_SCSI_PROC_FS=y
522 575
@@ -536,6 +589,7 @@ CONFIG_BLK_DEV_SD=y
536# CONFIG_SCSI_MULTI_LUN is not set 589# CONFIG_SCSI_MULTI_LUN is not set
537# CONFIG_SCSI_CONSTANTS is not set 590# CONFIG_SCSI_CONSTANTS is not set
538# CONFIG_SCSI_LOGGING is not set 591# CONFIG_SCSI_LOGGING is not set
592CONFIG_SCSI_SCAN_ASYNC=y
539 593
540# 594#
541# SCSI Transports 595# SCSI Transports
@@ -584,6 +638,7 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
584# CONFIG_SCSI_DC390T is not set 638# CONFIG_SCSI_DC390T is not set
585# CONFIG_SCSI_NSP32 is not set 639# CONFIG_SCSI_NSP32 is not set
586# CONFIG_SCSI_DEBUG is not set 640# CONFIG_SCSI_DEBUG is not set
641# CONFIG_SCSI_SRP is not set
587 642
588# 643#
589# Serial ATA (prod) and Parallel ATA (experimental) drivers 644# Serial ATA (prod) and Parallel ATA (experimental) drivers
@@ -671,7 +726,7 @@ CONFIG_8139TOO=y
671# CONFIG_SUNDANCE is not set 726# CONFIG_SUNDANCE is not set
672# CONFIG_TLAN is not set 727# CONFIG_TLAN is not set
673# CONFIG_VIA_RHINE is not set 728# CONFIG_VIA_RHINE is not set
674# CONFIG_LAN_SAA9730 is not set 729# CONFIG_SC92031 is not set
675 730
676# 731#
677# Ethernet (1000 Mbit) 732# Ethernet (1000 Mbit)
@@ -691,14 +746,17 @@ CONFIG_8139TOO=y
691# CONFIG_TIGON3 is not set 746# CONFIG_TIGON3 is not set
692# CONFIG_BNX2 is not set 747# CONFIG_BNX2 is not set
693# CONFIG_QLA3XXX is not set 748# CONFIG_QLA3XXX is not set
749# CONFIG_ATL1 is not set
694 750
695# 751#
696# Ethernet (10000 Mbit) 752# Ethernet (10000 Mbit)
697# 753#
698# CONFIG_CHELSIO_T1 is not set 754# CONFIG_CHELSIO_T1 is not set
755CONFIG_CHELSIO_T3=m
699# CONFIG_IXGB is not set 756# CONFIG_IXGB is not set
700# CONFIG_S2IO is not set 757# CONFIG_S2IO is not set
701# CONFIG_MYRI10GE is not set 758# CONFIG_MYRI10GE is not set
759CONFIG_NETXEN_NIC=m
702 760
703# 761#
704# Token Ring devices 762# Token Ring devices
@@ -804,6 +862,7 @@ CONFIG_SERIAL_NONSTANDARD=y
804# CONFIG_DIGIEPCA is not set 862# CONFIG_DIGIEPCA is not set
805# CONFIG_MOXA_INTELLIO is not set 863# CONFIG_MOXA_INTELLIO is not set
806# CONFIG_MOXA_SMARTIO is not set 864# CONFIG_MOXA_SMARTIO is not set
865CONFIG_MOXA_SMARTIO_NEW=m
807# CONFIG_ISI is not set 866# CONFIG_ISI is not set
808# CONFIG_SYNCLINKMP is not set 867# CONFIG_SYNCLINKMP is not set
809# CONFIG_SYNCLINK_GT is not set 868# CONFIG_SYNCLINK_GT is not set
@@ -822,7 +881,10 @@ CONFIG_SERIAL_NONSTANDARD=y
822# 881#
823# Non-8250 serial port support 882# Non-8250 serial port support
824# 883#
825# CONFIG_SERIAL_IP3106 is not set 884CONFIG_SERIAL_PNX8XXX=y
885CONFIG_SERIAL_PNX8XXX_CONSOLE=y
886CONFIG_SERIAL_CORE=y
887CONFIG_SERIAL_CORE_CONSOLE=y
826# CONFIG_SERIAL_JSM is not set 888# CONFIG_SERIAL_JSM is not set
827CONFIG_UNIX98_PTYS=y 889CONFIG_UNIX98_PTYS=y
828CONFIG_LEGACY_PTYS=y 890CONFIG_LEGACY_PTYS=y
@@ -843,10 +905,6 @@ CONFIG_HW_RANDOM=y
843# CONFIG_DTLK is not set 905# CONFIG_DTLK is not set
844# CONFIG_R3964 is not set 906# CONFIG_R3964 is not set
845# CONFIG_APPLICOM is not set 907# CONFIG_APPLICOM is not set
846
847#
848# Ftape, the floppy tape device driver
849#
850# CONFIG_DRM is not set 908# CONFIG_DRM is not set
851# CONFIG_RAW_DRIVER is not set 909# CONFIG_RAW_DRIVER is not set
852 910
@@ -854,7 +912,6 @@ CONFIG_HW_RANDOM=y
854# TPM devices 912# TPM devices
855# 913#
856# CONFIG_TCG_TPM is not set 914# CONFIG_TCG_TPM is not set
857# CONFIG_TELCLOCK is not set
858 915
859# 916#
860# I2C support 917# I2C support
@@ -883,6 +940,7 @@ CONFIG_I2C_ALGOBIT=m
883# CONFIG_I2C_NFORCE2 is not set 940# CONFIG_I2C_NFORCE2 is not set
884# CONFIG_I2C_OCORES is not set 941# CONFIG_I2C_OCORES is not set
885# CONFIG_I2C_PARPORT_LIGHT is not set 942# CONFIG_I2C_PARPORT_LIGHT is not set
943# CONFIG_I2C_PASEMI is not set
886# CONFIG_I2C_PROSAVAGE is not set 944# CONFIG_I2C_PROSAVAGE is not set
887# CONFIG_I2C_SAVAGE4 is not set 945# CONFIG_I2C_SAVAGE4 is not set
888# CONFIG_I2C_SIS5595 is not set 946# CONFIG_I2C_SIS5595 is not set
@@ -918,6 +976,7 @@ CONFIG_I2C_ALGOBIT=m
918# 976#
919# Dallas's 1-wire bus 977# Dallas's 1-wire bus
920# 978#
979# CONFIG_W1 is not set
921 980
922# 981#
923# Hardware Monitoring support 982# Hardware Monitoring support
@@ -951,6 +1010,7 @@ CONFIG_HWMON=y
951# CONFIG_SENSORS_LM92 is not set 1010# CONFIG_SENSORS_LM92 is not set
952# CONFIG_SENSORS_MAX1619 is not set 1011# CONFIG_SENSORS_MAX1619 is not set
953# CONFIG_SENSORS_PC87360 is not set 1012# CONFIG_SENSORS_PC87360 is not set
1013# CONFIG_SENSORS_PC87427 is not set
954# CONFIG_SENSORS_SIS5595 is not set 1014# CONFIG_SENSORS_SIS5595 is not set
955# CONFIG_SENSORS_SMSC47M1 is not set 1015# CONFIG_SENSORS_SMSC47M1 is not set
956# CONFIG_SENSORS_SMSC47M192 is not set 1016# CONFIG_SENSORS_SMSC47M192 is not set
@@ -961,17 +1021,13 @@ CONFIG_HWMON=y
961# CONFIG_SENSORS_W83781D is not set 1021# CONFIG_SENSORS_W83781D is not set
962# CONFIG_SENSORS_W83791D is not set 1022# CONFIG_SENSORS_W83791D is not set
963# CONFIG_SENSORS_W83792D is not set 1023# CONFIG_SENSORS_W83792D is not set
1024# CONFIG_SENSORS_W83793 is not set
964# CONFIG_SENSORS_W83L785TS is not set 1025# CONFIG_SENSORS_W83L785TS is not set
965# CONFIG_SENSORS_W83627HF is not set 1026# CONFIG_SENSORS_W83627HF is not set
966# CONFIG_SENSORS_W83627EHF is not set 1027# CONFIG_SENSORS_W83627EHF is not set
967# CONFIG_HWMON_DEBUG_CHIP is not set 1028# CONFIG_HWMON_DEBUG_CHIP is not set
968 1029
969# 1030#
970# Misc devices
971#
972# CONFIG_TIFM_CORE is not set
973
974#
975# Multimedia devices 1031# Multimedia devices
976# 1032#
977# CONFIG_VIDEO_DEV is not set 1033# CONFIG_VIDEO_DEV is not set
@@ -991,6 +1047,7 @@ CONFIG_FB=y
991# CONFIG_FB_CFB_FILLRECT is not set 1047# CONFIG_FB_CFB_FILLRECT is not set
992# CONFIG_FB_CFB_COPYAREA is not set 1048# CONFIG_FB_CFB_COPYAREA is not set
993# CONFIG_FB_CFB_IMAGEBLIT is not set 1049# CONFIG_FB_CFB_IMAGEBLIT is not set
1050# CONFIG_FB_SVGALIB is not set
994# CONFIG_FB_MACMODES is not set 1051# CONFIG_FB_MACMODES is not set
995# CONFIG_FB_BACKLIGHT is not set 1052# CONFIG_FB_BACKLIGHT is not set
996# CONFIG_FB_MODE_HELPERS is not set 1053# CONFIG_FB_MODE_HELPERS is not set
@@ -1007,6 +1064,7 @@ CONFIG_FB=y
1007# CONFIG_FB_RADEON is not set 1064# CONFIG_FB_RADEON is not set
1008# CONFIG_FB_ATY128 is not set 1065# CONFIG_FB_ATY128 is not set
1009# CONFIG_FB_ATY is not set 1066# CONFIG_FB_ATY is not set
1067# CONFIG_FB_S3 is not set
1010# CONFIG_FB_SAVAGE is not set 1068# CONFIG_FB_SAVAGE is not set
1011# CONFIG_FB_SIS is not set 1069# CONFIG_FB_SIS is not set
1012# CONFIG_FB_NEOMAGIC is not set 1070# CONFIG_FB_NEOMAGIC is not set
@@ -1036,6 +1094,12 @@ CONFIG_DUMMY_CONSOLE=y
1036# CONFIG_SOUND is not set 1094# CONFIG_SOUND is not set
1037 1095
1038# 1096#
1097# HID Devices
1098#
1099CONFIG_HID=y
1100# CONFIG_HID_DEBUG is not set
1101
1102#
1039# USB support 1103# USB support
1040# 1104#
1041CONFIG_USB_ARCH_HAS_HCD=y 1105CONFIG_USB_ARCH_HAS_HCD=y
@@ -1048,8 +1112,8 @@ CONFIG_USB=y
1048# Miscellaneous USB options 1112# Miscellaneous USB options
1049# 1113#
1050CONFIG_USB_DEVICEFS=y 1114CONFIG_USB_DEVICEFS=y
1051# CONFIG_USB_BANDWIDTH is not set
1052# CONFIG_USB_DYNAMIC_MINORS is not set 1115# CONFIG_USB_DYNAMIC_MINORS is not set
1116# CONFIG_USB_SUSPEND is not set
1053# CONFIG_USB_OTG is not set 1117# CONFIG_USB_OTG is not set
1054 1118
1055# 1119#
@@ -1085,7 +1149,6 @@ CONFIG_USB_STORAGE=y
1085# CONFIG_USB_STORAGE_SDDR55 is not set 1149# CONFIG_USB_STORAGE_SDDR55 is not set
1086# CONFIG_USB_STORAGE_JUMPSHOT is not set 1150# CONFIG_USB_STORAGE_JUMPSHOT is not set
1087# CONFIG_USB_STORAGE_ALAUDA is not set 1151# CONFIG_USB_STORAGE_ALAUDA is not set
1088# CONFIG_USB_STORAGE_ONETOUCH is not set
1089# CONFIG_USB_STORAGE_KARMA is not set 1152# CONFIG_USB_STORAGE_KARMA is not set
1090# CONFIG_USB_LIBUSUAL is not set 1153# CONFIG_USB_LIBUSUAL is not set
1091 1154
@@ -1093,7 +1156,6 @@ CONFIG_USB_STORAGE=y
1093# USB Input Devices 1156# USB Input Devices
1094# 1157#
1095CONFIG_USB_HID=y 1158CONFIG_USB_HID=y
1096CONFIG_USB_HIDINPUT=y
1097# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1159# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1098# CONFIG_HID_FF is not set 1160# CONFIG_HID_FF is not set
1099CONFIG_USB_HIDDEV=y 1161CONFIG_USB_HIDDEV=y
@@ -1109,7 +1171,7 @@ CONFIG_USB_HIDDEV=y
1109# CONFIG_USB_ATI_REMOTE2 is not set 1171# CONFIG_USB_ATI_REMOTE2 is not set
1110# CONFIG_USB_KEYSPAN_REMOTE is not set 1172# CONFIG_USB_KEYSPAN_REMOTE is not set
1111# CONFIG_USB_APPLETOUCH is not set 1173# CONFIG_USB_APPLETOUCH is not set
1112# CONFIG_USB_TRANCEVIBRATOR is not set 1174# CONFIG_USB_GTCO is not set
1113 1175
1114# 1176#
1115# USB Imaging devices 1177# USB Imaging devices
@@ -1124,6 +1186,7 @@ CONFIG_USB_HIDDEV=y
1124# CONFIG_USB_KAWETH is not set 1186# CONFIG_USB_KAWETH is not set
1125# CONFIG_USB_PEGASUS is not set 1187# CONFIG_USB_PEGASUS is not set
1126# CONFIG_USB_RTL8150 is not set 1188# CONFIG_USB_RTL8150 is not set
1189# CONFIG_USB_USBNET_MII is not set
1127# CONFIG_USB_USBNET is not set 1190# CONFIG_USB_USBNET is not set
1128CONFIG_USB_MON=y 1191CONFIG_USB_MON=y
1129 1192
@@ -1154,6 +1217,7 @@ CONFIG_USB_MON=y
1154# CONFIG_USB_FTDI_ELAN is not set 1217# CONFIG_USB_FTDI_ELAN is not set
1155# CONFIG_USB_APPLEDISPLAY is not set 1218# CONFIG_USB_APPLEDISPLAY is not set
1156# CONFIG_USB_LD is not set 1219# CONFIG_USB_LD is not set
1220# CONFIG_USB_TRANCEVIBRATOR is not set
1157# CONFIG_USB_TEST is not set 1221# CONFIG_USB_TEST is not set
1158 1222
1159# 1223#
@@ -1211,6 +1275,14 @@ CONFIG_USB_MON=y
1211# 1275#
1212 1276
1213# 1277#
1278# Auxiliary Display support
1279#
1280
1281#
1282# Virtualization
1283#
1284
1285#
1214# File systems 1286# File systems
1215# 1287#
1216CONFIG_EXT2_FS=y 1288CONFIG_EXT2_FS=y
@@ -1271,7 +1343,7 @@ CONFIG_TMPFS=y
1271# CONFIG_TMPFS_POSIX_ACL is not set 1343# CONFIG_TMPFS_POSIX_ACL is not set
1272# CONFIG_HUGETLB_PAGE is not set 1344# CONFIG_HUGETLB_PAGE is not set
1273CONFIG_RAMFS=y 1345CONFIG_RAMFS=y
1274# CONFIG_CONFIGFS_FS is not set 1346CONFIG_CONFIGFS_FS=m
1275 1347
1276# 1348#
1277# Miscellaneous filesystems 1349# Miscellaneous filesystems
@@ -1368,6 +1440,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1368# CONFIG_NLS_UTF8 is not set 1440# CONFIG_NLS_UTF8 is not set
1369 1441
1370# 1442#
1443# Distributed Lock Manager
1444#
1445CONFIG_DLM=m
1446CONFIG_DLM_TCP=y
1447# CONFIG_DLM_SCTP is not set
1448# CONFIG_DLM_DEBUG is not set
1449
1450#
1371# Profiling support 1451# Profiling support
1372# 1452#
1373# CONFIG_PROFILING is not set 1453# CONFIG_PROFILING is not set
@@ -1380,10 +1460,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1380CONFIG_ENABLE_MUST_CHECK=y 1460CONFIG_ENABLE_MUST_CHECK=y
1381# CONFIG_MAGIC_SYSRQ is not set 1461# CONFIG_MAGIC_SYSRQ is not set
1382# CONFIG_UNUSED_SYMBOLS is not set 1462# CONFIG_UNUSED_SYMBOLS is not set
1383# CONFIG_DEBUG_KERNEL is not set
1384CONFIG_LOG_BUF_SHIFT=14
1385# CONFIG_DEBUG_FS is not set 1463# CONFIG_DEBUG_FS is not set
1386# CONFIG_HEADERS_CHECK is not set 1464# CONFIG_HEADERS_CHECK is not set
1465# CONFIG_DEBUG_KERNEL is not set
1466CONFIG_LOG_BUF_SHIFT=14
1387CONFIG_CROSSCOMPILE=y 1467CONFIG_CROSSCOMPILE=y
1388CONFIG_CMDLINE="" 1468CONFIG_CMDLINE=""
1389 1469
@@ -1397,21 +1477,27 @@ CONFIG_CMDLINE=""
1397# Cryptographic options 1477# Cryptographic options
1398# 1478#
1399CONFIG_CRYPTO=y 1479CONFIG_CRYPTO=y
1400CONFIG_CRYPTO_ALGAPI=m 1480CONFIG_CRYPTO_ALGAPI=y
1401CONFIG_CRYPTO_BLKCIPHER=m 1481CONFIG_CRYPTO_BLKCIPHER=m
1482CONFIG_CRYPTO_HASH=m
1402CONFIG_CRYPTO_MANAGER=m 1483CONFIG_CRYPTO_MANAGER=m
1403# CONFIG_CRYPTO_HMAC is not set 1484# CONFIG_CRYPTO_HMAC is not set
1485CONFIG_CRYPTO_XCBC=m
1404# CONFIG_CRYPTO_NULL is not set 1486# CONFIG_CRYPTO_NULL is not set
1405# CONFIG_CRYPTO_MD4 is not set 1487# CONFIG_CRYPTO_MD4 is not set
1406CONFIG_CRYPTO_MD5=m 1488CONFIG_CRYPTO_MD5=y
1407CONFIG_CRYPTO_SHA1=m 1489CONFIG_CRYPTO_SHA1=m
1408# CONFIG_CRYPTO_SHA256 is not set 1490# CONFIG_CRYPTO_SHA256 is not set
1409# CONFIG_CRYPTO_SHA512 is not set 1491# CONFIG_CRYPTO_SHA512 is not set
1410# CONFIG_CRYPTO_WP512 is not set 1492# CONFIG_CRYPTO_WP512 is not set
1411# CONFIG_CRYPTO_TGR192 is not set 1493# CONFIG_CRYPTO_TGR192 is not set
1494CONFIG_CRYPTO_GF128MUL=m
1412CONFIG_CRYPTO_ECB=m 1495CONFIG_CRYPTO_ECB=m
1413CONFIG_CRYPTO_CBC=m 1496CONFIG_CRYPTO_CBC=m
1497CONFIG_CRYPTO_PCBC=m
1498CONFIG_CRYPTO_LRW=m
1414# CONFIG_CRYPTO_DES is not set 1499# CONFIG_CRYPTO_DES is not set
1500CONFIG_CRYPTO_FCRYPT=m
1415# CONFIG_CRYPTO_BLOWFISH is not set 1501# CONFIG_CRYPTO_BLOWFISH is not set
1416# CONFIG_CRYPTO_TWOFISH is not set 1502# CONFIG_CRYPTO_TWOFISH is not set
1417# CONFIG_CRYPTO_SERPENT is not set 1503# CONFIG_CRYPTO_SERPENT is not set
@@ -1425,6 +1511,7 @@ CONFIG_CRYPTO_ARC4=m
1425# CONFIG_CRYPTO_DEFLATE is not set 1511# CONFIG_CRYPTO_DEFLATE is not set
1426# CONFIG_CRYPTO_MICHAEL_MIC is not set 1512# CONFIG_CRYPTO_MICHAEL_MIC is not set
1427CONFIG_CRYPTO_CRC32C=m 1513CONFIG_CRYPTO_CRC32C=m
1514CONFIG_CRYPTO_CAMELLIA=m
1428# CONFIG_CRYPTO_TEST is not set 1515# CONFIG_CRYPTO_TEST is not set
1429 1516
1430# 1517#
@@ -1434,6 +1521,7 @@ CONFIG_CRYPTO_CRC32C=m
1434# 1521#
1435# Library routines 1522# Library routines
1436# 1523#
1524CONFIG_BITREVERSE=y
1437CONFIG_CRC_CCITT=m 1525CONFIG_CRC_CCITT=m
1438# CONFIG_CRC16 is not set 1526# CONFIG_CRC16 is not set
1439CONFIG_CRC32=y 1527CONFIG_CRC32=y
@@ -1445,3 +1533,5 @@ CONFIG_TEXTSEARCH_KMP=m
1445CONFIG_TEXTSEARCH_BM=m 1533CONFIG_TEXTSEARCH_BM=m
1446CONFIG_TEXTSEARCH_FSM=m 1534CONFIG_TEXTSEARCH_FSM=m
1447CONFIG_PLIST=y 1535CONFIG_PLIST=y
1536CONFIG_HAS_IOMEM=y
1537CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index aa61f0f030a5..c18c5e71d8ac 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:18 2006 4# Sun Feb 18 21:28:06 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,16 +64,21 @@ CONFIG_QEMU=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
71CONFIG_DMA_COHERENT=y 75CONFIG_DMA_COHERENT=y
72CONFIG_GENERIC_ISA_DMA=y 76CONFIG_GENERIC_ISA_DMA=y
73CONFIG_I8259=y 77CONFIG_I8259=y
74CONFIG_CPU_BIG_ENDIAN=y 78CONFIG_CPU_BIG_ENDIAN=y
75# CONFIG_CPU_LITTLE_ENDIAN is not set 79# CONFIG_CPU_LITTLE_ENDIAN is not set
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 80CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
81CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
77CONFIG_SWAP_IO_SPACE=y 82CONFIG_SWAP_IO_SPACE=y
78CONFIG_MIPS_L1_CACHE_SHIFT=5 83CONFIG_MIPS_L1_CACHE_SHIFT=5
79CONFIG_HAVE_STD_PC_SERIAL_PORT=y 84CONFIG_HAVE_STD_PC_SERIAL_PORT=y
@@ -117,8 +122,8 @@ CONFIG_PAGE_SIZE_4KB=y
117# CONFIG_PAGE_SIZE_64KB is not set 122# CONFIG_PAGE_SIZE_64KB is not set
118CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 124CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_MT_SMP is not set 125# CONFIG_MIPS_MT_SMP is not set
126# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set 127# CONFIG_MIPS_VPE_LOADER is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 128# CONFIG_64BIT_PHYS_ADDR is not set
124CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
@@ -130,9 +135,10 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
130CONFIG_ARCH_SPARSEMEM_ENABLE=y 135CONFIG_ARCH_SPARSEMEM_ENABLE=y
131CONFIG_FLATMEM=y 136CONFIG_FLATMEM=y
132CONFIG_FLAT_NODE_MEM_MAP=y 137CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 138CONFIG_SPARSEMEM_STATIC=y
134CONFIG_SPLIT_PTLOCK_CPUS=4 139CONFIG_SPLIT_PTLOCK_CPUS=4
135# CONFIG_RESOURCES_64BIT is not set 140# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1
136# CONFIG_HZ_48 is not set 142# CONFIG_HZ_48 is not set
137CONFIG_HZ_100=y 143CONFIG_HZ_100=y
138# CONFIG_HZ_128 is not set 144# CONFIG_HZ_128 is not set
@@ -164,12 +170,15 @@ CONFIG_LOCALVERSION_AUTO=y
164# CONFIG_SWAP is not set 170# CONFIG_SWAP is not set
165# CONFIG_SYSVIPC is not set 171# CONFIG_SYSVIPC is not set
166# CONFIG_BSD_PROCESS_ACCT is not set 172# CONFIG_BSD_PROCESS_ACCT is not set
167CONFIG_SYSCTL=y 173# CONFIG_TASKSTATS is not set
174# CONFIG_UTS_NS is not set
168# CONFIG_AUDIT is not set 175# CONFIG_AUDIT is not set
169# CONFIG_IKCONFIG is not set 176# CONFIG_IKCONFIG is not set
177CONFIG_SYSFS_DEPRECATED=y
170CONFIG_RELAY=y 178CONFIG_RELAY=y
171CONFIG_INITRAMFS_SOURCE="" 179CONFIG_SYSCTL=y
172CONFIG_EMBEDDED=y 180CONFIG_EMBEDDED=y
181CONFIG_SYSCTL_SYSCALL=y
173CONFIG_KALLSYMS=y 182CONFIG_KALLSYMS=y
174# CONFIG_KALLSYMS_EXTRA_PASS is not set 183# CONFIG_KALLSYMS_EXTRA_PASS is not set
175# CONFIG_HOTPLUG is not set 184# CONFIG_HOTPLUG is not set
@@ -194,6 +203,7 @@ CONFIG_BASE_SMALL=1
194# 203#
195# Block layer 204# Block layer
196# 205#
206CONFIG_BLOCK=y
197# CONFIG_LBD is not set 207# CONFIG_LBD is not set
198# CONFIG_BLK_DEV_IO_TRACE is not set 208# CONFIG_BLK_DEV_IO_TRACE is not set
199# CONFIG_LSF is not set 209# CONFIG_LSF is not set
@@ -221,7 +231,6 @@ CONFIG_I8253=y
221# 231#
222# PCCARD (PCMCIA/CardBus) support 232# PCCARD (PCMCIA/CardBus) support
223# 233#
224# CONFIG_PCCARD is not set
225 234
226# 235#
227# PCI Hotplug Support 236# PCI Hotplug Support
@@ -235,6 +244,14 @@ CONFIG_BINFMT_ELF=y
235CONFIG_TRAD_SIGNALS=y 244CONFIG_TRAD_SIGNALS=y
236 245
237# 246#
247# Power management options
248#
249CONFIG_PM=y
250# CONFIG_PM_LEGACY is not set
251# CONFIG_PM_DEBUG is not set
252# CONFIG_PM_SYSFS_DEPRECATED is not set
253
254#
238# Networking 255# Networking
239# 256#
240CONFIG_NET=y 257CONFIG_NET=y
@@ -268,10 +285,12 @@ CONFIG_IP_PNP_BOOTP=y
268# CONFIG_INET_TUNNEL is not set 285# CONFIG_INET_TUNNEL is not set
269CONFIG_INET_XFRM_MODE_TRANSPORT=y 286CONFIG_INET_XFRM_MODE_TRANSPORT=y
270CONFIG_INET_XFRM_MODE_TUNNEL=y 287CONFIG_INET_XFRM_MODE_TUNNEL=y
288CONFIG_INET_XFRM_MODE_BEET=y
271CONFIG_INET_DIAG=y 289CONFIG_INET_DIAG=y
272CONFIG_INET_TCP_DIAG=y 290CONFIG_INET_TCP_DIAG=y
273# CONFIG_TCP_CONG_ADVANCED is not set 291# CONFIG_TCP_CONG_ADVANCED is not set
274CONFIG_TCP_CONG_BIC=y 292CONFIG_TCP_CONG_CUBIC=y
293CONFIG_DEFAULT_TCP_CONG="cubic"
275# CONFIG_IPV6 is not set 294# CONFIG_IPV6 is not set
276# CONFIG_INET6_XFRM_TUNNEL is not set 295# CONFIG_INET6_XFRM_TUNNEL is not set
277# CONFIG_INET6_TUNNEL is not set 296# CONFIG_INET6_TUNNEL is not set
@@ -307,7 +326,6 @@ CONFIG_NETWORK_SECMARK=y
307# 326#
308CONFIG_STANDALONE=y 327CONFIG_STANDALONE=y
309# CONFIG_PREVENT_FIRMWARE_BUILD is not set 328# CONFIG_PREVENT_FIRMWARE_BUILD is not set
310# CONFIG_FW_LOADER is not set
311# CONFIG_SYS_HYPERVISOR is not set 329# CONFIG_SYS_HYPERVISOR is not set
312 330
313# 331#
@@ -343,6 +361,10 @@ CONFIG_PROC_EVENTS=y
343# CONFIG_ATA_OVER_ETH is not set 361# CONFIG_ATA_OVER_ETH is not set
344 362
345# 363#
364# Misc devices
365#
366
367#
346# ATA/ATAPI/MFM/RLL support 368# ATA/ATAPI/MFM/RLL support
347# 369#
348# CONFIG_IDE is not set 370# CONFIG_IDE is not set
@@ -352,6 +374,12 @@ CONFIG_PROC_EVENTS=y
352# 374#
353# CONFIG_RAID_ATTRS is not set 375# CONFIG_RAID_ATTRS is not set
354# CONFIG_SCSI is not set 376# CONFIG_SCSI is not set
377# CONFIG_SCSI_NETLINK is not set
378
379#
380# Serial ATA (prod) and Parallel ATA (experimental) drivers
381#
382# CONFIG_ATA is not set
355 383
356# 384#
357# Old CD-ROM drivers (not SCSI, not IDE) 385# Old CD-ROM drivers (not SCSI, not IDE)
@@ -459,6 +487,7 @@ CONFIG_NE2000=y
459# Input device support 487# Input device support
460# 488#
461CONFIG_INPUT=y 489CONFIG_INPUT=y
490# CONFIG_INPUT_FF_MEMLESS is not set
462 491
463# 492#
464# Userland interfaces 493# Userland interfaces
@@ -525,10 +554,6 @@ CONFIG_LEGACY_PTY_COUNT=256
525# CONFIG_GEN_RTC is not set 554# CONFIG_GEN_RTC is not set
526# CONFIG_DTLK is not set 555# CONFIG_DTLK is not set
527# CONFIG_R3964 is not set 556# CONFIG_R3964 is not set
528
529#
530# Ftape, the floppy tape device driver
531#
532# CONFIG_RAW_DRIVER is not set 557# CONFIG_RAW_DRIVER is not set
533 558
534# 559#
@@ -558,14 +583,9 @@ CONFIG_LEGACY_PTY_COUNT=256
558# CONFIG_HWMON_VID is not set 583# CONFIG_HWMON_VID is not set
559 584
560# 585#
561# Misc devices
562#
563
564#
565# Multimedia devices 586# Multimedia devices
566# 587#
567# CONFIG_VIDEO_DEV is not set 588# CONFIG_VIDEO_DEV is not set
568CONFIG_VIDEO_V4L2=y
569 589
570# 590#
571# Digital Video Broadcasting Devices 591# Digital Video Broadcasting Devices
@@ -585,6 +605,7 @@ CONFIG_VGA_CONSOLE=y
585# CONFIG_VGACON_SOFT_SCROLLBACK is not set 605# CONFIG_VGACON_SOFT_SCROLLBACK is not set
586# CONFIG_MDA_CONSOLE is not set 606# CONFIG_MDA_CONSOLE is not set
587CONFIG_DUMMY_CONSOLE=y 607CONFIG_DUMMY_CONSOLE=y
608# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
588 609
589# 610#
590# Sound 611# Sound
@@ -592,6 +613,12 @@ CONFIG_DUMMY_CONSOLE=y
592# CONFIG_SOUND is not set 613# CONFIG_SOUND is not set
593 614
594# 615#
616# HID Devices
617#
618CONFIG_HID=y
619# CONFIG_HID_DEBUG is not set
620
621#
595# USB support 622# USB support
596# 623#
597# CONFIG_USB_ARCH_HAS_HCD is not set 624# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -651,14 +678,23 @@ CONFIG_DUMMY_CONSOLE=y
651# 678#
652 679
653# 680#
681# Auxiliary Display support
682#
683
684#
685# Virtualization
686#
687
688#
654# File systems 689# File systems
655# 690#
656# CONFIG_EXT2_FS is not set 691# CONFIG_EXT2_FS is not set
657# CONFIG_EXT3_FS is not set 692# CONFIG_EXT3_FS is not set
658# CONFIG_REISERFS_FS is not set 693# CONFIG_REISERFS_FS is not set
659# CONFIG_JFS_FS is not set 694# CONFIG_JFS_FS is not set
660# CONFIG_FS_POSIX_ACL is not set 695CONFIG_FS_POSIX_ACL=y
661# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_OCFS2_FS is not set
662# CONFIG_MINIX_FS is not set 698# CONFIG_MINIX_FS is not set
663# CONFIG_ROMFS_FS is not set 699# CONFIG_ROMFS_FS is not set
664CONFIG_INOTIFY=y 700CONFIG_INOTIFY=y
@@ -668,6 +704,7 @@ CONFIG_INOTIFY_USER=y
668# CONFIG_AUTOFS_FS is not set 704# CONFIG_AUTOFS_FS is not set
669# CONFIG_AUTOFS4_FS is not set 705# CONFIG_AUTOFS4_FS is not set
670CONFIG_FUSE_FS=y 706CONFIG_FUSE_FS=y
707CONFIG_GENERIC_ACL=y
671 708
672# 709#
673# CD-ROM/DVD Filesystems 710# CD-ROM/DVD Filesystems
@@ -687,8 +724,10 @@ CONFIG_FUSE_FS=y
687# 724#
688CONFIG_PROC_FS=y 725CONFIG_PROC_FS=y
689CONFIG_PROC_KCORE=y 726CONFIG_PROC_KCORE=y
727CONFIG_PROC_SYSCTL=y
690CONFIG_SYSFS=y 728CONFIG_SYSFS=y
691CONFIG_TMPFS=y 729CONFIG_TMPFS=y
730CONFIG_TMPFS_POSIX_ACL=y
692# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
693CONFIG_RAMFS=y 732CONFIG_RAMFS=y
694 733
@@ -709,6 +748,7 @@ CONFIG_RAMFS=y
709CONFIG_NFS_FS=y 748CONFIG_NFS_FS=y
710CONFIG_NFS_V3=y 749CONFIG_NFS_V3=y
711# CONFIG_NFS_V3_ACL is not set 750# CONFIG_NFS_V3_ACL is not set
751CONFIG_NFS_DIRECTIO=y
712# CONFIG_NFSD is not set 752# CONFIG_NFSD is not set
713CONFIG_ROOT_NFS=y 753CONFIG_ROOT_NFS=y
714CONFIG_LOCKD=y 754CONFIG_LOCKD=y
@@ -717,7 +757,6 @@ CONFIG_NFS_COMMON=y
717CONFIG_SUNRPC=y 757CONFIG_SUNRPC=y
718# CONFIG_SMB_FS is not set 758# CONFIG_SMB_FS is not set
719# CONFIG_CIFS is not set 759# CONFIG_CIFS is not set
720# CONFIG_CIFS_DEBUG2 is not set
721# CONFIG_NCP_FS is not set 760# CONFIG_NCP_FS is not set
722# CONFIG_CODA_FS is not set 761# CONFIG_CODA_FS is not set
723 762
@@ -737,12 +776,13 @@ CONFIG_MSDOS_PARTITION=y
737# 776#
738CONFIG_TRACE_IRQFLAGS_SUPPORT=y 777CONFIG_TRACE_IRQFLAGS_SUPPORT=y
739# CONFIG_PRINTK_TIME is not set 778# CONFIG_PRINTK_TIME is not set
779CONFIG_ENABLE_MUST_CHECK=y
740# CONFIG_MAGIC_SYSRQ is not set 780# CONFIG_MAGIC_SYSRQ is not set
741# CONFIG_UNUSED_SYMBOLS is not set 781# CONFIG_UNUSED_SYMBOLS is not set
782# CONFIG_DEBUG_FS is not set
783# CONFIG_HEADERS_CHECK is not set
742# CONFIG_DEBUG_KERNEL is not set 784# CONFIG_DEBUG_KERNEL is not set
743CONFIG_LOG_BUF_SHIFT=14 785CONFIG_LOG_BUF_SHIFT=14
744# CONFIG_DEBUG_FS is not set
745# CONFIG_UNWIND_INFO is not set
746CONFIG_CROSSCOMPILE=y 786CONFIG_CROSSCOMPILE=y
747CONFIG_CMDLINE="" 787CONFIG_CMDLINE=""
748 788
@@ -758,13 +798,12 @@ CONFIG_CMDLINE=""
758# CONFIG_CRYPTO is not set 798# CONFIG_CRYPTO is not set
759 799
760# 800#
761# Hardware crypto devices
762#
763
764#
765# Library routines 801# Library routines
766# 802#
803CONFIG_BITREVERSE=y
767# CONFIG_CRC_CCITT is not set 804# CONFIG_CRC_CCITT is not set
768# CONFIG_CRC16 is not set 805# CONFIG_CRC16 is not set
769CONFIG_CRC32=y 806CONFIG_CRC32=y
770# CONFIG_LIBCRC32C is not set 807# CONFIG_LIBCRC32C is not set
808CONFIG_HAS_IOMEM=y
809CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index f9e8f41d17f2..678f23217c9a 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:19 2006 4# Sun Feb 18 21:28:07 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -71,10 +71,14 @@ CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61=y
71# CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set 71# CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND is not set
72# CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set 72# CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA is not set
73CONFIG_RWSEM_GENERIC_SPINLOCK=y 73CONFIG_RWSEM_GENERIC_SPINLOCK=y
74# CONFIG_ARCH_HAS_ILOG2_U32 is not set
75# CONFIG_ARCH_HAS_ILOG2_U64 is not set
74CONFIG_GENERIC_FIND_NEXT_BIT=y 76CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y 77CONFIG_GENERIC_HWEIGHT=y
76CONFIG_GENERIC_CALIBRATE_DELAY=y 78CONFIG_GENERIC_CALIBRATE_DELAY=y
79CONFIG_GENERIC_TIME=y
77CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
81CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
78CONFIG_DMA_NONCOHERENT=y 82CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 83CONFIG_DMA_NEED_PCI_MAP_STATE=y
80CONFIG_GENERIC_ISA_DMA=y 84CONFIG_GENERIC_ISA_DMA=y
@@ -126,8 +130,8 @@ CONFIG_PAGE_SIZE_4KB=y
126# CONFIG_PAGE_SIZE_64KB is not set 130# CONFIG_PAGE_SIZE_64KB is not set
127CONFIG_CPU_HAS_PREFETCH=y 131CONFIG_CPU_HAS_PREFETCH=y
128CONFIG_MIPS_MT_DISABLED=y 132CONFIG_MIPS_MT_DISABLED=y
129# CONFIG_MIPS_MT_SMTC is not set
130# CONFIG_MIPS_MT_SMP is not set 133# CONFIG_MIPS_MT_SMP is not set
134# CONFIG_MIPS_MT_SMTC is not set
131# CONFIG_MIPS_VPE_LOADER is not set 135# CONFIG_MIPS_VPE_LOADER is not set
132CONFIG_CPU_HAS_LLSC=y 136CONFIG_CPU_HAS_LLSC=y
133CONFIG_CPU_HAS_SYNC=y 137CONFIG_CPU_HAS_SYNC=y
@@ -143,6 +147,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143# CONFIG_SPARSEMEM_STATIC is not set 147# CONFIG_SPARSEMEM_STATIC is not set
144CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
150CONFIG_ZONE_DMA_FLAG=1
146# CONFIG_HZ_48 is not set 151# CONFIG_HZ_48 is not set
147# CONFIG_HZ_100 is not set 152# CONFIG_HZ_100 is not set
148# CONFIG_HZ_128 is not set 153# CONFIG_HZ_128 is not set
@@ -155,6 +160,7 @@ CONFIG_HZ=1000
155CONFIG_PREEMPT_NONE=y 160CONFIG_PREEMPT_NONE=y
156# CONFIG_PREEMPT_VOLUNTARY is not set 161# CONFIG_PREEMPT_VOLUNTARY is not set
157# CONFIG_PREEMPT is not set 162# CONFIG_PREEMPT is not set
163# CONFIG_KEXEC is not set
158CONFIG_LOCKDEP_SUPPORT=y 164CONFIG_LOCKDEP_SUPPORT=y
159CONFIG_STACKTRACE_SUPPORT=y 165CONFIG_STACKTRACE_SUPPORT=y
160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 166CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -173,16 +179,22 @@ CONFIG_LOCALVERSION=""
173CONFIG_LOCALVERSION_AUTO=y 179CONFIG_LOCALVERSION_AUTO=y
174CONFIG_SWAP=y 180CONFIG_SWAP=y
175CONFIG_SYSVIPC=y 181CONFIG_SYSVIPC=y
182# CONFIG_IPC_NS is not set
183CONFIG_SYSVIPC_SYSCTL=y
176# CONFIG_POSIX_MQUEUE is not set 184# CONFIG_POSIX_MQUEUE is not set
177# CONFIG_BSD_PROCESS_ACCT is not set 185# CONFIG_BSD_PROCESS_ACCT is not set
178CONFIG_SYSCTL=y 186# CONFIG_TASKSTATS is not set
187# CONFIG_UTS_NS is not set
179# CONFIG_AUDIT is not set 188# CONFIG_AUDIT is not set
180CONFIG_IKCONFIG=y 189CONFIG_IKCONFIG=y
181CONFIG_IKCONFIG_PROC=y 190CONFIG_IKCONFIG_PROC=y
191CONFIG_SYSFS_DEPRECATED=y
182CONFIG_RELAY=y 192CONFIG_RELAY=y
183CONFIG_INITRAMFS_SOURCE="" 193CONFIG_INITRAMFS_SOURCE=""
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 194# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
195CONFIG_SYSCTL=y
185CONFIG_EMBEDDED=y 196CONFIG_EMBEDDED=y
197CONFIG_SYSCTL_SYSCALL=y
186CONFIG_KALLSYMS=y 198CONFIG_KALLSYMS=y
187# CONFIG_KALLSYMS_EXTRA_PASS is not set 199# CONFIG_KALLSYMS_EXTRA_PASS is not set
188CONFIG_HOTPLUG=y 200CONFIG_HOTPLUG=y
@@ -211,6 +223,7 @@ CONFIG_KMOD=y
211# 223#
212# Block layer 224# Block layer
213# 225#
226CONFIG_BLOCK=y
214# CONFIG_LBD is not set 227# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 228# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 229# CONFIG_LSF is not set
@@ -254,6 +267,14 @@ CONFIG_BINFMT_ELF=y
254CONFIG_TRAD_SIGNALS=y 267CONFIG_TRAD_SIGNALS=y
255 268
256# 269#
270# Power management options
271#
272CONFIG_PM=y
273# CONFIG_PM_LEGACY is not set
274# CONFIG_PM_DEBUG is not set
275# CONFIG_PM_SYSFS_DEPRECATED is not set
276
277#
257# Networking 278# Networking
258# 279#
259CONFIG_NET=y 280CONFIG_NET=y
@@ -267,6 +288,8 @@ CONFIG_PACKET=y
267CONFIG_UNIX=y 288CONFIG_UNIX=y
268CONFIG_XFRM=y 289CONFIG_XFRM=y
269# CONFIG_XFRM_USER is not set 290# CONFIG_XFRM_USER is not set
291# CONFIG_XFRM_SUB_POLICY is not set
292CONFIG_XFRM_MIGRATE=y
270# CONFIG_NET_KEY is not set 293# CONFIG_NET_KEY is not set
271CONFIG_INET=y 294CONFIG_INET=y
272CONFIG_IP_MULTICAST=y 295CONFIG_IP_MULTICAST=y
@@ -285,13 +308,16 @@ CONFIG_IP_PNP_BOOTP=y
285# CONFIG_INET_ESP is not set 308# CONFIG_INET_ESP is not set
286# CONFIG_INET_IPCOMP is not set 309# CONFIG_INET_IPCOMP is not set
287# CONFIG_INET_XFRM_TUNNEL is not set 310# CONFIG_INET_XFRM_TUNNEL is not set
288# CONFIG_INET_TUNNEL is not set 311CONFIG_INET_TUNNEL=m
289CONFIG_INET_XFRM_MODE_TRANSPORT=m 312CONFIG_INET_XFRM_MODE_TRANSPORT=m
290CONFIG_INET_XFRM_MODE_TUNNEL=m 313CONFIG_INET_XFRM_MODE_TUNNEL=m
314CONFIG_INET_XFRM_MODE_BEET=m
291CONFIG_INET_DIAG=y 315CONFIG_INET_DIAG=y
292CONFIG_INET_TCP_DIAG=y 316CONFIG_INET_TCP_DIAG=y
293# CONFIG_TCP_CONG_ADVANCED is not set 317# CONFIG_TCP_CONG_ADVANCED is not set
294CONFIG_TCP_CONG_BIC=y 318CONFIG_TCP_CONG_CUBIC=y
319CONFIG_DEFAULT_TCP_CONG="cubic"
320CONFIG_TCP_MD5SIG=y
295 321
296# 322#
297# IP: Virtual Server Configuration 323# IP: Virtual Server Configuration
@@ -304,11 +330,17 @@ CONFIG_IPV6_ROUTE_INFO=y
304# CONFIG_INET6_AH is not set 330# CONFIG_INET6_AH is not set
305# CONFIG_INET6_ESP is not set 331# CONFIG_INET6_ESP is not set
306# CONFIG_INET6_IPCOMP is not set 332# CONFIG_INET6_IPCOMP is not set
333CONFIG_IPV6_MIP6=y
307# CONFIG_INET6_XFRM_TUNNEL is not set 334# CONFIG_INET6_XFRM_TUNNEL is not set
308# CONFIG_INET6_TUNNEL is not set 335# CONFIG_INET6_TUNNEL is not set
309CONFIG_INET6_XFRM_MODE_TRANSPORT=m 336CONFIG_INET6_XFRM_MODE_TRANSPORT=m
310CONFIG_INET6_XFRM_MODE_TUNNEL=m 337CONFIG_INET6_XFRM_MODE_TUNNEL=m
338CONFIG_INET6_XFRM_MODE_BEET=m
339CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
340CONFIG_IPV6_SIT=m
311# CONFIG_IPV6_TUNNEL is not set 341# CONFIG_IPV6_TUNNEL is not set
342CONFIG_IPV6_MULTIPLE_TABLES=y
343CONFIG_IPV6_SUBTREES=y
312CONFIG_NETWORK_SECMARK=y 344CONFIG_NETWORK_SECMARK=y
313CONFIG_NETFILTER=y 345CONFIG_NETFILTER=y
314# CONFIG_NETFILTER_DEBUG is not set 346# CONFIG_NETFILTER_DEBUG is not set
@@ -319,15 +351,42 @@ CONFIG_NETFILTER=y
319CONFIG_NETFILTER_NETLINK=m 351CONFIG_NETFILTER_NETLINK=m
320CONFIG_NETFILTER_NETLINK_QUEUE=m 352CONFIG_NETFILTER_NETLINK_QUEUE=m
321CONFIG_NETFILTER_NETLINK_LOG=m 353CONFIG_NETFILTER_NETLINK_LOG=m
322# CONFIG_NF_CONNTRACK is not set 354CONFIG_NF_CONNTRACK_ENABLED=m
355CONFIG_NF_CONNTRACK_SUPPORT=y
356# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
357CONFIG_NF_CONNTRACK=m
358CONFIG_NF_CT_ACCT=y
359CONFIG_NF_CONNTRACK_MARK=y
360CONFIG_NF_CONNTRACK_SECMARK=y
361CONFIG_NF_CONNTRACK_EVENTS=y
362CONFIG_NF_CT_PROTO_GRE=m
363CONFIG_NF_CT_PROTO_SCTP=m
364CONFIG_NF_CONNTRACK_AMANDA=m
365CONFIG_NF_CONNTRACK_FTP=m
366CONFIG_NF_CONNTRACK_H323=m
367CONFIG_NF_CONNTRACK_IRC=m
368# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
369CONFIG_NF_CONNTRACK_PPTP=m
370CONFIG_NF_CONNTRACK_SANE=m
371CONFIG_NF_CONNTRACK_SIP=m
372CONFIG_NF_CONNTRACK_TFTP=m
373CONFIG_NF_CT_NETLINK=m
323CONFIG_NETFILTER_XTABLES=m 374CONFIG_NETFILTER_XTABLES=m
324CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 375CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
325CONFIG_NETFILTER_XT_TARGET_MARK=m 376CONFIG_NETFILTER_XT_TARGET_MARK=m
326CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 377CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
378CONFIG_NETFILTER_XT_TARGET_NFLOG=m
327CONFIG_NETFILTER_XT_TARGET_SECMARK=m 379CONFIG_NETFILTER_XT_TARGET_SECMARK=m
380CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
381CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
328CONFIG_NETFILTER_XT_MATCH_COMMENT=m 382CONFIG_NETFILTER_XT_MATCH_COMMENT=m
383CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
384CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
385CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
329CONFIG_NETFILTER_XT_MATCH_DCCP=m 386CONFIG_NETFILTER_XT_MATCH_DCCP=m
387CONFIG_NETFILTER_XT_MATCH_DSCP=m
330CONFIG_NETFILTER_XT_MATCH_ESP=m 388CONFIG_NETFILTER_XT_MATCH_ESP=m
389CONFIG_NETFILTER_XT_MATCH_HELPER=m
331CONFIG_NETFILTER_XT_MATCH_LENGTH=m 390CONFIG_NETFILTER_XT_MATCH_LENGTH=m
332CONFIG_NETFILTER_XT_MATCH_LIMIT=m 391CONFIG_NETFILTER_XT_MATCH_LIMIT=m
333CONFIG_NETFILTER_XT_MATCH_MAC=m 392CONFIG_NETFILTER_XT_MATCH_MAC=m
@@ -338,14 +397,17 @@ CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
338CONFIG_NETFILTER_XT_MATCH_QUOTA=m 397CONFIG_NETFILTER_XT_MATCH_QUOTA=m
339CONFIG_NETFILTER_XT_MATCH_REALM=m 398CONFIG_NETFILTER_XT_MATCH_REALM=m
340CONFIG_NETFILTER_XT_MATCH_SCTP=m 399CONFIG_NETFILTER_XT_MATCH_SCTP=m
400CONFIG_NETFILTER_XT_MATCH_STATE=m
341CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 401CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
342CONFIG_NETFILTER_XT_MATCH_STRING=m 402CONFIG_NETFILTER_XT_MATCH_STRING=m
343CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 403CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
404CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
344 405
345# 406#
346# IP: Netfilter Configuration 407# IP: Netfilter Configuration
347# 408#
348# CONFIG_IP_NF_CONNTRACK is not set 409CONFIG_NF_CONNTRACK_IPV4=m
410CONFIG_NF_CONNTRACK_PROC_COMPAT=y
349# CONFIG_IP_NF_QUEUE is not set 411# CONFIG_IP_NF_QUEUE is not set
350# CONFIG_IP_NF_IPTABLES is not set 412# CONFIG_IP_NF_IPTABLES is not set
351# CONFIG_IP_NF_ARPTABLES is not set 413# CONFIG_IP_NF_ARPTABLES is not set
@@ -353,6 +415,7 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
353# 415#
354# IPv6: Netfilter Configuration (EXPERIMENTAL) 416# IPv6: Netfilter Configuration (EXPERIMENTAL)
355# 417#
418CONFIG_NF_CONNTRACK_IPV6=m
356# CONFIG_IP6_NF_QUEUE is not set 419# CONFIG_IP6_NF_QUEUE is not set
357# CONFIG_IP6_NF_IPTABLES is not set 420# CONFIG_IP6_NF_IPTABLES is not set
358 421
@@ -379,7 +442,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
379# CONFIG_ATALK is not set 442# CONFIG_ATALK is not set
380# CONFIG_X25 is not set 443# CONFIG_X25 is not set
381# CONFIG_LAPB is not set 444# CONFIG_LAPB is not set
382# CONFIG_NET_DIVERT is not set
383# CONFIG_ECONET is not set 445# CONFIG_ECONET is not set
384# CONFIG_WAN_ROUTER is not set 446# CONFIG_WAN_ROUTER is not set
385 447
@@ -404,6 +466,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
404CONFIG_IEEE80211_SOFTMAC=m 466CONFIG_IEEE80211_SOFTMAC=m
405# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 467# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
406CONFIG_WIRELESS_EXT=y 468CONFIG_WIRELESS_EXT=y
469CONFIG_FIB_RULES=y
407 470
408# 471#
409# Device Drivers 472# Device Drivers
@@ -436,11 +499,13 @@ CONFIG_MTD_PARTITIONS=y
436# User Modules And Translation Layers 499# User Modules And Translation Layers
437# 500#
438CONFIG_MTD_CHAR=y 501CONFIG_MTD_CHAR=y
502CONFIG_MTD_BLKDEVS=y
439CONFIG_MTD_BLOCK=y 503CONFIG_MTD_BLOCK=y
440# CONFIG_FTL is not set 504# CONFIG_FTL is not set
441# CONFIG_NFTL is not set 505# CONFIG_NFTL is not set
442# CONFIG_INFTL is not set 506# CONFIG_INFTL is not set
443# CONFIG_RFD_FTL is not set 507# CONFIG_RFD_FTL is not set
508# CONFIG_SSFDC is not set
444 509
445# 510#
446# RAM/ROM/Flash chip drivers 511# RAM/ROM/Flash chip drivers
@@ -495,6 +560,7 @@ CONFIG_MTD_CFI_UTIL=y
495# NAND Flash Device Drivers 560# NAND Flash Device Drivers
496# 561#
497# CONFIG_MTD_NAND is not set 562# CONFIG_MTD_NAND is not set
563# CONFIG_MTD_NAND_CAFE is not set
498 564
499# 565#
500# OneNAND Flash Device Drivers 566# OneNAND Flash Device Drivers
@@ -527,14 +593,22 @@ CONFIG_BLK_DEV_NBD=m
527CONFIG_BLK_DEV_RAM=y 593CONFIG_BLK_DEV_RAM=y
528CONFIG_BLK_DEV_RAM_COUNT=16 594CONFIG_BLK_DEV_RAM_COUNT=16
529CONFIG_BLK_DEV_RAM_SIZE=8192 595CONFIG_BLK_DEV_RAM_SIZE=8192
596CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
530CONFIG_BLK_DEV_INITRD=y 597CONFIG_BLK_DEV_INITRD=y
531# CONFIG_CDROM_PKTCDVD is not set 598# CONFIG_CDROM_PKTCDVD is not set
532# CONFIG_ATA_OVER_ETH is not set 599# CONFIG_ATA_OVER_ETH is not set
533 600
534# 601#
602# Misc devices
603#
604CONFIG_SGI_IOC4=m
605# CONFIG_TIFM_CORE is not set
606
607#
535# ATA/ATAPI/MFM/RLL support 608# ATA/ATAPI/MFM/RLL support
536# 609#
537CONFIG_IDE=y 610CONFIG_IDE=y
611CONFIG_IDE_MAX_HWIFS=4
538CONFIG_BLK_DEV_IDE=y 612CONFIG_BLK_DEV_IDE=y
539 613
540# 614#
@@ -570,8 +644,10 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
570# CONFIG_BLK_DEV_CS5530 is not set 644# CONFIG_BLK_DEV_CS5530 is not set
571# CONFIG_BLK_DEV_HPT34X is not set 645# CONFIG_BLK_DEV_HPT34X is not set
572# CONFIG_BLK_DEV_HPT366 is not set 646# CONFIG_BLK_DEV_HPT366 is not set
647# CONFIG_BLK_DEV_JMICRON is not set
573# CONFIG_BLK_DEV_SC1200 is not set 648# CONFIG_BLK_DEV_SC1200 is not set
574# CONFIG_BLK_DEV_PIIX is not set 649# CONFIG_BLK_DEV_PIIX is not set
650CONFIG_BLK_DEV_IT8213=m
575# CONFIG_BLK_DEV_IT821X is not set 651# CONFIG_BLK_DEV_IT821X is not set
576# CONFIG_BLK_DEV_NS87415 is not set 652# CONFIG_BLK_DEV_NS87415 is not set
577# CONFIG_BLK_DEV_PDC202XX_OLD is not set 653# CONFIG_BLK_DEV_PDC202XX_OLD is not set
@@ -581,6 +657,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
581# CONFIG_BLK_DEV_SLC90E66 is not set 657# CONFIG_BLK_DEV_SLC90E66 is not set
582# CONFIG_BLK_DEV_TRM290 is not set 658# CONFIG_BLK_DEV_TRM290 is not set
583# CONFIG_BLK_DEV_VIA82CXXX is not set 659# CONFIG_BLK_DEV_VIA82CXXX is not set
660CONFIG_BLK_DEV_TC86C001=m
584# CONFIG_IDE_ARM is not set 661# CONFIG_IDE_ARM is not set
585# CONFIG_IDE_CHIPSETS is not set 662# CONFIG_IDE_CHIPSETS is not set
586CONFIG_BLK_DEV_IDEDMA=y 663CONFIG_BLK_DEV_IDEDMA=y
@@ -593,6 +670,12 @@ CONFIG_BLK_DEV_IDEDMA=y
593# 670#
594CONFIG_RAID_ATTRS=m 671CONFIG_RAID_ATTRS=m
595# CONFIG_SCSI is not set 672# CONFIG_SCSI is not set
673# CONFIG_SCSI_NETLINK is not set
674
675#
676# Serial ATA (prod) and Parallel ATA (experimental) drivers
677#
678# CONFIG_ATA is not set
596 679
597# 680#
598# Old CD-ROM drivers (not SCSI, not IDE) 681# Old CD-ROM drivers (not SCSI, not IDE)
@@ -648,6 +731,8 @@ CONFIG_LXT_PHY=m
648CONFIG_CICADA_PHY=m 731CONFIG_CICADA_PHY=m
649CONFIG_VITESSE_PHY=m 732CONFIG_VITESSE_PHY=m
650CONFIG_SMSC_PHY=m 733CONFIG_SMSC_PHY=m
734# CONFIG_BROADCOM_PHY is not set
735# CONFIG_FIXED_PHY is not set
651 736
652# 737#
653# Ethernet (10 or 100Mbit) 738# Ethernet (10 or 100Mbit)
@@ -702,7 +787,7 @@ CONFIG_NET_PCI=y
702# CONFIG_SUNDANCE is not set 787# CONFIG_SUNDANCE is not set
703# CONFIG_TLAN is not set 788# CONFIG_TLAN is not set
704# CONFIG_VIA_RHINE is not set 789# CONFIG_VIA_RHINE is not set
705# CONFIG_LAN_SAA9730 is not set 790# CONFIG_SC92031 is not set
706 791
707# 792#
708# Ethernet (1000 Mbit) 793# Ethernet (1000 Mbit)
@@ -721,14 +806,18 @@ CONFIG_NET_PCI=y
721# CONFIG_VIA_VELOCITY is not set 806# CONFIG_VIA_VELOCITY is not set
722# CONFIG_TIGON3 is not set 807# CONFIG_TIGON3 is not set
723# CONFIG_BNX2 is not set 808# CONFIG_BNX2 is not set
809CONFIG_QLA3XXX=m
810# CONFIG_ATL1 is not set
724 811
725# 812#
726# Ethernet (10000 Mbit) 813# Ethernet (10000 Mbit)
727# 814#
728# CONFIG_CHELSIO_T1 is not set 815# CONFIG_CHELSIO_T1 is not set
816CONFIG_CHELSIO_T3=m
729# CONFIG_IXGB is not set 817# CONFIG_IXGB is not set
730# CONFIG_S2IO is not set 818# CONFIG_S2IO is not set
731# CONFIG_MYRI10GE is not set 819# CONFIG_MYRI10GE is not set
820CONFIG_NETXEN_NIC=m
732 821
733# 822#
734# Token Ring devices 823# Token Ring devices
@@ -785,6 +874,7 @@ CONFIG_PPP_DEFLATE=m
785CONFIG_PPP_MPPE=m 874CONFIG_PPP_MPPE=m
786CONFIG_PPPOE=m 875CONFIG_PPPOE=m
787# CONFIG_SLIP is not set 876# CONFIG_SLIP is not set
877CONFIG_SLHC=m
788# CONFIG_SHAPER is not set 878# CONFIG_SHAPER is not set
789# CONFIG_NETCONSOLE is not set 879# CONFIG_NETCONSOLE is not set
790# CONFIG_NETPOLL is not set 880# CONFIG_NETPOLL is not set
@@ -804,6 +894,7 @@ CONFIG_PPPOE=m
804# Input device support 894# Input device support
805# 895#
806CONFIG_INPUT=y 896CONFIG_INPUT=y
897# CONFIG_INPUT_FF_MEMLESS is not set
807 898
808# 899#
809# Userland interfaces 900# Userland interfaces
@@ -826,6 +917,7 @@ CONFIG_KEYBOARD_ATKBD=y
826# CONFIG_KEYBOARD_LKKBD is not set 917# CONFIG_KEYBOARD_LKKBD is not set
827# CONFIG_KEYBOARD_XTKBD is not set 918# CONFIG_KEYBOARD_XTKBD is not set
828# CONFIG_KEYBOARD_NEWTON is not set 919# CONFIG_KEYBOARD_NEWTON is not set
920# CONFIG_KEYBOARD_STOWAWAY is not set
829CONFIG_INPUT_MOUSE=y 921CONFIG_INPUT_MOUSE=y
830CONFIG_MOUSE_PS2=y 922CONFIG_MOUSE_PS2=y
831# CONFIG_MOUSE_SERIAL is not set 923# CONFIG_MOUSE_SERIAL is not set
@@ -868,6 +960,7 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
868CONFIG_SERIAL_CORE=y 960CONFIG_SERIAL_CORE=y
869CONFIG_SERIAL_TXX9=y 961CONFIG_SERIAL_TXX9=y
870CONFIG_HAS_TXX9_SERIAL=y 962CONFIG_HAS_TXX9_SERIAL=y
963CONFIG_SERIAL_TXX9_NR_UARTS=6
871# CONFIG_SERIAL_TXX9_CONSOLE is not set 964# CONFIG_SERIAL_TXX9_CONSOLE is not set
872# CONFIG_SERIAL_TXX9_STDSERIAL is not set 965# CONFIG_SERIAL_TXX9_STDSERIAL is not set
873# CONFIG_SERIAL_JSM is not set 966# CONFIG_SERIAL_JSM is not set
@@ -890,10 +983,6 @@ CONFIG_LEGACY_PTY_COUNT=256
890# CONFIG_DTLK is not set 983# CONFIG_DTLK is not set
891# CONFIG_R3964 is not set 984# CONFIG_R3964 is not set
892# CONFIG_APPLICOM is not set 985# CONFIG_APPLICOM is not set
893
894#
895# Ftape, the floppy tape device driver
896#
897# CONFIG_DRM is not set 986# CONFIG_DRM is not set
898# CONFIG_RAW_DRIVER is not set 987# CONFIG_RAW_DRIVER is not set
899 988
@@ -901,7 +990,6 @@ CONFIG_LEGACY_PTY_COUNT=256
901# TPM devices 990# TPM devices
902# 991#
903# CONFIG_TCG_TPM is not set 992# CONFIG_TCG_TPM is not set
904# CONFIG_TELCLOCK is not set
905 993
906# 994#
907# I2C support 995# I2C support
@@ -926,17 +1014,14 @@ CONFIG_HWMON=y
926# CONFIG_HWMON_VID is not set 1014# CONFIG_HWMON_VID is not set
927# CONFIG_SENSORS_ABITUGURU is not set 1015# CONFIG_SENSORS_ABITUGURU is not set
928# CONFIG_SENSORS_F71805F is not set 1016# CONFIG_SENSORS_F71805F is not set
1017# CONFIG_SENSORS_PC87427 is not set
1018# CONFIG_SENSORS_VT1211 is not set
929# CONFIG_HWMON_DEBUG_CHIP is not set 1019# CONFIG_HWMON_DEBUG_CHIP is not set
930 1020
931# 1021#
932# Misc devices
933#
934
935#
936# Multimedia devices 1022# Multimedia devices
937# 1023#
938# CONFIG_VIDEO_DEV is not set 1024# CONFIG_VIDEO_DEV is not set
939CONFIG_VIDEO_V4L2=y
940 1025
941# 1026#
942# Digital Video Broadcasting Devices 1027# Digital Video Broadcasting Devices
@@ -952,6 +1037,7 @@ CONFIG_FB=y
952CONFIG_FB_CFB_FILLRECT=y 1037CONFIG_FB_CFB_FILLRECT=y
953CONFIG_FB_CFB_COPYAREA=y 1038CONFIG_FB_CFB_COPYAREA=y
954CONFIG_FB_CFB_IMAGEBLIT=y 1039CONFIG_FB_CFB_IMAGEBLIT=y
1040# CONFIG_FB_SVGALIB is not set
955# CONFIG_FB_MACMODES is not set 1041# CONFIG_FB_MACMODES is not set
956# CONFIG_FB_BACKLIGHT is not set 1042# CONFIG_FB_BACKLIGHT is not set
957# CONFIG_FB_MODE_HELPERS is not set 1043# CONFIG_FB_MODE_HELPERS is not set
@@ -971,6 +1057,7 @@ CONFIG_FB_ATY=y
971CONFIG_FB_ATY_CT=y 1057CONFIG_FB_ATY_CT=y
972# CONFIG_FB_ATY_GENERIC_LCD is not set 1058# CONFIG_FB_ATY_GENERIC_LCD is not set
973# CONFIG_FB_ATY_GX is not set 1059# CONFIG_FB_ATY_GX is not set
1060# CONFIG_FB_S3 is not set
974# CONFIG_FB_SAVAGE is not set 1061# CONFIG_FB_SAVAGE is not set
975# CONFIG_FB_SIS is not set 1062# CONFIG_FB_SIS is not set
976# CONFIG_FB_NEOMAGIC is not set 1063# CONFIG_FB_NEOMAGIC is not set
@@ -1002,6 +1089,12 @@ CONFIG_DUMMY_CONSOLE=y
1002# CONFIG_SOUND is not set 1089# CONFIG_SOUND is not set
1003 1090
1004# 1091#
1092# HID Devices
1093#
1094CONFIG_HID=y
1095# CONFIG_HID_DEBUG is not set
1096
1097#
1005# USB support 1098# USB support
1006# 1099#
1007CONFIG_USB_ARCH_HAS_HCD=y 1100CONFIG_USB_ARCH_HAS_HCD=y
@@ -1014,8 +1107,8 @@ CONFIG_USB=y
1014# Miscellaneous USB options 1107# Miscellaneous USB options
1015# 1108#
1016# CONFIG_USB_DEVICEFS is not set 1109# CONFIG_USB_DEVICEFS is not set
1017# CONFIG_USB_BANDWIDTH is not set
1018# CONFIG_USB_DYNAMIC_MINORS is not set 1110# CONFIG_USB_DYNAMIC_MINORS is not set
1111# CONFIG_USB_SUSPEND is not set
1019# CONFIG_USB_OTG is not set 1112# CONFIG_USB_OTG is not set
1020 1113
1021# 1114#
@@ -1040,14 +1133,12 @@ CONFIG_USB=y
1040# 1133#
1041# may also be needed; see USB_STORAGE Help for more information 1134# may also be needed; see USB_STORAGE Help for more information
1042# 1135#
1043# CONFIG_USB_STORAGE is not set
1044# CONFIG_USB_LIBUSUAL is not set 1136# CONFIG_USB_LIBUSUAL is not set
1045 1137
1046# 1138#
1047# USB Input Devices 1139# USB Input Devices
1048# 1140#
1049CONFIG_USB_HID=y 1141CONFIG_USB_HID=y
1050CONFIG_USB_HIDINPUT=y
1051# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1142# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1052# CONFIG_HID_FF is not set 1143# CONFIG_HID_FF is not set
1053CONFIG_USB_HIDDEV=y 1144CONFIG_USB_HIDDEV=y
@@ -1063,6 +1154,7 @@ CONFIG_USB_YEALINK=m
1063# CONFIG_USB_ATI_REMOTE2 is not set 1154# CONFIG_USB_ATI_REMOTE2 is not set
1064# CONFIG_USB_KEYSPAN_REMOTE is not set 1155# CONFIG_USB_KEYSPAN_REMOTE is not set
1065# CONFIG_USB_APPLETOUCH is not set 1156# CONFIG_USB_APPLETOUCH is not set
1157# CONFIG_USB_GTCO is not set
1066 1158
1067# 1159#
1068# USB Imaging devices 1160# USB Imaging devices
@@ -1076,6 +1168,7 @@ CONFIG_USB_YEALINK=m
1076# CONFIG_USB_KAWETH is not set 1168# CONFIG_USB_KAWETH is not set
1077# CONFIG_USB_PEGASUS is not set 1169# CONFIG_USB_PEGASUS is not set
1078# CONFIG_USB_RTL8150 is not set 1170# CONFIG_USB_RTL8150 is not set
1171# CONFIG_USB_USBNET_MII is not set
1079# CONFIG_USB_USBNET is not set 1172# CONFIG_USB_USBNET is not set
1080CONFIG_USB_MON=y 1173CONFIG_USB_MON=y
1081 1174
@@ -1093,18 +1186,20 @@ CONFIG_USB_MON=y
1093# 1186#
1094# CONFIG_USB_EMI62 is not set 1187# CONFIG_USB_EMI62 is not set
1095# CONFIG_USB_EMI26 is not set 1188# CONFIG_USB_EMI26 is not set
1189# CONFIG_USB_ADUTUX is not set
1096# CONFIG_USB_AUERSWALD is not set 1190# CONFIG_USB_AUERSWALD is not set
1097# CONFIG_USB_RIO500 is not set 1191# CONFIG_USB_RIO500 is not set
1098# CONFIG_USB_LEGOTOWER is not set 1192# CONFIG_USB_LEGOTOWER is not set
1099# CONFIG_USB_LCD is not set 1193# CONFIG_USB_LCD is not set
1100# CONFIG_USB_LED is not set 1194# CONFIG_USB_LED is not set
1101# CONFIG_USB_CY7C63 is not set 1195# CONFIG_USB_CYPRESS_CY7C63 is not set
1102# CONFIG_USB_CYTHERM is not set 1196# CONFIG_USB_CYTHERM is not set
1103# CONFIG_USB_PHIDGETKIT is not set 1197# CONFIG_USB_PHIDGET is not set
1104# CONFIG_USB_PHIDGETSERVO is not set
1105# CONFIG_USB_IDMOUSE is not set 1198# CONFIG_USB_IDMOUSE is not set
1199# CONFIG_USB_FTDI_ELAN is not set
1106# CONFIG_USB_APPLEDISPLAY is not set 1200# CONFIG_USB_APPLEDISPLAY is not set
1107# CONFIG_USB_LD is not set 1201# CONFIG_USB_LD is not set
1202# CONFIG_USB_TRANCEVIBRATOR is not set
1108 1203
1109# 1204#
1110# USB DSL modem support 1205# USB DSL modem support
@@ -1161,6 +1256,14 @@ CONFIG_USB_MON=y
1161# 1256#
1162 1257
1163# 1258#
1259# Auxiliary Display support
1260#
1261
1262#
1263# Virtualization
1264#
1265
1266#
1164# File systems 1267# File systems
1165# 1268#
1166CONFIG_EXT2_FS=y 1269CONFIG_EXT2_FS=y
@@ -1170,6 +1273,7 @@ CONFIG_EXT3_FS=m
1170CONFIG_EXT3_FS_XATTR=y 1273CONFIG_EXT3_FS_XATTR=y
1171# CONFIG_EXT3_FS_POSIX_ACL is not set 1274# CONFIG_EXT3_FS_POSIX_ACL is not set
1172# CONFIG_EXT3_FS_SECURITY is not set 1275# CONFIG_EXT3_FS_SECURITY is not set
1276# CONFIG_EXT4DEV_FS is not set
1173CONFIG_JBD=m 1277CONFIG_JBD=m
1174# CONFIG_JBD_DEBUG is not set 1278# CONFIG_JBD_DEBUG is not set
1175CONFIG_FS_MBCACHE=y 1279CONFIG_FS_MBCACHE=y
@@ -1178,12 +1282,13 @@ CONFIG_REISERFS_FS=m
1178# CONFIG_REISERFS_PROC_INFO is not set 1282# CONFIG_REISERFS_PROC_INFO is not set
1179# CONFIG_REISERFS_FS_XATTR is not set 1283# CONFIG_REISERFS_FS_XATTR is not set
1180# CONFIG_JFS_FS is not set 1284# CONFIG_JFS_FS is not set
1181# CONFIG_FS_POSIX_ACL is not set 1285CONFIG_FS_POSIX_ACL=y
1182CONFIG_XFS_FS=m 1286CONFIG_XFS_FS=m
1183# CONFIG_XFS_QUOTA is not set 1287# CONFIG_XFS_QUOTA is not set
1184# CONFIG_XFS_SECURITY is not set 1288# CONFIG_XFS_SECURITY is not set
1185# CONFIG_XFS_POSIX_ACL is not set 1289# CONFIG_XFS_POSIX_ACL is not set
1186# CONFIG_XFS_RT is not set 1290# CONFIG_XFS_RT is not set
1291# CONFIG_GFS2_FS is not set
1187# CONFIG_OCFS2_FS is not set 1292# CONFIG_OCFS2_FS is not set
1188# CONFIG_MINIX_FS is not set 1293# CONFIG_MINIX_FS is not set
1189# CONFIG_ROMFS_FS is not set 1294# CONFIG_ROMFS_FS is not set
@@ -1194,6 +1299,7 @@ CONFIG_INOTIFY_USER=y
1194# CONFIG_AUTOFS_FS is not set 1299# CONFIG_AUTOFS_FS is not set
1195CONFIG_AUTOFS4_FS=m 1300CONFIG_AUTOFS4_FS=m
1196CONFIG_FUSE_FS=m 1301CONFIG_FUSE_FS=m
1302CONFIG_GENERIC_ACL=y
1197 1303
1198# 1304#
1199# CD-ROM/DVD Filesystems 1305# CD-ROM/DVD Filesystems
@@ -1218,11 +1324,13 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1218# 1324#
1219CONFIG_PROC_FS=y 1325CONFIG_PROC_FS=y
1220# CONFIG_PROC_KCORE is not set 1326# CONFIG_PROC_KCORE is not set
1327CONFIG_PROC_SYSCTL=y
1221CONFIG_SYSFS=y 1328CONFIG_SYSFS=y
1222CONFIG_TMPFS=y 1329CONFIG_TMPFS=y
1330CONFIG_TMPFS_POSIX_ACL=y
1223# CONFIG_HUGETLB_PAGE is not set 1331# CONFIG_HUGETLB_PAGE is not set
1224CONFIG_RAMFS=y 1332CONFIG_RAMFS=y
1225# CONFIG_CONFIGFS_FS is not set 1333CONFIG_CONFIGFS_FS=m
1226 1334
1227# 1335#
1228# Miscellaneous filesystems 1336# Miscellaneous filesystems
@@ -1234,7 +1342,6 @@ CONFIG_RAMFS=y
1234# CONFIG_BEFS_FS is not set 1342# CONFIG_BEFS_FS is not set
1235# CONFIG_BFS_FS is not set 1343# CONFIG_BFS_FS is not set
1236# CONFIG_EFS_FS is not set 1344# CONFIG_EFS_FS is not set
1237# CONFIG_JFFS_FS is not set
1238CONFIG_JFFS2_FS=y 1345CONFIG_JFFS2_FS=y
1239CONFIG_JFFS2_FS_DEBUG=0 1346CONFIG_JFFS2_FS_DEBUG=0
1240CONFIG_JFFS2_FS_WRITEBUFFER=y 1347CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1273,7 +1380,6 @@ CONFIG_SUNRPC=y
1273CONFIG_SMB_FS=m 1380CONFIG_SMB_FS=m
1274# CONFIG_SMB_NLS_DEFAULT is not set 1381# CONFIG_SMB_NLS_DEFAULT is not set
1275# CONFIG_CIFS is not set 1382# CONFIG_CIFS is not set
1276# CONFIG_CIFS_DEBUG2 is not set
1277# CONFIG_NCP_FS is not set 1383# CONFIG_NCP_FS is not set
1278# CONFIG_CODA_FS is not set 1384# CONFIG_CODA_FS is not set
1279# CONFIG_AFS_FS is not set 1385# CONFIG_AFS_FS is not set
@@ -1330,6 +1436,14 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1330# CONFIG_NLS_UTF8 is not set 1436# CONFIG_NLS_UTF8 is not set
1331 1437
1332# 1438#
1439# Distributed Lock Manager
1440#
1441CONFIG_DLM=m
1442CONFIG_DLM_TCP=y
1443# CONFIG_DLM_SCTP is not set
1444# CONFIG_DLM_DEBUG is not set
1445
1446#
1333# Profiling support 1447# Profiling support
1334# 1448#
1335# CONFIG_PROFILING is not set 1449# CONFIG_PROFILING is not set
@@ -1339,11 +1453,13 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1339# 1453#
1340CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1454CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1341# CONFIG_PRINTK_TIME is not set 1455# CONFIG_PRINTK_TIME is not set
1456CONFIG_ENABLE_MUST_CHECK=y
1342# CONFIG_MAGIC_SYSRQ is not set 1457# CONFIG_MAGIC_SYSRQ is not set
1343# CONFIG_UNUSED_SYMBOLS is not set 1458# CONFIG_UNUSED_SYMBOLS is not set
1459# CONFIG_DEBUG_FS is not set
1460# CONFIG_HEADERS_CHECK is not set
1344# CONFIG_DEBUG_KERNEL is not set 1461# CONFIG_DEBUG_KERNEL is not set
1345CONFIG_LOG_BUF_SHIFT=14 1462CONFIG_LOG_BUF_SHIFT=14
1346# CONFIG_DEBUG_FS is not set
1347CONFIG_CROSSCOMPILE=y 1463CONFIG_CROSSCOMPILE=y
1348CONFIG_CMDLINE="" 1464CONFIG_CMDLINE=""
1349 1465
@@ -1357,18 +1473,30 @@ CONFIG_CMDLINE=""
1357# Cryptographic options 1473# Cryptographic options
1358# 1474#
1359CONFIG_CRYPTO=y 1475CONFIG_CRYPTO=y
1476CONFIG_CRYPTO_ALGAPI=y
1477CONFIG_CRYPTO_BLKCIPHER=m
1478CONFIG_CRYPTO_HASH=y
1479CONFIG_CRYPTO_MANAGER=y
1360CONFIG_CRYPTO_HMAC=y 1480CONFIG_CRYPTO_HMAC=y
1481CONFIG_CRYPTO_XCBC=m
1361CONFIG_CRYPTO_NULL=m 1482CONFIG_CRYPTO_NULL=m
1362CONFIG_CRYPTO_MD4=m 1483CONFIG_CRYPTO_MD4=m
1363CONFIG_CRYPTO_MD5=m 1484CONFIG_CRYPTO_MD5=y
1364CONFIG_CRYPTO_SHA1=m 1485CONFIG_CRYPTO_SHA1=m
1365CONFIG_CRYPTO_SHA256=m 1486CONFIG_CRYPTO_SHA256=m
1366CONFIG_CRYPTO_SHA512=m 1487CONFIG_CRYPTO_SHA512=m
1367CONFIG_CRYPTO_WP512=m 1488CONFIG_CRYPTO_WP512=m
1368CONFIG_CRYPTO_TGR192=m 1489CONFIG_CRYPTO_TGR192=m
1490CONFIG_CRYPTO_GF128MUL=m
1491CONFIG_CRYPTO_ECB=m
1492CONFIG_CRYPTO_CBC=m
1493CONFIG_CRYPTO_PCBC=m
1494CONFIG_CRYPTO_LRW=m
1369CONFIG_CRYPTO_DES=m 1495CONFIG_CRYPTO_DES=m
1496CONFIG_CRYPTO_FCRYPT=m
1370CONFIG_CRYPTO_BLOWFISH=m 1497CONFIG_CRYPTO_BLOWFISH=m
1371CONFIG_CRYPTO_TWOFISH=m 1498CONFIG_CRYPTO_TWOFISH=m
1499CONFIG_CRYPTO_TWOFISH_COMMON=m
1372CONFIG_CRYPTO_SERPENT=m 1500CONFIG_CRYPTO_SERPENT=m
1373CONFIG_CRYPTO_AES=m 1501CONFIG_CRYPTO_AES=m
1374CONFIG_CRYPTO_CAST5=m 1502CONFIG_CRYPTO_CAST5=m
@@ -1380,6 +1508,7 @@ CONFIG_CRYPTO_ANUBIS=m
1380CONFIG_CRYPTO_DEFLATE=m 1508CONFIG_CRYPTO_DEFLATE=m
1381CONFIG_CRYPTO_MICHAEL_MIC=m 1509CONFIG_CRYPTO_MICHAEL_MIC=m
1382CONFIG_CRYPTO_CRC32C=m 1510CONFIG_CRYPTO_CRC32C=m
1511CONFIG_CRYPTO_CAMELLIA=m
1383# CONFIG_CRYPTO_TEST is not set 1512# CONFIG_CRYPTO_TEST is not set
1384 1513
1385# 1514#
@@ -1389,6 +1518,7 @@ CONFIG_CRYPTO_CRC32C=m
1389# 1518#
1390# Library routines 1519# Library routines
1391# 1520#
1521CONFIG_BITREVERSE=y
1392CONFIG_CRC_CCITT=m 1522CONFIG_CRC_CCITT=m
1393CONFIG_CRC16=m 1523CONFIG_CRC16=m
1394CONFIG_CRC32=y 1524CONFIG_CRC32=y
@@ -1399,3 +1529,5 @@ CONFIG_TEXTSEARCH=y
1399CONFIG_TEXTSEARCH_KMP=m 1529CONFIG_TEXTSEARCH_KMP=m
1400CONFIG_TEXTSEARCH_BM=m 1530CONFIG_TEXTSEARCH_BM=m
1401CONFIG_TEXTSEARCH_FSM=m 1531CONFIG_TEXTSEARCH_FSM=m
1532CONFIG_HAS_IOMEM=y
1533CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 496aa67b9f82..0417e86ab627 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:19 2006 4# Sun Feb 18 21:28:09 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_SNI_RM=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 75CONFIG_ARC=y
72CONFIG_ARCH_MAY_HAVE_PC_FDC=y 76CONFIG_ARCH_MAY_HAVE_PC_FDC=y
73CONFIG_DMA_NONCOHERENT=y 77CONFIG_DMA_NONCOHERENT=y
@@ -78,10 +82,10 @@ CONFIG_I8259=y
78CONFIG_CPU_LITTLE_ENDIAN=y 82CONFIG_CPU_LITTLE_ENDIAN=y
79CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 83CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 84CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
85CONFIG_IRQ_CPU=y
81CONFIG_ARC32=y 86CONFIG_ARC32=y
82CONFIG_BOOT_ELF32=y 87CONFIG_BOOT_ELF32=y
83CONFIG_MIPS_L1_CACHE_SHIFT=5 88CONFIG_MIPS_L1_CACHE_SHIFT=4
84CONFIG_HAVE_STD_PC_SERIAL_PORT=y
85CONFIG_ARC_CONSOLE=y 89CONFIG_ARC_CONSOLE=y
86CONFIG_ARC_MEMORY=y 90CONFIG_ARC_MEMORY=y
87CONFIG_ARC_PROMLIB=y 91CONFIG_ARC_PROMLIB=y
@@ -110,6 +114,7 @@ CONFIG_CPU_R4X00=y
110# CONFIG_CPU_SB1 is not set 114# CONFIG_CPU_SB1 is not set
111CONFIG_SYS_HAS_CPU_R4X00=y 115CONFIG_SYS_HAS_CPU_R4X00=y
112CONFIG_SYS_HAS_CPU_R5000=y 116CONFIG_SYS_HAS_CPU_R5000=y
117CONFIG_SYS_HAS_CPU_R10000=y
113CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 118CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
114CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 119CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
115CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 120CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -127,8 +132,8 @@ CONFIG_PAGE_SIZE_4KB=y
127CONFIG_BOARD_SCACHE=y 132CONFIG_BOARD_SCACHE=y
128CONFIG_R5000_CPU_SCACHE=y 133CONFIG_R5000_CPU_SCACHE=y
129CONFIG_MIPS_MT_DISABLED=y 134CONFIG_MIPS_MT_DISABLED=y
130# CONFIG_MIPS_MT_SMTC is not set
131# CONFIG_MIPS_MT_SMP is not set 135# CONFIG_MIPS_MT_SMP is not set
136# CONFIG_MIPS_MT_SMTC is not set
132# CONFIG_MIPS_VPE_LOADER is not set 137# CONFIG_MIPS_VPE_LOADER is not set
133# CONFIG_64BIT_PHYS_ADDR is not set 138# CONFIG_64BIT_PHYS_ADDR is not set
134CONFIG_CPU_HAS_LLSC=y 139CONFIG_CPU_HAS_LLSC=y
@@ -146,6 +151,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
146# CONFIG_SPARSEMEM_STATIC is not set 151# CONFIG_SPARSEMEM_STATIC is not set
147CONFIG_SPLIT_PTLOCK_CPUS=4 152CONFIG_SPLIT_PTLOCK_CPUS=4
148# CONFIG_RESOURCES_64BIT is not set 153# CONFIG_RESOURCES_64BIT is not set
154CONFIG_ZONE_DMA_FLAG=1
149# CONFIG_HZ_48 is not set 155# CONFIG_HZ_48 is not set
150# CONFIG_HZ_100 is not set 156# CONFIG_HZ_100 is not set
151# CONFIG_HZ_128 is not set 157# CONFIG_HZ_128 is not set
@@ -158,6 +164,7 @@ CONFIG_HZ=1000
158# CONFIG_PREEMPT_NONE is not set 164# CONFIG_PREEMPT_NONE is not set
159CONFIG_PREEMPT_VOLUNTARY=y 165CONFIG_PREEMPT_VOLUNTARY=y
160# CONFIG_PREEMPT is not set 166# CONFIG_PREEMPT is not set
167# CONFIG_KEXEC is not set
161CONFIG_LOCKDEP_SUPPORT=y 168CONFIG_LOCKDEP_SUPPORT=y
162CONFIG_STACKTRACE_SUPPORT=y 169CONFIG_STACKTRACE_SUPPORT=y
163CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 170CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -176,17 +183,22 @@ CONFIG_LOCALVERSION=""
176CONFIG_LOCALVERSION_AUTO=y 183CONFIG_LOCALVERSION_AUTO=y
177CONFIG_SWAP=y 184CONFIG_SWAP=y
178CONFIG_SYSVIPC=y 185CONFIG_SYSVIPC=y
186# CONFIG_IPC_NS is not set
187CONFIG_SYSVIPC_SYSCTL=y
179CONFIG_POSIX_MQUEUE=y 188CONFIG_POSIX_MQUEUE=y
180CONFIG_BSD_PROCESS_ACCT=y 189CONFIG_BSD_PROCESS_ACCT=y
181# CONFIG_BSD_PROCESS_ACCT_V3 is not set 190# CONFIG_BSD_PROCESS_ACCT_V3 is not set
182CONFIG_SYSCTL=y 191# CONFIG_TASKSTATS is not set
192# CONFIG_UTS_NS is not set
183# CONFIG_AUDIT is not set 193# CONFIG_AUDIT is not set
184CONFIG_IKCONFIG=y 194CONFIG_IKCONFIG=y
185CONFIG_IKCONFIG_PROC=y 195CONFIG_IKCONFIG_PROC=y
196CONFIG_SYSFS_DEPRECATED=y
186CONFIG_RELAY=y 197CONFIG_RELAY=y
187CONFIG_INITRAMFS_SOURCE=""
188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 198# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
199CONFIG_SYSCTL=y
189CONFIG_EMBEDDED=y 200CONFIG_EMBEDDED=y
201CONFIG_SYSCTL_SYSCALL=y
190CONFIG_KALLSYMS=y 202CONFIG_KALLSYMS=y
191# CONFIG_KALLSYMS_EXTRA_PASS is not set 203# CONFIG_KALLSYMS_EXTRA_PASS is not set
192CONFIG_HOTPLUG=y 204CONFIG_HOTPLUG=y
@@ -194,12 +206,12 @@ CONFIG_PRINTK=y
194CONFIG_BUG=y 206CONFIG_BUG=y
195CONFIG_ELF_CORE=y 207CONFIG_ELF_CORE=y
196CONFIG_BASE_FULL=y 208CONFIG_BASE_FULL=y
197CONFIG_RT_MUTEXES=y
198CONFIG_FUTEX=y 209CONFIG_FUTEX=y
199CONFIG_EPOLL=y 210CONFIG_EPOLL=y
200CONFIG_SHMEM=y 211CONFIG_SHMEM=y
201CONFIG_SLAB=y 212CONFIG_SLAB=y
202CONFIG_VM_EVENT_COUNTERS=y 213CONFIG_VM_EVENT_COUNTERS=y
214CONFIG_RT_MUTEXES=y
203# CONFIG_TINY_SHMEM is not set 215# CONFIG_TINY_SHMEM is not set
204CONFIG_BASE_SMALL=0 216CONFIG_BASE_SMALL=0
205# CONFIG_SLOB is not set 217# CONFIG_SLOB is not set
@@ -217,6 +229,7 @@ CONFIG_KMOD=y
217# 229#
218# Block layer 230# Block layer
219# 231#
232CONFIG_BLOCK=y
220# CONFIG_LBD is not set 233# CONFIG_LBD is not set
221# CONFIG_BLK_DEV_IO_TRACE is not set 234# CONFIG_BLK_DEV_IO_TRACE is not set
222# CONFIG_LSF is not set 235# CONFIG_LSF is not set
@@ -263,6 +276,14 @@ CONFIG_BINFMT_MISC=m
263CONFIG_TRAD_SIGNALS=y 276CONFIG_TRAD_SIGNALS=y
264 277
265# 278#
279# Power management options
280#
281CONFIG_PM=y
282# CONFIG_PM_LEGACY is not set
283# CONFIG_PM_DEBUG is not set
284# CONFIG_PM_SYSFS_DEPRECATED is not set
285
286#
266# Networking 287# Networking
267# 288#
268CONFIG_NET=y 289CONFIG_NET=y
@@ -276,7 +297,10 @@ CONFIG_PACKET_MMAP=y
276CONFIG_UNIX=y 297CONFIG_UNIX=y
277CONFIG_XFRM=y 298CONFIG_XFRM=y
278# CONFIG_XFRM_USER is not set 299# CONFIG_XFRM_USER is not set
300# CONFIG_XFRM_SUB_POLICY is not set
301CONFIG_XFRM_MIGRATE=y
279CONFIG_NET_KEY=m 302CONFIG_NET_KEY=m
303CONFIG_NET_KEY_MIGRATE=y
280CONFIG_INET=y 304CONFIG_INET=y
281CONFIG_IP_MULTICAST=y 305CONFIG_IP_MULTICAST=y
282# CONFIG_IP_ADVANCED_ROUTER is not set 306# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -297,10 +321,13 @@ CONFIG_IP_PIMSM_V2=y
297CONFIG_INET_TUNNEL=m 321CONFIG_INET_TUNNEL=m
298CONFIG_INET_XFRM_MODE_TRANSPORT=m 322CONFIG_INET_XFRM_MODE_TRANSPORT=m
299CONFIG_INET_XFRM_MODE_TUNNEL=m 323CONFIG_INET_XFRM_MODE_TUNNEL=m
324CONFIG_INET_XFRM_MODE_BEET=m
300CONFIG_INET_DIAG=y 325CONFIG_INET_DIAG=y
301CONFIG_INET_TCP_DIAG=y 326CONFIG_INET_TCP_DIAG=y
302# CONFIG_TCP_CONG_ADVANCED is not set 327# CONFIG_TCP_CONG_ADVANCED is not set
303CONFIG_TCP_CONG_BIC=y 328CONFIG_TCP_CONG_CUBIC=y
329CONFIG_DEFAULT_TCP_CONG="cubic"
330CONFIG_TCP_MD5SIG=y
304 331
305# 332#
306# IP: Virtual Server Configuration 333# IP: Virtual Server Configuration
@@ -313,11 +340,17 @@ CONFIG_IPV6_ROUTE_INFO=y
313CONFIG_INET6_AH=m 340CONFIG_INET6_AH=m
314CONFIG_INET6_ESP=m 341CONFIG_INET6_ESP=m
315CONFIG_INET6_IPCOMP=m 342CONFIG_INET6_IPCOMP=m
343CONFIG_IPV6_MIP6=y
316CONFIG_INET6_XFRM_TUNNEL=m 344CONFIG_INET6_XFRM_TUNNEL=m
317CONFIG_INET6_TUNNEL=m 345CONFIG_INET6_TUNNEL=m
318CONFIG_INET6_XFRM_MODE_TRANSPORT=m 346CONFIG_INET6_XFRM_MODE_TRANSPORT=m
319CONFIG_INET6_XFRM_MODE_TUNNEL=m 347CONFIG_INET6_XFRM_MODE_TUNNEL=m
348CONFIG_INET6_XFRM_MODE_BEET=m
349CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
350CONFIG_IPV6_SIT=m
320CONFIG_IPV6_TUNNEL=m 351CONFIG_IPV6_TUNNEL=m
352CONFIG_IPV6_MULTIPLE_TABLES=y
353CONFIG_IPV6_SUBTREES=y
321CONFIG_NETWORK_SECMARK=y 354CONFIG_NETWORK_SECMARK=y
322CONFIG_NETFILTER=y 355CONFIG_NETFILTER=y
323# CONFIG_NETFILTER_DEBUG is not set 356# CONFIG_NETFILTER_DEBUG is not set
@@ -329,18 +362,43 @@ CONFIG_BRIDGE_NETFILTER=y
329CONFIG_NETFILTER_NETLINK=m 362CONFIG_NETFILTER_NETLINK=m
330CONFIG_NETFILTER_NETLINK_QUEUE=m 363CONFIG_NETFILTER_NETLINK_QUEUE=m
331CONFIG_NETFILTER_NETLINK_LOG=m 364CONFIG_NETFILTER_NETLINK_LOG=m
365CONFIG_NF_CONNTRACK_ENABLED=m
366CONFIG_NF_CONNTRACK_SUPPORT=y
367# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
368CONFIG_NF_CONNTRACK=m
369CONFIG_NF_CT_ACCT=y
370CONFIG_NF_CONNTRACK_MARK=y
371CONFIG_NF_CONNTRACK_SECMARK=y
372CONFIG_NF_CONNTRACK_EVENTS=y
373CONFIG_NF_CT_PROTO_GRE=m
374CONFIG_NF_CT_PROTO_SCTP=m
375CONFIG_NF_CONNTRACK_AMANDA=m
376CONFIG_NF_CONNTRACK_FTP=m
377CONFIG_NF_CONNTRACK_H323=m
378CONFIG_NF_CONNTRACK_IRC=m
379# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
380CONFIG_NF_CONNTRACK_PPTP=m
381CONFIG_NF_CONNTRACK_SANE=m
382CONFIG_NF_CONNTRACK_SIP=m
383CONFIG_NF_CONNTRACK_TFTP=m
384CONFIG_NF_CT_NETLINK=m
332CONFIG_NETFILTER_XTABLES=m 385CONFIG_NETFILTER_XTABLES=m
333CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 386CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
334CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 387CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
388CONFIG_NETFILTER_XT_TARGET_DSCP=m
335CONFIG_NETFILTER_XT_TARGET_MARK=m 389CONFIG_NETFILTER_XT_TARGET_MARK=m
336CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 390CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
391CONFIG_NETFILTER_XT_TARGET_NFLOG=m
337CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 392CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
338CONFIG_NETFILTER_XT_TARGET_SECMARK=m 393CONFIG_NETFILTER_XT_TARGET_SECMARK=m
339# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 394# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
395CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
340CONFIG_NETFILTER_XT_MATCH_COMMENT=m 396CONFIG_NETFILTER_XT_MATCH_COMMENT=m
397CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
341CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 398CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
342CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 399CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
343CONFIG_NETFILTER_XT_MATCH_DCCP=m 400CONFIG_NETFILTER_XT_MATCH_DCCP=m
401CONFIG_NETFILTER_XT_MATCH_DSCP=m
344CONFIG_NETFILTER_XT_MATCH_ESP=m 402CONFIG_NETFILTER_XT_MATCH_ESP=m
345CONFIG_NETFILTER_XT_MATCH_HELPER=m 403CONFIG_NETFILTER_XT_MATCH_HELPER=m
346CONFIG_NETFILTER_XT_MATCH_LENGTH=m 404CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -358,60 +416,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
358CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 416CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
359CONFIG_NETFILTER_XT_MATCH_STRING=m 417CONFIG_NETFILTER_XT_MATCH_STRING=m
360CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 418CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
419CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
361 420
362# 421#
363# IP: Netfilter Configuration 422# IP: Netfilter Configuration
364# 423#
365CONFIG_IP_NF_CONNTRACK=m 424CONFIG_NF_CONNTRACK_IPV4=m
366# CONFIG_IP_NF_CT_ACCT is not set 425CONFIG_NF_CONNTRACK_PROC_COMPAT=y
367CONFIG_IP_NF_CONNTRACK_MARK=y
368CONFIG_IP_NF_CONNTRACK_SECMARK=y
369CONFIG_IP_NF_CONNTRACK_EVENTS=y
370CONFIG_IP_NF_CONNTRACK_NETLINK=m
371CONFIG_IP_NF_CT_PROTO_SCTP=m
372CONFIG_IP_NF_FTP=m
373CONFIG_IP_NF_IRC=m
374# CONFIG_IP_NF_NETBIOS_NS is not set
375CONFIG_IP_NF_TFTP=m
376CONFIG_IP_NF_AMANDA=m
377CONFIG_IP_NF_PPTP=m
378CONFIG_IP_NF_H323=m
379CONFIG_IP_NF_SIP=m
380CONFIG_IP_NF_QUEUE=m 426CONFIG_IP_NF_QUEUE=m
381CONFIG_IP_NF_IPTABLES=m 427CONFIG_IP_NF_IPTABLES=m
382CONFIG_IP_NF_MATCH_IPRANGE=m 428CONFIG_IP_NF_MATCH_IPRANGE=m
383CONFIG_IP_NF_MATCH_TOS=m 429CONFIG_IP_NF_MATCH_TOS=m
384CONFIG_IP_NF_MATCH_RECENT=m 430CONFIG_IP_NF_MATCH_RECENT=m
385CONFIG_IP_NF_MATCH_ECN=m 431CONFIG_IP_NF_MATCH_ECN=m
386CONFIG_IP_NF_MATCH_DSCP=m
387CONFIG_IP_NF_MATCH_AH=m 432CONFIG_IP_NF_MATCH_AH=m
388CONFIG_IP_NF_MATCH_TTL=m 433CONFIG_IP_NF_MATCH_TTL=m
389CONFIG_IP_NF_MATCH_OWNER=m 434CONFIG_IP_NF_MATCH_OWNER=m
390CONFIG_IP_NF_MATCH_ADDRTYPE=m 435CONFIG_IP_NF_MATCH_ADDRTYPE=m
391CONFIG_IP_NF_MATCH_HASHLIMIT=m
392CONFIG_IP_NF_FILTER=m 436CONFIG_IP_NF_FILTER=m
393CONFIG_IP_NF_TARGET_REJECT=m 437CONFIG_IP_NF_TARGET_REJECT=m
394CONFIG_IP_NF_TARGET_LOG=m 438CONFIG_IP_NF_TARGET_LOG=m
395CONFIG_IP_NF_TARGET_ULOG=m 439CONFIG_IP_NF_TARGET_ULOG=m
396CONFIG_IP_NF_TARGET_TCPMSS=m 440CONFIG_NF_NAT=m
397CONFIG_IP_NF_NAT=m 441CONFIG_NF_NAT_NEEDED=y
398CONFIG_IP_NF_NAT_NEEDED=y
399CONFIG_IP_NF_TARGET_MASQUERADE=m 442CONFIG_IP_NF_TARGET_MASQUERADE=m
400CONFIG_IP_NF_TARGET_REDIRECT=m 443CONFIG_IP_NF_TARGET_REDIRECT=m
401CONFIG_IP_NF_TARGET_NETMAP=m 444CONFIG_IP_NF_TARGET_NETMAP=m
402CONFIG_IP_NF_TARGET_SAME=m 445CONFIG_IP_NF_TARGET_SAME=m
403CONFIG_IP_NF_NAT_SNMP_BASIC=m 446CONFIG_NF_NAT_SNMP_BASIC=m
404CONFIG_IP_NF_NAT_IRC=m 447CONFIG_NF_NAT_PROTO_GRE=m
405CONFIG_IP_NF_NAT_FTP=m 448CONFIG_NF_NAT_FTP=m
406CONFIG_IP_NF_NAT_TFTP=m 449CONFIG_NF_NAT_IRC=m
407CONFIG_IP_NF_NAT_AMANDA=m 450CONFIG_NF_NAT_TFTP=m
408CONFIG_IP_NF_NAT_PPTP=m 451CONFIG_NF_NAT_AMANDA=m
409CONFIG_IP_NF_NAT_H323=m 452CONFIG_NF_NAT_PPTP=m
410CONFIG_IP_NF_NAT_SIP=m 453CONFIG_NF_NAT_H323=m
454CONFIG_NF_NAT_SIP=m
411CONFIG_IP_NF_MANGLE=m 455CONFIG_IP_NF_MANGLE=m
412CONFIG_IP_NF_TARGET_TOS=m 456CONFIG_IP_NF_TARGET_TOS=m
413CONFIG_IP_NF_TARGET_ECN=m 457CONFIG_IP_NF_TARGET_ECN=m
414CONFIG_IP_NF_TARGET_DSCP=m
415CONFIG_IP_NF_TARGET_TTL=m 458CONFIG_IP_NF_TARGET_TTL=m
416CONFIG_IP_NF_TARGET_CLUSTERIP=m 459CONFIG_IP_NF_TARGET_CLUSTERIP=m
417CONFIG_IP_NF_RAW=m 460CONFIG_IP_NF_RAW=m
@@ -422,6 +465,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
422# 465#
423# IPv6: Netfilter Configuration (EXPERIMENTAL) 466# IPv6: Netfilter Configuration (EXPERIMENTAL)
424# 467#
468CONFIG_NF_CONNTRACK_IPV6=m
425CONFIG_IP6_NF_QUEUE=m 469CONFIG_IP6_NF_QUEUE=m
426CONFIG_IP6_NF_IPTABLES=m 470CONFIG_IP6_NF_IPTABLES=m
427CONFIG_IP6_NF_MATCH_RT=m 471CONFIG_IP6_NF_MATCH_RT=m
@@ -431,6 +475,7 @@ CONFIG_IP6_NF_MATCH_HL=m
431CONFIG_IP6_NF_MATCH_OWNER=m 475CONFIG_IP6_NF_MATCH_OWNER=m
432CONFIG_IP6_NF_MATCH_IPV6HEADER=m 476CONFIG_IP6_NF_MATCH_IPV6HEADER=m
433CONFIG_IP6_NF_MATCH_AH=m 477CONFIG_IP6_NF_MATCH_AH=m
478CONFIG_IP6_NF_MATCH_MH=m
434CONFIG_IP6_NF_MATCH_EUI64=m 479CONFIG_IP6_NF_MATCH_EUI64=m
435CONFIG_IP6_NF_FILTER=m 480CONFIG_IP6_NF_FILTER=m
436CONFIG_IP6_NF_TARGET_LOG=m 481CONFIG_IP6_NF_TARGET_LOG=m
@@ -493,7 +538,6 @@ CONFIG_LLC=m
493# CONFIG_ATALK is not set 538# CONFIG_ATALK is not set
494# CONFIG_X25 is not set 539# CONFIG_X25 is not set
495# CONFIG_LAPB is not set 540# CONFIG_LAPB is not set
496# CONFIG_NET_DIVERT is not set
497# CONFIG_ECONET is not set 541# CONFIG_ECONET is not set
498# CONFIG_WAN_ROUTER is not set 542# CONFIG_WAN_ROUTER is not set
499 543
@@ -501,6 +545,7 @@ CONFIG_LLC=m
501# QoS and/or fair queueing 545# QoS and/or fair queueing
502# 546#
503CONFIG_NET_SCHED=y 547CONFIG_NET_SCHED=y
548CONFIG_NET_SCH_FIFO=y
504CONFIG_NET_SCH_CLK_JIFFIES=y 549CONFIG_NET_SCH_CLK_JIFFIES=y
505# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 550# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
506# CONFIG_NET_SCH_CLK_CPU is not set 551# CONFIG_NET_SCH_CLK_CPU is not set
@@ -575,6 +620,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
575CONFIG_IEEE80211_SOFTMAC=m 620CONFIG_IEEE80211_SOFTMAC=m
576# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 621# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
577CONFIG_WIRELESS_EXT=y 622CONFIG_WIRELESS_EXT=y
623CONFIG_FIB_RULES=y
578 624
579# 625#
580# Device Drivers 626# Device Drivers
@@ -606,10 +652,10 @@ CONFIG_PARPORT_PC=m
606CONFIG_PARPORT_SERIAL=m 652CONFIG_PARPORT_SERIAL=m
607# CONFIG_PARPORT_PC_FIFO is not set 653# CONFIG_PARPORT_PC_FIFO is not set
608# CONFIG_PARPORT_PC_SUPERIO is not set 654# CONFIG_PARPORT_PC_SUPERIO is not set
609CONFIG_PARPORT_NOT_PC=y
610# CONFIG_PARPORT_GSC is not set 655# CONFIG_PARPORT_GSC is not set
611# CONFIG_PARPORT_AX88796 is not set 656# CONFIG_PARPORT_AX88796 is not set
612CONFIG_PARPORT_1284=y 657CONFIG_PARPORT_1284=y
658CONFIG_PARPORT_NOT_PC=y
613 659
614# 660#
615# Plug and Play support 661# Plug and Play support
@@ -621,7 +667,6 @@ CONFIG_PARPORT_1284=y
621# 667#
622CONFIG_BLK_DEV_FD=m 668CONFIG_BLK_DEV_FD=m
623CONFIG_PARIDE=m 669CONFIG_PARIDE=m
624CONFIG_PARIDE_PARPORT=m
625 670
626# 671#
627# Parallel IDE high-level drivers 672# Parallel IDE high-level drivers
@@ -664,6 +709,7 @@ CONFIG_BLK_DEV_UB=m
664CONFIG_BLK_DEV_RAM=m 709CONFIG_BLK_DEV_RAM=m
665CONFIG_BLK_DEV_RAM_COUNT=16 710CONFIG_BLK_DEV_RAM_COUNT=16
666CONFIG_BLK_DEV_RAM_SIZE=4096 711CONFIG_BLK_DEV_RAM_SIZE=4096
712CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
667# CONFIG_BLK_DEV_INITRD is not set 713# CONFIG_BLK_DEV_INITRD is not set
668CONFIG_CDROM_PKTCDVD=m 714CONFIG_CDROM_PKTCDVD=m
669CONFIG_CDROM_PKTCDVD_BUFFERS=8 715CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -671,6 +717,12 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
671CONFIG_ATA_OVER_ETH=m 717CONFIG_ATA_OVER_ETH=m
672 718
673# 719#
720# Misc devices
721#
722CONFIG_SGI_IOC4=m
723# CONFIG_TIFM_CORE is not set
724
725#
674# ATA/ATAPI/MFM/RLL support 726# ATA/ATAPI/MFM/RLL support
675# 727#
676# CONFIG_IDE is not set 728# CONFIG_IDE is not set
@@ -680,6 +732,8 @@ CONFIG_ATA_OVER_ETH=m
680# 732#
681CONFIG_RAID_ATTRS=m 733CONFIG_RAID_ATTRS=m
682CONFIG_SCSI=y 734CONFIG_SCSI=y
735CONFIG_SCSI_TGT=m
736CONFIG_SCSI_NETLINK=y
683CONFIG_SCSI_PROC_FS=y 737CONFIG_SCSI_PROC_FS=y
684 738
685# 739#
@@ -699,14 +753,17 @@ CONFIG_BLK_DEV_SR_VENDOR=y
699# CONFIG_SCSI_MULTI_LUN is not set 753# CONFIG_SCSI_MULTI_LUN is not set
700CONFIG_SCSI_CONSTANTS=y 754CONFIG_SCSI_CONSTANTS=y
701# CONFIG_SCSI_LOGGING is not set 755# CONFIG_SCSI_LOGGING is not set
756CONFIG_SCSI_SCAN_ASYNC=y
702 757
703# 758#
704# SCSI Transport Attributes 759# SCSI Transports
705# 760#
706CONFIG_SCSI_SPI_ATTRS=y 761CONFIG_SCSI_SPI_ATTRS=y
707CONFIG_SCSI_FC_ATTRS=y 762CONFIG_SCSI_FC_ATTRS=y
708CONFIG_SCSI_ISCSI_ATTRS=m 763CONFIG_SCSI_ISCSI_ATTRS=m
709CONFIG_SCSI_SAS_ATTRS=m 764CONFIG_SCSI_SAS_ATTRS=m
765CONFIG_SCSI_SAS_LIBSAS=m
766# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
710 767
711# 768#
712# SCSI low-level drivers 769# SCSI low-level drivers
@@ -720,14 +777,16 @@ CONFIG_ISCSI_TCP=m
720# CONFIG_SCSI_AIC7XXX is not set 777# CONFIG_SCSI_AIC7XXX is not set
721# CONFIG_SCSI_AIC7XXX_OLD is not set 778# CONFIG_SCSI_AIC7XXX_OLD is not set
722# CONFIG_SCSI_AIC79XX is not set 779# CONFIG_SCSI_AIC79XX is not set
780CONFIG_SCSI_AIC94XX=m
781# CONFIG_AIC94XX_DEBUG is not set
723# CONFIG_SCSI_DPT_I2O is not set 782# CONFIG_SCSI_DPT_I2O is not set
724# CONFIG_SCSI_IN2000 is not set 783# CONFIG_SCSI_IN2000 is not set
784# CONFIG_SCSI_ARCMSR is not set
725CONFIG_MEGARAID_NEWGEN=y 785CONFIG_MEGARAID_NEWGEN=y
726CONFIG_MEGARAID_MM=m 786CONFIG_MEGARAID_MM=m
727CONFIG_MEGARAID_MAILBOX=m 787CONFIG_MEGARAID_MAILBOX=m
728# CONFIG_MEGARAID_LEGACY is not set 788# CONFIG_MEGARAID_LEGACY is not set
729# CONFIG_MEGARAID_SAS is not set 789# CONFIG_MEGARAID_SAS is not set
730# CONFIG_SCSI_SATA is not set
731# CONFIG_SCSI_HPTIOP is not set 790# CONFIG_SCSI_HPTIOP is not set
732# CONFIG_SCSI_DMX3191D is not set 791# CONFIG_SCSI_DMX3191D is not set
733# CONFIG_SCSI_DTC3280 is not set 792# CONFIG_SCSI_DTC3280 is not set
@@ -742,17 +801,19 @@ CONFIG_SCSI_IMM=m
742# CONFIG_SCSI_IZIP_EPP16 is not set 801# CONFIG_SCSI_IZIP_EPP16 is not set
743# CONFIG_SCSI_IZIP_SLOW_CTR is not set 802# CONFIG_SCSI_IZIP_SLOW_CTR is not set
744# CONFIG_SCSI_NCR53C406A is not set 803# CONFIG_SCSI_NCR53C406A is not set
804# CONFIG_SCSI_SNI_53C710 is not set
805# CONFIG_SCSI_STEX is not set
745CONFIG_SCSI_SYM53C8XX_2=y 806CONFIG_SCSI_SYM53C8XX_2=y
746CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 807CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
747CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 808CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
748CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 809CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
749CONFIG_SCSI_SYM53C8XX_MMIO=y 810CONFIG_SCSI_SYM53C8XX_MMIO=y
750# CONFIG_SCSI_IPR is not set
751# CONFIG_SCSI_PAS16 is not set 811# CONFIG_SCSI_PAS16 is not set
752# CONFIG_SCSI_PSI240I is not set 812# CONFIG_SCSI_PSI240I is not set
753# CONFIG_SCSI_QLOGIC_FAS is not set 813# CONFIG_SCSI_QLOGIC_FAS is not set
754# CONFIG_SCSI_QLOGIC_1280 is not set 814# CONFIG_SCSI_QLOGIC_1280 is not set
755# CONFIG_SCSI_QLA_FC is not set 815# CONFIG_SCSI_QLA_FC is not set
816# CONFIG_SCSI_QLA_ISCSI is not set
756# CONFIG_SCSI_LPFC is not set 817# CONFIG_SCSI_LPFC is not set
757# CONFIG_SCSI_SYM53C416 is not set 818# CONFIG_SCSI_SYM53C416 is not set
758# CONFIG_SCSI_DC395x is not set 819# CONFIG_SCSI_DC395x is not set
@@ -760,6 +821,12 @@ CONFIG_SCSI_SYM53C8XX_MMIO=y
760# CONFIG_SCSI_T128 is not set 821# CONFIG_SCSI_T128 is not set
761# CONFIG_SCSI_NSP32 is not set 822# CONFIG_SCSI_NSP32 is not set
762# CONFIG_SCSI_DEBUG is not set 823# CONFIG_SCSI_DEBUG is not set
824# CONFIG_SCSI_SRP is not set
825
826#
827# Serial ATA (prod) and Parallel ATA (experimental) drivers
828#
829# CONFIG_ATA is not set
763 830
764# 831#
765# Old CD-ROM drivers (not SCSI, not IDE) 832# Old CD-ROM drivers (not SCSI, not IDE)
@@ -780,6 +847,7 @@ CONFIG_MD_RAID5_RESHAPE=y
780CONFIG_MD_MULTIPATH=m 847CONFIG_MD_MULTIPATH=m
781CONFIG_MD_FAULTY=m 848CONFIG_MD_FAULTY=m
782CONFIG_BLK_DEV_DM=m 849CONFIG_BLK_DEV_DM=m
850# CONFIG_DM_DEBUG is not set
783# CONFIG_DM_CRYPT is not set 851# CONFIG_DM_CRYPT is not set
784CONFIG_DM_SNAPSHOT=m 852CONFIG_DM_SNAPSHOT=m
785CONFIG_DM_MIRROR=m 853CONFIG_DM_MIRROR=m
@@ -834,6 +902,8 @@ CONFIG_LXT_PHY=m
834CONFIG_CICADA_PHY=m 902CONFIG_CICADA_PHY=m
835CONFIG_VITESSE_PHY=m 903CONFIG_VITESSE_PHY=m
836CONFIG_SMSC_PHY=m 904CONFIG_SMSC_PHY=m
905# CONFIG_BROADCOM_PHY is not set
906# CONFIG_FIXED_PHY is not set
837 907
838# 908#
839# Ethernet (10 or 100Mbit) 909# Ethernet (10 or 100Mbit)
@@ -868,6 +938,7 @@ CONFIG_NE2000=m
868# CONFIG_SEEQ8005 is not set 938# CONFIG_SEEQ8005 is not set
869CONFIG_NET_PCI=y 939CONFIG_NET_PCI=y
870CONFIG_PCNET32=y 940CONFIG_PCNET32=y
941# CONFIG_PCNET32_NAPI is not set
871# CONFIG_AMD8111_ETH is not set 942# CONFIG_AMD8111_ETH is not set
872# CONFIG_ADAPTEC_STARFIRE is not set 943# CONFIG_ADAPTEC_STARFIRE is not set
873# CONFIG_AC3200 is not set 944# CONFIG_AC3200 is not set
@@ -888,7 +959,7 @@ CONFIG_EEPRO100=m
888# CONFIG_SUNDANCE is not set 959# CONFIG_SUNDANCE is not set
889# CONFIG_TLAN is not set 960# CONFIG_TLAN is not set
890# CONFIG_VIA_RHINE is not set 961# CONFIG_VIA_RHINE is not set
891# CONFIG_LAN_SAA9730 is not set 962# CONFIG_SC92031 is not set
892# CONFIG_NET_POCKET is not set 963# CONFIG_NET_POCKET is not set
893 964
894# 965#
@@ -908,14 +979,18 @@ CONFIG_EEPRO100=m
908CONFIG_VIA_VELOCITY=m 979CONFIG_VIA_VELOCITY=m
909# CONFIG_TIGON3 is not set 980# CONFIG_TIGON3 is not set
910# CONFIG_BNX2 is not set 981# CONFIG_BNX2 is not set
982CONFIG_QLA3XXX=m
983# CONFIG_ATL1 is not set
911 984
912# 985#
913# Ethernet (10000 Mbit) 986# Ethernet (10000 Mbit)
914# 987#
915# CONFIG_CHELSIO_T1 is not set 988# CONFIG_CHELSIO_T1 is not set
989CONFIG_CHELSIO_T3=m
916# CONFIG_IXGB is not set 990# CONFIG_IXGB is not set
917# CONFIG_S2IO is not set 991# CONFIG_S2IO is not set
918# CONFIG_MYRI10GE is not set 992# CONFIG_MYRI10GE is not set
993CONFIG_NETXEN_NIC=m
919 994
920# 995#
921# Token Ring devices 996# Token Ring devices
@@ -956,6 +1031,7 @@ CONFIG_PLIP=m
956# Input device support 1031# Input device support
957# 1032#
958CONFIG_INPUT=y 1033CONFIG_INPUT=y
1034CONFIG_INPUT_FF_MEMLESS=m
959 1035
960# 1036#
961# Userland interfaces 1037# Userland interfaces
@@ -978,6 +1054,7 @@ CONFIG_KEYBOARD_ATKBD=y
978# CONFIG_KEYBOARD_LKKBD is not set 1054# CONFIG_KEYBOARD_LKKBD is not set
979# CONFIG_KEYBOARD_XTKBD is not set 1055# CONFIG_KEYBOARD_XTKBD is not set
980# CONFIG_KEYBOARD_NEWTON is not set 1056# CONFIG_KEYBOARD_NEWTON is not set
1057# CONFIG_KEYBOARD_STOWAWAY is not set
981CONFIG_INPUT_MOUSE=y 1058CONFIG_INPUT_MOUSE=y
982CONFIG_MOUSE_PS2=y 1059CONFIG_MOUSE_PS2=y
983# CONFIG_MOUSE_SERIAL is not set 1060# CONFIG_MOUSE_SERIAL is not set
@@ -1051,10 +1128,6 @@ CONFIG_RTC=m
1051# CONFIG_DTLK is not set 1128# CONFIG_DTLK is not set
1052# CONFIG_R3964 is not set 1129# CONFIG_R3964 is not set
1053# CONFIG_APPLICOM is not set 1130# CONFIG_APPLICOM is not set
1054
1055#
1056# Ftape, the floppy tape device driver
1057#
1058# CONFIG_DRM is not set 1131# CONFIG_DRM is not set
1059# CONFIG_RAW_DRIVER is not set 1132# CONFIG_RAW_DRIVER is not set
1060 1133
@@ -1062,7 +1135,6 @@ CONFIG_RTC=m
1062# TPM devices 1135# TPM devices
1063# 1136#
1064# CONFIG_TCG_TPM is not set 1137# CONFIG_TCG_TPM is not set
1065# CONFIG_TELCLOCK is not set
1066 1138
1067# 1139#
1068# I2C support 1140# I2C support
@@ -1101,14 +1173,9 @@ CONFIG_W1_CON=y
1101# CONFIG_HWMON_VID is not set 1173# CONFIG_HWMON_VID is not set
1102 1174
1103# 1175#
1104# Misc devices
1105#
1106
1107#
1108# Multimedia devices 1176# Multimedia devices
1109# 1177#
1110# CONFIG_VIDEO_DEV is not set 1178# CONFIG_VIDEO_DEV is not set
1111CONFIG_VIDEO_V4L2=y
1112 1179
1113# 1180#
1114# Digital Video Broadcasting Devices 1181# Digital Video Broadcasting Devices
@@ -1129,6 +1196,7 @@ CONFIG_VGA_CONSOLE=y
1129# CONFIG_VGACON_SOFT_SCROLLBACK is not set 1196# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1130# CONFIG_MDA_CONSOLE is not set 1197# CONFIG_MDA_CONSOLE is not set
1131CONFIG_DUMMY_CONSOLE=y 1198CONFIG_DUMMY_CONSOLE=y
1199# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1132 1200
1133# 1201#
1134# Sound 1202# Sound
@@ -1136,6 +1204,12 @@ CONFIG_DUMMY_CONSOLE=y
1136# CONFIG_SOUND is not set 1204# CONFIG_SOUND is not set
1137 1205
1138# 1206#
1207# HID Devices
1208#
1209CONFIG_HID=y
1210# CONFIG_HID_DEBUG is not set
1211
1212#
1139# USB support 1213# USB support
1140# 1214#
1141CONFIG_USB_ARCH_HAS_HCD=y 1215CONFIG_USB_ARCH_HAS_HCD=y
@@ -1148,8 +1222,8 @@ CONFIG_USB=m
1148# Miscellaneous USB options 1222# Miscellaneous USB options
1149# 1223#
1150CONFIG_USB_DEVICEFS=y 1224CONFIG_USB_DEVICEFS=y
1151# CONFIG_USB_BANDWIDTH is not set
1152# CONFIG_USB_DYNAMIC_MINORS is not set 1225# CONFIG_USB_DYNAMIC_MINORS is not set
1226# CONFIG_USB_SUSPEND is not set
1153# CONFIG_USB_OTG is not set 1227# CONFIG_USB_OTG is not set
1154 1228
1155# 1229#
@@ -1159,9 +1233,11 @@ CONFIG_USB_EHCI_HCD=m
1159# CONFIG_USB_EHCI_SPLIT_ISO is not set 1233# CONFIG_USB_EHCI_SPLIT_ISO is not set
1160# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1234# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1161# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1235# CONFIG_USB_EHCI_TT_NEWSCHED is not set
1236# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
1162# CONFIG_USB_ISP116X_HCD is not set 1237# CONFIG_USB_ISP116X_HCD is not set
1163CONFIG_USB_OHCI_HCD=m 1238CONFIG_USB_OHCI_HCD=m
1164# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1239# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1240# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1165CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1241CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1166CONFIG_USB_UHCI_HCD=m 1242CONFIG_USB_UHCI_HCD=m
1167# CONFIG_USB_SL811_HCD is not set 1243# CONFIG_USB_SL811_HCD is not set
@@ -1189,18 +1265,20 @@ CONFIG_USB_STORAGE_SDDR09=y
1189CONFIG_USB_STORAGE_SDDR55=y 1265CONFIG_USB_STORAGE_SDDR55=y
1190CONFIG_USB_STORAGE_JUMPSHOT=y 1266CONFIG_USB_STORAGE_JUMPSHOT=y
1191# CONFIG_USB_STORAGE_ALAUDA is not set 1267# CONFIG_USB_STORAGE_ALAUDA is not set
1268# CONFIG_USB_STORAGE_KARMA is not set
1192# CONFIG_USB_LIBUSUAL is not set 1269# CONFIG_USB_LIBUSUAL is not set
1193 1270
1194# 1271#
1195# USB Input Devices 1272# USB Input Devices
1196# 1273#
1197CONFIG_USB_HID=m 1274CONFIG_USB_HID=m
1198CONFIG_USB_HIDINPUT=y
1199# CONFIG_USB_HIDINPUT_POWERBOOK is not set 1275# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1200CONFIG_HID_FF=y 1276CONFIG_HID_FF=y
1201CONFIG_HID_PID=y 1277CONFIG_HID_PID=y
1202CONFIG_LOGITECH_FF=y 1278CONFIG_LOGITECH_FF=y
1279# CONFIG_PANTHERLORD_FF is not set
1203CONFIG_THRUSTMASTER_FF=y 1280CONFIG_THRUSTMASTER_FF=y
1281# CONFIG_ZEROPLUS_FF is not set
1204CONFIG_USB_HIDDEV=y 1282CONFIG_USB_HIDDEV=y
1205 1283
1206# 1284#
@@ -1220,6 +1298,7 @@ CONFIG_USB_XPAD=m
1220# CONFIG_USB_ATI_REMOTE2 is not set 1298# CONFIG_USB_ATI_REMOTE2 is not set
1221# CONFIG_USB_KEYSPAN_REMOTE is not set 1299# CONFIG_USB_KEYSPAN_REMOTE is not set
1222# CONFIG_USB_APPLETOUCH is not set 1300# CONFIG_USB_APPLETOUCH is not set
1301# CONFIG_USB_GTCO is not set
1223 1302
1224# 1303#
1225# USB Imaging devices 1304# USB Imaging devices
@@ -1234,12 +1313,14 @@ CONFIG_USB_CATC=m
1234CONFIG_USB_KAWETH=m 1313CONFIG_USB_KAWETH=m
1235CONFIG_USB_PEGASUS=m 1314CONFIG_USB_PEGASUS=m
1236CONFIG_USB_RTL8150=m 1315CONFIG_USB_RTL8150=m
1316CONFIG_USB_USBNET_MII=m
1237CONFIG_USB_USBNET=m 1317CONFIG_USB_USBNET=m
1238CONFIG_USB_NET_AX8817X=m 1318CONFIG_USB_NET_AX8817X=m
1239CONFIG_USB_NET_CDCETHER=m 1319CONFIG_USB_NET_CDCETHER=m
1240# CONFIG_USB_NET_GL620A is not set 1320# CONFIG_USB_NET_GL620A is not set
1241CONFIG_USB_NET_NET1080=m 1321CONFIG_USB_NET_NET1080=m
1242# CONFIG_USB_NET_PLUSB is not set 1322# CONFIG_USB_NET_PLUSB is not set
1323# CONFIG_USB_NET_MCS7830 is not set
1243# CONFIG_USB_NET_RNDIS_HOST is not set 1324# CONFIG_USB_NET_RNDIS_HOST is not set
1244# CONFIG_USB_NET_CDC_SUBSET is not set 1325# CONFIG_USB_NET_CDC_SUBSET is not set
1245CONFIG_USB_NET_ZAURUS=m 1326CONFIG_USB_NET_ZAURUS=m
@@ -1255,8 +1336,8 @@ CONFIG_USB_USS720=m
1255# 1336#
1256CONFIG_USB_SERIAL=m 1337CONFIG_USB_SERIAL=m
1257CONFIG_USB_SERIAL_GENERIC=y 1338CONFIG_USB_SERIAL_GENERIC=y
1339# CONFIG_USB_SERIAL_AIRCABLE is not set
1258CONFIG_USB_SERIAL_AIRPRIME=m 1340CONFIG_USB_SERIAL_AIRPRIME=m
1259CONFIG_USB_SERIAL_ANYDATA=m
1260# CONFIG_USB_SERIAL_ARK3116 is not set 1341# CONFIG_USB_SERIAL_ARK3116 is not set
1261CONFIG_USB_SERIAL_BELKIN=m 1342CONFIG_USB_SERIAL_BELKIN=m
1262CONFIG_USB_SERIAL_WHITEHEAT=m 1343CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -1290,16 +1371,20 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1290CONFIG_USB_SERIAL_KLSI=m 1371CONFIG_USB_SERIAL_KLSI=m
1291CONFIG_USB_SERIAL_KOBIL_SCT=m 1372CONFIG_USB_SERIAL_KOBIL_SCT=m
1292CONFIG_USB_SERIAL_MCT_U232=m 1373CONFIG_USB_SERIAL_MCT_U232=m
1374# CONFIG_USB_SERIAL_MOS7720 is not set
1375# CONFIG_USB_SERIAL_MOS7840 is not set
1293# CONFIG_USB_SERIAL_NAVMAN is not set 1376# CONFIG_USB_SERIAL_NAVMAN is not set
1294CONFIG_USB_SERIAL_PL2303=m 1377CONFIG_USB_SERIAL_PL2303=m
1295CONFIG_USB_SERIAL_HP4X=m 1378CONFIG_USB_SERIAL_HP4X=m
1296CONFIG_USB_SERIAL_SAFE=m 1379CONFIG_USB_SERIAL_SAFE=m
1297CONFIG_USB_SERIAL_SAFE_PADDED=y 1380CONFIG_USB_SERIAL_SAFE_PADDED=y
1381# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
1298# CONFIG_USB_SERIAL_TI is not set 1382# CONFIG_USB_SERIAL_TI is not set
1299CONFIG_USB_SERIAL_CYBERJACK=m 1383CONFIG_USB_SERIAL_CYBERJACK=m
1300CONFIG_USB_SERIAL_XIRCOM=m 1384CONFIG_USB_SERIAL_XIRCOM=m
1301# CONFIG_USB_SERIAL_OPTION is not set 1385# CONFIG_USB_SERIAL_OPTION is not set
1302CONFIG_USB_SERIAL_OMNINET=m 1386CONFIG_USB_SERIAL_OMNINET=m
1387# CONFIG_USB_SERIAL_DEBUG is not set
1303CONFIG_USB_EZUSB=y 1388CONFIG_USB_EZUSB=y
1304 1389
1305# 1390#
@@ -1307,20 +1392,22 @@ CONFIG_USB_EZUSB=y
1307# 1392#
1308# CONFIG_USB_EMI62 is not set 1393# CONFIG_USB_EMI62 is not set
1309# CONFIG_USB_EMI26 is not set 1394# CONFIG_USB_EMI26 is not set
1395# CONFIG_USB_ADUTUX is not set
1310CONFIG_USB_AUERSWALD=m 1396CONFIG_USB_AUERSWALD=m
1311CONFIG_USB_RIO500=m 1397CONFIG_USB_RIO500=m
1312CONFIG_USB_LEGOTOWER=m 1398CONFIG_USB_LEGOTOWER=m
1313CONFIG_USB_LCD=m 1399CONFIG_USB_LCD=m
1314CONFIG_USB_LED=m 1400CONFIG_USB_LED=m
1315# CONFIG_USB_CY7C63 is not set 1401# CONFIG_USB_CYPRESS_CY7C63 is not set
1316CONFIG_USB_CYTHERM=m 1402CONFIG_USB_CYTHERM=m
1317CONFIG_USB_PHIDGETKIT=m 1403# CONFIG_USB_PHIDGET is not set
1318CONFIG_USB_PHIDGETSERVO=m
1319# CONFIG_USB_IDMOUSE is not set 1404# CONFIG_USB_IDMOUSE is not set
1405# CONFIG_USB_FTDI_ELAN is not set
1320# CONFIG_USB_APPLEDISPLAY is not set 1406# CONFIG_USB_APPLEDISPLAY is not set
1321CONFIG_USB_SISUSBVGA=m 1407CONFIG_USB_SISUSBVGA=m
1322# CONFIG_USB_SISUSBVGA_CON is not set 1408# CONFIG_USB_SISUSBVGA_CON is not set
1323CONFIG_USB_LD=m 1409CONFIG_USB_LD=m
1410# CONFIG_USB_TRANCEVIBRATOR is not set
1324CONFIG_USB_TEST=m 1411CONFIG_USB_TEST=m
1325 1412
1326# 1413#
@@ -1378,6 +1465,15 @@ CONFIG_USB_TEST=m
1378# 1465#
1379 1466
1380# 1467#
1468# Auxiliary Display support
1469#
1470# CONFIG_KS0108 is not set
1471
1472#
1473# Virtualization
1474#
1475
1476#
1381# File systems 1477# File systems
1382# 1478#
1383CONFIG_EXT2_FS=m 1479CONFIG_EXT2_FS=m
@@ -1387,6 +1483,7 @@ CONFIG_EXT3_FS=y
1387CONFIG_EXT3_FS_XATTR=y 1483CONFIG_EXT3_FS_XATTR=y
1388# CONFIG_EXT3_FS_POSIX_ACL is not set 1484# CONFIG_EXT3_FS_POSIX_ACL is not set
1389# CONFIG_EXT3_FS_SECURITY is not set 1485# CONFIG_EXT3_FS_SECURITY is not set
1486# CONFIG_EXT4DEV_FS is not set
1390CONFIG_JBD=y 1487CONFIG_JBD=y
1391# CONFIG_JBD_DEBUG is not set 1488# CONFIG_JBD_DEBUG is not set
1392CONFIG_FS_MBCACHE=y 1489CONFIG_FS_MBCACHE=y
@@ -1403,6 +1500,7 @@ CONFIG_XFS_QUOTA=y
1403CONFIG_XFS_SECURITY=y 1500CONFIG_XFS_SECURITY=y
1404# CONFIG_XFS_POSIX_ACL is not set 1501# CONFIG_XFS_POSIX_ACL is not set
1405# CONFIG_XFS_RT is not set 1502# CONFIG_XFS_RT is not set
1503# CONFIG_GFS2_FS is not set
1406# CONFIG_OCFS2_FS is not set 1504# CONFIG_OCFS2_FS is not set
1407CONFIG_MINIX_FS=m 1505CONFIG_MINIX_FS=m
1408CONFIG_ROMFS_FS=m 1506CONFIG_ROMFS_FS=m
@@ -1414,6 +1512,7 @@ CONFIG_DNOTIFY=y
1414CONFIG_AUTOFS_FS=m 1512CONFIG_AUTOFS_FS=m
1415CONFIG_AUTOFS4_FS=m 1513CONFIG_AUTOFS4_FS=m
1416CONFIG_FUSE_FS=m 1514CONFIG_FUSE_FS=m
1515CONFIG_GENERIC_ACL=y
1417 1516
1418# 1517#
1419# CD-ROM/DVD Filesystems 1518# CD-ROM/DVD Filesystems
@@ -1421,7 +1520,6 @@ CONFIG_FUSE_FS=m
1421CONFIG_ISO9660_FS=m 1520CONFIG_ISO9660_FS=m
1422CONFIG_JOLIET=y 1521CONFIG_JOLIET=y
1423CONFIG_ZISOFS=y 1522CONFIG_ZISOFS=y
1424CONFIG_ZISOFS_FS=m
1425CONFIG_UDF_FS=m 1523CONFIG_UDF_FS=m
1426CONFIG_UDF_NLS=y 1524CONFIG_UDF_NLS=y
1427 1525
@@ -1442,11 +1540,13 @@ CONFIG_NTFS_FS=m
1442# 1540#
1443CONFIG_PROC_FS=y 1541CONFIG_PROC_FS=y
1444CONFIG_PROC_KCORE=y 1542CONFIG_PROC_KCORE=y
1543CONFIG_PROC_SYSCTL=y
1445CONFIG_SYSFS=y 1544CONFIG_SYSFS=y
1446CONFIG_TMPFS=y 1545CONFIG_TMPFS=y
1546CONFIG_TMPFS_POSIX_ACL=y
1447# CONFIG_HUGETLB_PAGE is not set 1547# CONFIG_HUGETLB_PAGE is not set
1448CONFIG_RAMFS=y 1548CONFIG_RAMFS=y
1449# CONFIG_CONFIGFS_FS is not set 1549CONFIG_CONFIGFS_FS=m
1450 1550
1451# 1551#
1452# Miscellaneous filesystems 1552# Miscellaneous filesystems
@@ -1454,6 +1554,7 @@ CONFIG_RAMFS=y
1454CONFIG_ADFS_FS=m 1554CONFIG_ADFS_FS=m
1455# CONFIG_ADFS_FS_RW is not set 1555# CONFIG_ADFS_FS_RW is not set
1456CONFIG_AFFS_FS=m 1556CONFIG_AFFS_FS=m
1557# CONFIG_ECRYPT_FS is not set
1457CONFIG_HFS_FS=m 1558CONFIG_HFS_FS=m
1458# CONFIG_HFSPLUS_FS is not set 1559# CONFIG_HFSPLUS_FS is not set
1459CONFIG_BEFS_FS=m 1560CONFIG_BEFS_FS=m
@@ -1579,6 +1680,14 @@ CONFIG_NLS_KOI8_U=m
1579CONFIG_NLS_UTF8=m 1680CONFIG_NLS_UTF8=m
1580 1681
1581# 1682#
1683# Distributed Lock Manager
1684#
1685CONFIG_DLM=m
1686CONFIG_DLM_TCP=y
1687# CONFIG_DLM_SCTP is not set
1688# CONFIG_DLM_DEBUG is not set
1689
1690#
1582# Profiling support 1691# Profiling support
1583# 1692#
1584# CONFIG_PROFILING is not set 1693# CONFIG_PROFILING is not set
@@ -1588,11 +1697,13 @@ CONFIG_NLS_UTF8=m
1588# 1697#
1589CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1698CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1590# CONFIG_PRINTK_TIME is not set 1699# CONFIG_PRINTK_TIME is not set
1700CONFIG_ENABLE_MUST_CHECK=y
1591# CONFIG_MAGIC_SYSRQ is not set 1701# CONFIG_MAGIC_SYSRQ is not set
1592# CONFIG_UNUSED_SYMBOLS is not set 1702# CONFIG_UNUSED_SYMBOLS is not set
1703# CONFIG_DEBUG_FS is not set
1704# CONFIG_HEADERS_CHECK is not set
1593# CONFIG_DEBUG_KERNEL is not set 1705# CONFIG_DEBUG_KERNEL is not set
1594CONFIG_LOG_BUF_SHIFT=14 1706CONFIG_LOG_BUF_SHIFT=14
1595# CONFIG_DEBUG_FS is not set
1596CONFIG_CROSSCOMPILE=y 1707CONFIG_CROSSCOMPILE=y
1597CONFIG_CMDLINE="" 1708CONFIG_CMDLINE=""
1598 1709
@@ -1607,18 +1718,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1607# Cryptographic options 1718# Cryptographic options
1608# 1719#
1609CONFIG_CRYPTO=y 1720CONFIG_CRYPTO=y
1721CONFIG_CRYPTO_ALGAPI=y
1722CONFIG_CRYPTO_BLKCIPHER=m
1723CONFIG_CRYPTO_HASH=y
1724CONFIG_CRYPTO_MANAGER=y
1610CONFIG_CRYPTO_HMAC=y 1725CONFIG_CRYPTO_HMAC=y
1726CONFIG_CRYPTO_XCBC=m
1611CONFIG_CRYPTO_NULL=m 1727CONFIG_CRYPTO_NULL=m
1612CONFIG_CRYPTO_MD4=m 1728CONFIG_CRYPTO_MD4=m
1613CONFIG_CRYPTO_MD5=m 1729CONFIG_CRYPTO_MD5=y
1614CONFIG_CRYPTO_SHA1=m 1730CONFIG_CRYPTO_SHA1=m
1615CONFIG_CRYPTO_SHA256=m 1731CONFIG_CRYPTO_SHA256=m
1616CONFIG_CRYPTO_SHA512=m 1732CONFIG_CRYPTO_SHA512=m
1617CONFIG_CRYPTO_WP512=m 1733CONFIG_CRYPTO_WP512=m
1618CONFIG_CRYPTO_TGR192=m 1734CONFIG_CRYPTO_TGR192=m
1735CONFIG_CRYPTO_GF128MUL=m
1736CONFIG_CRYPTO_ECB=m
1737CONFIG_CRYPTO_CBC=m
1738CONFIG_CRYPTO_PCBC=m
1739CONFIG_CRYPTO_LRW=m
1619CONFIG_CRYPTO_DES=m 1740CONFIG_CRYPTO_DES=m
1741CONFIG_CRYPTO_FCRYPT=m
1620CONFIG_CRYPTO_BLOWFISH=m 1742CONFIG_CRYPTO_BLOWFISH=m
1621CONFIG_CRYPTO_TWOFISH=m 1743CONFIG_CRYPTO_TWOFISH=m
1744CONFIG_CRYPTO_TWOFISH_COMMON=m
1622CONFIG_CRYPTO_SERPENT=m 1745CONFIG_CRYPTO_SERPENT=m
1623CONFIG_CRYPTO_AES=m 1746CONFIG_CRYPTO_AES=m
1624CONFIG_CRYPTO_CAST5=m 1747CONFIG_CRYPTO_CAST5=m
@@ -1630,6 +1753,7 @@ CONFIG_CRYPTO_ANUBIS=m
1630CONFIG_CRYPTO_DEFLATE=m 1753CONFIG_CRYPTO_DEFLATE=m
1631CONFIG_CRYPTO_MICHAEL_MIC=m 1754CONFIG_CRYPTO_MICHAEL_MIC=m
1632CONFIG_CRYPTO_CRC32C=m 1755CONFIG_CRYPTO_CRC32C=m
1756CONFIG_CRYPTO_CAMELLIA=m
1633# CONFIG_CRYPTO_TEST is not set 1757# CONFIG_CRYPTO_TEST is not set
1634 1758
1635# 1759#
@@ -1639,6 +1763,7 @@ CONFIG_CRYPTO_CRC32C=m
1639# 1763#
1640# Library routines 1764# Library routines
1641# 1765#
1766CONFIG_BITREVERSE=y
1642CONFIG_CRC_CCITT=m 1767CONFIG_CRC_CCITT=m
1643CONFIG_CRC16=m 1768CONFIG_CRC16=m
1644CONFIG_CRC32=y 1769CONFIG_CRC32=y
@@ -1650,3 +1775,5 @@ CONFIG_TEXTSEARCH_KMP=m
1650CONFIG_TEXTSEARCH_BM=m 1775CONFIG_TEXTSEARCH_BM=m
1651CONFIG_TEXTSEARCH_FSM=m 1776CONFIG_TEXTSEARCH_FSM=m
1652CONFIG_PLIST=y 1777CONFIG_PLIST=y
1778CONFIG_HAS_IOMEM=y
1779CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index e33c17200b39..533df6fd8b4d 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:19 2006 4# Sun Feb 18 21:28:09 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -81,10 +81,14 @@ CONFIG_SIBYTE_CFE=y
81# CONFIG_SIBYTE_SB1250_PROF is not set 81# CONFIG_SIBYTE_SB1250_PROF is not set
82# CONFIG_SIBYTE_TBPROF is not set 82# CONFIG_SIBYTE_TBPROF is not set
83CONFIG_RWSEM_GENERIC_SPINLOCK=y 83CONFIG_RWSEM_GENERIC_SPINLOCK=y
84# CONFIG_ARCH_HAS_ILOG2_U32 is not set
85# CONFIG_ARCH_HAS_ILOG2_U64 is not set
84CONFIG_GENERIC_FIND_NEXT_BIT=y 86CONFIG_GENERIC_FIND_NEXT_BIT=y
85CONFIG_GENERIC_HWEIGHT=y 87CONFIG_GENERIC_HWEIGHT=y
86CONFIG_GENERIC_CALIBRATE_DELAY=y 88CONFIG_GENERIC_CALIBRATE_DELAY=y
89CONFIG_GENERIC_TIME=y
87CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 90CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
91# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
88CONFIG_DMA_COHERENT=y 92CONFIG_DMA_COHERENT=y
89CONFIG_CPU_BIG_ENDIAN=y 93CONFIG_CPU_BIG_ENDIAN=y
90# CONFIG_CPU_LITTLE_ENDIAN is not set 94# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -117,6 +121,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
117# CONFIG_CPU_RM9000 is not set 121# CONFIG_CPU_RM9000 is not set
118CONFIG_CPU_SB1=y 122CONFIG_CPU_SB1=y
119CONFIG_SYS_HAS_CPU_SB1=y 123CONFIG_SYS_HAS_CPU_SB1=y
124CONFIG_WEAK_ORDERING=y
120CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 125CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
121CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 126CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
122CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 127CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -134,8 +139,8 @@ CONFIG_PAGE_SIZE_4KB=y
134# CONFIG_SIBYTE_DMA_PAGEOPS is not set 139# CONFIG_SIBYTE_DMA_PAGEOPS is not set
135CONFIG_CPU_HAS_PREFETCH=y 140CONFIG_CPU_HAS_PREFETCH=y
136CONFIG_MIPS_MT_DISABLED=y 141CONFIG_MIPS_MT_DISABLED=y
137# CONFIG_MIPS_MT_SMTC is not set
138# CONFIG_MIPS_MT_SMP is not set 142# CONFIG_MIPS_MT_SMP is not set
143# CONFIG_MIPS_MT_SMTC is not set
139# CONFIG_MIPS_VPE_LOADER is not set 144# CONFIG_MIPS_VPE_LOADER is not set
140CONFIG_SB1_PASS_1_WORKAROUNDS=y 145CONFIG_SB1_PASS_1_WORKAROUNDS=y
141CONFIG_CPU_HAS_LLSC=y 146CONFIG_CPU_HAS_LLSC=y
@@ -155,8 +160,10 @@ CONFIG_FLAT_NODE_MEM_MAP=y
155# CONFIG_SPARSEMEM_STATIC is not set 160# CONFIG_SPARSEMEM_STATIC is not set
156CONFIG_SPLIT_PTLOCK_CPUS=4 161CONFIG_SPLIT_PTLOCK_CPUS=4
157CONFIG_RESOURCES_64BIT=y 162CONFIG_RESOURCES_64BIT=y
163CONFIG_ZONE_DMA_FLAG=1
158CONFIG_SMP=y 164CONFIG_SMP=y
159CONFIG_SYS_SUPPORTS_SMP=y 165CONFIG_SYS_SUPPORTS_SMP=y
166CONFIG_NR_CPUS_DEFAULT_2=y
160CONFIG_NR_CPUS=2 167CONFIG_NR_CPUS=2
161# CONFIG_HZ_48 is not set 168# CONFIG_HZ_48 is not set
162# CONFIG_HZ_100 is not set 169# CONFIG_HZ_100 is not set
@@ -171,6 +178,7 @@ CONFIG_PREEMPT_NONE=y
171# CONFIG_PREEMPT_VOLUNTARY is not set 178# CONFIG_PREEMPT_VOLUNTARY is not set
172# CONFIG_PREEMPT is not set 179# CONFIG_PREEMPT is not set
173CONFIG_PREEMPT_BKL=y 180CONFIG_PREEMPT_BKL=y
181# CONFIG_KEXEC is not set
174CONFIG_LOCKDEP_SUPPORT=y 182CONFIG_LOCKDEP_SUPPORT=y
175CONFIG_STACKTRACE_SUPPORT=y 183CONFIG_STACKTRACE_SUPPORT=y
176CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 184CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -189,16 +197,22 @@ CONFIG_LOCALVERSION=""
189CONFIG_LOCALVERSION_AUTO=y 197CONFIG_LOCALVERSION_AUTO=y
190CONFIG_SWAP=y 198CONFIG_SWAP=y
191CONFIG_SYSVIPC=y 199CONFIG_SYSVIPC=y
200# CONFIG_IPC_NS is not set
201CONFIG_SYSVIPC_SYSCTL=y
192# CONFIG_POSIX_MQUEUE is not set 202# CONFIG_POSIX_MQUEUE is not set
193# CONFIG_BSD_PROCESS_ACCT is not set 203# CONFIG_BSD_PROCESS_ACCT is not set
194CONFIG_SYSCTL=y 204# CONFIG_TASKSTATS is not set
205# CONFIG_UTS_NS is not set
195# CONFIG_AUDIT is not set 206# CONFIG_AUDIT is not set
196# CONFIG_IKCONFIG is not set 207# CONFIG_IKCONFIG is not set
197CONFIG_CPUSETS=y 208CONFIG_CPUSETS=y
209CONFIG_SYSFS_DEPRECATED=y
198CONFIG_RELAY=y 210CONFIG_RELAY=y
199CONFIG_INITRAMFS_SOURCE="" 211CONFIG_INITRAMFS_SOURCE=""
200# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 212# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
213CONFIG_SYSCTL=y
201CONFIG_EMBEDDED=y 214CONFIG_EMBEDDED=y
215CONFIG_SYSCTL_SYSCALL=y
202CONFIG_KALLSYMS=y 216CONFIG_KALLSYMS=y
203# CONFIG_KALLSYMS_EXTRA_PASS is not set 217# CONFIG_KALLSYMS_EXTRA_PASS is not set
204CONFIG_HOTPLUG=y 218CONFIG_HOTPLUG=y
@@ -206,12 +220,12 @@ CONFIG_PRINTK=y
206CONFIG_BUG=y 220CONFIG_BUG=y
207CONFIG_ELF_CORE=y 221CONFIG_ELF_CORE=y
208CONFIG_BASE_FULL=y 222CONFIG_BASE_FULL=y
209CONFIG_RT_MUTEXES=y
210CONFIG_FUTEX=y 223CONFIG_FUTEX=y
211CONFIG_EPOLL=y 224CONFIG_EPOLL=y
212CONFIG_SHMEM=y 225CONFIG_SHMEM=y
213CONFIG_SLAB=y 226CONFIG_SLAB=y
214CONFIG_VM_EVENT_COUNTERS=y 227CONFIG_VM_EVENT_COUNTERS=y
228CONFIG_RT_MUTEXES=y
215# CONFIG_TINY_SHMEM is not set 229# CONFIG_TINY_SHMEM is not set
216CONFIG_BASE_SMALL=0 230CONFIG_BASE_SMALL=0
217# CONFIG_SLOB is not set 231# CONFIG_SLOB is not set
@@ -230,6 +244,7 @@ CONFIG_STOP_MACHINE=y
230# 244#
231# Block layer 245# Block layer
232# 246#
247CONFIG_BLOCK=y
233# CONFIG_BLK_DEV_IO_TRACE is not set 248# CONFIG_BLK_DEV_IO_TRACE is not set
234 249
235# 250#
@@ -270,11 +285,20 @@ CONFIG_BINFMT_ELF=y
270# CONFIG_BUILD_ELF64 is not set 285# CONFIG_BUILD_ELF64 is not set
271CONFIG_MIPS32_COMPAT=y 286CONFIG_MIPS32_COMPAT=y
272CONFIG_COMPAT=y 287CONFIG_COMPAT=y
288CONFIG_SYSVIPC_COMPAT=y
273CONFIG_MIPS32_O32=y 289CONFIG_MIPS32_O32=y
274# CONFIG_MIPS32_N32 is not set 290# CONFIG_MIPS32_N32 is not set
275CONFIG_BINFMT_ELF32=y 291CONFIG_BINFMT_ELF32=y
276 292
277# 293#
294# Power management options
295#
296CONFIG_PM=y
297# CONFIG_PM_LEGACY is not set
298# CONFIG_PM_DEBUG is not set
299# CONFIG_PM_SYSFS_DEPRECATED is not set
300
301#
278# Networking 302# Networking
279# 303#
280CONFIG_NET=y 304CONFIG_NET=y
@@ -288,7 +312,10 @@ CONFIG_PACKET_MMAP=y
288CONFIG_UNIX=y 312CONFIG_UNIX=y
289CONFIG_XFRM=y 313CONFIG_XFRM=y
290CONFIG_XFRM_USER=m 314CONFIG_XFRM_USER=m
315# CONFIG_XFRM_SUB_POLICY is not set
316CONFIG_XFRM_MIGRATE=y
291CONFIG_NET_KEY=y 317CONFIG_NET_KEY=y
318CONFIG_NET_KEY_MIGRATE=y
292CONFIG_INET=y 319CONFIG_INET=y
293# CONFIG_IP_MULTICAST is not set 320# CONFIG_IP_MULTICAST is not set
294# CONFIG_IP_ADVANCED_ROUTER is not set 321# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -308,10 +335,13 @@ CONFIG_IP_PNP_BOOTP=y
308# CONFIG_INET_TUNNEL is not set 335# CONFIG_INET_TUNNEL is not set
309CONFIG_INET_XFRM_MODE_TRANSPORT=m 336CONFIG_INET_XFRM_MODE_TRANSPORT=m
310CONFIG_INET_XFRM_MODE_TUNNEL=m 337CONFIG_INET_XFRM_MODE_TUNNEL=m
338CONFIG_INET_XFRM_MODE_BEET=m
311CONFIG_INET_DIAG=y 339CONFIG_INET_DIAG=y
312CONFIG_INET_TCP_DIAG=y 340CONFIG_INET_TCP_DIAG=y
313# CONFIG_TCP_CONG_ADVANCED is not set 341# CONFIG_TCP_CONG_ADVANCED is not set
314CONFIG_TCP_CONG_BIC=y 342CONFIG_TCP_CONG_CUBIC=y
343CONFIG_DEFAULT_TCP_CONG="cubic"
344CONFIG_TCP_MD5SIG=y
315# CONFIG_IPV6 is not set 345# CONFIG_IPV6 is not set
316# CONFIG_INET6_XFRM_TUNNEL is not set 346# CONFIG_INET6_XFRM_TUNNEL is not set
317# CONFIG_INET6_TUNNEL is not set 347# CONFIG_INET6_TUNNEL is not set
@@ -341,7 +371,6 @@ CONFIG_NETWORK_SECMARK=y
341# CONFIG_ATALK is not set 371# CONFIG_ATALK is not set
342# CONFIG_X25 is not set 372# CONFIG_X25 is not set
343# CONFIG_LAPB is not set 373# CONFIG_LAPB is not set
344# CONFIG_NET_DIVERT is not set
345# CONFIG_ECONET is not set 374# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 375# CONFIG_WAN_ROUTER is not set
347 376
@@ -410,6 +439,7 @@ CONFIG_CONNECTOR=m
410CONFIG_BLK_DEV_RAM=y 439CONFIG_BLK_DEV_RAM=y
411CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
412CONFIG_BLK_DEV_RAM_SIZE=9220 441CONFIG_BLK_DEV_RAM_SIZE=9220
442CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
413CONFIG_BLK_DEV_INITRD=y 443CONFIG_BLK_DEV_INITRD=y
414CONFIG_CDROM_PKTCDVD=m 444CONFIG_CDROM_PKTCDVD=m
415CONFIG_CDROM_PKTCDVD_BUFFERS=8 445CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -417,9 +447,16 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
417CONFIG_ATA_OVER_ETH=m 447CONFIG_ATA_OVER_ETH=m
418 448
419# 449#
450# Misc devices
451#
452CONFIG_SGI_IOC4=m
453# CONFIG_TIFM_CORE is not set
454
455#
420# ATA/ATAPI/MFM/RLL support 456# ATA/ATAPI/MFM/RLL support
421# 457#
422CONFIG_IDE=y 458CONFIG_IDE=y
459CONFIG_IDE_MAX_HWIFS=4
423CONFIG_BLK_DEV_IDE=y 460CONFIG_BLK_DEV_IDE=y
424 461
425# 462#
@@ -449,6 +486,12 @@ CONFIG_IDE_GENERIC=y
449# 486#
450CONFIG_RAID_ATTRS=m 487CONFIG_RAID_ATTRS=m
451# CONFIG_SCSI is not set 488# CONFIG_SCSI is not set
489# CONFIG_SCSI_NETLINK is not set
490
491#
492# Serial ATA (prod) and Parallel ATA (experimental) drivers
493#
494# CONFIG_ATA is not set
452 495
453# 496#
454# Multi-device support (RAID and LVM) 497# Multi-device support (RAID and LVM)
@@ -499,6 +542,8 @@ CONFIG_LXT_PHY=m
499CONFIG_CICADA_PHY=m 542CONFIG_CICADA_PHY=m
500CONFIG_VITESSE_PHY=m 543CONFIG_VITESSE_PHY=m
501CONFIG_SMSC_PHY=m 544CONFIG_SMSC_PHY=m
545# CONFIG_BROADCOM_PHY is not set
546# CONFIG_FIXED_PHY is not set
502 547
503# 548#
504# Ethernet (10 or 100Mbit) 549# Ethernet (10 or 100Mbit)
@@ -535,14 +580,17 @@ CONFIG_NET_SB1250_MAC=y
535# CONFIG_SK98LIN is not set 580# CONFIG_SK98LIN is not set
536# CONFIG_TIGON3 is not set 581# CONFIG_TIGON3 is not set
537# CONFIG_BNX2 is not set 582# CONFIG_BNX2 is not set
583CONFIG_QLA3XXX=m
538 584
539# 585#
540# Ethernet (10000 Mbit) 586# Ethernet (10000 Mbit)
541# 587#
542# CONFIG_CHELSIO_T1 is not set 588# CONFIG_CHELSIO_T1 is not set
589CONFIG_CHELSIO_T3=m
543# CONFIG_IXGB is not set 590# CONFIG_IXGB is not set
544# CONFIG_S2IO is not set 591# CONFIG_S2IO is not set
545# CONFIG_MYRI10GE is not set 592# CONFIG_MYRI10GE is not set
593CONFIG_NETXEN_NIC=m
546 594
547# 595#
548# Token Ring devices 596# Token Ring devices
@@ -604,6 +652,7 @@ CONFIG_SERIAL_NONSTANDARD=y
604# CONFIG_DIGIEPCA is not set 652# CONFIG_DIGIEPCA is not set
605# CONFIG_MOXA_INTELLIO is not set 653# CONFIG_MOXA_INTELLIO is not set
606# CONFIG_MOXA_SMARTIO is not set 654# CONFIG_MOXA_SMARTIO is not set
655CONFIG_MOXA_SMARTIO_NEW=m
607# CONFIG_ISI is not set 656# CONFIG_ISI is not set
608# CONFIG_SYNCLINKMP is not set 657# CONFIG_SYNCLINKMP is not set
609# CONFIG_SYNCLINK_GT is not set 658# CONFIG_SYNCLINK_GT is not set
@@ -643,10 +692,6 @@ CONFIG_LEGACY_PTY_COUNT=256
643# CONFIG_DTLK is not set 692# CONFIG_DTLK is not set
644# CONFIG_R3964 is not set 693# CONFIG_R3964 is not set
645# CONFIG_APPLICOM is not set 694# CONFIG_APPLICOM is not set
646
647#
648# Ftape, the floppy tape device driver
649#
650# CONFIG_DRM is not set 695# CONFIG_DRM is not set
651# CONFIG_RAW_DRIVER is not set 696# CONFIG_RAW_DRIVER is not set
652 697
@@ -654,7 +699,6 @@ CONFIG_LEGACY_PTY_COUNT=256
654# TPM devices 699# TPM devices
655# 700#
656# CONFIG_TCG_TPM is not set 701# CONFIG_TCG_TPM is not set
657# CONFIG_TELCLOCK is not set
658 702
659# 703#
660# I2C support 704# I2C support
@@ -679,14 +723,9 @@ CONFIG_LEGACY_PTY_COUNT=256
679# CONFIG_HWMON_VID is not set 723# CONFIG_HWMON_VID is not set
680 724
681# 725#
682# Misc devices
683#
684
685#
686# Multimedia devices 726# Multimedia devices
687# 727#
688# CONFIG_VIDEO_DEV is not set 728# CONFIG_VIDEO_DEV is not set
689CONFIG_VIDEO_V4L2=y
690 729
691# 730#
692# Digital Video Broadcasting Devices 731# Digital Video Broadcasting Devices
@@ -698,6 +737,7 @@ CONFIG_VIDEO_V4L2=y
698# 737#
699# CONFIG_FIRMWARE_EDID is not set 738# CONFIG_FIRMWARE_EDID is not set
700# CONFIG_FB is not set 739# CONFIG_FB is not set
740# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
701 741
702# 742#
703# Sound 743# Sound
@@ -767,6 +807,14 @@ CONFIG_USB_ARCH_HAS_EHCI=y
767# 807#
768 808
769# 809#
810# Auxiliary Display support
811#
812
813#
814# Virtualization
815#
816
817#
770# File systems 818# File systems
771# 819#
772CONFIG_EXT2_FS=y 820CONFIG_EXT2_FS=y
@@ -775,11 +823,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
775CONFIG_EXT2_FS_SECURITY=y 823CONFIG_EXT2_FS_SECURITY=y
776# CONFIG_EXT2_FS_XIP is not set 824# CONFIG_EXT2_FS_XIP is not set
777# CONFIG_EXT3_FS is not set 825# CONFIG_EXT3_FS is not set
826# CONFIG_EXT4DEV_FS is not set
778CONFIG_FS_MBCACHE=y 827CONFIG_FS_MBCACHE=y
779# CONFIG_REISERFS_FS is not set 828# CONFIG_REISERFS_FS is not set
780# CONFIG_JFS_FS is not set 829# CONFIG_JFS_FS is not set
781CONFIG_FS_POSIX_ACL=y 830CONFIG_FS_POSIX_ACL=y
782# CONFIG_XFS_FS is not set 831# CONFIG_XFS_FS is not set
832# CONFIG_GFS2_FS is not set
783# CONFIG_OCFS2_FS is not set 833# CONFIG_OCFS2_FS is not set
784# CONFIG_MINIX_FS is not set 834# CONFIG_MINIX_FS is not set
785# CONFIG_ROMFS_FS is not set 835# CONFIG_ROMFS_FS is not set
@@ -809,17 +859,19 @@ CONFIG_FUSE_FS=m
809# 859#
810CONFIG_PROC_FS=y 860CONFIG_PROC_FS=y
811CONFIG_PROC_KCORE=y 861CONFIG_PROC_KCORE=y
862CONFIG_PROC_SYSCTL=y
812CONFIG_SYSFS=y 863CONFIG_SYSFS=y
813# CONFIG_TMPFS is not set 864# CONFIG_TMPFS is not set
814# CONFIG_HUGETLB_PAGE is not set 865# CONFIG_HUGETLB_PAGE is not set
815CONFIG_RAMFS=y 866CONFIG_RAMFS=y
816# CONFIG_CONFIGFS_FS is not set 867CONFIG_CONFIGFS_FS=m
817 868
818# 869#
819# Miscellaneous filesystems 870# Miscellaneous filesystems
820# 871#
821# CONFIG_ADFS_FS is not set 872# CONFIG_ADFS_FS is not set
822# CONFIG_AFFS_FS is not set 873# CONFIG_AFFS_FS is not set
874# CONFIG_ECRYPT_FS is not set
823# CONFIG_HFS_FS is not set 875# CONFIG_HFS_FS is not set
824# CONFIG_HFSPLUS_FS is not set 876# CONFIG_HFSPLUS_FS is not set
825# CONFIG_BEFS_FS is not set 877# CONFIG_BEFS_FS is not set
@@ -850,7 +902,6 @@ CONFIG_SUNRPC=y
850# CONFIG_RPCSEC_GSS_SPKM3 is not set 902# CONFIG_RPCSEC_GSS_SPKM3 is not set
851# CONFIG_SMB_FS is not set 903# CONFIG_SMB_FS is not set
852# CONFIG_CIFS is not set 904# CONFIG_CIFS is not set
853# CONFIG_CIFS_DEBUG2 is not set
854# CONFIG_NCP_FS is not set 905# CONFIG_NCP_FS is not set
855# CONFIG_CODA_FS is not set 906# CONFIG_CODA_FS is not set
856# CONFIG_AFS_FS is not set 907# CONFIG_AFS_FS is not set
@@ -868,6 +919,14 @@ CONFIG_MSDOS_PARTITION=y
868# CONFIG_NLS is not set 919# CONFIG_NLS is not set
869 920
870# 921#
922# Distributed Lock Manager
923#
924CONFIG_DLM=m
925CONFIG_DLM_TCP=y
926# CONFIG_DLM_SCTP is not set
927# CONFIG_DLM_DEBUG is not set
928
929#
871# Profiling support 930# Profiling support
872# 931#
873# CONFIG_PROFILING is not set 932# CONFIG_PROFILING is not set
@@ -877,11 +936,13 @@ CONFIG_MSDOS_PARTITION=y
877# 936#
878CONFIG_TRACE_IRQFLAGS_SUPPORT=y 937CONFIG_TRACE_IRQFLAGS_SUPPORT=y
879# CONFIG_PRINTK_TIME is not set 938# CONFIG_PRINTK_TIME is not set
939CONFIG_ENABLE_MUST_CHECK=y
880# CONFIG_MAGIC_SYSRQ is not set 940# CONFIG_MAGIC_SYSRQ is not set
881# CONFIG_UNUSED_SYMBOLS is not set 941# CONFIG_UNUSED_SYMBOLS is not set
942# CONFIG_DEBUG_FS is not set
943# CONFIG_HEADERS_CHECK is not set
882# CONFIG_DEBUG_KERNEL is not set 944# CONFIG_DEBUG_KERNEL is not set
883CONFIG_LOG_BUF_SHIFT=15 945CONFIG_LOG_BUF_SHIFT=15
884# CONFIG_DEBUG_FS is not set
885CONFIG_CROSSCOMPILE=y 946CONFIG_CROSSCOMPILE=y
886CONFIG_CMDLINE="" 947CONFIG_CMDLINE=""
887# CONFIG_SB1XXX_CORELIS is not set 948# CONFIG_SB1XXX_CORELIS is not set
@@ -897,18 +958,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
897# Cryptographic options 958# Cryptographic options
898# 959#
899CONFIG_CRYPTO=y 960CONFIG_CRYPTO=y
961CONFIG_CRYPTO_ALGAPI=y
962CONFIG_CRYPTO_BLKCIPHER=m
963CONFIG_CRYPTO_HASH=y
964CONFIG_CRYPTO_MANAGER=y
900CONFIG_CRYPTO_HMAC=y 965CONFIG_CRYPTO_HMAC=y
966CONFIG_CRYPTO_XCBC=m
901CONFIG_CRYPTO_NULL=m 967CONFIG_CRYPTO_NULL=m
902CONFIG_CRYPTO_MD4=m 968CONFIG_CRYPTO_MD4=m
903CONFIG_CRYPTO_MD5=m 969CONFIG_CRYPTO_MD5=y
904CONFIG_CRYPTO_SHA1=m 970CONFIG_CRYPTO_SHA1=m
905CONFIG_CRYPTO_SHA256=m 971CONFIG_CRYPTO_SHA256=m
906CONFIG_CRYPTO_SHA512=m 972CONFIG_CRYPTO_SHA512=m
907CONFIG_CRYPTO_WP512=m 973CONFIG_CRYPTO_WP512=m
908CONFIG_CRYPTO_TGR192=m 974CONFIG_CRYPTO_TGR192=m
975CONFIG_CRYPTO_GF128MUL=m
976CONFIG_CRYPTO_ECB=m
977CONFIG_CRYPTO_CBC=m
978CONFIG_CRYPTO_PCBC=m
979CONFIG_CRYPTO_LRW=m
909CONFIG_CRYPTO_DES=m 980CONFIG_CRYPTO_DES=m
981CONFIG_CRYPTO_FCRYPT=m
910CONFIG_CRYPTO_BLOWFISH=m 982CONFIG_CRYPTO_BLOWFISH=m
911CONFIG_CRYPTO_TWOFISH=m 983CONFIG_CRYPTO_TWOFISH=m
984CONFIG_CRYPTO_TWOFISH_COMMON=m
912CONFIG_CRYPTO_SERPENT=m 985CONFIG_CRYPTO_SERPENT=m
913CONFIG_CRYPTO_AES=m 986CONFIG_CRYPTO_AES=m
914CONFIG_CRYPTO_CAST5=m 987CONFIG_CRYPTO_CAST5=m
@@ -920,6 +993,7 @@ CONFIG_CRYPTO_ANUBIS=m
920CONFIG_CRYPTO_DEFLATE=m 993CONFIG_CRYPTO_DEFLATE=m
921CONFIG_CRYPTO_MICHAEL_MIC=m 994CONFIG_CRYPTO_MICHAEL_MIC=m
922CONFIG_CRYPTO_CRC32C=m 995CONFIG_CRYPTO_CRC32C=m
996CONFIG_CRYPTO_CAMELLIA=m
923# CONFIG_CRYPTO_TEST is not set 997# CONFIG_CRYPTO_TEST is not set
924 998
925# 999#
@@ -929,6 +1003,7 @@ CONFIG_CRYPTO_CRC32C=m
929# 1003#
930# Library routines 1004# Library routines
931# 1005#
1006CONFIG_BITREVERSE=y
932# CONFIG_CRC_CCITT is not set 1007# CONFIG_CRC_CCITT is not set
933CONFIG_CRC16=m 1008CONFIG_CRC16=m
934CONFIG_CRC32=y 1009CONFIG_CRC32=y
@@ -936,3 +1011,5 @@ CONFIG_LIBCRC32C=m
936CONFIG_ZLIB_INFLATE=m 1011CONFIG_ZLIB_INFLATE=m
937CONFIG_ZLIB_DEFLATE=m 1012CONFIG_ZLIB_DEFLATE=m
938CONFIG_PLIST=y 1013CONFIG_PLIST=y
1014CONFIG_HAS_IOMEM=y
1015CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 83fb932f9d4b..38816fe264a9 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:20 2006 4# Sun Feb 18 21:28:10 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS_SEAD=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_MIPS_SEAD=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73# CONFIG_CPU_BIG_ENDIAN is not set 77# CONFIG_CPU_BIG_ENDIAN is not set
@@ -120,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
120# CONFIG_PAGE_SIZE_64KB is not set 124# CONFIG_PAGE_SIZE_64KB is not set
121CONFIG_CPU_HAS_PREFETCH=y 125CONFIG_CPU_HAS_PREFETCH=y
122CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
126# CONFIG_64BIT_PHYS_ADDR is not set 130# CONFIG_64BIT_PHYS_ADDR is not set
127CONFIG_CPU_HAS_LLSC=y 131CONFIG_CPU_HAS_LLSC=y
@@ -139,6 +143,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 143# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 144CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 145# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -151,6 +156,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 156CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 157# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
159# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 160CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 161CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 162CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,13 +175,18 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 175CONFIG_LOCALVERSION_AUTO=y
170# CONFIG_SWAP is not set 176# CONFIG_SWAP is not set
171CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_BSD_PROCESS_ACCT is not set 180# CONFIG_BSD_PROCESS_ACCT is not set
173CONFIG_SYSCTL=y 181# CONFIG_UTS_NS is not set
174# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
175CONFIG_RELAY=y 184CONFIG_RELAY=y
176CONFIG_INITRAMFS_SOURCE="" 185CONFIG_INITRAMFS_SOURCE=""
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 186# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
187CONFIG_SYSCTL=y
178CONFIG_EMBEDDED=y 188CONFIG_EMBEDDED=y
189CONFIG_SYSCTL_SYSCALL=y
179CONFIG_KALLSYMS=y 190CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_EXTRA_PASS is not set 191# CONFIG_KALLSYMS_EXTRA_PASS is not set
181# CONFIG_HOTPLUG is not set 192# CONFIG_HOTPLUG is not set
@@ -183,12 +194,12 @@ CONFIG_PRINTK=y
183CONFIG_BUG=y 194CONFIG_BUG=y
184CONFIG_ELF_CORE=y 195CONFIG_ELF_CORE=y
185CONFIG_BASE_FULL=y 196CONFIG_BASE_FULL=y
186CONFIG_RT_MUTEXES=y
187CONFIG_FUTEX=y 197CONFIG_FUTEX=y
188CONFIG_EPOLL=y 198CONFIG_EPOLL=y
189CONFIG_SHMEM=y 199CONFIG_SHMEM=y
190CONFIG_SLAB=y 200CONFIG_SLAB=y
191CONFIG_VM_EVENT_COUNTERS=y 201CONFIG_VM_EVENT_COUNTERS=y
202CONFIG_RT_MUTEXES=y
192# CONFIG_TINY_SHMEM is not set 203# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 204CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set 205# CONFIG_SLOB is not set
@@ -201,6 +212,7 @@ CONFIG_BASE_SMALL=0
201# 212#
202# Block layer 213# Block layer
203# 214#
215CONFIG_BLOCK=y
204# CONFIG_LBD is not set 216# CONFIG_LBD is not set
205# CONFIG_BLK_DEV_IO_TRACE is not set 217# CONFIG_BLK_DEV_IO_TRACE is not set
206# CONFIG_LSF is not set 218# CONFIG_LSF is not set
@@ -226,7 +238,6 @@ CONFIG_MMU=y
226# 238#
227# PCCARD (PCMCIA/CardBus) support 239# PCCARD (PCMCIA/CardBus) support
228# 240#
229# CONFIG_PCCARD is not set
230 241
231# 242#
232# PCI Hotplug Support 243# PCI Hotplug Support
@@ -240,6 +251,14 @@ CONFIG_BINFMT_ELF=y
240CONFIG_TRAD_SIGNALS=y 251CONFIG_TRAD_SIGNALS=y
241 252
242# 253#
254# Power management options
255#
256CONFIG_PM=y
257# CONFIG_PM_LEGACY is not set
258# CONFIG_PM_DEBUG is not set
259# CONFIG_PM_SYSFS_DEPRECATED is not set
260
261#
243# Networking 262# Networking
244# 263#
245# CONFIG_NET is not set 264# CONFIG_NET is not set
@@ -253,7 +272,6 @@ CONFIG_TRAD_SIGNALS=y
253# 272#
254CONFIG_STANDALONE=y 273CONFIG_STANDALONE=y
255CONFIG_PREVENT_FIRMWARE_BUILD=y 274CONFIG_PREVENT_FIRMWARE_BUILD=y
256# CONFIG_FW_LOADER is not set
257# CONFIG_SYS_HYPERVISOR is not set 275# CONFIG_SYS_HYPERVISOR is not set
258 276
259# 277#
@@ -283,10 +301,15 @@ CONFIG_BLK_DEV_LOOP=y
283CONFIG_BLK_DEV_RAM=y 301CONFIG_BLK_DEV_RAM=y
284CONFIG_BLK_DEV_RAM_COUNT=16 302CONFIG_BLK_DEV_RAM_COUNT=16
285CONFIG_BLK_DEV_RAM_SIZE=18432 303CONFIG_BLK_DEV_RAM_SIZE=18432
304CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
286CONFIG_BLK_DEV_INITRD=y 305CONFIG_BLK_DEV_INITRD=y
287# CONFIG_CDROM_PKTCDVD is not set 306# CONFIG_CDROM_PKTCDVD is not set
288 307
289# 308#
309# Misc devices
310#
311
312#
290# ATA/ATAPI/MFM/RLL support 313# ATA/ATAPI/MFM/RLL support
291# 314#
292# CONFIG_IDE is not set 315# CONFIG_IDE is not set
@@ -296,6 +319,12 @@ CONFIG_BLK_DEV_INITRD=y
296# 319#
297CONFIG_RAID_ATTRS=y 320CONFIG_RAID_ATTRS=y
298# CONFIG_SCSI is not set 321# CONFIG_SCSI is not set
322# CONFIG_SCSI_NETLINK is not set
323
324#
325# Serial ATA (prod) and Parallel ATA (experimental) drivers
326#
327# CONFIG_ATA is not set
299 328
300# 329#
301# Multi-device support (RAID and LVM) 330# Multi-device support (RAID and LVM)
@@ -373,17 +402,12 @@ CONFIG_LEGACY_PTY_COUNT=256
373# CONFIG_GEN_RTC is not set 402# CONFIG_GEN_RTC is not set
374# CONFIG_DTLK is not set 403# CONFIG_DTLK is not set
375# CONFIG_R3964 is not set 404# CONFIG_R3964 is not set
376
377#
378# Ftape, the floppy tape device driver
379#
380# CONFIG_RAW_DRIVER is not set 405# CONFIG_RAW_DRIVER is not set
381 406
382# 407#
383# TPM devices 408# TPM devices
384# 409#
385# CONFIG_TCG_TPM is not set 410# CONFIG_TCG_TPM is not set
386# CONFIG_TELCLOCK is not set
387 411
388# 412#
389# I2C support 413# I2C support
@@ -399,6 +423,7 @@ CONFIG_LEGACY_PTY_COUNT=256
399# 423#
400# Dallas's 1-wire bus 424# Dallas's 1-wire bus
401# 425#
426# CONFIG_W1 is not set
402 427
403# 428#
404# Hardware Monitoring support 429# Hardware Monitoring support
@@ -407,14 +432,9 @@ CONFIG_LEGACY_PTY_COUNT=256
407# CONFIG_HWMON_VID is not set 432# CONFIG_HWMON_VID is not set
408 433
409# 434#
410# Misc devices
411#
412
413#
414# Multimedia devices 435# Multimedia devices
415# 436#
416# CONFIG_VIDEO_DEV is not set 437# CONFIG_VIDEO_DEV is not set
417CONFIG_VIDEO_V4L2=y
418 438
419# 439#
420# Digital Video Broadcasting Devices 440# Digital Video Broadcasting Devices
@@ -425,6 +445,7 @@ CONFIG_VIDEO_V4L2=y
425# 445#
426# CONFIG_FIRMWARE_EDID is not set 446# CONFIG_FIRMWARE_EDID is not set
427# CONFIG_FB is not set 447# CONFIG_FB is not set
448# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
428 449
429# 450#
430# Sound 451# Sound
@@ -492,16 +513,26 @@ CONFIG_VIDEO_V4L2=y
492# 513#
493 514
494# 515#
516# Auxiliary Display support
517#
518
519#
520# Virtualization
521#
522
523#
495# File systems 524# File systems
496# 525#
497CONFIG_EXT2_FS=y 526CONFIG_EXT2_FS=y
498# CONFIG_EXT2_FS_XATTR is not set 527# CONFIG_EXT2_FS_XATTR is not set
499# CONFIG_EXT2_FS_XIP is not set 528# CONFIG_EXT2_FS_XIP is not set
500# CONFIG_EXT3_FS is not set 529# CONFIG_EXT3_FS is not set
530# CONFIG_EXT4DEV_FS is not set
501# CONFIG_REISERFS_FS is not set 531# CONFIG_REISERFS_FS is not set
502# CONFIG_JFS_FS is not set 532# CONFIG_JFS_FS is not set
503# CONFIG_FS_POSIX_ACL is not set 533# CONFIG_FS_POSIX_ACL is not set
504# CONFIG_XFS_FS is not set 534# CONFIG_XFS_FS is not set
535# CONFIG_GFS2_FS is not set
505# CONFIG_MINIX_FS is not set 536# CONFIG_MINIX_FS is not set
506# CONFIG_ROMFS_FS is not set 537# CONFIG_ROMFS_FS is not set
507CONFIG_INOTIFY=y 538CONFIG_INOTIFY=y
@@ -530,6 +561,7 @@ CONFIG_FUSE_FS=y
530# 561#
531CONFIG_PROC_FS=y 562CONFIG_PROC_FS=y
532CONFIG_PROC_KCORE=y 563CONFIG_PROC_KCORE=y
564CONFIG_PROC_SYSCTL=y
533CONFIG_SYSFS=y 565CONFIG_SYSFS=y
534# CONFIG_TMPFS is not set 566# CONFIG_TMPFS is not set
535# CONFIG_HUGETLB_PAGE is not set 567# CONFIG_HUGETLB_PAGE is not set
@@ -585,12 +617,13 @@ CONFIG_PARTITION_ADVANCED=y
585# 617#
586CONFIG_TRACE_IRQFLAGS_SUPPORT=y 618CONFIG_TRACE_IRQFLAGS_SUPPORT=y
587# CONFIG_PRINTK_TIME is not set 619# CONFIG_PRINTK_TIME is not set
620CONFIG_ENABLE_MUST_CHECK=y
588# CONFIG_MAGIC_SYSRQ is not set 621# CONFIG_MAGIC_SYSRQ is not set
589# CONFIG_UNUSED_SYMBOLS is not set 622# CONFIG_UNUSED_SYMBOLS is not set
623# CONFIG_DEBUG_FS is not set
624# CONFIG_HEADERS_CHECK is not set
590# CONFIG_DEBUG_KERNEL is not set 625# CONFIG_DEBUG_KERNEL is not set
591CONFIG_LOG_BUF_SHIFT=14 626CONFIG_LOG_BUF_SHIFT=14
592# CONFIG_DEBUG_FS is not set
593# CONFIG_UNWIND_INFO is not set
594CONFIG_CROSSCOMPILE=y 627CONFIG_CROSSCOMPILE=y
595CONFIG_CMDLINE="" 628CONFIG_CMDLINE=""
596 629
@@ -606,10 +639,6 @@ CONFIG_CMDLINE=""
606# CONFIG_CRYPTO is not set 639# CONFIG_CRYPTO is not set
607 640
608# 641#
609# Hardware crypto devices
610#
611
612#
613# Library routines 642# Library routines
614# 643#
615# CONFIG_CRC_CCITT is not set 644# CONFIG_CRC_CCITT is not set
@@ -617,3 +646,5 @@ CONFIG_CRC16=y
617# CONFIG_CRC32 is not set 646# CONFIG_CRC32 is not set
618# CONFIG_LIBCRC32C is not set 647# CONFIG_LIBCRC32C is not set
619CONFIG_PLIST=y 648CONFIG_PLIST=y
649CONFIG_HAS_IOMEM=y
650CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index e9d4eae45bfa..c2f7c8cea1e8 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:20 2006 4# Sun Feb 18 21:28:11 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -72,12 +72,15 @@ CONFIG_TANBAC_TB0226=y
72# CONFIG_VICTOR_MPC30X is not set 72# CONFIG_VICTOR_MPC30X is not set
73# CONFIG_ZAO_CAPCELLA is not set 73# CONFIG_ZAO_CAPCELLA is not set
74CONFIG_PCI_VR41XX=y 74CONFIG_PCI_VR41XX=y
75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 75CONFIG_RWSEM_GENERIC_SPINLOCK=y
76# CONFIG_ARCH_HAS_ILOG2_U32 is not set
77# CONFIG_ARCH_HAS_ILOG2_U64 is not set
77CONFIG_GENERIC_FIND_NEXT_BIT=y 78CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y 79CONFIG_GENERIC_HWEIGHT=y
79CONFIG_GENERIC_CALIBRATE_DELAY=y 80CONFIG_GENERIC_CALIBRATE_DELAY=y
81CONFIG_GENERIC_TIME=y
80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 82CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
83CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
81CONFIG_DMA_NONCOHERENT=y 84CONFIG_DMA_NONCOHERENT=y
82CONFIG_DMA_NEED_PCI_MAP_STATE=y 85CONFIG_DMA_NEED_PCI_MAP_STATE=y
83# CONFIG_CPU_BIG_ENDIAN is not set 86# CONFIG_CPU_BIG_ENDIAN is not set
@@ -110,6 +113,7 @@ CONFIG_CPU_VR41XX=y
110# CONFIG_CPU_SB1 is not set 113# CONFIG_CPU_SB1 is not set
111CONFIG_SYS_HAS_CPU_VR41XX=y 114CONFIG_SYS_HAS_CPU_VR41XX=y
112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 115CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
116CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 117CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 118CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
115 119
@@ -123,8 +127,8 @@ CONFIG_PAGE_SIZE_4KB=y
123# CONFIG_PAGE_SIZE_16KB is not set 127# CONFIG_PAGE_SIZE_16KB is not set
124# CONFIG_PAGE_SIZE_64KB is not set 128# CONFIG_PAGE_SIZE_64KB is not set
125CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
129CONFIG_CPU_HAS_SYNC=y 133CONFIG_CPU_HAS_SYNC=y
130CONFIG_GENERIC_HARDIRQS=y 134CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +143,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 143# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 144CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 145# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -151,6 +156,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 156CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 157# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
159# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 160CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 161CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 162CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,15 +175,20 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 175CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y 176CONFIG_SWAP=y
171CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 180# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 182# CONFIG_TASKSTATS is not set
183# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 185# CONFIG_IKCONFIG is not set
186CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 187# CONFIG_RELAY is not set
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
189CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
191CONFIG_SYSCTL_SYSCALL=y
181CONFIG_KALLSYMS=y 192CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set 193# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y 194CONFIG_HOTPLUG=y
@@ -185,12 +196,12 @@ CONFIG_PRINTK=y
185CONFIG_BUG=y 196CONFIG_BUG=y
186CONFIG_ELF_CORE=y 197CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 198CONFIG_BASE_FULL=y
188CONFIG_RT_MUTEXES=y
189CONFIG_FUTEX=y 199CONFIG_FUTEX=y
190CONFIG_EPOLL=y 200CONFIG_EPOLL=y
191CONFIG_SHMEM=y 201CONFIG_SHMEM=y
192CONFIG_SLAB=y 202CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 203CONFIG_VM_EVENT_COUNTERS=y
204CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 205# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 206CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set 207# CONFIG_SLOB is not set
@@ -208,6 +219,7 @@ CONFIG_KMOD=y
208# 219#
209# Block layer 220# Block layer
210# 221#
222CONFIG_BLOCK=y
211# CONFIG_LBD is not set 223# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 224# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 225# CONFIG_LSF is not set
@@ -250,6 +262,14 @@ CONFIG_BINFMT_ELF=y
250CONFIG_TRAD_SIGNALS=y 262CONFIG_TRAD_SIGNALS=y
251 263
252# 264#
265# Power management options
266#
267CONFIG_PM=y
268# CONFIG_PM_LEGACY is not set
269# CONFIG_PM_DEBUG is not set
270# CONFIG_PM_SYSFS_DEPRECATED is not set
271
272#
253# Networking 273# Networking
254# 274#
255CONFIG_NET=y 275CONFIG_NET=y
@@ -263,6 +283,8 @@ CONFIG_PACKET=y
263CONFIG_UNIX=y 283CONFIG_UNIX=y
264CONFIG_XFRM=y 284CONFIG_XFRM=y
265# CONFIG_XFRM_USER is not set 285# CONFIG_XFRM_USER is not set
286# CONFIG_XFRM_SUB_POLICY is not set
287CONFIG_XFRM_MIGRATE=y
266# CONFIG_NET_KEY is not set 288# CONFIG_NET_KEY is not set
267CONFIG_INET=y 289CONFIG_INET=y
268CONFIG_IP_MULTICAST=y 290CONFIG_IP_MULTICAST=y
@@ -290,10 +312,13 @@ CONFIG_SYN_COOKIES=y
290# CONFIG_INET_TUNNEL is not set 312# CONFIG_INET_TUNNEL is not set
291CONFIG_INET_XFRM_MODE_TRANSPORT=m 313CONFIG_INET_XFRM_MODE_TRANSPORT=m
292CONFIG_INET_XFRM_MODE_TUNNEL=m 314CONFIG_INET_XFRM_MODE_TUNNEL=m
315CONFIG_INET_XFRM_MODE_BEET=m
293CONFIG_INET_DIAG=y 316CONFIG_INET_DIAG=y
294CONFIG_INET_TCP_DIAG=y 317CONFIG_INET_TCP_DIAG=y
295# CONFIG_TCP_CONG_ADVANCED is not set 318# CONFIG_TCP_CONG_ADVANCED is not set
296CONFIG_TCP_CONG_BIC=y 319CONFIG_TCP_CONG_CUBIC=y
320CONFIG_DEFAULT_TCP_CONG="cubic"
321CONFIG_TCP_MD5SIG=y
297# CONFIG_IPV6 is not set 322# CONFIG_IPV6 is not set
298# CONFIG_INET6_XFRM_TUNNEL is not set 323# CONFIG_INET6_XFRM_TUNNEL is not set
299# CONFIG_INET6_TUNNEL is not set 324# CONFIG_INET6_TUNNEL is not set
@@ -323,7 +348,6 @@ CONFIG_NETWORK_SECMARK=y
323# CONFIG_ATALK is not set 348# CONFIG_ATALK is not set
324# CONFIG_X25 is not set 349# CONFIG_X25 is not set
325# CONFIG_LAPB is not set 350# CONFIG_LAPB is not set
326# CONFIG_NET_DIVERT is not set
327# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
329 353
@@ -340,6 +364,7 @@ CONFIG_NETWORK_SECMARK=y
340# CONFIG_IRDA is not set 364# CONFIG_IRDA is not set
341# CONFIG_BT is not set 365# CONFIG_BT is not set
342# CONFIG_IEEE80211 is not set 366# CONFIG_IEEE80211 is not set
367CONFIG_FIB_RULES=y
343 368
344# 369#
345# Device Drivers 370# Device Drivers
@@ -388,11 +413,18 @@ CONFIG_BLK_DEV_NBD=m
388CONFIG_BLK_DEV_RAM=y 413CONFIG_BLK_DEV_RAM=y
389CONFIG_BLK_DEV_RAM_COUNT=16 414CONFIG_BLK_DEV_RAM_COUNT=16
390CONFIG_BLK_DEV_RAM_SIZE=4096 415CONFIG_BLK_DEV_RAM_SIZE=4096
416CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
391# CONFIG_BLK_DEV_INITRD is not set 417# CONFIG_BLK_DEV_INITRD is not set
392# CONFIG_CDROM_PKTCDVD is not set 418# CONFIG_CDROM_PKTCDVD is not set
393# CONFIG_ATA_OVER_ETH is not set 419# CONFIG_ATA_OVER_ETH is not set
394 420
395# 421#
422# Misc devices
423#
424CONFIG_SGI_IOC4=m
425# CONFIG_TIFM_CORE is not set
426
427#
396# ATA/ATAPI/MFM/RLL support 428# ATA/ATAPI/MFM/RLL support
397# 429#
398# CONFIG_IDE is not set 430# CONFIG_IDE is not set
@@ -402,6 +434,8 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
402# 434#
403# CONFIG_RAID_ATTRS is not set 435# CONFIG_RAID_ATTRS is not set
404CONFIG_SCSI=y 436CONFIG_SCSI=y
437CONFIG_SCSI_TGT=m
438# CONFIG_SCSI_NETLINK is not set
405CONFIG_SCSI_PROC_FS=y 439CONFIG_SCSI_PROC_FS=y
406 440
407# 441#
@@ -420,14 +454,17 @@ CONFIG_BLK_DEV_SD=y
420CONFIG_SCSI_MULTI_LUN=y 454CONFIG_SCSI_MULTI_LUN=y
421# CONFIG_SCSI_CONSTANTS is not set 455# CONFIG_SCSI_CONSTANTS is not set
422# CONFIG_SCSI_LOGGING is not set 456# CONFIG_SCSI_LOGGING is not set
457CONFIG_SCSI_SCAN_ASYNC=y
423 458
424# 459#
425# SCSI Transport Attributes 460# SCSI Transports
426# 461#
427# CONFIG_SCSI_SPI_ATTRS is not set 462# CONFIG_SCSI_SPI_ATTRS is not set
428# CONFIG_SCSI_FC_ATTRS is not set 463# CONFIG_SCSI_FC_ATTRS is not set
429# CONFIG_SCSI_ISCSI_ATTRS is not set 464# CONFIG_SCSI_ISCSI_ATTRS is not set
430# CONFIG_SCSI_SAS_ATTRS is not set 465CONFIG_SCSI_SAS_ATTRS=m
466CONFIG_SCSI_SAS_LIBSAS=m
467# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
431 468
432# 469#
433# SCSI low-level drivers 470# SCSI low-level drivers
@@ -440,26 +477,35 @@ CONFIG_SCSI_MULTI_LUN=y
440# CONFIG_SCSI_AIC7XXX is not set 477# CONFIG_SCSI_AIC7XXX is not set
441# CONFIG_SCSI_AIC7XXX_OLD is not set 478# CONFIG_SCSI_AIC7XXX_OLD is not set
442# CONFIG_SCSI_AIC79XX is not set 479# CONFIG_SCSI_AIC79XX is not set
480CONFIG_SCSI_AIC94XX=m
481# CONFIG_AIC94XX_DEBUG is not set
443# CONFIG_SCSI_DPT_I2O is not set 482# CONFIG_SCSI_DPT_I2O is not set
483# CONFIG_SCSI_ARCMSR is not set
444# CONFIG_MEGARAID_NEWGEN is not set 484# CONFIG_MEGARAID_NEWGEN is not set
445# CONFIG_MEGARAID_LEGACY is not set 485# CONFIG_MEGARAID_LEGACY is not set
446# CONFIG_MEGARAID_SAS is not set 486# CONFIG_MEGARAID_SAS is not set
447# CONFIG_SCSI_SATA is not set
448# CONFIG_SCSI_HPTIOP is not set 487# CONFIG_SCSI_HPTIOP is not set
449# CONFIG_SCSI_DMX3191D is not set 488# CONFIG_SCSI_DMX3191D is not set
450# CONFIG_SCSI_FUTURE_DOMAIN is not set 489# CONFIG_SCSI_FUTURE_DOMAIN is not set
451# CONFIG_SCSI_IPS is not set 490# CONFIG_SCSI_IPS is not set
452# CONFIG_SCSI_INITIO is not set 491# CONFIG_SCSI_INITIO is not set
453# CONFIG_SCSI_INIA100 is not set 492# CONFIG_SCSI_INIA100 is not set
493# CONFIG_SCSI_STEX is not set
454# CONFIG_SCSI_SYM53C8XX_2 is not set 494# CONFIG_SCSI_SYM53C8XX_2 is not set
455# CONFIG_SCSI_IPR is not set
456# CONFIG_SCSI_QLOGIC_1280 is not set 495# CONFIG_SCSI_QLOGIC_1280 is not set
457# CONFIG_SCSI_QLA_FC is not set 496# CONFIG_SCSI_QLA_FC is not set
497# CONFIG_SCSI_QLA_ISCSI is not set
458# CONFIG_SCSI_LPFC is not set 498# CONFIG_SCSI_LPFC is not set
459# CONFIG_SCSI_DC395x is not set 499# CONFIG_SCSI_DC395x is not set
460# CONFIG_SCSI_DC390T is not set 500# CONFIG_SCSI_DC390T is not set
461# CONFIG_SCSI_NSP32 is not set 501# CONFIG_SCSI_NSP32 is not set
462# CONFIG_SCSI_DEBUG is not set 502# CONFIG_SCSI_DEBUG is not set
503# CONFIG_SCSI_SRP is not set
504
505#
506# Serial ATA (prod) and Parallel ATA (experimental) drivers
507#
508# CONFIG_ATA is not set
463 509
464# 510#
465# Multi-device support (RAID and LVM) 511# Multi-device support (RAID and LVM)
@@ -513,6 +559,8 @@ CONFIG_LXT_PHY=m
513CONFIG_CICADA_PHY=m 559CONFIG_CICADA_PHY=m
514CONFIG_VITESSE_PHY=m 560CONFIG_VITESSE_PHY=m
515CONFIG_SMSC_PHY=m 561CONFIG_SMSC_PHY=m
562# CONFIG_BROADCOM_PHY is not set
563# CONFIG_FIXED_PHY is not set
516 564
517# 565#
518# Ethernet (10 or 100Mbit) 566# Ethernet (10 or 100Mbit)
@@ -549,7 +597,7 @@ CONFIG_E100=y
549# CONFIG_SUNDANCE is not set 597# CONFIG_SUNDANCE is not set
550# CONFIG_TLAN is not set 598# CONFIG_TLAN is not set
551# CONFIG_VIA_RHINE is not set 599# CONFIG_VIA_RHINE is not set
552# CONFIG_LAN_SAA9730 is not set 600# CONFIG_SC92031 is not set
553 601
554# 602#
555# Ethernet (1000 Mbit) 603# Ethernet (1000 Mbit)
@@ -568,14 +616,18 @@ CONFIG_E100=y
568# CONFIG_VIA_VELOCITY is not set 616# CONFIG_VIA_VELOCITY is not set
569# CONFIG_TIGON3 is not set 617# CONFIG_TIGON3 is not set
570# CONFIG_BNX2 is not set 618# CONFIG_BNX2 is not set
619CONFIG_QLA3XXX=m
620# CONFIG_ATL1 is not set
571 621
572# 622#
573# Ethernet (10000 Mbit) 623# Ethernet (10000 Mbit)
574# 624#
575# CONFIG_CHELSIO_T1 is not set 625# CONFIG_CHELSIO_T1 is not set
626CONFIG_CHELSIO_T3=m
576# CONFIG_IXGB is not set 627# CONFIG_IXGB is not set
577# CONFIG_S2IO is not set 628# CONFIG_S2IO is not set
578# CONFIG_MYRI10GE is not set 629# CONFIG_MYRI10GE is not set
630CONFIG_NETXEN_NIC=m
579 631
580# 632#
581# Token Ring devices 633# Token Ring devices
@@ -615,6 +667,7 @@ CONFIG_E100=y
615# Input device support 667# Input device support
616# 668#
617CONFIG_INPUT=y 669CONFIG_INPUT=y
670# CONFIG_INPUT_FF_MEMLESS is not set
618 671
619# 672#
620# Userland interfaces 673# Userland interfaces
@@ -682,10 +735,6 @@ CONFIG_LEGACY_PTY_COUNT=256
682# CONFIG_R3964 is not set 735# CONFIG_R3964 is not set
683# CONFIG_APPLICOM is not set 736# CONFIG_APPLICOM is not set
684# CONFIG_TANBAC_TB0219 is not set 737# CONFIG_TANBAC_TB0219 is not set
685
686#
687# Ftape, the floppy tape device driver
688#
689# CONFIG_DRM is not set 738# CONFIG_DRM is not set
690CONFIG_GPIO_VR41XX=y 739CONFIG_GPIO_VR41XX=y
691# CONFIG_RAW_DRIVER is not set 740# CONFIG_RAW_DRIVER is not set
@@ -694,7 +743,6 @@ CONFIG_GPIO_VR41XX=y
694# TPM devices 743# TPM devices
695# 744#
696# CONFIG_TCG_TPM is not set 745# CONFIG_TCG_TPM is not set
697# CONFIG_TELCLOCK is not set
698 746
699# 747#
700# I2C support 748# I2C support
@@ -719,14 +767,9 @@ CONFIG_GPIO_VR41XX=y
719# CONFIG_HWMON_VID is not set 767# CONFIG_HWMON_VID is not set
720 768
721# 769#
722# Misc devices
723#
724
725#
726# Multimedia devices 770# Multimedia devices
727# 771#
728# CONFIG_VIDEO_DEV is not set 772# CONFIG_VIDEO_DEV is not set
729CONFIG_VIDEO_V4L2=y
730 773
731# 774#
732# Digital Video Broadcasting Devices 775# Digital Video Broadcasting Devices
@@ -745,6 +788,7 @@ CONFIG_VIDEO_V4L2=y
745# 788#
746# CONFIG_VGA_CONSOLE is not set 789# CONFIG_VGA_CONSOLE is not set
747CONFIG_DUMMY_CONSOLE=y 790CONFIG_DUMMY_CONSOLE=y
791# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
748 792
749# 793#
750# Sound 794# Sound
@@ -752,6 +796,12 @@ CONFIG_DUMMY_CONSOLE=y
752# CONFIG_SOUND is not set 796# CONFIG_SOUND is not set
753 797
754# 798#
799# HID Devices
800#
801CONFIG_HID=y
802# CONFIG_HID_DEBUG is not set
803
804#
755# USB support 805# USB support
756# 806#
757CONFIG_USB_ARCH_HAS_HCD=y 807CONFIG_USB_ARCH_HAS_HCD=y
@@ -764,8 +814,8 @@ CONFIG_USB=y
764# Miscellaneous USB options 814# Miscellaneous USB options
765# 815#
766CONFIG_USB_DEVICEFS=y 816CONFIG_USB_DEVICEFS=y
767# CONFIG_USB_BANDWIDTH is not set
768# CONFIG_USB_DYNAMIC_MINORS is not set 817# CONFIG_USB_DYNAMIC_MINORS is not set
818# CONFIG_USB_SUSPEND is not set
769# CONFIG_USB_OTG is not set 819# CONFIG_USB_OTG is not set
770 820
771# 821#
@@ -775,9 +825,11 @@ CONFIG_USB_EHCI_HCD=y
775# CONFIG_USB_EHCI_SPLIT_ISO is not set 825# CONFIG_USB_EHCI_SPLIT_ISO is not set
776# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 826# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
777# CONFIG_USB_EHCI_TT_NEWSCHED is not set 827# CONFIG_USB_EHCI_TT_NEWSCHED is not set
828# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
778# CONFIG_USB_ISP116X_HCD is not set 829# CONFIG_USB_ISP116X_HCD is not set
779CONFIG_USB_OHCI_HCD=y 830CONFIG_USB_OHCI_HCD=y
780# CONFIG_USB_OHCI_BIG_ENDIAN is not set 831# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
832# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
781CONFIG_USB_OHCI_LITTLE_ENDIAN=y 833CONFIG_USB_OHCI_LITTLE_ENDIAN=y
782# CONFIG_USB_UHCI_HCD is not set 834# CONFIG_USB_UHCI_HCD is not set
783# CONFIG_USB_SL811_HCD is not set 835# CONFIG_USB_SL811_HCD is not set
@@ -805,6 +857,7 @@ CONFIG_USB_STORAGE=y
805# CONFIG_USB_STORAGE_SDDR55 is not set 857# CONFIG_USB_STORAGE_SDDR55 is not set
806# CONFIG_USB_STORAGE_JUMPSHOT is not set 858# CONFIG_USB_STORAGE_JUMPSHOT is not set
807# CONFIG_USB_STORAGE_ALAUDA is not set 859# CONFIG_USB_STORAGE_ALAUDA is not set
860# CONFIG_USB_STORAGE_KARMA is not set
808# CONFIG_USB_LIBUSUAL is not set 861# CONFIG_USB_LIBUSUAL is not set
809 862
810# 863#
@@ -829,6 +882,7 @@ CONFIG_USB_STORAGE=y
829# CONFIG_USB_ATI_REMOTE2 is not set 882# CONFIG_USB_ATI_REMOTE2 is not set
830# CONFIG_USB_KEYSPAN_REMOTE is not set 883# CONFIG_USB_KEYSPAN_REMOTE is not set
831# CONFIG_USB_APPLETOUCH is not set 884# CONFIG_USB_APPLETOUCH is not set
885# CONFIG_USB_GTCO is not set
832 886
833# 887#
834# USB Imaging devices 888# USB Imaging devices
@@ -843,6 +897,7 @@ CONFIG_USB_STORAGE=y
843# CONFIG_USB_KAWETH is not set 897# CONFIG_USB_KAWETH is not set
844# CONFIG_USB_PEGASUS is not set 898# CONFIG_USB_PEGASUS is not set
845# CONFIG_USB_RTL8150 is not set 899# CONFIG_USB_RTL8150 is not set
900# CONFIG_USB_USBNET_MII is not set
846# CONFIG_USB_USBNET is not set 901# CONFIG_USB_USBNET is not set
847# CONFIG_USB_MON is not set 902# CONFIG_USB_MON is not set
848 903
@@ -860,19 +915,21 @@ CONFIG_USB_STORAGE=y
860# 915#
861# CONFIG_USB_EMI62 is not set 916# CONFIG_USB_EMI62 is not set
862# CONFIG_USB_EMI26 is not set 917# CONFIG_USB_EMI26 is not set
918# CONFIG_USB_ADUTUX is not set
863# CONFIG_USB_AUERSWALD is not set 919# CONFIG_USB_AUERSWALD is not set
864# CONFIG_USB_RIO500 is not set 920# CONFIG_USB_RIO500 is not set
865# CONFIG_USB_LEGOTOWER is not set 921# CONFIG_USB_LEGOTOWER is not set
866# CONFIG_USB_LCD is not set 922# CONFIG_USB_LCD is not set
867# CONFIG_USB_LED is not set 923# CONFIG_USB_LED is not set
868# CONFIG_USB_CY7C63 is not set 924# CONFIG_USB_CYPRESS_CY7C63 is not set
869# CONFIG_USB_CYTHERM is not set 925# CONFIG_USB_CYTHERM is not set
870# CONFIG_USB_PHIDGETKIT is not set 926# CONFIG_USB_PHIDGET is not set
871# CONFIG_USB_PHIDGETSERVO is not set
872# CONFIG_USB_IDMOUSE is not set 927# CONFIG_USB_IDMOUSE is not set
928# CONFIG_USB_FTDI_ELAN is not set
873# CONFIG_USB_APPLEDISPLAY is not set 929# CONFIG_USB_APPLEDISPLAY is not set
874# CONFIG_USB_SISUSBVGA is not set 930# CONFIG_USB_SISUSBVGA is not set
875# CONFIG_USB_LD is not set 931# CONFIG_USB_LD is not set
932# CONFIG_USB_TRANCEVIBRATOR is not set
876# CONFIG_USB_TEST is not set 933# CONFIG_USB_TEST is not set
877 934
878# 935#
@@ -918,6 +975,7 @@ CONFIG_RTC_LIB=y
918CONFIG_RTC_CLASS=y 975CONFIG_RTC_CLASS=y
919CONFIG_RTC_HCTOSYS=y 976CONFIG_RTC_HCTOSYS=y
920CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 977CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
978# CONFIG_RTC_DEBUG is not set
921 979
922# 980#
923# RTC interfaces 981# RTC interfaces
@@ -951,16 +1009,26 @@ CONFIG_RTC_DRV_VR41XX=y
951# 1009#
952 1010
953# 1011#
1012# Auxiliary Display support
1013#
1014
1015#
1016# Virtualization
1017#
1018
1019#
954# File systems 1020# File systems
955# 1021#
956CONFIG_EXT2_FS=y 1022CONFIG_EXT2_FS=y
957# CONFIG_EXT2_FS_XATTR is not set 1023# CONFIG_EXT2_FS_XATTR is not set
958# CONFIG_EXT2_FS_XIP is not set 1024# CONFIG_EXT2_FS_XIP is not set
959# CONFIG_EXT3_FS is not set 1025# CONFIG_EXT3_FS is not set
1026# CONFIG_EXT4DEV_FS is not set
960# CONFIG_REISERFS_FS is not set 1027# CONFIG_REISERFS_FS is not set
961# CONFIG_JFS_FS is not set 1028# CONFIG_JFS_FS is not set
962# CONFIG_FS_POSIX_ACL is not set 1029CONFIG_FS_POSIX_ACL=y
963# CONFIG_XFS_FS is not set 1030# CONFIG_XFS_FS is not set
1031# CONFIG_GFS2_FS is not set
964# CONFIG_OCFS2_FS is not set 1032# CONFIG_OCFS2_FS is not set
965# CONFIG_MINIX_FS is not set 1033# CONFIG_MINIX_FS is not set
966CONFIG_ROMFS_FS=m 1034CONFIG_ROMFS_FS=m
@@ -971,6 +1039,7 @@ CONFIG_DNOTIFY=y
971# CONFIG_AUTOFS_FS is not set 1039# CONFIG_AUTOFS_FS is not set
972CONFIG_AUTOFS4_FS=y 1040CONFIG_AUTOFS4_FS=y
973CONFIG_FUSE_FS=m 1041CONFIG_FUSE_FS=m
1042CONFIG_GENERIC_ACL=y
974 1043
975# 1044#
976# CD-ROM/DVD Filesystems 1045# CD-ROM/DVD Filesystems
@@ -990,11 +1059,13 @@ CONFIG_FUSE_FS=m
990# 1059#
991CONFIG_PROC_FS=y 1060CONFIG_PROC_FS=y
992CONFIG_PROC_KCORE=y 1061CONFIG_PROC_KCORE=y
1062CONFIG_PROC_SYSCTL=y
993CONFIG_SYSFS=y 1063CONFIG_SYSFS=y
994CONFIG_TMPFS=y 1064CONFIG_TMPFS=y
1065CONFIG_TMPFS_POSIX_ACL=y
995# CONFIG_HUGETLB_PAGE is not set 1066# CONFIG_HUGETLB_PAGE is not set
996CONFIG_RAMFS=y 1067CONFIG_RAMFS=y
997# CONFIG_CONFIGFS_FS is not set 1068CONFIG_CONFIGFS_FS=m
998 1069
999# 1070#
1000# Miscellaneous filesystems 1071# Miscellaneous filesystems
@@ -1036,7 +1107,6 @@ CONFIG_SUNRPC=y
1036# CONFIG_RPCSEC_GSS_SPKM3 is not set 1107# CONFIG_RPCSEC_GSS_SPKM3 is not set
1037# CONFIG_SMB_FS is not set 1108# CONFIG_SMB_FS is not set
1038# CONFIG_CIFS is not set 1109# CONFIG_CIFS is not set
1039# CONFIG_CIFS_DEBUG2 is not set
1040# CONFIG_NCP_FS is not set 1110# CONFIG_NCP_FS is not set
1041# CONFIG_CODA_FS is not set 1111# CONFIG_CODA_FS is not set
1042# CONFIG_AFS_FS is not set 1112# CONFIG_AFS_FS is not set
@@ -1054,6 +1124,14 @@ CONFIG_MSDOS_PARTITION=y
1054# CONFIG_NLS is not set 1124# CONFIG_NLS is not set
1055 1125
1056# 1126#
1127# Distributed Lock Manager
1128#
1129CONFIG_DLM=m
1130CONFIG_DLM_TCP=y
1131# CONFIG_DLM_SCTP is not set
1132# CONFIG_DLM_DEBUG is not set
1133
1134#
1057# Profiling support 1135# Profiling support
1058# 1136#
1059# CONFIG_PROFILING is not set 1137# CONFIG_PROFILING is not set
@@ -1063,11 +1141,13 @@ CONFIG_MSDOS_PARTITION=y
1063# 1141#
1064CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1142CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1065# CONFIG_PRINTK_TIME is not set 1143# CONFIG_PRINTK_TIME is not set
1144CONFIG_ENABLE_MUST_CHECK=y
1066# CONFIG_MAGIC_SYSRQ is not set 1145# CONFIG_MAGIC_SYSRQ is not set
1067# CONFIG_UNUSED_SYMBOLS is not set 1146# CONFIG_UNUSED_SYMBOLS is not set
1147# CONFIG_DEBUG_FS is not set
1148# CONFIG_HEADERS_CHECK is not set
1068# CONFIG_DEBUG_KERNEL is not set 1149# CONFIG_DEBUG_KERNEL is not set
1069CONFIG_LOG_BUF_SHIFT=14 1150CONFIG_LOG_BUF_SHIFT=14
1070# CONFIG_DEBUG_FS is not set
1071CONFIG_CROSSCOMPILE=y 1151CONFIG_CROSSCOMPILE=y
1072CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" 1152CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1073 1153
@@ -1080,7 +1160,44 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1080# 1160#
1081# Cryptographic options 1161# Cryptographic options
1082# 1162#
1083# CONFIG_CRYPTO is not set 1163CONFIG_CRYPTO=y
1164CONFIG_CRYPTO_ALGAPI=y
1165CONFIG_CRYPTO_BLKCIPHER=m
1166CONFIG_CRYPTO_HASH=m
1167CONFIG_CRYPTO_MANAGER=m
1168CONFIG_CRYPTO_HMAC=m
1169CONFIG_CRYPTO_XCBC=m
1170CONFIG_CRYPTO_NULL=m
1171CONFIG_CRYPTO_MD4=m
1172CONFIG_CRYPTO_MD5=y
1173CONFIG_CRYPTO_SHA1=m
1174CONFIG_CRYPTO_SHA256=m
1175CONFIG_CRYPTO_SHA512=m
1176CONFIG_CRYPTO_WP512=m
1177CONFIG_CRYPTO_TGR192=m
1178CONFIG_CRYPTO_GF128MUL=m
1179CONFIG_CRYPTO_ECB=m
1180CONFIG_CRYPTO_CBC=m
1181CONFIG_CRYPTO_PCBC=m
1182CONFIG_CRYPTO_LRW=m
1183CONFIG_CRYPTO_DES=m
1184CONFIG_CRYPTO_FCRYPT=m
1185CONFIG_CRYPTO_BLOWFISH=m
1186CONFIG_CRYPTO_TWOFISH=m
1187CONFIG_CRYPTO_TWOFISH_COMMON=m
1188CONFIG_CRYPTO_SERPENT=m
1189CONFIG_CRYPTO_AES=m
1190CONFIG_CRYPTO_CAST5=m
1191CONFIG_CRYPTO_CAST6=m
1192CONFIG_CRYPTO_TEA=m
1193CONFIG_CRYPTO_ARC4=m
1194CONFIG_CRYPTO_KHAZAD=m
1195CONFIG_CRYPTO_ANUBIS=m
1196CONFIG_CRYPTO_DEFLATE=m
1197CONFIG_CRYPTO_MICHAEL_MIC=m
1198CONFIG_CRYPTO_CRC32C=m
1199CONFIG_CRYPTO_CAMELLIA=m
1200# CONFIG_CRYPTO_TEST is not set
1084 1201
1085# 1202#
1086# Hardware crypto devices 1203# Hardware crypto devices
@@ -1092,6 +1209,9 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1092# CONFIG_CRC_CCITT is not set 1209# CONFIG_CRC_CCITT is not set
1093# CONFIG_CRC16 is not set 1210# CONFIG_CRC16 is not set
1094# CONFIG_CRC32 is not set 1211# CONFIG_CRC32 is not set
1095# CONFIG_LIBCRC32C is not set 1212CONFIG_LIBCRC32C=m
1096CONFIG_ZLIB_INFLATE=m 1213CONFIG_ZLIB_INFLATE=m
1214CONFIG_ZLIB_DEFLATE=m
1097CONFIG_PLIST=y 1215CONFIG_PLIST=y
1216CONFIG_HAS_IOMEM=y
1217CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index c19597fb0c32..33b788089ab5 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:20 2006 4# Sun Feb 18 21:28:12 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -72,12 +72,15 @@ CONFIG_TANBAC_TB022X=y
72# CONFIG_VICTOR_MPC30X is not set 72# CONFIG_VICTOR_MPC30X is not set
73# CONFIG_ZAO_CAPCELLA is not set 73# CONFIG_ZAO_CAPCELLA is not set
74CONFIG_PCI_VR41XX=y 74CONFIG_PCI_VR41XX=y
75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 75CONFIG_RWSEM_GENERIC_SPINLOCK=y
76# CONFIG_ARCH_HAS_ILOG2_U32 is not set
77# CONFIG_ARCH_HAS_ILOG2_U64 is not set
77CONFIG_GENERIC_FIND_NEXT_BIT=y 78CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y 79CONFIG_GENERIC_HWEIGHT=y
79CONFIG_GENERIC_CALIBRATE_DELAY=y 80CONFIG_GENERIC_CALIBRATE_DELAY=y
81CONFIG_GENERIC_TIME=y
80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 82CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
83CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
81CONFIG_DMA_NONCOHERENT=y 84CONFIG_DMA_NONCOHERENT=y
82CONFIG_DMA_NEED_PCI_MAP_STATE=y 85CONFIG_DMA_NEED_PCI_MAP_STATE=y
83# CONFIG_CPU_BIG_ENDIAN is not set 86# CONFIG_CPU_BIG_ENDIAN is not set
@@ -110,6 +113,7 @@ CONFIG_CPU_VR41XX=y
110# CONFIG_CPU_SB1 is not set 113# CONFIG_CPU_SB1 is not set
111CONFIG_SYS_HAS_CPU_VR41XX=y 114CONFIG_SYS_HAS_CPU_VR41XX=y
112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 115CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
116CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 117CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 118CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
115 119
@@ -123,8 +127,8 @@ CONFIG_PAGE_SIZE_4KB=y
123# CONFIG_PAGE_SIZE_16KB is not set 127# CONFIG_PAGE_SIZE_16KB is not set
124# CONFIG_PAGE_SIZE_64KB is not set 128# CONFIG_PAGE_SIZE_64KB is not set
125CONFIG_MIPS_MT_DISABLED=y 129CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 130# CONFIG_MIPS_MT_SMP is not set
131# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 132# CONFIG_MIPS_VPE_LOADER is not set
129CONFIG_CPU_HAS_SYNC=y 133CONFIG_CPU_HAS_SYNC=y
130CONFIG_GENERIC_HARDIRQS=y 134CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +143,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139# CONFIG_SPARSEMEM_STATIC is not set 143# CONFIG_SPARSEMEM_STATIC is not set
140CONFIG_SPLIT_PTLOCK_CPUS=4 144CONFIG_SPLIT_PTLOCK_CPUS=4
141# CONFIG_RESOURCES_64BIT is not set 145# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1
142# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -151,6 +156,7 @@ CONFIG_HZ=1000
151CONFIG_PREEMPT_NONE=y 156CONFIG_PREEMPT_NONE=y
152# CONFIG_PREEMPT_VOLUNTARY is not set 157# CONFIG_PREEMPT_VOLUNTARY is not set
153# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
159# CONFIG_KEXEC is not set
154CONFIG_LOCKDEP_SUPPORT=y 160CONFIG_LOCKDEP_SUPPORT=y
155CONFIG_STACKTRACE_SUPPORT=y 161CONFIG_STACKTRACE_SUPPORT=y
156CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 162CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -169,15 +175,20 @@ CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y 175CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y 176CONFIG_SWAP=y
171CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 180# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 182# CONFIG_TASKSTATS is not set
183# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 185# CONFIG_IKCONFIG is not set
186CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 187# CONFIG_RELAY is not set
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
189CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
191CONFIG_SYSCTL_SYSCALL=y
181CONFIG_KALLSYMS=y 192CONFIG_KALLSYMS=y
182# CONFIG_KALLSYMS_EXTRA_PASS is not set 193# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y 194CONFIG_HOTPLUG=y
@@ -185,12 +196,12 @@ CONFIG_PRINTK=y
185CONFIG_BUG=y 196CONFIG_BUG=y
186CONFIG_ELF_CORE=y 197CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 198CONFIG_BASE_FULL=y
188CONFIG_RT_MUTEXES=y
189CONFIG_FUTEX=y 199CONFIG_FUTEX=y
190CONFIG_EPOLL=y 200CONFIG_EPOLL=y
191CONFIG_SHMEM=y 201CONFIG_SHMEM=y
192CONFIG_SLAB=y 202CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 203CONFIG_VM_EVENT_COUNTERS=y
204CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 205# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 206CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set 207# CONFIG_SLOB is not set
@@ -208,6 +219,7 @@ CONFIG_KMOD=y
208# 219#
209# Block layer 220# Block layer
210# 221#
222CONFIG_BLOCK=y
211# CONFIG_LBD is not set 223# CONFIG_LBD is not set
212# CONFIG_BLK_DEV_IO_TRACE is not set 224# CONFIG_BLK_DEV_IO_TRACE is not set
213# CONFIG_LSF is not set 225# CONFIG_LSF is not set
@@ -250,6 +262,14 @@ CONFIG_BINFMT_ELF=y
250CONFIG_TRAD_SIGNALS=y 262CONFIG_TRAD_SIGNALS=y
251 263
252# 264#
265# Power management options
266#
267CONFIG_PM=y
268# CONFIG_PM_LEGACY is not set
269# CONFIG_PM_DEBUG is not set
270# CONFIG_PM_SYSFS_DEPRECATED is not set
271
272#
253# Networking 273# Networking
254# 274#
255CONFIG_NET=y 275CONFIG_NET=y
@@ -263,6 +283,8 @@ CONFIG_PACKET=y
263CONFIG_UNIX=y 283CONFIG_UNIX=y
264CONFIG_XFRM=y 284CONFIG_XFRM=y
265# CONFIG_XFRM_USER is not set 285# CONFIG_XFRM_USER is not set
286# CONFIG_XFRM_SUB_POLICY is not set
287CONFIG_XFRM_MIGRATE=y
266# CONFIG_NET_KEY is not set 288# CONFIG_NET_KEY is not set
267CONFIG_INET=y 289CONFIG_INET=y
268CONFIG_IP_MULTICAST=y 290CONFIG_IP_MULTICAST=y
@@ -291,10 +313,13 @@ CONFIG_SYN_COOKIES=y
291CONFIG_INET_TUNNEL=m 313CONFIG_INET_TUNNEL=m
292CONFIG_INET_XFRM_MODE_TRANSPORT=m 314CONFIG_INET_XFRM_MODE_TRANSPORT=m
293CONFIG_INET_XFRM_MODE_TUNNEL=m 315CONFIG_INET_XFRM_MODE_TUNNEL=m
316CONFIG_INET_XFRM_MODE_BEET=m
294CONFIG_INET_DIAG=y 317CONFIG_INET_DIAG=y
295CONFIG_INET_TCP_DIAG=y 318CONFIG_INET_TCP_DIAG=y
296# CONFIG_TCP_CONG_ADVANCED is not set 319# CONFIG_TCP_CONG_ADVANCED is not set
297CONFIG_TCP_CONG_BIC=y 320CONFIG_TCP_CONG_CUBIC=y
321CONFIG_DEFAULT_TCP_CONG="cubic"
322CONFIG_TCP_MD5SIG=y
298# CONFIG_IPV6 is not set 323# CONFIG_IPV6 is not set
299# CONFIG_INET6_XFRM_TUNNEL is not set 324# CONFIG_INET6_XFRM_TUNNEL is not set
300# CONFIG_INET6_TUNNEL is not set 325# CONFIG_INET6_TUNNEL is not set
@@ -324,7 +349,6 @@ CONFIG_NETWORK_SECMARK=y
324# CONFIG_ATALK is not set 349# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 350# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 351# CONFIG_LAPB is not set
327# CONFIG_NET_DIVERT is not set
328# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
330 354
@@ -341,6 +365,7 @@ CONFIG_NETWORK_SECMARK=y
341# CONFIG_IRDA is not set 365# CONFIG_IRDA is not set
342# CONFIG_BT is not set 366# CONFIG_BT is not set
343# CONFIG_IEEE80211 is not set 367# CONFIG_IEEE80211 is not set
368CONFIG_FIB_RULES=y
344 369
345# 370#
346# Device Drivers 371# Device Drivers
@@ -389,11 +414,18 @@ CONFIG_BLK_DEV_NBD=m
389CONFIG_BLK_DEV_RAM=y 414CONFIG_BLK_DEV_RAM=y
390CONFIG_BLK_DEV_RAM_COUNT=16 415CONFIG_BLK_DEV_RAM_COUNT=16
391CONFIG_BLK_DEV_RAM_SIZE=4096 416CONFIG_BLK_DEV_RAM_SIZE=4096
417CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
392# CONFIG_BLK_DEV_INITRD is not set 418# CONFIG_BLK_DEV_INITRD is not set
393# CONFIG_CDROM_PKTCDVD is not set 419# CONFIG_CDROM_PKTCDVD is not set
394# CONFIG_ATA_OVER_ETH is not set 420# CONFIG_ATA_OVER_ETH is not set
395 421
396# 422#
423# Misc devices
424#
425CONFIG_SGI_IOC4=m
426# CONFIG_TIFM_CORE is not set
427
428#
397# ATA/ATAPI/MFM/RLL support 429# ATA/ATAPI/MFM/RLL support
398# 430#
399# CONFIG_IDE is not set 431# CONFIG_IDE is not set
@@ -403,6 +435,12 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
403# 435#
404# CONFIG_RAID_ATTRS is not set 436# CONFIG_RAID_ATTRS is not set
405# CONFIG_SCSI is not set 437# CONFIG_SCSI is not set
438# CONFIG_SCSI_NETLINK is not set
439
440#
441# Serial ATA (prod) and Parallel ATA (experimental) drivers
442#
443# CONFIG_ATA is not set
406 444
407# 445#
408# Multi-device support (RAID and LVM) 446# Multi-device support (RAID and LVM)
@@ -453,6 +491,8 @@ CONFIG_LXT_PHY=m
453CONFIG_CICADA_PHY=m 491CONFIG_CICADA_PHY=m
454CONFIG_VITESSE_PHY=m 492CONFIG_VITESSE_PHY=m
455CONFIG_SMSC_PHY=m 493CONFIG_SMSC_PHY=m
494# CONFIG_BROADCOM_PHY is not set
495# CONFIG_FIXED_PHY is not set
456 496
457# 497#
458# Ethernet (10 or 100Mbit) 498# Ethernet (10 or 100Mbit)
@@ -489,14 +529,17 @@ CONFIG_R8169=y
489# CONFIG_SK98LIN is not set 529# CONFIG_SK98LIN is not set
490# CONFIG_TIGON3 is not set 530# CONFIG_TIGON3 is not set
491# CONFIG_BNX2 is not set 531# CONFIG_BNX2 is not set
532CONFIG_QLA3XXX=m
492 533
493# 534#
494# Ethernet (10000 Mbit) 535# Ethernet (10000 Mbit)
495# 536#
496# CONFIG_CHELSIO_T1 is not set 537# CONFIG_CHELSIO_T1 is not set
538CONFIG_CHELSIO_T3=m
497# CONFIG_IXGB is not set 539# CONFIG_IXGB is not set
498# CONFIG_S2IO is not set 540# CONFIG_S2IO is not set
499# CONFIG_MYRI10GE is not set 541# CONFIG_MYRI10GE is not set
542CONFIG_NETXEN_NIC=m
500 543
501# 544#
502# Token Ring devices 545# Token Ring devices
@@ -535,6 +578,7 @@ CONFIG_R8169=y
535# Input device support 578# Input device support
536# 579#
537CONFIG_INPUT=y 580CONFIG_INPUT=y
581# CONFIG_INPUT_FF_MEMLESS is not set
538 582
539# 583#
540# Userland interfaces 584# Userland interfaces
@@ -602,10 +646,6 @@ CONFIG_LEGACY_PTY_COUNT=256
602# CONFIG_R3964 is not set 646# CONFIG_R3964 is not set
603# CONFIG_APPLICOM is not set 647# CONFIG_APPLICOM is not set
604CONFIG_TANBAC_TB0219=y 648CONFIG_TANBAC_TB0219=y
605
606#
607# Ftape, the floppy tape device driver
608#
609# CONFIG_DRM is not set 649# CONFIG_DRM is not set
610CONFIG_GPIO_VR41XX=y 650CONFIG_GPIO_VR41XX=y
611# CONFIG_RAW_DRIVER is not set 651# CONFIG_RAW_DRIVER is not set
@@ -614,7 +654,6 @@ CONFIG_GPIO_VR41XX=y
614# TPM devices 654# TPM devices
615# 655#
616# CONFIG_TCG_TPM is not set 656# CONFIG_TCG_TPM is not set
617# CONFIG_TELCLOCK is not set
618 657
619# 658#
620# I2C support 659# I2C support
@@ -630,6 +669,7 @@ CONFIG_GPIO_VR41XX=y
630# 669#
631# Dallas's 1-wire bus 670# Dallas's 1-wire bus
632# 671#
672# CONFIG_W1 is not set
633 673
634# 674#
635# Hardware Monitoring support 675# Hardware Monitoring support
@@ -638,14 +678,9 @@ CONFIG_GPIO_VR41XX=y
638# CONFIG_HWMON_VID is not set 678# CONFIG_HWMON_VID is not set
639 679
640# 680#
641# Misc devices
642#
643
644#
645# Multimedia devices 681# Multimedia devices
646# 682#
647# CONFIG_VIDEO_DEV is not set 683# CONFIG_VIDEO_DEV is not set
648CONFIG_VIDEO_V4L2=y
649 684
650# 685#
651# Digital Video Broadcasting Devices 686# Digital Video Broadcasting Devices
@@ -664,6 +699,7 @@ CONFIG_VIDEO_V4L2=y
664# 699#
665# CONFIG_VGA_CONSOLE is not set 700# CONFIG_VGA_CONSOLE is not set
666CONFIG_DUMMY_CONSOLE=y 701CONFIG_DUMMY_CONSOLE=y
702# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
667 703
668# 704#
669# Sound 705# Sound
@@ -671,6 +707,12 @@ CONFIG_DUMMY_CONSOLE=y
671# CONFIG_SOUND is not set 707# CONFIG_SOUND is not set
672 708
673# 709#
710# HID Devices
711#
712CONFIG_HID=y
713# CONFIG_HID_DEBUG is not set
714
715#
674# USB support 716# USB support
675# 717#
676CONFIG_USB_ARCH_HAS_HCD=y 718CONFIG_USB_ARCH_HAS_HCD=y
@@ -683,8 +725,8 @@ CONFIG_USB=m
683# Miscellaneous USB options 725# Miscellaneous USB options
684# 726#
685CONFIG_USB_DEVICEFS=y 727CONFIG_USB_DEVICEFS=y
686# CONFIG_USB_BANDWIDTH is not set
687# CONFIG_USB_DYNAMIC_MINORS is not set 728# CONFIG_USB_DYNAMIC_MINORS is not set
729# CONFIG_USB_SUSPEND is not set
688# CONFIG_USB_OTG is not set 730# CONFIG_USB_OTG is not set
689 731
690# 732#
@@ -694,9 +736,11 @@ CONFIG_USB_EHCI_HCD=m
694# CONFIG_USB_EHCI_SPLIT_ISO is not set 736# CONFIG_USB_EHCI_SPLIT_ISO is not set
695# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 737# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
696# CONFIG_USB_EHCI_TT_NEWSCHED is not set 738# CONFIG_USB_EHCI_TT_NEWSCHED is not set
739# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
697# CONFIG_USB_ISP116X_HCD is not set 740# CONFIG_USB_ISP116X_HCD is not set
698CONFIG_USB_OHCI_HCD=m 741CONFIG_USB_OHCI_HCD=m
699# CONFIG_USB_OHCI_BIG_ENDIAN is not set 742# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
743# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
700CONFIG_USB_OHCI_LITTLE_ENDIAN=y 744CONFIG_USB_OHCI_LITTLE_ENDIAN=y
701# CONFIG_USB_UHCI_HCD is not set 745# CONFIG_USB_UHCI_HCD is not set
702# CONFIG_USB_SL811_HCD is not set 746# CONFIG_USB_SL811_HCD is not set
@@ -714,7 +758,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
714# 758#
715# may also be needed; see USB_STORAGE Help for more information 759# may also be needed; see USB_STORAGE Help for more information
716# 760#
717# CONFIG_USB_STORAGE is not set
718# CONFIG_USB_LIBUSUAL is not set 761# CONFIG_USB_LIBUSUAL is not set
719 762
720# 763#
@@ -739,6 +782,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
739# CONFIG_USB_ATI_REMOTE2 is not set 782# CONFIG_USB_ATI_REMOTE2 is not set
740# CONFIG_USB_KEYSPAN_REMOTE is not set 783# CONFIG_USB_KEYSPAN_REMOTE is not set
741# CONFIG_USB_APPLETOUCH is not set 784# CONFIG_USB_APPLETOUCH is not set
785# CONFIG_USB_GTCO is not set
742 786
743# 787#
744# USB Imaging devices 788# USB Imaging devices
@@ -752,6 +796,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
752# CONFIG_USB_KAWETH is not set 796# CONFIG_USB_KAWETH is not set
753# CONFIG_USB_PEGASUS is not set 797# CONFIG_USB_PEGASUS is not set
754# CONFIG_USB_RTL8150 is not set 798# CONFIG_USB_RTL8150 is not set
799# CONFIG_USB_USBNET_MII is not set
755# CONFIG_USB_USBNET is not set 800# CONFIG_USB_USBNET is not set
756CONFIG_USB_MON=y 801CONFIG_USB_MON=y
757 802
@@ -769,19 +814,21 @@ CONFIG_USB_MON=y
769# 814#
770# CONFIG_USB_EMI62 is not set 815# CONFIG_USB_EMI62 is not set
771# CONFIG_USB_EMI26 is not set 816# CONFIG_USB_EMI26 is not set
817# CONFIG_USB_ADUTUX is not set
772# CONFIG_USB_AUERSWALD is not set 818# CONFIG_USB_AUERSWALD is not set
773# CONFIG_USB_RIO500 is not set 819# CONFIG_USB_RIO500 is not set
774# CONFIG_USB_LEGOTOWER is not set 820# CONFIG_USB_LEGOTOWER is not set
775# CONFIG_USB_LCD is not set 821# CONFIG_USB_LCD is not set
776# CONFIG_USB_LED is not set 822# CONFIG_USB_LED is not set
777# CONFIG_USB_CY7C63 is not set 823# CONFIG_USB_CYPRESS_CY7C63 is not set
778# CONFIG_USB_CYTHERM is not set 824# CONFIG_USB_CYTHERM is not set
779# CONFIG_USB_PHIDGETKIT is not set 825# CONFIG_USB_PHIDGET is not set
780# CONFIG_USB_PHIDGETSERVO is not set
781# CONFIG_USB_IDMOUSE is not set 826# CONFIG_USB_IDMOUSE is not set
827# CONFIG_USB_FTDI_ELAN is not set
782# CONFIG_USB_APPLEDISPLAY is not set 828# CONFIG_USB_APPLEDISPLAY is not set
783# CONFIG_USB_SISUSBVGA is not set 829# CONFIG_USB_SISUSBVGA is not set
784# CONFIG_USB_LD is not set 830# CONFIG_USB_LD is not set
831# CONFIG_USB_TRANCEVIBRATOR is not set
785# CONFIG_USB_TEST is not set 832# CONFIG_USB_TEST is not set
786 833
787# 834#
@@ -827,6 +874,7 @@ CONFIG_RTC_LIB=y
827CONFIG_RTC_CLASS=y 874CONFIG_RTC_CLASS=y
828CONFIG_RTC_HCTOSYS=y 875CONFIG_RTC_HCTOSYS=y
829CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 876CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
877# CONFIG_RTC_DEBUG is not set
830 878
831# 879#
832# RTC interfaces 880# RTC interfaces
@@ -860,16 +908,26 @@ CONFIG_RTC_DRV_VR41XX=y
860# 908#
861 909
862# 910#
911# Auxiliary Display support
912#
913
914#
915# Virtualization
916#
917
918#
863# File systems 919# File systems
864# 920#
865CONFIG_EXT2_FS=y 921CONFIG_EXT2_FS=y
866# CONFIG_EXT2_FS_XATTR is not set 922# CONFIG_EXT2_FS_XATTR is not set
867# CONFIG_EXT2_FS_XIP is not set 923# CONFIG_EXT2_FS_XIP is not set
868# CONFIG_EXT3_FS is not set 924# CONFIG_EXT3_FS is not set
925# CONFIG_EXT4DEV_FS is not set
869# CONFIG_REISERFS_FS is not set 926# CONFIG_REISERFS_FS is not set
870# CONFIG_JFS_FS is not set 927# CONFIG_JFS_FS is not set
871# CONFIG_FS_POSIX_ACL is not set 928CONFIG_FS_POSIX_ACL=y
872# CONFIG_XFS_FS is not set 929# CONFIG_XFS_FS is not set
930# CONFIG_GFS2_FS is not set
873# CONFIG_OCFS2_FS is not set 931# CONFIG_OCFS2_FS is not set
874# CONFIG_MINIX_FS is not set 932# CONFIG_MINIX_FS is not set
875CONFIG_ROMFS_FS=m 933CONFIG_ROMFS_FS=m
@@ -880,6 +938,7 @@ CONFIG_DNOTIFY=y
880# CONFIG_AUTOFS_FS is not set 938# CONFIG_AUTOFS_FS is not set
881CONFIG_AUTOFS4_FS=y 939CONFIG_AUTOFS4_FS=y
882CONFIG_FUSE_FS=m 940CONFIG_FUSE_FS=m
941CONFIG_GENERIC_ACL=y
883 942
884# 943#
885# CD-ROM/DVD Filesystems 944# CD-ROM/DVD Filesystems
@@ -899,11 +958,13 @@ CONFIG_FUSE_FS=m
899# 958#
900CONFIG_PROC_FS=y 959CONFIG_PROC_FS=y
901CONFIG_PROC_KCORE=y 960CONFIG_PROC_KCORE=y
961CONFIG_PROC_SYSCTL=y
902CONFIG_SYSFS=y 962CONFIG_SYSFS=y
903CONFIG_TMPFS=y 963CONFIG_TMPFS=y
964CONFIG_TMPFS_POSIX_ACL=y
904# CONFIG_HUGETLB_PAGE is not set 965# CONFIG_HUGETLB_PAGE is not set
905CONFIG_RAMFS=y 966CONFIG_RAMFS=y
906# CONFIG_CONFIGFS_FS is not set 967CONFIG_CONFIGFS_FS=m
907 968
908# 969#
909# Miscellaneous filesystems 970# Miscellaneous filesystems
@@ -945,7 +1006,6 @@ CONFIG_SUNRPC=y
945# CONFIG_RPCSEC_GSS_SPKM3 is not set 1006# CONFIG_RPCSEC_GSS_SPKM3 is not set
946# CONFIG_SMB_FS is not set 1007# CONFIG_SMB_FS is not set
947# CONFIG_CIFS is not set 1008# CONFIG_CIFS is not set
948# CONFIG_CIFS_DEBUG2 is not set
949# CONFIG_NCP_FS is not set 1009# CONFIG_NCP_FS is not set
950# CONFIG_CODA_FS is not set 1010# CONFIG_CODA_FS is not set
951# CONFIG_AFS_FS is not set 1011# CONFIG_AFS_FS is not set
@@ -963,6 +1023,14 @@ CONFIG_MSDOS_PARTITION=y
963# CONFIG_NLS is not set 1023# CONFIG_NLS is not set
964 1024
965# 1025#
1026# Distributed Lock Manager
1027#
1028CONFIG_DLM=m
1029CONFIG_DLM_TCP=y
1030# CONFIG_DLM_SCTP is not set
1031# CONFIG_DLM_DEBUG is not set
1032
1033#
966# Profiling support 1034# Profiling support
967# 1035#
968# CONFIG_PROFILING is not set 1036# CONFIG_PROFILING is not set
@@ -972,11 +1040,13 @@ CONFIG_MSDOS_PARTITION=y
972# 1040#
973CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1041CONFIG_TRACE_IRQFLAGS_SUPPORT=y
974# CONFIG_PRINTK_TIME is not set 1042# CONFIG_PRINTK_TIME is not set
1043CONFIG_ENABLE_MUST_CHECK=y
975# CONFIG_MAGIC_SYSRQ is not set 1044# CONFIG_MAGIC_SYSRQ is not set
976# CONFIG_UNUSED_SYMBOLS is not set 1045# CONFIG_UNUSED_SYMBOLS is not set
1046# CONFIG_DEBUG_FS is not set
1047# CONFIG_HEADERS_CHECK is not set
977# CONFIG_DEBUG_KERNEL is not set 1048# CONFIG_DEBUG_KERNEL is not set
978CONFIG_LOG_BUF_SHIFT=14 1049CONFIG_LOG_BUF_SHIFT=14
979# CONFIG_DEBUG_FS is not set
980CONFIG_CROSSCOMPILE=y 1050CONFIG_CROSSCOMPILE=y
981CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 1051CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
982 1052
@@ -989,7 +1059,44 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
989# 1059#
990# Cryptographic options 1060# Cryptographic options
991# 1061#
992# CONFIG_CRYPTO is not set 1062CONFIG_CRYPTO=y
1063CONFIG_CRYPTO_ALGAPI=y
1064CONFIG_CRYPTO_BLKCIPHER=m
1065CONFIG_CRYPTO_HASH=m
1066CONFIG_CRYPTO_MANAGER=m
1067CONFIG_CRYPTO_HMAC=m
1068CONFIG_CRYPTO_XCBC=m
1069CONFIG_CRYPTO_NULL=m
1070CONFIG_CRYPTO_MD4=m
1071CONFIG_CRYPTO_MD5=y
1072CONFIG_CRYPTO_SHA1=m
1073CONFIG_CRYPTO_SHA256=m
1074CONFIG_CRYPTO_SHA512=m
1075CONFIG_CRYPTO_WP512=m
1076CONFIG_CRYPTO_TGR192=m
1077CONFIG_CRYPTO_GF128MUL=m
1078CONFIG_CRYPTO_ECB=m
1079CONFIG_CRYPTO_CBC=m
1080CONFIG_CRYPTO_PCBC=m
1081CONFIG_CRYPTO_LRW=m
1082CONFIG_CRYPTO_DES=m
1083CONFIG_CRYPTO_FCRYPT=m
1084CONFIG_CRYPTO_BLOWFISH=m
1085CONFIG_CRYPTO_TWOFISH=m
1086CONFIG_CRYPTO_TWOFISH_COMMON=m
1087CONFIG_CRYPTO_SERPENT=m
1088CONFIG_CRYPTO_AES=m
1089CONFIG_CRYPTO_CAST5=m
1090CONFIG_CRYPTO_CAST6=m
1091CONFIG_CRYPTO_TEA=m
1092CONFIG_CRYPTO_ARC4=m
1093CONFIG_CRYPTO_KHAZAD=m
1094CONFIG_CRYPTO_ANUBIS=m
1095CONFIG_CRYPTO_DEFLATE=m
1096CONFIG_CRYPTO_MICHAEL_MIC=m
1097CONFIG_CRYPTO_CRC32C=m
1098CONFIG_CRYPTO_CAMELLIA=m
1099# CONFIG_CRYPTO_TEST is not set
993 1100
994# 1101#
995# Hardware crypto devices 1102# Hardware crypto devices
@@ -998,9 +1105,13 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
998# 1105#
999# Library routines 1106# Library routines
1000# 1107#
1108CONFIG_BITREVERSE=y
1001# CONFIG_CRC_CCITT is not set 1109# CONFIG_CRC_CCITT is not set
1002# CONFIG_CRC16 is not set 1110# CONFIG_CRC16 is not set
1003CONFIG_CRC32=y 1111CONFIG_CRC32=y
1004# CONFIG_LIBCRC32C is not set 1112CONFIG_LIBCRC32C=m
1005CONFIG_ZLIB_INFLATE=m 1113CONFIG_ZLIB_INFLATE=m
1114CONFIG_ZLIB_DEFLATE=m
1006CONFIG_PLIST=y 1115CONFIG_PLIST=y
1116CONFIG_HAS_IOMEM=y
1117CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 97d94f96990f..d180586d6385 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19-rc2 3# Linux kernel version: 2.6.20
4# Wed Oct 18 12:57:11 2006 4# Sun Feb 18 21:28:13 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -40,6 +41,7 @@ CONFIG_MIPS=y
40# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
41# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
42# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
43# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
44CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
45# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -71,11 +73,14 @@ CONFIG_TANBAC_TB0287=y
71# CONFIG_ZAO_CAPCELLA is not set 73# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_PCI_VR41XX=y 74CONFIG_PCI_VR41XX=y
73CONFIG_RWSEM_GENERIC_SPINLOCK=y 75CONFIG_RWSEM_GENERIC_SPINLOCK=y
76# CONFIG_ARCH_HAS_ILOG2_U32 is not set
77# CONFIG_ARCH_HAS_ILOG2_U64 is not set
74CONFIG_GENERIC_FIND_NEXT_BIT=y 78CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y 79CONFIG_GENERIC_HWEIGHT=y
76CONFIG_GENERIC_CALIBRATE_DELAY=y 80CONFIG_GENERIC_CALIBRATE_DELAY=y
77CONFIG_GENERIC_TIME=y 81CONFIG_GENERIC_TIME=y
78CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 82CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
83CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
79CONFIG_DMA_NONCOHERENT=y 84CONFIG_DMA_NONCOHERENT=y
80CONFIG_DMA_NEED_PCI_MAP_STATE=y 85CONFIG_DMA_NEED_PCI_MAP_STATE=y
81# CONFIG_CPU_BIG_ENDIAN is not set 86# CONFIG_CPU_BIG_ENDIAN is not set
@@ -108,6 +113,7 @@ CONFIG_CPU_VR41XX=y
108# CONFIG_CPU_SB1 is not set 113# CONFIG_CPU_SB1 is not set
109CONFIG_SYS_HAS_CPU_VR41XX=y 114CONFIG_SYS_HAS_CPU_VR41XX=y
110CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 115CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
116CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 117CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 118CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
113 119
@@ -137,6 +143,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
137# CONFIG_SPARSEMEM_STATIC is not set 143# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4 144CONFIG_SPLIT_PTLOCK_CPUS=4
139# CONFIG_RESOURCES_64BIT is not set 145# CONFIG_RESOURCES_64BIT is not set
146CONFIG_ZONE_DMA_FLAG=1
140# CONFIG_HZ_48 is not set 147# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 148# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 149# CONFIG_HZ_128 is not set
@@ -149,6 +156,7 @@ CONFIG_HZ=1000
149CONFIG_PREEMPT_NONE=y 156CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 157# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 158# CONFIG_PREEMPT is not set
159# CONFIG_KEXEC is not set
152CONFIG_LOCKDEP_SUPPORT=y 160CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 161CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 162CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -168,14 +176,15 @@ CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 176CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 177CONFIG_SYSVIPC=y
170# CONFIG_IPC_NS is not set 178# CONFIG_IPC_NS is not set
179CONFIG_SYSVIPC_SYSCTL=y
171# CONFIG_POSIX_MQUEUE is not set 180# CONFIG_POSIX_MQUEUE is not set
172# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
173# CONFIG_TASKSTATS is not set 182# CONFIG_TASKSTATS is not set
174# CONFIG_UTS_NS is not set 183# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 185# CONFIG_IKCONFIG is not set
186CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 187# CONFIG_RELAY is not set
178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 188# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
180CONFIG_SYSCTL=y 189CONFIG_SYSCTL=y
181CONFIG_EMBEDDED=y 190CONFIG_EMBEDDED=y
@@ -233,7 +242,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
233# 242#
234CONFIG_HW_HAS_PCI=y 243CONFIG_HW_HAS_PCI=y
235CONFIG_PCI=y 244CONFIG_PCI=y
236# CONFIG_PCI_MULTITHREAD_PROBE is not set
237CONFIG_MMU=y 245CONFIG_MMU=y
238 246
239# 247#
@@ -252,6 +260,14 @@ CONFIG_BINFMT_ELF=y
252CONFIG_TRAD_SIGNALS=y 260CONFIG_TRAD_SIGNALS=y
253 261
254# 262#
263# Power management options
264#
265CONFIG_PM=y
266# CONFIG_PM_LEGACY is not set
267# CONFIG_PM_DEBUG is not set
268# CONFIG_PM_SYSFS_DEPRECATED is not set
269
270#
255# Networking 271# Networking
256# 272#
257CONFIG_NET=y 273CONFIG_NET=y
@@ -266,6 +282,7 @@ CONFIG_UNIX=y
266CONFIG_XFRM=y 282CONFIG_XFRM=y
267# CONFIG_XFRM_USER is not set 283# CONFIG_XFRM_USER is not set
268# CONFIG_XFRM_SUB_POLICY is not set 284# CONFIG_XFRM_SUB_POLICY is not set
285CONFIG_XFRM_MIGRATE=y
269# CONFIG_NET_KEY is not set 286# CONFIG_NET_KEY is not set
270CONFIG_INET=y 287CONFIG_INET=y
271CONFIG_IP_MULTICAST=y 288CONFIG_IP_MULTICAST=y
@@ -315,6 +332,7 @@ CONFIG_DEFAULT_BIC=y
315# CONFIG_DEFAULT_WESTWOOD is not set 332# CONFIG_DEFAULT_WESTWOOD is not set
316# CONFIG_DEFAULT_RENO is not set 333# CONFIG_DEFAULT_RENO is not set
317CONFIG_DEFAULT_TCP_CONG="bic" 334CONFIG_DEFAULT_TCP_CONG="bic"
335CONFIG_TCP_MD5SIG=y
318# CONFIG_IPV6 is not set 336# CONFIG_IPV6 is not set
319# CONFIG_INET6_XFRM_TUNNEL is not set 337# CONFIG_INET6_XFRM_TUNNEL is not set
320# CONFIG_INET6_TUNNEL is not set 338# CONFIG_INET6_TUNNEL is not set
@@ -414,6 +432,12 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
414# CONFIG_ATA_OVER_ETH is not set 432# CONFIG_ATA_OVER_ETH is not set
415 433
416# 434#
435# Misc devices
436#
437CONFIG_SGI_IOC4=m
438# CONFIG_TIFM_CORE is not set
439
440#
417# ATA/ATAPI/MFM/RLL support 441# ATA/ATAPI/MFM/RLL support
418# 442#
419# CONFIG_IDE is not set 443# CONFIG_IDE is not set
@@ -423,6 +447,7 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
423# 447#
424# CONFIG_RAID_ATTRS is not set 448# CONFIG_RAID_ATTRS is not set
425CONFIG_SCSI=y 449CONFIG_SCSI=y
450CONFIG_SCSI_TGT=m
426# CONFIG_SCSI_NETLINK is not set 451# CONFIG_SCSI_NETLINK is not set
427CONFIG_SCSI_PROC_FS=y 452CONFIG_SCSI_PROC_FS=y
428 453
@@ -442,6 +467,7 @@ CONFIG_BLK_DEV_SD=y
442# CONFIG_SCSI_MULTI_LUN is not set 467# CONFIG_SCSI_MULTI_LUN is not set
443# CONFIG_SCSI_CONSTANTS is not set 468# CONFIG_SCSI_CONSTANTS is not set
444# CONFIG_SCSI_LOGGING is not set 469# CONFIG_SCSI_LOGGING is not set
470CONFIG_SCSI_SCAN_ASYNC=y
445 471
446# 472#
447# SCSI Transports 473# SCSI Transports
@@ -486,11 +512,13 @@ CONFIG_BLK_DEV_SD=y
486# CONFIG_SCSI_DC390T is not set 512# CONFIG_SCSI_DC390T is not set
487# CONFIG_SCSI_NSP32 is not set 513# CONFIG_SCSI_NSP32 is not set
488# CONFIG_SCSI_DEBUG is not set 514# CONFIG_SCSI_DEBUG is not set
515# CONFIG_SCSI_SRP is not set
489 516
490# 517#
491# Serial ATA (prod) and Parallel ATA (experimental) drivers 518# Serial ATA (prod) and Parallel ATA (experimental) drivers
492# 519#
493CONFIG_ATA=y 520CONFIG_ATA=y
521# CONFIG_ATA_NONSTANDARD is not set
494# CONFIG_SATA_AHCI is not set 522# CONFIG_SATA_AHCI is not set
495# CONFIG_SATA_SVW is not set 523# CONFIG_SATA_SVW is not set
496# CONFIG_ATA_PIIX is not set 524# CONFIG_ATA_PIIX is not set
@@ -506,6 +534,7 @@ CONFIG_ATA=y
506# CONFIG_SATA_ULI is not set 534# CONFIG_SATA_ULI is not set
507# CONFIG_SATA_VIA is not set 535# CONFIG_SATA_VIA is not set
508# CONFIG_SATA_VITESSE is not set 536# CONFIG_SATA_VITESSE is not set
537# CONFIG_SATA_INIC162X is not set
509# CONFIG_PATA_ALI is not set 538# CONFIG_PATA_ALI is not set
510# CONFIG_PATA_AMD is not set 539# CONFIG_PATA_AMD is not set
511# CONFIG_PATA_ARTOP is not set 540# CONFIG_PATA_ARTOP is not set
@@ -521,8 +550,10 @@ CONFIG_ATA=y
521# CONFIG_PATA_HPT3X2N is not set 550# CONFIG_PATA_HPT3X2N is not set
522# CONFIG_PATA_HPT3X3 is not set 551# CONFIG_PATA_HPT3X3 is not set
523# CONFIG_PATA_IT821X is not set 552# CONFIG_PATA_IT821X is not set
553# CONFIG_PATA_IT8213 is not set
524# CONFIG_PATA_JMICRON is not set 554# CONFIG_PATA_JMICRON is not set
525# CONFIG_PATA_TRIFLEX is not set 555# CONFIG_PATA_TRIFLEX is not set
556# CONFIG_PATA_MARVELL is not set
526# CONFIG_PATA_MPIIX is not set 557# CONFIG_PATA_MPIIX is not set
527# CONFIG_PATA_OLDPIIX is not set 558# CONFIG_PATA_OLDPIIX is not set
528# CONFIG_PATA_NETCELL is not set 559# CONFIG_PATA_NETCELL is not set
@@ -539,6 +570,7 @@ CONFIG_PATA_SIL680=y
539# CONFIG_PATA_SIS is not set 570# CONFIG_PATA_SIS is not set
540# CONFIG_PATA_VIA is not set 571# CONFIG_PATA_VIA is not set
541# CONFIG_PATA_WINBOND is not set 572# CONFIG_PATA_WINBOND is not set
573# CONFIG_PATA_PLATFORM is not set
542 574
543# 575#
544# Multi-device support (RAID and LVM) 576# Multi-device support (RAID and LVM)
@@ -562,10 +594,8 @@ CONFIG_IEEE1394=m
562# Subsystem Options 594# Subsystem Options
563# 595#
564# CONFIG_IEEE1394_VERBOSEDEBUG is not set 596# CONFIG_IEEE1394_VERBOSEDEBUG is not set
565# CONFIG_IEEE1394_OUI_DB is not set
566CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y 597CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
567CONFIG_IEEE1394_CONFIG_ROM_IP1394=y 598CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
568# CONFIG_IEEE1394_EXPORT_FULL_API is not set
569 599
570# 600#
571# Device Drivers 601# Device Drivers
@@ -650,9 +680,11 @@ CONFIG_R8169=y
650# Ethernet (10000 Mbit) 680# Ethernet (10000 Mbit)
651# 681#
652# CONFIG_CHELSIO_T1 is not set 682# CONFIG_CHELSIO_T1 is not set
683CONFIG_CHELSIO_T3=m
653# CONFIG_IXGB is not set 684# CONFIG_IXGB is not set
654# CONFIG_S2IO is not set 685# CONFIG_S2IO is not set
655# CONFIG_MYRI10GE is not set 686# CONFIG_MYRI10GE is not set
687CONFIG_NETXEN_NIC=m
656 688
657# 689#
658# Token Ring devices 690# Token Ring devices
@@ -760,10 +792,6 @@ CONFIG_LEGACY_PTY_COUNT=256
760# CONFIG_R3964 is not set 792# CONFIG_R3964 is not set
761# CONFIG_APPLICOM is not set 793# CONFIG_APPLICOM is not set
762# CONFIG_TANBAC_TB0219 is not set 794# CONFIG_TANBAC_TB0219 is not set
763
764#
765# Ftape, the floppy tape device driver
766#
767# CONFIG_DRM is not set 795# CONFIG_DRM is not set
768CONFIG_GPIO_VR41XX=y 796CONFIG_GPIO_VR41XX=y
769# CONFIG_RAW_DRIVER is not set 797# CONFIG_RAW_DRIVER is not set
@@ -787,6 +815,7 @@ CONFIG_GPIO_VR41XX=y
787# 815#
788# Dallas's 1-wire bus 816# Dallas's 1-wire bus
789# 817#
818# CONFIG_W1 is not set
790 819
791# 820#
792# Hardware Monitoring support 821# Hardware Monitoring support
@@ -795,11 +824,6 @@ CONFIG_GPIO_VR41XX=y
795# CONFIG_HWMON_VID is not set 824# CONFIG_HWMON_VID is not set
796 825
797# 826#
798# Misc devices
799#
800# CONFIG_TIFM_CORE is not set
801
802#
803# Multimedia devices 827# Multimedia devices
804# 828#
805# CONFIG_VIDEO_DEV is not set 829# CONFIG_VIDEO_DEV is not set
@@ -818,6 +842,7 @@ CONFIG_FB=y
818CONFIG_FB_CFB_FILLRECT=y 842CONFIG_FB_CFB_FILLRECT=y
819CONFIG_FB_CFB_COPYAREA=y 843CONFIG_FB_CFB_COPYAREA=y
820CONFIG_FB_CFB_IMAGEBLIT=y 844CONFIG_FB_CFB_IMAGEBLIT=y
845# CONFIG_FB_SVGALIB is not set
821# CONFIG_FB_MACMODES is not set 846# CONFIG_FB_MACMODES is not set
822# CONFIG_FB_BACKLIGHT is not set 847# CONFIG_FB_BACKLIGHT is not set
823# CONFIG_FB_MODE_HELPERS is not set 848# CONFIG_FB_MODE_HELPERS is not set
@@ -834,6 +859,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
834# CONFIG_FB_RADEON is not set 859# CONFIG_FB_RADEON is not set
835# CONFIG_FB_ATY128 is not set 860# CONFIG_FB_ATY128 is not set
836# CONFIG_FB_ATY is not set 861# CONFIG_FB_ATY is not set
862# CONFIG_FB_S3 is not set
837# CONFIG_FB_SAVAGE is not set 863# CONFIG_FB_SAVAGE is not set
838# CONFIG_FB_SIS is not set 864# CONFIG_FB_SIS is not set
839# CONFIG_FB_NEOMAGIC is not set 865# CONFIG_FB_NEOMAGIC is not set
@@ -863,6 +889,12 @@ CONFIG_DUMMY_CONSOLE=y
863# CONFIG_SOUND is not set 889# CONFIG_SOUND is not set
864 890
865# 891#
892# HID Devices
893#
894CONFIG_HID=y
895# CONFIG_HID_DEBUG is not set
896
897#
866# USB support 898# USB support
867# 899#
868CONFIG_USB_ARCH_HAS_HCD=y 900CONFIG_USB_ARCH_HAS_HCD=y
@@ -875,8 +907,8 @@ CONFIG_USB=m
875# Miscellaneous USB options 907# Miscellaneous USB options
876# 908#
877# CONFIG_USB_DEVICEFS is not set 909# CONFIG_USB_DEVICEFS is not set
878# CONFIG_USB_BANDWIDTH is not set
879# CONFIG_USB_DYNAMIC_MINORS is not set 910# CONFIG_USB_DYNAMIC_MINORS is not set
911# CONFIG_USB_SUSPEND is not set
880# CONFIG_USB_OTG is not set 912# CONFIG_USB_OTG is not set
881 913
882# 914#
@@ -886,9 +918,11 @@ CONFIG_USB_EHCI_HCD=m
886# CONFIG_USB_EHCI_SPLIT_ISO is not set 918# CONFIG_USB_EHCI_SPLIT_ISO is not set
887# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 919# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
888# CONFIG_USB_EHCI_TT_NEWSCHED is not set 920# CONFIG_USB_EHCI_TT_NEWSCHED is not set
921# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
889# CONFIG_USB_ISP116X_HCD is not set 922# CONFIG_USB_ISP116X_HCD is not set
890CONFIG_USB_OHCI_HCD=m 923CONFIG_USB_OHCI_HCD=m
891# CONFIG_USB_OHCI_BIG_ENDIAN is not set 924# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
925# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
892CONFIG_USB_OHCI_LITTLE_ENDIAN=y 926CONFIG_USB_OHCI_LITTLE_ENDIAN=y
893# CONFIG_USB_UHCI_HCD is not set 927# CONFIG_USB_UHCI_HCD is not set
894# CONFIG_USB_SL811_HCD is not set 928# CONFIG_USB_SL811_HCD is not set
@@ -923,7 +957,6 @@ CONFIG_USB_STORAGE=m
923# USB Input Devices 957# USB Input Devices
924# 958#
925CONFIG_USB_HID=m 959CONFIG_USB_HID=m
926CONFIG_USB_HIDINPUT=y
927# CONFIG_USB_HIDINPUT_POWERBOOK is not set 960# CONFIG_USB_HIDINPUT_POWERBOOK is not set
928# CONFIG_HID_FF is not set 961# CONFIG_HID_FF is not set
929# CONFIG_USB_HIDDEV is not set 962# CONFIG_USB_HIDDEV is not set
@@ -945,7 +978,7 @@ CONFIG_USB_HIDINPUT=y
945# CONFIG_USB_ATI_REMOTE2 is not set 978# CONFIG_USB_ATI_REMOTE2 is not set
946# CONFIG_USB_KEYSPAN_REMOTE is not set 979# CONFIG_USB_KEYSPAN_REMOTE is not set
947# CONFIG_USB_APPLETOUCH is not set 980# CONFIG_USB_APPLETOUCH is not set
948# CONFIG_USB_TRANCEVIBRATOR is not set 981# CONFIG_USB_GTCO is not set
949 982
950# 983#
951# USB Imaging devices 984# USB Imaging devices
@@ -960,6 +993,7 @@ CONFIG_USB_HIDINPUT=y
960# CONFIG_USB_KAWETH is not set 993# CONFIG_USB_KAWETH is not set
961# CONFIG_USB_PEGASUS is not set 994# CONFIG_USB_PEGASUS is not set
962# CONFIG_USB_RTL8150 is not set 995# CONFIG_USB_RTL8150 is not set
996# CONFIG_USB_USBNET_MII is not set
963# CONFIG_USB_USBNET is not set 997# CONFIG_USB_USBNET is not set
964CONFIG_USB_MON=y 998CONFIG_USB_MON=y
965 999
@@ -991,6 +1025,7 @@ CONFIG_USB_MON=y
991# CONFIG_USB_APPLEDISPLAY is not set 1025# CONFIG_USB_APPLEDISPLAY is not set
992# CONFIG_USB_SISUSBVGA is not set 1026# CONFIG_USB_SISUSBVGA is not set
993# CONFIG_USB_LD is not set 1027# CONFIG_USB_LD is not set
1028# CONFIG_USB_TRANCEVIBRATOR is not set
994 1029
995# 1030#
996# USB DSL modem support 1031# USB DSL modem support
@@ -1047,6 +1082,14 @@ CONFIG_USB_MON=y
1047# 1082#
1048 1083
1049# 1084#
1085# Auxiliary Display support
1086#
1087
1088#
1089# Virtualization
1090#
1091
1092#
1050# File systems 1093# File systems
1051# 1094#
1052CONFIG_EXT2_FS=y 1095CONFIG_EXT2_FS=y
@@ -1105,7 +1148,7 @@ CONFIG_TMPFS=y
1105# CONFIG_TMPFS_POSIX_ACL is not set 1148# CONFIG_TMPFS_POSIX_ACL is not set
1106# CONFIG_HUGETLB_PAGE is not set 1149# CONFIG_HUGETLB_PAGE is not set
1107CONFIG_RAMFS=y 1150CONFIG_RAMFS=y
1108# CONFIG_CONFIGFS_FS is not set 1151CONFIG_CONFIGFS_FS=m
1109 1152
1110# 1153#
1111# Miscellaneous filesystems 1154# Miscellaneous filesystems
@@ -1159,6 +1202,14 @@ CONFIG_MSDOS_PARTITION=y
1159# CONFIG_NLS is not set 1202# CONFIG_NLS is not set
1160 1203
1161# 1204#
1205# Distributed Lock Manager
1206#
1207CONFIG_DLM=m
1208CONFIG_DLM_TCP=y
1209# CONFIG_DLM_SCTP is not set
1210# CONFIG_DLM_DEBUG is not set
1211
1212#
1162# Profiling support 1213# Profiling support
1163# 1214#
1164# CONFIG_PROFILING is not set 1215# CONFIG_PROFILING is not set
@@ -1171,10 +1222,10 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1171CONFIG_ENABLE_MUST_CHECK=y 1222CONFIG_ENABLE_MUST_CHECK=y
1172# CONFIG_MAGIC_SYSRQ is not set 1223# CONFIG_MAGIC_SYSRQ is not set
1173# CONFIG_UNUSED_SYMBOLS is not set 1224# CONFIG_UNUSED_SYMBOLS is not set
1174# CONFIG_DEBUG_KERNEL is not set
1175CONFIG_LOG_BUF_SHIFT=14
1176# CONFIG_DEBUG_FS is not set 1225# CONFIG_DEBUG_FS is not set
1177# CONFIG_HEADERS_CHECK is not set 1226# CONFIG_HEADERS_CHECK is not set
1227# CONFIG_DEBUG_KERNEL is not set
1228CONFIG_LOG_BUF_SHIFT=14
1178CONFIG_CROSSCOMPILE=y 1229CONFIG_CROSSCOMPILE=y
1179CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 1230CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1180 1231
@@ -1187,14 +1238,59 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1187# 1238#
1188# Cryptographic options 1239# Cryptographic options
1189# 1240#
1190# CONFIG_CRYPTO is not set 1241CONFIG_CRYPTO=y
1242CONFIG_CRYPTO_ALGAPI=y
1243CONFIG_CRYPTO_BLKCIPHER=m
1244CONFIG_CRYPTO_HASH=m
1245CONFIG_CRYPTO_MANAGER=m
1246CONFIG_CRYPTO_HMAC=m
1247CONFIG_CRYPTO_XCBC=m
1248CONFIG_CRYPTO_NULL=m
1249CONFIG_CRYPTO_MD4=m
1250CONFIG_CRYPTO_MD5=y
1251CONFIG_CRYPTO_SHA1=m
1252CONFIG_CRYPTO_SHA256=m
1253CONFIG_CRYPTO_SHA512=m
1254CONFIG_CRYPTO_WP512=m
1255CONFIG_CRYPTO_TGR192=m
1256CONFIG_CRYPTO_GF128MUL=m
1257CONFIG_CRYPTO_ECB=m
1258CONFIG_CRYPTO_CBC=m
1259CONFIG_CRYPTO_PCBC=m
1260CONFIG_CRYPTO_LRW=m
1261CONFIG_CRYPTO_DES=m
1262CONFIG_CRYPTO_FCRYPT=m
1263CONFIG_CRYPTO_BLOWFISH=m
1264CONFIG_CRYPTO_TWOFISH=m
1265CONFIG_CRYPTO_TWOFISH_COMMON=m
1266CONFIG_CRYPTO_SERPENT=m
1267CONFIG_CRYPTO_AES=m
1268CONFIG_CRYPTO_CAST5=m
1269CONFIG_CRYPTO_CAST6=m
1270CONFIG_CRYPTO_TEA=m
1271CONFIG_CRYPTO_ARC4=m
1272CONFIG_CRYPTO_KHAZAD=m
1273CONFIG_CRYPTO_ANUBIS=m
1274CONFIG_CRYPTO_DEFLATE=m
1275CONFIG_CRYPTO_MICHAEL_MIC=m
1276CONFIG_CRYPTO_CRC32C=m
1277CONFIG_CRYPTO_CAMELLIA=m
1278# CONFIG_CRYPTO_TEST is not set
1279
1280#
1281# Hardware crypto devices
1282#
1191 1283
1192# 1284#
1193# Library routines 1285# Library routines
1194# 1286#
1287CONFIG_BITREVERSE=y
1195# CONFIG_CRC_CCITT is not set 1288# CONFIG_CRC_CCITT is not set
1196# CONFIG_CRC16 is not set 1289# CONFIG_CRC16 is not set
1197CONFIG_CRC32=y 1290CONFIG_CRC32=y
1198# CONFIG_LIBCRC32C is not set 1291CONFIG_LIBCRC32C=m
1199CONFIG_ZLIB_INFLATE=m 1292CONFIG_ZLIB_INFLATE=m
1293CONFIG_ZLIB_DEFLATE=m
1200CONFIG_PLIST=y 1294CONFIG_PLIST=y
1295CONFIG_HAS_IOMEM=y
1296CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 553734a47b62..570f0c1475b3 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc2 3# Linux kernel version: 2.6.20
4# Tue Jul 25 23:13:04 2006 4# Sun Feb 18 21:28:13 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46CONFIG_MACH_VR41XX=y 46CONFIG_MACH_VR41XX=y
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -70,10 +70,14 @@ CONFIG_IBM_WORKPAD=y
70# CONFIG_VICTOR_MPC30X is not set 70# CONFIG_VICTOR_MPC30X is not set
71# CONFIG_ZAO_CAPCELLA is not set 71# CONFIG_ZAO_CAPCELLA is not set
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73# CONFIG_ARCH_HAS_ILOG2_U32 is not set
74# CONFIG_ARCH_HAS_ILOG2_U64 is not set
73CONFIG_GENERIC_FIND_NEXT_BIT=y 75CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y 76CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_GENERIC_TIME=y
76CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 79CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
80CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_DMA_NONCOHERENT=y 81CONFIG_DMA_NONCOHERENT=y
78CONFIG_DMA_NEED_PCI_MAP_STATE=y 82CONFIG_DMA_NEED_PCI_MAP_STATE=y
79# CONFIG_CPU_BIG_ENDIAN is not set 83# CONFIG_CPU_BIG_ENDIAN is not set
@@ -106,6 +110,7 @@ CONFIG_CPU_VR41XX=y
106# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y 111CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
113CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 115CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 116
@@ -119,8 +124,8 @@ CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_16KB is not set 124# CONFIG_PAGE_SIZE_16KB is not set
120# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
121CONFIG_MIPS_MT_DISABLED=y 126CONFIG_MIPS_MT_DISABLED=y
122# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_MT_SMP is not set 127# CONFIG_MIPS_MT_SMP is not set
128# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_VPE_LOADER is not set 129# CONFIG_MIPS_VPE_LOADER is not set
125CONFIG_CPU_HAS_SYNC=y 130CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 131CONFIG_GENERIC_HARDIRQS=y
@@ -135,6 +140,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 140# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 141CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 142# CONFIG_RESOURCES_64BIT is not set
143CONFIG_ZONE_DMA_FLAG=1
138# CONFIG_HZ_48 is not set 144# CONFIG_HZ_48 is not set
139# CONFIG_HZ_100 is not set 145# CONFIG_HZ_100 is not set
140# CONFIG_HZ_128 is not set 146# CONFIG_HZ_128 is not set
@@ -147,6 +153,7 @@ CONFIG_HZ=1000
147CONFIG_PREEMPT_NONE=y 153CONFIG_PREEMPT_NONE=y
148# CONFIG_PREEMPT_VOLUNTARY is not set 154# CONFIG_PREEMPT_VOLUNTARY is not set
149# CONFIG_PREEMPT is not set 155# CONFIG_PREEMPT is not set
156# CONFIG_KEXEC is not set
150CONFIG_LOCKDEP_SUPPORT=y 157CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 158CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 159CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -165,16 +172,20 @@ CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 172CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 173CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 174CONFIG_SYSVIPC=y
175# CONFIG_IPC_NS is not set
176CONFIG_SYSVIPC_SYSCTL=y
168# CONFIG_POSIX_MQUEUE is not set 177# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set 178# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_TASKSTATS is not set 179# CONFIG_TASKSTATS is not set
171CONFIG_SYSCTL=y 180# CONFIG_UTS_NS is not set
172# CONFIG_AUDIT is not set 181# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 182# CONFIG_IKCONFIG is not set
183CONFIG_SYSFS_DEPRECATED=y
174# CONFIG_RELAY is not set 184# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SYSCTL=y
177CONFIG_EMBEDDED=y 187CONFIG_EMBEDDED=y
188CONFIG_SYSCTL_SYSCALL=y
178CONFIG_KALLSYMS=y 189CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 190# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_HOTPLUG=y 191CONFIG_HOTPLUG=y
@@ -182,12 +193,12 @@ CONFIG_PRINTK=y
182CONFIG_BUG=y 193CONFIG_BUG=y
183CONFIG_ELF_CORE=y 194CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 195CONFIG_BASE_FULL=y
185CONFIG_RT_MUTEXES=y
186CONFIG_FUTEX=y 196CONFIG_FUTEX=y
187CONFIG_EPOLL=y 197CONFIG_EPOLL=y
188CONFIG_SHMEM=y 198CONFIG_SHMEM=y
189CONFIG_SLAB=y 199CONFIG_SLAB=y
190CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 202# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 203CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set 204# CONFIG_SLOB is not set
@@ -205,6 +216,7 @@ CONFIG_KMOD=y
205# 216#
206# Block layer 217# Block layer
207# 218#
219CONFIG_BLOCK=y
208# CONFIG_LBD is not set 220# CONFIG_LBD is not set
209# CONFIG_BLK_DEV_IO_TRACE is not set 221# CONFIG_BLK_DEV_IO_TRACE is not set
210# CONFIG_LSF is not set 222# CONFIG_LSF is not set
@@ -257,6 +269,14 @@ CONFIG_BINFMT_ELF=y
257CONFIG_TRAD_SIGNALS=y 269CONFIG_TRAD_SIGNALS=y
258 270
259# 271#
272# Power management options
273#
274CONFIG_PM=y
275# CONFIG_PM_LEGACY is not set
276# CONFIG_PM_DEBUG is not set
277# CONFIG_PM_SYSFS_DEPRECATED is not set
278
279#
260# Networking 280# Networking
261# 281#
262CONFIG_NET=y 282CONFIG_NET=y
@@ -270,7 +290,10 @@ CONFIG_PACKET_MMAP=y
270CONFIG_UNIX=y 290CONFIG_UNIX=y
271CONFIG_XFRM=y 291CONFIG_XFRM=y
272CONFIG_XFRM_USER=m 292CONFIG_XFRM_USER=m
293# CONFIG_XFRM_SUB_POLICY is not set
294CONFIG_XFRM_MIGRATE=y
273CONFIG_NET_KEY=y 295CONFIG_NET_KEY=y
296CONFIG_NET_KEY_MIGRATE=y
274CONFIG_INET=y 297CONFIG_INET=y
275CONFIG_IP_MULTICAST=y 298CONFIG_IP_MULTICAST=y
276# CONFIG_IP_ADVANCED_ROUTER is not set 299# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -288,10 +311,13 @@ CONFIG_IP_FIB_HASH=y
288# CONFIG_INET_TUNNEL is not set 311# CONFIG_INET_TUNNEL is not set
289CONFIG_INET_XFRM_MODE_TRANSPORT=m 312CONFIG_INET_XFRM_MODE_TRANSPORT=m
290CONFIG_INET_XFRM_MODE_TUNNEL=m 313CONFIG_INET_XFRM_MODE_TUNNEL=m
314CONFIG_INET_XFRM_MODE_BEET=m
291CONFIG_INET_DIAG=y 315CONFIG_INET_DIAG=y
292CONFIG_INET_TCP_DIAG=y 316CONFIG_INET_TCP_DIAG=y
293# CONFIG_TCP_CONG_ADVANCED is not set 317# CONFIG_TCP_CONG_ADVANCED is not set
294CONFIG_TCP_CONG_BIC=y 318CONFIG_TCP_CONG_CUBIC=y
319CONFIG_DEFAULT_TCP_CONG="cubic"
320CONFIG_TCP_MD5SIG=y
295# CONFIG_IPV6 is not set 321# CONFIG_IPV6 is not set
296# CONFIG_INET6_XFRM_TUNNEL is not set 322# CONFIG_INET6_XFRM_TUNNEL is not set
297# CONFIG_INET6_TUNNEL is not set 323# CONFIG_INET6_TUNNEL is not set
@@ -321,7 +347,6 @@ CONFIG_NETWORK_SECMARK=y
321# CONFIG_ATALK is not set 347# CONFIG_ATALK is not set
322# CONFIG_X25 is not set 348# CONFIG_X25 is not set
323# CONFIG_LAPB is not set 349# CONFIG_LAPB is not set
324# CONFIG_NET_DIVERT is not set
325# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
326# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
327 352
@@ -387,9 +412,14 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
387# CONFIG_ATA_OVER_ETH is not set 412# CONFIG_ATA_OVER_ETH is not set
388 413
389# 414#
415# Misc devices
416#
417
418#
390# ATA/ATAPI/MFM/RLL support 419# ATA/ATAPI/MFM/RLL support
391# 420#
392CONFIG_IDE=y 421CONFIG_IDE=y
422CONFIG_IDE_MAX_HWIFS=4
393CONFIG_BLK_DEV_IDE=y 423CONFIG_BLK_DEV_IDE=y
394 424
395# 425#
@@ -419,6 +449,12 @@ CONFIG_IDE_GENERIC=y
419# 449#
420# CONFIG_RAID_ATTRS is not set 450# CONFIG_RAID_ATTRS is not set
421# CONFIG_SCSI is not set 451# CONFIG_SCSI is not set
452# CONFIG_SCSI_NETLINK is not set
453
454#
455# Serial ATA (prod) and Parallel ATA (experimental) drivers
456#
457# CONFIG_ATA is not set
422 458
423# 459#
424# Old CD-ROM drivers (not SCSI, not IDE) 460# Old CD-ROM drivers (not SCSI, not IDE)
@@ -472,6 +508,8 @@ CONFIG_LXT_PHY=m
472CONFIG_CICADA_PHY=m 508CONFIG_CICADA_PHY=m
473CONFIG_VITESSE_PHY=m 509CONFIG_VITESSE_PHY=m
474CONFIG_SMSC_PHY=m 510CONFIG_SMSC_PHY=m
511# CONFIG_BROADCOM_PHY is not set
512# CONFIG_FIXED_PHY is not set
475 513
476# 514#
477# Ethernet (10 or 100Mbit) 515# Ethernet (10 or 100Mbit)
@@ -575,6 +613,7 @@ CONFIG_PCMCIA_AXNET=m
575# Input device support 613# Input device support
576# 614#
577CONFIG_INPUT=y 615CONFIG_INPUT=y
616# CONFIG_INPUT_FF_MEMLESS is not set
578 617
579# 618#
580# Userland interfaces 619# Userland interfaces
@@ -641,10 +680,6 @@ CONFIG_LEGACY_PTY_COUNT=256
641# CONFIG_R3964 is not set 680# CONFIG_R3964 is not set
642 681
643# 682#
644# Ftape, the floppy tape device driver
645#
646
647#
648# PCMCIA character devices 683# PCMCIA character devices
649# 684#
650# CONFIG_SYNCLINK_CS is not set 685# CONFIG_SYNCLINK_CS is not set
@@ -657,7 +692,6 @@ CONFIG_LEGACY_PTY_COUNT=256
657# TPM devices 692# TPM devices
658# 693#
659# CONFIG_TCG_TPM is not set 694# CONFIG_TCG_TPM is not set
660# CONFIG_TELCLOCK is not set
661 695
662# 696#
663# I2C support 697# I2C support
@@ -682,14 +716,9 @@ CONFIG_LEGACY_PTY_COUNT=256
682# CONFIG_HWMON_VID is not set 716# CONFIG_HWMON_VID is not set
683 717
684# 718#
685# Misc devices
686#
687
688#
689# Multimedia devices 719# Multimedia devices
690# 720#
691# CONFIG_VIDEO_DEV is not set 721# CONFIG_VIDEO_DEV is not set
692CONFIG_VIDEO_V4L2=y
693 722
694# 723#
695# Digital Video Broadcasting Devices 724# Digital Video Broadcasting Devices
@@ -708,6 +737,7 @@ CONFIG_VIDEO_V4L2=y
708# CONFIG_VGA_CONSOLE is not set 737# CONFIG_VGA_CONSOLE is not set
709# CONFIG_MDA_CONSOLE is not set 738# CONFIG_MDA_CONSOLE is not set
710CONFIG_DUMMY_CONSOLE=y 739CONFIG_DUMMY_CONSOLE=y
740# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
711 741
712# 742#
713# Sound 743# Sound
@@ -715,6 +745,12 @@ CONFIG_DUMMY_CONSOLE=y
715# CONFIG_SOUND is not set 745# CONFIG_SOUND is not set
716 746
717# 747#
748# HID Devices
749#
750CONFIG_HID=y
751# CONFIG_HID_DEBUG is not set
752
753#
718# USB support 754# USB support
719# 755#
720# CONFIG_USB_ARCH_HAS_HCD is not set 756# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -775,6 +811,14 @@ CONFIG_DUMMY_CONSOLE=y
775# 811#
776 812
777# 813#
814# Auxiliary Display support
815#
816
817#
818# Virtualization
819#
820
821#
778# File systems 822# File systems
779# 823#
780CONFIG_EXT2_FS=y 824CONFIG_EXT2_FS=y
@@ -783,11 +827,13 @@ CONFIG_EXT2_FS_POSIX_ACL=y
783CONFIG_EXT2_FS_SECURITY=y 827CONFIG_EXT2_FS_SECURITY=y
784# CONFIG_EXT2_FS_XIP is not set 828# CONFIG_EXT2_FS_XIP is not set
785# CONFIG_EXT3_FS is not set 829# CONFIG_EXT3_FS is not set
830# CONFIG_EXT4DEV_FS is not set
786CONFIG_FS_MBCACHE=y 831CONFIG_FS_MBCACHE=y
787# CONFIG_REISERFS_FS is not set 832# CONFIG_REISERFS_FS is not set
788# CONFIG_JFS_FS is not set 833# CONFIG_JFS_FS is not set
789CONFIG_FS_POSIX_ACL=y 834CONFIG_FS_POSIX_ACL=y
790# CONFIG_XFS_FS is not set 835# CONFIG_XFS_FS is not set
836# CONFIG_GFS2_FS is not set
791# CONFIG_OCFS2_FS is not set 837# CONFIG_OCFS2_FS is not set
792# CONFIG_MINIX_FS is not set 838# CONFIG_MINIX_FS is not set
793# CONFIG_ROMFS_FS is not set 839# CONFIG_ROMFS_FS is not set
@@ -798,6 +844,7 @@ CONFIG_DNOTIFY=y
798# CONFIG_AUTOFS_FS is not set 844# CONFIG_AUTOFS_FS is not set
799CONFIG_AUTOFS4_FS=y 845CONFIG_AUTOFS4_FS=y
800CONFIG_FUSE_FS=m 846CONFIG_FUSE_FS=m
847CONFIG_GENERIC_ACL=y
801 848
802# 849#
803# CD-ROM/DVD Filesystems 850# CD-ROM/DVD Filesystems
@@ -817,11 +864,13 @@ CONFIG_FUSE_FS=m
817# 864#
818CONFIG_PROC_FS=y 865CONFIG_PROC_FS=y
819CONFIG_PROC_KCORE=y 866CONFIG_PROC_KCORE=y
867CONFIG_PROC_SYSCTL=y
820CONFIG_SYSFS=y 868CONFIG_SYSFS=y
821CONFIG_TMPFS=y 869CONFIG_TMPFS=y
870CONFIG_TMPFS_POSIX_ACL=y
822# CONFIG_HUGETLB_PAGE is not set 871# CONFIG_HUGETLB_PAGE is not set
823CONFIG_RAMFS=y 872CONFIG_RAMFS=y
824# CONFIG_CONFIGFS_FS is not set 873CONFIG_CONFIGFS_FS=m
825 874
826# 875#
827# Miscellaneous filesystems 876# Miscellaneous filesystems
@@ -875,6 +924,14 @@ CONFIG_MSDOS_PARTITION=y
875# CONFIG_NLS is not set 924# CONFIG_NLS is not set
876 925
877# 926#
927# Distributed Lock Manager
928#
929CONFIG_DLM=m
930CONFIG_DLM_TCP=y
931# CONFIG_DLM_SCTP is not set
932# CONFIG_DLM_DEBUG is not set
933
934#
878# Profiling support 935# Profiling support
879# 936#
880# CONFIG_PROFILING is not set 937# CONFIG_PROFILING is not set
@@ -884,11 +941,13 @@ CONFIG_MSDOS_PARTITION=y
884# 941#
885CONFIG_TRACE_IRQFLAGS_SUPPORT=y 942CONFIG_TRACE_IRQFLAGS_SUPPORT=y
886# CONFIG_PRINTK_TIME is not set 943# CONFIG_PRINTK_TIME is not set
944CONFIG_ENABLE_MUST_CHECK=y
887# CONFIG_MAGIC_SYSRQ is not set 945# CONFIG_MAGIC_SYSRQ is not set
888# CONFIG_UNUSED_SYMBOLS is not set 946# CONFIG_UNUSED_SYMBOLS is not set
947# CONFIG_DEBUG_FS is not set
948# CONFIG_HEADERS_CHECK is not set
889# CONFIG_DEBUG_KERNEL is not set 949# CONFIG_DEBUG_KERNEL is not set
890CONFIG_LOG_BUF_SHIFT=14 950CONFIG_LOG_BUF_SHIFT=14
891# CONFIG_DEBUG_FS is not set
892CONFIG_CROSSCOMPILE=y 951CONFIG_CROSSCOMPILE=y
893CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" 952CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
894 953
@@ -901,7 +960,44 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
901# 960#
902# Cryptographic options 961# Cryptographic options
903# 962#
904# CONFIG_CRYPTO is not set 963CONFIG_CRYPTO=y
964CONFIG_CRYPTO_ALGAPI=y
965CONFIG_CRYPTO_BLKCIPHER=m
966CONFIG_CRYPTO_HASH=m
967CONFIG_CRYPTO_MANAGER=m
968CONFIG_CRYPTO_HMAC=m
969CONFIG_CRYPTO_XCBC=m
970CONFIG_CRYPTO_NULL=m
971CONFIG_CRYPTO_MD4=m
972CONFIG_CRYPTO_MD5=y
973CONFIG_CRYPTO_SHA1=m
974CONFIG_CRYPTO_SHA256=m
975CONFIG_CRYPTO_SHA512=m
976CONFIG_CRYPTO_WP512=m
977CONFIG_CRYPTO_TGR192=m
978CONFIG_CRYPTO_GF128MUL=m
979CONFIG_CRYPTO_ECB=m
980CONFIG_CRYPTO_CBC=m
981CONFIG_CRYPTO_PCBC=m
982CONFIG_CRYPTO_LRW=m
983CONFIG_CRYPTO_DES=m
984CONFIG_CRYPTO_FCRYPT=m
985CONFIG_CRYPTO_BLOWFISH=m
986CONFIG_CRYPTO_TWOFISH=m
987CONFIG_CRYPTO_TWOFISH_COMMON=m
988CONFIG_CRYPTO_SERPENT=m
989CONFIG_CRYPTO_AES=m
990CONFIG_CRYPTO_CAST5=m
991CONFIG_CRYPTO_CAST6=m
992CONFIG_CRYPTO_TEA=m
993CONFIG_CRYPTO_ARC4=m
994CONFIG_CRYPTO_KHAZAD=m
995CONFIG_CRYPTO_ANUBIS=m
996CONFIG_CRYPTO_DEFLATE=m
997CONFIG_CRYPTO_MICHAEL_MIC=m
998CONFIG_CRYPTO_CRC32C=m
999CONFIG_CRYPTO_CAMELLIA=m
1000# CONFIG_CRYPTO_TEST is not set
905 1001
906# 1002#
907# Hardware crypto devices 1003# Hardware crypto devices
@@ -910,8 +1006,13 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
910# 1006#
911# Library routines 1007# Library routines
912# 1008#
1009CONFIG_BITREVERSE=y
913# CONFIG_CRC_CCITT is not set 1010# CONFIG_CRC_CCITT is not set
914# CONFIG_CRC16 is not set 1011# CONFIG_CRC16 is not set
915CONFIG_CRC32=y 1012CONFIG_CRC32=y
916# CONFIG_LIBCRC32C is not set 1013CONFIG_LIBCRC32C=m
1014CONFIG_ZLIB_INFLATE=m
1015CONFIG_ZLIB_DEFLATE=m
917CONFIG_PLIST=y 1016CONFIG_PLIST=y
1017CONFIG_HAS_IOMEM=y
1018CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/wrppmc_defconfig b/arch/mips/configs/wrppmc_defconfig
index d3dfb702bb7c..08f3190dda89 100644
--- a/arch/mips/configs/wrppmc_defconfig
+++ b/arch/mips/configs/wrppmc_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:21 2006 4# Sun Feb 18 21:28:14 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_WR_PPMC=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,10 +64,14 @@ CONFIG_WR_PPMC=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_DMA_NONCOHERENT=y 75CONFIG_DMA_NONCOHERENT=y
72CONFIG_DMA_NEED_PCI_MAP_STATE=y 76CONFIG_DMA_NEED_PCI_MAP_STATE=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
@@ -124,8 +128,8 @@ CONFIG_PAGE_SIZE_4KB=y
124# CONFIG_PAGE_SIZE_64KB is not set 128# CONFIG_PAGE_SIZE_64KB is not set
125CONFIG_CPU_HAS_PREFETCH=y 129CONFIG_CPU_HAS_PREFETCH=y
126CONFIG_MIPS_MT_DISABLED=y 130CONFIG_MIPS_MT_DISABLED=y
127# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_MT_SMP is not set 131# CONFIG_MIPS_MT_SMP is not set
132# CONFIG_MIPS_MT_SMTC is not set
129# CONFIG_MIPS_VPE_LOADER is not set 133# CONFIG_MIPS_VPE_LOADER is not set
130# CONFIG_64BIT_PHYS_ADDR is not set 134# CONFIG_64BIT_PHYS_ADDR is not set
131CONFIG_CPU_HAS_LLSC=y 135CONFIG_CPU_HAS_LLSC=y
@@ -143,6 +147,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
143# CONFIG_SPARSEMEM_STATIC is not set 147# CONFIG_SPARSEMEM_STATIC is not set
144CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
145# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
150CONFIG_ZONE_DMA_FLAG=1
146# CONFIG_HZ_48 is not set 151# CONFIG_HZ_48 is not set
147# CONFIG_HZ_100 is not set 152# CONFIG_HZ_100 is not set
148# CONFIG_HZ_128 is not set 153# CONFIG_HZ_128 is not set
@@ -155,6 +160,7 @@ CONFIG_HZ=1000
155CONFIG_PREEMPT_NONE=y 160CONFIG_PREEMPT_NONE=y
156# CONFIG_PREEMPT_VOLUNTARY is not set 161# CONFIG_PREEMPT_VOLUNTARY is not set
157# CONFIG_PREEMPT is not set 162# CONFIG_PREEMPT is not set
163# CONFIG_KEXEC is not set
158CONFIG_LOCKDEP_SUPPORT=y 164CONFIG_LOCKDEP_SUPPORT=y
159CONFIG_STACKTRACE_SUPPORT=y 165CONFIG_STACKTRACE_SUPPORT=y
160CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 166CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -173,16 +179,22 @@ CONFIG_LOCALVERSION=""
173CONFIG_LOCALVERSION_AUTO=y 179CONFIG_LOCALVERSION_AUTO=y
174# CONFIG_SWAP is not set 180# CONFIG_SWAP is not set
175CONFIG_SYSVIPC=y 181CONFIG_SYSVIPC=y
182# CONFIG_IPC_NS is not set
183CONFIG_SYSVIPC_SYSCTL=y
176# CONFIG_POSIX_MQUEUE is not set 184# CONFIG_POSIX_MQUEUE is not set
177CONFIG_BSD_PROCESS_ACCT=y 185CONFIG_BSD_PROCESS_ACCT=y
178# CONFIG_BSD_PROCESS_ACCT_V3 is not set 186# CONFIG_BSD_PROCESS_ACCT_V3 is not set
179CONFIG_SYSCTL=y 187# CONFIG_TASKSTATS is not set
188# CONFIG_UTS_NS is not set
180# CONFIG_AUDIT is not set 189# CONFIG_AUDIT is not set
181# CONFIG_IKCONFIG is not set 190# CONFIG_IKCONFIG is not set
191CONFIG_SYSFS_DEPRECATED=y
182# CONFIG_RELAY is not set 192# CONFIG_RELAY is not set
183CONFIG_INITRAMFS_SOURCE="" 193CONFIG_INITRAMFS_SOURCE=""
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 194# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
195CONFIG_SYSCTL=y
185CONFIG_EMBEDDED=y 196CONFIG_EMBEDDED=y
197CONFIG_SYSCTL_SYSCALL=y
186CONFIG_KALLSYMS=y 198CONFIG_KALLSYMS=y
187CONFIG_KALLSYMS_EXTRA_PASS=y 199CONFIG_KALLSYMS_EXTRA_PASS=y
188CONFIG_HOTPLUG=y 200CONFIG_HOTPLUG=y
@@ -190,12 +202,12 @@ CONFIG_PRINTK=y
190CONFIG_BUG=y 202CONFIG_BUG=y
191CONFIG_ELF_CORE=y 203CONFIG_ELF_CORE=y
192CONFIG_BASE_FULL=y 204CONFIG_BASE_FULL=y
193CONFIG_RT_MUTEXES=y
194CONFIG_FUTEX=y 205CONFIG_FUTEX=y
195# CONFIG_EPOLL is not set 206# CONFIG_EPOLL is not set
196CONFIG_SHMEM=y 207CONFIG_SHMEM=y
197CONFIG_SLAB=y 208CONFIG_SLAB=y
198CONFIG_VM_EVENT_COUNTERS=y 209CONFIG_VM_EVENT_COUNTERS=y
210CONFIG_RT_MUTEXES=y
199# CONFIG_TINY_SHMEM is not set 211# CONFIG_TINY_SHMEM is not set
200CONFIG_BASE_SMALL=0 212CONFIG_BASE_SMALL=0
201# CONFIG_SLOB is not set 213# CONFIG_SLOB is not set
@@ -213,6 +225,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
213# 225#
214# Block layer 226# Block layer
215# 227#
228CONFIG_BLOCK=y
216# CONFIG_LBD is not set 229# CONFIG_LBD is not set
217# CONFIG_BLK_DEV_IO_TRACE is not set 230# CONFIG_BLK_DEV_IO_TRACE is not set
218# CONFIG_LSF is not set 231# CONFIG_LSF is not set
@@ -258,6 +271,14 @@ CONFIG_BINFMT_MISC=y
258CONFIG_TRAD_SIGNALS=y 271CONFIG_TRAD_SIGNALS=y
259 272
260# 273#
274# Power management options
275#
276CONFIG_PM=y
277# CONFIG_PM_LEGACY is not set
278# CONFIG_PM_DEBUG is not set
279# CONFIG_PM_SYSFS_DEPRECATED is not set
280
281#
261# Networking 282# Networking
262# 283#
263CONFIG_NET=y 284CONFIG_NET=y
@@ -271,6 +292,8 @@ CONFIG_PACKET_MMAP=y
271CONFIG_UNIX=y 292CONFIG_UNIX=y
272CONFIG_XFRM=y 293CONFIG_XFRM=y
273# CONFIG_XFRM_USER is not set 294# CONFIG_XFRM_USER is not set
295# CONFIG_XFRM_SUB_POLICY is not set
296CONFIG_XFRM_MIGRATE=y
274# CONFIG_NET_KEY is not set 297# CONFIG_NET_KEY is not set
275CONFIG_INET=y 298CONFIG_INET=y
276CONFIG_IP_MULTICAST=y 299CONFIG_IP_MULTICAST=y
@@ -294,10 +317,13 @@ CONFIG_ARPD=y
294# CONFIG_INET_TUNNEL is not set 317# CONFIG_INET_TUNNEL is not set
295CONFIG_INET_XFRM_MODE_TRANSPORT=m 318CONFIG_INET_XFRM_MODE_TRANSPORT=m
296CONFIG_INET_XFRM_MODE_TUNNEL=m 319CONFIG_INET_XFRM_MODE_TUNNEL=m
320CONFIG_INET_XFRM_MODE_BEET=m
297CONFIG_INET_DIAG=y 321CONFIG_INET_DIAG=y
298CONFIG_INET_TCP_DIAG=y 322CONFIG_INET_TCP_DIAG=y
299# CONFIG_TCP_CONG_ADVANCED is not set 323# CONFIG_TCP_CONG_ADVANCED is not set
300CONFIG_TCP_CONG_BIC=y 324CONFIG_TCP_CONG_CUBIC=y
325CONFIG_DEFAULT_TCP_CONG="cubic"
326CONFIG_TCP_MD5SIG=y
301# CONFIG_IPV6 is not set 327# CONFIG_IPV6 is not set
302# CONFIG_INET6_XFRM_TUNNEL is not set 328# CONFIG_INET6_XFRM_TUNNEL is not set
303# CONFIG_INET6_TUNNEL is not set 329# CONFIG_INET6_TUNNEL is not set
@@ -327,7 +353,6 @@ CONFIG_NETWORK_SECMARK=y
327# CONFIG_ATALK is not set 353# CONFIG_ATALK is not set
328# CONFIG_X25 is not set 354# CONFIG_X25 is not set
329# CONFIG_LAPB is not set 355# CONFIG_LAPB is not set
330# CONFIG_NET_DIVERT is not set
331# CONFIG_ECONET is not set 356# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 357# CONFIG_WAN_ROUTER is not set
333 358
@@ -390,11 +415,18 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
390CONFIG_BLK_DEV_RAM=y 415CONFIG_BLK_DEV_RAM=y
391CONFIG_BLK_DEV_RAM_COUNT=16 416CONFIG_BLK_DEV_RAM_COUNT=16
392CONFIG_BLK_DEV_RAM_SIZE=4096 417CONFIG_BLK_DEV_RAM_SIZE=4096
418CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
393CONFIG_BLK_DEV_INITRD=y 419CONFIG_BLK_DEV_INITRD=y
394# CONFIG_CDROM_PKTCDVD is not set 420# CONFIG_CDROM_PKTCDVD is not set
395# CONFIG_ATA_OVER_ETH is not set 421# CONFIG_ATA_OVER_ETH is not set
396 422
397# 423#
424# Misc devices
425#
426CONFIG_SGI_IOC4=m
427# CONFIG_TIFM_CORE is not set
428
429#
398# ATA/ATAPI/MFM/RLL support 430# ATA/ATAPI/MFM/RLL support
399# 431#
400# CONFIG_IDE is not set 432# CONFIG_IDE is not set
@@ -404,6 +436,12 @@ CONFIG_BLK_DEV_INITRD=y
404# 436#
405# CONFIG_RAID_ATTRS is not set 437# CONFIG_RAID_ATTRS is not set
406# CONFIG_SCSI is not set 438# CONFIG_SCSI is not set
439# CONFIG_SCSI_NETLINK is not set
440
441#
442# Serial ATA (prod) and Parallel ATA (experimental) drivers
443#
444# CONFIG_ATA is not set
407 445
408# 446#
409# Multi-device support (RAID and LVM) 447# Multi-device support (RAID and LVM)
@@ -454,6 +492,8 @@ CONFIG_PHYLIB=y
454# CONFIG_CICADA_PHY is not set 492# CONFIG_CICADA_PHY is not set
455CONFIG_VITESSE_PHY=m 493CONFIG_VITESSE_PHY=m
456CONFIG_SMSC_PHY=m 494CONFIG_SMSC_PHY=m
495# CONFIG_BROADCOM_PHY is not set
496# CONFIG_FIXED_PHY is not set
457 497
458# 498#
459# Ethernet (10 or 100Mbit) 499# Ethernet (10 or 100Mbit)
@@ -490,7 +530,7 @@ CONFIG_E100=y
490# CONFIG_SUNDANCE is not set 530# CONFIG_SUNDANCE is not set
491# CONFIG_TLAN is not set 531# CONFIG_TLAN is not set
492# CONFIG_VIA_RHINE is not set 532# CONFIG_VIA_RHINE is not set
493# CONFIG_LAN_SAA9730 is not set 533# CONFIG_SC92031 is not set
494 534
495# 535#
496# Ethernet (1000 Mbit) 536# Ethernet (1000 Mbit)
@@ -509,14 +549,18 @@ CONFIG_E100=y
509# CONFIG_VIA_VELOCITY is not set 549# CONFIG_VIA_VELOCITY is not set
510# CONFIG_TIGON3 is not set 550# CONFIG_TIGON3 is not set
511# CONFIG_BNX2 is not set 551# CONFIG_BNX2 is not set
552CONFIG_QLA3XXX=m
553# CONFIG_ATL1 is not set
512 554
513# 555#
514# Ethernet (10000 Mbit) 556# Ethernet (10000 Mbit)
515# 557#
516# CONFIG_CHELSIO_T1 is not set 558# CONFIG_CHELSIO_T1 is not set
559CONFIG_CHELSIO_T3=m
517# CONFIG_IXGB is not set 560# CONFIG_IXGB is not set
518# CONFIG_S2IO is not set 561# CONFIG_S2IO is not set
519# CONFIG_MYRI10GE is not set 562# CONFIG_MYRI10GE is not set
563CONFIG_NETXEN_NIC=m
520 564
521# 565#
522# Token Ring devices 566# Token Ring devices
@@ -602,10 +646,6 @@ CONFIG_RTC=y
602# CONFIG_DTLK is not set 646# CONFIG_DTLK is not set
603# CONFIG_R3964 is not set 647# CONFIG_R3964 is not set
604# CONFIG_APPLICOM is not set 648# CONFIG_APPLICOM is not set
605
606#
607# Ftape, the floppy tape device driver
608#
609# CONFIG_DRM is not set 649# CONFIG_DRM is not set
610# CONFIG_RAW_DRIVER is not set 650# CONFIG_RAW_DRIVER is not set
611 651
@@ -613,7 +653,6 @@ CONFIG_RTC=y
613# TPM devices 653# TPM devices
614# 654#
615# CONFIG_TCG_TPM is not set 655# CONFIG_TCG_TPM is not set
616# CONFIG_TELCLOCK is not set
617 656
618# 657#
619# I2C support 658# I2C support
@@ -629,6 +668,7 @@ CONFIG_RTC=y
629# 668#
630# Dallas's 1-wire bus 669# Dallas's 1-wire bus
631# 670#
671# CONFIG_W1 is not set
632 672
633# 673#
634# Hardware Monitoring support 674# Hardware Monitoring support
@@ -637,17 +677,14 @@ CONFIG_HWMON=y
637# CONFIG_HWMON_VID is not set 677# CONFIG_HWMON_VID is not set
638# CONFIG_SENSORS_ABITUGURU is not set 678# CONFIG_SENSORS_ABITUGURU is not set
639# CONFIG_SENSORS_F71805F is not set 679# CONFIG_SENSORS_F71805F is not set
680# CONFIG_SENSORS_PC87427 is not set
681# CONFIG_SENSORS_VT1211 is not set
640# CONFIG_HWMON_DEBUG_CHIP is not set 682# CONFIG_HWMON_DEBUG_CHIP is not set
641 683
642# 684#
643# Misc devices
644#
645
646#
647# Multimedia devices 685# Multimedia devices
648# 686#
649# CONFIG_VIDEO_DEV is not set 687# CONFIG_VIDEO_DEV is not set
650CONFIG_VIDEO_V4L2=y
651 688
652# 689#
653# Digital Video Broadcasting Devices 690# Digital Video Broadcasting Devices
@@ -659,6 +696,7 @@ CONFIG_VIDEO_V4L2=y
659# 696#
660# CONFIG_FIRMWARE_EDID is not set 697# CONFIG_FIRMWARE_EDID is not set
661# CONFIG_FB is not set 698# CONFIG_FB is not set
699# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
662 700
663# 701#
664# Sound 702# Sound
@@ -728,14 +766,24 @@ CONFIG_USB_ARCH_HAS_EHCI=y
728# 766#
729 767
730# 768#
769# Auxiliary Display support
770#
771
772#
773# Virtualization
774#
775
776#
731# File systems 777# File systems
732# 778#
733# CONFIG_EXT2_FS is not set 779# CONFIG_EXT2_FS is not set
734# CONFIG_EXT3_FS is not set 780# CONFIG_EXT3_FS is not set
781# CONFIG_EXT4DEV_FS is not set
735# CONFIG_REISERFS_FS is not set 782# CONFIG_REISERFS_FS is not set
736# CONFIG_JFS_FS is not set 783# CONFIG_JFS_FS is not set
737# CONFIG_FS_POSIX_ACL is not set 784CONFIG_FS_POSIX_ACL=y
738# CONFIG_XFS_FS is not set 785# CONFIG_XFS_FS is not set
786# CONFIG_GFS2_FS is not set
739# CONFIG_OCFS2_FS is not set 787# CONFIG_OCFS2_FS is not set
740# CONFIG_MINIX_FS is not set 788# CONFIG_MINIX_FS is not set
741# CONFIG_ROMFS_FS is not set 789# CONFIG_ROMFS_FS is not set
@@ -746,6 +794,7 @@ CONFIG_DNOTIFY=y
746# CONFIG_AUTOFS_FS is not set 794# CONFIG_AUTOFS_FS is not set
747# CONFIG_AUTOFS4_FS is not set 795# CONFIG_AUTOFS4_FS is not set
748# CONFIG_FUSE_FS is not set 796# CONFIG_FUSE_FS is not set
797CONFIG_GENERIC_ACL=y
749 798
750# 799#
751# CD-ROM/DVD Filesystems 800# CD-ROM/DVD Filesystems
@@ -765,11 +814,13 @@ CONFIG_DNOTIFY=y
765# 814#
766CONFIG_PROC_FS=y 815CONFIG_PROC_FS=y
767CONFIG_PROC_KCORE=y 816CONFIG_PROC_KCORE=y
817CONFIG_PROC_SYSCTL=y
768CONFIG_SYSFS=y 818CONFIG_SYSFS=y
769CONFIG_TMPFS=y 819CONFIG_TMPFS=y
820CONFIG_TMPFS_POSIX_ACL=y
770# CONFIG_HUGETLB_PAGE is not set 821# CONFIG_HUGETLB_PAGE is not set
771CONFIG_RAMFS=y 822CONFIG_RAMFS=y
772# CONFIG_CONFIGFS_FS is not set 823CONFIG_CONFIGFS_FS=m
773 824
774# 825#
775# Miscellaneous filesystems 826# Miscellaneous filesystems
@@ -806,7 +857,6 @@ CONFIG_SUNRPC=y
806# CONFIG_RPCSEC_GSS_SPKM3 is not set 857# CONFIG_RPCSEC_GSS_SPKM3 is not set
807# CONFIG_SMB_FS is not set 858# CONFIG_SMB_FS is not set
808# CONFIG_CIFS is not set 859# CONFIG_CIFS is not set
809# CONFIG_CIFS_DEBUG2 is not set
810# CONFIG_NCP_FS is not set 860# CONFIG_NCP_FS is not set
811# CONFIG_CODA_FS is not set 861# CONFIG_CODA_FS is not set
812# CONFIG_AFS_FS is not set 862# CONFIG_AFS_FS is not set
@@ -824,6 +874,14 @@ CONFIG_MSDOS_PARTITION=y
824# CONFIG_NLS is not set 874# CONFIG_NLS is not set
825 875
826# 876#
877# Distributed Lock Manager
878#
879CONFIG_DLM=m
880CONFIG_DLM_TCP=y
881# CONFIG_DLM_SCTP is not set
882# CONFIG_DLM_DEBUG is not set
883
884#
827# Profiling support 885# Profiling support
828# 886#
829# CONFIG_PROFILING is not set 887# CONFIG_PROFILING is not set
@@ -833,11 +891,13 @@ CONFIG_MSDOS_PARTITION=y
833# 891#
834CONFIG_TRACE_IRQFLAGS_SUPPORT=y 892CONFIG_TRACE_IRQFLAGS_SUPPORT=y
835# CONFIG_PRINTK_TIME is not set 893# CONFIG_PRINTK_TIME is not set
894CONFIG_ENABLE_MUST_CHECK=y
836# CONFIG_MAGIC_SYSRQ is not set 895# CONFIG_MAGIC_SYSRQ is not set
837# CONFIG_UNUSED_SYMBOLS is not set 896# CONFIG_UNUSED_SYMBOLS is not set
897# CONFIG_DEBUG_FS is not set
898# CONFIG_HEADERS_CHECK is not set
838# CONFIG_DEBUG_KERNEL is not set 899# CONFIG_DEBUG_KERNEL is not set
839CONFIG_LOG_BUF_SHIFT=14 900CONFIG_LOG_BUF_SHIFT=14
840# CONFIG_DEBUG_FS is not set
841CONFIG_CROSSCOMPILE=y 901CONFIG_CROSSCOMPILE=y
842CONFIG_CMDLINE="console=ttyS0,115200n8" 902CONFIG_CMDLINE="console=ttyS0,115200n8"
843 903
@@ -850,7 +910,44 @@ CONFIG_CMDLINE="console=ttyS0,115200n8"
850# 910#
851# Cryptographic options 911# Cryptographic options
852# 912#
853# CONFIG_CRYPTO is not set 913CONFIG_CRYPTO=y
914CONFIG_CRYPTO_ALGAPI=y
915CONFIG_CRYPTO_BLKCIPHER=m
916CONFIG_CRYPTO_HASH=m
917CONFIG_CRYPTO_MANAGER=m
918CONFIG_CRYPTO_HMAC=m
919CONFIG_CRYPTO_XCBC=m
920CONFIG_CRYPTO_NULL=m
921CONFIG_CRYPTO_MD4=m
922CONFIG_CRYPTO_MD5=y
923CONFIG_CRYPTO_SHA1=m
924CONFIG_CRYPTO_SHA256=m
925CONFIG_CRYPTO_SHA512=m
926CONFIG_CRYPTO_WP512=m
927CONFIG_CRYPTO_TGR192=m
928CONFIG_CRYPTO_GF128MUL=m
929CONFIG_CRYPTO_ECB=m
930CONFIG_CRYPTO_CBC=m
931CONFIG_CRYPTO_PCBC=m
932CONFIG_CRYPTO_LRW=m
933CONFIG_CRYPTO_DES=m
934CONFIG_CRYPTO_FCRYPT=m
935CONFIG_CRYPTO_BLOWFISH=m
936CONFIG_CRYPTO_TWOFISH=m
937CONFIG_CRYPTO_TWOFISH_COMMON=m
938CONFIG_CRYPTO_SERPENT=m
939CONFIG_CRYPTO_AES=m
940CONFIG_CRYPTO_CAST5=m
941CONFIG_CRYPTO_CAST6=m
942CONFIG_CRYPTO_TEA=m
943CONFIG_CRYPTO_ARC4=m
944CONFIG_CRYPTO_KHAZAD=m
945CONFIG_CRYPTO_ANUBIS=m
946CONFIG_CRYPTO_DEFLATE=m
947CONFIG_CRYPTO_MICHAEL_MIC=m
948CONFIG_CRYPTO_CRC32C=m
949CONFIG_CRYPTO_CAMELLIA=m
950# CONFIG_CRYPTO_TEST is not set
854 951
855# 952#
856# Hardware crypto devices 953# Hardware crypto devices
@@ -859,8 +956,13 @@ CONFIG_CMDLINE="console=ttyS0,115200n8"
859# 956#
860# Library routines 957# Library routines
861# 958#
959CONFIG_BITREVERSE=y
862CONFIG_CRC_CCITT=y 960CONFIG_CRC_CCITT=y
863CONFIG_CRC16=y 961CONFIG_CRC16=y
864CONFIG_CRC32=y 962CONFIG_CRC32=y
865CONFIG_LIBCRC32C=y 963CONFIG_LIBCRC32C=y
964CONFIG_ZLIB_INFLATE=m
965CONFIG_ZLIB_DEFLATE=m
866CONFIG_PLIST=y 966CONFIG_PLIST=y
967CONFIG_HAS_IOMEM=y
968CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index b9f74d6745ee..aa69fee321d2 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:21 2006 4# Sun Feb 18 21:28:15 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47CONFIG_PMC_YOSEMITE=y 47CONFIG_PMC_YOSEMITE=y
@@ -65,10 +65,14 @@ CONFIG_PMC_YOSEMITE=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_HYPERTRANSPORT is not set 66# CONFIG_HYPERTRANSPORT is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set
69# CONFIG_ARCH_HAS_ILOG2_U64 is not set
68CONFIG_GENERIC_FIND_NEXT_BIT=y 70CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y 71CONFIG_GENERIC_HWEIGHT=y
70CONFIG_GENERIC_CALIBRATE_DELAY=y 72CONFIG_GENERIC_CALIBRATE_DELAY=y
73CONFIG_GENERIC_TIME=y
71CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 74CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
72CONFIG_DMA_COHERENT=y 76CONFIG_DMA_COHERENT=y
73CONFIG_CPU_BIG_ENDIAN=y 77CONFIG_CPU_BIG_ENDIAN=y
74# CONFIG_CPU_LITTLE_ENDIAN is not set 78# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -102,6 +106,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
102CONFIG_CPU_RM9000=y 106CONFIG_CPU_RM9000=y
103# CONFIG_CPU_SB1 is not set 107# CONFIG_CPU_SB1 is not set
104CONFIG_SYS_HAS_CPU_RM9000=y 108CONFIG_SYS_HAS_CPU_RM9000=y
109CONFIG_WEAK_ORDERING=y
105CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 110CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
106CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 111CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 112CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -118,8 +123,8 @@ CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_64KB is not set 123# CONFIG_PAGE_SIZE_64KB is not set
119CONFIG_CPU_HAS_PREFETCH=y 124CONFIG_CPU_HAS_PREFETCH=y
120CONFIG_MIPS_MT_DISABLED=y 125CONFIG_MIPS_MT_DISABLED=y
121# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_MT_SMP is not set 126# CONFIG_MIPS_MT_SMP is not set
127# CONFIG_MIPS_MT_SMTC is not set
123# CONFIG_MIPS_VPE_LOADER is not set 128# CONFIG_MIPS_VPE_LOADER is not set
124# CONFIG_64BIT_PHYS_ADDR is not set 129# CONFIG_64BIT_PHYS_ADDR is not set
125CONFIG_CPU_HAS_LLSC=y 130CONFIG_CPU_HAS_LLSC=y
@@ -136,6 +141,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 141# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 142CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 143# CONFIG_RESOURCES_64BIT is not set
144CONFIG_ZONE_DMA_FLAG=1
139CONFIG_SMP=y 145CONFIG_SMP=y
140CONFIG_SYS_SUPPORTS_SMP=y 146CONFIG_SYS_SUPPORTS_SMP=y
141CONFIG_NR_CPUS=2 147CONFIG_NR_CPUS=2
@@ -170,15 +176,20 @@ CONFIG_LOCALVERSION=""
170CONFIG_LOCALVERSION_AUTO=y 176CONFIG_LOCALVERSION_AUTO=y
171CONFIG_SWAP=y 177CONFIG_SWAP=y
172CONFIG_SYSVIPC=y 178CONFIG_SYSVIPC=y
179# CONFIG_IPC_NS is not set
180CONFIG_SYSVIPC_SYSCTL=y
173# CONFIG_BSD_PROCESS_ACCT is not set 181# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 182# CONFIG_TASKSTATS is not set
183# CONFIG_UTS_NS is not set
175# CONFIG_AUDIT is not set 184# CONFIG_AUDIT is not set
176CONFIG_IKCONFIG=y 185CONFIG_IKCONFIG=y
177CONFIG_IKCONFIG_PROC=y 186CONFIG_IKCONFIG_PROC=y
178# CONFIG_CPUSETS is not set 187# CONFIG_CPUSETS is not set
188CONFIG_SYSFS_DEPRECATED=y
179CONFIG_RELAY=y 189CONFIG_RELAY=y
180CONFIG_INITRAMFS_SOURCE="" 190CONFIG_SYSCTL=y
181CONFIG_EMBEDDED=y 191CONFIG_EMBEDDED=y
192CONFIG_SYSCTL_SYSCALL=y
182CONFIG_KALLSYMS=y 193CONFIG_KALLSYMS=y
183# CONFIG_KALLSYMS_ALL is not set 194# CONFIG_KALLSYMS_ALL is not set
184# CONFIG_KALLSYMS_EXTRA_PASS is not set 195# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -187,12 +198,12 @@ CONFIG_PRINTK=y
187CONFIG_BUG=y 198CONFIG_BUG=y
188CONFIG_ELF_CORE=y 199CONFIG_ELF_CORE=y
189CONFIG_BASE_FULL=y 200CONFIG_BASE_FULL=y
190CONFIG_RT_MUTEXES=y
191CONFIG_FUTEX=y 201CONFIG_FUTEX=y
192CONFIG_EPOLL=y 202CONFIG_EPOLL=y
193CONFIG_SHMEM=y 203CONFIG_SHMEM=y
194CONFIG_SLAB=y 204CONFIG_SLAB=y
195CONFIG_VM_EVENT_COUNTERS=y 205CONFIG_VM_EVENT_COUNTERS=y
206CONFIG_RT_MUTEXES=y
196# CONFIG_TINY_SHMEM is not set 207# CONFIG_TINY_SHMEM is not set
197CONFIG_BASE_SMALL=0 208CONFIG_BASE_SMALL=0
198# CONFIG_SLOB is not set 209# CONFIG_SLOB is not set
@@ -210,6 +221,7 @@ CONFIG_STOP_MACHINE=y
210# 221#
211# Block layer 222# Block layer
212# 223#
224CONFIG_BLOCK=y
213# CONFIG_LBD is not set 225# CONFIG_LBD is not set
214# CONFIG_BLK_DEV_IO_TRACE is not set 226# CONFIG_BLK_DEV_IO_TRACE is not set
215# CONFIG_LSF is not set 227# CONFIG_LSF is not set
@@ -252,6 +264,14 @@ CONFIG_BINFMT_ELF=y
252CONFIG_TRAD_SIGNALS=y 264CONFIG_TRAD_SIGNALS=y
253 265
254# 266#
267# Power management options
268#
269CONFIG_PM=y
270# CONFIG_PM_LEGACY is not set
271# CONFIG_PM_DEBUG is not set
272# CONFIG_PM_SYSFS_DEPRECATED is not set
273
274#
255# Networking 275# Networking
256# 276#
257CONFIG_NET=y 277CONFIG_NET=y
@@ -281,13 +301,15 @@ CONFIG_IP_PNP_BOOTP=y
281# CONFIG_INET_ESP is not set 301# CONFIG_INET_ESP is not set
282# CONFIG_INET_IPCOMP is not set 302# CONFIG_INET_IPCOMP is not set
283# CONFIG_INET_XFRM_TUNNEL is not set 303# CONFIG_INET_XFRM_TUNNEL is not set
284# CONFIG_INET_TUNNEL is not set 304CONFIG_INET_TUNNEL=m
285CONFIG_INET_XFRM_MODE_TRANSPORT=m 305CONFIG_INET_XFRM_MODE_TRANSPORT=m
286CONFIG_INET_XFRM_MODE_TUNNEL=m 306CONFIG_INET_XFRM_MODE_TUNNEL=m
307CONFIG_INET_XFRM_MODE_BEET=m
287CONFIG_INET_DIAG=y 308CONFIG_INET_DIAG=y
288CONFIG_INET_TCP_DIAG=y 309CONFIG_INET_TCP_DIAG=y
289# CONFIG_TCP_CONG_ADVANCED is not set 310# CONFIG_TCP_CONG_ADVANCED is not set
290CONFIG_TCP_CONG_BIC=y 311CONFIG_TCP_CONG_CUBIC=y
312CONFIG_DEFAULT_TCP_CONG="cubic"
291CONFIG_IPV6=m 313CONFIG_IPV6=m
292CONFIG_IPV6_PRIVACY=y 314CONFIG_IPV6_PRIVACY=y
293CONFIG_IPV6_ROUTER_PREF=y 315CONFIG_IPV6_ROUTER_PREF=y
@@ -298,6 +320,8 @@ CONFIG_INET6_XFRM_TUNNEL=m
298CONFIG_INET6_TUNNEL=m 320CONFIG_INET6_TUNNEL=m
299CONFIG_INET6_XFRM_MODE_TRANSPORT=m 321CONFIG_INET6_XFRM_MODE_TRANSPORT=m
300CONFIG_INET6_XFRM_MODE_TUNNEL=m 322CONFIG_INET6_XFRM_MODE_TUNNEL=m
323CONFIG_INET6_XFRM_MODE_BEET=m
324CONFIG_IPV6_SIT=m
301CONFIG_IPV6_TUNNEL=m 325CONFIG_IPV6_TUNNEL=m
302CONFIG_NETWORK_SECMARK=y 326CONFIG_NETWORK_SECMARK=y
303# CONFIG_NETFILTER is not set 327# CONFIG_NETFILTER is not set
@@ -336,6 +360,7 @@ CONFIG_STANDALONE=y
336CONFIG_PREVENT_FIRMWARE_BUILD=y 360CONFIG_PREVENT_FIRMWARE_BUILD=y
337CONFIG_FW_LOADER=m 361CONFIG_FW_LOADER=m
338# CONFIG_DEBUG_DRIVER is not set 362# CONFIG_DEBUG_DRIVER is not set
363# CONFIG_DEBUG_DEVRES is not set
339# CONFIG_SYS_HYPERVISOR is not set 364# CONFIG_SYS_HYPERVISOR is not set
340 365
341# 366#
@@ -374,6 +399,11 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
374CONFIG_ATA_OVER_ETH=m 399CONFIG_ATA_OVER_ETH=m
375 400
376# 401#
402# Misc devices
403#
404CONFIG_SGI_IOC4=m
405
406#
377# ATA/ATAPI/MFM/RLL support 407# ATA/ATAPI/MFM/RLL support
378# 408#
379# CONFIG_IDE is not set 409# CONFIG_IDE is not set
@@ -383,6 +413,12 @@ CONFIG_ATA_OVER_ETH=m
383# 413#
384CONFIG_RAID_ATTRS=m 414CONFIG_RAID_ATTRS=m
385# CONFIG_SCSI is not set 415# CONFIG_SCSI is not set
416# CONFIG_SCSI_NETLINK is not set
417
418#
419# Serial ATA (prod) and Parallel ATA (experimental) drivers
420#
421# CONFIG_ATA is not set
386 422
387# 423#
388# Multi-device support (RAID and LVM) 424# Multi-device support (RAID and LVM)
@@ -433,6 +469,8 @@ CONFIG_LXT_PHY=m
433CONFIG_CICADA_PHY=m 469CONFIG_CICADA_PHY=m
434CONFIG_VITESSE_PHY=m 470CONFIG_VITESSE_PHY=m
435CONFIG_SMSC_PHY=m 471CONFIG_SMSC_PHY=m
472# CONFIG_BROADCOM_PHY is not set
473# CONFIG_FIXED_PHY is not set
436 474
437# 475#
438# Ethernet (10 or 100Mbit) 476# Ethernet (10 or 100Mbit)
@@ -463,18 +501,22 @@ CONFIG_MII=y
463# CONFIG_R8169 is not set 501# CONFIG_R8169 is not set
464# CONFIG_SIS190 is not set 502# CONFIG_SIS190 is not set
465# CONFIG_SKGE is not set 503# CONFIG_SKGE is not set
504# CONFIG_SKY2 is not set
466# CONFIG_SK98LIN is not set 505# CONFIG_SK98LIN is not set
467# CONFIG_TIGON3 is not set 506# CONFIG_TIGON3 is not set
468# CONFIG_BNX2 is not set 507# CONFIG_BNX2 is not set
469CONFIG_TITAN_GE=y 508CONFIG_TITAN_GE=y
509CONFIG_QLA3XXX=m
470 510
471# 511#
472# Ethernet (10000 Mbit) 512# Ethernet (10000 Mbit)
473# 513#
474# CONFIG_CHELSIO_T1 is not set 514# CONFIG_CHELSIO_T1 is not set
515CONFIG_CHELSIO_T3=m
475# CONFIG_IXGB is not set 516# CONFIG_IXGB is not set
476# CONFIG_S2IO is not set 517# CONFIG_S2IO is not set
477# CONFIG_MYRI10GE is not set 518# CONFIG_MYRI10GE is not set
519CONFIG_NETXEN_NIC=m
478 520
479# 521#
480# Token Ring devices 522# Token Ring devices
@@ -559,10 +601,6 @@ CONFIG_GEN_RTC_X=y
559# CONFIG_DTLK is not set 601# CONFIG_DTLK is not set
560# CONFIG_R3964 is not set 602# CONFIG_R3964 is not set
561# CONFIG_APPLICOM is not set 603# CONFIG_APPLICOM is not set
562
563#
564# Ftape, the floppy tape device driver
565#
566# CONFIG_DRM is not set 604# CONFIG_DRM is not set
567# CONFIG_RAW_DRIVER is not set 605# CONFIG_RAW_DRIVER is not set
568 606
@@ -593,14 +631,9 @@ CONFIG_GEN_RTC_X=y
593# CONFIG_HWMON_VID is not set 631# CONFIG_HWMON_VID is not set
594 632
595# 633#
596# Misc devices
597#
598
599#
600# Multimedia devices 634# Multimedia devices
601# 635#
602# CONFIG_VIDEO_DEV is not set 636# CONFIG_VIDEO_DEV is not set
603CONFIG_VIDEO_V4L2=y
604 637
605# 638#
606# Digital Video Broadcasting Devices 639# Digital Video Broadcasting Devices
@@ -612,6 +645,7 @@ CONFIG_VIDEO_V4L2=y
612# 645#
613# CONFIG_FIRMWARE_EDID is not set 646# CONFIG_FIRMWARE_EDID is not set
614# CONFIG_FB is not set 647# CONFIG_FB is not set
648# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
615 649
616# 650#
617# Sound 651# Sound
@@ -680,14 +714,23 @@ CONFIG_USB_ARCH_HAS_EHCI=y
680# 714#
681 715
682# 716#
717# Auxiliary Display support
718#
719
720#
721# Virtualization
722#
723
724#
683# File systems 725# File systems
684# 726#
685# CONFIG_EXT2_FS is not set 727# CONFIG_EXT2_FS is not set
686# CONFIG_EXT3_FS is not set 728# CONFIG_EXT3_FS is not set
687# CONFIG_REISERFS_FS is not set 729# CONFIG_REISERFS_FS is not set
688# CONFIG_JFS_FS is not set 730# CONFIG_JFS_FS is not set
689# CONFIG_FS_POSIX_ACL is not set 731CONFIG_FS_POSIX_ACL=y
690# CONFIG_XFS_FS is not set 732# CONFIG_XFS_FS is not set
733# CONFIG_OCFS2_FS is not set
691# CONFIG_MINIX_FS is not set 734# CONFIG_MINIX_FS is not set
692# CONFIG_ROMFS_FS is not set 735# CONFIG_ROMFS_FS is not set
693CONFIG_INOTIFY=y 736CONFIG_INOTIFY=y
@@ -697,6 +740,7 @@ CONFIG_DNOTIFY=y
697# CONFIG_AUTOFS_FS is not set 740# CONFIG_AUTOFS_FS is not set
698# CONFIG_AUTOFS4_FS is not set 741# CONFIG_AUTOFS4_FS is not set
699CONFIG_FUSE_FS=m 742CONFIG_FUSE_FS=m
743CONFIG_GENERIC_ACL=y
700 744
701# 745#
702# CD-ROM/DVD Filesystems 746# CD-ROM/DVD Filesystems
@@ -716,8 +760,10 @@ CONFIG_FUSE_FS=m
716# 760#
717CONFIG_PROC_FS=y 761CONFIG_PROC_FS=y
718CONFIG_PROC_KCORE=y 762CONFIG_PROC_KCORE=y
763CONFIG_PROC_SYSCTL=y
719CONFIG_SYSFS=y 764CONFIG_SYSFS=y
720CONFIG_TMPFS=y 765CONFIG_TMPFS=y
766CONFIG_TMPFS_POSIX_ACL=y
721# CONFIG_HUGETLB_PAGE is not set 767# CONFIG_HUGETLB_PAGE is not set
722CONFIG_RAMFS=y 768CONFIG_RAMFS=y
723 769
@@ -737,6 +783,7 @@ CONFIG_RAMFS=y
737# 783#
738CONFIG_NFS_FS=y 784CONFIG_NFS_FS=y
739# CONFIG_NFS_V3 is not set 785# CONFIG_NFS_V3 is not set
786# CONFIG_NFS_DIRECTIO is not set
740# CONFIG_NFSD is not set 787# CONFIG_NFSD is not set
741CONFIG_ROOT_NFS=y 788CONFIG_ROOT_NFS=y
742CONFIG_LOCKD=y 789CONFIG_LOCKD=y
@@ -744,7 +791,6 @@ CONFIG_NFS_COMMON=y
744CONFIG_SUNRPC=y 791CONFIG_SUNRPC=y
745# CONFIG_SMB_FS is not set 792# CONFIG_SMB_FS is not set
746# CONFIG_CIFS is not set 793# CONFIG_CIFS is not set
747# CONFIG_CIFS_DEBUG2 is not set
748# CONFIG_NCP_FS is not set 794# CONFIG_NCP_FS is not set
749# CONFIG_CODA_FS is not set 795# CONFIG_CODA_FS is not set
750 796
@@ -764,25 +810,31 @@ CONFIG_MSDOS_PARTITION=y
764# 810#
765CONFIG_TRACE_IRQFLAGS_SUPPORT=y 811CONFIG_TRACE_IRQFLAGS_SUPPORT=y
766# CONFIG_PRINTK_TIME is not set 812# CONFIG_PRINTK_TIME is not set
813CONFIG_ENABLE_MUST_CHECK=y
767# CONFIG_MAGIC_SYSRQ is not set 814# CONFIG_MAGIC_SYSRQ is not set
768# CONFIG_UNUSED_SYMBOLS is not set 815# CONFIG_UNUSED_SYMBOLS is not set
816# CONFIG_DEBUG_FS is not set
817# CONFIG_HEADERS_CHECK is not set
769CONFIG_DEBUG_KERNEL=y 818CONFIG_DEBUG_KERNEL=y
819# CONFIG_DEBUG_SHIRQ is not set
770CONFIG_LOG_BUF_SHIFT=14 820CONFIG_LOG_BUF_SHIFT=14
771CONFIG_DETECT_SOFTLOCKUP=y 821CONFIG_DETECT_SOFTLOCKUP=y
772# CONFIG_SCHEDSTATS is not set 822# CONFIG_SCHEDSTATS is not set
823# CONFIG_TIMER_STATS is not set
773# CONFIG_DEBUG_SLAB is not set 824# CONFIG_DEBUG_SLAB is not set
774# CONFIG_DEBUG_RT_MUTEXES is not set 825# CONFIG_DEBUG_RT_MUTEXES is not set
775# CONFIG_RT_MUTEX_TESTER is not set 826# CONFIG_RT_MUTEX_TESTER is not set
776# CONFIG_DEBUG_SPINLOCK is not set 827# CONFIG_DEBUG_SPINLOCK is not set
777CONFIG_DEBUG_MUTEXES=y 828CONFIG_DEBUG_MUTEXES=y
778# CONFIG_DEBUG_RWSEMS is not set 829# CONFIG_DEBUG_LOCK_ALLOC is not set
830# CONFIG_PROVE_LOCKING is not set
779# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 831# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
780# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set 832# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
781# CONFIG_DEBUG_KOBJECT is not set 833# CONFIG_DEBUG_KOBJECT is not set
782# CONFIG_DEBUG_HIGHMEM is not set 834# CONFIG_DEBUG_HIGHMEM is not set
783# CONFIG_DEBUG_INFO is not set 835# CONFIG_DEBUG_INFO is not set
784# CONFIG_DEBUG_FS is not set
785# CONFIG_DEBUG_VM is not set 836# CONFIG_DEBUG_VM is not set
837# CONFIG_DEBUG_LIST is not set
786CONFIG_FORCED_INLINING=y 838CONFIG_FORCED_INLINING=y
787# CONFIG_RCU_TORTURE_TEST is not set 839# CONFIG_RCU_TORTURE_TEST is not set
788CONFIG_CROSSCOMPILE=y 840CONFIG_CROSSCOMPILE=y
@@ -802,6 +854,10 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
802# Cryptographic options 854# Cryptographic options
803# 855#
804CONFIG_CRYPTO=y 856CONFIG_CRYPTO=y
857CONFIG_CRYPTO_ALGAPI=y
858CONFIG_CRYPTO_BLKCIPHER=m
859CONFIG_CRYPTO_HASH=y
860CONFIG_CRYPTO_MANAGER=y
805CONFIG_CRYPTO_HMAC=y 861CONFIG_CRYPTO_HMAC=y
806CONFIG_CRYPTO_NULL=m 862CONFIG_CRYPTO_NULL=m
807CONFIG_CRYPTO_MD4=m 863CONFIG_CRYPTO_MD4=m
@@ -811,9 +867,14 @@ CONFIG_CRYPTO_SHA256=m
811CONFIG_CRYPTO_SHA512=m 867CONFIG_CRYPTO_SHA512=m
812CONFIG_CRYPTO_WP512=m 868CONFIG_CRYPTO_WP512=m
813CONFIG_CRYPTO_TGR192=m 869CONFIG_CRYPTO_TGR192=m
870CONFIG_CRYPTO_ECB=m
871CONFIG_CRYPTO_CBC=m
872CONFIG_CRYPTO_PCBC=m
814CONFIG_CRYPTO_DES=m 873CONFIG_CRYPTO_DES=m
874CONFIG_CRYPTO_FCRYPT=m
815CONFIG_CRYPTO_BLOWFISH=m 875CONFIG_CRYPTO_BLOWFISH=m
816CONFIG_CRYPTO_TWOFISH=m 876CONFIG_CRYPTO_TWOFISH=m
877CONFIG_CRYPTO_TWOFISH_COMMON=m
817CONFIG_CRYPTO_SERPENT=m 878CONFIG_CRYPTO_SERPENT=m
818CONFIG_CRYPTO_AES=m 879CONFIG_CRYPTO_AES=m
819CONFIG_CRYPTO_CAST5=m 880CONFIG_CRYPTO_CAST5=m
@@ -825,6 +886,7 @@ CONFIG_CRYPTO_ANUBIS=m
825CONFIG_CRYPTO_DEFLATE=m 886CONFIG_CRYPTO_DEFLATE=m
826CONFIG_CRYPTO_MICHAEL_MIC=m 887CONFIG_CRYPTO_MICHAEL_MIC=m
827CONFIG_CRYPTO_CRC32C=m 888CONFIG_CRYPTO_CRC32C=m
889CONFIG_CRYPTO_CAMELLIA=m
828# CONFIG_CRYPTO_TEST is not set 890# CONFIG_CRYPTO_TEST is not set
829 891
830# 892#
@@ -834,6 +896,7 @@ CONFIG_CRYPTO_CRC32C=m
834# 896#
835# Library routines 897# Library routines
836# 898#
899CONFIG_BITREVERSE=m
837# CONFIG_CRC_CCITT is not set 900# CONFIG_CRC_CCITT is not set
838CONFIG_CRC16=m 901CONFIG_CRC16=m
839CONFIG_CRC32=m 902CONFIG_CRC32=m
@@ -841,3 +904,5 @@ CONFIG_LIBCRC32C=m
841CONFIG_ZLIB_INFLATE=m 904CONFIG_ZLIB_INFLATE=m
842CONFIG_ZLIB_DEFLATE=m 905CONFIG_ZLIB_DEFLATE=m
843CONFIG_PLIST=y 906CONFIG_PLIST=y
907CONFIG_HAS_IOMEM=y
908CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index f9812d1e4579..6c2a233e36cb 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,13 +1,14 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.18-rc1 3# Linux kernel version: 2.6.20
4# Thu Jul 6 10:04:10 2006 4# Sun Feb 18 21:27:34 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
11# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MIPS_MTX1 is not set
12# CONFIG_MIPS_BOSPORUS is not set 13# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set 14# CONFIG_MIPS_PB1000 is not set
@@ -25,8 +26,6 @@ CONFIG_MIPS=y
25# CONFIG_MIPS_COBALT is not set 26# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 27# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MIPS_EV64120 is not set 28# CONFIG_MIPS_EV64120 is not set
28# CONFIG_MIPS_IVR is not set
29# CONFIG_MIPS_ITE8172 is not set
30# CONFIG_MACH_JAZZ is not set 29# CONFIG_MACH_JAZZ is not set
31# CONFIG_LASAT is not set 30# CONFIG_LASAT is not set
32# CONFIG_MIPS_ATLAS is not set 31# CONFIG_MIPS_ATLAS is not set
@@ -42,6 +41,7 @@ CONFIG_MIPS=y
42# CONFIG_MIPS_XXS1500 is not set 41# CONFIG_MIPS_XXS1500 is not set
43# CONFIG_PNX8550_V2PCI is not set 42# CONFIG_PNX8550_V2PCI is not set
44# CONFIG_PNX8550_JBS is not set 43# CONFIG_PNX8550_JBS is not set
44# CONFIG_PNX8550_STB810 is not set
45# CONFIG_DDB5477 is not set 45# CONFIG_DDB5477 is not set
46# CONFIG_MACH_VR41XX is not set 46# CONFIG_MACH_VR41XX is not set
47# CONFIG_PMC_YOSEMITE is not set 47# CONFIG_PMC_YOSEMITE is not set
@@ -64,13 +64,18 @@ CONFIG_SGI_IP22=y
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 66CONFIG_RWSEM_GENERIC_SPINLOCK=y
67# CONFIG_ARCH_HAS_ILOG2_U32 is not set
68# CONFIG_ARCH_HAS_ILOG2_U64 is not set
67CONFIG_GENERIC_FIND_NEXT_BIT=y 69CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y 70CONFIG_GENERIC_HWEIGHT=y
69CONFIG_GENERIC_CALIBRATE_DELAY=y 71CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_GENERIC_TIME=y
70CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 73CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
74# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
71CONFIG_ARC=y 75CONFIG_ARC=y
72CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
78CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
74CONFIG_CPU_BIG_ENDIAN=y 79CONFIG_CPU_BIG_ENDIAN=y
75# CONFIG_CPU_LITTLE_ENDIAN is not set 80# CONFIG_CPU_LITTLE_ENDIAN is not set
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 81CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -123,8 +128,8 @@ CONFIG_PAGE_SIZE_4KB=y
123CONFIG_BOARD_SCACHE=y 128CONFIG_BOARD_SCACHE=y
124CONFIG_IP22_CPU_SCACHE=y 129CONFIG_IP22_CPU_SCACHE=y
125CONFIG_MIPS_MT_DISABLED=y 130CONFIG_MIPS_MT_DISABLED=y
126# CONFIG_MIPS_MT_SMTC is not set
127# CONFIG_MIPS_MT_SMP is not set 131# CONFIG_MIPS_MT_SMP is not set
132# CONFIG_MIPS_MT_SMTC is not set
128# CONFIG_MIPS_VPE_LOADER is not set 133# CONFIG_MIPS_VPE_LOADER is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 134# CONFIG_64BIT_PHYS_ADDR is not set
130CONFIG_CPU_HAS_LLSC=y 135CONFIG_CPU_HAS_LLSC=y
@@ -141,6 +146,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
141# CONFIG_SPARSEMEM_STATIC is not set 146# CONFIG_SPARSEMEM_STATIC is not set
142CONFIG_SPLIT_PTLOCK_CPUS=4 147CONFIG_SPLIT_PTLOCK_CPUS=4
143# CONFIG_RESOURCES_64BIT is not set 148# CONFIG_RESOURCES_64BIT is not set
149CONFIG_ZONE_DMA_FLAG=1
144# CONFIG_HZ_48 is not set 150# CONFIG_HZ_48 is not set
145# CONFIG_HZ_100 is not set 151# CONFIG_HZ_100 is not set
146# CONFIG_HZ_128 is not set 152# CONFIG_HZ_128 is not set
@@ -153,6 +159,7 @@ CONFIG_HZ=1000
153# CONFIG_PREEMPT_NONE is not set 159# CONFIG_PREEMPT_NONE is not set
154CONFIG_PREEMPT_VOLUNTARY=y 160CONFIG_PREEMPT_VOLUNTARY=y
155# CONFIG_PREEMPT is not set 161# CONFIG_PREEMPT is not set
162# CONFIG_KEXEC is not set
156CONFIG_LOCKDEP_SUPPORT=y 163CONFIG_LOCKDEP_SUPPORT=y
157CONFIG_STACKTRACE_SUPPORT=y 164CONFIG_STACKTRACE_SUPPORT=y
158CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 165CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -171,16 +178,21 @@ CONFIG_LOCALVERSION=""
171CONFIG_LOCALVERSION_AUTO=y 178CONFIG_LOCALVERSION_AUTO=y
172CONFIG_SWAP=y 179CONFIG_SWAP=y
173CONFIG_SYSVIPC=y 180CONFIG_SYSVIPC=y
181# CONFIG_IPC_NS is not set
182CONFIG_SYSVIPC_SYSCTL=y
174# CONFIG_POSIX_MQUEUE is not set 183# CONFIG_POSIX_MQUEUE is not set
175# CONFIG_BSD_PROCESS_ACCT is not set 184# CONFIG_BSD_PROCESS_ACCT is not set
176CONFIG_SYSCTL=y 185# CONFIG_TASKSTATS is not set
186# CONFIG_UTS_NS is not set
177# CONFIG_AUDIT is not set 187# CONFIG_AUDIT is not set
178CONFIG_IKCONFIG=y 188CONFIG_IKCONFIG=y
179CONFIG_IKCONFIG_PROC=y 189CONFIG_IKCONFIG_PROC=y
190CONFIG_SYSFS_DEPRECATED=y
180CONFIG_RELAY=y 191CONFIG_RELAY=y
181CONFIG_INITRAMFS_SOURCE=""
182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 192# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
193CONFIG_SYSCTL=y
183CONFIG_EMBEDDED=y 194CONFIG_EMBEDDED=y
195CONFIG_SYSCTL_SYSCALL=y
184CONFIG_KALLSYMS=y 196CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 197# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 198# CONFIG_HOTPLUG is not set
@@ -188,12 +200,12 @@ CONFIG_PRINTK=y
188CONFIG_BUG=y 200CONFIG_BUG=y
189CONFIG_ELF_CORE=y 201CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 202CONFIG_BASE_FULL=y
191CONFIG_RT_MUTEXES=y
192CONFIG_FUTEX=y 203CONFIG_FUTEX=y
193CONFIG_EPOLL=y 204CONFIG_EPOLL=y
194CONFIG_SHMEM=y 205CONFIG_SHMEM=y
195CONFIG_SLAB=y 206CONFIG_SLAB=y
196CONFIG_VM_EVENT_COUNTERS=y 207CONFIG_VM_EVENT_COUNTERS=y
208CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 209# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 210CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set 211# CONFIG_SLOB is not set
@@ -211,6 +223,7 @@ CONFIG_KMOD=y
211# 223#
212# Block layer 224# Block layer
213# 225#
226CONFIG_BLOCK=y
214# CONFIG_LBD is not set 227# CONFIG_LBD is not set
215# CONFIG_BLK_DEV_IO_TRACE is not set 228# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_LSF is not set 229# CONFIG_LSF is not set
@@ -238,7 +251,6 @@ CONFIG_MMU=y
238# 251#
239# PCCARD (PCMCIA/CardBus) support 252# PCCARD (PCMCIA/CardBus) support
240# 253#
241# CONFIG_PCCARD is not set
242 254
243# 255#
244# PCI Hotplug Support 256# PCI Hotplug Support
@@ -252,6 +264,14 @@ CONFIG_BINFMT_MISC=m
252CONFIG_TRAD_SIGNALS=y 264CONFIG_TRAD_SIGNALS=y
253 265
254# 266#
267# Power management options
268#
269CONFIG_PM=y
270# CONFIG_PM_LEGACY is not set
271# CONFIG_PM_DEBUG is not set
272# CONFIG_PM_SYSFS_DEPRECATED is not set
273
274#
255# Networking 275# Networking
256# 276#
257CONFIG_NET=y 277CONFIG_NET=y
@@ -265,7 +285,10 @@ CONFIG_PACKET_MMAP=y
265CONFIG_UNIX=y 285CONFIG_UNIX=y
266CONFIG_XFRM=y 286CONFIG_XFRM=y
267CONFIG_XFRM_USER=m 287CONFIG_XFRM_USER=m
288# CONFIG_XFRM_SUB_POLICY is not set
289CONFIG_XFRM_MIGRATE=y
268CONFIG_NET_KEY=y 290CONFIG_NET_KEY=y
291CONFIG_NET_KEY_MIGRATE=y
269CONFIG_INET=y 292CONFIG_INET=y
270CONFIG_IP_MULTICAST=y 293CONFIG_IP_MULTICAST=y
271# CONFIG_IP_ADVANCED_ROUTER is not set 294# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -286,10 +309,13 @@ CONFIG_INET_XFRM_TUNNEL=m
286CONFIG_INET_TUNNEL=m 309CONFIG_INET_TUNNEL=m
287CONFIG_INET_XFRM_MODE_TRANSPORT=m 310CONFIG_INET_XFRM_MODE_TRANSPORT=m
288CONFIG_INET_XFRM_MODE_TUNNEL=m 311CONFIG_INET_XFRM_MODE_TUNNEL=m
312CONFIG_INET_XFRM_MODE_BEET=m
289CONFIG_INET_DIAG=y 313CONFIG_INET_DIAG=y
290CONFIG_INET_TCP_DIAG=y 314CONFIG_INET_TCP_DIAG=y
291# CONFIG_TCP_CONG_ADVANCED is not set 315# CONFIG_TCP_CONG_ADVANCED is not set
292CONFIG_TCP_CONG_BIC=y 316CONFIG_TCP_CONG_CUBIC=y
317CONFIG_DEFAULT_TCP_CONG="cubic"
318CONFIG_TCP_MD5SIG=y
293 319
294# 320#
295# IP: Virtual Server Configuration 321# IP: Virtual Server Configuration
@@ -331,11 +357,17 @@ CONFIG_IPV6_ROUTE_INFO=y
331CONFIG_INET6_AH=m 357CONFIG_INET6_AH=m
332CONFIG_INET6_ESP=m 358CONFIG_INET6_ESP=m
333CONFIG_INET6_IPCOMP=m 359CONFIG_INET6_IPCOMP=m
360CONFIG_IPV6_MIP6=y
334CONFIG_INET6_XFRM_TUNNEL=m 361CONFIG_INET6_XFRM_TUNNEL=m
335CONFIG_INET6_TUNNEL=m 362CONFIG_INET6_TUNNEL=m
336CONFIG_INET6_XFRM_MODE_TRANSPORT=m 363CONFIG_INET6_XFRM_MODE_TRANSPORT=m
337CONFIG_INET6_XFRM_MODE_TUNNEL=m 364CONFIG_INET6_XFRM_MODE_TUNNEL=m
365CONFIG_INET6_XFRM_MODE_BEET=m
366CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
367CONFIG_IPV6_SIT=m
338CONFIG_IPV6_TUNNEL=m 368CONFIG_IPV6_TUNNEL=m
369CONFIG_IPV6_MULTIPLE_TABLES=y
370CONFIG_IPV6_SUBTREES=y
339CONFIG_NETWORK_SECMARK=y 371CONFIG_NETWORK_SECMARK=y
340CONFIG_NETFILTER=y 372CONFIG_NETFILTER=y
341# CONFIG_NETFILTER_DEBUG is not set 373# CONFIG_NETFILTER_DEBUG is not set
@@ -346,19 +378,43 @@ CONFIG_NETFILTER=y
346CONFIG_NETFILTER_NETLINK=m 378CONFIG_NETFILTER_NETLINK=m
347CONFIG_NETFILTER_NETLINK_QUEUE=m 379CONFIG_NETFILTER_NETLINK_QUEUE=m
348CONFIG_NETFILTER_NETLINK_LOG=m 380CONFIG_NETFILTER_NETLINK_LOG=m
381CONFIG_NF_CONNTRACK_ENABLED=m
382CONFIG_NF_CONNTRACK_SUPPORT=y
383# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
384CONFIG_NF_CONNTRACK=m
385CONFIG_NF_CT_ACCT=y
386CONFIG_NF_CONNTRACK_MARK=y
387CONFIG_NF_CONNTRACK_SECMARK=y
388CONFIG_NF_CONNTRACK_EVENTS=y
389CONFIG_NF_CT_PROTO_GRE=m
390CONFIG_NF_CT_PROTO_SCTP=m
391CONFIG_NF_CONNTRACK_AMANDA=m
392CONFIG_NF_CONNTRACK_FTP=m
393CONFIG_NF_CONNTRACK_H323=m
394CONFIG_NF_CONNTRACK_IRC=m
395# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
396CONFIG_NF_CONNTRACK_PPTP=m
397CONFIG_NF_CONNTRACK_SANE=m
398CONFIG_NF_CONNTRACK_SIP=m
399CONFIG_NF_CONNTRACK_TFTP=m
400CONFIG_NF_CT_NETLINK=m
349CONFIG_NETFILTER_XTABLES=m 401CONFIG_NETFILTER_XTABLES=m
350CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 402CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
351CONFIG_NETFILTER_XT_TARGET_CONNMARK=m 403CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
404CONFIG_NETFILTER_XT_TARGET_DSCP=m
352CONFIG_NETFILTER_XT_TARGET_MARK=m 405CONFIG_NETFILTER_XT_TARGET_MARK=m
353CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 406CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
407CONFIG_NETFILTER_XT_TARGET_NFLOG=m
354CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 408CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
355CONFIG_NETFILTER_XT_TARGET_SECMARK=m 409CONFIG_NETFILTER_XT_TARGET_SECMARK=m
356CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 410CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
411CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
357CONFIG_NETFILTER_XT_MATCH_COMMENT=m 412CONFIG_NETFILTER_XT_MATCH_COMMENT=m
358CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 413CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
359CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 414CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
360CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 415CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
361CONFIG_NETFILTER_XT_MATCH_DCCP=m 416CONFIG_NETFILTER_XT_MATCH_DCCP=m
417CONFIG_NETFILTER_XT_MATCH_DSCP=m
362CONFIG_NETFILTER_XT_MATCH_ESP=m 418CONFIG_NETFILTER_XT_MATCH_ESP=m
363CONFIG_NETFILTER_XT_MATCH_HELPER=m 419CONFIG_NETFILTER_XT_MATCH_HELPER=m
364CONFIG_NETFILTER_XT_MATCH_LENGTH=m 420CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -375,60 +431,45 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
375CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 431CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
376CONFIG_NETFILTER_XT_MATCH_STRING=m 432CONFIG_NETFILTER_XT_MATCH_STRING=m
377CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 433CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
434CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
378 435
379# 436#
380# IP: Netfilter Configuration 437# IP: Netfilter Configuration
381# 438#
382CONFIG_IP_NF_CONNTRACK=m 439CONFIG_NF_CONNTRACK_IPV4=m
383CONFIG_IP_NF_CT_ACCT=y 440CONFIG_NF_CONNTRACK_PROC_COMPAT=y
384CONFIG_IP_NF_CONNTRACK_MARK=y
385CONFIG_IP_NF_CONNTRACK_SECMARK=y
386CONFIG_IP_NF_CONNTRACK_EVENTS=y
387CONFIG_IP_NF_CONNTRACK_NETLINK=m
388# CONFIG_IP_NF_CT_PROTO_SCTP is not set
389CONFIG_IP_NF_FTP=m
390CONFIG_IP_NF_IRC=m
391# CONFIG_IP_NF_NETBIOS_NS is not set
392CONFIG_IP_NF_TFTP=m
393CONFIG_IP_NF_AMANDA=m
394CONFIG_IP_NF_PPTP=m
395CONFIG_IP_NF_H323=m
396CONFIG_IP_NF_SIP=m
397CONFIG_IP_NF_QUEUE=m 441CONFIG_IP_NF_QUEUE=m
398CONFIG_IP_NF_IPTABLES=m 442CONFIG_IP_NF_IPTABLES=m
399CONFIG_IP_NF_MATCH_IPRANGE=m 443CONFIG_IP_NF_MATCH_IPRANGE=m
400CONFIG_IP_NF_MATCH_TOS=m 444CONFIG_IP_NF_MATCH_TOS=m
401CONFIG_IP_NF_MATCH_RECENT=m 445CONFIG_IP_NF_MATCH_RECENT=m
402CONFIG_IP_NF_MATCH_ECN=m 446CONFIG_IP_NF_MATCH_ECN=m
403CONFIG_IP_NF_MATCH_DSCP=m
404CONFIG_IP_NF_MATCH_AH=m 447CONFIG_IP_NF_MATCH_AH=m
405CONFIG_IP_NF_MATCH_TTL=m 448CONFIG_IP_NF_MATCH_TTL=m
406CONFIG_IP_NF_MATCH_OWNER=m 449CONFIG_IP_NF_MATCH_OWNER=m
407CONFIG_IP_NF_MATCH_ADDRTYPE=m 450CONFIG_IP_NF_MATCH_ADDRTYPE=m
408CONFIG_IP_NF_MATCH_HASHLIMIT=m
409CONFIG_IP_NF_FILTER=m 451CONFIG_IP_NF_FILTER=m
410CONFIG_IP_NF_TARGET_REJECT=m 452CONFIG_IP_NF_TARGET_REJECT=m
411CONFIG_IP_NF_TARGET_LOG=m 453CONFIG_IP_NF_TARGET_LOG=m
412CONFIG_IP_NF_TARGET_ULOG=m 454CONFIG_IP_NF_TARGET_ULOG=m
413CONFIG_IP_NF_TARGET_TCPMSS=m 455CONFIG_NF_NAT=m
414CONFIG_IP_NF_NAT=m 456CONFIG_NF_NAT_NEEDED=y
415CONFIG_IP_NF_NAT_NEEDED=y
416CONFIG_IP_NF_TARGET_MASQUERADE=m 457CONFIG_IP_NF_TARGET_MASQUERADE=m
417CONFIG_IP_NF_TARGET_REDIRECT=m 458CONFIG_IP_NF_TARGET_REDIRECT=m
418CONFIG_IP_NF_TARGET_NETMAP=m 459CONFIG_IP_NF_TARGET_NETMAP=m
419CONFIG_IP_NF_TARGET_SAME=m 460CONFIG_IP_NF_TARGET_SAME=m
420CONFIG_IP_NF_NAT_SNMP_BASIC=m 461CONFIG_NF_NAT_SNMP_BASIC=m
421CONFIG_IP_NF_NAT_IRC=m 462CONFIG_NF_NAT_PROTO_GRE=m
422CONFIG_IP_NF_NAT_FTP=m 463CONFIG_NF_NAT_FTP=m
423CONFIG_IP_NF_NAT_TFTP=m 464CONFIG_NF_NAT_IRC=m
424CONFIG_IP_NF_NAT_AMANDA=m 465CONFIG_NF_NAT_TFTP=m
425CONFIG_IP_NF_NAT_PPTP=m 466CONFIG_NF_NAT_AMANDA=m
426CONFIG_IP_NF_NAT_H323=m 467CONFIG_NF_NAT_PPTP=m
427CONFIG_IP_NF_NAT_SIP=m 468CONFIG_NF_NAT_H323=m
469CONFIG_NF_NAT_SIP=m
428CONFIG_IP_NF_MANGLE=m 470CONFIG_IP_NF_MANGLE=m
429CONFIG_IP_NF_TARGET_TOS=m 471CONFIG_IP_NF_TARGET_TOS=m
430CONFIG_IP_NF_TARGET_ECN=m 472CONFIG_IP_NF_TARGET_ECN=m
431CONFIG_IP_NF_TARGET_DSCP=m
432CONFIG_IP_NF_TARGET_TTL=m 473CONFIG_IP_NF_TARGET_TTL=m
433CONFIG_IP_NF_TARGET_CLUSTERIP=m 474CONFIG_IP_NF_TARGET_CLUSTERIP=m
434CONFIG_IP_NF_RAW=m 475CONFIG_IP_NF_RAW=m
@@ -439,6 +480,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
439# 480#
440# IPv6: Netfilter Configuration (EXPERIMENTAL) 481# IPv6: Netfilter Configuration (EXPERIMENTAL)
441# 482#
483CONFIG_NF_CONNTRACK_IPV6=m
442CONFIG_IP6_NF_QUEUE=m 484CONFIG_IP6_NF_QUEUE=m
443CONFIG_IP6_NF_IPTABLES=m 485CONFIG_IP6_NF_IPTABLES=m
444CONFIG_IP6_NF_MATCH_RT=m 486CONFIG_IP6_NF_MATCH_RT=m
@@ -448,6 +490,7 @@ CONFIG_IP6_NF_MATCH_HL=m
448CONFIG_IP6_NF_MATCH_OWNER=m 490CONFIG_IP6_NF_MATCH_OWNER=m
449CONFIG_IP6_NF_MATCH_IPV6HEADER=m 491CONFIG_IP6_NF_MATCH_IPV6HEADER=m
450CONFIG_IP6_NF_MATCH_AH=m 492CONFIG_IP6_NF_MATCH_AH=m
493CONFIG_IP6_NF_MATCH_MH=m
451CONFIG_IP6_NF_MATCH_EUI64=m 494CONFIG_IP6_NF_MATCH_EUI64=m
452CONFIG_IP6_NF_FILTER=m 495CONFIG_IP6_NF_FILTER=m
453CONFIG_IP6_NF_TARGET_LOG=m 496CONFIG_IP6_NF_TARGET_LOG=m
@@ -484,7 +527,6 @@ CONFIG_SCTP_HMAC_MD5=y
484# CONFIG_ATALK is not set 527# CONFIG_ATALK is not set
485# CONFIG_X25 is not set 528# CONFIG_X25 is not set
486# CONFIG_LAPB is not set 529# CONFIG_LAPB is not set
487CONFIG_NET_DIVERT=y
488# CONFIG_ECONET is not set 530# CONFIG_ECONET is not set
489# CONFIG_WAN_ROUTER is not set 531# CONFIG_WAN_ROUTER is not set
490 532
@@ -492,6 +534,7 @@ CONFIG_NET_DIVERT=y
492# QoS and/or fair queueing 534# QoS and/or fair queueing
493# 535#
494CONFIG_NET_SCHED=y 536CONFIG_NET_SCHED=y
537CONFIG_NET_SCH_FIFO=y
495# CONFIG_NET_SCH_CLK_JIFFIES is not set 538# CONFIG_NET_SCH_CLK_JIFFIES is not set
496CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 539CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
497# CONFIG_NET_SCH_CLK_CPU is not set 540# CONFIG_NET_SCH_CLK_CPU is not set
@@ -546,6 +589,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
546CONFIG_IEEE80211_SOFTMAC=m 589CONFIG_IEEE80211_SOFTMAC=m
547# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 590# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
548CONFIG_WIRELESS_EXT=y 591CONFIG_WIRELESS_EXT=y
592CONFIG_FIB_RULES=y
549 593
550# 594#
551# Device Drivers 595# Device Drivers
@@ -556,7 +600,6 @@ CONFIG_WIRELESS_EXT=y
556# 600#
557CONFIG_STANDALONE=y 601CONFIG_STANDALONE=y
558CONFIG_PREVENT_FIRMWARE_BUILD=y 602CONFIG_PREVENT_FIRMWARE_BUILD=y
559# CONFIG_FW_LOADER is not set
560# CONFIG_SYS_HYPERVISOR is not set 603# CONFIG_SYS_HYPERVISOR is not set
561 604
562# 605#
@@ -592,6 +635,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
592CONFIG_ATA_OVER_ETH=m 635CONFIG_ATA_OVER_ETH=m
593 636
594# 637#
638# Misc devices
639#
640
641#
595# ATA/ATAPI/MFM/RLL support 642# ATA/ATAPI/MFM/RLL support
596# 643#
597# CONFIG_IDE is not set 644# CONFIG_IDE is not set
@@ -601,6 +648,8 @@ CONFIG_ATA_OVER_ETH=m
601# 648#
602CONFIG_RAID_ATTRS=m 649CONFIG_RAID_ATTRS=m
603CONFIG_SCSI=y 650CONFIG_SCSI=y
651CONFIG_SCSI_TGT=m
652# CONFIG_SCSI_NETLINK is not set
604CONFIG_SCSI_PROC_FS=y 653CONFIG_SCSI_PROC_FS=y
605 654
606# 655#
@@ -620,24 +669,30 @@ CONFIG_CHR_DEV_SCH=m
620# CONFIG_SCSI_MULTI_LUN is not set 669# CONFIG_SCSI_MULTI_LUN is not set
621CONFIG_SCSI_CONSTANTS=y 670CONFIG_SCSI_CONSTANTS=y
622# CONFIG_SCSI_LOGGING is not set 671# CONFIG_SCSI_LOGGING is not set
672CONFIG_SCSI_SCAN_ASYNC=y
623 673
624# 674#
625# SCSI Transport Attributes 675# SCSI Transports
626# 676#
627CONFIG_SCSI_SPI_ATTRS=m 677CONFIG_SCSI_SPI_ATTRS=m
628# CONFIG_SCSI_FC_ATTRS is not set 678# CONFIG_SCSI_FC_ATTRS is not set
629CONFIG_SCSI_ISCSI_ATTRS=m 679CONFIG_SCSI_ISCSI_ATTRS=m
630CONFIG_SCSI_SAS_ATTRS=m 680CONFIG_SCSI_SAS_ATTRS=m
681# CONFIG_SCSI_SAS_LIBSAS is not set
631 682
632# 683#
633# SCSI low-level drivers 684# SCSI low-level drivers
634# 685#
635CONFIG_ISCSI_TCP=m 686CONFIG_ISCSI_TCP=m
636CONFIG_SGIWD93_SCSI=y 687CONFIG_SGIWD93_SCSI=y
637# CONFIG_SCSI_SATA is not set
638# CONFIG_SCSI_DEBUG is not set 688# CONFIG_SCSI_DEBUG is not set
639 689
640# 690#
691# Serial ATA (prod) and Parallel ATA (experimental) drivers
692#
693# CONFIG_ATA is not set
694
695#
641# Multi-device support (RAID and LVM) 696# Multi-device support (RAID and LVM)
642# 697#
643# CONFIG_MD is not set 698# CONFIG_MD is not set
@@ -679,6 +734,8 @@ CONFIG_LXT_PHY=m
679CONFIG_CICADA_PHY=m 734CONFIG_CICADA_PHY=m
680# CONFIG_VITESSE_PHY is not set 735# CONFIG_VITESSE_PHY is not set
681# CONFIG_SMSC_PHY is not set 736# CONFIG_SMSC_PHY is not set
737# CONFIG_BROADCOM_PHY is not set
738# CONFIG_FIXED_PHY is not set
682 739
683# 740#
684# Ethernet (10 or 100Mbit) 741# Ethernet (10 or 100Mbit)
@@ -730,6 +787,7 @@ CONFIG_SGISEEQ=y
730# Input device support 787# Input device support
731# 788#
732CONFIG_INPUT=y 789CONFIG_INPUT=y
790# CONFIG_INPUT_FF_MEMLESS is not set
733 791
734# 792#
735# Userland interfaces 793# Userland interfaces
@@ -752,6 +810,7 @@ CONFIG_KEYBOARD_ATKBD=y
752# CONFIG_KEYBOARD_LKKBD is not set 810# CONFIG_KEYBOARD_LKKBD is not set
753# CONFIG_KEYBOARD_XTKBD is not set 811# CONFIG_KEYBOARD_XTKBD is not set
754# CONFIG_KEYBOARD_NEWTON is not set 812# CONFIG_KEYBOARD_NEWTON is not set
813# CONFIG_KEYBOARD_STOWAWAY is not set
755CONFIG_INPUT_MOUSE=y 814CONFIG_INPUT_MOUSE=y
756CONFIG_MOUSE_PS2=m 815CONFIG_MOUSE_PS2=m
757CONFIG_MOUSE_SERIAL=m 816CONFIG_MOUSE_SERIAL=m
@@ -815,10 +874,6 @@ CONFIG_SGI_DS1286=m
815# CONFIG_GEN_RTC is not set 874# CONFIG_GEN_RTC is not set
816# CONFIG_DTLK is not set 875# CONFIG_DTLK is not set
817# CONFIG_R3964 is not set 876# CONFIG_R3964 is not set
818
819#
820# Ftape, the floppy tape device driver
821#
822CONFIG_RAW_DRIVER=m 877CONFIG_RAW_DRIVER=m
823CONFIG_MAX_RAW_DEVS=256 878CONFIG_MAX_RAW_DEVS=256
824 879
@@ -826,7 +881,6 @@ CONFIG_MAX_RAW_DEVS=256
826# TPM devices 881# TPM devices
827# 882#
828# CONFIG_TCG_TPM is not set 883# CONFIG_TCG_TPM is not set
829# CONFIG_TELCLOCK is not set
830 884
831# 885#
832# I2C support 886# I2C support
@@ -851,14 +905,9 @@ CONFIG_MAX_RAW_DEVS=256
851# CONFIG_HWMON_VID is not set 905# CONFIG_HWMON_VID is not set
852 906
853# 907#
854# Misc devices
855#
856
857#
858# Multimedia devices 908# Multimedia devices
859# 909#
860# CONFIG_VIDEO_DEV is not set 910# CONFIG_VIDEO_DEV is not set
861CONFIG_VIDEO_V4L2=y
862 911
863# 912#
864# Digital Video Broadcasting Devices 913# Digital Video Broadcasting Devices
@@ -887,6 +936,7 @@ CONFIG_LOGO=y
887# CONFIG_LOGO_LINUX_VGA16 is not set 936# CONFIG_LOGO_LINUX_VGA16 is not set
888# CONFIG_LOGO_LINUX_CLUT224 is not set 937# CONFIG_LOGO_LINUX_CLUT224 is not set
889CONFIG_LOGO_SGI_CLUT224=y 938CONFIG_LOGO_SGI_CLUT224=y
939# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
890 940
891# 941#
892# Sound 942# Sound
@@ -894,6 +944,12 @@ CONFIG_LOGO_SGI_CLUT224=y
894# CONFIG_SOUND is not set 944# CONFIG_SOUND is not set
895 945
896# 946#
947# HID Devices
948#
949CONFIG_HID=y
950# CONFIG_HID_DEBUG is not set
951
952#
897# USB support 953# USB support
898# 954#
899# CONFIG_USB_ARCH_HAS_HCD is not set 955# CONFIG_USB_ARCH_HAS_HCD is not set
@@ -954,6 +1010,14 @@ CONFIG_LOGO_SGI_CLUT224=y
954# 1010#
955 1011
956# 1012#
1013# Auxiliary Display support
1014#
1015
1016#
1017# Virtualization
1018#
1019
1020#
957# File systems 1021# File systems
958# 1022#
959CONFIG_EXT2_FS=m 1023CONFIG_EXT2_FS=m
@@ -963,6 +1027,7 @@ CONFIG_EXT3_FS=y
963CONFIG_EXT3_FS_XATTR=y 1027CONFIG_EXT3_FS_XATTR=y
964CONFIG_EXT3_FS_POSIX_ACL=y 1028CONFIG_EXT3_FS_POSIX_ACL=y
965CONFIG_EXT3_FS_SECURITY=y 1029CONFIG_EXT3_FS_SECURITY=y
1030# CONFIG_EXT4DEV_FS is not set
966CONFIG_JBD=y 1031CONFIG_JBD=y
967# CONFIG_JBD_DEBUG is not set 1032# CONFIG_JBD_DEBUG is not set
968CONFIG_FS_MBCACHE=y 1033CONFIG_FS_MBCACHE=y
@@ -974,6 +1039,7 @@ CONFIG_XFS_QUOTA=y
974CONFIG_XFS_SECURITY=y 1039CONFIG_XFS_SECURITY=y
975# CONFIG_XFS_POSIX_ACL is not set 1040# CONFIG_XFS_POSIX_ACL is not set
976# CONFIG_XFS_RT is not set 1041# CONFIG_XFS_RT is not set
1042# CONFIG_GFS2_FS is not set
977# CONFIG_OCFS2_FS is not set 1043# CONFIG_OCFS2_FS is not set
978CONFIG_MINIX_FS=m 1044CONFIG_MINIX_FS=m
979# CONFIG_ROMFS_FS is not set 1045# CONFIG_ROMFS_FS is not set
@@ -987,6 +1053,7 @@ CONFIG_DNOTIFY=y
987CONFIG_AUTOFS_FS=m 1053CONFIG_AUTOFS_FS=m
988CONFIG_AUTOFS4_FS=m 1054CONFIG_AUTOFS4_FS=m
989CONFIG_FUSE_FS=m 1055CONFIG_FUSE_FS=m
1056CONFIG_GENERIC_ACL=y
990 1057
991# 1058#
992# CD-ROM/DVD Filesystems 1059# CD-ROM/DVD Filesystems
@@ -994,7 +1061,6 @@ CONFIG_FUSE_FS=m
994CONFIG_ISO9660_FS=m 1061CONFIG_ISO9660_FS=m
995CONFIG_JOLIET=y 1062CONFIG_JOLIET=y
996CONFIG_ZISOFS=y 1063CONFIG_ZISOFS=y
997CONFIG_ZISOFS_FS=m
998CONFIG_UDF_FS=m 1064CONFIG_UDF_FS=m
999CONFIG_UDF_NLS=y 1065CONFIG_UDF_NLS=y
1000 1066
@@ -1013,17 +1079,20 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1013# 1079#
1014CONFIG_PROC_FS=y 1080CONFIG_PROC_FS=y
1015CONFIG_PROC_KCORE=y 1081CONFIG_PROC_KCORE=y
1082CONFIG_PROC_SYSCTL=y
1016CONFIG_SYSFS=y 1083CONFIG_SYSFS=y
1017CONFIG_TMPFS=y 1084CONFIG_TMPFS=y
1085CONFIG_TMPFS_POSIX_ACL=y
1018# CONFIG_HUGETLB_PAGE is not set 1086# CONFIG_HUGETLB_PAGE is not set
1019CONFIG_RAMFS=y 1087CONFIG_RAMFS=y
1020# CONFIG_CONFIGFS_FS is not set 1088CONFIG_CONFIGFS_FS=m
1021 1089
1022# 1090#
1023# Miscellaneous filesystems 1091# Miscellaneous filesystems
1024# 1092#
1025# CONFIG_ADFS_FS is not set 1093# CONFIG_ADFS_FS is not set
1026# CONFIG_AFFS_FS is not set 1094# CONFIG_AFFS_FS is not set
1095# CONFIG_ECRYPT_FS is not set
1027# CONFIG_HFS_FS is not set 1096# CONFIG_HFS_FS is not set
1028# CONFIG_HFSPLUS_FS is not set 1097# CONFIG_HFSPLUS_FS is not set
1029# CONFIG_BEFS_FS is not set 1098# CONFIG_BEFS_FS is not set
@@ -1142,6 +1211,14 @@ CONFIG_NLS_KOI8_U=m
1142CONFIG_NLS_UTF8=m 1211CONFIG_NLS_UTF8=m
1143 1212
1144# 1213#
1214# Distributed Lock Manager
1215#
1216CONFIG_DLM=m
1217CONFIG_DLM_TCP=y
1218# CONFIG_DLM_SCTP is not set
1219# CONFIG_DLM_DEBUG is not set
1220
1221#
1145# Profiling support 1222# Profiling support
1146# 1223#
1147# CONFIG_PROFILING is not set 1224# CONFIG_PROFILING is not set
@@ -1151,11 +1228,13 @@ CONFIG_NLS_UTF8=m
1151# 1228#
1152CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1229CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1153# CONFIG_PRINTK_TIME is not set 1230# CONFIG_PRINTK_TIME is not set
1231CONFIG_ENABLE_MUST_CHECK=y
1154# CONFIG_MAGIC_SYSRQ is not set 1232# CONFIG_MAGIC_SYSRQ is not set
1155# CONFIG_UNUSED_SYMBOLS is not set 1233# CONFIG_UNUSED_SYMBOLS is not set
1234# CONFIG_DEBUG_FS is not set
1235# CONFIG_HEADERS_CHECK is not set
1156# CONFIG_DEBUG_KERNEL is not set 1236# CONFIG_DEBUG_KERNEL is not set
1157CONFIG_LOG_BUF_SHIFT=14 1237CONFIG_LOG_BUF_SHIFT=14
1158# CONFIG_DEBUG_FS is not set
1159CONFIG_CROSSCOMPILE=y 1238CONFIG_CROSSCOMPILE=y
1160CONFIG_CMDLINE="" 1239CONFIG_CMDLINE=""
1161 1240
@@ -1170,18 +1249,30 @@ CONFIG_KEYS_DEBUG_PROC_KEYS=y
1170# Cryptographic options 1249# Cryptographic options
1171# 1250#
1172CONFIG_CRYPTO=y 1251CONFIG_CRYPTO=y
1252CONFIG_CRYPTO_ALGAPI=y
1253CONFIG_CRYPTO_BLKCIPHER=m
1254CONFIG_CRYPTO_HASH=y
1255CONFIG_CRYPTO_MANAGER=y
1173CONFIG_CRYPTO_HMAC=y 1256CONFIG_CRYPTO_HMAC=y
1257CONFIG_CRYPTO_XCBC=m
1174CONFIG_CRYPTO_NULL=m 1258CONFIG_CRYPTO_NULL=m
1175CONFIG_CRYPTO_MD4=m 1259CONFIG_CRYPTO_MD4=m
1176CONFIG_CRYPTO_MD5=m 1260CONFIG_CRYPTO_MD5=y
1177CONFIG_CRYPTO_SHA1=m 1261CONFIG_CRYPTO_SHA1=m
1178CONFIG_CRYPTO_SHA256=m 1262CONFIG_CRYPTO_SHA256=m
1179CONFIG_CRYPTO_SHA512=m 1263CONFIG_CRYPTO_SHA512=m
1180CONFIG_CRYPTO_WP512=m 1264CONFIG_CRYPTO_WP512=m
1181CONFIG_CRYPTO_TGR192=m 1265CONFIG_CRYPTO_TGR192=m
1266CONFIG_CRYPTO_GF128MUL=m
1267CONFIG_CRYPTO_ECB=m
1268CONFIG_CRYPTO_CBC=m
1269CONFIG_CRYPTO_PCBC=m
1270CONFIG_CRYPTO_LRW=m
1182CONFIG_CRYPTO_DES=m 1271CONFIG_CRYPTO_DES=m
1272CONFIG_CRYPTO_FCRYPT=m
1183CONFIG_CRYPTO_BLOWFISH=m 1273CONFIG_CRYPTO_BLOWFISH=m
1184CONFIG_CRYPTO_TWOFISH=m 1274CONFIG_CRYPTO_TWOFISH=m
1275CONFIG_CRYPTO_TWOFISH_COMMON=m
1185CONFIG_CRYPTO_SERPENT=m 1276CONFIG_CRYPTO_SERPENT=m
1186CONFIG_CRYPTO_AES=m 1277CONFIG_CRYPTO_AES=m
1187CONFIG_CRYPTO_CAST5=m 1278CONFIG_CRYPTO_CAST5=m
@@ -1193,6 +1284,7 @@ CONFIG_CRYPTO_ANUBIS=m
1193CONFIG_CRYPTO_DEFLATE=m 1284CONFIG_CRYPTO_DEFLATE=m
1194CONFIG_CRYPTO_MICHAEL_MIC=m 1285CONFIG_CRYPTO_MICHAEL_MIC=m
1195CONFIG_CRYPTO_CRC32C=m 1286CONFIG_CRYPTO_CRC32C=m
1287CONFIG_CRYPTO_CAMELLIA=m
1196# CONFIG_CRYPTO_TEST is not set 1288# CONFIG_CRYPTO_TEST is not set
1197 1289
1198# 1290#
@@ -1202,6 +1294,7 @@ CONFIG_CRYPTO_CRC32C=m
1202# 1294#
1203# Library routines 1295# Library routines
1204# 1296#
1297CONFIG_BITREVERSE=m
1205# CONFIG_CRC_CCITT is not set 1298# CONFIG_CRC_CCITT is not set
1206CONFIG_CRC16=m 1299CONFIG_CRC16=m
1207CONFIG_CRC32=m 1300CONFIG_CRC32=m
@@ -1213,3 +1306,5 @@ CONFIG_TEXTSEARCH_KMP=m
1213CONFIG_TEXTSEARCH_BM=m 1306CONFIG_TEXTSEARCH_BM=m
1214CONFIG_TEXTSEARCH_FSM=m 1307CONFIG_TEXTSEARCH_FSM=m
1215CONFIG_PLIST=y 1308CONFIG_PLIST=y
1309CONFIG_HAS_IOMEM=y
1310CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 1bf2c8448912..8faf1b40cd66 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -53,9 +53,9 @@ obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o
53obj-$(CONFIG_32BIT) += scall32-o32.o 53obj-$(CONFIG_32BIT) += scall32-o32.o
54obj-$(CONFIG_64BIT) += scall64-64.o 54obj-$(CONFIG_64BIT) += scall64-64.o
55obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o 55obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o
56obj-$(CONFIG_MIPS32_COMPAT) += linux32.o signal32.o 56obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o
57obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o 57obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o
58obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o ptrace32.o 58obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o
59 59
60obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.o 60obj-$(CONFIG_KGDB) += gdb-low.o gdb-stub.o
61obj-$(CONFIG_PROC_FS) += proc.o 61obj-$(CONFIG_PROC_FS) += proc.o
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index f59ef271d247..50ed6d58ae71 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -16,6 +16,7 @@
16#include <linux/ptrace.h> 16#include <linux/ptrace.h>
17#include <linux/stddef.h> 17#include <linux/stddef.h>
18 18
19#include <asm/bugs.h>
19#include <asm/cpu.h> 20#include <asm/cpu.h>
20#include <asm/fpu.h> 21#include <asm/fpu.h>
21#include <asm/mipsregs.h> 22#include <asm/mipsregs.h>
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 04e5b38d327d..a669089e4672 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -26,7 +26,6 @@
26#include <linux/completion.h> 26#include <linux/completion.h>
27#include <linux/kallsyms.h> 27#include <linux/kallsyms.h>
28 28
29#include <asm/abi.h>
30#include <asm/bootinfo.h> 29#include <asm/bootinfo.h>
31#include <asm/cpu.h> 30#include <asm/cpu.h>
32#include <asm/dsp.h> 31#include <asm/dsp.h>
@@ -66,38 +65,6 @@ ATTRIB_NORET void cpu_idle(void)
66 } 65 }
67} 66}
68 67
69/*
70 * Native o32 and N64 ABI without DSP ASE
71 */
72struct mips_abi mips_abi = {
73 .do_signal = do_signal,
74#ifdef CONFIG_TRAD_SIGNALS
75 .setup_frame = setup_frame,
76#endif
77 .setup_rt_frame = setup_rt_frame
78};
79
80#ifdef CONFIG_MIPS32_O32
81/*
82 * o32 compatibility on 64-bit kernels, without DSP ASE
83 */
84struct mips_abi mips_abi_32 = {
85 .do_signal = do_signal32,
86 .setup_frame = setup_frame_32,
87 .setup_rt_frame = setup_rt_frame_32
88};
89#endif /* CONFIG_MIPS32_O32 */
90
91#ifdef CONFIG_MIPS32_N32
92/*
93 * N32 on 64-bit kernels, without DSP ASE
94 */
95struct mips_abi mips_abi_n32 = {
96 .do_signal = do_signal,
97 .setup_rt_frame = setup_rt_frame_n32
98};
99#endif /* CONFIG_MIPS32_N32 */
100
101asmlinkage void ret_from_fork(void); 68asmlinkage void ret_from_fork(void);
102 69
103void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp) 70void start_thread(struct pt_regs * regs, unsigned long pc, unsigned long sp)
@@ -246,7 +213,7 @@ int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr)
246/* 213/*
247 * Create a kernel thread 214 * Create a kernel thread
248 */ 215 */
249ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *)) 216static ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
250{ 217{
251 do_exit(fn(arg)); 218 do_exit(fn(arg));
252} 219}
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index b2e9ab1bb101..adbfb95e42d0 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -398,7 +398,7 @@ badframe:
398} 398}
399 399
400#ifdef CONFIG_TRAD_SIGNALS 400#ifdef CONFIG_TRAD_SIGNALS
401int setup_frame(struct k_sigaction * ka, struct pt_regs *regs, 401static int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
402 int signr, sigset_t *set) 402 int signr, sigset_t *set)
403{ 403{
404 struct sigframe __user *frame; 404 struct sigframe __user *frame;
@@ -443,7 +443,7 @@ give_sigsegv:
443} 443}
444#endif 444#endif
445 445
446int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, 446static int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
447 int signr, sigset_t *set, siginfo_t *info) 447 int signr, sigset_t *set, siginfo_t *info)
448{ 448{
449 struct rt_sigframe __user *frame; 449 struct rt_sigframe __user *frame;
@@ -501,6 +501,14 @@ give_sigsegv:
501 return -EFAULT; 501 return -EFAULT;
502} 502}
503 503
504struct mips_abi mips_abi = {
505#ifdef CONFIG_TRAD_SIGNALS
506 .setup_frame = setup_frame,
507#endif
508 .setup_rt_frame = setup_rt_frame,
509 .restart = __NR_restart_syscall
510};
511
504static int handle_signal(unsigned long sig, siginfo_t *info, 512static int handle_signal(unsigned long sig, siginfo_t *info,
505 struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs) 513 struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
506{ 514{
@@ -539,7 +547,7 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
539 return ret; 547 return ret;
540} 548}
541 549
542void do_signal(struct pt_regs *regs) 550static void do_signal(struct pt_regs *regs)
543{ 551{
544 struct k_sigaction ka; 552 struct k_sigaction ka;
545 sigset_t *oldset; 553 sigset_t *oldset;
@@ -589,7 +597,7 @@ void do_signal(struct pt_regs *regs)
589 regs->cp0_epc -= 8; 597 regs->cp0_epc -= 8;
590 } 598 }
591 if (regs->regs[2] == ERESTART_RESTARTBLOCK) { 599 if (regs->regs[2] == ERESTART_RESTARTBLOCK) {
592 regs->regs[2] = __NR_restart_syscall; 600 regs->regs[2] = current->thread.abi->restart;
593 regs->regs[7] = regs->regs[26]; 601 regs->regs[7] = regs->regs[26];
594 regs->cp0_epc -= 4; 602 regs->cp0_epc -= 4;
595 } 603 }
@@ -615,5 +623,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused,
615{ 623{
616 /* deal with pending signal delivery */ 624 /* deal with pending signal delivery */
617 if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) 625 if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
618 current->thread.abi->do_signal(regs); 626 do_signal(regs);
619} 627}
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index c28cb21514c8..02062fc59f77 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -104,7 +104,7 @@ typedef struct compat_siginfo {
104 */ 104 */
105#define __NR_O32_sigreturn 4119 105#define __NR_O32_sigreturn 4119
106#define __NR_O32_rt_sigreturn 4193 106#define __NR_O32_rt_sigreturn 4193
107#define __NR_O32_restart_syscall 4253 107#define __NR_O32_restart_syscall 4253
108 108
109/* 32-bit compatibility types */ 109/* 32-bit compatibility types */
110 110
@@ -150,7 +150,7 @@ struct sigframe32 {
150 u32 sf_ass[4]; /* argument save space for o32 */ 150 u32 sf_ass[4]; /* argument save space for o32 */
151 u32 sf_code[2]; /* signal trampoline */ 151 u32 sf_code[2]; /* signal trampoline */
152 struct sigcontext32 sf_sc; 152 struct sigcontext32 sf_sc;
153 sigset_t sf_mask; 153 compat_sigset_t sf_mask;
154}; 154};
155 155
156struct rt_sigframe32 { 156struct rt_sigframe32 {
@@ -166,7 +166,7 @@ struct sigframe32 {
166 u32 sf_ass[4]; /* argument save space for o32 */ 166 u32 sf_ass[4]; /* argument save space for o32 */
167 u32 sf_pad[2]; 167 u32 sf_pad[2];
168 struct sigcontext32 sf_sc; /* hw context */ 168 struct sigcontext32 sf_sc; /* hw context */
169 sigset_t sf_mask; 169 compat_sigset_t sf_mask;
170 u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */ 170 u32 sf_code[8] ____cacheline_aligned; /* signal trampoline */
171}; 171};
172 172
@@ -598,7 +598,7 @@ badframe:
598 force_sig(SIGSEGV, current); 598 force_sig(SIGSEGV, current);
599} 599}
600 600
601int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, 601static int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
602 int signr, sigset_t *set) 602 int signr, sigset_t *set)
603{ 603{
604 struct sigframe32 __user *frame; 604 struct sigframe32 __user *frame;
@@ -644,7 +644,7 @@ give_sigsegv:
644 return -EFAULT; 644 return -EFAULT;
645} 645}
646 646
647int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, 647static int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
648 int signr, sigset_t *set, siginfo_t *info) 648 int signr, sigset_t *set, siginfo_t *info)
649{ 649{
650 struct rt_sigframe32 __user *frame; 650 struct rt_sigframe32 __user *frame;
@@ -704,110 +704,14 @@ give_sigsegv:
704 return -EFAULT; 704 return -EFAULT;
705} 705}
706 706
707static inline int handle_signal(unsigned long sig, siginfo_t *info, 707/*
708 struct k_sigaction *ka, sigset_t *oldset, struct pt_regs * regs) 708 * o32 compatibility on 64-bit kernels, without DSP ASE
709{ 709 */
710 int ret; 710struct mips_abi mips_abi_32 = {
711 711 .setup_frame = setup_frame_32,
712 switch (regs->regs[0]) { 712 .setup_rt_frame = setup_rt_frame_32,
713 case ERESTART_RESTARTBLOCK: 713 .restart = __NR_O32_restart_syscall
714 case ERESTARTNOHAND: 714};
715 regs->regs[2] = EINTR;
716 break;
717 case ERESTARTSYS:
718 if (!(ka->sa.sa_flags & SA_RESTART)) {
719 regs->regs[2] = EINTR;
720 break;
721 }
722 /* fallthrough */
723 case ERESTARTNOINTR: /* Userland will reload $v0. */
724 regs->regs[7] = regs->regs[26];
725 regs->cp0_epc -= 8;
726 }
727
728 regs->regs[0] = 0; /* Don't deal with this again. */
729
730 if (ka->sa.sa_flags & SA_SIGINFO)
731 ret = current->thread.abi->setup_rt_frame(ka, regs, sig, oldset, info);
732 else
733 ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);
734
735 spin_lock_irq(&current->sighand->siglock);
736 sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
737 if (!(ka->sa.sa_flags & SA_NODEFER))
738 sigaddset(&current->blocked,sig);
739 recalc_sigpending();
740 spin_unlock_irq(&current->sighand->siglock);
741
742 return ret;
743}
744
745void do_signal32(struct pt_regs *regs)
746{
747 struct k_sigaction ka;
748 sigset_t *oldset;
749 siginfo_t info;
750 int signr;
751
752 /*
753 * We want the common case to go fast, which is why we may in certain
754 * cases get here from kernel mode. Just return without doing anything
755 * if so.
756 */
757 if (!user_mode(regs))
758 return;
759
760 if (test_thread_flag(TIF_RESTORE_SIGMASK))
761 oldset = &current->saved_sigmask;
762 else
763 oldset = &current->blocked;
764
765 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
766 if (signr > 0) {
767 /* Whee! Actually deliver the signal. */
768 if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
769 /*
770 * A signal was successfully delivered; the saved
771 * sigmask will have been stored in the signal frame,
772 * and will be restored by sigreturn, so we can simply
773 * clear the TIF_RESTORE_SIGMASK flag.
774 */
775 if (test_thread_flag(TIF_RESTORE_SIGMASK))
776 clear_thread_flag(TIF_RESTORE_SIGMASK);
777 }
778
779 return;
780 }
781
782 /*
783 * Who's code doesn't conform to the restartable syscall convention
784 * dies here!!! The li instruction, a single machine instruction,
785 * must directly be followed by the syscall instruction.
786 */
787 if (regs->regs[0]) {
788 if (regs->regs[2] == ERESTARTNOHAND ||
789 regs->regs[2] == ERESTARTSYS ||
790 regs->regs[2] == ERESTARTNOINTR) {
791 regs->regs[7] = regs->regs[26];
792 regs->cp0_epc -= 8;
793 }
794 if (regs->regs[2] == ERESTART_RESTARTBLOCK) {
795 regs->regs[2] = __NR_O32_restart_syscall;
796 regs->regs[7] = regs->regs[26];
797 regs->cp0_epc -= 4;
798 }
799 regs->regs[0] = 0; /* Don't deal with this again. */
800 }
801
802 /*
803 * If there's no signal to deliver, we just put the saved sigmask
804 * back
805 */
806 if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
807 clear_thread_flag(TIF_RESTORE_SIGMASK);
808 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
809 }
810}
811 715
812asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, 716asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
813 struct sigaction32 __user *oact, 717 struct sigaction32 __user *oact,
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 7ca2a078841f..ecf1f7ecaad9 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -29,6 +29,7 @@
29#include <linux/compat.h> 29#include <linux/compat.h>
30#include <linux/bitops.h> 30#include <linux/bitops.h>
31 31
32#include <asm/abi.h>
32#include <asm/asm.h> 33#include <asm/asm.h>
33#include <asm/cacheflush.h> 34#include <asm/cacheflush.h>
34#include <asm/compat-signal.h> 35#include <asm/compat-signal.h>
@@ -169,7 +170,7 @@ badframe:
169 force_sig(SIGSEGV, current); 170 force_sig(SIGSEGV, current);
170} 171}
171 172
172int setup_rt_frame_n32(struct k_sigaction * ka, 173static int setup_rt_frame_n32(struct k_sigaction * ka,
173 struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info) 174 struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info)
174{ 175{
175 struct rt_sigframe_n32 __user *frame; 176 struct rt_sigframe_n32 __user *frame;
@@ -228,3 +229,8 @@ give_sigsegv:
228 force_sigsegv(signr, current); 229 force_sigsegv(signr, current);
229 return -EFAULT; 230 return -EFAULT;
230} 231}
232
233struct mips_abi mips_abi_n32 = {
234 .setup_rt_frame = setup_rt_frame_n32,
235 .restart = __NR_N32_restart_syscall
236};
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 2a932cada244..f663c63d5dd3 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -340,13 +340,9 @@ NORET_TYPE void ATTRIB_NORET die(const char * str, struct pt_regs * regs)
340extern const struct exception_table_entry __start___dbe_table[]; 340extern const struct exception_table_entry __start___dbe_table[];
341extern const struct exception_table_entry __stop___dbe_table[]; 341extern const struct exception_table_entry __stop___dbe_table[];
342 342
343void __declare_dbe_table(void) 343__asm__(
344{ 344" .section __dbe_table, \"a\"\n"
345 __asm__ __volatile__( 345" .previous \n");
346 ".section\t__dbe_table,\"a\"\n\t"
347 ".previous"
348 );
349}
350 346
351/* Given an address, look for it in the exception tables. */ 347/* Given an address, look for it in the exception tables. */
352static const struct exception_table_entry *search_dbe_tables(unsigned long addr) 348static const struct exception_table_entry *search_dbe_tables(unsigned long addr)
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 5ad501b30b43..9e5d985936b3 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -5,7 +5,8 @@
5lib-y += csum_partial.o memcpy.o memset.o promlib.o \ 5lib-y += csum_partial.o memcpy.o memset.o promlib.o \
6 strlen_user.o strncpy_user.o strnlen_user.o uncached.o 6 strlen_user.o strncpy_user.o strnlen_user.o uncached.o
7 7
8obj-y += iomap.o 8obj-y += iomap.o
9obj-$(CONFIG_PCI) += iomap-pci.o
9 10
10# libgcc-style stuff needed in the kernel 11# libgcc-style stuff needed in the kernel
11lib-y += ashldi3.o ashrdi3.o lshrdi3.o 12lib-y += ashldi3.o ashrdi3.o lshrdi3.o
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
new file mode 100644
index 000000000000..c11b2494bb6e
--- /dev/null
+++ b/arch/mips/lib/iomap-pci.c
@@ -0,0 +1,74 @@
1/*
2 * Implement the default iomap interfaces
3 *
4 * (C) Copyright 2004 Linus Torvalds
5 * (C) Copyright 2006 Ralf Baechle <ralf@linux-mips.org>
6 * (C) Copyright 2007 MIPS Technologies, Inc.
7 * written by Ralf Baechle <ralf@linux-mips.org>
8 */
9#include <linux/pci.h>
10#include <linux/module.h>
11#include <asm/io.h>
12
13static void __iomem *ioport_map_pci(struct pci_dev *dev,
14 unsigned long port, unsigned int nr)
15{
16 struct pci_controller *ctrl = dev->bus->sysdata;
17 unsigned long base = ctrl->io_map_base;
18
19 /* This will eventually become a BUG_ON but for now be gentle */
20 if (unlikely(!ctrl->io_map_base)) {
21 struct pci_bus *bus = dev->bus;
22 char name[8];
23
24 while (bus->parent)
25 bus = bus->parent;
26
27 ctrl->io_map_base = base = mips_io_port_base;
28
29 sprintf(name, "%04x:%02x", pci_domain_nr(bus), bus->number);
30 printk(KERN_WARNING "io_map_base of root PCI bus %s unset. "
31 "Trying to continue but you better\nfix this issue or "
32 "report it to linux-mips@linux-mips.org or your "
33 "vendor.\n", name);
34#ifdef CONFIG_PCI_DOMAINS
35 panic("To avoid data corruption io_map_base MUST be set with "
36 "multiple PCI domains.");
37#endif
38 }
39
40 return (void __iomem *) (ctrl->io_map_base + port);
41}
42
43/*
44 * Create a virtual mapping cookie for a PCI BAR (memory or IO)
45 */
46void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
47{
48 unsigned long start = pci_resource_start(dev, bar);
49 unsigned long len = pci_resource_len(dev, bar);
50 unsigned long flags = pci_resource_flags(dev, bar);
51
52 if (!len || !start)
53 return NULL;
54 if (maxlen && len > maxlen)
55 len = maxlen;
56 if (flags & IORESOURCE_IO)
57 return ioport_map_pci(dev, start, len);
58 if (flags & IORESOURCE_MEM) {
59 if (flags & IORESOURCE_CACHEABLE)
60 return ioremap(start, len);
61 return ioremap_nocache(start, len);
62 }
63 /* What? */
64 return NULL;
65}
66
67EXPORT_SYMBOL(pci_iomap);
68
69void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
70{
71 iounmap(addr);
72}
73
74EXPORT_SYMBOL(pci_iounmap);
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c
index f4ac5bbcd81f..d51d5cb0a4a9 100644
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
@@ -1,78 +1,227 @@
1/* 1/*
2 * iomap.c, Memory Mapped I/O routines for MIPS architecture. 2 * Implement the default iomap interfaces
3 * 3 *
4 * This code is based on lib/iomap.c, by Linus Torvalds. 4 * (C) Copyright 2004 Linus Torvalds
5 * 5 * (C) Copyright 2006 Ralf Baechle <ralf@linux-mips.org>
6 * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> 6 * (C) Copyright 2007 MIPS Technologies, Inc.
7 * 7 * written by Ralf Baechle <ralf@linux-mips.org>
8 * This program is free software; you can redistribute it and/or modify 8 */
9 * it under the terms of the GNU General Public License as published by 9#include <linux/pci.h>
10 * the Free Software Foundation; either version 2 of the License, or 10#include <linux/module.h>
11 * (at your option) any later version. 11#include <asm/io.h>
12
13/*
14 * Read/write from/to an (offsettable) iomem cookie. It might be a PIO
15 * access or a MMIO access, these functions don't care. The info is
16 * encoded in the hardware mapping set up by the mapping functions
17 * (or the cookie itself, depending on implementation and hw).
12 * 18 *
13 * This program is distributed in the hope that it will be useful, 19 * The generic routines don't assume any hardware mappings, and just
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 20 * encode the PIO/MMIO as part of the cookie. They coldly assume that
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 21 * the MMIO IO mappings are not in the low address range.
16 * GNU General Public License for more details.
17 * 22 *
18 * You should have received a copy of the GNU General Public License 23 * Architectures for which this is not true can't use this generic
19 * along with this program; if not, write to the Free Software 24 * implementation and should do their own copy.
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 */ 25 */
22#include <linux/ioport.h>
23#include <linux/module.h>
24#include <linux/pci.h>
25 26
26#include <asm/io.h> 27#define PIO_MASK 0x0ffffUL
27 28
28void __iomem *ioport_map(unsigned long port, unsigned int nr) 29unsigned int ioread8(void __iomem *addr)
29{ 30{
30 unsigned long end; 31 return readb(addr);
32}
31 33
32 end = port + nr - 1UL; 34EXPORT_SYMBOL(ioread8);
33 if (ioport_resource.start > port ||
34 ioport_resource.end < end || port > end)
35 return NULL;
36 35
37 return (void __iomem *)(mips_io_port_base + port); 36unsigned int ioread16(void __iomem *addr)
37{
38 return readw(addr);
38} 39}
39 40
40void ioport_unmap(void __iomem *addr) 41EXPORT_SYMBOL(ioread16);
42
43unsigned int ioread16be(void __iomem *addr)
41{ 44{
45 return be16_to_cpu(__raw_readw(addr));
42} 46}
43EXPORT_SYMBOL(ioport_map);
44EXPORT_SYMBOL(ioport_unmap);
45 47
46void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) 48EXPORT_SYMBOL(ioread16be);
49
50unsigned int ioread32(void __iomem *addr)
47{ 51{
48 unsigned long start, len, flags; 52 return readl(addr);
53}
49 54
50 if (dev == NULL) 55EXPORT_SYMBOL(ioread32);
51 return NULL;
52 56
53 start = pci_resource_start(dev, bar); 57unsigned int ioread32be(void __iomem *addr)
54 len = pci_resource_len(dev, bar); 58{
55 if (!start || !len) 59 return be32_to_cpu(__raw_readl(addr));
56 return NULL; 60}
57 61
58 if (maxlen != 0 && len > maxlen) 62EXPORT_SYMBOL(ioread32be);
59 len = maxlen; 63
64void iowrite8(u8 val, void __iomem *addr)
65{
66 writeb(val, addr);
67}
60 68
61 flags = pci_resource_flags(dev, bar); 69EXPORT_SYMBOL(iowrite8);
62 if (flags & IORESOURCE_IO) 70
63 return ioport_map(start, len); 71void iowrite16(u16 val, void __iomem *addr)
64 if (flags & IORESOURCE_MEM) { 72{
65 if (flags & IORESOURCE_CACHEABLE) 73 writew(val, addr);
66 return ioremap_cachable(start, len); 74}
67 return ioremap_nocache(start, len); 75
76EXPORT_SYMBOL(iowrite16);
77
78void iowrite16be(u16 val, void __iomem *addr)
79{
80 __raw_writew(cpu_to_be16(val), addr);
81}
82
83EXPORT_SYMBOL(iowrite16be);
84
85void iowrite32(u32 val, void __iomem *addr)
86{
87 writel(val, addr);
88}
89
90EXPORT_SYMBOL(iowrite32);
91
92void iowrite32be(u32 val, void __iomem *addr)
93{
94 __raw_writel(cpu_to_be32(val), addr);
95}
96
97EXPORT_SYMBOL(iowrite32be);
98
99/*
100 * These are the "repeat MMIO read/write" functions.
101 * Note the "__raw" accesses, since we don't want to
102 * convert to CPU byte order. We write in "IO byte
103 * order" (we also don't have IO barriers).
104 */
105static inline void mmio_insb(void __iomem *addr, u8 *dst, int count)
106{
107 while (--count >= 0) {
108 u8 data = __raw_readb(addr);
109 *dst = data;
110 dst++;
68 } 111 }
112}
69 113
70 return NULL; 114static inline void mmio_insw(void __iomem *addr, u16 *dst, int count)
115{
116 while (--count >= 0) {
117 u16 data = __raw_readw(addr);
118 *dst = data;
119 dst++;
120 }
71} 121}
72 122
73void pci_iounmap(struct pci_dev *dev, void __iomem *addr) 123static inline void mmio_insl(void __iomem *addr, u32 *dst, int count)
74{ 124{
75 iounmap(addr); 125 while (--count >= 0) {
126 u32 data = __raw_readl(addr);
127 *dst = data;
128 dst++;
129 }
76} 130}
77EXPORT_SYMBOL(pci_iomap); 131
78EXPORT_SYMBOL(pci_iounmap); 132static inline void mmio_outsb(void __iomem *addr, const u8 *src, int count)
133{
134 while (--count >= 0) {
135 __raw_writeb(*src, addr);
136 src++;
137 }
138}
139
140static inline void mmio_outsw(void __iomem *addr, const u16 *src, int count)
141{
142 while (--count >= 0) {
143 __raw_writew(*src, addr);
144 src++;
145 }
146}
147
148static inline void mmio_outsl(void __iomem *addr, const u32 *src, int count)
149{
150 while (--count >= 0) {
151 __raw_writel(*src, addr);
152 src++;
153 }
154}
155
156void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
157{
158 mmio_insb(addr, dst, count);
159}
160
161EXPORT_SYMBOL(ioread8_rep);
162
163void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
164{
165 mmio_insw(addr, dst, count);
166}
167
168EXPORT_SYMBOL(ioread16_rep);
169
170void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
171{
172 mmio_insl(addr, dst, count);
173}
174
175EXPORT_SYMBOL(ioread32_rep);
176
177void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
178{
179 mmio_outsb(addr, src, count);
180}
181
182EXPORT_SYMBOL(iowrite8_rep);
183
184void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
185{
186 mmio_outsw(addr, src, count);
187}
188
189EXPORT_SYMBOL(iowrite16_rep);
190
191void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
192{
193 mmio_outsl(addr, src, count);
194}
195
196EXPORT_SYMBOL(iowrite32_rep);
197
198/*
199 * Create a virtual mapping cookie for an IO port range
200 *
201 * This uses the same mapping are as the in/out family which has to be setup
202 * by the platform initialization code.
203 *
204 * Just to make matters somewhat more interesting on MIPS systems with
205 * multiple host bridge each will have it's own ioport address space.
206 */
207static void __iomem *ioport_map_legacy(unsigned long port, unsigned int nr)
208{
209 return (void __iomem *) (mips_io_port_base + port);
210}
211
212void __iomem *ioport_map(unsigned long port, unsigned int nr)
213{
214 if (port > PIO_MASK)
215 return NULL;
216
217 return ioport_map_legacy(port, nr);
218}
219
220EXPORT_SYMBOL(ioport_map);
221
222void ioport_unmap(void __iomem *addr)
223{
224 /* Nothing to do */
225}
226
227EXPORT_SYMBOL(ioport_unmap);
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 125a4a85ec05..13a420844436 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -314,8 +314,6 @@ void __init fixrange_init(unsigned long start, unsigned long end,
314} 314}
315 315
316#ifndef CONFIG_NEED_MULTIPLE_NODES 316#ifndef CONFIG_NEED_MULTIPLE_NODES
317extern void pagetable_init(void);
318
319static int __init page_is_ram(unsigned long pagenr) 317static int __init page_is_ram(unsigned long pagenr)
320{ 318{
321 int i; 319 int i;
diff --git a/arch/mips/mm/pgtable-32.c b/arch/mips/mm/pgtable-32.c
index 4a61e624b0ec..575e4019227b 100644
--- a/arch/mips/mm/pgtable-32.c
+++ b/arch/mips/mm/pgtable-32.c
@@ -11,6 +11,7 @@
11#include <linux/highmem.h> 11#include <linux/highmem.h>
12#include <asm/fixmap.h> 12#include <asm/fixmap.h>
13#include <asm/pgtable.h> 13#include <asm/pgtable.h>
14#include <asm/pgalloc.h>
14 15
15void pgd_init(unsigned long page) 16void pgd_init(unsigned long page)
16{ 17{
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c
index c46eb651bf09..e4b565aeb008 100644
--- a/arch/mips/mm/pgtable-64.c
+++ b/arch/mips/mm/pgtable-64.c
@@ -10,6 +10,7 @@
10#include <linux/mm.h> 10#include <linux/mm.h>
11#include <asm/fixmap.h> 11#include <asm/fixmap.h>
12#include <asm/pgtable.h> 12#include <asm/pgtable.h>
13#include <asm/pgalloc.h>
13 14
14void pgd_init(unsigned long page) 15void pgd_init(unsigned long page)
15{ 16{
diff --git a/arch/mips/pci/fixup-sni.c b/arch/mips/pci/fixup-sni.c
index a176f2ca8656..0c9a4732d455 100644
--- a/arch/mips/pci/fixup-sni.c
+++ b/arch/mips/pci/fixup-sni.c
@@ -15,7 +15,7 @@
15#include <asm/sni.h> 15#include <asm/sni.h>
16 16
17/* 17/*
18 * Shortcuts ... 18 * PCIMT Shortcuts ...
19 */ 19 */
20#define SCSI PCIMT_IRQ_SCSI 20#define SCSI PCIMT_IRQ_SCSI
21#define ETH PCIMT_IRQ_ETHERNET 21#define ETH PCIMT_IRQ_ETHERNET
@@ -67,6 +67,50 @@ static char irq_tab_rm300d[8][5] __initdata = {
67 { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */ 67 { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */
68}; 68};
69 69
70static char irq_tab_rm300e[5][5] __initdata = {
71 /* INTA INTB INTC INTD */
72 { 0, 0, 0, 0, 0 }, /* HOST bridge */
73 { SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */
74 { 0, INTC, INTD, INTA, INTB }, /* Bridge/i960 */
75 { 0, INTD, INTA, INTB, INTC }, /* Slot 1 */
76 { 0, INTA, INTB, INTC, INTD }, /* Slot 2 */
77};
78#undef SCSI
79#undef ETH
80#undef INTA
81#undef INTB
82#undef INTC
83#undef INTD
84
85
86/*
87 * PCIT Shortcuts ...
88 */
89#define SCSI0 PCIT_IRQ_SCSI0
90#define SCSI1 PCIT_IRQ_SCSI1
91#define ETH PCIT_IRQ_ETHERNET
92#define INTA PCIT_IRQ_INTA
93#define INTB PCIT_IRQ_INTB
94#define INTC PCIT_IRQ_INTC
95#define INTD PCIT_IRQ_INTD
96
97static char irq_tab_pcit[13][5] __initdata = {
98 /* INTA INTB INTC INTD */
99 { 0, 0, 0, 0, 0 }, /* HOST bridge */
100 { SCSI0, SCSI0, SCSI0, SCSI0, SCSI0 }, /* SCSI */
101 { SCSI1, SCSI1, SCSI1, SCSI1, SCSI1 }, /* SCSI */
102 { ETH, ETH, ETH, ETH, ETH }, /* Ethernet */
103 { 0, INTA, INTB, INTC, INTD }, /* PCI-PCI bridge */
104 { 0, 0, 0, 0, 0 }, /* Unused */
105 { 0, 0, 0, 0, 0 }, /* Unused */
106 { 0, 0, 0, 0, 0 }, /* Unused */
107 { 0, INTA, INTB, INTC, INTD }, /* Slot 1 */
108 { 0, INTB, INTC, INTD, INTA }, /* Slot 2 */
109 { 0, INTC, INTD, INTA, INTB }, /* Slot 3 */
110 { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */
111 { 0, INTA, INTB, INTC, INTD }, /* Slot 5 */
112};
113
70static inline int is_rm300_revd(void) 114static inline int is_rm300_revd(void)
71{ 115{
72 unsigned char csmsr = *(volatile unsigned char *)PCIMT_CSMSR; 116 unsigned char csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
@@ -76,10 +120,24 @@ static inline int is_rm300_revd(void)
76 120
77int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 121int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
78{ 122{
79 if (is_rm300_revd()) 123 switch (sni_brd_type) {
80 return irq_tab_rm300d[slot][pin]; 124 case SNI_BRD_PCI_TOWER:
125 case SNI_BRD_PCI_TOWER_CPLUS:
126 return irq_tab_pcit[slot][pin];
127
128 case SNI_BRD_PCI_MTOWER:
129 if (is_rm300_revd())
130 return irq_tab_rm300d[slot][pin];
131 /* fall through */
81 132
82 return irq_tab_rm200[slot][pin]; 133 case SNI_BRD_PCI_DESKTOP:
134 return irq_tab_rm200[slot][pin];
135
136 case SNI_BRD_PCI_MTOWER_CPLUS:
137 return irq_tab_rm300e[slot][pin];
138 }
139
140 return 0;
83} 141}
84 142
85/* Do platform specific device initialization at pci_enable_device() time */ 143/* Do platform specific device initialization at pci_enable_device() time */
diff --git a/arch/mips/pci/ops-sni.c b/arch/mips/pci/ops-sni.c
index 2b0ccd6d9dcd..fa2d2c60f797 100644
--- a/arch/mips/pci/ops-sni.c
+++ b/arch/mips/pci/ops-sni.c
@@ -83,7 +83,82 @@ static int pcimt_write(struct pci_bus *bus, unsigned int devfn, int reg,
83 return 0; 83 return 0;
84} 84}
85 85
86struct pci_ops sni_pci_ops = { 86struct pci_ops sni_pcimt_ops = {
87 .read = pcimt_read, 87 .read = pcimt_read,
88 .write = pcimt_write, 88 .write = pcimt_write,
89}; 89};
90
91static int pcit_set_config_address(unsigned int busno, unsigned int devfn, int reg)
92{
93 if ((devfn > 255) || (reg > 255) || (busno > 255))
94 return PCIBIOS_BAD_REGISTER_NUMBER;
95
96 outl ((1 << 31) | ((busno & 0xff) << 16) | ((devfn & 0xff) << 8) | (reg & 0xfc), 0xcf8);
97 return PCIBIOS_SUCCESSFUL;
98}
99
100static int pcit_read(struct pci_bus *bus, unsigned int devfn, int reg,
101 int size, u32 * val)
102{
103 int res;
104
105 /*
106 * on bus 0 we need to check, whether there is a device answering
107 * for the devfn by doing a config write and checking the result. If
108 * we don't do it, we will get a data bus error
109 */
110 if (bus->number == 0) {
111 pcit_set_config_address (0, 0, 0x68);
112 outl (inl (0xcfc) | 0xc0000000, 0xcfc);
113 if ((res = pcit_set_config_address(0, devfn, 0)))
114 return res;
115 outl (0xffffffff, 0xcfc);
116 pcit_set_config_address (0, 0, 0x68);
117 if (inl(0xcfc) & 0x100000)
118 return PCIBIOS_DEVICE_NOT_FOUND;
119 }
120 if ((res = pcit_set_config_address(bus->number, devfn, reg)))
121 return res;
122
123 switch (size) {
124 case 1:
125 *val = inb(PCIMT_CONFIG_DATA + (reg & 3));
126 break;
127 case 2:
128 *val = inw(PCIMT_CONFIG_DATA + (reg & 2));
129 break;
130 case 4:
131 *val = inl(PCIMT_CONFIG_DATA);
132 break;
133 }
134 return 0;
135}
136
137static int pcit_write(struct pci_bus *bus, unsigned int devfn, int reg,
138 int size, u32 val)
139{
140 int res;
141
142 if ((res = pcit_set_config_address(bus->number, devfn, reg)))
143 return res;
144
145 switch (size) {
146 case 1:
147 outb (val, PCIMT_CONFIG_DATA + (reg & 3));
148 break;
149 case 2:
150 outw (val, PCIMT_CONFIG_DATA + (reg & 2));
151 break;
152 case 4:
153 outl (val, PCIMT_CONFIG_DATA);
154 break;
155 }
156
157 return 0;
158}
159
160
161struct pci_ops sni_pcit_ops = {
162 .read = pcit_read,
163 .write = pcit_write,
164};
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 5ace368657ad..697a7e48cb8d 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -79,6 +79,14 @@ void __init register_pci_controller(struct pci_controller *hose)
79{ 79{
80 *hose_tail = hose; 80 *hose_tail = hose;
81 hose_tail = &hose->next; 81 hose_tail = &hose->next;
82
83 /*
84 * Do not panic here but later - this might hapen before console init.
85 */
86 if (!hose->io_map_base) {
87 printk(KERN_WARNING
88 "registering PCI controller with io_map_base unset\n");
89 }
82} 90}
83 91
84/* Most MIPS systems have straight-forward swizzling needs. */ 92/* Most MIPS systems have straight-forward swizzling needs. */
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 0e3d535e9f43..fe8a1066aec1 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -21,6 +21,7 @@
21#include <linux/pfn.h> 21#include <linux/pfn.h>
22#include <linux/highmem.h> 22#include <linux/highmem.h>
23#include <asm/page.h> 23#include <asm/page.h>
24#include <asm/pgalloc.h>
24#include <asm/sections.h> 25#include <asm/sections.h>
25 26
26#include <asm/sn/arch.h> 27#include <asm/sn/arch.h>
@@ -503,7 +504,6 @@ void __init prom_free_prom_memory(void)
503 /* We got nothing to free here ... */ 504 /* We got nothing to free here ... */
504} 505}
505 506
506extern void pagetable_init(void);
507extern unsigned long setup_zero_pages(void); 507extern unsigned long setup_zero_pages(void);
508 508
509void __init paging_init(void) 509void __init paging_init(void)
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 9ce513629b14..8c3c78c63ccd 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -190,7 +190,7 @@ static struct irq_chip rt_irq_type = {
190}; 190};
191 191
192static struct irqaction rt_irqaction = { 192static struct irqaction rt_irqaction = {
193 .handler = ip27_rt_timer_interrupt, 193 .handler = (irq_handler_t) ip27_rt_timer_interrupt,
194 .flags = IRQF_DISABLED, 194 .flags = IRQF_DISABLED,
195 .mask = CPU_MASK_NONE, 195 .mask = CPU_MASK_NONE,
196 .name = "timer" 196 .name = "timer"
diff --git a/arch/mips/sni/Makefile b/arch/mips/sni/Makefile
index a5eb0adb87c7..e30809a92151 100644
--- a/arch/mips/sni/Makefile
+++ b/arch/mips/sni/Makefile
@@ -2,7 +2,7 @@
2# Makefile for the SNI specific part of the kernel 2# Makefile for the SNI specific part of the kernel
3# 3#
4 4
5obj-y += irq.o pcimt_scache.o reset.o setup.o 5obj-y += irq.o reset.o setup.o ds1216.o a20r.o rm200.o pcimt.o pcit.o time.o
6obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o 6obj-$(CONFIG_CPU_BIG_ENDIAN) += sniprom.o
7 7
8EXTRA_AFLAGS := $(CFLAGS) 8EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
new file mode 100644
index 000000000000..31ab80f1befa
--- /dev/null
+++ b/arch/mips/sni/a20r.c
@@ -0,0 +1,227 @@
1/*
2 * A20R specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */
10
11#include <linux/init.h>
12#include <linux/interrupt.h>
13#include <linux/platform_device.h>
14#include <linux/serial_8250.h>
15
16#include <asm/sni.h>
17#include <asm/time.h>
18#include <asm/ds1216.h>
19
20#define PORT(_base,_irq) \
21 { \
22 .iobase = _base, \
23 .irq = _irq, \
24 .uartclk = 1843200, \
25 .iotype = UPIO_PORT, \
26 .flags = UPF_BOOT_AUTOCONF, \
27 }
28
29static struct plat_serial8250_port a20r_data[] = {
30 PORT(0x3f8, 4),
31 PORT(0x2f8, 3),
32 { },
33};
34
35static struct platform_device a20r_serial8250_device = {
36 .name = "serial8250",
37 .id = PLAT8250_DEV_PLATFORM,
38 .dev = {
39 .platform_data = a20r_data,
40 },
41};
42
43static struct resource snirm_82596_rsrc[] = {
44 {
45 .start = 0xb8000000,
46 .end = 0xb8000004,
47 .flags = IORESOURCE_MEM
48 },
49 {
50 .start = 0xb8010000,
51 .end = 0xb8010004,
52 .flags = IORESOURCE_MEM
53 },
54 {
55 .start = 0xbff00000,
56 .end = 0xbff00020,
57 .flags = IORESOURCE_MEM
58 },
59 {
60 .start = 22,
61 .end = 22,
62 .flags = IORESOURCE_IRQ
63 },
64 {
65 .flags = 0x01 /* 16bit mpu port access */
66 }
67};
68
69static struct platform_device snirm_82596_pdev = {
70 .name = "snirm_82596",
71 .num_resources = ARRAY_SIZE(snirm_82596_rsrc),
72 .resource = snirm_82596_rsrc
73};
74
75static struct resource snirm_53c710_rsrc[] = {
76 {
77 .start = 0xb9000000,
78 .end = 0xb90fffff,
79 .flags = IORESOURCE_MEM
80 },
81 {
82 .start = 19,
83 .end = 19,
84 .flags = IORESOURCE_IRQ
85 }
86};
87
88static struct platform_device snirm_53c710_pdev = {
89 .name = "snirm_53c710",
90 .num_resources = ARRAY_SIZE(snirm_53c710_rsrc),
91 .resource = snirm_53c710_rsrc
92};
93
94static struct resource sc26xx_rsrc[] = {
95 {
96 .start = 0xbc070000,
97 .end = 0xbc0700ff,
98 .flags = IORESOURCE_MEM
99 },
100 {
101 .start = 20,
102 .end = 20,
103 .flags = IORESOURCE_IRQ
104 }
105};
106
107static struct platform_device sc26xx_pdev = {
108 .name = "SC26xx",
109 .num_resources = ARRAY_SIZE(sc26xx_rsrc),
110 .resource = sc26xx_rsrc
111};
112
113static u32 a20r_ack_hwint(void)
114{
115 u32 status = read_c0_status();
116
117 write_c0_status (status | 0x00010000);
118 asm volatile(
119 " .set push \n"
120 " .set noat \n"
121 " .set noreorder \n"
122 " lw $1, 0(%0) \n"
123 " sb $0, 0(%1) \n"
124 " sync \n"
125 " lb %1, 0(%1) \n"
126 " b 1f \n"
127 " ori %1, $1, 2 \n"
128 " .align 8 \n"
129 "1: \n"
130 " nop \n"
131 " sw %1, 0(%0) \n"
132 " sync \n"
133 " li %1, 0x20 \n"
134 "2: \n"
135 " nop \n"
136 " bnez %1,2b \n"
137 " addiu %1, -1 \n"
138 " sw $1, 0(%0) \n"
139 " sync \n"
140 ".set pop \n"
141 :
142 : "Jr" (PCIMT_UCONF), "Jr" (0xbc000000));
143 write_c0_status(status);
144
145 return status;
146}
147
148static inline void unmask_a20r_irq(unsigned int irq)
149{
150 set_c0_status(0x100 << (irq - SNI_A20R_IRQ_BASE));
151 irq_enable_hazard();
152}
153
154static inline void mask_a20r_irq(unsigned int irq)
155{
156 clear_c0_status(0x100 << (irq - SNI_A20R_IRQ_BASE));
157 irq_disable_hazard();
158}
159
160static void end_a20r_irq(unsigned int irq)
161{
162 if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
163 a20r_ack_hwint();
164 unmask_a20r_irq(irq);
165 }
166}
167
168static struct irq_chip a20r_irq_type = {
169 .typename = "A20R",
170 .ack = mask_a20r_irq,
171 .mask = mask_a20r_irq,
172 .mask_ack = mask_a20r_irq,
173 .unmask = unmask_a20r_irq,
174 .end = end_a20r_irq,
175};
176
177/*
178 * hwint 0 receive all interrupts
179 */
180static void a20r_hwint(void)
181{
182 u32 cause, status;
183 int irq;
184
185 clear_c0_status (IE_IRQ0);
186 status = a20r_ack_hwint();
187 cause = read_c0_cause();
188
189 irq = ffs(((cause & status) >> 8) & 0xf8);
190 if (likely(irq > 0))
191 do_IRQ(SNI_A20R_IRQ_BASE + irq - 1);
192 set_c0_status(IE_IRQ0);
193}
194
195void __init sni_a20r_irq_init(void)
196{
197 int i;
198
199 for (i = SNI_A20R_IRQ_BASE + 2 ; i < SNI_A20R_IRQ_BASE + 8; i++)
200 set_irq_chip(i, &a20r_irq_type);
201 sni_hwint = a20r_hwint;
202 change_c0_status(ST0_IM, IE_IRQ0);
203 setup_irq (SNI_A20R_IRQ_BASE + 3, &sni_isa_irq);
204}
205
206void sni_a20r_init(void)
207{
208 ds1216_base = (volatile unsigned char *) SNI_DS1216_A20R_BASE;
209 rtc_mips_get_time = ds1216_get_cmos_time;
210}
211
212static int __init snirm_a20r_setup_devinit(void)
213{
214 switch (sni_brd_type) {
215 case SNI_BRD_TOWER_OASIC:
216 case SNI_BRD_MINITOWER:
217 platform_device_register(&snirm_82596_pdev);
218 platform_device_register(&snirm_53c710_pdev);
219 platform_device_register(&sc26xx_pdev);
220 platform_device_register(&a20r_serial8250_device);
221 break;
222 }
223
224 return 0;
225}
226
227device_initcall(snirm_a20r_setup_devinit);
diff --git a/arch/mips/sni/ds1216.c b/arch/mips/sni/ds1216.c
new file mode 100644
index 000000000000..1d92732c14f1
--- /dev/null
+++ b/arch/mips/sni/ds1216.c
@@ -0,0 +1,81 @@
1
2#include <linux/bcd.h>
3#include <linux/time.h>
4
5#include <asm/ds1216.h>
6
7volatile unsigned char *ds1216_base;
8
9/*
10 * Read the 64 bit we'd like to have - It a series
11 * of 64 bits showing up in the LSB of the base register.
12 *
13 */
14static unsigned char *ds1216_read(void)
15{
16 static unsigned char rdbuf[8];
17 unsigned char c;
18 int i, j;
19
20 for (i = 0; i < 8; i++) {
21 c = 0x0;
22 for (j = 0; j < 8; j++) {
23 c |= (*ds1216_base & 0x1) << j;
24 }
25 rdbuf[i] = c;
26 }
27
28 return rdbuf;
29}
30
31static void ds1216_switch_ds_to_clock(void)
32{
33 unsigned char magic[] = {
34 0xc5, 0x3a, 0xa3, 0x5c, 0xc5, 0x3a, 0xa3, 0x5c
35 };
36 int i,j,c;
37
38 /* Reset magic pointer */
39 c = *ds1216_base;
40
41 /* Write 64 bit magic to DS1216 */
42 for (i = 0; i < 8; i++) {
43 c = magic[i];
44 for (j = 0; j < 8; j++) {
45 *ds1216_base = c;
46 c = c >> 1;
47 }
48 }
49}
50
51unsigned long ds1216_get_cmos_time(void)
52{
53 unsigned char *rdbuf;
54 unsigned int year, month, date, hour, min, sec;
55
56 ds1216_switch_ds_to_clock();
57 rdbuf = ds1216_read();
58
59 sec = BCD2BIN(DS1216_SEC(rdbuf));
60 min = BCD2BIN(DS1216_MIN(rdbuf));
61 hour = BCD2BIN(DS1216_HOUR(rdbuf));
62 date = BCD2BIN(DS1216_DATE(rdbuf));
63 month = BCD2BIN(DS1216_MONTH(rdbuf));
64 year = BCD2BIN(DS1216_YEAR(rdbuf));
65
66 if (DS1216_1224(rdbuf) && DS1216_AMPM(rdbuf))
67 hour+=12;
68
69 if (year < 70)
70 year += 2000;
71 else
72 year += 1900;
73
74 return mktime(year, month, date, hour, min, sec);
75}
76
77int ds1216_set_rtc_mmss(unsigned long nowtime)
78{
79 printk("ds1216_set_rtc_mmss called but not implemented\n");
80 return -1;
81}
diff --git a/arch/mips/sni/irq.c b/arch/mips/sni/irq.c
index 039e8e540508..ad5fc471a004 100644
--- a/arch/mips/sni/irq.c
+++ b/arch/mips/sni/irq.c
@@ -5,6 +5,7 @@
5 * 5 *
6 * Copyright (C) 1992 Linus Torvalds 6 * Copyright (C) 1992 Linus Torvalds
7 * Copyright (C) 1994 - 2000 Ralf Baechle 7 * Copyright (C) 1994 - 2000 Ralf Baechle
8 * Copyright (C) 2006 Thomas Bogendoerfer
8 */ 9 */
9#include <linux/delay.h> 10#include <linux/delay.h>
10#include <linux/init.h> 11#include <linux/init.h>
@@ -15,152 +16,34 @@
15#include <asm/i8259.h> 16#include <asm/i8259.h>
16#include <asm/io.h> 17#include <asm/io.h>
17#include <asm/sni.h> 18#include <asm/sni.h>
19#include <asm/irq.h>
20#include <asm/irq_cpu.h>
18 21
19static void enable_pciasic_irq(unsigned int irq) 22void (*sni_hwint)(void);
20{
21 unsigned int mask = 1 << (irq - PCIMT_IRQ_INT2);
22
23 *(volatile u8 *) PCIMT_IRQSEL |= mask;
24}
25
26void disable_pciasic_irq(unsigned int irq)
27{
28 unsigned int mask = ~(1 << (irq - PCIMT_IRQ_INT2));
29
30 *(volatile u8 *) PCIMT_IRQSEL &= mask;
31}
32 23
33static void end_pciasic_irq(unsigned int irq) 24asmlinkage void plat_irq_dispatch(void)
34{
35 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
36 enable_pciasic_irq(irq);
37}
38
39static struct irq_chip pciasic_irq_type = {
40 .name = "ASIC-PCI",
41 .ack = disable_pciasic_irq,
42 .mask = disable_pciasic_irq,
43 .mask_ack = disable_pciasic_irq,
44 .unmask = enable_pciasic_irq,
45 .end = end_pciasic_irq,
46};
47
48/*
49 * hwint0 should deal with MP agent, ASIC PCI, EISA NMI and debug
50 * button interrupts. Later ...
51 */
52static void pciasic_hwint0(void)
53{
54 panic("Received int0 but no handler yet ...");
55}
56
57/* This interrupt was used for the com1 console on the first prototypes. */
58static void pciasic_hwint2(void)
59{
60 /* I think this shouldn't happen on production machines. */
61 panic("hwint2 and no handler yet");
62}
63
64/* hwint5 is the r4k count / compare interrupt */
65static void pciasic_hwint5(void)
66{
67 panic("hwint5 and no handler yet");
68}
69
70static unsigned int ls1bit8(unsigned int x)
71{
72 int b = 7, s;
73
74 s = 4; if ((x & 0x0f) == 0) s = 0; b -= s; x <<= s;
75 s = 2; if ((x & 0x30) == 0) s = 0; b -= s; x <<= s;
76 s = 1; if ((x & 0x40) == 0) s = 0; b -= s;
77
78 return b;
79}
80
81/*
82 * hwint 1 deals with EISA and SCSI interrupts,
83 *
84 * The EISA_INT bit in CSITPEND is high active, all others are low active.
85 */
86static void pciasic_hwint1(void)
87{ 25{
88 u8 pend = *(volatile char *)PCIMT_CSITPEND; 26 sni_hwint();
89 unsigned long flags;
90
91 if (pend & IT_EISA) {
92 int irq;
93 /*
94 * Note: ASIC PCI's builtin interrupt achknowledge feature is
95 * broken. Using it may result in loss of some or all i8259
96 * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
97 */
98 irq = i8259_irq();
99 if (unlikely(irq < 0))
100 return;
101
102 do_IRQ(irq);
103 }
104
105 if (!(pend & IT_SCSI)) {
106 flags = read_c0_status();
107 clear_c0_status(ST0_IM);
108 do_IRQ(PCIMT_IRQ_SCSI);
109 write_c0_status(flags);
110 }
111} 27}
112 28
113/* 29/* ISA irq handler */
114 * hwint 3 should deal with the PCI A - D interrupts, 30static irqreturn_t sni_isa_irq_handler(int dummy, void *p)
115 */
116static void pciasic_hwint3(void)
117{ 31{
118 u8 pend = *(volatile char *)PCIMT_CSITPEND;
119 int irq; 32 int irq;
120 33
121 pend &= (IT_INTA | IT_INTB | IT_INTC | IT_INTD); 34 irq = i8259_irq();
122 clear_c0_status(IE_IRQ3); 35 if (unlikely(irq < 0))
123 irq = PCIMT_IRQ_INT2 + ls1bit8(pend); 36 return IRQ_NONE;
124 do_IRQ(irq);
125 set_c0_status(IE_IRQ3);
126}
127 37
128/* 38 do_IRQ(irq);
129 * hwint 4 is used for only the onboard PCnet 32. 39 return IRQ_HANDLED;
130 */
131static void pciasic_hwint4(void)
132{
133 clear_c0_status(IE_IRQ4);
134 do_IRQ(PCIMT_IRQ_ETHERNET);
135 set_c0_status(IE_IRQ4);
136}
137
138asmlinkage void plat_irq_dispatch(void)
139{
140 unsigned int pending = read_c0_status() & read_c0_cause();
141 static unsigned char led_cache;
142
143 *(volatile unsigned char *) PCIMT_CSLED = ++led_cache;
144
145 if (pending & 0x0800)
146 pciasic_hwint1();
147 else if (pending & 0x4000)
148 pciasic_hwint4();
149 else if (pending & 0x2000)
150 pciasic_hwint3();
151 else if (pending & 0x1000)
152 pciasic_hwint2();
153 else if (pending & 0x8000)
154 pciasic_hwint5();
155 else if (pending & 0x0400)
156 pciasic_hwint0();
157} 40}
158 41
159void __init init_pciasic(void) 42struct irqaction sni_isa_irq = {
160{ 43 .handler = sni_isa_irq_handler,
161 * (volatile u8 *) PCIMT_IRQSEL = 44 .name = "ISA",
162 IT_EISA | IT_INTA | IT_INTB | IT_INTC | IT_INTD; 45 .flags = SA_SHIRQ
163} 46};
164 47
165/* 48/*
166 * On systems with i8259-style interrupt controllers we assume for 49 * On systems with i8259-style interrupt controllers we assume for
@@ -169,14 +52,31 @@ void __init init_pciasic(void)
169 */ 52 */
170void __init arch_init_irq(void) 53void __init arch_init_irq(void)
171{ 54{
172 int i;
173
174 init_i8259_irqs(); /* Integrated i8259 */ 55 init_i8259_irqs(); /* Integrated i8259 */
175 init_pciasic(); 56 switch (sni_brd_type) {
176 57 case SNI_BRD_10:
177 /* Actually we've got more interrupts to handle ... */ 58 case SNI_BRD_10NEW:
178 for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_ETHERNET; i++) 59 case SNI_BRD_TOWER_OASIC:
179 set_irq_chip(i, &pciasic_irq_type); 60 case SNI_BRD_MINITOWER:
180 61 sni_a20r_irq_init();
181 change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ2|IE_IRQ3|IE_IRQ4); 62 break;
63
64 case SNI_BRD_PCI_TOWER:
65 sni_pcit_irq_init();
66 break;
67
68 case SNI_BRD_PCI_TOWER_CPLUS:
69 sni_pcit_cplus_irq_init();
70 break;
71
72 case SNI_BRD_RM200:
73 sni_rm200_irq_init();
74 break;
75
76 case SNI_BRD_PCI_MTOWER:
77 case SNI_BRD_PCI_DESKTOP:
78 case SNI_BRD_PCI_MTOWER_CPLUS:
79 sni_pcimt_irq_init();
80 break;
81 }
182} 82}
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
new file mode 100644
index 000000000000..6c0dad7cbf4e
--- /dev/null
+++ b/arch/mips/sni/pcimt.c
@@ -0,0 +1,390 @@
1/*
2 * PCIMT specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org)
9 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
10 */
11
12#include <linux/init.h>
13#include <linux/interrupt.h>
14#include <linux/pci.h>
15#include <linux/serial_8250.h>
16
17#include <asm/mc146818-time.h>
18#include <asm/sni.h>
19#include <asm/time.h>
20#include <asm/i8259.h>
21#include <asm/irq_cpu.h>
22
23#define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF)
24#define invspace (*(volatile unsigned int *)PCIMT_INVSPACE)
25
26static void __init sni_pcimt_sc_init(void)
27{
28 unsigned int scsiz, sc_size;
29
30 scsiz = cacheconf & 7;
31 if (scsiz == 0) {
32 printk("Second level cache is deactived.\n");
33 return;
34 }
35 if (scsiz >= 6) {
36 printk("Invalid second level cache size configured, "
37 "deactivating second level cache.\n");
38 cacheconf = 0;
39 return;
40 }
41
42 sc_size = 128 << scsiz;
43 printk("%dkb second level cache detected, deactivating.\n", sc_size);
44 cacheconf = 0;
45}
46
47
48/*
49 * A bit more gossip about the iron we're running on ...
50 */
51static inline void sni_pcimt_detect(void)
52{
53 char boardtype[80];
54 unsigned char csmsr;
55 char *p = boardtype;
56 unsigned int asic;
57
58 csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
59
60 p += sprintf(p, "%s PCI", (csmsr & 0x80) ? "RM200" : "RM300");
61 if ((csmsr & 0x80) == 0)
62 p += sprintf(p, ", board revision %s",
63 (csmsr & 0x20) ? "D" : "C");
64 asic = csmsr & 0x80;
65 asic = (csmsr & 0x08) ? asic : !asic;
66 p += sprintf(p, ", ASIC PCI Rev %s", asic ? "1.0" : "1.1");
67 printk("%s.\n", boardtype);
68}
69
70#define PORT(_base,_irq) \
71 { \
72 .iobase = _base, \
73 .irq = _irq, \
74 .uartclk = 1843200, \
75 .iotype = UPIO_PORT, \
76 .flags = UPF_BOOT_AUTOCONF, \
77 }
78
79static struct plat_serial8250_port pcimt_data[] = {
80 PORT(0x3f8, 4),
81 PORT(0x2f8, 3),
82 { },
83};
84
85static struct platform_device pcimt_serial8250_device = {
86 .name = "serial8250",
87 .id = PLAT8250_DEV_PLATFORM,
88 .dev = {
89 .platform_data = pcimt_data,
90 },
91};
92
93static struct resource sni_io_resource = {
94 .start = 0x00001000UL,
95 .end = 0x03bfffffUL,
96 .name = "PCIMT IO MEM",
97 .flags = IORESOURCE_IO,
98};
99
100static struct resource pcimt_io_resources[] = {
101 {
102 .start = 0x00,
103 .end = 0x1f,
104 .name = "dma1",
105 .flags = IORESOURCE_BUSY
106 }, {
107 .start = 0x40,
108 .end = 0x5f,
109 .name = "timer",
110 .flags = IORESOURCE_BUSY
111 }, {
112 .start = 0x60,
113 .end = 0x6f,
114 .name = "keyboard",
115 .flags = IORESOURCE_BUSY
116 }, {
117 .start = 0x80,
118 .end = 0x8f,
119 .name = "dma page reg",
120 .flags = IORESOURCE_BUSY
121 }, {
122 .start = 0xc0,
123 .end = 0xdf,
124 .name = "dma2",
125 .flags = IORESOURCE_BUSY
126 }, {
127 .start = 0xcfc,
128 .end = 0xcff,
129 .name = "PCI config data",
130 .flags = IORESOURCE_BUSY
131 }
132};
133
134static struct resource sni_mem_resource = {
135 .start = 0x10000000UL,
136 .end = 0xffffffffUL,
137 .name = "PCIMT PCI MEM",
138 .flags = IORESOURCE_MEM
139};
140
141/*
142 * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
143 * for other purposes. Be paranoid and allocate all of the before the PCI
144 * code gets a chance to to map anything else there ...
145 *
146 * This leaves the following areas available:
147 *
148 * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory
149 * 0x10100000 - 0x13ffffff ( 15MB) PCI/EISA/ISA Bus Memory
150 * 0x18000000 - 0x1fbfffff (124MB) PCI/EISA Bus Memory
151 * 0x1ff08000 - 0x1ffeffff (816kB) PCI/EISA Bus Memory
152 * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory
153 */
154static struct resource pcimt_mem_resources[] = {
155 {
156 .start = 0x100a0000,
157 .end = 0x100bffff,
158 .name = "Video RAM area",
159 .flags = IORESOURCE_BUSY
160 }, {
161 .start = 0x100c0000,
162 .end = 0x100fffff,
163 .name = "ISA Reserved",
164 .flags = IORESOURCE_BUSY
165 }, {
166 .start = 0x14000000,
167 .end = 0x17bfffff,
168 .name = "PCI IO",
169 .flags = IORESOURCE_BUSY
170 }, {
171 .start = 0x17c00000,
172 .end = 0x17ffffff,
173 .name = "Cache Replacement Area",
174 .flags = IORESOURCE_BUSY
175 }, {
176 .start = 0x1a000000,
177 .end = 0x1a000003,
178 .name = "PCI INT Acknowledge",
179 .flags = IORESOURCE_BUSY
180 }, {
181 .start = 0x1fc00000,
182 .end = 0x1fc7ffff,
183 .name = "Boot PROM",
184 .flags = IORESOURCE_BUSY
185 }, {
186 .start = 0x1fc80000,
187 .end = 0x1fcfffff,
188 .name = "Diag PROM",
189 .flags = IORESOURCE_BUSY
190 }, {
191 .start = 0x1fd00000,
192 .end = 0x1fdfffff,
193 .name = "X-Bus",
194 .flags = IORESOURCE_BUSY
195 }, {
196 .start = 0x1fe00000,
197 .end = 0x1fefffff,
198 .name = "BIOS map",
199 .flags = IORESOURCE_BUSY
200 }, {
201 .start = 0x1ff00000,
202 .end = 0x1ff7ffff,
203 .name = "NVRAM / EEPROM",
204 .flags = IORESOURCE_BUSY
205 }, {
206 .start = 0x1fff0000,
207 .end = 0x1fffefff,
208 .name = "ASIC PCI",
209 .flags = IORESOURCE_BUSY
210 }, {
211 .start = 0x1ffff000,
212 .end = 0x1fffffff,
213 .name = "MP Agent",
214 .flags = IORESOURCE_BUSY
215 }, {
216 .start = 0x20000000,
217 .end = 0x9fffffff,
218 .name = "Main Memory",
219 .flags = IORESOURCE_BUSY
220 }
221};
222
223static void __init sni_pcimt_resource_init(void)
224{
225 int i;
226
227 /* request I/O space for devices used on all i[345]86 PCs */
228 for (i = 0; i < ARRAY_SIZE(pcimt_io_resources); i++)
229 request_resource(&ioport_resource, pcimt_io_resources + i);
230
231 /* request mem space for pcimt-specific devices */
232 for (i = 0; i < ARRAY_SIZE(pcimt_mem_resources); i++)
233 request_resource(&sni_mem_resource, pcimt_mem_resources + i);
234
235 ioport_resource.end = sni_io_resource.end;
236}
237
238extern struct pci_ops sni_pcimt_ops;
239
240static struct pci_controller sni_controller = {
241 .pci_ops = &sni_pcimt_ops,
242 .mem_resource = &sni_mem_resource,
243 .mem_offset = 0x10000000UL,
244 .io_resource = &sni_io_resource,
245 .io_offset = 0x00000000UL
246};
247
248static void enable_pcimt_irq(unsigned int irq)
249{
250 unsigned int mask = 1 << (irq - PCIMT_IRQ_INT2);
251
252 *(volatile u8 *) PCIMT_IRQSEL |= mask;
253}
254
255void disable_pcimt_irq(unsigned int irq)
256{
257 unsigned int mask = ~(1 << (irq - PCIMT_IRQ_INT2));
258
259 *(volatile u8 *) PCIMT_IRQSEL &= mask;
260}
261
262static void end_pcimt_irq(unsigned int irq)
263{
264 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
265 enable_pcimt_irq(irq);
266}
267
268static struct irq_chip pcimt_irq_type = {
269 .typename = "PCIMT",
270 .ack = disable_pcimt_irq,
271 .mask = disable_pcimt_irq,
272 .mask_ack = disable_pcimt_irq,
273 .unmask = enable_pcimt_irq,
274 .end = end_pcimt_irq,
275};
276
277/*
278 * hwint0 should deal with MP agent, ASIC PCI, EISA NMI and debug
279 * button interrupts. Later ...
280 */
281static void pcimt_hwint0(void)
282{
283 panic("Received int0 but no handler yet ...");
284}
285
286/*
287 * hwint 1 deals with EISA and SCSI interrupts,
288 *
289 * The EISA_INT bit in CSITPEND is high active, all others are low active.
290 */
291static void pcimt_hwint1(void)
292{
293 u8 pend = *(volatile char *)PCIMT_CSITPEND;
294 unsigned long flags;
295
296 if (pend & IT_EISA) {
297 int irq;
298 /*
299 * Note: ASIC PCI's builtin interrupt achknowledge feature is
300 * broken. Using it may result in loss of some or all i8259
301 * interupts, so don't use PCIMT_INT_ACKNOWLEDGE ...
302 */
303 irq = i8259_irq();
304 if (unlikely(irq < 0))
305 return;
306
307 do_IRQ(irq);
308 }
309
310 if (!(pend & IT_SCSI)) {
311 flags = read_c0_status();
312 clear_c0_status(ST0_IM);
313 do_IRQ(PCIMT_IRQ_SCSI);
314 write_c0_status(flags);
315 }
316}
317
318/*
319 * hwint 3 should deal with the PCI A - D interrupts,
320 */
321static void pcimt_hwint3(void)
322{
323 u8 pend = *(volatile char *)PCIMT_CSITPEND;
324 int irq;
325
326 pend &= (IT_INTA | IT_INTB | IT_INTC | IT_INTD);
327 pend ^= (IT_INTA | IT_INTB | IT_INTC | IT_INTD);
328 clear_c0_status(IE_IRQ3);
329 irq = PCIMT_IRQ_INT2 + ffs(pend) - 1;
330 do_IRQ(irq);
331 set_c0_status(IE_IRQ3);
332}
333
334static void sni_pcimt_hwint(void)
335{
336 u32 pending = (read_c0_cause() & read_c0_status());
337
338 if (pending & C_IRQ5)
339 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 7);
340 else if (pending & C_IRQ4)
341 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 6);
342 else if (pending & C_IRQ3)
343 pcimt_hwint3();
344 else if (pending & C_IRQ1)
345 pcimt_hwint1();
346 else if (pending & C_IRQ0) {
347 pcimt_hwint0();
348 }
349}
350
351void __init sni_pcimt_irq_init(void)
352{
353 int i;
354
355 *(volatile u8 *) PCIMT_IRQSEL = IT_ETH | IT_EISA;
356 mips_cpu_irq_init();
357 /* Actually we've got more interrupts to handle ... */
358 for (i = PCIMT_IRQ_INT2; i <= PCIMT_IRQ_SCSI; i++)
359 set_irq_chip(i, &pcimt_irq_type);
360 sni_hwint = sni_pcimt_hwint;
361 change_c0_status(ST0_IM, IE_IRQ1|IE_IRQ3);
362}
363
364void sni_pcimt_init(void)
365{
366 sni_pcimt_resource_init();
367 sni_pcimt_detect();
368 sni_pcimt_sc_init();
369 rtc_mips_get_time = mc146818_get_cmos_time;
370 rtc_mips_set_time = mc146818_set_rtc_mmss;
371 board_time_init = sni_cpu_time_init;
372#ifdef CONFIG_PCI
373 register_pci_controller(&sni_controller);
374#endif
375}
376
377static int __init snirm_pcimt_setup_devinit(void)
378{
379 switch (sni_brd_type) {
380 case SNI_BRD_PCI_MTOWER:
381 case SNI_BRD_PCI_DESKTOP:
382 case SNI_BRD_PCI_MTOWER_CPLUS:
383 platform_device_register(&pcimt_serial8250_device);
384 break;
385 }
386
387 return 0;
388}
389
390device_initcall(snirm_pcimt_setup_devinit);
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
new file mode 100644
index 000000000000..3921096023c3
--- /dev/null
+++ b/arch/mips/sni/pcit.c
@@ -0,0 +1,351 @@
1/*
2 * PCI Tower specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */
10
11#include <linux/init.h>
12#include <linux/interrupt.h>
13#include <linux/pci.h>
14#include <linux/serial_8250.h>
15
16#include <asm/mc146818-time.h>
17#include <asm/sni.h>
18#include <asm/time.h>
19#include <asm/irq_cpu.h>
20
21
22#define PORT(_base,_irq) \
23 { \
24 .iobase = _base, \
25 .irq = _irq, \
26 .uartclk = 1843200, \
27 .iotype = UPIO_PORT, \
28 .flags = UPF_BOOT_AUTOCONF, \
29 }
30
31static struct plat_serial8250_port pcit_data[] = {
32 PORT(0x3f8, 0),
33 PORT(0x2f8, 3),
34 { },
35};
36
37static struct platform_device pcit_serial8250_device = {
38 .name = "serial8250",
39 .id = PLAT8250_DEV_PLATFORM,
40 .dev = {
41 .platform_data = pcit_data,
42 },
43};
44
45static struct plat_serial8250_port pcit_cplus_data[] = {
46 PORT(0x3f8, 4),
47 PORT(0x2f8, 3),
48 PORT(0x3e8, 4),
49 PORT(0x2e8, 3),
50 { },
51};
52
53static struct platform_device pcit_cplus_serial8250_device = {
54 .name = "serial8250",
55 .id = PLAT8250_DEV_PLATFORM,
56 .dev = {
57 .platform_data = pcit_cplus_data,
58 },
59};
60
61static struct resource sni_io_resource = {
62 .start = 0x00001000UL,
63 .end = 0x03bfffffUL,
64 .name = "PCIT IO MEM",
65 .flags = IORESOURCE_IO,
66};
67
68static struct resource pcit_io_resources[] = {
69 {
70 .start = 0x00,
71 .end = 0x1f,
72 .name = "dma1",
73 .flags = IORESOURCE_BUSY
74 }, {
75 .start = 0x40,
76 .end = 0x5f,
77 .name = "timer",
78 .flags = IORESOURCE_BUSY
79 }, {
80 .start = 0x60,
81 .end = 0x6f,
82 .name = "keyboard",
83 .flags = IORESOURCE_BUSY
84 }, {
85 .start = 0x80,
86 .end = 0x8f,
87 .name = "dma page reg",
88 .flags = IORESOURCE_BUSY
89 }, {
90 .start = 0xc0,
91 .end = 0xdf,
92 .name = "dma2",
93 .flags = IORESOURCE_BUSY
94 }, {
95 .start = 0xcfc,
96 .end = 0xcff,
97 .name = "PCI config data",
98 .flags = IORESOURCE_BUSY
99 }
100};
101
102static struct resource sni_mem_resource = {
103 .start = 0x10000000UL,
104 .end = 0xffffffffUL,
105 .name = "PCIT PCI MEM",
106 .flags = IORESOURCE_MEM
107};
108
109/*
110 * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
111 * for other purposes. Be paranoid and allocate all of the before the PCI
112 * code gets a chance to to map anything else there ...
113 *
114 * This leaves the following areas available:
115 *
116 * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory
117 * 0x10100000 - 0x13ffffff ( 15MB) PCI/EISA/ISA Bus Memory
118 * 0x18000000 - 0x1fbfffff (124MB) PCI/EISA Bus Memory
119 * 0x1ff08000 - 0x1ffeffff (816kB) PCI/EISA Bus Memory
120 * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory
121 */
122static struct resource pcit_mem_resources[] = {
123 {
124 .start = 0x14000000,
125 .end = 0x17bfffff,
126 .name = "PCI IO",
127 .flags = IORESOURCE_BUSY
128 }, {
129 .start = 0x17c00000,
130 .end = 0x17ffffff,
131 .name = "Cache Replacement Area",
132 .flags = IORESOURCE_BUSY
133 }, {
134 .start = 0x180a0000,
135 .end = 0x180bffff,
136 .name = "Video RAM area",
137 .flags = IORESOURCE_BUSY
138 }, {
139 .start = 0x180c0000,
140 .end = 0x180fffff,
141 .name = "ISA Reserved",
142 .flags = IORESOURCE_BUSY
143 }, {
144 .start = 0x19000000,
145 .end = 0x1fbfffff,
146 .name = "PCI MEM",
147 .flags = IORESOURCE_BUSY
148 }, {
149 .start = 0x1fc00000,
150 .end = 0x1fc7ffff,
151 .name = "Boot PROM",
152 .flags = IORESOURCE_BUSY
153 }, {
154 .start = 0x1fc80000,
155 .end = 0x1fcfffff,
156 .name = "Diag PROM",
157 .flags = IORESOURCE_BUSY
158 }, {
159 .start = 0x1fd00000,
160 .end = 0x1fdfffff,
161 .name = "X-Bus",
162 .flags = IORESOURCE_BUSY
163 }, {
164 .start = 0x1fe00000,
165 .end = 0x1fefffff,
166 .name = "BIOS map",
167 .flags = IORESOURCE_BUSY
168 }, {
169 .start = 0x1ff00000,
170 .end = 0x1ff7ffff,
171 .name = "NVRAM / EEPROM",
172 .flags = IORESOURCE_BUSY
173 }, {
174 .start = 0x1fff0000,
175 .end = 0x1fffefff,
176 .name = "MAUI ASIC",
177 .flags = IORESOURCE_BUSY
178 }, {
179 .start = 0x1ffff000,
180 .end = 0x1fffffff,
181 .name = "MP Agent",
182 .flags = IORESOURCE_BUSY
183 }, {
184 .start = 0x20000000,
185 .end = 0x9fffffff,
186 .name = "Main Memory",
187 .flags = IORESOURCE_BUSY
188 }
189};
190
191static void __init sni_pcit_resource_init(void)
192{
193 int i;
194
195 /* request I/O space for devices used on all i[345]86 PCs */
196 for (i = 0; i < ARRAY_SIZE(pcit_io_resources); i++)
197 request_resource(&ioport_resource, pcit_io_resources + i);
198
199 /* request mem space for pcimt-specific devices */
200 for (i = 0; i < ARRAY_SIZE(pcit_mem_resources); i++)
201 request_resource(&sni_mem_resource, pcit_mem_resources + i);
202
203 ioport_resource.end = sni_io_resource.end;
204}
205
206
207extern struct pci_ops sni_pcit_ops;
208
209static struct pci_controller sni_pcit_controller = {
210 .pci_ops = &sni_pcit_ops,
211 .mem_resource = &sni_mem_resource,
212 .mem_offset = 0x10000000UL,
213 .io_resource = &sni_io_resource,
214 .io_offset = 0x00000000UL
215};
216
217static void enable_pcit_irq(unsigned int irq)
218{
219 u32 mask = 1 << (irq - SNI_PCIT_INT_START + 24);
220
221 *(volatile u32 *)SNI_PCIT_INT_REG |= mask;
222}
223
224void disable_pcit_irq(unsigned int irq)
225{
226 u32 mask = 1 << (irq - SNI_PCIT_INT_START + 24);
227
228 *(volatile u32 *)SNI_PCIT_INT_REG &= ~mask;
229}
230
231void end_pcit_irq(unsigned int irq)
232{
233 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
234 enable_pcit_irq(irq);
235}
236
237static struct irq_chip pcit_irq_type = {
238 .typename = "PCIT",
239 .ack = disable_pcit_irq,
240 .mask = disable_pcit_irq,
241 .mask_ack = disable_pcit_irq,
242 .unmask = enable_pcit_irq,
243 .end = end_pcit_irq,
244};
245
246static void pcit_hwint1(void)
247{
248 u32 pending = *(volatile u32 *)SNI_PCIT_INT_REG;
249 int irq;
250
251 clear_c0_status(IE_IRQ1);
252 irq = ffs((pending >> 16) & 0x7f);
253
254 if (likely(irq > 0))
255 do_IRQ (irq + SNI_PCIT_INT_START - 1);
256 set_c0_status (IE_IRQ1);
257}
258
259static void pcit_hwint0(void)
260{
261 u32 pending = *(volatile u32 *)SNI_PCIT_INT_REG;
262 int irq;
263
264 clear_c0_status(IE_IRQ0);
265 irq = ffs((pending >> 16) & 0x7f);
266
267 if (likely(irq > 0))
268 do_IRQ (irq + SNI_PCIT_INT_START - 1);
269 set_c0_status (IE_IRQ0);
270}
271
272static void sni_pcit_hwint(void)
273{
274 u32 pending = (read_c0_cause() & read_c0_status());
275
276 if (pending & C_IRQ1)
277 pcit_hwint1();
278 else if (pending & C_IRQ2)
279 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 4);
280 else if (pending & C_IRQ3)
281 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 5);
282 else if (pending & C_IRQ5)
283 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 7);
284}
285
286static void sni_pcit_hwint_cplus(void)
287{
288 u32 pending = (read_c0_cause() & read_c0_status());
289
290 if (pending & C_IRQ0)
291 pcit_hwint0();
292 else if (pending & C_IRQ2)
293 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 4);
294 else if (pending & C_IRQ3)
295 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 5);
296 else if (pending & C_IRQ5)
297 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 7);
298}
299
300void __init sni_pcit_irq_init(void)
301{
302 int i;
303
304 mips_cpu_irq_init();
305 for (i = SNI_PCIT_INT_START; i <= SNI_PCIT_INT_END; i++)
306 set_irq_chip(i, &pcit_irq_type);
307 *(volatile u32 *)SNI_PCIT_INT_REG = 0;
308 sni_hwint = sni_pcit_hwint;
309 change_c0_status(ST0_IM, IE_IRQ1);
310 setup_irq (SNI_PCIT_INT_START + 6, &sni_isa_irq);
311}
312
313void __init sni_pcit_cplus_irq_init(void)
314{
315 int i;
316
317 mips_cpu_irq_init();
318 for (i = SNI_PCIT_INT_START; i <= SNI_PCIT_INT_END; i++)
319 set_irq_chip(i, &pcit_irq_type);
320 *(volatile u32 *)SNI_PCIT_INT_REG = 0;
321 sni_hwint = sni_pcit_hwint_cplus;
322 change_c0_status(ST0_IM, IE_IRQ0);
323 setup_irq (SNI_PCIT_INT_START + 6, &sni_isa_irq);
324}
325
326void sni_pcit_init(void)
327{
328 sni_pcit_resource_init();
329 rtc_mips_get_time = mc146818_get_cmos_time;
330 rtc_mips_set_time = mc146818_set_rtc_mmss;
331 board_time_init = sni_cpu_time_init;
332#ifdef CONFIG_PCI
333 register_pci_controller(&sni_pcit_controller);
334#endif
335}
336
337static int __init snirm_pcit_setup_devinit(void)
338{
339 switch (sni_brd_type) {
340 case SNI_BRD_PCI_TOWER:
341 platform_device_register(&pcit_serial8250_device);
342 break;
343
344 case SNI_BRD_PCI_TOWER_CPLUS:
345 platform_device_register(&pcit_cplus_serial8250_device);
346 break;
347 }
348 return 0;
349}
350
351device_initcall(snirm_pcit_setup_devinit);
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index be85bec002e1..2eada8aea682 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -13,12 +13,11 @@
13 * controller to pulse the reset-line low. We try that for a while, 13 * controller to pulse the reset-line low. We try that for a while,
14 * and if it doesn't work, we do some other stupid things. 14 * and if it doesn't work, we do some other stupid things.
15 */ 15 */
16static inline void 16static inline void kb_wait(void)
17kb_wait(void)
18{ 17{
19 int i; 18 int i;
20 19
21 for (i=0; i<0x10000; i++) 20 for (i = 0; i < 0x10000; i++)
22 if ((inb_p(0x64) & 0x02) == 0) 21 if ((inb_p(0x64) & 0x02) == 0)
23 break; 22 break;
24} 23}
@@ -32,9 +31,9 @@ void sni_machine_restart(char *command)
32 We can do that easier ... */ 31 We can do that easier ... */
33 local_irq_disable(); 32 local_irq_disable();
34 for (;;) { 33 for (;;) {
35 for (i=0; i<100; i++) { 34 for (i = 0; i < 100; i++) {
36 kb_wait(); 35 kb_wait();
37 for(j = 0; j < 100000 ; j++) 36 for (j = 0; j < 100000 ; j++)
38 /* nothing */; 37 /* nothing */;
39 outb_p(0xfe,0x64); /* pulse reset low */ 38 outb_p(0xfe,0x64); /* pulse reset low */
40 } 39 }
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
new file mode 100644
index 000000000000..517dc698c083
--- /dev/null
+++ b/arch/mips/sni/rm200.c
@@ -0,0 +1,186 @@
1/*
2 * RM200 specific code
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */
10
11#include <linux/init.h>
12#include <linux/interrupt.h>
13#include <linux/platform_device.h>
14#include <linux/serial_8250.h>
15
16#include <asm/sni.h>
17#include <asm/time.h>
18#include <asm/ds1216.h>
19#include <asm/irq_cpu.h>
20
21#define PORT(_base,_irq) \
22 { \
23 .iobase = _base, \
24 .irq = _irq, \
25 .uartclk = 1843200, \
26 .iotype = UPIO_PORT, \
27 .flags = UPF_BOOT_AUTOCONF, \
28 }
29
30static struct plat_serial8250_port rm200_data[] = {
31 PORT(0x3f8, 4),
32 PORT(0x2f8, 3),
33 { },
34};
35
36static struct platform_device rm200_serial8250_device = {
37 .name = "serial8250",
38 .id = PLAT8250_DEV_PLATFORM,
39 .dev = {
40 .platform_data = rm200_data,
41 },
42};
43
44static struct resource snirm_82596_rm200_rsrc[] = {
45 {
46 .start = 0xb8000000,
47 .end = 0xb80fffff,
48 .flags = IORESOURCE_MEM
49 },
50 {
51 .start = 0xbb000000,
52 .end = 0xbb000004,
53 .flags = IORESOURCE_MEM
54 },
55 {
56 .start = 0xbff00000,
57 .end = 0xbff00020,
58 .flags = IORESOURCE_MEM
59 },
60 {
61 .start = 27,
62 .end = 27,
63 .flags = IORESOURCE_IRQ
64 },
65 {
66 .flags = 0x00
67 }
68};
69
70static struct platform_device snirm_82596_rm200_pdev = {
71 .name = "snirm_82596",
72 .num_resources = ARRAY_SIZE(snirm_82596_rm200_rsrc),
73 .resource = snirm_82596_rm200_rsrc
74};
75
76static struct resource snirm_53c710_rm200_rsrc[] = {
77 {
78 .start = 0xb9000000,
79 .end = 0xb90fffff,
80 .flags = IORESOURCE_MEM
81 },
82 {
83 .start = 26,
84 .end = 26,
85 .flags = IORESOURCE_IRQ
86 }
87};
88
89static struct platform_device snirm_53c710_rm200_pdev = {
90 .name = "snirm_53c710",
91 .num_resources = ARRAY_SIZE(snirm_53c710_rm200_rsrc),
92 .resource = snirm_53c710_rm200_rsrc
93};
94
95static int __init snirm_setup_devinit(void)
96{
97 if (sni_brd_type == SNI_BRD_RM200) {
98 platform_device_register(&rm200_serial8250_device);
99 platform_device_register(&snirm_82596_rm200_pdev);
100 platform_device_register(&snirm_53c710_rm200_pdev);
101 }
102 return 0;
103}
104
105device_initcall(snirm_setup_devinit);
106
107
108#define SNI_RM200_INT_STAT_REG 0xbc000000
109#define SNI_RM200_INT_ENA_REG 0xbc080000
110
111#define SNI_RM200_INT_START 24
112#define SNI_RM200_INT_END 28
113
114static void enable_rm200_irq(unsigned int irq)
115{
116 unsigned int mask = 1 << (irq - SNI_RM200_INT_START);
117
118 *(volatile u8 *)SNI_RM200_INT_ENA_REG &= ~mask;
119}
120
121void disable_rm200_irq(unsigned int irq)
122{
123 unsigned int mask = 1 << (irq - SNI_RM200_INT_START);
124
125 *(volatile u8 *)SNI_RM200_INT_ENA_REG |= mask;
126}
127
128void end_rm200_irq(unsigned int irq)
129{
130 if (!(irq_desc[irq].status & (IRQ_DISABLED|IRQ_INPROGRESS)))
131 enable_rm200_irq(irq);
132}
133
134static struct irq_chip rm200_irq_type = {
135 .typename = "RM200",
136 .ack = disable_rm200_irq,
137 .mask = disable_rm200_irq,
138 .mask_ack = disable_rm200_irq,
139 .unmask = enable_rm200_irq,
140 .end = end_rm200_irq,
141};
142
143static void sni_rm200_hwint(void)
144{
145 u32 pending = read_c0_cause() & read_c0_status();
146 u8 mask;
147 u8 stat;
148 int irq;
149
150 if (pending & C_IRQ5)
151 do_IRQ (SNI_MIPS_IRQ_CPU_BASE + 7);
152 else if (pending & C_IRQ0) {
153 clear_c0_status (IE_IRQ0);
154 mask = *(volatile u8 *)SNI_RM200_INT_ENA_REG ^ 0x1f;
155 stat = *(volatile u8 *)SNI_RM200_INT_STAT_REG ^ 0x14;
156 irq = ffs(stat & mask & 0x1f);
157
158 if (likely(irq > 0))
159 do_IRQ (irq + SNI_RM200_INT_START - 1);
160 set_c0_status (IE_IRQ0);
161 }
162}
163
164void __init sni_rm200_irq_init(void)
165{
166 int i;
167
168 * (volatile u8 *)SNI_RM200_INT_ENA_REG = 0x1f;
169
170 mips_cpu_irq_init();
171 /* Actually we've got more interrupts to handle ... */
172 for (i = SNI_RM200_INT_START; i <= SNI_RM200_INT_END; i++)
173 set_irq_chip(i, &rm200_irq_type);
174 sni_hwint = sni_rm200_hwint;
175 change_c0_status(ST0_IM, IE_IRQ0);
176 setup_irq (SNI_RM200_INT_START + 0, &sni_isa_irq);
177}
178
179void sni_rm200_init(void)
180{
181 set_io_port_base(SNI_PORT_BASE + 0x02000000);
182 ioport_resource.end += 0x02000000;
183 ds1216_base = (volatile unsigned char *) SNI_DS1216_RM200_BASE;
184 rtc_mips_get_time = ds1216_get_cmos_time;
185 board_time_init = sni_cpu_time_init;
186}
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index afeb7f13e5b5..68d7cf609b4f 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -6,16 +6,10 @@
6 * for more details. 6 * for more details.
7 * 7 *
8 * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org) 8 * Copyright (C) 1996, 97, 98, 2000, 03, 04, 06 Ralf Baechle (ralf@linux-mips.org)
9 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */ 10 */
10#include <linux/eisa.h> 11#include <linux/eisa.h>
11#include <linux/hdreg.h>
12#include <linux/ioport.h>
13#include <linux/sched.h>
14#include <linux/init.h> 12#include <linux/init.h>
15#include <linux/interrupt.h>
16#include <linux/mc146818rtc.h>
17#include <linux/pm.h>
18#include <linux/pci.h>
19#include <linux/console.h> 13#include <linux/console.h>
20#include <linux/fb.h> 14#include <linux/fb.h>
21#include <linux/screen_info.h> 15#include <linux/screen_info.h>
@@ -25,52 +19,16 @@
25#include <asm/sgialib.h> 19#include <asm/sgialib.h>
26#endif 20#endif
27 21
28#include <asm/bcache.h>
29#include <asm/bootinfo.h>
30#include <asm/io.h> 22#include <asm/io.h>
31#include <asm/irq.h>
32#include <asm/mc146818-time.h>
33#include <asm/processor.h>
34#include <asm/reboot.h> 23#include <asm/reboot.h>
35#include <asm/sni.h> 24#include <asm/sni.h>
36#include <asm/time.h> 25
37#include <asm/traps.h> 26unsigned int sni_brd_type;
38 27
39extern void sni_machine_restart(char *command); 28extern void sni_machine_restart(char *command);
40extern void sni_machine_halt(void); 29extern void sni_machine_halt(void);
41extern void sni_machine_power_off(void); 30extern void sni_machine_power_off(void);
42 31
43void __init plat_timer_setup(struct irqaction *irq)
44{
45 /* set the clock to 100 Hz */
46 outb_p(0x34,0x43); /* binary, mode 2, LSB/MSB, ch 0 */
47 outb_p(LATCH & 0xff , 0x40); /* LSB */
48 outb(LATCH >> 8 , 0x40); /* MSB */
49 setup_irq(0, irq);
50}
51
52/*
53 * A bit more gossip about the iron we're running on ...
54 */
55static inline void sni_pcimt_detect(void)
56{
57 char boardtype[80];
58 unsigned char csmsr;
59 char *p = boardtype;
60 unsigned int asic;
61
62 csmsr = *(volatile unsigned char *)PCIMT_CSMSR;
63
64 p += sprintf(p, "%s PCI", (csmsr & 0x80) ? "RM200" : "RM300");
65 if ((csmsr & 0x80) == 0)
66 p += sprintf(p, ", board revision %s",
67 (csmsr & 0x20) ? "D" : "C");
68 asic = csmsr & 0x80;
69 asic = (csmsr & 0x08) ? asic : !asic;
70 p += sprintf(p, ", ASIC PCI Rev %s", asic ? "1.0" : "1.1");
71 printk("%s.\n", boardtype);
72}
73
74static void __init sni_display_setup(void) 32static void __init sni_display_setup(void)
75{ 33{
76#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_ARC) 34#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE) && defined(CONFIG_ARC)
@@ -90,175 +48,11 @@ static void __init sni_display_setup(void)
90#endif 48#endif
91} 49}
92 50
93static struct resource sni_io_resource = {
94 .start = 0x00001000UL,
95 .end = 0x03bfffffUL,
96 .name = "PCIMT IO MEM",
97 .flags = IORESOURCE_IO,
98};
99
100static struct resource pcimt_io_resources[] = {
101 {
102 .start = 0x00,
103 .end = 0x1f,
104 .name = "dma1",
105 .flags = IORESOURCE_BUSY
106 }, {
107 .start = 0x40,
108 .end = 0x5f,
109 .name = "timer",
110 .flags = IORESOURCE_BUSY
111 }, {
112 .start = 0x60,
113 .end = 0x6f,
114 .name = "keyboard",
115 .flags = IORESOURCE_BUSY
116 }, {
117 .start = 0x80,
118 .end = 0x8f,
119 .name = "dma page reg",
120 .flags = IORESOURCE_BUSY
121 }, {
122 .start = 0xc0,
123 .end = 0xdf,
124 .name = "dma2",
125 .flags = IORESOURCE_BUSY
126 }, {
127 .start = 0xcfc,
128 .end = 0xcff,
129 .name = "PCI config data",
130 .flags = IORESOURCE_BUSY
131 }
132};
133
134static struct resource sni_mem_resource = {
135 .start = 0x10000000UL,
136 .end = 0xffffffffUL,
137 .name = "PCIMT PCI MEM",
138 .flags = IORESOURCE_MEM
139};
140
141/*
142 * The RM200/RM300 has a few holes in it's PCI/EISA memory address space used
143 * for other purposes. Be paranoid and allocate all of the before the PCI
144 * code gets a chance to to map anything else there ...
145 *
146 * This leaves the following areas available:
147 *
148 * 0x10000000 - 0x1009ffff (640kB) PCI/EISA/ISA Bus Memory
149 * 0x10100000 - 0x13ffffff ( 15MB) PCI/EISA/ISA Bus Memory
150 * 0x18000000 - 0x1fbfffff (124MB) PCI/EISA Bus Memory
151 * 0x1ff08000 - 0x1ffeffff (816kB) PCI/EISA Bus Memory
152 * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory
153 */
154static struct resource pcimt_mem_resources[] = {
155 {
156 .start = 0x100a0000,
157 .end = 0x100bffff,
158 .name = "Video RAM area",
159 .flags = IORESOURCE_BUSY
160 }, {
161 .start = 0x100c0000,
162 .end = 0x100fffff,
163 .name = "ISA Reserved",
164 .flags = IORESOURCE_BUSY
165 }, {
166 .start = 0x14000000,
167 .end = 0x17bfffff,
168 .name = "PCI IO",
169 .flags = IORESOURCE_BUSY
170 }, {
171 .start = 0x17c00000,
172 .end = 0x17ffffff,
173 .name = "Cache Replacement Area",
174 .flags = IORESOURCE_BUSY
175 }, {
176 .start = 0x1a000000,
177 .end = 0x1a000003,
178 .name = "PCI INT Acknowledge",
179 .flags = IORESOURCE_BUSY
180 }, {
181 .start = 0x1fc00000,
182 .end = 0x1fc7ffff,
183 .name = "Boot PROM",
184 .flags = IORESOURCE_BUSY
185 }, {
186 .start = 0x1fc80000,
187 .end = 0x1fcfffff,
188 .name = "Diag PROM",
189 .flags = IORESOURCE_BUSY
190 }, {
191 .start = 0x1fd00000,
192 .end = 0x1fdfffff,
193 .name = "X-Bus",
194 .flags = IORESOURCE_BUSY
195 }, {
196 .start = 0x1fe00000,
197 .end = 0x1fefffff,
198 .name = "BIOS map",
199 .flags = IORESOURCE_BUSY
200 }, {
201 .start = 0x1ff00000,
202 .end = 0x1ff7ffff,
203 .name = "NVRAM / EEPROM",
204 .flags = IORESOURCE_BUSY
205 }, {
206 .start = 0x1fff0000,
207 .end = 0x1fffefff,
208 .name = "ASIC PCI",
209 .flags = IORESOURCE_BUSY
210 }, {
211 .start = 0x1ffff000,
212 .end = 0x1fffffff,
213 .name = "MP Agent",
214 .flags = IORESOURCE_BUSY
215 }, {
216 .start = 0x20000000,
217 .end = 0x9fffffff,
218 .name = "Main Memory",
219 .flags = IORESOURCE_BUSY
220 }
221};
222
223static void __init sni_resource_init(void)
224{
225 int i;
226
227 /* request I/O space for devices used on all i[345]86 PCs */
228 for (i = 0; i < ARRAY_SIZE(pcimt_io_resources); i++)
229 request_resource(&ioport_resource, pcimt_io_resources + i);
230
231 /* request mem space for pcimt-specific devices */
232 for (i = 0; i < ARRAY_SIZE(pcimt_mem_resources); i++)
233 request_resource(&sni_mem_resource, pcimt_mem_resources + i);
234
235 ioport_resource.end = sni_io_resource.end;
236}
237
238extern struct pci_ops sni_pci_ops;
239
240static struct pci_controller sni_controller = {
241 .pci_ops = &sni_pci_ops,
242 .mem_resource = &sni_mem_resource,
243 .mem_offset = 0x10000000UL,
244 .io_resource = &sni_io_resource,
245 .io_offset = 0x00000000UL
246};
247
248static inline void sni_pcimt_time_init(void)
249{
250 rtc_mips_get_time = mc146818_get_cmos_time;
251 rtc_mips_set_time = mc146818_set_rtc_mmss;
252}
253 51
254void __init plat_mem_setup(void) 52void __init plat_mem_setup(void)
255{ 53{
256 sni_pcimt_detect();
257 sni_pcimt_sc_init();
258 sni_pcimt_time_init();
259
260 set_io_port_base(SNI_PORT_BASE); 54 set_io_port_base(SNI_PORT_BASE);
261 ioport_resource.end = sni_io_resource.end; 55// ioport_resource.end = sni_io_resource.end;
262 56
263 /* 57 /*
264 * Setup (E)ISA I/O memory access stuff 58 * Setup (E)ISA I/O memory access stuff
@@ -268,15 +62,33 @@ void __init plat_mem_setup(void)
268 EISA_bus = 1; 62 EISA_bus = 1;
269#endif 63#endif
270 64
271 sni_resource_init(); 65 switch (sni_brd_type) {
66 case SNI_BRD_10:
67 case SNI_BRD_10NEW:
68 case SNI_BRD_TOWER_OASIC:
69 case SNI_BRD_MINITOWER:
70 sni_a20r_init();
71 break;
72
73 case SNI_BRD_PCI_TOWER:
74 case SNI_BRD_PCI_TOWER_CPLUS:
75 sni_pcit_init();
76 break;
77
78 case SNI_BRD_RM200:
79 sni_rm200_init();
80 break;
81
82 case SNI_BRD_PCI_MTOWER:
83 case SNI_BRD_PCI_DESKTOP:
84 case SNI_BRD_PCI_MTOWER_CPLUS:
85 sni_pcimt_init();
86 break;
87 }
272 88
273 _machine_restart = sni_machine_restart; 89 _machine_restart = sni_machine_restart;
274 _machine_halt = sni_machine_halt; 90 _machine_halt = sni_machine_halt;
275 pm_power_off = sni_machine_power_off; 91 pm_power_off = sni_machine_power_off;
276 92
277 sni_display_setup(); 93 sni_display_setup();
278
279#ifdef CONFIG_PCI
280 register_pci_controller(&sni_controller);
281#endif
282} 94}
diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c
index 1213d166f22e..6a44bbf0b732 100644
--- a/arch/mips/sni/sniprom.c
+++ b/arch/mips/sni/sniprom.c
@@ -12,6 +12,7 @@
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/string.h> 14#include <linux/string.h>
15#include <linux/console.h>
15 16
16#include <asm/addrspace.h> 17#include <asm/addrspace.h>
17#include <asm/sni.h> 18#include <asm/sni.h>
@@ -31,7 +32,7 @@
31#define PROM_ENTRY(x) (PROM_VEC + (x)) 32#define PROM_ENTRY(x) (PROM_VEC + (x))
32 33
33 34
34#undef DEBUG 35#define DEBUG
35#ifdef DEBUG 36#ifdef DEBUG
36#define DBG_PRINTF(x...) prom_printf(x) 37#define DBG_PRINTF(x...) prom_printf(x)
37#else 38#else
@@ -93,14 +94,14 @@ static void sni_idprom_dump(void)
93{ 94{
94 int i; 95 int i;
95 96
96 prom_printf("SNI IDProm dump (first 128byte):\n"); 97 prom_printf("SNI IDProm dump:\n");
97 for(i=0;i<128;i++) { 98 for (i = 0; i < 256; i++) {
98 if (i%16 == 0) 99 if (i%16 == 0)
99 prom_printf("%04x ", i); 100 prom_printf("%04x ", i);
100 101
101 prom_printf("%02x ", *(unsigned char *) (SNI_IDPROM_BASE+i)); 102 prom_printf("%02x ", *(unsigned char *) (SNI_IDPROM_BASE + i));
102 103
103 if (i%16 == 15) 104 if (i % 16 == 15)
104 prom_printf("\n"); 105 prom_printf("\n");
105 } 106 }
106} 107}
@@ -118,7 +119,7 @@ static void sni_mem_init(void )
118 } memconf[8]; 119 } memconf[8];
119 120
120 /* MemSIZE from prom in 16MByte chunks */ 121 /* MemSIZE from prom in 16MByte chunks */
121 memsize=*((unsigned char *) SNI_IDPROM_MEMSIZE) * 16; 122 memsize = *((unsigned char *) SNI_IDPROM_MEMSIZE) * 16;
122 123
123 DBG_PRINTF("IDProm memsize: %lu MByte\n", memsize); 124 DBG_PRINTF("IDProm memsize: %lu MByte\n", memsize);
124 125
@@ -126,26 +127,134 @@ static void sni_mem_init(void )
126 __prom_get_memconf(&memconf); 127 __prom_get_memconf(&memconf);
127 128
128 DBG_PRINTF("prom_get_mem_conf memory configuration:\n"); 129 DBG_PRINTF("prom_get_mem_conf memory configuration:\n");
129 for(i=0;i<8 && memconf[i].size;i++) { 130 for (i = 0;i < 8 && memconf[i].size; i++) {
130 prom_printf("Bank%d: %08x @ %08x\n", i, 131 if (sni_brd_type == SNI_BRD_PCI_TOWER ||
132 sni_brd_type == SNI_BRD_PCI_TOWER_CPLUS) {
133 if (memconf[i].base >= 0x20000000 &&
134 memconf[i].base < 0x30000000) {
135 memconf[i].base -= 0x20000000;
136 }
137 }
138 DBG_PRINTF("Bank%d: %08x @ %08x\n", i,
131 memconf[i].size, memconf[i].base); 139 memconf[i].size, memconf[i].base);
132 add_memory_region(memconf[i].base, memconf[i].size, BOOT_MEM_RAM); 140 add_memory_region(memconf[i].base, memconf[i].size, BOOT_MEM_RAM);
133 } 141 }
134} 142}
135 143
144static void __init sni_console_setup(void)
145{
146 char *ctype;
147 char *cdev;
148 char *baud;
149 int port;
150 static char options[8];
151
152 cdev = prom_getenv ("console_dev");
153 if (strncmp (cdev, "tty", 3) == 0) {
154 ctype = prom_getenv ("console");
155 switch (*ctype) {
156 default:
157 case 'l':
158 port = 0;
159 baud = prom_getenv("lbaud");
160 break;
161 case 'r':
162 port = 1;
163 baud = prom_getenv("rbaud");
164 break;
165 }
166 if (baud)
167 strcpy(options, baud);
168 add_preferred_console("ttyS", port, baud ? options : NULL);
169 }
170}
171
136void __init prom_init(void) 172void __init prom_init(void)
137{ 173{
138 int argc = fw_arg0; 174 int argc = fw_arg0;
139 char **argv = (void *)fw_arg1; 175 char **argv = (void *)fw_arg1;
140 unsigned int sni_brd_type = *(unsigned char *) SNI_IDPROM_BRDTYPE;
141 int i; 176 int i;
177 int cputype;
142 178
143 DBG_PRINTF("Found SNI brdtype %02x\n", sni_brd_type); 179 sni_brd_type = *(unsigned char *)SNI_IDPROM_BRDTYPE;
180 cputype = *(unsigned char *)SNI_IDPROM_CPUTYPE;
181 switch (sni_brd_type) {
182 case SNI_BRD_TOWER_OASIC:
183 switch (cputype) {
184 case SNI_CPU_M8030:
185 systype = "RM400-330";
186 break;
187 case SNI_CPU_M8031:
188 systype = "RM400-430";
189 break;
190 case SNI_CPU_M8037:
191 systype = "RM400-530";
192 break;
193 case SNI_CPU_M8034:
194 systype = "RM400-730";
195 break;
196 default:
197 systype = "RM400-xxx";
198 break;
199 }
200 break;
201 case SNI_BRD_MINITOWER:
202 switch (cputype) {
203 case SNI_CPU_M8021:
204 case SNI_CPU_M8043:
205 systype = "RM400-120";
206 break;
207 case SNI_CPU_M8040:
208 systype = "RM400-220";
209 break;
210 case SNI_CPU_M8053:
211 systype = "RM400-225";
212 break;
213 case SNI_CPU_M8050:
214 systype = "RM400-420";
215 break;
216 default:
217 systype = "RM400-xxx";
218 break;
219 }
220 break;
221 case SNI_BRD_PCI_TOWER:
222 systype = "RM400-Cxx";
223 break;
224 case SNI_BRD_RM200:
225 systype = "RM200-xxx";
226 break;
227 case SNI_BRD_PCI_MTOWER:
228 systype = "RM300-Cxx";
229 break;
230 case SNI_BRD_PCI_DESKTOP:
231 switch (read_c0_prid() & 0xff00) {
232 case PRID_IMP_R4600:
233 case PRID_IMP_R4700:
234 systype = "RM200-C20";
235 break;
236 case PRID_IMP_R5000:
237 systype = "RM200-C40";
238 break;
239 default:
240 systype = "RM200-Cxx";
241 break;
242 }
243 break;
244 case SNI_BRD_PCI_TOWER_CPLUS:
245 systype = "RM400-Exx";
246 break;
247 case SNI_BRD_PCI_MTOWER_CPLUS:
248 systype = "RM300-Exx";
249 break;
250 }
251 DBG_PRINTF("Found SNI brdtype %02x name %s\n", sni_brd_type,systype);
144 252
145#ifdef DEBUG 253#ifdef DEBUG
146 sni_idprom_dump(); 254 sni_idprom_dump();
147#endif 255#endif
148 sni_mem_init(); 256 sni_mem_init();
257 sni_console_setup();
149 258
150 /* copy prom cmdline parameters to kernel cmdline */ 259 /* copy prom cmdline parameters to kernel cmdline */
151 for (i = 1; i < argc; i++) { 260 for (i = 1; i < argc; i++) {
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
new file mode 100644
index 000000000000..20028fc7757e
--- /dev/null
+++ b/arch/mips/sni/time.c
@@ -0,0 +1,148 @@
1#include <linux/types.h>
2#include <linux/interrupt.h>
3#include <linux/time.h>
4
5#include <asm/sni.h>
6#include <asm/time.h>
7
8#define SNI_CLOCK_TICK_RATE 3686400
9#define SNI_COUNTER2_DIV 64
10#define SNI_COUNTER0_DIV ((SNI_CLOCK_TICK_RATE / SNI_COUNTER2_DIV) / HZ)
11
12static void sni_a20r_timer_ack(void)
13{
14 *(volatile u8 *)A20R_PT_TIM0_ACK = 0x0; wmb();
15}
16
17/*
18 * a20r platform uses 2 counters to divide the input frequency.
19 * Counter 2 output is connected to Counter 0 & 1 input.
20 */
21static void __init sni_a20r_timer_setup(struct irqaction *irq)
22{
23 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0x34; wmb();
24 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = (SNI_COUNTER0_DIV) & 0xff; wmb();
25 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 0) = (SNI_COUNTER0_DIV >> 8) & 0xff; wmb();
26
27 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 12) = 0xb4; wmb();
28 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = (SNI_COUNTER2_DIV) & 0xff; wmb();
29 *(volatile u8 *)(A20R_PT_CLOCK_BASE + 8) = (SNI_COUNTER2_DIV >> 8) & 0xff; wmb();
30
31 setup_irq(SNI_A20R_IRQ_TIMER, irq);
32 mips_timer_ack = sni_a20r_timer_ack;
33}
34
35#define SNI_8254_TICK_RATE 1193182UL
36
37#define SNI_8254_TCSAMP_COUNTER ((SNI_8254_TICK_RATE / HZ) + 255)
38
39static __init unsigned long dosample(void)
40{
41 u32 ct0, ct1;
42 volatile u8 msb, lsb;
43
44 /* Start the counter. */
45 outb_p (0x34, 0x43);
46 outb_p(SNI_8254_TCSAMP_COUNTER & 0xff, 0x40);
47 outb (SNI_8254_TCSAMP_COUNTER >> 8, 0x40);
48
49 /* Get initial counter invariant */
50 ct0 = read_c0_count();
51
52 /* Latch and spin until top byte of counter0 is zero */
53 do {
54 outb (0x00, 0x43);
55 lsb = inb (0x40);
56 msb = inb (0x40);
57 ct1 = read_c0_count();
58 } while (msb);
59
60 /* Stop the counter. */
61 outb (0x38, 0x43);
62 /*
63 * Return the difference, this is how far the r4k counter increments
64 * for every 1/HZ seconds. We round off the nearest 1 MHz of master
65 * clock (= 1000000 / HZ / 2).
66 */
67 /*return (ct1 - ct0 + (500000/HZ/2)) / (500000/HZ) * (500000/HZ);*/
68 return (ct1 - ct0) / (500000/HZ) * (500000/HZ);
69}
70
71/*
72 * Here we need to calibrate the cycle counter to at least be close.
73 */
74__init void sni_cpu_time_init(void)
75{
76 unsigned long r4k_ticks[3];
77 unsigned long r4k_tick;
78
79 /*
80 * Figure out the r4k offset, the algorithm is very simple and works in
81 * _all_ cases as long as the 8254 counter register itself works ok (as
82 * an interrupt driving timer it does not because of bug, this is why
83 * we are using the onchip r4k counter/compare register to serve this
84 * purpose, but for r4k_offset calculation it will work ok for us).
85 * There are other very complicated ways of performing this calculation
86 * but this one works just fine so I am not going to futz around. ;-)
87 */
88 printk(KERN_INFO "Calibrating system timer... ");
89 dosample(); /* Prime cache. */
90 dosample(); /* Prime cache. */
91 /* Zero is NOT an option. */
92 do {
93 r4k_ticks[0] = dosample();
94 } while (!r4k_ticks[0]);
95 do {
96 r4k_ticks[1] = dosample();
97 } while (!r4k_ticks[1]);
98
99 if (r4k_ticks[0] != r4k_ticks[1]) {
100 printk("warning: timer counts differ, retrying... ");
101 r4k_ticks[2] = dosample();
102 if (r4k_ticks[2] == r4k_ticks[0]
103 || r4k_ticks[2] == r4k_ticks[1])
104 r4k_tick = r4k_ticks[2];
105 else {
106 printk("disagreement, using average... ");
107 r4k_tick = (r4k_ticks[0] + r4k_ticks[1]
108 + r4k_ticks[2]) / 3;
109 }
110 } else
111 r4k_tick = r4k_ticks[0];
112
113 printk("%d [%d.%04d MHz CPU]\n", (int) r4k_tick,
114 (int) (r4k_tick / (500000 / HZ)),
115 (int) (r4k_tick % (500000 / HZ)));
116
117 mips_hpt_frequency = r4k_tick * HZ;
118}
119
120/*
121 * R4k counter based timer interrupt. Works on RM200-225 and possibly
122 * others but not on RM400
123 */
124static void __init sni_cpu_timer_setup(struct irqaction *irq)
125{
126 setup_irq(SNI_MIPS_IRQ_CPU_TIMER, irq);
127}
128
129void __init plat_timer_setup(struct irqaction *irq)
130{
131 switch (sni_brd_type) {
132 case SNI_BRD_10:
133 case SNI_BRD_10NEW:
134 case SNI_BRD_TOWER_OASIC:
135 case SNI_BRD_MINITOWER:
136 sni_a20r_timer_setup (irq);
137 break;
138
139 case SNI_BRD_PCI_TOWER:
140 case SNI_BRD_RM200:
141 case SNI_BRD_PCI_MTOWER:
142 case SNI_BRD_PCI_DESKTOP:
143 case SNI_BRD_PCI_TOWER_CPLUS:
144 case SNI_BRD_PCI_MTOWER_CPLUS:
145 sni_cpu_timer_setup (irq);
146 break;
147 }
148}
diff --git a/include/asm-mips/abi.h b/include/asm-mips/abi.h
index 1ce0518ace2e..1dd74fbdc09b 100644
--- a/include/asm-mips/abi.h
+++ b/include/asm-mips/abi.h
@@ -13,13 +13,13 @@
13#include <asm/siginfo.h> 13#include <asm/siginfo.h>
14 14
15struct mips_abi { 15struct mips_abi {
16 void (* const do_signal)(struct pt_regs *regs);
17 int (* const setup_frame)(struct k_sigaction * ka, 16 int (* const setup_frame)(struct k_sigaction * ka,
18 struct pt_regs *regs, int signr, 17 struct pt_regs *regs, int signr,
19 sigset_t *set); 18 sigset_t *set);
20 int (* const setup_rt_frame)(struct k_sigaction * ka, 19 int (* const setup_rt_frame)(struct k_sigaction * ka,
21 struct pt_regs *regs, int signr, 20 struct pt_regs *regs, int signr,
22 sigset_t *set, siginfo_t *info); 21 sigset_t *set, siginfo_t *info);
22 const unsigned long restart;
23}; 23};
24 24
25#endif /* _ASM_ABI_H */ 25#endif /* _ASM_ABI_H */
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h
index 06c08228a525..89436b96ad66 100644
--- a/include/asm-mips/bitops.h
+++ b/include/asm-mips/bitops.h
@@ -3,7 +3,7 @@
3 * License. See the file "COPYING" in the main directory of this archive 3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (c) 1994 - 1997, 1999, 2000, 06 Ralf Baechle (ralf@linux-mips.org) 6 * Copyright (c) 1994 - 1997, 99, 2000, 06, 07 Ralf Baechle (ralf@linux-mips.org)
7 * Copyright (c) 1999, 2000 Silicon Graphics, Inc. 7 * Copyright (c) 1999, 2000 Silicon Graphics, Inc.
8 */ 8 */
9#ifndef _ASM_BITOPS_H 9#ifndef _ASM_BITOPS_H
@@ -24,11 +24,15 @@
24#define SZLONG_MASK 31UL 24#define SZLONG_MASK 31UL
25#define __LL "ll " 25#define __LL "ll "
26#define __SC "sc " 26#define __SC "sc "
27#define __INS "ins "
28#define __EXT "ext "
27#elif (_MIPS_SZLONG == 64) 29#elif (_MIPS_SZLONG == 64)
28#define SZLONG_LOG 6 30#define SZLONG_LOG 6
29#define SZLONG_MASK 63UL 31#define SZLONG_MASK 63UL
30#define __LL "lld " 32#define __LL "lld "
31#define __SC "scd " 33#define __SC "scd "
34#define __INS "dins "
35#define __EXT "dext "
32#endif 36#endif
33 37
34/* 38/*
@@ -62,6 +66,19 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
62 " .set mips0 \n" 66 " .set mips0 \n"
63 : "=&r" (temp), "=m" (*m) 67 : "=&r" (temp), "=m" (*m)
64 : "ir" (1UL << (nr & SZLONG_MASK)), "m" (*m)); 68 : "ir" (1UL << (nr & SZLONG_MASK)), "m" (*m));
69#ifdef CONFIG_CPU_MIPSR2
70 } else if (__builtin_constant_p(nr)) {
71 __asm__ __volatile__(
72 "1: " __LL "%0, %1 # set_bit \n"
73 " " __INS "%0, %4, %2, 1 \n"
74 " " __SC "%0, %1 \n"
75 " beqz %0, 2f \n"
76 " .subsection 2 \n"
77 "2: b 1b \n"
78 " .previous \n"
79 : "=&r" (temp), "=m" (*m)
80 : "ir" (nr & SZLONG_MASK), "m" (*m), "r" (~0));
81#endif /* CONFIG_CPU_MIPSR2 */
65 } else if (cpu_has_llsc) { 82 } else if (cpu_has_llsc) {
66 __asm__ __volatile__( 83 __asm__ __volatile__(
67 " .set mips3 \n" 84 " .set mips3 \n"
@@ -113,6 +130,19 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
113 " .set mips0 \n" 130 " .set mips0 \n"
114 : "=&r" (temp), "=m" (*m) 131 : "=&r" (temp), "=m" (*m)
115 : "ir" (~(1UL << (nr & SZLONG_MASK))), "m" (*m)); 132 : "ir" (~(1UL << (nr & SZLONG_MASK))), "m" (*m));
133#ifdef CONFIG_CPU_MIPSR2
134 } else if (__builtin_constant_p(nr)) {
135 __asm__ __volatile__(
136 "1: " __LL "%0, %1 # clear_bit \n"
137 " " __INS "%0, $0, %2, 1 \n"
138 " " __SC "%0, %1 \n"
139 " beqz %0, 2f \n"
140 " .subsection 2 \n"
141 "2: b 1b \n"
142 " .previous \n"
143 : "=&r" (temp), "=m" (*m)
144 : "ir" (nr & SZLONG_MASK), "m" (*m));
145#endif /* CONFIG_CPU_MIPSR2 */
116 } else if (cpu_has_llsc) { 146 } else if (cpu_has_llsc) {
117 __asm__ __volatile__( 147 __asm__ __volatile__(
118 " .set mips3 \n" 148 " .set mips3 \n"
@@ -291,6 +321,26 @@ static inline int test_and_clear_bit(unsigned long nr,
291 : "memory"); 321 : "memory");
292 322
293 return res != 0; 323 return res != 0;
324#ifdef CONFIG_CPU_MIPSR2
325 } else if (__builtin_constant_p(nr)) {
326 unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
327 unsigned long temp, res;
328
329 __asm__ __volatile__(
330 "1: " __LL "%0, %1 # test_and_clear_bit \n"
331 " " __EXT "%2, %0, %3, 1 \n"
332 " " __INS "%0, $0, %3, 1 \n"
333 " " __SC "%0, %1 \n"
334 " beqz %0, 2f \n"
335 " .subsection 2 \n"
336 "2: b 1b \n"
337 " .previous \n"
338 : "=&r" (temp), "=m" (*m), "=&r" (res)
339 : "ri" (nr & SZLONG_MASK), "m" (*m)
340 : "memory");
341
342 return res;
343#endif
294 } else if (cpu_has_llsc) { 344 } else if (cpu_has_llsc) {
295 unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG); 345 unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
296 unsigned long temp, res; 346 unsigned long temp, res;
diff --git a/include/asm-mips/compat-signal.h b/include/asm-mips/compat-signal.h
index 672077084aa1..6599a901b63e 100644
--- a/include/asm-mips/compat-signal.h
+++ b/include/asm-mips/compat-signal.h
@@ -5,6 +5,11 @@
5#include <linux/compat.h> 5#include <linux/compat.h>
6#include <linux/compiler.h> 6#include <linux/compiler.h>
7 7
8#include <asm/signal.h>
9#include <asm/siginfo.h>
10
11#include <asm/uaccess.h>
12
8static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d, 13static inline int __copy_conv_sigset_to_user(compat_sigset_t __user *d,
9 const sigset_t *s) 14 const sigset_t *s)
10{ 15{
@@ -33,9 +38,6 @@ static inline int __copy_conv_sigset_from_user(sigset_t *d,
33 BUG_ON(sizeof(*d) != sizeof(*s)); 38 BUG_ON(sizeof(*d) != sizeof(*s));
34 BUG_ON(_NSIG_WORDS != 2); 39 BUG_ON(_NSIG_WORDS != 2);
35 40
36 if (unlikely(!access_ok(VERIFY_READ, d, sizeof(*d))))
37 return -EFAULT;
38
39#ifdef CONFIG_CPU_BIG_ENDIAN 41#ifdef CONFIG_CPU_BIG_ENDIAN
40 err = __get_user(u->c.sig[1], &s->sig[0]); 42 err = __get_user(u->c.sig[1], &s->sig[0]);
41 err |= __get_user(u->c.sig[0], &s->sig[1]); 43 err |= __get_user(u->c.sig[0], &s->sig[1]);
diff --git a/include/asm-mips/ds1216.h b/include/asm-mips/ds1216.h
new file mode 100644
index 000000000000..1ff8b73f7a6a
--- /dev/null
+++ b/include/asm-mips/ds1216.h
@@ -0,0 +1,31 @@
1#ifndef _DS1216_H
2#define _DS1216_H
3
4extern volatile unsigned char *ds1216_base;
5unsigned long ds1216_get_cmos_time(void);
6int ds1216_set_rtc_mmss(unsigned long nowtime);
7
8#define DS1216_SEC_BYTE 1
9#define DS1216_MIN_BYTE 2
10#define DS1216_HOUR_BYTE 3
11#define DS1216_HOUR_MASK (0x1f)
12#define DS1216_AMPM_MASK (1<<5)
13#define DS1216_1224_MASK (1<<7)
14#define DS1216_DAY_BYTE 4
15#define DS1216_DAY_MASK (0x7)
16#define DS1216_DATE_BYTE 5
17#define DS1216_DATE_MASK (0x3f)
18#define DS1216_MONTH_BYTE 6
19#define DS1216_MONTH_MASK (0x1f)
20#define DS1216_YEAR_BYTE 7
21
22#define DS1216_SEC(buf) (buf[DS1216_SEC_BYTE])
23#define DS1216_MIN(buf) (buf[DS1216_MIN_BYTE])
24#define DS1216_HOUR(buf) (buf[DS1216_HOUR_BYTE] & DS1216_HOUR_MASK)
25#define DS1216_AMPM(buf) (buf[DS1216_HOUR_BYTE] & DS1216_AMPM_MASK)
26#define DS1216_1224(buf) (buf[DS1216_HOUR_BYTE] & DS1216_1224_MASK)
27#define DS1216_DATE(buf) (buf[DS1216_DATE_BYTE] & DS1216_DATE_MASK)
28#define DS1216_MONTH(buf) (buf[DS1216_MONTH_BYTE] & DS1216_MONTH_MASK)
29#define DS1216_YEAR(buf) (buf[DS1216_YEAR_BYTE])
30
31#endif
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index b6a2eb816628..92ec2618560c 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -20,6 +20,7 @@
20#include <asm/byteorder.h> 20#include <asm/byteorder.h>
21#include <asm/cpu.h> 21#include <asm/cpu.h>
22#include <asm/cpu-features.h> 22#include <asm/cpu-features.h>
23#include <asm-generic/iomap.h>
23#include <asm/page.h> 24#include <asm/page.h>
24#include <asm/pgtable-bits.h> 25#include <asm/pgtable-bits.h>
25#include <asm/processor.h> 26#include <asm/processor.h>
@@ -518,34 +519,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int
518} 519}
519 520
520/* 521/*
521 * Memory Mapped I/O
522 */
523#define ioread8(addr) readb(addr)
524#define ioread16(addr) readw(addr)
525#define ioread32(addr) readl(addr)
526
527#define iowrite8(b,addr) writeb(b,addr)
528#define iowrite16(w,addr) writew(w,addr)
529#define iowrite32(l,addr) writel(l,addr)
530
531#define ioread8_rep(a,b,c) readsb(a,b,c)
532#define ioread16_rep(a,b,c) readsw(a,b,c)
533#define ioread32_rep(a,b,c) readsl(a,b,c)
534
535#define iowrite8_rep(a,b,c) writesb(a,b,c)
536#define iowrite16_rep(a,b,c) writesw(a,b,c)
537#define iowrite32_rep(a,b,c) writesl(a,b,c)
538
539/* Create a virtual mapping cookie for an IO port range */
540extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
541extern void ioport_unmap(void __iomem *);
542
543/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
544struct pci_dev;
545extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
546extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
547
548/*
549 * ISA space is 'always mapped' on currently supported MIPS systems, no need 522 * ISA space is 'always mapped' on currently supported MIPS systems, no need
550 * to explicitly ioremap() it. The fact that the ISA IO space is mapped 523 * to explicitly ioremap() it. The fact that the ISA IO space is mapped
551 * to PAGE_OFFSET is pure coincidence - it does not mean ISA values 524 * to PAGE_OFFSET is pure coincidence - it does not mean ISA values
diff --git a/include/asm-mips/mach-rm/cpu-feature-overrides.h b/include/asm-mips/mach-rm/cpu-feature-overrides.h
index 11410ae10d36..7e07283140a3 100644
--- a/include/asm-mips/mach-rm/cpu-feature-overrides.h
+++ b/include/asm-mips/mach-rm/cpu-feature-overrides.h
@@ -21,9 +21,7 @@
21#define cpu_has_watch 0 21#define cpu_has_watch 0
22#define cpu_has_mips16 0 22#define cpu_has_mips16 0
23#define cpu_has_divec 0 23#define cpu_has_divec 0
24#define cpu_has_vce 0
25#define cpu_has_cache_cdex_p 1 24#define cpu_has_cache_cdex_p 1
26#define cpu_has_cache_cdex_s 0
27#define cpu_has_prefetch 0 25#define cpu_has_prefetch 0
28#define cpu_has_mcheck 0 26#define cpu_has_mcheck 0
29#define cpu_has_ejtag 0 27#define cpu_has_ejtag 0
@@ -35,9 +33,6 @@
35#define cpu_has_nofpuex 0 33#define cpu_has_nofpuex 0
36#define cpu_has_64bits 1 34#define cpu_has_64bits 1
37 35
38#define cpu_dcache_line_size() 32
39#define cpu_icache_line_size() 32
40
41#define cpu_has_mips32r1 0 36#define cpu_has_mips32r1 0
42#define cpu_has_mips32r2 0 37#define cpu_has_mips32r2 0
43#define cpu_has_mips64r1 0 38#define cpu_has_mips64r1 0
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
index 7f0f120ca07c..3eea3ba0fca5 100644
--- a/include/asm-mips/pci.h
+++ b/include/asm-mips/pci.h
@@ -32,6 +32,7 @@ struct pci_controller {
32 unsigned long mem_offset; 32 unsigned long mem_offset;
33 struct resource *io_resource; 33 struct resource *io_resource;
34 unsigned long io_offset; 34 unsigned long io_offset;
35 unsigned long io_map_base;
35 36
36 unsigned int index; 37 unsigned int index;
37 /* For compatibility with current (as of July 2003) pciutils 38 /* For compatibility with current (as of July 2003) pciutils
diff --git a/include/asm-mips/pgalloc.h b/include/asm-mips/pgalloc.h
index af121c67dc71..5685d4fc7881 100644
--- a/include/asm-mips/pgalloc.h
+++ b/include/asm-mips/pgalloc.h
@@ -130,4 +130,6 @@ static inline void pmd_free(pmd_t *pmd)
130 130
131#define check_pgt_cache() do { } while (0) 131#define check_pgt_cache() do { } while (0)
132 132
133extern void pagetable_init(void);
134
133#endif /* _ASM_PGALLOC_H */ 135#endif /* _ASM_PGALLOC_H */
diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h
index 8b391a2f0814..7a28989f7ee3 100644
--- a/include/asm-mips/signal.h
+++ b/include/asm-mips/signal.h
@@ -137,23 +137,6 @@ typedef struct sigaltstack {
137 137
138#define ptrace_signal_deliver(regs, cookie) do { } while (0) 138#define ptrace_signal_deliver(regs, cookie) do { } while (0)
139 139
140struct pt_regs;
141extern void do_signal(struct pt_regs *regs);
142extern void do_signal32(struct pt_regs *regs);
143
144extern int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
145 int signr, sigset_t *set);
146extern int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
147 int signr, sigset_t *set, siginfo_t *info);
148
149extern int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
150 int signr, sigset_t *set);
151extern int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
152 int signr, sigset_t *set, siginfo_t *info);
153
154extern int setup_rt_frame_n32(struct k_sigaction * ka, struct pt_regs *regs,
155 int signr, sigset_t *set, siginfo_t *info);
156
157#endif /* __KERNEL__ */ 140#endif /* __KERNEL__ */
158 141
159#endif /* _ASM_SIGNAL_H */ 142#endif /* _ASM_SIGNAL_H */
diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h
index b9ba54d0dd35..62f9be6f7320 100644
--- a/include/asm-mips/sni.h
+++ b/include/asm-mips/sni.h
@@ -6,12 +6,72 @@
6 * for more details. 6 * for more details.
7 * 7 *
8 * Copyright (C) 1997, 1998 by Ralf Baechle 8 * Copyright (C) 1997, 1998 by Ralf Baechle
9 * Copyright (C) 2006 Thomas Bogendoerfer (tsbogend@alpha.franken.de)
9 */ 10 */
10#ifndef __ASM_SNI_H 11#ifndef __ASM_SNI_H
11#define __ASM_SNI_H 12#define __ASM_SNI_H
12 13
14extern unsigned int sni_brd_type;
15
16#define SNI_BRD_10 2
17#define SNI_BRD_10NEW 3
18#define SNI_BRD_TOWER_OASIC 4
19#define SNI_BRD_MINITOWER 5
20#define SNI_BRD_PCI_TOWER 6
21#define SNI_BRD_RM200 7
22#define SNI_BRD_PCI_MTOWER 8
23#define SNI_BRD_PCI_DESKTOP 9
24#define SNI_BRD_PCI_TOWER_CPLUS 10
25#define SNI_BRD_PCI_MTOWER_CPLUS 11
26
27/* RM400 cpu types */
28#define SNI_CPU_M8021 0x01
29#define SNI_CPU_M8030 0x04
30#define SNI_CPU_M8031 0x06
31#define SNI_CPU_M8034 0x0f
32#define SNI_CPU_M8037 0x07
33#define SNI_CPU_M8040 0x05
34#define SNI_CPU_M8043 0x09
35#define SNI_CPU_M8050 0x0b
36#define SNI_CPU_M8053 0x0d
37
13#define SNI_PORT_BASE 0xb4000000 38#define SNI_PORT_BASE 0xb4000000
14 39
40#ifndef __MIPSEL__
41/*
42 * ASIC PCI registers for big endian configuration.
43 */
44#define PCIMT_UCONF 0xbfff0004
45#define PCIMT_IOADTIMEOUT2 0xbfff000c
46#define PCIMT_IOMEMCONF 0xbfff0014
47#define PCIMT_IOMMU 0xbfff001c
48#define PCIMT_IOADTIMEOUT1 0xbfff0024
49#define PCIMT_DMAACCESS 0xbfff002c
50#define PCIMT_DMAHIT 0xbfff0034
51#define PCIMT_ERRSTATUS 0xbfff003c
52#define PCIMT_ERRADDR 0xbfff0044
53#define PCIMT_SYNDROME 0xbfff004c
54#define PCIMT_ITPEND 0xbfff0054
55#define IT_INT2 0x01
56#define IT_INTD 0x02
57#define IT_INTC 0x04
58#define IT_INTB 0x08
59#define IT_INTA 0x10
60#define IT_EISA 0x20
61#define IT_SCSI 0x40
62#define IT_ETH 0x80
63#define PCIMT_IRQSEL 0xbfff005c
64#define PCIMT_TESTMEM 0xbfff0064
65#define PCIMT_ECCREG 0xbfff006c
66#define PCIMT_CONFIG_ADDRESS 0xbfff0074
67#define PCIMT_ASIC_ID 0xbfff007c /* read */
68#define PCIMT_SOFT_RESET 0xbfff007c /* write */
69#define PCIMT_PIA_OE 0xbfff0084
70#define PCIMT_PIA_DATAOUT 0xbfff008c
71#define PCIMT_PIA_DATAIN 0xbfff0094
72#define PCIMT_CACHECONF 0xbfff009c
73#define PCIMT_INVSPACE 0xbfff00a4
74#else
15/* 75/*
16 * ASIC PCI registers for little endian configuration. 76 * ASIC PCI registers for little endian configuration.
17 */ 77 */
@@ -45,6 +105,8 @@
45#define PCIMT_PIA_DATAIN 0xbfff0090 105#define PCIMT_PIA_DATAIN 0xbfff0090
46#define PCIMT_CACHECONF 0xbfff0098 106#define PCIMT_CACHECONF 0xbfff0098
47#define PCIMT_INVSPACE 0xbfff00a0 107#define PCIMT_INVSPACE 0xbfff00a0
108#endif
109
48#define PCIMT_PCI_CONF 0xbfff0100 110#define PCIMT_PCI_CONF 0xbfff0100
49 111
50/* 112/*
@@ -73,6 +135,36 @@
73#define PCIMT_PWDN 0xbfdf0000 135#define PCIMT_PWDN 0xbfdf0000
74 136
75/* 137/*
138 * A20R based boards
139 */
140#define A20R_PT_CLOCK_BASE 0xbc040000
141#define A20R_PT_TIM0_ACK 0xbc050000
142#define A20R_PT_TIM1_ACK 0xbc060000
143
144#define SNI_MIPS_IRQ_CPU_BASE 16
145#define SNI_MIPS_IRQ_CPU_TIMER (SNI_MIPS_IRQ_CPU_BASE+7)
146
147#define SNI_A20R_IRQ_BASE SNI_MIPS_IRQ_CPU_BASE
148#define SNI_A20R_IRQ_TIMER (SNI_A20R_IRQ_BASE+5)
149
150#define SNI_DS1216_A20R_BASE 0xbc081ffc
151#define SNI_DS1216_RM200_BASE 0xbcd41ffc
152
153#define SNI_PCIT_INT_REG 0xbfff000c
154
155#define SNI_PCIT_INT_START 24
156#define SNI_PCIT_INT_END 30
157
158#define PCIT_IRQ_ETHERNET (SNI_MIPS_IRQ_CPU_BASE + 5)
159#define PCIT_IRQ_INTA (SNI_PCIT_INT_START + 0)
160#define PCIT_IRQ_INTB (SNI_PCIT_INT_START + 1)
161#define PCIT_IRQ_INTC (SNI_PCIT_INT_START + 2)
162#define PCIT_IRQ_INTD (SNI_PCIT_INT_START + 3)
163#define PCIT_IRQ_SCSI0 (SNI_PCIT_INT_START + 4)
164#define PCIT_IRQ_SCSI1 (SNI_PCIT_INT_START + 5)
165
166
167/*
76 * Interrupt 0-16 are EISA interrupts. Interrupts from 16 on are assigned 168 * Interrupt 0-16 are EISA interrupts. Interrupts from 16 on are assigned
77 * to the other interrupts generated by ASIC PCI. 169 * to the other interrupts generated by ASIC PCI.
78 * 170 *
@@ -80,18 +172,22 @@
80 * ASIC PCI interrupt. 172 * ASIC PCI interrupt.
81 */ 173 */
82#define PCIMT_KEYBOARD_IRQ 1 174#define PCIMT_KEYBOARD_IRQ 1
83#define PCIMT_IRQ_INT2 16 175#define PCIMT_IRQ_INT2 24
84#define PCIMT_IRQ_INTD 17 176#define PCIMT_IRQ_INTD 25
85#define PCIMT_IRQ_INTC 18 177#define PCIMT_IRQ_INTC 26
86#define PCIMT_IRQ_INTB 19 178#define PCIMT_IRQ_INTB 27
87#define PCIMT_IRQ_INTA 20 179#define PCIMT_IRQ_INTA 28
88#define PCIMT_IRQ_EISA 21 180#define PCIMT_IRQ_EISA 29
89#define PCIMT_IRQ_SCSI 22 181#define PCIMT_IRQ_SCSI 30
90#define PCIMT_IRQ_ETHERNET 23 182
183#define PCIMT_IRQ_ETHERNET (SNI_MIPS_IRQ_CPU_BASE+6)
184
185#if 0
91#define PCIMT_IRQ_TEMPERATURE 24 186#define PCIMT_IRQ_TEMPERATURE 24
92#define PCIMT_IRQ_EISA_NMI 25 187#define PCIMT_IRQ_EISA_NMI 25
93#define PCIMT_IRQ_POWER_OFF 26 188#define PCIMT_IRQ_POWER_OFF 26
94#define PCIMT_IRQ_BUTTON 27 189#define PCIMT_IRQ_BUTTON 27
190#endif
95 191
96/* 192/*
97 * Base address for the mapped 16mb EISA bus segment. 193 * Base address for the mapped 16mb EISA bus segment.
@@ -101,4 +197,24 @@
101/* PCI EISA Interrupt acknowledge */ 197/* PCI EISA Interrupt acknowledge */
102#define PCIMT_INT_ACKNOWLEDGE 0xba000000 198#define PCIMT_INT_ACKNOWLEDGE 0xba000000
103 199
200/* board specific init functions */
201extern void sni_a20r_init (void);
202extern void sni_pcit_init (void);
203extern void sni_rm200_init (void);
204extern void sni_pcimt_init (void);
205
206/* board specific irq init functions */
207extern void sni_a20r_irq_init (void);
208extern void sni_pcit_irq_init (void);
209extern void sni_pcit_cplus_irq_init (void);
210extern void sni_rm200_irq_init (void);
211extern void sni_pcimt_irq_init (void);
212
213/* timer inits */
214extern void sni_cpu_time_init(void);
215
216/* common irq stuff */
217extern void (*sni_hwint)(void);
218extern struct irqaction sni_isa_irq;
219
104#endif /* __ASM_SNI_H */ 220#endif /* __ASM_SNI_H */
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-28 07:32:42 -0500