aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/configs/atlas_defconfig83
-rw-r--r--arch/mips/configs/bigsur_defconfig64
-rw-r--r--arch/mips/configs/capcella_defconfig143
-rw-r--r--arch/mips/configs/cobalt_defconfig68
-rw-r--r--arch/mips/configs/db1000_defconfig70
-rw-r--r--arch/mips/configs/db1100_defconfig71
-rw-r--r--arch/mips/configs/db1200_defconfig68
-rw-r--r--arch/mips/configs/db1500_defconfig105
-rw-r--r--arch/mips/configs/db1550_defconfig73
-rw-r--r--arch/mips/configs/ddb5476_defconfig69
-rw-r--r--arch/mips/configs/ddb5477_defconfig67
-rw-r--r--arch/mips/configs/decstation_defconfig69
-rw-r--r--arch/mips/configs/e55_defconfig288
-rw-r--r--arch/mips/configs/ev64120_defconfig67
-rw-r--r--arch/mips/configs/ev96100_defconfig64
-rw-r--r--arch/mips/configs/ip22_defconfig77
-rw-r--r--arch/mips/configs/ip27_defconfig54
-rw-r--r--arch/mips/configs/ip32_defconfig67
-rw-r--r--arch/mips/configs/it8172_defconfig66
-rw-r--r--arch/mips/configs/ivr_defconfig67
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig56
-rw-r--r--arch/mips/configs/jmr3927_defconfig72
-rw-r--r--arch/mips/configs/lasat200_defconfig69
-rw-r--r--arch/mips/configs/malta_defconfig86
-rw-r--r--arch/mips/configs/mipssim_defconfig64
-rw-r--r--arch/mips/configs/mpc30x_defconfig95
-rw-r--r--arch/mips/configs/ocelot_3_defconfig72
-rw-r--r--arch/mips/configs/ocelot_c_defconfig66
-rw-r--r--arch/mips/configs/ocelot_defconfig64
-rw-r--r--arch/mips/configs/ocelot_g_defconfig66
-rw-r--r--arch/mips/configs/pb1100_defconfig70
-rw-r--r--arch/mips/configs/pb1500_defconfig73
-rw-r--r--arch/mips/configs/pb1550_defconfig73
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig76
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig85
-rw-r--r--arch/mips/configs/qemu_defconfig48
-rw-r--r--arch/mips/configs/rbhma4500_defconfig95
-rw-r--r--arch/mips/configs/rm200_defconfig121
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig63
-rw-r--r--arch/mips/configs/sead_defconfig50
-rw-r--r--arch/mips/configs/tb0226_defconfig218
-rw-r--r--arch/mips/configs/tb0229_defconfig282
-rw-r--r--arch/mips/configs/tb0287_defconfig104
-rw-r--r--arch/mips/configs/workpad_defconfig185
-rw-r--r--arch/mips/configs/yosemite_defconfig54
-rw-r--r--arch/mips/defconfig77
46 files changed, 2316 insertions, 1768 deletions
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 9e1ae953e966..4b080bcb258f 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:52 2006 4# Mon Apr 24 14:50:55 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -127,11 +129,11 @@ CONFIG_RM7000_CPU_SCACHE=y
127CONFIG_CPU_HAS_PREFETCH=y 129CONFIG_CPU_HAS_PREFETCH=y
128# CONFIG_MIPS_MT is not set 130# CONFIG_MIPS_MT is not set
129# CONFIG_64BIT_PHYS_ADDR is not set 131# CONFIG_64BIT_PHYS_ADDR is not set
130# CONFIG_CPU_ADVANCED is not set
131CONFIG_CPU_HAS_LLSC=y 132CONFIG_CPU_HAS_LLSC=y
132CONFIG_CPU_HAS_SYNC=y 133CONFIG_CPU_HAS_SYNC=y
133CONFIG_GENERIC_HARDIRQS=y 134CONFIG_GENERIC_HARDIRQS=y
134CONFIG_GENERIC_IRQ_PROBE=y 135CONFIG_GENERIC_IRQ_PROBE=y
136CONFIG_CPU_SUPPORTS_HIGHMEM=y
135CONFIG_ARCH_FLATMEM_ENABLE=y 137CONFIG_ARCH_FLATMEM_ENABLE=y
136CONFIG_SELECT_MEMORY_MODEL=y 138CONFIG_SELECT_MEMORY_MODEL=y
137CONFIG_FLATMEM_MANUAL=y 139CONFIG_FLATMEM_MANUAL=y
@@ -149,7 +151,6 @@ CONFIG_PREEMPT_NONE=y
149# Code maturity level options 151# Code maturity level options
150# 152#
151CONFIG_EXPERIMENTAL=y 153CONFIG_EXPERIMENTAL=y
152CONFIG_CLEAN_COMPILE=y
153CONFIG_BROKEN_ON_SMP=y 154CONFIG_BROKEN_ON_SMP=y
154CONFIG_INIT_ENV_ARG_LIMIT=32 155CONFIG_INIT_ENV_ARG_LIMIT=32
155 156
@@ -165,6 +166,7 @@ CONFIG_SYSVIPC=y
165CONFIG_SYSCTL=y 166CONFIG_SYSCTL=y
166# CONFIG_AUDIT is not set 167# CONFIG_AUDIT is not set
167# CONFIG_IKCONFIG is not set 168# CONFIG_IKCONFIG is not set
169CONFIG_RELAY=y
168CONFIG_INITRAMFS_SOURCE="" 170CONFIG_INITRAMFS_SOURCE=""
169# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
170CONFIG_EMBEDDED=y 172CONFIG_EMBEDDED=y
@@ -178,10 +180,6 @@ CONFIG_BASE_FULL=y
178CONFIG_FUTEX=y 180CONFIG_FUTEX=y
179CONFIG_EPOLL=y 181CONFIG_EPOLL=y
180CONFIG_SHMEM=y 182CONFIG_SHMEM=y
181CONFIG_CC_ALIGN_FUNCTIONS=0
182CONFIG_CC_ALIGN_LABELS=0
183CONFIG_CC_ALIGN_LOOPS=0
184CONFIG_CC_ALIGN_JUMPS=0
185CONFIG_SLAB=y 183CONFIG_SLAB=y
186# CONFIG_TINY_SHMEM is not set 184# CONFIG_TINY_SHMEM is not set
187CONFIG_BASE_SMALL=0 185CONFIG_BASE_SMALL=0
@@ -193,7 +191,6 @@ CONFIG_BASE_SMALL=0
193CONFIG_MODULES=y 191CONFIG_MODULES=y
194CONFIG_MODULE_UNLOAD=y 192CONFIG_MODULE_UNLOAD=y
195# CONFIG_MODULE_FORCE_UNLOAD is not set 193# CONFIG_MODULE_FORCE_UNLOAD is not set
196CONFIG_OBSOLETE_MODPARM=y
197CONFIG_MODVERSIONS=y 194CONFIG_MODVERSIONS=y
198CONFIG_MODULE_SRCVERSION_ALL=y 195CONFIG_MODULE_SRCVERSION_ALL=y
199CONFIG_KMOD=y 196CONFIG_KMOD=y
@@ -202,6 +199,8 @@ CONFIG_KMOD=y
202# Block layer 199# Block layer
203# 200#
204# CONFIG_LBD is not set 201# CONFIG_LBD is not set
202# CONFIG_BLK_DEV_IO_TRACE is not set
203# CONFIG_LSF is not set
205 204
206# 205#
207# IO Schedulers 206# IO Schedulers
@@ -221,7 +220,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
221# 220#
222CONFIG_HW_HAS_PCI=y 221CONFIG_HW_HAS_PCI=y
223CONFIG_PCI=y 222CONFIG_PCI=y
224CONFIG_PCI_LEGACY_PROC=y
225CONFIG_MMU=y 223CONFIG_MMU=y
226 224
227# 225#
@@ -249,6 +247,7 @@ CONFIG_NET=y
249# 247#
250# Networking options 248# Networking options
251# 249#
250# CONFIG_NETDEBUG is not set
252CONFIG_PACKET=y 251CONFIG_PACKET=y
253CONFIG_PACKET_MMAP=y 252CONFIG_PACKET_MMAP=y
254CONFIG_UNIX=y 253CONFIG_UNIX=y
@@ -281,6 +280,7 @@ CONFIG_SYN_COOKIES=y
281CONFIG_INET_AH=m 280CONFIG_INET_AH=m
282CONFIG_INET_ESP=m 281CONFIG_INET_ESP=m
283CONFIG_INET_IPCOMP=m 282CONFIG_INET_IPCOMP=m
283CONFIG_INET_XFRM_TUNNEL=m
284CONFIG_INET_TUNNEL=m 284CONFIG_INET_TUNNEL=m
285CONFIG_INET_DIAG=y 285CONFIG_INET_DIAG=y
286CONFIG_INET_TCP_DIAG=y 286CONFIG_INET_TCP_DIAG=y
@@ -322,9 +322,12 @@ CONFIG_IP_VS_NQ=m
322CONFIG_IP_VS_FTP=m 322CONFIG_IP_VS_FTP=m
323CONFIG_IPV6=m 323CONFIG_IPV6=m
324CONFIG_IPV6_PRIVACY=y 324CONFIG_IPV6_PRIVACY=y
325CONFIG_IPV6_ROUTER_PREF=y
326CONFIG_IPV6_ROUTE_INFO=y
325CONFIG_INET6_AH=m 327CONFIG_INET6_AH=m
326CONFIG_INET6_ESP=m 328CONFIG_INET6_ESP=m
327CONFIG_INET6_IPCOMP=m 329CONFIG_INET6_IPCOMP=m
330CONFIG_INET6_XFRM_TUNNEL=m
328CONFIG_INET6_TUNNEL=m 331CONFIG_INET6_TUNNEL=m
329CONFIG_IPV6_TUNNEL=m 332CONFIG_IPV6_TUNNEL=m
330CONFIG_NETFILTER=y 333CONFIG_NETFILTER=y
@@ -348,11 +351,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
348CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 351CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
349CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 352CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
350CONFIG_NETFILTER_XT_MATCH_DCCP=m 353CONFIG_NETFILTER_XT_MATCH_DCCP=m
354CONFIG_NETFILTER_XT_MATCH_ESP=m
351CONFIG_NETFILTER_XT_MATCH_HELPER=m 355CONFIG_NETFILTER_XT_MATCH_HELPER=m
352CONFIG_NETFILTER_XT_MATCH_LENGTH=m 356CONFIG_NETFILTER_XT_MATCH_LENGTH=m
353CONFIG_NETFILTER_XT_MATCH_LIMIT=m 357CONFIG_NETFILTER_XT_MATCH_LIMIT=m
354CONFIG_NETFILTER_XT_MATCH_MAC=m 358CONFIG_NETFILTER_XT_MATCH_MAC=m
355CONFIG_NETFILTER_XT_MATCH_MARK=m 359CONFIG_NETFILTER_XT_MATCH_MARK=m
360CONFIG_NETFILTER_XT_MATCH_POLICY=m
361CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
356CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m 362CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
357CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 363CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
358CONFIG_NETFILTER_XT_MATCH_REALM=m 364CONFIG_NETFILTER_XT_MATCH_REALM=m
@@ -376,20 +382,19 @@ CONFIG_IP_NF_IRC=m
376CONFIG_IP_NF_TFTP=m 382CONFIG_IP_NF_TFTP=m
377CONFIG_IP_NF_AMANDA=m 383CONFIG_IP_NF_AMANDA=m
378CONFIG_IP_NF_PPTP=m 384CONFIG_IP_NF_PPTP=m
385CONFIG_IP_NF_H323=m
379CONFIG_IP_NF_QUEUE=m 386CONFIG_IP_NF_QUEUE=m
380CONFIG_IP_NF_IPTABLES=m 387CONFIG_IP_NF_IPTABLES=m
381CONFIG_IP_NF_MATCH_IPRANGE=m 388CONFIG_IP_NF_MATCH_IPRANGE=m
382CONFIG_IP_NF_MATCH_MULTIPORT=m
383CONFIG_IP_NF_MATCH_TOS=m 389CONFIG_IP_NF_MATCH_TOS=m
384CONFIG_IP_NF_MATCH_RECENT=m 390CONFIG_IP_NF_MATCH_RECENT=m
385CONFIG_IP_NF_MATCH_ECN=m 391CONFIG_IP_NF_MATCH_ECN=m
386CONFIG_IP_NF_MATCH_DSCP=m 392CONFIG_IP_NF_MATCH_DSCP=m
387CONFIG_IP_NF_MATCH_AH_ESP=m 393CONFIG_IP_NF_MATCH_AH=m
388CONFIG_IP_NF_MATCH_TTL=m 394CONFIG_IP_NF_MATCH_TTL=m
389CONFIG_IP_NF_MATCH_OWNER=m 395CONFIG_IP_NF_MATCH_OWNER=m
390CONFIG_IP_NF_MATCH_ADDRTYPE=m 396CONFIG_IP_NF_MATCH_ADDRTYPE=m
391CONFIG_IP_NF_MATCH_HASHLIMIT=m 397CONFIG_IP_NF_MATCH_HASHLIMIT=m
392CONFIG_IP_NF_MATCH_POLICY=m
393CONFIG_IP_NF_FILTER=m 398CONFIG_IP_NF_FILTER=m
394CONFIG_IP_NF_TARGET_REJECT=m 399CONFIG_IP_NF_TARGET_REJECT=m
395CONFIG_IP_NF_TARGET_LOG=m 400CONFIG_IP_NF_TARGET_LOG=m
@@ -407,6 +412,7 @@ CONFIG_IP_NF_NAT_FTP=m
407CONFIG_IP_NF_NAT_TFTP=m 412CONFIG_IP_NF_NAT_TFTP=m
408CONFIG_IP_NF_NAT_AMANDA=m 413CONFIG_IP_NF_NAT_AMANDA=m
409CONFIG_IP_NF_NAT_PPTP=m 414CONFIG_IP_NF_NAT_PPTP=m
415CONFIG_IP_NF_NAT_H323=m
410CONFIG_IP_NF_MANGLE=m 416CONFIG_IP_NF_MANGLE=m
411CONFIG_IP_NF_TARGET_TOS=m 417CONFIG_IP_NF_TARGET_TOS=m
412CONFIG_IP_NF_TARGET_ECN=m 418CONFIG_IP_NF_TARGET_ECN=m
@@ -427,12 +433,10 @@ CONFIG_IP6_NF_MATCH_RT=m
427CONFIG_IP6_NF_MATCH_OPTS=m 433CONFIG_IP6_NF_MATCH_OPTS=m
428CONFIG_IP6_NF_MATCH_FRAG=m 434CONFIG_IP6_NF_MATCH_FRAG=m
429CONFIG_IP6_NF_MATCH_HL=m 435CONFIG_IP6_NF_MATCH_HL=m
430CONFIG_IP6_NF_MATCH_MULTIPORT=m
431CONFIG_IP6_NF_MATCH_OWNER=m 436CONFIG_IP6_NF_MATCH_OWNER=m
432CONFIG_IP6_NF_MATCH_IPV6HEADER=m 437CONFIG_IP6_NF_MATCH_IPV6HEADER=m
433CONFIG_IP6_NF_MATCH_AHESP=m 438CONFIG_IP6_NF_MATCH_AH=m
434CONFIG_IP6_NF_MATCH_EUI64=m 439CONFIG_IP6_NF_MATCH_EUI64=m
435CONFIG_IP6_NF_MATCH_POLICY=m
436CONFIG_IP6_NF_FILTER=m 440CONFIG_IP6_NF_FILTER=m
437CONFIG_IP6_NF_TARGET_LOG=m 441CONFIG_IP6_NF_TARGET_LOG=m
438CONFIG_IP6_NF_TARGET_REJECT=m 442CONFIG_IP6_NF_TARGET_REJECT=m
@@ -478,6 +482,11 @@ CONFIG_IP_SCTP=m
478# CONFIG_SCTP_HMAC_NONE is not set 482# CONFIG_SCTP_HMAC_NONE is not set
479# CONFIG_SCTP_HMAC_SHA1 is not set 483# CONFIG_SCTP_HMAC_SHA1 is not set
480CONFIG_SCTP_HMAC_MD5=y 484CONFIG_SCTP_HMAC_MD5=y
485
486#
487# TIPC Configuration (EXPERIMENTAL)
488#
489# CONFIG_TIPC is not set
481# CONFIG_ATM is not set 490# CONFIG_ATM is not set
482CONFIG_BRIDGE=m 491CONFIG_BRIDGE=m
483CONFIG_VLAN_8021Q=m 492CONFIG_VLAN_8021Q=m
@@ -492,11 +501,6 @@ CONFIG_IPDDP_ENCAP=y
492CONFIG_IPDDP_DECAP=y 501CONFIG_IPDDP_DECAP=y
493# CONFIG_X25 is not set 502# CONFIG_X25 is not set
494# CONFIG_LAPB is not set 503# CONFIG_LAPB is not set
495
496#
497# TIPC Configuration (EXPERIMENTAL)
498#
499# CONFIG_TIPC is not set
500CONFIG_NET_DIVERT=y 504CONFIG_NET_DIVERT=y
501# CONFIG_ECONET is not set 505# CONFIG_ECONET is not set
502# CONFIG_WAN_ROUTER is not set 506# CONFIG_WAN_ROUTER is not set
@@ -556,6 +560,9 @@ CONFIG_IEEE80211=m
556# CONFIG_IEEE80211_DEBUG is not set 560# CONFIG_IEEE80211_DEBUG is not set
557CONFIG_IEEE80211_CRYPT_WEP=m 561CONFIG_IEEE80211_CRYPT_WEP=m
558CONFIG_IEEE80211_CRYPT_CCMP=m 562CONFIG_IEEE80211_CRYPT_CCMP=m
563CONFIG_IEEE80211_SOFTMAC=m
564# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
565CONFIG_WIRELESS_EXT=y
559 566
560# 567#
561# Device Drivers 568# Device Drivers
@@ -694,9 +701,8 @@ CONFIG_SCSI_SYM53C8XX_2=y
694CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 701CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
695CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 702CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
696CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 703CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
697# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 704CONFIG_SCSI_SYM53C8XX_MMIO=y
698# CONFIG_SCSI_IPR is not set 705# CONFIG_SCSI_IPR is not set
699# CONFIG_SCSI_QLOGIC_FC is not set
700# CONFIG_SCSI_QLOGIC_1280 is not set 706# CONFIG_SCSI_QLOGIC_1280 is not set
701# CONFIG_SCSI_QLA_FC is not set 707# CONFIG_SCSI_QLA_FC is not set
702# CONFIG_SCSI_LPFC is not set 708# CONFIG_SCSI_LPFC is not set
@@ -715,6 +721,7 @@ CONFIG_MD_RAID0=m
715CONFIG_MD_RAID1=m 721CONFIG_MD_RAID1=m
716CONFIG_MD_RAID10=m 722CONFIG_MD_RAID10=m
717CONFIG_MD_RAID5=m 723CONFIG_MD_RAID5=m
724CONFIG_MD_RAID5_RESHAPE=y
718CONFIG_MD_RAID6=m 725CONFIG_MD_RAID6=m
719CONFIG_MD_MULTIPATH=m 726CONFIG_MD_MULTIPATH=m
720CONFIG_MD_FAULTY=m 727CONFIG_MD_FAULTY=m
@@ -921,6 +928,7 @@ CONFIG_HW_CONSOLE=y
921# 928#
922CONFIG_SERIAL_8250=y 929CONFIG_SERIAL_8250=y
923CONFIG_SERIAL_8250_CONSOLE=y 930CONFIG_SERIAL_8250_CONSOLE=y
931CONFIG_SERIAL_8250_PCI=m
924CONFIG_SERIAL_8250_NR_UARTS=4 932CONFIG_SERIAL_8250_NR_UARTS=4
925CONFIG_SERIAL_8250_RUNTIME_UARTS=4 933CONFIG_SERIAL_8250_RUNTIME_UARTS=4
926# CONFIG_SERIAL_8250_EXTENDED is not set 934# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -930,6 +938,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
930# 938#
931CONFIG_SERIAL_CORE=y 939CONFIG_SERIAL_CORE=y
932CONFIG_SERIAL_CORE_CONSOLE=y 940CONFIG_SERIAL_CORE_CONSOLE=y
941# CONFIG_SERIAL_JSM is not set
933CONFIG_UNIX98_PTYS=y 942CONFIG_UNIX98_PTYS=y
934CONFIG_LEGACY_PTYS=y 943CONFIG_LEGACY_PTYS=y
935CONFIG_LEGACY_PTY_COUNT=256 944CONFIG_LEGACY_PTY_COUNT=256
@@ -988,10 +997,6 @@ CONFIG_LEGACY_PTY_COUNT=256
988# 997#
989 998
990# 999#
991# Multimedia Capabilities Port drivers
992#
993
994#
995# Multimedia devices 1000# Multimedia devices
996# 1001#
997# CONFIG_VIDEO_DEV is not set 1002# CONFIG_VIDEO_DEV is not set
@@ -1022,6 +1027,7 @@ CONFIG_DUMMY_CONSOLE=y
1022# 1027#
1023CONFIG_USB_ARCH_HAS_HCD=y 1028CONFIG_USB_ARCH_HAS_HCD=y
1024CONFIG_USB_ARCH_HAS_OHCI=y 1029CONFIG_USB_ARCH_HAS_OHCI=y
1030CONFIG_USB_ARCH_HAS_EHCI=y
1025# CONFIG_USB is not set 1031# CONFIG_USB is not set
1026 1032
1027# 1033#
@@ -1039,13 +1045,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1039# CONFIG_MMC is not set 1045# CONFIG_MMC is not set
1040 1046
1041# 1047#
1048# LED devices
1049#
1050# CONFIG_NEW_LEDS is not set
1051
1052#
1053# LED drivers
1054#
1055
1056#
1057# LED Triggers
1058#
1059
1060#
1042# InfiniBand support 1061# InfiniBand support
1043# 1062#
1044# CONFIG_INFINIBAND is not set 1063# CONFIG_INFINIBAND is not set
1045 1064
1046# 1065#
1047# SN Devices 1066# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1067#
1068
1069#
1070# Real Time Clock
1048# 1071#
1072# CONFIG_RTC_CLASS is not set
1049 1073
1050# 1074#
1051# File systems 1075# File systems
@@ -1120,7 +1144,6 @@ CONFIG_SYSFS=y
1120# CONFIG_TMPFS is not set 1144# CONFIG_TMPFS is not set
1121# CONFIG_HUGETLB_PAGE is not set 1145# CONFIG_HUGETLB_PAGE is not set
1122CONFIG_RAMFS=y 1146CONFIG_RAMFS=y
1123CONFIG_RELAYFS_FS=m
1124# CONFIG_CONFIGFS_FS is not set 1147# CONFIG_CONFIGFS_FS is not set
1125 1148
1126# 1149#
@@ -1140,7 +1163,6 @@ CONFIG_VXFS_FS=m
1140# CONFIG_QNX4FS_FS is not set 1163# CONFIG_QNX4FS_FS is not set
1141CONFIG_SYSV_FS=m 1164CONFIG_SYSV_FS=m
1142CONFIG_UFS_FS=m 1165CONFIG_UFS_FS=m
1143# CONFIG_UFS_FS_WRITE is not set
1144 1166
1145# 1167#
1146# Network File Systems 1168# Network File Systems
@@ -1232,6 +1254,7 @@ CONFIG_NLS_UTF8=m
1232# CONFIG_MAGIC_SYSRQ is not set 1254# CONFIG_MAGIC_SYSRQ is not set
1233# CONFIG_DEBUG_KERNEL is not set 1255# CONFIG_DEBUG_KERNEL is not set
1234CONFIG_LOG_BUF_SHIFT=14 1256CONFIG_LOG_BUF_SHIFT=14
1257# CONFIG_DEBUG_FS is not set
1235CONFIG_CROSSCOMPILE=y 1258CONFIG_CROSSCOMPILE=y
1236CONFIG_CMDLINE="" 1259CONFIG_CMDLINE=""
1237 1260
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 32984100a75e..d85cda58d650 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:53 2006 4# Mon Apr 24 14:50:55 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -80,6 +80,8 @@ CONFIG_SIBYTE_CFE=y
80# CONFIG_SIBYTE_SB1250_PROF is not set 80# CONFIG_SIBYTE_SB1250_PROF is not set
81# CONFIG_SIBYTE_TBPROF is not set 81# CONFIG_SIBYTE_TBPROF is not set
82CONFIG_RWSEM_GENERIC_SPINLOCK=y 82CONFIG_RWSEM_GENERIC_SPINLOCK=y
83CONFIG_GENERIC_FIND_NEXT_BIT=y
84CONFIG_GENERIC_HWEIGHT=y
83CONFIG_GENERIC_CALIBRATE_DELAY=y 85CONFIG_GENERIC_CALIBRATE_DELAY=y
84CONFIG_DMA_COHERENT=y 86CONFIG_DMA_COHERENT=y
85CONFIG_CPU_BIG_ENDIAN=y 87CONFIG_CPU_BIG_ENDIAN=y
@@ -154,7 +156,6 @@ CONFIG_PREEMPT_NONE=y
154# Code maturity level options 156# Code maturity level options
155# 157#
156CONFIG_EXPERIMENTAL=y 158CONFIG_EXPERIMENTAL=y
157CONFIG_CLEAN_COMPILE=y
158CONFIG_LOCK_KERNEL=y 159CONFIG_LOCK_KERNEL=y
159CONFIG_INIT_ENV_ARG_LIMIT=32 160CONFIG_INIT_ENV_ARG_LIMIT=32
160 161
@@ -172,6 +173,7 @@ CONFIG_SYSCTL=y
172CONFIG_IKCONFIG=y 173CONFIG_IKCONFIG=y
173CONFIG_IKCONFIG_PROC=y 174CONFIG_IKCONFIG_PROC=y
174# CONFIG_CPUSETS is not set 175# CONFIG_CPUSETS is not set
176# CONFIG_RELAY is not set
175CONFIG_INITRAMFS_SOURCE="" 177CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
177CONFIG_EMBEDDED=y 179CONFIG_EMBEDDED=y
@@ -186,10 +188,6 @@ CONFIG_BASE_FULL=y
186CONFIG_FUTEX=y 188CONFIG_FUTEX=y
187CONFIG_EPOLL=y 189CONFIG_EPOLL=y
188CONFIG_SHMEM=y 190CONFIG_SHMEM=y
189CONFIG_CC_ALIGN_FUNCTIONS=0
190CONFIG_CC_ALIGN_LABELS=0
191CONFIG_CC_ALIGN_LOOPS=0
192CONFIG_CC_ALIGN_JUMPS=0
193CONFIG_SLAB=y 191CONFIG_SLAB=y
194# CONFIG_TINY_SHMEM is not set 192# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 193CONFIG_BASE_SMALL=0
@@ -201,7 +199,6 @@ CONFIG_BASE_SMALL=0
201CONFIG_MODULES=y 199CONFIG_MODULES=y
202CONFIG_MODULE_UNLOAD=y 200CONFIG_MODULE_UNLOAD=y
203# CONFIG_MODULE_FORCE_UNLOAD is not set 201# CONFIG_MODULE_FORCE_UNLOAD is not set
204CONFIG_OBSOLETE_MODPARM=y
205CONFIG_MODVERSIONS=y 202CONFIG_MODVERSIONS=y
206CONFIG_MODULE_SRCVERSION_ALL=y 203CONFIG_MODULE_SRCVERSION_ALL=y
207CONFIG_KMOD=y 204CONFIG_KMOD=y
@@ -210,6 +207,7 @@ CONFIG_STOP_MACHINE=y
210# 207#
211# Block layer 208# Block layer
212# 209#
210# CONFIG_BLK_DEV_IO_TRACE is not set
213 211
214# 212#
215# IO Schedulers 213# IO Schedulers
@@ -230,7 +228,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
230CONFIG_HW_HAS_PCI=y 228CONFIG_HW_HAS_PCI=y
231CONFIG_PCI=y 229CONFIG_PCI=y
232CONFIG_PCI_DOMAINS=y 230CONFIG_PCI_DOMAINS=y
233CONFIG_PCI_LEGACY_PROC=y
234CONFIG_PCI_DEBUG=y 231CONFIG_PCI_DEBUG=y
235CONFIG_MMU=y 232CONFIG_MMU=y
236 233
@@ -249,6 +246,7 @@ CONFIG_MMU=y
249# 246#
250CONFIG_BINFMT_ELF=y 247CONFIG_BINFMT_ELF=y
251# CONFIG_BINFMT_MISC is not set 248# CONFIG_BINFMT_MISC is not set
249CONFIG_BUILD_ELF64=y
252CONFIG_MIPS32_COMPAT=y 250CONFIG_MIPS32_COMPAT=y
253CONFIG_COMPAT=y 251CONFIG_COMPAT=y
254CONFIG_MIPS32_O32=y 252CONFIG_MIPS32_O32=y
@@ -263,6 +261,7 @@ CONFIG_NET=y
263# 261#
264# Networking options 262# Networking options
265# 263#
264# CONFIG_NETDEBUG is not set
266CONFIG_PACKET=y 265CONFIG_PACKET=y
267CONFIG_PACKET_MMAP=y 266CONFIG_PACKET_MMAP=y
268CONFIG_UNIX=y 267CONFIG_UNIX=y
@@ -284,12 +283,15 @@ CONFIG_IP_PNP_BOOTP=y
284# CONFIG_INET_AH is not set 283# CONFIG_INET_AH is not set
285# CONFIG_INET_ESP is not set 284# CONFIG_INET_ESP is not set
286# CONFIG_INET_IPCOMP is not set 285# CONFIG_INET_IPCOMP is not set
287CONFIG_INET_TUNNEL=m 286# CONFIG_INET_XFRM_TUNNEL is not set
287# CONFIG_INET_TUNNEL is not set
288CONFIG_INET_DIAG=y 288CONFIG_INET_DIAG=y
289CONFIG_INET_TCP_DIAG=y 289CONFIG_INET_TCP_DIAG=y
290# CONFIG_TCP_CONG_ADVANCED is not set 290# CONFIG_TCP_CONG_ADVANCED is not set
291CONFIG_TCP_CONG_BIC=y 291CONFIG_TCP_CONG_BIC=y
292# CONFIG_IPV6 is not set 292# CONFIG_IPV6 is not set
293# CONFIG_INET6_XFRM_TUNNEL is not set
294# CONFIG_INET6_TUNNEL is not set
293# CONFIG_NETFILTER is not set 295# CONFIG_NETFILTER is not set
294 296
295# 297#
@@ -301,6 +303,11 @@ CONFIG_TCP_CONG_BIC=y
301# SCTP Configuration (EXPERIMENTAL) 303# SCTP Configuration (EXPERIMENTAL)
302# 304#
303# CONFIG_IP_SCTP is not set 305# CONFIG_IP_SCTP is not set
306
307#
308# TIPC Configuration (EXPERIMENTAL)
309#
310# CONFIG_TIPC is not set
304# CONFIG_ATM is not set 311# CONFIG_ATM is not set
305# CONFIG_BRIDGE is not set 312# CONFIG_BRIDGE is not set
306# CONFIG_VLAN_8021Q is not set 313# CONFIG_VLAN_8021Q is not set
@@ -310,11 +317,6 @@ CONFIG_TCP_CONG_BIC=y
310# CONFIG_ATALK is not set 317# CONFIG_ATALK is not set
311# CONFIG_X25 is not set 318# CONFIG_X25 is not set
312# CONFIG_LAPB is not set 319# CONFIG_LAPB is not set
313
314#
315# TIPC Configuration (EXPERIMENTAL)
316#
317# CONFIG_TIPC is not set
318# CONFIG_NET_DIVERT is not set 320# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 321# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 322# CONFIG_WAN_ROUTER is not set
@@ -377,7 +379,7 @@ CONFIG_BLK_DEV_LOOP=m
377CONFIG_BLK_DEV_NBD=m 379CONFIG_BLK_DEV_NBD=m
378# CONFIG_BLK_DEV_SX8 is not set 380# CONFIG_BLK_DEV_SX8 is not set
379# CONFIG_BLK_DEV_RAM is not set 381# CONFIG_BLK_DEV_RAM is not set
380CONFIG_BLK_DEV_RAM_COUNT=16 382# CONFIG_BLK_DEV_INITRD is not set
381# CONFIG_CDROM_PKTCDVD is not set 383# CONFIG_CDROM_PKTCDVD is not set
382# CONFIG_ATA_OVER_ETH is not set 384# CONFIG_ATA_OVER_ETH is not set
383 385
@@ -575,6 +577,7 @@ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
575# 577#
576# Non-8250 serial port support 578# Non-8250 serial port support
577# 579#
580# CONFIG_SERIAL_JSM is not set
578CONFIG_UNIX98_PTYS=y 581CONFIG_UNIX98_PTYS=y
579CONFIG_LEGACY_PTYS=y 582CONFIG_LEGACY_PTYS=y
580CONFIG_LEGACY_PTY_COUNT=256 583CONFIG_LEGACY_PTY_COUNT=256
@@ -637,7 +640,6 @@ CONFIG_I2C_ALGO_SIBYTE=y
637# CONFIG_I2C_PROSAVAGE is not set 640# CONFIG_I2C_PROSAVAGE is not set
638# CONFIG_I2C_SAVAGE4 is not set 641# CONFIG_I2C_SAVAGE4 is not set
639CONFIG_I2C_SIBYTE=y 642CONFIG_I2C_SIBYTE=y
640# CONFIG_SCx200_ACB is not set
641# CONFIG_I2C_SIS5595 is not set 643# CONFIG_I2C_SIS5595 is not set
642# CONFIG_I2C_SIS630 is not set 644# CONFIG_I2C_SIS630 is not set
643# CONFIG_I2C_SIS96X is not set 645# CONFIG_I2C_SIS96X is not set
@@ -656,9 +658,7 @@ CONFIG_SENSORS_EEPROM=y
656CONFIG_SENSORS_PCF8574=y 658CONFIG_SENSORS_PCF8574=y
657CONFIG_SENSORS_PCA9539=y 659CONFIG_SENSORS_PCA9539=y
658CONFIG_SENSORS_PCF8591=y 660CONFIG_SENSORS_PCF8591=y
659CONFIG_SENSORS_RTC8564=y
660CONFIG_SENSORS_MAX6875=y 661CONFIG_SENSORS_MAX6875=y
661# CONFIG_RTC_X1205_I2C is not set
662CONFIG_I2C_DEBUG_CORE=y 662CONFIG_I2C_DEBUG_CORE=y
663CONFIG_I2C_DEBUG_ALGO=y 663CONFIG_I2C_DEBUG_ALGO=y
664CONFIG_I2C_DEBUG_BUS=y 664CONFIG_I2C_DEBUG_BUS=y
@@ -686,10 +686,6 @@ CONFIG_I2C_DEBUG_CHIP=y
686# 686#
687 687
688# 688#
689# Multimedia Capabilities Port drivers
690#
691
692#
693# Multimedia devices 689# Multimedia devices
694# 690#
695# CONFIG_VIDEO_DEV is not set 691# CONFIG_VIDEO_DEV is not set
@@ -714,6 +710,7 @@ CONFIG_I2C_DEBUG_CHIP=y
714# 710#
715CONFIG_USB_ARCH_HAS_HCD=y 711CONFIG_USB_ARCH_HAS_HCD=y
716CONFIG_USB_ARCH_HAS_OHCI=y 712CONFIG_USB_ARCH_HAS_OHCI=y
713CONFIG_USB_ARCH_HAS_EHCI=y
717# CONFIG_USB is not set 714# CONFIG_USB is not set
718 715
719# 716#
@@ -731,13 +728,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
731# CONFIG_MMC is not set 728# CONFIG_MMC is not set
732 729
733# 730#
731# LED devices
732#
733# CONFIG_NEW_LEDS is not set
734
735#
736# LED drivers
737#
738
739#
740# LED Triggers
741#
742
743#
734# InfiniBand support 744# InfiniBand support
735# 745#
736# CONFIG_INFINIBAND is not set 746# CONFIG_INFINIBAND is not set
737 747
738# 748#
739# SN Devices 749# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
750#
751
752#
753# Real Time Clock
740# 754#
755# CONFIG_RTC_CLASS is not set
741 756
742# 757#
743# File systems 758# File systems
@@ -785,7 +800,6 @@ CONFIG_SYSFS=y
785# CONFIG_TMPFS is not set 800# CONFIG_TMPFS is not set
786# CONFIG_HUGETLB_PAGE is not set 801# CONFIG_HUGETLB_PAGE is not set
787CONFIG_RAMFS=y 802CONFIG_RAMFS=y
788# CONFIG_RELAYFS_FS is not set
789# CONFIG_CONFIGFS_FS is not set 803# CONFIG_CONFIGFS_FS is not set
790 804
791# 805#
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 6c2961affbd6..ca0af1683a00 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:54 2006 4# Tue Apr 25 00:08:06 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -72,6 +72,8 @@ CONFIG_ZAO_CAPCELLA=y
72CONFIG_PCI_VR41XX=y 72CONFIG_PCI_VR41XX=y
73# CONFIG_VRC4173 is not set 73# CONFIG_VRC4173 is not set
74CONFIG_RWSEM_GENERIC_SPINLOCK=y 74CONFIG_RWSEM_GENERIC_SPINLOCK=y
75CONFIG_GENERIC_FIND_NEXT_BIT=y
76CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
76CONFIG_DMA_NONCOHERENT=y 78CONFIG_DMA_NONCOHERENT=y
77CONFIG_DMA_NEED_PCI_MAP_STATE=y 79CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -90,7 +92,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
90# CONFIG_CPU_MIPS64_R2 is not set 92# CONFIG_CPU_MIPS64_R2 is not set
91# CONFIG_CPU_R3000 is not set 93# CONFIG_CPU_R3000 is not set
92# CONFIG_CPU_TX39XX is not set 94# CONFIG_CPU_TX39XX is not set
93# CONFIG_CPU_VR41XX is not set 95CONFIG_CPU_VR41XX=y
94# CONFIG_CPU_R4300 is not set 96# CONFIG_CPU_R4300 is not set
95# CONFIG_CPU_R4X00 is not set 97# CONFIG_CPU_R4X00 is not set
96# CONFIG_CPU_TX49XX is not set 98# CONFIG_CPU_TX49XX is not set
@@ -103,18 +105,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
103# CONFIG_CPU_RM7000 is not set 105# CONFIG_CPU_RM7000 is not set
104# CONFIG_CPU_RM9000 is not set 106# CONFIG_CPU_RM9000 is not set
105# CONFIG_CPU_SB1 is not set 107# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_VR41XX=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
106 112
107# 113#
108# Kernel type 114# Kernel type
109# 115#
110# CONFIG_32BIT is not set 116CONFIG_32BIT=y
111# CONFIG_64BIT is not set 117# CONFIG_64BIT is not set
112CONFIG_PAGE_SIZE_4KB=y 118CONFIG_PAGE_SIZE_4KB=y
113# CONFIG_PAGE_SIZE_8KB is not set 119# CONFIG_PAGE_SIZE_8KB is not set
114# CONFIG_PAGE_SIZE_16KB is not set 120# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
116# CONFIG_MIPS_MT is not set 122# CONFIG_MIPS_MT is not set
117CONFIG_CPU_HAS_LLSC=y
118CONFIG_CPU_HAS_SYNC=y 123CONFIG_CPU_HAS_SYNC=y
119CONFIG_GENERIC_HARDIRQS=y 124CONFIG_GENERIC_HARDIRQS=y
120CONFIG_GENERIC_IRQ_PROBE=y 125CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,7 +140,6 @@ CONFIG_PREEMPT_NONE=y
135# Code maturity level options 140# Code maturity level options
136# 141#
137CONFIG_EXPERIMENTAL=y 142CONFIG_EXPERIMENTAL=y
138CONFIG_CLEAN_COMPILE=y
139CONFIG_BROKEN_ON_SMP=y 143CONFIG_BROKEN_ON_SMP=y
140CONFIG_INIT_ENV_ARG_LIMIT=32 144CONFIG_INIT_ENV_ARG_LIMIT=32
141 145
@@ -151,6 +155,7 @@ CONFIG_SYSVIPC=y
151CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 156# CONFIG_AUDIT is not set
153# CONFIG_IKCONFIG is not set 157# CONFIG_IKCONFIG is not set
158# CONFIG_RELAY is not set
154CONFIG_INITRAMFS_SOURCE="" 159CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 160# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
156CONFIG_EMBEDDED=y 161CONFIG_EMBEDDED=y
@@ -164,10 +169,6 @@ CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 169CONFIG_FUTEX=y
165CONFIG_EPOLL=y 170CONFIG_EPOLL=y
166CONFIG_SHMEM=y 171CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y 172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
@@ -179,7 +180,6 @@ CONFIG_BASE_SMALL=0
179CONFIG_MODULES=y 180CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -187,6 +187,9 @@ CONFIG_KMOD=y
187# 187#
188# Block layer 188# Block layer
189# 189#
190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
190 193
191# 194#
192# IO Schedulers 195# IO Schedulers
@@ -206,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
206# 209#
207CONFIG_HW_HAS_PCI=y 210CONFIG_HW_HAS_PCI=y
208CONFIG_PCI=y 211CONFIG_PCI=y
209CONFIG_PCI_LEGACY_PROC=y
210CONFIG_MMU=y 212CONFIG_MMU=y
211 213
212# 214#
@@ -224,6 +226,7 @@ CONFIG_MMU=y
224# 226#
225CONFIG_BINFMT_ELF=y 227CONFIG_BINFMT_ELF=y
226# CONFIG_BINFMT_MISC is not set 228# CONFIG_BINFMT_MISC is not set
229CONFIG_TRAD_SIGNALS=y
227 230
228# 231#
229# Networking 232# Networking
@@ -233,6 +236,7 @@ CONFIG_NET=y
233# 236#
234# Networking options 237# Networking options
235# 238#
239# CONFIG_NETDEBUG is not set
236CONFIG_PACKET=y 240CONFIG_PACKET=y
237CONFIG_PACKET_MMAP=y 241CONFIG_PACKET_MMAP=y
238CONFIG_UNIX=y 242CONFIG_UNIX=y
@@ -255,12 +259,15 @@ CONFIG_IP_PNP_BOOTP=y
255# CONFIG_INET_AH is not set 259# CONFIG_INET_AH is not set
256# CONFIG_INET_ESP is not set 260# CONFIG_INET_ESP is not set
257# CONFIG_INET_IPCOMP is not set 261# CONFIG_INET_IPCOMP is not set
258CONFIG_INET_TUNNEL=m 262# CONFIG_INET_XFRM_TUNNEL is not set
263# CONFIG_INET_TUNNEL is not set
259CONFIG_INET_DIAG=y 264CONFIG_INET_DIAG=y
260CONFIG_INET_TCP_DIAG=y 265CONFIG_INET_TCP_DIAG=y
261# CONFIG_TCP_CONG_ADVANCED is not set 266# CONFIG_TCP_CONG_ADVANCED is not set
262CONFIG_TCP_CONG_BIC=y 267CONFIG_TCP_CONG_BIC=y
263# CONFIG_IPV6 is not set 268# CONFIG_IPV6 is not set
269# CONFIG_INET6_XFRM_TUNNEL is not set
270# CONFIG_INET6_TUNNEL is not set
264# CONFIG_NETFILTER is not set 271# CONFIG_NETFILTER is not set
265 272
266# 273#
@@ -272,6 +279,11 @@ CONFIG_TCP_CONG_BIC=y
272# SCTP Configuration (EXPERIMENTAL) 279# SCTP Configuration (EXPERIMENTAL)
273# 280#
274# CONFIG_IP_SCTP is not set 281# CONFIG_IP_SCTP is not set
282
283#
284# TIPC Configuration (EXPERIMENTAL)
285#
286# CONFIG_TIPC is not set
275# CONFIG_ATM is not set 287# CONFIG_ATM is not set
276# CONFIG_BRIDGE is not set 288# CONFIG_BRIDGE is not set
277# CONFIG_VLAN_8021Q is not set 289# CONFIG_VLAN_8021Q is not set
@@ -281,11 +293,6 @@ CONFIG_TCP_CONG_BIC=y
281# CONFIG_ATALK is not set 293# CONFIG_ATALK is not set
282# CONFIG_X25 is not set 294# CONFIG_X25 is not set
283# CONFIG_LAPB is not set 295# CONFIG_LAPB is not set
284
285#
286# TIPC Configuration (EXPERIMENTAL)
287#
288# CONFIG_TIPC is not set
289# CONFIG_NET_DIVERT is not set 296# CONFIG_NET_DIVERT is not set
290# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
291# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
@@ -302,10 +309,7 @@ CONFIG_TCP_CONG_BIC=y
302# CONFIG_HAMRADIO is not set 309# CONFIG_HAMRADIO is not set
303# CONFIG_IRDA is not set 310# CONFIG_IRDA is not set
304# CONFIG_BT is not set 311# CONFIG_BT is not set
305CONFIG_IEEE80211=m 312# CONFIG_IEEE80211 is not set
306# CONFIG_IEEE80211_DEBUG is not set
307CONFIG_IEEE80211_CRYPT_WEP=m
308CONFIG_IEEE80211_CRYPT_CCMP=m
309 313
310# 314#
311# Device Drivers 315# Device Drivers
@@ -348,10 +352,12 @@ CONFIG_CONNECTOR=m
348# CONFIG_BLK_DEV_LOOP is not set 352# CONFIG_BLK_DEV_LOOP is not set
349# CONFIG_BLK_DEV_NBD is not set 353# CONFIG_BLK_DEV_NBD is not set
350# CONFIG_BLK_DEV_SX8 is not set 354# CONFIG_BLK_DEV_SX8 is not set
351# CONFIG_BLK_DEV_RAM is not set 355CONFIG_BLK_DEV_RAM=y
352CONFIG_BLK_DEV_RAM_COUNT=16 356CONFIG_BLK_DEV_RAM_COUNT=16
357CONFIG_BLK_DEV_RAM_SIZE=4096
358# CONFIG_BLK_DEV_INITRD is not set
353# CONFIG_CDROM_PKTCDVD is not set 359# CONFIG_CDROM_PKTCDVD is not set
354CONFIG_ATA_OVER_ETH=m 360# CONFIG_ATA_OVER_ETH is not set
355 361
356# 362#
357# ATA/ATAPI/MFM/RLL support 363# ATA/ATAPI/MFM/RLL support
@@ -578,6 +584,11 @@ CONFIG_HW_CONSOLE=y
578# 584#
579# Non-8250 serial port support 585# Non-8250 serial port support
580# 586#
587CONFIG_SERIAL_CORE=y
588CONFIG_SERIAL_CORE_CONSOLE=y
589CONFIG_SERIAL_VR41XX=y
590CONFIG_SERIAL_VR41XX_CONSOLE=y
591# CONFIG_SERIAL_JSM is not set
581CONFIG_UNIX98_PTYS=y 592CONFIG_UNIX98_PTYS=y
582CONFIG_LEGACY_PTYS=y 593CONFIG_LEGACY_PTYS=y
583CONFIG_LEGACY_PTY_COUNT=256 594CONFIG_LEGACY_PTY_COUNT=256
@@ -601,6 +612,7 @@ CONFIG_LEGACY_PTY_COUNT=256
601# Ftape, the floppy tape device driver 612# Ftape, the floppy tape device driver
602# 613#
603# CONFIG_DRM is not set 614# CONFIG_DRM is not set
615CONFIG_GPIO_VR41XX=y
604# CONFIG_RAW_DRIVER is not set 616# CONFIG_RAW_DRIVER is not set
605 617
606# 618#
@@ -636,10 +648,6 @@ CONFIG_LEGACY_PTY_COUNT=256
636# 648#
637 649
638# 650#
639# Multimedia Capabilities Port drivers
640#
641
642#
643# Multimedia devices 651# Multimedia devices
644# 652#
645# CONFIG_VIDEO_DEV is not set 653# CONFIG_VIDEO_DEV is not set
@@ -670,6 +678,7 @@ CONFIG_DUMMY_CONSOLE=y
670# 678#
671CONFIG_USB_ARCH_HAS_HCD=y 679CONFIG_USB_ARCH_HAS_HCD=y
672CONFIG_USB_ARCH_HAS_OHCI=y 680CONFIG_USB_ARCH_HAS_OHCI=y
681CONFIG_USB_ARCH_HAS_EHCI=y
673# CONFIG_USB is not set 682# CONFIG_USB is not set
674 683
675# 684#
@@ -687,13 +696,48 @@ CONFIG_USB_ARCH_HAS_OHCI=y
687# CONFIG_MMC is not set 696# CONFIG_MMC is not set
688 697
689# 698#
699# LED devices
700#
701# CONFIG_NEW_LEDS is not set
702
703#
704# LED drivers
705#
706
707#
708# LED Triggers
709#
710
711#
690# InfiniBand support 712# InfiniBand support
691# 713#
692# CONFIG_INFINIBAND is not set 714# CONFIG_INFINIBAND is not set
693 715
694# 716#
695# SN Devices 717# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
718#
719
720#
721# Real Time Clock
722#
723CONFIG_RTC_LIB=y
724CONFIG_RTC_CLASS=y
725CONFIG_RTC_HCTOSYS=y
726CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
727
728#
729# RTC interfaces
730#
731CONFIG_RTC_INTF_SYSFS=y
732CONFIG_RTC_INTF_PROC=y
733CONFIG_RTC_INTF_DEV=y
734
735#
736# RTC drivers
696# 737#
738# CONFIG_RTC_DRV_M48T86 is not set
739CONFIG_RTC_DRV_VR41XX=y
740# CONFIG_RTC_DRV_TEST is not set
697 741
698# 742#
699# File systems 743# File systems
@@ -712,7 +756,7 @@ CONFIG_EXT2_FS=y
712CONFIG_INOTIFY=y 756CONFIG_INOTIFY=y
713# CONFIG_QUOTA is not set 757# CONFIG_QUOTA is not set
714CONFIG_DNOTIFY=y 758CONFIG_DNOTIFY=y
715CONFIG_AUTOFS_FS=y 759# CONFIG_AUTOFS_FS is not set
716CONFIG_AUTOFS4_FS=y 760CONFIG_AUTOFS4_FS=y
717CONFIG_FUSE_FS=m 761CONFIG_FUSE_FS=m
718 762
@@ -735,10 +779,9 @@ CONFIG_FUSE_FS=m
735CONFIG_PROC_FS=y 779CONFIG_PROC_FS=y
736CONFIG_PROC_KCORE=y 780CONFIG_PROC_KCORE=y
737CONFIG_SYSFS=y 781CONFIG_SYSFS=y
738# CONFIG_TMPFS is not set 782CONFIG_TMPFS=y
739# CONFIG_HUGETLB_PAGE is not set 783# CONFIG_HUGETLB_PAGE is not set
740CONFIG_RAMFS=y 784CONFIG_RAMFS=y
741CONFIG_RELAYFS_FS=m
742# CONFIG_CONFIGFS_FS is not set 785# CONFIG_CONFIGFS_FS is not set
743 786
744# 787#
@@ -805,44 +848,20 @@ CONFIG_MSDOS_PARTITION=y
805# CONFIG_MAGIC_SYSRQ is not set 848# CONFIG_MAGIC_SYSRQ is not set
806# CONFIG_DEBUG_KERNEL is not set 849# CONFIG_DEBUG_KERNEL is not set
807CONFIG_LOG_BUF_SHIFT=14 850CONFIG_LOG_BUF_SHIFT=14
851# CONFIG_DEBUG_FS is not set
808CONFIG_CROSSCOMPILE=y 852CONFIG_CROSSCOMPILE=y
809CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" 853CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
810 854
811# 855#
812# Security options 856# Security options
813# 857#
814CONFIG_KEYS=y 858# CONFIG_KEYS is not set
815CONFIG_KEYS_DEBUG_PROC_KEYS=y
816# CONFIG_SECURITY is not set 859# CONFIG_SECURITY is not set
817 860
818# 861#
819# Cryptographic options 862# Cryptographic options
820# 863#
821CONFIG_CRYPTO=y 864# CONFIG_CRYPTO is not set
822CONFIG_CRYPTO_HMAC=y
823CONFIG_CRYPTO_NULL=m
824CONFIG_CRYPTO_MD4=m
825CONFIG_CRYPTO_MD5=m
826CONFIG_CRYPTO_SHA1=m
827CONFIG_CRYPTO_SHA256=m
828CONFIG_CRYPTO_SHA512=m
829CONFIG_CRYPTO_WP512=m
830CONFIG_CRYPTO_TGR192=m
831CONFIG_CRYPTO_DES=m
832CONFIG_CRYPTO_BLOWFISH=m
833CONFIG_CRYPTO_TWOFISH=m
834CONFIG_CRYPTO_SERPENT=m
835CONFIG_CRYPTO_AES=m
836CONFIG_CRYPTO_CAST5=m
837CONFIG_CRYPTO_CAST6=m
838CONFIG_CRYPTO_TEA=m
839CONFIG_CRYPTO_ARC4=m
840CONFIG_CRYPTO_KHAZAD=m
841CONFIG_CRYPTO_ANUBIS=m
842CONFIG_CRYPTO_DEFLATE=m
843CONFIG_CRYPTO_MICHAEL_MIC=m
844CONFIG_CRYPTO_CRC32C=m
845# CONFIG_CRYPTO_TEST is not set
846 865
847# 866#
848# Hardware crypto devices 867# Hardware crypto devices
@@ -852,8 +871,6 @@ CONFIG_CRYPTO_CRC32C=m
852# Library routines 871# Library routines
853# 872#
854# CONFIG_CRC_CCITT is not set 873# CONFIG_CRC_CCITT is not set
855CONFIG_CRC16=m 874# CONFIG_CRC16 is not set
856CONFIG_CRC32=y 875CONFIG_CRC32=y
857CONFIG_LIBCRC32C=m 876# CONFIG_LIBCRC32C is not set
858CONFIG_ZLIB_INFLATE=m
859CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 8336b21d3db2..7d269e609282 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:55 2006 4# Mon Apr 24 14:50:57 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,7 +63,10 @@ CONFIG_MIPS_COBALT=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
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_EARLY_PRINTK=y
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 72CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -113,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y
113# CONFIG_PAGE_SIZE_16KB is not set 116# CONFIG_PAGE_SIZE_16KB is not set
114# CONFIG_PAGE_SIZE_64KB is not set 117# CONFIG_PAGE_SIZE_64KB is not set
115# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
116# CONFIG_CPU_ADVANCED is not set
117CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
118CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
119CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
@@ -135,7 +137,6 @@ CONFIG_PREEMPT_NONE=y
135# Code maturity level options 137# Code maturity level options
136# 138#
137CONFIG_EXPERIMENTAL=y 139CONFIG_EXPERIMENTAL=y
138CONFIG_CLEAN_COMPILE=y
139CONFIG_BROKEN_ON_SMP=y 140CONFIG_BROKEN_ON_SMP=y
140CONFIG_INIT_ENV_ARG_LIMIT=32 141CONFIG_INIT_ENV_ARG_LIMIT=32
141 142
@@ -151,6 +152,7 @@ CONFIG_SYSVIPC=y
151CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
153# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
155CONFIG_RELAY=y
154CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
156CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
@@ -164,10 +166,6 @@ CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 166CONFIG_FUTEX=y
165CONFIG_EPOLL=y 167CONFIG_EPOLL=y
166CONFIG_SHMEM=y 168CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y 169CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
@@ -182,6 +180,8 @@ CONFIG_BASE_SMALL=0
182# Block layer 180# Block layer
183# 181#
184# CONFIG_LBD is not set 182# CONFIG_LBD is not set
183# CONFIG_BLK_DEV_IO_TRACE is not set
184# CONFIG_LSF is not set
185 185
186# 186#
187# IO Schedulers 187# IO Schedulers
@@ -201,7 +201,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
201# 201#
202CONFIG_HW_HAS_PCI=y 202CONFIG_HW_HAS_PCI=y
203CONFIG_PCI=y 203CONFIG_PCI=y
204CONFIG_PCI_LEGACY_PROC=y
205CONFIG_MMU=y 204CONFIG_MMU=y
206 205
207# 206#
@@ -229,6 +228,7 @@ CONFIG_NET=y
229# 228#
230# Networking options 229# Networking options
231# 230#
231# CONFIG_NETDEBUG is not set
232CONFIG_PACKET=y 232CONFIG_PACKET=y
233# CONFIG_PACKET_MMAP is not set 233# CONFIG_PACKET_MMAP is not set
234CONFIG_UNIX=y 234CONFIG_UNIX=y
@@ -247,12 +247,15 @@ CONFIG_IP_FIB_HASH=y
247# CONFIG_INET_AH is not set 247# CONFIG_INET_AH is not set
248# CONFIG_INET_ESP is not set 248# CONFIG_INET_ESP is not set
249# CONFIG_INET_IPCOMP is not set 249# CONFIG_INET_IPCOMP is not set
250CONFIG_INET_TUNNEL=y 250# CONFIG_INET_XFRM_TUNNEL is not set
251# CONFIG_INET_TUNNEL is not set
251CONFIG_INET_DIAG=y 252CONFIG_INET_DIAG=y
252CONFIG_INET_TCP_DIAG=y 253CONFIG_INET_TCP_DIAG=y
253# CONFIG_TCP_CONG_ADVANCED is not set 254# CONFIG_TCP_CONG_ADVANCED is not set
254CONFIG_TCP_CONG_BIC=y 255CONFIG_TCP_CONG_BIC=y
255# CONFIG_IPV6 is not set 256# CONFIG_IPV6 is not set
257# CONFIG_INET6_XFRM_TUNNEL is not set
258# CONFIG_INET6_TUNNEL is not set
256# CONFIG_NETFILTER is not set 259# CONFIG_NETFILTER is not set
257 260
258# 261#
@@ -264,6 +267,11 @@ CONFIG_TCP_CONG_BIC=y
264# SCTP Configuration (EXPERIMENTAL) 267# SCTP Configuration (EXPERIMENTAL)
265# 268#
266# CONFIG_IP_SCTP is not set 269# CONFIG_IP_SCTP is not set
270
271#
272# TIPC Configuration (EXPERIMENTAL)
273#
274# CONFIG_TIPC is not set
267# CONFIG_ATM is not set 275# CONFIG_ATM is not set
268# CONFIG_BRIDGE is not set 276# CONFIG_BRIDGE is not set
269# CONFIG_VLAN_8021Q is not set 277# CONFIG_VLAN_8021Q is not set
@@ -273,11 +281,6 @@ CONFIG_TCP_CONG_BIC=y
273# CONFIG_ATALK is not set 281# CONFIG_ATALK is not set
274# CONFIG_X25 is not set 282# CONFIG_X25 is not set
275# CONFIG_LAPB is not set 283# CONFIG_LAPB is not set
276
277#
278# TIPC Configuration (EXPERIMENTAL)
279#
280# CONFIG_TIPC is not set
281# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
@@ -298,6 +301,9 @@ CONFIG_IEEE80211=y
298# CONFIG_IEEE80211_DEBUG is not set 301# CONFIG_IEEE80211_DEBUG is not set
299CONFIG_IEEE80211_CRYPT_WEP=y 302CONFIG_IEEE80211_CRYPT_WEP=y
300CONFIG_IEEE80211_CRYPT_CCMP=y 303CONFIG_IEEE80211_CRYPT_CCMP=y
304CONFIG_IEEE80211_SOFTMAC=y
305# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
306CONFIG_WIRELESS_EXT=y
301 307
302# 308#
303# Device Drivers 309# Device Drivers
@@ -343,7 +349,7 @@ CONFIG_BLK_DEV_LOOP=y
343# CONFIG_BLK_DEV_NBD is not set 349# CONFIG_BLK_DEV_NBD is not set
344# CONFIG_BLK_DEV_SX8 is not set 350# CONFIG_BLK_DEV_SX8 is not set
345# CONFIG_BLK_DEV_RAM is not set 351# CONFIG_BLK_DEV_RAM is not set
346CONFIG_BLK_DEV_RAM_COUNT=16 352# CONFIG_BLK_DEV_INITRD is not set
347CONFIG_CDROM_PKTCDVD=y 353CONFIG_CDROM_PKTCDVD=y
348CONFIG_CDROM_PKTCDVD_BUFFERS=8 354CONFIG_CDROM_PKTCDVD_BUFFERS=8
349# CONFIG_CDROM_PKTCDVD_WCACHE is not set 355# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -593,6 +599,7 @@ CONFIG_HW_CONSOLE=y
593# 599#
594CONFIG_SERIAL_8250=y 600CONFIG_SERIAL_8250=y
595CONFIG_SERIAL_8250_CONSOLE=y 601CONFIG_SERIAL_8250_CONSOLE=y
602CONFIG_SERIAL_8250_PCI=y
596CONFIG_SERIAL_8250_NR_UARTS=4 603CONFIG_SERIAL_8250_NR_UARTS=4
597CONFIG_SERIAL_8250_RUNTIME_UARTS=4 604CONFIG_SERIAL_8250_RUNTIME_UARTS=4
598# CONFIG_SERIAL_8250_EXTENDED is not set 605# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -602,6 +609,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
602# 609#
603CONFIG_SERIAL_CORE=y 610CONFIG_SERIAL_CORE=y
604CONFIG_SERIAL_CORE_CONSOLE=y 611CONFIG_SERIAL_CORE_CONSOLE=y
612# CONFIG_SERIAL_JSM is not set
605CONFIG_UNIX98_PTYS=y 613CONFIG_UNIX98_PTYS=y
606CONFIG_LEGACY_PTYS=y 614CONFIG_LEGACY_PTYS=y
607CONFIG_LEGACY_PTY_COUNT=256 615CONFIG_LEGACY_PTY_COUNT=256
@@ -660,10 +668,6 @@ CONFIG_COBALT_LCD=y
660# 668#
661 669
662# 670#
663# Multimedia Capabilities Port drivers
664#
665
666#
667# Multimedia devices 671# Multimedia devices
668# 672#
669# CONFIG_VIDEO_DEV is not set 673# CONFIG_VIDEO_DEV is not set
@@ -694,6 +698,7 @@ CONFIG_DUMMY_CONSOLE=y
694# 698#
695CONFIG_USB_ARCH_HAS_HCD=y 699CONFIG_USB_ARCH_HAS_HCD=y
696CONFIG_USB_ARCH_HAS_OHCI=y 700CONFIG_USB_ARCH_HAS_OHCI=y
701CONFIG_USB_ARCH_HAS_EHCI=y
697# CONFIG_USB is not set 702# CONFIG_USB is not set
698 703
699# 704#
@@ -711,13 +716,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
711# CONFIG_MMC is not set 716# CONFIG_MMC is not set
712 717
713# 718#
719# LED devices
720#
721# CONFIG_NEW_LEDS is not set
722
723#
724# LED drivers
725#
726
727#
728# LED Triggers
729#
730
731#
714# InfiniBand support 732# InfiniBand support
715# 733#
716# CONFIG_INFINIBAND is not set 734# CONFIG_INFINIBAND is not set
717 735
718# 736#
719# SN Devices 737# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
738#
739
740#
741# Real Time Clock
720# 742#
743# CONFIG_RTC_CLASS is not set
721 744
722# 745#
723# File systems 746# File systems
@@ -765,7 +788,6 @@ CONFIG_SYSFS=y
765# CONFIG_TMPFS is not set 788# CONFIG_TMPFS is not set
766# CONFIG_HUGETLB_PAGE is not set 789# CONFIG_HUGETLB_PAGE is not set
767CONFIG_RAMFS=y 790CONFIG_RAMFS=y
768CONFIG_RELAYFS_FS=y
769# CONFIG_CONFIGFS_FS is not set 791# CONFIG_CONFIGFS_FS is not set
770 792
771# 793#
@@ -828,6 +850,8 @@ CONFIG_MSDOS_PARTITION=y
828# CONFIG_MAGIC_SYSRQ is not set 850# CONFIG_MAGIC_SYSRQ is not set
829# CONFIG_DEBUG_KERNEL is not set 851# CONFIG_DEBUG_KERNEL is not set
830CONFIG_LOG_BUF_SHIFT=14 852CONFIG_LOG_BUF_SHIFT=14
853# CONFIG_DEBUG_FS is not set
854# CONFIG_UNWIND_INFO is not set
831CONFIG_CROSSCOMPILE=y 855CONFIG_CROSSCOMPILE=y
832CONFIG_CMDLINE="" 856CONFIG_CMDLINE=""
833 857
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 7f071403c8e3..579b665e3339 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:56 2006 4# Mon Apr 24 14:50:57 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y
114CONFIG_CPU_HAS_PREFETCH=y 116CONFIG_CPU_HAS_PREFETCH=y
115# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
116CONFIG_64BIT_PHYS_ADDR=y 118CONFIG_64BIT_PHYS_ADDR=y
117# CONFIG_CPU_ADVANCED is not set
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
121CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
123CONFIG_CPU_SUPPORTS_HIGHMEM=y
122CONFIG_ARCH_FLATMEM_ENABLE=y 124CONFIG_ARCH_FLATMEM_ENABLE=y
123CONFIG_SELECT_MEMORY_MODEL=y 125CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y 126CONFIG_FLATMEM_MANUAL=y
@@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
136# Code maturity level options 138# Code maturity level options
137# 139#
138CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
142 143
@@ -152,6 +153,7 @@ CONFIG_SYSVIPC=y
152CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
154# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
156CONFIG_RELAY=y
155CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
@@ -165,10 +167,6 @@ CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 167CONFIG_FUTEX=y
166CONFIG_EPOLL=y 168CONFIG_EPOLL=y
167CONFIG_SHMEM=y 169CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y 170CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 171# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 172CONFIG_BASE_SMALL=0
@@ -181,7 +179,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
181CONFIG_MODULES=y 179CONFIG_MODULES=y
182CONFIG_MODULE_UNLOAD=y 180CONFIG_MODULE_UNLOAD=y
183# CONFIG_MODULE_FORCE_UNLOAD is not set 181# CONFIG_MODULE_FORCE_UNLOAD is not set
184CONFIG_OBSOLETE_MODPARM=y
185CONFIG_MODVERSIONS=y 182CONFIG_MODVERSIONS=y
186CONFIG_MODULE_SRCVERSION_ALL=y 183CONFIG_MODULE_SRCVERSION_ALL=y
187CONFIG_KMOD=y 184CONFIG_KMOD=y
@@ -190,6 +187,8 @@ CONFIG_KMOD=y
190# Block layer 187# Block layer
191# 188#
192# CONFIG_LBD is not set 189# CONFIG_LBD is not set
190# CONFIG_BLK_DEV_IO_TRACE is not set
191# CONFIG_LSF is not set
193 192
194# 193#
195# IO Schedulers 194# IO Schedulers
@@ -245,6 +244,7 @@ CONFIG_NET=y
245# 244#
246# Networking options 245# Networking options
247# 246#
247# CONFIG_NETDEBUG is not set
248CONFIG_PACKET=y 248CONFIG_PACKET=y
249# CONFIG_PACKET_MMAP is not set 249# CONFIG_PACKET_MMAP is not set
250CONFIG_UNIX=y 250CONFIG_UNIX=y
@@ -267,7 +267,8 @@ CONFIG_IP_PNP_BOOTP=y
267# CONFIG_INET_AH is not set 267# CONFIG_INET_AH is not set
268# CONFIG_INET_ESP is not set 268# CONFIG_INET_ESP is not set
269# CONFIG_INET_IPCOMP is not set 269# CONFIG_INET_IPCOMP is not set
270CONFIG_INET_TUNNEL=m 270# CONFIG_INET_XFRM_TUNNEL is not set
271# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
272CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
273# CONFIG_TCP_CONG_ADVANCED is not set 274# CONFIG_TCP_CONG_ADVANCED is not set
@@ -278,6 +279,8 @@ CONFIG_TCP_CONG_BIC=y
278# 279#
279# CONFIG_IP_VS is not set 280# CONFIG_IP_VS is not set
280# CONFIG_IPV6 is not set 281# CONFIG_IPV6 is not set
282# CONFIG_INET6_XFRM_TUNNEL is not set
283# CONFIG_INET6_TUNNEL is not set
281CONFIG_NETFILTER=y 284CONFIG_NETFILTER=y
282# CONFIG_NETFILTER_DEBUG is not set 285# CONFIG_NETFILTER_DEBUG is not set
283 286
@@ -294,10 +297,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
294CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 297CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
295CONFIG_NETFILTER_XT_MATCH_COMMENT=m 298CONFIG_NETFILTER_XT_MATCH_COMMENT=m
296CONFIG_NETFILTER_XT_MATCH_DCCP=m 299CONFIG_NETFILTER_XT_MATCH_DCCP=m
300CONFIG_NETFILTER_XT_MATCH_ESP=m
297CONFIG_NETFILTER_XT_MATCH_LENGTH=m 301CONFIG_NETFILTER_XT_MATCH_LENGTH=m
298CONFIG_NETFILTER_XT_MATCH_LIMIT=m 302CONFIG_NETFILTER_XT_MATCH_LIMIT=m
299CONFIG_NETFILTER_XT_MATCH_MAC=m 303CONFIG_NETFILTER_XT_MATCH_MAC=m
300CONFIG_NETFILTER_XT_MATCH_MARK=m 304CONFIG_NETFILTER_XT_MATCH_MARK=m
305CONFIG_NETFILTER_XT_MATCH_POLICY=m
306CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
301CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 307CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
302CONFIG_NETFILTER_XT_MATCH_REALM=m 308CONFIG_NETFILTER_XT_MATCH_REALM=m
303CONFIG_NETFILTER_XT_MATCH_SCTP=m 309CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -321,6 +327,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
321# SCTP Configuration (EXPERIMENTAL) 327# SCTP Configuration (EXPERIMENTAL)
322# 328#
323# CONFIG_IP_SCTP is not set 329# CONFIG_IP_SCTP is not set
330
331#
332# TIPC Configuration (EXPERIMENTAL)
333#
334# CONFIG_TIPC is not set
324# CONFIG_ATM is not set 335# CONFIG_ATM is not set
325# CONFIG_BRIDGE is not set 336# CONFIG_BRIDGE is not set
326# CONFIG_VLAN_8021Q is not set 337# CONFIG_VLAN_8021Q is not set
@@ -330,11 +341,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
330# CONFIG_ATALK is not set 341# CONFIG_ATALK is not set
331# CONFIG_X25 is not set 342# CONFIG_X25 is not set
332# CONFIG_LAPB is not set 343# CONFIG_LAPB is not set
333
334#
335# TIPC Configuration (EXPERIMENTAL)
336#
337# CONFIG_TIPC is not set
338# CONFIG_NET_DIVERT is not set 344# CONFIG_NET_DIVERT is not set
339# CONFIG_ECONET is not set 345# CONFIG_ECONET is not set
340# CONFIG_WAN_ROUTER is not set 346# CONFIG_WAN_ROUTER is not set
@@ -356,6 +362,9 @@ CONFIG_IEEE80211=m
356# CONFIG_IEEE80211_DEBUG is not set 362# CONFIG_IEEE80211_DEBUG is not set
357CONFIG_IEEE80211_CRYPT_WEP=m 363CONFIG_IEEE80211_CRYPT_WEP=m
358CONFIG_IEEE80211_CRYPT_CCMP=m 364CONFIG_IEEE80211_CRYPT_CCMP=m
365CONFIG_IEEE80211_SOFTMAC=m
366# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
367CONFIG_WIRELESS_EXT=y
359 368
360# 369#
361# Device Drivers 370# Device Drivers
@@ -412,7 +421,6 @@ CONFIG_MTD_CFI_I2=y
412# CONFIG_MTD_CFI_I8 is not set 421# CONFIG_MTD_CFI_I8 is not set
413# CONFIG_MTD_CFI_INTELEXT is not set 422# CONFIG_MTD_CFI_INTELEXT is not set
414CONFIG_MTD_CFI_AMDSTD=y 423CONFIG_MTD_CFI_AMDSTD=y
415CONFIG_MTD_CFI_AMDSTD_RETRY=0
416# CONFIG_MTD_CFI_STAA is not set 424# CONFIG_MTD_CFI_STAA is not set
417CONFIG_MTD_CFI_UTIL=y 425CONFIG_MTD_CFI_UTIL=y
418# CONFIG_MTD_RAM is not set 426# CONFIG_MTD_RAM is not set
@@ -434,7 +442,6 @@ CONFIG_MTD_ALCHEMY=y
434# CONFIG_MTD_SLRAM is not set 442# CONFIG_MTD_SLRAM is not set
435# CONFIG_MTD_PHRAM is not set 443# CONFIG_MTD_PHRAM is not set
436# CONFIG_MTD_MTDRAM is not set 444# CONFIG_MTD_MTDRAM is not set
437# CONFIG_MTD_BLKMTD is not set
438# CONFIG_MTD_BLOCK2MTD is not set 445# CONFIG_MTD_BLOCK2MTD is not set
439 446
440# 447#
@@ -471,7 +478,7 @@ CONFIG_BLK_DEV_LOOP=y
471# CONFIG_BLK_DEV_CRYPTOLOOP is not set 478# CONFIG_BLK_DEV_CRYPTOLOOP is not set
472# CONFIG_BLK_DEV_NBD is not set 479# CONFIG_BLK_DEV_NBD is not set
473# CONFIG_BLK_DEV_RAM is not set 480# CONFIG_BLK_DEV_RAM is not set
474CONFIG_BLK_DEV_RAM_COUNT=16 481# CONFIG_BLK_DEV_INITRD is not set
475CONFIG_CDROM_PKTCDVD=m 482CONFIG_CDROM_PKTCDVD=m
476CONFIG_CDROM_PKTCDVD_BUFFERS=8 483CONFIG_CDROM_PKTCDVD_BUFFERS=8
477# CONFIG_CDROM_PKTCDVD_WCACHE is not set 484# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -722,10 +729,6 @@ CONFIG_SYNCLINK_CS=m
722# 729#
723 730
724# 731#
725# Multimedia Capabilities Port drivers
726#
727
728#
729# Multimedia devices 732# Multimedia devices
730# 733#
731# CONFIG_VIDEO_DEV is not set 734# CONFIG_VIDEO_DEV is not set
@@ -756,6 +759,7 @@ CONFIG_DUMMY_CONSOLE=y
756# 759#
757CONFIG_USB_ARCH_HAS_HCD=y 760CONFIG_USB_ARCH_HAS_HCD=y
758CONFIG_USB_ARCH_HAS_OHCI=y 761CONFIG_USB_ARCH_HAS_OHCI=y
762# CONFIG_USB_ARCH_HAS_EHCI is not set
759# CONFIG_USB is not set 763# CONFIG_USB is not set
760 764
761# 765#
@@ -773,12 +777,30 @@ CONFIG_USB_ARCH_HAS_OHCI=y
773# CONFIG_MMC is not set 777# CONFIG_MMC is not set
774 778
775# 779#
780# LED devices
781#
782# CONFIG_NEW_LEDS is not set
783
784#
785# LED drivers
786#
787
788#
789# LED Triggers
790#
791
792#
776# InfiniBand support 793# InfiniBand support
777# 794#
778 795
779# 796#
780# SN Devices 797# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
798#
799
800#
801# Real Time Clock
781# 802#
803# CONFIG_RTC_CLASS is not set
782 804
783# 805#
784# File systems 806# File systems
@@ -836,7 +858,6 @@ CONFIG_SYSFS=y
836CONFIG_TMPFS=y 858CONFIG_TMPFS=y
837# CONFIG_HUGETLB_PAGE is not set 859# CONFIG_HUGETLB_PAGE is not set
838CONFIG_RAMFS=y 860CONFIG_RAMFS=y
839CONFIG_RELAYFS_FS=m
840# CONFIG_CONFIGFS_FS is not set 861# CONFIG_CONFIGFS_FS is not set
841 862
842# 863#
@@ -945,6 +966,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
945# CONFIG_MAGIC_SYSRQ is not set 966# CONFIG_MAGIC_SYSRQ is not set
946# CONFIG_DEBUG_KERNEL is not set 967# CONFIG_DEBUG_KERNEL is not set
947CONFIG_LOG_BUF_SHIFT=14 968CONFIG_LOG_BUF_SHIFT=14
969# CONFIG_DEBUG_FS is not set
948CONFIG_CROSSCOMPILE=y 970CONFIG_CROSSCOMPILE=y
949CONFIG_CMDLINE="" 971CONFIG_CMDLINE=""
950 972
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 98590cac1ec5..e5eb53867422 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:57 2006 4# Mon Apr 24 14:50:58 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y
114CONFIG_CPU_HAS_PREFETCH=y 116CONFIG_CPU_HAS_PREFETCH=y
115# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
116CONFIG_64BIT_PHYS_ADDR=y 118CONFIG_64BIT_PHYS_ADDR=y
117# CONFIG_CPU_ADVANCED is not set
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
121CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
123CONFIG_CPU_SUPPORTS_HIGHMEM=y
122CONFIG_ARCH_FLATMEM_ENABLE=y 124CONFIG_ARCH_FLATMEM_ENABLE=y
123CONFIG_SELECT_MEMORY_MODEL=y 125CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y 126CONFIG_FLATMEM_MANUAL=y
@@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
136# Code maturity level options 138# Code maturity level options
137# 139#
138CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
142 143
@@ -152,6 +153,7 @@ CONFIG_SYSVIPC=y
152CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
154# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
156CONFIG_RELAY=y
155CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
@@ -165,10 +167,6 @@ CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 167CONFIG_FUTEX=y
166CONFIG_EPOLL=y 168CONFIG_EPOLL=y
167CONFIG_SHMEM=y 169CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y 170CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 171# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 172CONFIG_BASE_SMALL=0
@@ -181,7 +179,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
181CONFIG_MODULES=y 179CONFIG_MODULES=y
182CONFIG_MODULE_UNLOAD=y 180CONFIG_MODULE_UNLOAD=y
183# CONFIG_MODULE_FORCE_UNLOAD is not set 181# CONFIG_MODULE_FORCE_UNLOAD is not set
184CONFIG_OBSOLETE_MODPARM=y
185CONFIG_MODVERSIONS=y 182CONFIG_MODVERSIONS=y
186CONFIG_MODULE_SRCVERSION_ALL=y 183CONFIG_MODULE_SRCVERSION_ALL=y
187CONFIG_KMOD=y 184CONFIG_KMOD=y
@@ -190,6 +187,8 @@ CONFIG_KMOD=y
190# Block layer 187# Block layer
191# 188#
192# CONFIG_LBD is not set 189# CONFIG_LBD is not set
190# CONFIG_BLK_DEV_IO_TRACE is not set
191# CONFIG_LSF is not set
193 192
194# 193#
195# IO Schedulers 194# IO Schedulers
@@ -234,6 +233,7 @@ CONFIG_NET=y
234# 233#
235# Networking options 234# Networking options
236# 235#
236# CONFIG_NETDEBUG is not set
237CONFIG_PACKET=y 237CONFIG_PACKET=y
238# CONFIG_PACKET_MMAP is not set 238# CONFIG_PACKET_MMAP is not set
239CONFIG_UNIX=y 239CONFIG_UNIX=y
@@ -256,7 +256,8 @@ CONFIG_IP_PNP_BOOTP=y
256# CONFIG_INET_AH is not set 256# CONFIG_INET_AH is not set
257# CONFIG_INET_ESP is not set 257# CONFIG_INET_ESP is not set
258# CONFIG_INET_IPCOMP is not set 258# CONFIG_INET_IPCOMP is not set
259CONFIG_INET_TUNNEL=m 259# CONFIG_INET_XFRM_TUNNEL is not set
260# CONFIG_INET_TUNNEL is not set
260CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
@@ -267,6 +268,8 @@ CONFIG_TCP_CONG_BIC=y
267# 268#
268# CONFIG_IP_VS is not set 269# CONFIG_IP_VS is not set
269# CONFIG_IPV6 is not set 270# CONFIG_IPV6 is not set
271# CONFIG_INET6_XFRM_TUNNEL is not set
272# CONFIG_INET6_TUNNEL is not set
270CONFIG_NETFILTER=y 273CONFIG_NETFILTER=y
271# CONFIG_NETFILTER_DEBUG is not set 274# CONFIG_NETFILTER_DEBUG is not set
272 275
@@ -283,10 +286,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
283CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 286CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
284CONFIG_NETFILTER_XT_MATCH_COMMENT=m 287CONFIG_NETFILTER_XT_MATCH_COMMENT=m
285CONFIG_NETFILTER_XT_MATCH_DCCP=m 288CONFIG_NETFILTER_XT_MATCH_DCCP=m
289CONFIG_NETFILTER_XT_MATCH_ESP=m
286CONFIG_NETFILTER_XT_MATCH_LENGTH=m 290CONFIG_NETFILTER_XT_MATCH_LENGTH=m
287CONFIG_NETFILTER_XT_MATCH_LIMIT=m 291CONFIG_NETFILTER_XT_MATCH_LIMIT=m
288CONFIG_NETFILTER_XT_MATCH_MAC=m 292CONFIG_NETFILTER_XT_MATCH_MAC=m
289CONFIG_NETFILTER_XT_MATCH_MARK=m 293CONFIG_NETFILTER_XT_MATCH_MARK=m
294CONFIG_NETFILTER_XT_MATCH_POLICY=m
295CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
290CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 296CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
291CONFIG_NETFILTER_XT_MATCH_REALM=m 297CONFIG_NETFILTER_XT_MATCH_REALM=m
292CONFIG_NETFILTER_XT_MATCH_SCTP=m 298CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -310,6 +316,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
310# SCTP Configuration (EXPERIMENTAL) 316# SCTP Configuration (EXPERIMENTAL)
311# 317#
312# CONFIG_IP_SCTP is not set 318# CONFIG_IP_SCTP is not set
319
320#
321# TIPC Configuration (EXPERIMENTAL)
322#
323# CONFIG_TIPC is not set
313# CONFIG_ATM is not set 324# CONFIG_ATM is not set
314# CONFIG_BRIDGE is not set 325# CONFIG_BRIDGE is not set
315# CONFIG_VLAN_8021Q is not set 326# CONFIG_VLAN_8021Q is not set
@@ -319,11 +330,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
319# CONFIG_ATALK is not set 330# CONFIG_ATALK is not set
320# CONFIG_X25 is not set 331# CONFIG_X25 is not set
321# CONFIG_LAPB is not set 332# CONFIG_LAPB is not set
322
323#
324# TIPC Configuration (EXPERIMENTAL)
325#
326# CONFIG_TIPC is not set
327# CONFIG_NET_DIVERT is not set 333# CONFIG_NET_DIVERT is not set
328# CONFIG_ECONET is not set 334# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 335# CONFIG_WAN_ROUTER is not set
@@ -345,6 +351,9 @@ CONFIG_IEEE80211=m
345# CONFIG_IEEE80211_DEBUG is not set 351# CONFIG_IEEE80211_DEBUG is not set
346CONFIG_IEEE80211_CRYPT_WEP=m 352CONFIG_IEEE80211_CRYPT_WEP=m
347CONFIG_IEEE80211_CRYPT_CCMP=m 353CONFIG_IEEE80211_CRYPT_CCMP=m
354CONFIG_IEEE80211_SOFTMAC=m
355# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
356CONFIG_WIRELESS_EXT=y
348 357
349# 358#
350# Device Drivers 359# Device Drivers
@@ -401,7 +410,6 @@ CONFIG_MTD_CFI_I2=y
401# CONFIG_MTD_CFI_I8 is not set 410# CONFIG_MTD_CFI_I8 is not set
402# CONFIG_MTD_CFI_INTELEXT is not set 411# CONFIG_MTD_CFI_INTELEXT is not set
403CONFIG_MTD_CFI_AMDSTD=y 412CONFIG_MTD_CFI_AMDSTD=y
404CONFIG_MTD_CFI_AMDSTD_RETRY=0
405# CONFIG_MTD_CFI_STAA is not set 413# CONFIG_MTD_CFI_STAA is not set
406CONFIG_MTD_CFI_UTIL=y 414CONFIG_MTD_CFI_UTIL=y
407# CONFIG_MTD_RAM is not set 415# CONFIG_MTD_RAM is not set
@@ -423,7 +431,6 @@ CONFIG_MTD_ALCHEMY=y
423# CONFIG_MTD_SLRAM is not set 431# CONFIG_MTD_SLRAM is not set
424# CONFIG_MTD_PHRAM is not set 432# CONFIG_MTD_PHRAM is not set
425# CONFIG_MTD_MTDRAM is not set 433# CONFIG_MTD_MTDRAM is not set
426# CONFIG_MTD_BLKMTD is not set
427# CONFIG_MTD_BLOCK2MTD is not set 434# CONFIG_MTD_BLOCK2MTD is not set
428 435
429# 436#
@@ -460,7 +467,7 @@ CONFIG_BLK_DEV_LOOP=y
460# CONFIG_BLK_DEV_CRYPTOLOOP is not set 467# CONFIG_BLK_DEV_CRYPTOLOOP is not set
461# CONFIG_BLK_DEV_NBD is not set 468# CONFIG_BLK_DEV_NBD is not set
462# CONFIG_BLK_DEV_RAM is not set 469# CONFIG_BLK_DEV_RAM is not set
463CONFIG_BLK_DEV_RAM_COUNT=16 470# CONFIG_BLK_DEV_INITRD is not set
464CONFIG_CDROM_PKTCDVD=m 471CONFIG_CDROM_PKTCDVD=m
465CONFIG_CDROM_PKTCDVD_BUFFERS=8 472CONFIG_CDROM_PKTCDVD_BUFFERS=8
466# CONFIG_CDROM_PKTCDVD_WCACHE is not set 473# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -690,10 +697,6 @@ CONFIG_LEGACY_PTY_COUNT=256
690# 697#
691 698
692# 699#
693# Multimedia Capabilities Port drivers
694#
695
696#
697# Multimedia devices 700# Multimedia devices
698# 701#
699# CONFIG_VIDEO_DEV is not set 702# CONFIG_VIDEO_DEV is not set
@@ -711,6 +714,7 @@ CONFIG_FB_CFB_FILLRECT=y
711CONFIG_FB_CFB_COPYAREA=y 714CONFIG_FB_CFB_COPYAREA=y
712CONFIG_FB_CFB_IMAGEBLIT=y 715CONFIG_FB_CFB_IMAGEBLIT=y
713# CONFIG_FB_MACMODES is not set 716# CONFIG_FB_MACMODES is not set
717CONFIG_FB_FIRMWARE_EDID=y
714# CONFIG_FB_MODE_HELPERS is not set 718# CONFIG_FB_MODE_HELPERS is not set
715# CONFIG_FB_TILEBLITTING is not set 719# CONFIG_FB_TILEBLITTING is not set
716# CONFIG_FB_S1D13XXX is not set 720# CONFIG_FB_S1D13XXX is not set
@@ -755,6 +759,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
755# 759#
756CONFIG_USB_ARCH_HAS_HCD=y 760CONFIG_USB_ARCH_HAS_HCD=y
757CONFIG_USB_ARCH_HAS_OHCI=y 761CONFIG_USB_ARCH_HAS_OHCI=y
762# CONFIG_USB_ARCH_HAS_EHCI is not set
758# CONFIG_USB is not set 763# CONFIG_USB is not set
759 764
760# 765#
@@ -772,12 +777,30 @@ CONFIG_USB_ARCH_HAS_OHCI=y
772# CONFIG_MMC is not set 777# CONFIG_MMC is not set
773 778
774# 779#
780# LED devices
781#
782# CONFIG_NEW_LEDS is not set
783
784#
785# LED drivers
786#
787
788#
789# LED Triggers
790#
791
792#
775# InfiniBand support 793# InfiniBand support
776# 794#
777 795
778# 796#
779# SN Devices 797# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
798#
799
800#
801# Real Time Clock
780# 802#
803# CONFIG_RTC_CLASS is not set
781 804
782# 805#
783# File systems 806# File systems
@@ -835,7 +858,6 @@ CONFIG_SYSFS=y
835CONFIG_TMPFS=y 858CONFIG_TMPFS=y
836# CONFIG_HUGETLB_PAGE is not set 859# CONFIG_HUGETLB_PAGE is not set
837CONFIG_RAMFS=y 860CONFIG_RAMFS=y
838CONFIG_RELAYFS_FS=m
839# CONFIG_CONFIGFS_FS is not set 861# CONFIG_CONFIGFS_FS is not set
840 862
841# 863#
@@ -944,6 +966,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
944# CONFIG_MAGIC_SYSRQ is not set 966# CONFIG_MAGIC_SYSRQ is not set
945# CONFIG_DEBUG_KERNEL is not set 967# CONFIG_DEBUG_KERNEL is not set
946CONFIG_LOG_BUF_SHIFT=14 968CONFIG_LOG_BUF_SHIFT=14
969# CONFIG_DEBUG_FS is not set
947CONFIG_CROSSCOMPILE=y 970CONFIG_CROSSCOMPILE=y
948CONFIG_CMDLINE="" 971CONFIG_CMDLINE=""
949 972
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 92888472dca0..a43fb2329fd5 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:58 2006 4# Mon Apr 24 14:50:58 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_COHERENT=y 70CONFIG_DMA_COHERENT=y
69CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y 71CONFIG_MIPS_DISABLE_OBSOLETE_IDE=y
@@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y
114CONFIG_CPU_HAS_PREFETCH=y 116CONFIG_CPU_HAS_PREFETCH=y
115# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
116CONFIG_64BIT_PHYS_ADDR=y 118CONFIG_64BIT_PHYS_ADDR=y
117# CONFIG_CPU_ADVANCED is not set
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
121CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
123CONFIG_CPU_SUPPORTS_HIGHMEM=y
122CONFIG_ARCH_FLATMEM_ENABLE=y 124CONFIG_ARCH_FLATMEM_ENABLE=y
123CONFIG_SELECT_MEMORY_MODEL=y 125CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y 126CONFIG_FLATMEM_MANUAL=y
@@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
136# Code maturity level options 138# Code maturity level options
137# 139#
138CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
142 143
@@ -153,6 +154,7 @@ CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
154CONFIG_IKCONFIG=y 155CONFIG_IKCONFIG=y
155CONFIG_IKCONFIG_PROC=y 156CONFIG_IKCONFIG_PROC=y
157# CONFIG_RELAY is not set
156CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 168CONFIG_FUTEX=y
167CONFIG_EPOLL=y 169CONFIG_EPOLL=y
168CONFIG_SHMEM=y 170CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y 171CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
182CONFIG_MODULES=y 180CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
188CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -191,6 +188,8 @@ CONFIG_KMOD=y
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set 190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
194 193
195# 194#
196# IO Schedulers 195# IO Schedulers
@@ -244,6 +243,7 @@ CONFIG_NET=y
244# 243#
245# Networking options 244# Networking options
246# 245#
246# CONFIG_NETDEBUG is not set
247CONFIG_PACKET=y 247CONFIG_PACKET=y
248# CONFIG_PACKET_MMAP is not set 248# CONFIG_PACKET_MMAP is not set
249CONFIG_UNIX=y 249CONFIG_UNIX=y
@@ -263,7 +263,8 @@ CONFIG_IP_FIB_HASH=y
263# CONFIG_INET_AH is not set 263# CONFIG_INET_AH is not set
264# CONFIG_INET_ESP is not set 264# CONFIG_INET_ESP is not set
265# CONFIG_INET_IPCOMP is not set 265# CONFIG_INET_IPCOMP is not set
266CONFIG_INET_TUNNEL=m 266# CONFIG_INET_XFRM_TUNNEL is not set
267# CONFIG_INET_TUNNEL is not set
267CONFIG_INET_DIAG=y 268CONFIG_INET_DIAG=y
268CONFIG_INET_TCP_DIAG=y 269CONFIG_INET_TCP_DIAG=y
269# CONFIG_TCP_CONG_ADVANCED is not set 270# CONFIG_TCP_CONG_ADVANCED is not set
@@ -274,6 +275,8 @@ CONFIG_TCP_CONG_BIC=y
274# 275#
275# CONFIG_IP_VS is not set 276# CONFIG_IP_VS is not set
276# CONFIG_IPV6 is not set 277# CONFIG_IPV6 is not set
278# CONFIG_INET6_XFRM_TUNNEL is not set
279# CONFIG_INET6_TUNNEL is not set
277CONFIG_NETFILTER=y 280CONFIG_NETFILTER=y
278# CONFIG_NETFILTER_DEBUG is not set 281# CONFIG_NETFILTER_DEBUG is not set
279 282
@@ -288,10 +291,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
288CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 291CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
289CONFIG_NETFILTER_XT_MATCH_COMMENT=m 292CONFIG_NETFILTER_XT_MATCH_COMMENT=m
290CONFIG_NETFILTER_XT_MATCH_DCCP=m 293CONFIG_NETFILTER_XT_MATCH_DCCP=m
294CONFIG_NETFILTER_XT_MATCH_ESP=m
291CONFIG_NETFILTER_XT_MATCH_LENGTH=m 295CONFIG_NETFILTER_XT_MATCH_LENGTH=m
292CONFIG_NETFILTER_XT_MATCH_LIMIT=m 296CONFIG_NETFILTER_XT_MATCH_LIMIT=m
293CONFIG_NETFILTER_XT_MATCH_MAC=m 297CONFIG_NETFILTER_XT_MATCH_MAC=m
294CONFIG_NETFILTER_XT_MATCH_MARK=m 298CONFIG_NETFILTER_XT_MATCH_MARK=m
299CONFIG_NETFILTER_XT_MATCH_POLICY=m
300CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
295CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 301CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
296CONFIG_NETFILTER_XT_MATCH_REALM=m 302CONFIG_NETFILTER_XT_MATCH_REALM=m
297CONFIG_NETFILTER_XT_MATCH_SCTP=m 303CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -315,6 +321,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
315# SCTP Configuration (EXPERIMENTAL) 321# SCTP Configuration (EXPERIMENTAL)
316# 322#
317# CONFIG_IP_SCTP is not set 323# CONFIG_IP_SCTP is not set
324
325#
326# TIPC Configuration (EXPERIMENTAL)
327#
328# CONFIG_TIPC is not set
318# CONFIG_ATM is not set 329# CONFIG_ATM is not set
319# CONFIG_BRIDGE is not set 330# CONFIG_BRIDGE is not set
320# CONFIG_VLAN_8021Q is not set 331# CONFIG_VLAN_8021Q is not set
@@ -324,11 +335,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
324# CONFIG_ATALK is not set 335# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 336# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 337# CONFIG_LAPB is not set
327
328#
329# TIPC Configuration (EXPERIMENTAL)
330#
331# CONFIG_TIPC is not set
332# CONFIG_NET_DIVERT is not set 338# CONFIG_NET_DIVERT is not set
333# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
334# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
@@ -403,7 +409,6 @@ CONFIG_MTD_CFI_I2=y
403# CONFIG_MTD_CFI_I8 is not set 409# CONFIG_MTD_CFI_I8 is not set
404# CONFIG_MTD_CFI_INTELEXT is not set 410# CONFIG_MTD_CFI_INTELEXT is not set
405CONFIG_MTD_CFI_AMDSTD=y 411CONFIG_MTD_CFI_AMDSTD=y
406CONFIG_MTD_CFI_AMDSTD_RETRY=0
407# CONFIG_MTD_CFI_STAA is not set 412# CONFIG_MTD_CFI_STAA is not set
408CONFIG_MTD_CFI_UTIL=y 413CONFIG_MTD_CFI_UTIL=y
409# CONFIG_MTD_RAM is not set 414# CONFIG_MTD_RAM is not set
@@ -425,7 +430,6 @@ CONFIG_MTD_ALCHEMY=y
425# CONFIG_MTD_SLRAM is not set 430# CONFIG_MTD_SLRAM is not set
426# CONFIG_MTD_PHRAM is not set 431# CONFIG_MTD_PHRAM is not set
427# CONFIG_MTD_MTDRAM is not set 432# CONFIG_MTD_MTDRAM is not set
428# CONFIG_MTD_BLKMTD is not set
429# CONFIG_MTD_BLOCK2MTD is not set 433# CONFIG_MTD_BLOCK2MTD is not set
430 434
431# 435#
@@ -763,10 +767,6 @@ CONFIG_LEGACY_PTY_COUNT=256
763# 767#
764 768
765# 769#
766# Multimedia Capabilities Port drivers
767#
768
769#
770# Multimedia devices 770# Multimedia devices
771# 771#
772# CONFIG_VIDEO_DEV is not set 772# CONFIG_VIDEO_DEV is not set
@@ -784,6 +784,7 @@ CONFIG_FB_CFB_FILLRECT=y
784CONFIG_FB_CFB_COPYAREA=y 784CONFIG_FB_CFB_COPYAREA=y
785CONFIG_FB_CFB_IMAGEBLIT=y 785CONFIG_FB_CFB_IMAGEBLIT=y
786# CONFIG_FB_MACMODES is not set 786# CONFIG_FB_MACMODES is not set
787CONFIG_FB_FIRMWARE_EDID=y
787# CONFIG_FB_MODE_HELPERS is not set 788# CONFIG_FB_MODE_HELPERS is not set
788# CONFIG_FB_TILEBLITTING is not set 789# CONFIG_FB_TILEBLITTING is not set
789# CONFIG_FB_S1D13XXX is not set 790# CONFIG_FB_S1D13XXX is not set
@@ -794,6 +795,7 @@ CONFIG_FB_AU1200=y
794# Console display driver support 795# Console display driver support
795# 796#
796CONFIG_VGA_CONSOLE=y 797CONFIG_VGA_CONSOLE=y
798# CONFIG_VGACON_SOFT_SCROLLBACK is not set
797CONFIG_DUMMY_CONSOLE=y 799CONFIG_DUMMY_CONSOLE=y
798# CONFIG_FRAMEBUFFER_CONSOLE is not set 800# CONFIG_FRAMEBUFFER_CONSOLE is not set
799 801
@@ -816,6 +818,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
816# 818#
817CONFIG_USB_ARCH_HAS_HCD=y 819CONFIG_USB_ARCH_HAS_HCD=y
818CONFIG_USB_ARCH_HAS_OHCI=y 820CONFIG_USB_ARCH_HAS_OHCI=y
821CONFIG_USB_ARCH_HAS_EHCI=y
819# CONFIG_USB is not set 822# CONFIG_USB is not set
820 823
821# 824#
@@ -832,6 +835,7 @@ CONFIG_USB_GADGET=m
832# CONFIG_USB_GADGET_GOKU is not set 835# CONFIG_USB_GADGET_GOKU is not set
833# CONFIG_USB_GADGET_LH7A40X is not set 836# CONFIG_USB_GADGET_LH7A40X is not set
834# CONFIG_USB_GADGET_OMAP is not set 837# CONFIG_USB_GADGET_OMAP is not set
838# CONFIG_USB_GADGET_AT91 is not set
835# CONFIG_USB_GADGET_DUMMY_HCD is not set 839# CONFIG_USB_GADGET_DUMMY_HCD is not set
836# CONFIG_USB_GADGET_DUALSPEED is not set 840# CONFIG_USB_GADGET_DUALSPEED is not set
837 841
@@ -844,12 +848,30 @@ CONFIG_MMC_BLOCK=y
844CONFIG_MMC_AU1X=y 848CONFIG_MMC_AU1X=y
845 849
846# 850#
851# LED devices
852#
853# CONFIG_NEW_LEDS is not set
854
855#
856# LED drivers
857#
858
859#
860# LED Triggers
861#
862
863#
847# InfiniBand support 864# InfiniBand support
848# 865#
849 866
850# 867#
851# SN Devices 868# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
869#
870
871#
872# Real Time Clock
852# 873#
874# CONFIG_RTC_CLASS is not set
853 875
854# 876#
855# File systems 877# File systems
@@ -913,7 +935,6 @@ CONFIG_SYSFS=y
913CONFIG_TMPFS=y 935CONFIG_TMPFS=y
914# CONFIG_HUGETLB_PAGE is not set 936# CONFIG_HUGETLB_PAGE is not set
915CONFIG_RAMFS=y 937CONFIG_RAMFS=y
916# CONFIG_RELAYFS_FS is not set
917# CONFIG_CONFIGFS_FS is not set 938# CONFIG_CONFIGFS_FS is not set
918 939
919# 940#
@@ -1027,6 +1048,7 @@ CONFIG_NLS_UTF8=m
1027# CONFIG_MAGIC_SYSRQ is not set 1048# CONFIG_MAGIC_SYSRQ is not set
1028# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1029CONFIG_LOG_BUF_SHIFT=14 1050CONFIG_LOG_BUF_SHIFT=14
1051# CONFIG_DEBUG_FS is not set
1030CONFIG_CROSSCOMPILE=y 1052CONFIG_CROSSCOMPILE=y
1031CONFIG_CMDLINE="mem=48M" 1053CONFIG_CMDLINE="mem=48M"
1032 1054
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 5a415b1d4af0..ad632d87c4ef 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:59 2006 4# Mon Apr 24 14:50:59 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -116,11 +118,11 @@ CONFIG_PAGE_SIZE_4KB=y
116CONFIG_CPU_HAS_PREFETCH=y 118CONFIG_CPU_HAS_PREFETCH=y
117# CONFIG_MIPS_MT is not set 119# CONFIG_MIPS_MT is not set
118CONFIG_64BIT_PHYS_ADDR=y 120CONFIG_64BIT_PHYS_ADDR=y
119# CONFIG_CPU_ADVANCED is not set
120CONFIG_CPU_HAS_LLSC=y 121CONFIG_CPU_HAS_LLSC=y
121CONFIG_CPU_HAS_SYNC=y 122CONFIG_CPU_HAS_SYNC=y
122CONFIG_GENERIC_HARDIRQS=y 123CONFIG_GENERIC_HARDIRQS=y
123CONFIG_GENERIC_IRQ_PROBE=y 124CONFIG_GENERIC_IRQ_PROBE=y
125CONFIG_CPU_SUPPORTS_HIGHMEM=y
124CONFIG_ARCH_FLATMEM_ENABLE=y 126CONFIG_ARCH_FLATMEM_ENABLE=y
125CONFIG_SELECT_MEMORY_MODEL=y 127CONFIG_SELECT_MEMORY_MODEL=y
126CONFIG_FLATMEM_MANUAL=y 128CONFIG_FLATMEM_MANUAL=y
@@ -138,7 +140,6 @@ CONFIG_PREEMPT_NONE=y
138# Code maturity level options 140# Code maturity level options
139# 141#
140CONFIG_EXPERIMENTAL=y 142CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y 143CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32 144CONFIG_INIT_ENV_ARG_LIMIT=32
144 145
@@ -154,6 +155,7 @@ CONFIG_SYSVIPC=y
154CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 156# CONFIG_AUDIT is not set
156# CONFIG_IKCONFIG is not set 157# CONFIG_IKCONFIG is not set
158CONFIG_RELAY=y
157CONFIG_INITRAMFS_SOURCE="" 159CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 160# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 161CONFIG_EMBEDDED=y
@@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 169CONFIG_FUTEX=y
168CONFIG_EPOLL=y 170CONFIG_EPOLL=y
169CONFIG_SHMEM=y 171CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 172CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
@@ -183,7 +181,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
183CONFIG_MODULES=y 181CONFIG_MODULES=y
184CONFIG_MODULE_UNLOAD=y 182CONFIG_MODULE_UNLOAD=y
185# CONFIG_MODULE_FORCE_UNLOAD is not set 183# CONFIG_MODULE_FORCE_UNLOAD is not set
186CONFIG_OBSOLETE_MODPARM=y
187CONFIG_MODVERSIONS=y 184CONFIG_MODVERSIONS=y
188CONFIG_MODULE_SRCVERSION_ALL=y 185CONFIG_MODULE_SRCVERSION_ALL=y
189CONFIG_KMOD=y 186CONFIG_KMOD=y
@@ -192,6 +189,8 @@ CONFIG_KMOD=y
192# Block layer 189# Block layer
193# 190#
194# CONFIG_LBD is not set 191# CONFIG_LBD is not set
192# CONFIG_BLK_DEV_IO_TRACE is not set
193# CONFIG_LSF is not set
195 194
196# 195#
197# IO Schedulers 196# IO Schedulers
@@ -211,7 +210,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
211# 210#
212CONFIG_HW_HAS_PCI=y 211CONFIG_HW_HAS_PCI=y
213CONFIG_PCI=y 212CONFIG_PCI=y
214CONFIG_PCI_LEGACY_PROC=y
215CONFIG_MMU=y 213CONFIG_MMU=y
216 214
217# 215#
@@ -253,6 +251,7 @@ CONFIG_NET=y
253# 251#
254# Networking options 252# Networking options
255# 253#
254# CONFIG_NETDEBUG is not set
256CONFIG_PACKET=y 255CONFIG_PACKET=y
257# CONFIG_PACKET_MMAP is not set 256# CONFIG_PACKET_MMAP is not set
258CONFIG_UNIX=y 257CONFIG_UNIX=y
@@ -275,7 +274,8 @@ CONFIG_IP_PNP_BOOTP=y
275# CONFIG_INET_AH is not set 274# CONFIG_INET_AH is not set
276# CONFIG_INET_ESP is not set 275# CONFIG_INET_ESP is not set
277# CONFIG_INET_IPCOMP is not set 276# CONFIG_INET_IPCOMP is not set
278CONFIG_INET_TUNNEL=m 277# CONFIG_INET_XFRM_TUNNEL is not set
278# CONFIG_INET_TUNNEL is not set
279CONFIG_INET_DIAG=y 279CONFIG_INET_DIAG=y
280CONFIG_INET_TCP_DIAG=y 280CONFIG_INET_TCP_DIAG=y
281# CONFIG_TCP_CONG_ADVANCED is not set 281# CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,6 +286,8 @@ CONFIG_TCP_CONG_BIC=y
286# 286#
287# CONFIG_IP_VS is not set 287# CONFIG_IP_VS is not set
288# CONFIG_IPV6 is not set 288# CONFIG_IPV6 is not set
289# CONFIG_INET6_XFRM_TUNNEL is not set
290# CONFIG_INET6_TUNNEL is not set
289CONFIG_NETFILTER=y 291CONFIG_NETFILTER=y
290# CONFIG_NETFILTER_DEBUG is not set 292# CONFIG_NETFILTER_DEBUG is not set
291 293
@@ -302,10 +304,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 304CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
303CONFIG_NETFILTER_XT_MATCH_COMMENT=m 305CONFIG_NETFILTER_XT_MATCH_COMMENT=m
304CONFIG_NETFILTER_XT_MATCH_DCCP=m 306CONFIG_NETFILTER_XT_MATCH_DCCP=m
307CONFIG_NETFILTER_XT_MATCH_ESP=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m 308CONFIG_NETFILTER_XT_MATCH_LENGTH=m
306CONFIG_NETFILTER_XT_MATCH_LIMIT=m 309CONFIG_NETFILTER_XT_MATCH_LIMIT=m
307CONFIG_NETFILTER_XT_MATCH_MAC=m 310CONFIG_NETFILTER_XT_MATCH_MAC=m
308CONFIG_NETFILTER_XT_MATCH_MARK=m 311CONFIG_NETFILTER_XT_MATCH_MARK=m
312CONFIG_NETFILTER_XT_MATCH_POLICY=m
313CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 314CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
310CONFIG_NETFILTER_XT_MATCH_REALM=m 315CONFIG_NETFILTER_XT_MATCH_REALM=m
311CONFIG_NETFILTER_XT_MATCH_SCTP=m 316CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -329,6 +334,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
329# SCTP Configuration (EXPERIMENTAL) 334# SCTP Configuration (EXPERIMENTAL)
330# 335#
331# CONFIG_IP_SCTP is not set 336# CONFIG_IP_SCTP is not set
337
338#
339# TIPC Configuration (EXPERIMENTAL)
340#
341# CONFIG_TIPC is not set
332# CONFIG_ATM is not set 342# CONFIG_ATM is not set
333# CONFIG_BRIDGE is not set 343# CONFIG_BRIDGE is not set
334# CONFIG_VLAN_8021Q is not set 344# CONFIG_VLAN_8021Q is not set
@@ -338,11 +348,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
338# CONFIG_ATALK is not set 348# CONFIG_ATALK is not set
339# CONFIG_X25 is not set 349# CONFIG_X25 is not set
340# CONFIG_LAPB is not set 350# CONFIG_LAPB is not set
341
342#
343# TIPC Configuration (EXPERIMENTAL)
344#
345# CONFIG_TIPC is not set
346# CONFIG_NET_DIVERT is not set 351# CONFIG_NET_DIVERT is not set
347# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
348# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
@@ -364,6 +369,9 @@ CONFIG_IEEE80211=m
364# CONFIG_IEEE80211_DEBUG is not set 369# CONFIG_IEEE80211_DEBUG is not set
365CONFIG_IEEE80211_CRYPT_WEP=m 370CONFIG_IEEE80211_CRYPT_WEP=m
366CONFIG_IEEE80211_CRYPT_CCMP=m 371CONFIG_IEEE80211_CRYPT_CCMP=m
372CONFIG_IEEE80211_SOFTMAC=m
373# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
374CONFIG_WIRELESS_EXT=y
367 375
368# 376#
369# Device Drivers 377# Device Drivers
@@ -420,7 +428,6 @@ CONFIG_MTD_CFI_I2=y
420# CONFIG_MTD_CFI_I8 is not set 428# CONFIG_MTD_CFI_I8 is not set
421CONFIG_MTD_CFI_INTELEXT=y 429CONFIG_MTD_CFI_INTELEXT=y
422CONFIG_MTD_CFI_AMDSTD=y 430CONFIG_MTD_CFI_AMDSTD=y
423CONFIG_MTD_CFI_AMDSTD_RETRY=0
424# CONFIG_MTD_CFI_STAA is not set 431# CONFIG_MTD_CFI_STAA is not set
425CONFIG_MTD_CFI_UTIL=y 432CONFIG_MTD_CFI_UTIL=y
426# CONFIG_MTD_RAM is not set 433# CONFIG_MTD_RAM is not set
@@ -443,7 +450,6 @@ CONFIG_MTD_ALCHEMY=y
443# CONFIG_MTD_SLRAM is not set 450# CONFIG_MTD_SLRAM is not set
444# CONFIG_MTD_PHRAM is not set 451# CONFIG_MTD_PHRAM is not set
445# CONFIG_MTD_MTDRAM is not set 452# CONFIG_MTD_MTDRAM is not set
446# CONFIG_MTD_BLKMTD is not set
447# CONFIG_MTD_BLOCK2MTD is not set 453# CONFIG_MTD_BLOCK2MTD is not set
448 454
449# 455#
@@ -486,7 +492,7 @@ CONFIG_BLK_DEV_LOOP=y
486# CONFIG_BLK_DEV_SX8 is not set 492# CONFIG_BLK_DEV_SX8 is not set
487# CONFIG_BLK_DEV_UB is not set 493# CONFIG_BLK_DEV_UB is not set
488# CONFIG_BLK_DEV_RAM is not set 494# CONFIG_BLK_DEV_RAM is not set
489CONFIG_BLK_DEV_RAM_COUNT=16 495# CONFIG_BLK_DEV_INITRD is not set
490CONFIG_CDROM_PKTCDVD=m 496CONFIG_CDROM_PKTCDVD=m
491CONFIG_CDROM_PKTCDVD_BUFFERS=8 497CONFIG_CDROM_PKTCDVD_BUFFERS=8
492# CONFIG_CDROM_PKTCDVD_WCACHE is not set 498# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -714,6 +720,7 @@ CONFIG_SERIO_RAW=m
714# 720#
715CONFIG_SERIAL_8250=y 721CONFIG_SERIAL_8250=y
716CONFIG_SERIAL_8250_CONSOLE=y 722CONFIG_SERIAL_8250_CONSOLE=y
723CONFIG_SERIAL_8250_PCI=y
717# CONFIG_SERIAL_8250_CS is not set 724# CONFIG_SERIAL_8250_CS is not set
718CONFIG_SERIAL_8250_NR_UARTS=4 725CONFIG_SERIAL_8250_NR_UARTS=4
719CONFIG_SERIAL_8250_RUNTIME_UARTS=4 726CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -725,6 +732,7 @@ CONFIG_SERIAL_8250_AU1X00=y
725# 732#
726CONFIG_SERIAL_CORE=y 733CONFIG_SERIAL_CORE=y
727CONFIG_SERIAL_CORE_CONSOLE=y 734CONFIG_SERIAL_CORE_CONSOLE=y
735# CONFIG_SERIAL_JSM is not set
728CONFIG_UNIX98_PTYS=y 736CONFIG_UNIX98_PTYS=y
729CONFIG_LEGACY_PTYS=y 737CONFIG_LEGACY_PTYS=y
730CONFIG_LEGACY_PTY_COUNT=256 738CONFIG_LEGACY_PTY_COUNT=256
@@ -790,10 +798,6 @@ CONFIG_SYNCLINK_CS=m
790# 798#
791 799
792# 800#
793# Multimedia Capabilities Port drivers
794#
795
796#
797# Multimedia devices 801# Multimedia devices
798# 802#
799# CONFIG_VIDEO_DEV is not set 803# CONFIG_VIDEO_DEV is not set
@@ -802,6 +806,7 @@ CONFIG_SYNCLINK_CS=m
802# Digital Video Broadcasting Devices 806# Digital Video Broadcasting Devices
803# 807#
804# CONFIG_DVB is not set 808# CONFIG_DVB is not set
809# CONFIG_USB_DABUSB is not set
805 810
806# 811#
807# Graphics support 812# Graphics support
@@ -825,9 +830,11 @@ CONFIG_SND_SEQ_DUMMY=m
825CONFIG_SND_OSSEMUL=y 830CONFIG_SND_OSSEMUL=y
826CONFIG_SND_MIXER_OSS=m 831CONFIG_SND_MIXER_OSS=m
827CONFIG_SND_PCM_OSS=m 832CONFIG_SND_PCM_OSS=m
833CONFIG_SND_PCM_OSS_PLUGINS=y
828CONFIG_SND_SEQUENCER_OSS=y 834CONFIG_SND_SEQUENCER_OSS=y
829# CONFIG_SND_DYNAMIC_MINORS is not set 835# CONFIG_SND_DYNAMIC_MINORS is not set
830CONFIG_SND_SUPPORT_OLD_API=y 836CONFIG_SND_SUPPORT_OLD_API=y
837CONFIG_SND_VERBOSE_PROCFS=y
831# CONFIG_SND_VERBOSE_PRINTK is not set 838# CONFIG_SND_VERBOSE_PRINTK is not set
832# CONFIG_SND_DEBUG is not set 839# CONFIG_SND_DEBUG is not set
833 840
@@ -846,6 +853,7 @@ CONFIG_SND_MTPAV=m
846# PCI devices 853# PCI devices
847# 854#
848# CONFIG_SND_AD1889 is not set 855# CONFIG_SND_AD1889 is not set
856# CONFIG_SND_ALS300 is not set
849# CONFIG_SND_ALI5451 is not set 857# CONFIG_SND_ALI5451 is not set
850# CONFIG_SND_ATIIXP is not set 858# CONFIG_SND_ATIIXP is not set
851# CONFIG_SND_ATIIXP_MODEM is not set 859# CONFIG_SND_ATIIXP_MODEM is not set
@@ -877,6 +885,7 @@ CONFIG_SND_MTPAV=m
877# CONFIG_SND_MIXART is not set 885# CONFIG_SND_MIXART is not set
878# CONFIG_SND_NM256 is not set 886# CONFIG_SND_NM256 is not set
879# CONFIG_SND_PCXHR is not set 887# CONFIG_SND_PCXHR is not set
888# CONFIG_SND_RIPTIDE is not set
880# CONFIG_SND_RME32 is not set 889# CONFIG_SND_RME32 is not set
881# CONFIG_SND_RME96 is not set 890# CONFIG_SND_RME96 is not set
882# CONFIG_SND_RME9652 is not set 891# CONFIG_SND_RME9652 is not set
@@ -905,34 +914,22 @@ CONFIG_SND_AU1X00=m
905# Open Sound System 914# Open Sound System
906# 915#
907CONFIG_SOUND_PRIME=y 916CONFIG_SOUND_PRIME=y
908CONFIG_OBSOLETE_OSS_DRIVER=y
909# CONFIG_SOUND_BT878 is not set 917# CONFIG_SOUND_BT878 is not set
910# CONFIG_SOUND_CMPCI is not set
911# CONFIG_SOUND_EMU10K1 is not set 918# CONFIG_SOUND_EMU10K1 is not set
912# CONFIG_SOUND_FUSION is not set 919# CONFIG_SOUND_FUSION is not set
913# CONFIG_SOUND_CS4281 is not set
914# CONFIG_SOUND_ES1370 is not set
915# CONFIG_SOUND_ES1371 is not set 920# CONFIG_SOUND_ES1371 is not set
916# CONFIG_SOUND_ESSSOLO1 is not set
917# CONFIG_SOUND_MAESTRO is not set
918# CONFIG_SOUND_MAESTRO3 is not set
919# CONFIG_SOUND_ICH is not set 921# CONFIG_SOUND_ICH is not set
920# CONFIG_SOUND_SONICVIBES is not set
921# CONFIG_SOUND_AU1000 is not set
922# CONFIG_SOUND_TRIDENT is not set 922# CONFIG_SOUND_TRIDENT is not set
923# CONFIG_SOUND_MSNDCLAS is not set 923# CONFIG_SOUND_MSNDCLAS is not set
924# CONFIG_SOUND_MSNDPIN is not set 924# CONFIG_SOUND_MSNDPIN is not set
925# CONFIG_SOUND_VIA82CXXX is not set 925# CONFIG_SOUND_VIA82CXXX is not set
926# CONFIG_SOUND_ALI5455 is not set
927# CONFIG_SOUND_FORTE is not set
928# CONFIG_SOUND_RME96XX is not set
929# CONFIG_SOUND_AD1980 is not set
930 926
931# 927#
932# USB support 928# USB support
933# 929#
934CONFIG_USB_ARCH_HAS_HCD=y 930CONFIG_USB_ARCH_HAS_HCD=y
935CONFIG_USB_ARCH_HAS_OHCI=y 931CONFIG_USB_ARCH_HAS_OHCI=y
932CONFIG_USB_ARCH_HAS_EHCI=y
936CONFIG_USB=y 933CONFIG_USB=y
937# CONFIG_USB_DEBUG is not set 934# CONFIG_USB_DEBUG is not set
938 935
@@ -958,7 +955,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
958# 955#
959# USB Device Class drivers 956# USB Device Class drivers
960# 957#
961# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
962# CONFIG_USB_ACM is not set 958# CONFIG_USB_ACM is not set
963# CONFIG_USB_PRINTER is not set 959# CONFIG_USB_PRINTER is not set
964 960
@@ -985,9 +981,7 @@ CONFIG_USB_HIDINPUT=y
985# CONFIG_USB_ACECAD is not set 981# CONFIG_USB_ACECAD is not set
986# CONFIG_USB_KBTAB is not set 982# CONFIG_USB_KBTAB is not set
987# CONFIG_USB_POWERMATE is not set 983# CONFIG_USB_POWERMATE is not set
988# CONFIG_USB_MTOUCH is not set 984# CONFIG_USB_TOUCHSCREEN is not set
989# CONFIG_USB_ITMTOUCH is not set
990# CONFIG_USB_EGALAX is not set
991CONFIG_USB_YEALINK=m 985CONFIG_USB_YEALINK=m
992# CONFIG_USB_XPAD is not set 986# CONFIG_USB_XPAD is not set
993# CONFIG_USB_ATI_REMOTE is not set 987# CONFIG_USB_ATI_REMOTE is not set
@@ -1001,15 +995,6 @@ CONFIG_USB_YEALINK=m
1001# CONFIG_USB_MDC800 is not set 995# CONFIG_USB_MDC800 is not set
1002 996
1003# 997#
1004# USB Multimedia devices
1005#
1006# CONFIG_USB_DABUSB is not set
1007
1008#
1009# Video4Linux support is needed for USB Multimedia device support
1010#
1011
1012#
1013# USB Network Adapters 998# USB Network Adapters
1014# 999#
1015# CONFIG_USB_CATC is not set 1000# CONFIG_USB_CATC is not set
@@ -1059,13 +1044,31 @@ CONFIG_USB_LD=m
1059# CONFIG_MMC is not set 1044# CONFIG_MMC is not set
1060 1045
1061# 1046#
1047# LED devices
1048#
1049# CONFIG_NEW_LEDS is not set
1050
1051#
1052# LED drivers
1053#
1054
1055#
1056# LED Triggers
1057#
1058
1059#
1062# InfiniBand support 1060# InfiniBand support
1063# 1061#
1064# CONFIG_INFINIBAND is not set 1062# CONFIG_INFINIBAND is not set
1065 1063
1066# 1064#
1067# SN Devices 1065# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1066#
1067
1068#
1069# Real Time Clock
1068# 1070#
1071# CONFIG_RTC_CLASS is not set
1069 1072
1070# 1073#
1071# File systems 1074# File systems
@@ -1123,7 +1126,6 @@ CONFIG_SYSFS=y
1123CONFIG_TMPFS=y 1126CONFIG_TMPFS=y
1124# CONFIG_HUGETLB_PAGE is not set 1127# CONFIG_HUGETLB_PAGE is not set
1125CONFIG_RAMFS=y 1128CONFIG_RAMFS=y
1126CONFIG_RELAYFS_FS=m
1127# CONFIG_CONFIGFS_FS is not set 1129# CONFIG_CONFIGFS_FS is not set
1128 1130
1129# 1131#
@@ -1232,6 +1234,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1232# CONFIG_MAGIC_SYSRQ is not set 1234# CONFIG_MAGIC_SYSRQ is not set
1233# CONFIG_DEBUG_KERNEL is not set 1235# CONFIG_DEBUG_KERNEL is not set
1234CONFIG_LOG_BUF_SHIFT=14 1236CONFIG_LOG_BUF_SHIFT=14
1237# CONFIG_DEBUG_FS is not set
1235CONFIG_CROSSCOMPILE=y 1238CONFIG_CROSSCOMPILE=y
1236CONFIG_CMDLINE="" 1239CONFIG_CMDLINE=""
1237 1240
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 8dc1f18badfe..8130e23dc255 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:00 2006 4# Mon Apr 24 14:51:00 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -115,11 +117,11 @@ CONFIG_PAGE_SIZE_4KB=y
115CONFIG_CPU_HAS_PREFETCH=y 117CONFIG_CPU_HAS_PREFETCH=y
116# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
117CONFIG_64BIT_PHYS_ADDR=y 119CONFIG_64BIT_PHYS_ADDR=y
118# CONFIG_CPU_ADVANCED is not set
119CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
124CONFIG_CPU_SUPPORTS_HIGHMEM=y
123CONFIG_ARCH_FLATMEM_ENABLE=y 125CONFIG_ARCH_FLATMEM_ENABLE=y
124CONFIG_SELECT_MEMORY_MODEL=y 126CONFIG_SELECT_MEMORY_MODEL=y
125CONFIG_FLATMEM_MANUAL=y 127CONFIG_FLATMEM_MANUAL=y
@@ -137,7 +139,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 139# Code maturity level options
138# 140#
139CONFIG_EXPERIMENTAL=y 141CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 142CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 143CONFIG_INIT_ENV_ARG_LIMIT=32
143 144
@@ -153,6 +154,7 @@ CONFIG_SYSVIPC=y
153CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
155# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
157CONFIG_RELAY=y
156CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 168CONFIG_FUTEX=y
167CONFIG_EPOLL=y 169CONFIG_EPOLL=y
168CONFIG_SHMEM=y 170CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y 171CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
182CONFIG_MODULES=y 180CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
188CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -191,6 +188,8 @@ CONFIG_KMOD=y
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set 190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
194 193
195# 194#
196# IO Schedulers 195# IO Schedulers
@@ -210,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
210# 209#
211CONFIG_HW_HAS_PCI=y 210CONFIG_HW_HAS_PCI=y
212CONFIG_PCI=y 211CONFIG_PCI=y
213CONFIG_PCI_LEGACY_PROC=y
214CONFIG_MMU=y 212CONFIG_MMU=y
215 213
216# 214#
@@ -252,6 +250,7 @@ CONFIG_NET=y
252# 250#
253# Networking options 251# Networking options
254# 252#
253# CONFIG_NETDEBUG is not set
255CONFIG_PACKET=y 254CONFIG_PACKET=y
256# CONFIG_PACKET_MMAP is not set 255# CONFIG_PACKET_MMAP is not set
257CONFIG_UNIX=y 256CONFIG_UNIX=y
@@ -274,7 +273,8 @@ CONFIG_IP_PNP_BOOTP=y
274# CONFIG_INET_AH is not set 273# CONFIG_INET_AH is not set
275# CONFIG_INET_ESP is not set 274# CONFIG_INET_ESP is not set
276# CONFIG_INET_IPCOMP is not set 275# CONFIG_INET_IPCOMP is not set
277CONFIG_INET_TUNNEL=m 276# CONFIG_INET_XFRM_TUNNEL is not set
277# CONFIG_INET_TUNNEL is not set
278CONFIG_INET_DIAG=y 278CONFIG_INET_DIAG=y
279CONFIG_INET_TCP_DIAG=y 279CONFIG_INET_TCP_DIAG=y
280# CONFIG_TCP_CONG_ADVANCED is not set 280# CONFIG_TCP_CONG_ADVANCED is not set
@@ -285,6 +285,8 @@ CONFIG_TCP_CONG_BIC=y
285# 285#
286# CONFIG_IP_VS is not set 286# CONFIG_IP_VS is not set
287# CONFIG_IPV6 is not set 287# CONFIG_IPV6 is not set
288# CONFIG_INET6_XFRM_TUNNEL is not set
289# CONFIG_INET6_TUNNEL is not set
288CONFIG_NETFILTER=y 290CONFIG_NETFILTER=y
289# CONFIG_NETFILTER_DEBUG is not set 291# CONFIG_NETFILTER_DEBUG is not set
290 292
@@ -301,10 +303,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
301CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 303CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
302CONFIG_NETFILTER_XT_MATCH_COMMENT=m 304CONFIG_NETFILTER_XT_MATCH_COMMENT=m
303CONFIG_NETFILTER_XT_MATCH_DCCP=m 305CONFIG_NETFILTER_XT_MATCH_DCCP=m
306CONFIG_NETFILTER_XT_MATCH_ESP=m
304CONFIG_NETFILTER_XT_MATCH_LENGTH=m 307CONFIG_NETFILTER_XT_MATCH_LENGTH=m
305CONFIG_NETFILTER_XT_MATCH_LIMIT=m 308CONFIG_NETFILTER_XT_MATCH_LIMIT=m
306CONFIG_NETFILTER_XT_MATCH_MAC=m 309CONFIG_NETFILTER_XT_MATCH_MAC=m
307CONFIG_NETFILTER_XT_MATCH_MARK=m 310CONFIG_NETFILTER_XT_MATCH_MARK=m
311CONFIG_NETFILTER_XT_MATCH_POLICY=m
312CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
308CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 313CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
309CONFIG_NETFILTER_XT_MATCH_REALM=m 314CONFIG_NETFILTER_XT_MATCH_REALM=m
310CONFIG_NETFILTER_XT_MATCH_SCTP=m 315CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -328,6 +333,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
328# SCTP Configuration (EXPERIMENTAL) 333# SCTP Configuration (EXPERIMENTAL)
329# 334#
330# CONFIG_IP_SCTP is not set 335# CONFIG_IP_SCTP is not set
336
337#
338# TIPC Configuration (EXPERIMENTAL)
339#
340# CONFIG_TIPC is not set
331# CONFIG_ATM is not set 341# CONFIG_ATM is not set
332# CONFIG_BRIDGE is not set 342# CONFIG_BRIDGE is not set
333# CONFIG_VLAN_8021Q is not set 343# CONFIG_VLAN_8021Q is not set
@@ -337,11 +347,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
337# CONFIG_ATALK is not set 347# CONFIG_ATALK is not set
338# CONFIG_X25 is not set 348# CONFIG_X25 is not set
339# CONFIG_LAPB is not set 349# CONFIG_LAPB is not set
340
341#
342# TIPC Configuration (EXPERIMENTAL)
343#
344# CONFIG_TIPC is not set
345# CONFIG_NET_DIVERT is not set 350# CONFIG_NET_DIVERT is not set
346# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
347# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
@@ -363,6 +368,9 @@ CONFIG_IEEE80211=m
363# CONFIG_IEEE80211_DEBUG is not set 368# CONFIG_IEEE80211_DEBUG is not set
364CONFIG_IEEE80211_CRYPT_WEP=m 369CONFIG_IEEE80211_CRYPT_WEP=m
365CONFIG_IEEE80211_CRYPT_CCMP=m 370CONFIG_IEEE80211_CRYPT_CCMP=m
371CONFIG_IEEE80211_SOFTMAC=m
372# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
373CONFIG_WIRELESS_EXT=y
366 374
367# 375#
368# Device Drivers 376# Device Drivers
@@ -419,7 +427,6 @@ CONFIG_MTD_CFI_I2=y
419# CONFIG_MTD_CFI_I8 is not set 427# CONFIG_MTD_CFI_I8 is not set
420# CONFIG_MTD_CFI_INTELEXT is not set 428# CONFIG_MTD_CFI_INTELEXT is not set
421CONFIG_MTD_CFI_AMDSTD=y 429CONFIG_MTD_CFI_AMDSTD=y
422CONFIG_MTD_CFI_AMDSTD_RETRY=0
423# CONFIG_MTD_CFI_STAA is not set 430# CONFIG_MTD_CFI_STAA is not set
424CONFIG_MTD_CFI_UTIL=y 431CONFIG_MTD_CFI_UTIL=y
425# CONFIG_MTD_RAM is not set 432# CONFIG_MTD_RAM is not set
@@ -442,7 +449,6 @@ CONFIG_MTD_ALCHEMY=y
442# CONFIG_MTD_SLRAM is not set 449# CONFIG_MTD_SLRAM is not set
443# CONFIG_MTD_PHRAM is not set 450# CONFIG_MTD_PHRAM is not set
444# CONFIG_MTD_MTDRAM is not set 451# CONFIG_MTD_MTDRAM is not set
445# CONFIG_MTD_BLKMTD is not set
446# CONFIG_MTD_BLOCK2MTD is not set 452# CONFIG_MTD_BLOCK2MTD is not set
447 453
448# 454#
@@ -489,7 +495,7 @@ CONFIG_BLK_DEV_LOOP=y
489# CONFIG_BLK_DEV_NBD is not set 495# CONFIG_BLK_DEV_NBD is not set
490# CONFIG_BLK_DEV_SX8 is not set 496# CONFIG_BLK_DEV_SX8 is not set
491# CONFIG_BLK_DEV_RAM is not set 497# CONFIG_BLK_DEV_RAM is not set
492CONFIG_BLK_DEV_RAM_COUNT=16 498# CONFIG_BLK_DEV_INITRD is not set
493CONFIG_CDROM_PKTCDVD=m 499CONFIG_CDROM_PKTCDVD=m
494CONFIG_CDROM_PKTCDVD_BUFFERS=8 500CONFIG_CDROM_PKTCDVD_BUFFERS=8
495# CONFIG_CDROM_PKTCDVD_WCACHE is not set 501# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -754,6 +760,7 @@ CONFIG_SERIO_RAW=m
754# 760#
755CONFIG_SERIAL_8250=y 761CONFIG_SERIAL_8250=y
756CONFIG_SERIAL_8250_CONSOLE=y 762CONFIG_SERIAL_8250_CONSOLE=y
763CONFIG_SERIAL_8250_PCI=y
757# CONFIG_SERIAL_8250_CS is not set 764# CONFIG_SERIAL_8250_CS is not set
758CONFIG_SERIAL_8250_NR_UARTS=4 765CONFIG_SERIAL_8250_NR_UARTS=4
759CONFIG_SERIAL_8250_RUNTIME_UARTS=4 766CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -765,6 +772,7 @@ CONFIG_SERIAL_8250_AU1X00=y
765# 772#
766CONFIG_SERIAL_CORE=y 773CONFIG_SERIAL_CORE=y
767CONFIG_SERIAL_CORE_CONSOLE=y 774CONFIG_SERIAL_CORE_CONSOLE=y
775# CONFIG_SERIAL_JSM is not set
768CONFIG_UNIX98_PTYS=y 776CONFIG_UNIX98_PTYS=y
769CONFIG_LEGACY_PTYS=y 777CONFIG_LEGACY_PTYS=y
770CONFIG_LEGACY_PTY_COUNT=256 778CONFIG_LEGACY_PTY_COUNT=256
@@ -830,10 +838,6 @@ CONFIG_SYNCLINK_CS=m
830# 838#
831 839
832# 840#
833# Multimedia Capabilities Port drivers
834#
835
836#
837# Multimedia devices 841# Multimedia devices
838# 842#
839# CONFIG_VIDEO_DEV is not set 843# CONFIG_VIDEO_DEV is not set
@@ -858,6 +862,7 @@ CONFIG_SYNCLINK_CS=m
858# 862#
859CONFIG_USB_ARCH_HAS_HCD=y 863CONFIG_USB_ARCH_HAS_HCD=y
860CONFIG_USB_ARCH_HAS_OHCI=y 864CONFIG_USB_ARCH_HAS_OHCI=y
865CONFIG_USB_ARCH_HAS_EHCI=y
861# CONFIG_USB is not set 866# CONFIG_USB is not set
862 867
863# 868#
@@ -875,13 +880,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
875# CONFIG_MMC is not set 880# CONFIG_MMC is not set
876 881
877# 882#
883# LED devices
884#
885# CONFIG_NEW_LEDS is not set
886
887#
888# LED drivers
889#
890
891#
892# LED Triggers
893#
894
895#
878# InfiniBand support 896# InfiniBand support
879# 897#
880# CONFIG_INFINIBAND is not set 898# CONFIG_INFINIBAND is not set
881 899
882# 900#
883# SN Devices 901# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
902#
903
904#
905# Real Time Clock
884# 906#
907# CONFIG_RTC_CLASS is not set
885 908
886# 909#
887# File systems 910# File systems
@@ -939,7 +962,6 @@ CONFIG_SYSFS=y
939CONFIG_TMPFS=y 962CONFIG_TMPFS=y
940# CONFIG_HUGETLB_PAGE is not set 963# CONFIG_HUGETLB_PAGE is not set
941CONFIG_RAMFS=y 964CONFIG_RAMFS=y
942CONFIG_RELAYFS_FS=m
943# CONFIG_CONFIGFS_FS is not set 965# CONFIG_CONFIGFS_FS is not set
944 966
945# 967#
@@ -1048,6 +1070,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1048# CONFIG_MAGIC_SYSRQ is not set 1070# CONFIG_MAGIC_SYSRQ is not set
1049# CONFIG_DEBUG_KERNEL is not set 1071# CONFIG_DEBUG_KERNEL is not set
1050CONFIG_LOG_BUF_SHIFT=14 1072CONFIG_LOG_BUF_SHIFT=14
1073# CONFIG_DEBUG_FS is not set
1051CONFIG_CROSSCOMPILE=y 1074CONFIG_CROSSCOMPILE=y
1052CONFIG_CMDLINE="" 1075CONFIG_CMDLINE=""
1053 1076
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index 8fae63e47e5e..8d88ac1bbfeb 100644
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:02 2006 4# Mon Apr 24 14:51:00 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_DDB5476=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y
114# CONFIG_PAGE_SIZE_16KB is not set 116# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set 117# CONFIG_PAGE_SIZE_64KB is not set
116# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
117# CONFIG_CPU_ADVANCED is not set
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
@@ -136,7 +137,6 @@ CONFIG_PREEMPT_NONE=y
136# Code maturity level options 137# Code maturity level options
137# 138#
138CONFIG_EXPERIMENTAL=y 139CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y 140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32 141CONFIG_INIT_ENV_ARG_LIMIT=32
142 142
@@ -152,6 +152,7 @@ CONFIG_SYSVIPC=y
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
155CONFIG_RELAY=y
155CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
@@ -165,10 +166,6 @@ CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167CONFIG_SHMEM=y 168CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y 169CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
@@ -183,6 +180,8 @@ CONFIG_BASE_SMALL=0
183# Block layer 180# Block layer
184# 181#
185# CONFIG_LBD is not set 182# CONFIG_LBD is not set
183# CONFIG_BLK_DEV_IO_TRACE is not set
184# CONFIG_LSF is not set
186 185
187# 186#
188# IO Schedulers 187# IO Schedulers
@@ -202,7 +201,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
202# 201#
203CONFIG_HW_HAS_PCI=y 202CONFIG_HW_HAS_PCI=y
204CONFIG_PCI=y 203CONFIG_PCI=y
205CONFIG_PCI_LEGACY_PROC=y
206CONFIG_ISA=y 204CONFIG_ISA=y
207CONFIG_MMU=y 205CONFIG_MMU=y
208 206
@@ -231,6 +229,7 @@ CONFIG_NET=y
231# 229#
232# Networking options 230# Networking options
233# 231#
232# CONFIG_NETDEBUG is not set
234CONFIG_PACKET=y 233CONFIG_PACKET=y
235# CONFIG_PACKET_MMAP is not set 234# CONFIG_PACKET_MMAP is not set
236CONFIG_UNIX=y 235CONFIG_UNIX=y
@@ -252,12 +251,15 @@ CONFIG_IP_PNP_BOOTP=y
252# CONFIG_INET_AH is not set 251# CONFIG_INET_AH is not set
253# CONFIG_INET_ESP is not set 252# CONFIG_INET_ESP is not set
254# CONFIG_INET_IPCOMP is not set 253# CONFIG_INET_IPCOMP is not set
255CONFIG_INET_TUNNEL=y 254# CONFIG_INET_XFRM_TUNNEL is not set
255# CONFIG_INET_TUNNEL is not set
256CONFIG_INET_DIAG=y 256CONFIG_INET_DIAG=y
257CONFIG_INET_TCP_DIAG=y 257CONFIG_INET_TCP_DIAG=y
258# CONFIG_TCP_CONG_ADVANCED is not set 258# CONFIG_TCP_CONG_ADVANCED is not set
259CONFIG_TCP_CONG_BIC=y 259CONFIG_TCP_CONG_BIC=y
260# CONFIG_IPV6 is not set 260# CONFIG_IPV6 is not set
261# CONFIG_INET6_XFRM_TUNNEL is not set
262# CONFIG_INET6_TUNNEL is not set
261# CONFIG_NETFILTER is not set 263# CONFIG_NETFILTER is not set
262 264
263# 265#
@@ -269,6 +271,11 @@ CONFIG_TCP_CONG_BIC=y
269# SCTP Configuration (EXPERIMENTAL) 271# SCTP Configuration (EXPERIMENTAL)
270# 272#
271# CONFIG_IP_SCTP is not set 273# CONFIG_IP_SCTP is not set
274
275#
276# TIPC Configuration (EXPERIMENTAL)
277#
278# CONFIG_TIPC is not set
272# CONFIG_ATM is not set 279# CONFIG_ATM is not set
273# CONFIG_BRIDGE is not set 280# CONFIG_BRIDGE is not set
274# CONFIG_VLAN_8021Q is not set 281# CONFIG_VLAN_8021Q is not set
@@ -278,11 +285,6 @@ CONFIG_TCP_CONG_BIC=y
278# CONFIG_ATALK is not set 285# CONFIG_ATALK is not set
279# CONFIG_X25 is not set 286# CONFIG_X25 is not set
280# CONFIG_LAPB is not set 287# CONFIG_LAPB is not set
281
282#
283# TIPC Configuration (EXPERIMENTAL)
284#
285# CONFIG_TIPC is not set
286# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
287# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
288# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
@@ -303,6 +305,9 @@ CONFIG_IEEE80211=y
303# CONFIG_IEEE80211_DEBUG is not set 305# CONFIG_IEEE80211_DEBUG is not set
304CONFIG_IEEE80211_CRYPT_WEP=y 306CONFIG_IEEE80211_CRYPT_WEP=y
305CONFIG_IEEE80211_CRYPT_CCMP=y 307CONFIG_IEEE80211_CRYPT_CCMP=y
308CONFIG_IEEE80211_SOFTMAC=y
309# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
310CONFIG_WIRELESS_EXT=y
306 311
307# 312#
308# Device Drivers 313# Device Drivers
@@ -348,7 +353,7 @@ CONFIG_PROC_EVENTS=y
348# CONFIG_BLK_DEV_NBD is not set 353# CONFIG_BLK_DEV_NBD is not set
349# CONFIG_BLK_DEV_SX8 is not set 354# CONFIG_BLK_DEV_SX8 is not set
350# CONFIG_BLK_DEV_RAM is not set 355# CONFIG_BLK_DEV_RAM is not set
351CONFIG_BLK_DEV_RAM_COUNT=16 356# CONFIG_BLK_DEV_INITRD is not set
352CONFIG_CDROM_PKTCDVD=y 357CONFIG_CDROM_PKTCDVD=y
353CONFIG_CDROM_PKTCDVD_BUFFERS=8 358CONFIG_CDROM_PKTCDVD_BUFFERS=8
354# CONFIG_CDROM_PKTCDVD_WCACHE is not set 359# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -571,6 +576,7 @@ CONFIG_HW_CONSOLE=y
571# 576#
572CONFIG_SERIAL_8250=y 577CONFIG_SERIAL_8250=y
573CONFIG_SERIAL_8250_CONSOLE=y 578CONFIG_SERIAL_8250_CONSOLE=y
579CONFIG_SERIAL_8250_PCI=y
574CONFIG_SERIAL_8250_NR_UARTS=4 580CONFIG_SERIAL_8250_NR_UARTS=4
575CONFIG_SERIAL_8250_RUNTIME_UARTS=4 581CONFIG_SERIAL_8250_RUNTIME_UARTS=4
576# CONFIG_SERIAL_8250_EXTENDED is not set 582# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -580,6 +586,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
580# 586#
581CONFIG_SERIAL_CORE=y 587CONFIG_SERIAL_CORE=y
582CONFIG_SERIAL_CORE_CONSOLE=y 588CONFIG_SERIAL_CORE_CONSOLE=y
589# CONFIG_SERIAL_JSM is not set
583CONFIG_UNIX98_PTYS=y 590CONFIG_UNIX98_PTYS=y
584CONFIG_LEGACY_PTYS=y 591CONFIG_LEGACY_PTYS=y
585CONFIG_LEGACY_PTY_COUNT=256 592CONFIG_LEGACY_PTY_COUNT=256
@@ -638,10 +645,6 @@ CONFIG_LEGACY_PTY_COUNT=256
638# 645#
639 646
640# 647#
641# Multimedia Capabilities Port drivers
642#
643
644#
645# Multimedia devices 648# Multimedia devices
646# 649#
647# CONFIG_VIDEO_DEV is not set 650# CONFIG_VIDEO_DEV is not set
@@ -659,6 +662,7 @@ CONFIG_FB=y
659# CONFIG_FB_CFB_COPYAREA is not set 662# CONFIG_FB_CFB_COPYAREA is not set
660# CONFIG_FB_CFB_IMAGEBLIT is not set 663# CONFIG_FB_CFB_IMAGEBLIT is not set
661# CONFIG_FB_MACMODES is not set 664# CONFIG_FB_MACMODES is not set
665CONFIG_FB_FIRMWARE_EDID=y
662# CONFIG_FB_MODE_HELPERS is not set 666# CONFIG_FB_MODE_HELPERS is not set
663# CONFIG_FB_TILEBLITTING is not set 667# CONFIG_FB_TILEBLITTING is not set
664# CONFIG_FB_CIRRUS is not set 668# CONFIG_FB_CIRRUS is not set
@@ -670,7 +674,6 @@ CONFIG_FB=y
670# CONFIG_FB_NVIDIA is not set 674# CONFIG_FB_NVIDIA is not set
671# CONFIG_FB_RIVA is not set 675# CONFIG_FB_RIVA is not set
672# CONFIG_FB_MATROX is not set 676# CONFIG_FB_MATROX is not set
673# CONFIG_FB_RADEON_OLD is not set
674# CONFIG_FB_RADEON is not set 677# CONFIG_FB_RADEON is not set
675# CONFIG_FB_ATY128 is not set 678# CONFIG_FB_ATY128 is not set
676# CONFIG_FB_ATY is not set 679# CONFIG_FB_ATY is not set
@@ -708,6 +711,7 @@ CONFIG_DUMMY_CONSOLE=y
708# 711#
709CONFIG_USB_ARCH_HAS_HCD=y 712CONFIG_USB_ARCH_HAS_HCD=y
710CONFIG_USB_ARCH_HAS_OHCI=y 713CONFIG_USB_ARCH_HAS_OHCI=y
714CONFIG_USB_ARCH_HAS_EHCI=y
711# CONFIG_USB is not set 715# CONFIG_USB is not set
712 716
713# 717#
@@ -725,13 +729,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
725# CONFIG_MMC is not set 729# CONFIG_MMC is not set
726 730
727# 731#
732# LED devices
733#
734# CONFIG_NEW_LEDS is not set
735
736#
737# LED drivers
738#
739
740#
741# LED Triggers
742#
743
744#
728# InfiniBand support 745# InfiniBand support
729# 746#
730# CONFIG_INFINIBAND is not set 747# CONFIG_INFINIBAND is not set
731 748
732# 749#
733# SN Devices 750# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
751#
752
753#
754# Real Time Clock
734# 755#
756# CONFIG_RTC_CLASS is not set
735 757
736# 758#
737# File systems 759# File systems
@@ -776,7 +798,6 @@ CONFIG_SYSFS=y
776# CONFIG_TMPFS is not set 798# CONFIG_TMPFS is not set
777# CONFIG_HUGETLB_PAGE is not set 799# CONFIG_HUGETLB_PAGE is not set
778CONFIG_RAMFS=y 800CONFIG_RAMFS=y
779CONFIG_RELAYFS_FS=y
780# CONFIG_CONFIGFS_FS is not set 801# CONFIG_CONFIGFS_FS is not set
781 802
782# 803#
@@ -840,6 +861,8 @@ CONFIG_MSDOS_PARTITION=y
840# CONFIG_MAGIC_SYSRQ is not set 861# CONFIG_MAGIC_SYSRQ is not set
841# CONFIG_DEBUG_KERNEL is not set 862# CONFIG_DEBUG_KERNEL is not set
842CONFIG_LOG_BUF_SHIFT=14 863CONFIG_LOG_BUF_SHIFT=14
864# CONFIG_DEBUG_FS is not set
865# CONFIG_UNWIND_INFO is not set
843CONFIG_CROSSCOMPILE=y 866CONFIG_CROSSCOMPILE=y
844CONFIG_CMDLINE="ip=any" 867CONFIG_CMDLINE="ip=any"
845 868
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index a0fcd44e7709..8c911b671415 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:02 2006 4# Mon Apr 24 14:51:01 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -65,6 +65,8 @@ 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
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
68CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
70CONFIG_DMA_NEED_PCI_MAP_STATE=y 72CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y
114# CONFIG_PAGE_SIZE_16KB is not set 116# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set 117# CONFIG_PAGE_SIZE_64KB is not set
116# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
117# CONFIG_CPU_ADVANCED is not set
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
@@ -136,7 +137,6 @@ CONFIG_PREEMPT_NONE=y
136# Code maturity level options 137# Code maturity level options
137# 138#
138CONFIG_EXPERIMENTAL=y 139CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y 140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32 141CONFIG_INIT_ENV_ARG_LIMIT=32
142 142
@@ -152,6 +152,7 @@ CONFIG_SYSVIPC=y
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
155CONFIG_RELAY=y
155CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
@@ -165,10 +166,6 @@ CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167CONFIG_SHMEM=y 168CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y 169CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
@@ -183,6 +180,8 @@ CONFIG_BASE_SMALL=0
183# Block layer 180# Block layer
184# 181#
185# CONFIG_LBD is not set 182# CONFIG_LBD is not set
183# CONFIG_BLK_DEV_IO_TRACE is not set
184# CONFIG_LSF is not set
186 185
187# 186#
188# IO Schedulers 187# IO Schedulers
@@ -202,7 +201,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
202# 201#
203CONFIG_HW_HAS_PCI=y 202CONFIG_HW_HAS_PCI=y
204CONFIG_PCI=y 203CONFIG_PCI=y
205CONFIG_PCI_LEGACY_PROC=y
206CONFIG_MMU=y 204CONFIG_MMU=y
207 205
208# 206#
@@ -230,6 +228,7 @@ CONFIG_NET=y
230# 228#
231# Networking options 229# Networking options
232# 230#
231# CONFIG_NETDEBUG is not set
233CONFIG_PACKET=y 232CONFIG_PACKET=y
234# CONFIG_PACKET_MMAP is not set 233# CONFIG_PACKET_MMAP is not set
235CONFIG_UNIX=y 234CONFIG_UNIX=y
@@ -251,12 +250,15 @@ CONFIG_IP_PNP_BOOTP=y
251# CONFIG_INET_AH is not set 250# CONFIG_INET_AH is not set
252# CONFIG_INET_ESP is not set 251# CONFIG_INET_ESP is not set
253# CONFIG_INET_IPCOMP is not set 252# CONFIG_INET_IPCOMP is not set
254CONFIG_INET_TUNNEL=y 253# CONFIG_INET_XFRM_TUNNEL is not set
254# CONFIG_INET_TUNNEL is not set
255CONFIG_INET_DIAG=y 255CONFIG_INET_DIAG=y
256CONFIG_INET_TCP_DIAG=y 256CONFIG_INET_TCP_DIAG=y
257# CONFIG_TCP_CONG_ADVANCED is not set 257# CONFIG_TCP_CONG_ADVANCED is not set
258CONFIG_TCP_CONG_BIC=y 258CONFIG_TCP_CONG_BIC=y
259# CONFIG_IPV6 is not set 259# CONFIG_IPV6 is not set
260# CONFIG_INET6_XFRM_TUNNEL is not set
261# CONFIG_INET6_TUNNEL is not set
260# CONFIG_NETFILTER is not set 262# CONFIG_NETFILTER is not set
261 263
262# 264#
@@ -268,6 +270,11 @@ CONFIG_TCP_CONG_BIC=y
268# SCTP Configuration (EXPERIMENTAL) 270# SCTP Configuration (EXPERIMENTAL)
269# 271#
270# CONFIG_IP_SCTP is not set 272# CONFIG_IP_SCTP is not set
273
274#
275# TIPC Configuration (EXPERIMENTAL)
276#
277# CONFIG_TIPC is not set
271# CONFIG_ATM is not set 278# CONFIG_ATM is not set
272# CONFIG_BRIDGE is not set 279# CONFIG_BRIDGE is not set
273# CONFIG_VLAN_8021Q is not set 280# CONFIG_VLAN_8021Q is not set
@@ -277,11 +284,6 @@ CONFIG_TCP_CONG_BIC=y
277# CONFIG_ATALK is not set 284# CONFIG_ATALK is not set
278# CONFIG_X25 is not set 285# CONFIG_X25 is not set
279# CONFIG_LAPB is not set 286# CONFIG_LAPB is not set
280
281#
282# TIPC Configuration (EXPERIMENTAL)
283#
284# CONFIG_TIPC is not set
285# CONFIG_NET_DIVERT is not set 287# CONFIG_NET_DIVERT is not set
286# CONFIG_ECONET is not set 288# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 289# CONFIG_WAN_ROUTER is not set
@@ -302,6 +304,9 @@ CONFIG_IEEE80211=y
302# CONFIG_IEEE80211_DEBUG is not set 304# CONFIG_IEEE80211_DEBUG is not set
303CONFIG_IEEE80211_CRYPT_WEP=y 305CONFIG_IEEE80211_CRYPT_WEP=y
304CONFIG_IEEE80211_CRYPT_CCMP=y 306CONFIG_IEEE80211_CRYPT_CCMP=y
307CONFIG_IEEE80211_SOFTMAC=y
308# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
309CONFIG_WIRELESS_EXT=y
305 310
306# 311#
307# Device Drivers 312# Device Drivers
@@ -346,7 +351,7 @@ CONFIG_PROC_EVENTS=y
346# CONFIG_BLK_DEV_NBD is not set 351# CONFIG_BLK_DEV_NBD is not set
347# CONFIG_BLK_DEV_SX8 is not set 352# CONFIG_BLK_DEV_SX8 is not set
348# CONFIG_BLK_DEV_RAM is not set 353# CONFIG_BLK_DEV_RAM is not set
349CONFIG_BLK_DEV_RAM_COUNT=16 354# CONFIG_BLK_DEV_INITRD is not set
350CONFIG_CDROM_PKTCDVD=y 355CONFIG_CDROM_PKTCDVD=y
351CONFIG_CDROM_PKTCDVD_BUFFERS=8 356CONFIG_CDROM_PKTCDVD_BUFFERS=8
352# CONFIG_CDROM_PKTCDVD_WCACHE is not set 357# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -556,6 +561,7 @@ CONFIG_HW_CONSOLE=y
556# 561#
557CONFIG_SERIAL_8250=y 562CONFIG_SERIAL_8250=y
558CONFIG_SERIAL_8250_CONSOLE=y 563CONFIG_SERIAL_8250_CONSOLE=y
564CONFIG_SERIAL_8250_PCI=y
559CONFIG_SERIAL_8250_NR_UARTS=4 565CONFIG_SERIAL_8250_NR_UARTS=4
560CONFIG_SERIAL_8250_RUNTIME_UARTS=4 566CONFIG_SERIAL_8250_RUNTIME_UARTS=4
561# CONFIG_SERIAL_8250_EXTENDED is not set 567# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -565,6 +571,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
565# 571#
566CONFIG_SERIAL_CORE=y 572CONFIG_SERIAL_CORE=y
567CONFIG_SERIAL_CORE_CONSOLE=y 573CONFIG_SERIAL_CORE_CONSOLE=y
574# CONFIG_SERIAL_JSM is not set
568CONFIG_UNIX98_PTYS=y 575CONFIG_UNIX98_PTYS=y
569CONFIG_LEGACY_PTYS=y 576CONFIG_LEGACY_PTYS=y
570CONFIG_LEGACY_PTY_COUNT=256 577CONFIG_LEGACY_PTY_COUNT=256
@@ -623,10 +630,6 @@ CONFIG_LEGACY_PTY_COUNT=256
623# 630#
624 631
625# 632#
626# Multimedia Capabilities Port drivers
627#
628
629#
630# Multimedia devices 633# Multimedia devices
631# 634#
632# CONFIG_VIDEO_DEV is not set 635# CONFIG_VIDEO_DEV is not set
@@ -657,6 +660,7 @@ CONFIG_DUMMY_CONSOLE=y
657# 660#
658CONFIG_USB_ARCH_HAS_HCD=y 661CONFIG_USB_ARCH_HAS_HCD=y
659CONFIG_USB_ARCH_HAS_OHCI=y 662CONFIG_USB_ARCH_HAS_OHCI=y
663CONFIG_USB_ARCH_HAS_EHCI=y
660# CONFIG_USB is not set 664# CONFIG_USB is not set
661 665
662# 666#
@@ -674,13 +678,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
674# CONFIG_MMC is not set 678# CONFIG_MMC is not set
675 679
676# 680#
681# LED devices
682#
683# CONFIG_NEW_LEDS is not set
684
685#
686# LED drivers
687#
688
689#
690# LED Triggers
691#
692
693#
677# InfiniBand support 694# InfiniBand support
678# 695#
679# CONFIG_INFINIBAND is not set 696# CONFIG_INFINIBAND is not set
680 697
681# 698#
682# SN Devices 699# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
700#
701
702#
703# Real Time Clock
683# 704#
705# CONFIG_RTC_CLASS is not set
684 706
685# 707#
686# File systems 708# File systems
@@ -725,7 +747,6 @@ CONFIG_SYSFS=y
725# CONFIG_TMPFS is not set 747# CONFIG_TMPFS is not set
726# CONFIG_HUGETLB_PAGE is not set 748# CONFIG_HUGETLB_PAGE is not set
727CONFIG_RAMFS=y 749CONFIG_RAMFS=y
728CONFIG_RELAYFS_FS=y
729# CONFIG_CONFIGFS_FS is not set 750# CONFIG_CONFIGFS_FS is not set
730 751
731# 752#
@@ -792,6 +813,8 @@ CONFIG_MSDOS_PARTITION=y
792# CONFIG_MAGIC_SYSRQ is not set 813# CONFIG_MAGIC_SYSRQ is not set
793# CONFIG_DEBUG_KERNEL is not set 814# CONFIG_DEBUG_KERNEL is not set
794CONFIG_LOG_BUF_SHIFT=14 815CONFIG_LOG_BUF_SHIFT=14
816# CONFIG_DEBUG_FS is not set
817# CONFIG_UNWIND_INFO is not set
795CONFIG_CROSSCOMPILE=y 818CONFIG_CROSSCOMPILE=y
796CONFIG_CMDLINE="ip=any" 819CONFIG_CMDLINE="ip=any"
797 820
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 5a181eadd437..d838496e114f 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:03 2006 4# Mon Apr 24 14:51:01 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,11 +63,13 @@ CONFIG_MACH_DECSTATION=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
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_EARLY_PRINTK=y
66CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 72CONFIG_DMA_NEED_PCI_MAP_STATE=y
70CONFIG_EARLY_PRINTK=y
71# CONFIG_CPU_BIG_ENDIAN is not set 73# CONFIG_CPU_BIG_ENDIAN is not set
72CONFIG_CPU_LITTLE_ENDIAN=y 74CONFIG_CPU_LITTLE_ENDIAN=y
73CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 75CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -113,7 +115,6 @@ CONFIG_PAGE_SIZE_4KB=y
113# CONFIG_PAGE_SIZE_16KB is not set 115# CONFIG_PAGE_SIZE_16KB is not set
114# CONFIG_PAGE_SIZE_64KB is not set 116# CONFIG_PAGE_SIZE_64KB is not set
115# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
116# CONFIG_CPU_ADVANCED is not set
117CONFIG_CPU_HAS_WB=y 118CONFIG_CPU_HAS_WB=y
118CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
119CONFIG_GENERIC_IRQ_PROBE=y 120CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,7 +136,6 @@ CONFIG_PREEMPT_NONE=y
135# Code maturity level options 136# Code maturity level options
136# 137#
137CONFIG_EXPERIMENTAL=y 138CONFIG_EXPERIMENTAL=y
138CONFIG_CLEAN_COMPILE=y
139CONFIG_BROKEN_ON_SMP=y 139CONFIG_BROKEN_ON_SMP=y
140CONFIG_INIT_ENV_ARG_LIMIT=32 140CONFIG_INIT_ENV_ARG_LIMIT=32
141 141
@@ -151,6 +151,7 @@ CONFIG_SYSVIPC=y
151CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
153# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
154CONFIG_RELAY=y
154CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
156CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
@@ -165,10 +166,6 @@ CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167CONFIG_SHMEM=y 168CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y 169CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
@@ -180,7 +177,6 @@ CONFIG_BASE_SMALL=0
180CONFIG_MODULES=y 177CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y 178CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set 179# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184# CONFIG_MODVERSIONS is not set 180# CONFIG_MODVERSIONS is not set
185CONFIG_MODULE_SRCVERSION_ALL=y 181CONFIG_MODULE_SRCVERSION_ALL=y
186CONFIG_KMOD=y 182CONFIG_KMOD=y
@@ -189,6 +185,8 @@ CONFIG_KMOD=y
189# Block layer 185# Block layer
190# 186#
191# CONFIG_LBD is not set 187# CONFIG_LBD is not set
188# CONFIG_BLK_DEV_IO_TRACE is not set
189# CONFIG_LSF is not set
192 190
193# 191#
194# IO Schedulers 192# IO Schedulers
@@ -233,11 +231,10 @@ CONFIG_NET=y
233# 231#
234# Networking options 232# Networking options
235# 233#
234# CONFIG_NETDEBUG is not set
236CONFIG_PACKET=y 235CONFIG_PACKET=y
237CONFIG_PACKET_MMAP=y 236CONFIG_PACKET_MMAP=y
238CONFIG_UNIX=y 237CONFIG_UNIX=y
239CONFIG_XFRM=y
240CONFIG_XFRM_USER=m
241# CONFIG_NET_KEY is not set 238# CONFIG_NET_KEY is not set
242CONFIG_INET=y 239CONFIG_INET=y
243# CONFIG_IP_MULTICAST is not set 240# CONFIG_IP_MULTICAST is not set
@@ -254,12 +251,15 @@ CONFIG_IP_PNP_BOOTP=y
254# CONFIG_INET_AH is not set 251# CONFIG_INET_AH is not set
255# CONFIG_INET_ESP is not set 252# CONFIG_INET_ESP is not set
256# CONFIG_INET_IPCOMP is not set 253# CONFIG_INET_IPCOMP is not set
257CONFIG_INET_TUNNEL=m 254# CONFIG_INET_XFRM_TUNNEL is not set
255# CONFIG_INET_TUNNEL is not set
258CONFIG_INET_DIAG=y 256CONFIG_INET_DIAG=y
259CONFIG_INET_TCP_DIAG=y 257CONFIG_INET_TCP_DIAG=y
260# CONFIG_TCP_CONG_ADVANCED is not set 258# CONFIG_TCP_CONG_ADVANCED is not set
261CONFIG_TCP_CONG_BIC=y 259CONFIG_TCP_CONG_BIC=y
262# CONFIG_IPV6 is not set 260# CONFIG_IPV6 is not set
261# CONFIG_INET6_XFRM_TUNNEL is not set
262# CONFIG_INET6_TUNNEL is not set
263# CONFIG_NETFILTER is not set 263# CONFIG_NETFILTER is not set
264 264
265# 265#
@@ -271,6 +271,11 @@ CONFIG_TCP_CONG_BIC=y
271# SCTP Configuration (EXPERIMENTAL) 271# SCTP Configuration (EXPERIMENTAL)
272# 272#
273# CONFIG_IP_SCTP is not set 273# CONFIG_IP_SCTP is not set
274
275#
276# TIPC Configuration (EXPERIMENTAL)
277#
278# CONFIG_TIPC is not set
274# CONFIG_ATM is not set 279# CONFIG_ATM is not set
275# CONFIG_BRIDGE is not set 280# CONFIG_BRIDGE is not set
276# CONFIG_VLAN_8021Q is not set 281# CONFIG_VLAN_8021Q is not set
@@ -280,11 +285,6 @@ CONFIG_TCP_CONG_BIC=y
280# CONFIG_ATALK is not set 285# CONFIG_ATALK is not set
281# CONFIG_X25 is not set 286# CONFIG_X25 is not set
282# CONFIG_LAPB is not set 287# CONFIG_LAPB is not set
283
284#
285# TIPC Configuration (EXPERIMENTAL)
286#
287# CONFIG_TIPC is not set
288# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
289# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
290# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
@@ -305,6 +305,9 @@ CONFIG_IEEE80211=m
305# CONFIG_IEEE80211_DEBUG is not set 305# CONFIG_IEEE80211_DEBUG is not set
306CONFIG_IEEE80211_CRYPT_WEP=m 306CONFIG_IEEE80211_CRYPT_WEP=m
307CONFIG_IEEE80211_CRYPT_CCMP=m 307CONFIG_IEEE80211_CRYPT_CCMP=m
308CONFIG_IEEE80211_SOFTMAC=m
309# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
310CONFIG_WIRELESS_EXT=y
308 311
309# 312#
310# Device Drivers 313# Device Drivers
@@ -345,7 +348,7 @@ CONFIG_BLK_DEV_LOOP=m
345# CONFIG_BLK_DEV_CRYPTOLOOP is not set 348# CONFIG_BLK_DEV_CRYPTOLOOP is not set
346# CONFIG_BLK_DEV_NBD is not set 349# CONFIG_BLK_DEV_NBD is not set
347# CONFIG_BLK_DEV_RAM is not set 350# CONFIG_BLK_DEV_RAM is not set
348CONFIG_BLK_DEV_RAM_COUNT=16 351# CONFIG_BLK_DEV_INITRD is not set
349# CONFIG_CDROM_PKTCDVD is not set 352# CONFIG_CDROM_PKTCDVD is not set
350# CONFIG_ATA_OVER_ETH is not set 353# CONFIG_ATA_OVER_ETH is not set
351 354
@@ -567,10 +570,6 @@ CONFIG_RTC=y
567# 570#
568 571
569# 572#
570# Multimedia Capabilities Port drivers
571#
572
573#
574# Multimedia devices 573# Multimedia devices
575# 574#
576# CONFIG_VIDEO_DEV is not set 575# CONFIG_VIDEO_DEV is not set
@@ -588,6 +587,7 @@ CONFIG_FB_CFB_FILLRECT=y
588CONFIG_FB_CFB_COPYAREA=y 587CONFIG_FB_CFB_COPYAREA=y
589CONFIG_FB_CFB_IMAGEBLIT=y 588CONFIG_FB_CFB_IMAGEBLIT=y
590# CONFIG_FB_MACMODES is not set 589# CONFIG_FB_MACMODES is not set
590CONFIG_FB_FIRMWARE_EDID=y
591# CONFIG_FB_MODE_HELPERS is not set 591# CONFIG_FB_MODE_HELPERS is not set
592# CONFIG_FB_TILEBLITTING is not set 592# CONFIG_FB_TILEBLITTING is not set
593# CONFIG_FB_S1D13XXX is not set 593# CONFIG_FB_S1D13XXX is not set
@@ -617,6 +617,7 @@ CONFIG_LOGO_DEC_CLUT224=y
617# 617#
618# CONFIG_USB_ARCH_HAS_HCD is not set 618# CONFIG_USB_ARCH_HAS_HCD is not set
619# CONFIG_USB_ARCH_HAS_OHCI is not set 619# CONFIG_USB_ARCH_HAS_OHCI is not set
620# CONFIG_USB_ARCH_HAS_EHCI is not set
620 621
621# 622#
622# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 623# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -633,12 +634,30 @@ CONFIG_LOGO_DEC_CLUT224=y
633# CONFIG_MMC is not set 634# CONFIG_MMC is not set
634 635
635# 636#
637# LED devices
638#
639# CONFIG_NEW_LEDS is not set
640
641#
642# LED drivers
643#
644
645#
646# LED Triggers
647#
648
649#
636# InfiniBand support 650# InfiniBand support
637# 651#
638 652
639# 653#
640# SN Devices 654# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
655#
656
657#
658# Real Time Clock
641# 659#
660# CONFIG_RTC_CLASS is not set
642 661
643# 662#
644# File systems 663# File systems
@@ -686,7 +705,6 @@ CONFIG_SYSFS=y
686CONFIG_TMPFS=y 705CONFIG_TMPFS=y
687# CONFIG_HUGETLB_PAGE is not set 706# CONFIG_HUGETLB_PAGE is not set
688CONFIG_RAMFS=y 707CONFIG_RAMFS=y
689CONFIG_RELAYFS_FS=m
690# CONFIG_CONFIGFS_FS is not set 708# CONFIG_CONFIGFS_FS is not set
691 709
692# 710#
@@ -705,7 +723,6 @@ CONFIG_RELAYFS_FS=m
705# CONFIG_QNX4FS_FS is not set 723# CONFIG_QNX4FS_FS is not set
706# CONFIG_SYSV_FS is not set 724# CONFIG_SYSV_FS is not set
707CONFIG_UFS_FS=y 725CONFIG_UFS_FS=y
708CONFIG_UFS_FS_WRITE=y
709 726
710# 727#
711# Network File Systems 728# Network File Systems
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 8fbfc06a6a2a..0760f4318910 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:04 2006 4# Tue Apr 25 00:08:20 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -70,6 +70,8 @@ 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
73CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y
73CONFIG_GENERIC_CALIBRATE_DELAY=y 75CONFIG_GENERIC_CALIBRATE_DELAY=y
74CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
75CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -88,7 +90,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
88# CONFIG_CPU_MIPS64_R2 is not set 90# CONFIG_CPU_MIPS64_R2 is not set
89# CONFIG_CPU_R3000 is not set 91# CONFIG_CPU_R3000 is not set
90# CONFIG_CPU_TX39XX is not set 92# CONFIG_CPU_TX39XX is not set
91# CONFIG_CPU_VR41XX is not set 93CONFIG_CPU_VR41XX=y
92# CONFIG_CPU_R4300 is not set 94# CONFIG_CPU_R4300 is not set
93# CONFIG_CPU_R4X00 is not set 95# CONFIG_CPU_R4X00 is not set
94# CONFIG_CPU_TX49XX is not set 96# CONFIG_CPU_TX49XX is not set
@@ -101,18 +103,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
101# CONFIG_CPU_RM7000 is not set 103# CONFIG_CPU_RM7000 is not set
102# CONFIG_CPU_RM9000 is not set 104# CONFIG_CPU_RM9000 is not set
103# CONFIG_CPU_SB1 is not set 105# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_VR41XX=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
104 110
105# 111#
106# Kernel type 112# Kernel type
107# 113#
108# CONFIG_32BIT is not set 114CONFIG_32BIT=y
109# CONFIG_64BIT is not set 115# CONFIG_64BIT is not set
110CONFIG_PAGE_SIZE_4KB=y 116CONFIG_PAGE_SIZE_4KB=y
111# CONFIG_PAGE_SIZE_8KB is not set 117# CONFIG_PAGE_SIZE_8KB is not set
112# CONFIG_PAGE_SIZE_16KB is not set 118# CONFIG_PAGE_SIZE_16KB is not set
113# CONFIG_PAGE_SIZE_64KB is not set 119# CONFIG_PAGE_SIZE_64KB is not set
114# CONFIG_MIPS_MT is not set 120# CONFIG_MIPS_MT is not set
115CONFIG_CPU_HAS_LLSC=y
116CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
117CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
118CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
133# Code maturity level options 138# Code maturity level options
134# 139#
135CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
136CONFIG_CLEAN_COMPILE=y
137CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
138CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
139 143
@@ -144,11 +148,10 @@ CONFIG_LOCALVERSION=""
144CONFIG_LOCALVERSION_AUTO=y 148CONFIG_LOCALVERSION_AUTO=y
145CONFIG_SWAP=y 149CONFIG_SWAP=y
146CONFIG_SYSVIPC=y 150CONFIG_SYSVIPC=y
147# CONFIG_POSIX_MQUEUE is not set
148# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
149CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
150# CONFIG_AUDIT is not set
151# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
154# CONFIG_RELAY is not set
152CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
153# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
154CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
@@ -162,10 +165,6 @@ CONFIG_BASE_FULL=y
162CONFIG_FUTEX=y 165CONFIG_FUTEX=y
163CONFIG_EPOLL=y 166CONFIG_EPOLL=y
164CONFIG_SHMEM=y 167CONFIG_SHMEM=y
165CONFIG_CC_ALIGN_FUNCTIONS=0
166CONFIG_CC_ALIGN_LABELS=0
167CONFIG_CC_ALIGN_LOOPS=0
168CONFIG_CC_ALIGN_JUMPS=0
169CONFIG_SLAB=y 168CONFIG_SLAB=y
170# CONFIG_TINY_SHMEM is not set 169# CONFIG_TINY_SHMEM is not set
171CONFIG_BASE_SMALL=0 170CONFIG_BASE_SMALL=0
@@ -177,7 +176,6 @@ CONFIG_BASE_SMALL=0
177CONFIG_MODULES=y 176CONFIG_MODULES=y
178CONFIG_MODULE_UNLOAD=y 177CONFIG_MODULE_UNLOAD=y
179# CONFIG_MODULE_FORCE_UNLOAD is not set 178# CONFIG_MODULE_FORCE_UNLOAD is not set
180CONFIG_OBSOLETE_MODPARM=y
181CONFIG_MODVERSIONS=y 179CONFIG_MODVERSIONS=y
182CONFIG_MODULE_SRCVERSION_ALL=y 180CONFIG_MODULE_SRCVERSION_ALL=y
183CONFIG_KMOD=y 181CONFIG_KMOD=y
@@ -185,6 +183,9 @@ CONFIG_KMOD=y
185# 183#
186# Block layer 184# Block layer
187# 185#
186# CONFIG_LBD is not set
187# CONFIG_BLK_DEV_IO_TRACE is not set
188# CONFIG_LSF is not set
188 189
189# 190#
190# IO Schedulers 191# IO Schedulers
@@ -219,85 +220,12 @@ CONFIG_MMU=y
219# 220#
220CONFIG_BINFMT_ELF=y 221CONFIG_BINFMT_ELF=y
221# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
223CONFIG_TRAD_SIGNALS=y
222 224
223# 225#
224# Networking 226# Networking
225# 227#
226CONFIG_NET=y 228# CONFIG_NET is not set
227
228#
229# Networking options
230#
231CONFIG_PACKET=y
232CONFIG_PACKET_MMAP=y
233CONFIG_UNIX=y
234CONFIG_XFRM=y
235CONFIG_XFRM_USER=m
236CONFIG_NET_KEY=y
237CONFIG_INET=y
238CONFIG_IP_MULTICAST=y
239# CONFIG_IP_ADVANCED_ROUTER is not set
240CONFIG_IP_FIB_HASH=y
241# CONFIG_IP_PNP is not set
242# CONFIG_NET_IPIP is not set
243# CONFIG_NET_IPGRE is not set
244# CONFIG_IP_MROUTE is not set
245# CONFIG_ARPD is not set
246# CONFIG_SYN_COOKIES is not set
247# CONFIG_INET_AH is not set
248# CONFIG_INET_ESP is not set
249# CONFIG_INET_IPCOMP is not set
250CONFIG_INET_TUNNEL=m
251CONFIG_INET_DIAG=y
252CONFIG_INET_TCP_DIAG=y
253# CONFIG_TCP_CONG_ADVANCED is not set
254CONFIG_TCP_CONG_BIC=y
255# CONFIG_IPV6 is not set
256# CONFIG_NETFILTER is not set
257
258#
259# DCCP Configuration (EXPERIMENTAL)
260#
261# CONFIG_IP_DCCP is not set
262
263#
264# SCTP Configuration (EXPERIMENTAL)
265#
266# CONFIG_IP_SCTP is not set
267# CONFIG_ATM is not set
268# CONFIG_BRIDGE is not set
269# CONFIG_VLAN_8021Q is not set
270# CONFIG_DECNET is not set
271# CONFIG_LLC2 is not set
272# CONFIG_IPX is not set
273# CONFIG_ATALK is not set
274# CONFIG_X25 is not set
275# CONFIG_LAPB is not set
276
277#
278# TIPC Configuration (EXPERIMENTAL)
279#
280# CONFIG_TIPC is not set
281# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set
284
285#
286# QoS and/or fair queueing
287#
288# CONFIG_NET_SCHED is not set
289
290#
291# Network testing
292#
293# CONFIG_NET_PKTGEN is not set
294# CONFIG_HAMRADIO is not set
295# CONFIG_IRDA is not set
296# CONFIG_BT is not set
297CONFIG_IEEE80211=m
298# CONFIG_IEEE80211_DEBUG is not set
299CONFIG_IEEE80211_CRYPT_WEP=m
300CONFIG_IEEE80211_CRYPT_CCMP=m
301 229
302# 230#
303# Device Drivers 231# Device Drivers
@@ -313,7 +241,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
313# 241#
314# Connector - unified userspace <-> kernelspace linker 242# Connector - unified userspace <-> kernelspace linker
315# 243#
316CONFIG_CONNECTOR=m
317 244
318# 245#
319# Memory Technology Devices (MTD) 246# Memory Technology Devices (MTD)
@@ -335,11 +262,11 @@ CONFIG_CONNECTOR=m
335# 262#
336# CONFIG_BLK_DEV_COW_COMMON is not set 263# CONFIG_BLK_DEV_COW_COMMON is not set
337# CONFIG_BLK_DEV_LOOP is not set 264# CONFIG_BLK_DEV_LOOP is not set
338# CONFIG_BLK_DEV_NBD is not set 265CONFIG_BLK_DEV_RAM=m
339# CONFIG_BLK_DEV_RAM is not set
340CONFIG_BLK_DEV_RAM_COUNT=16 266CONFIG_BLK_DEV_RAM_COUNT=16
267CONFIG_BLK_DEV_RAM_SIZE=4096
268# CONFIG_BLK_DEV_INITRD is not set
341# CONFIG_CDROM_PKTCDVD is not set 269# CONFIG_CDROM_PKTCDVD is not set
342# CONFIG_ATA_OVER_ETH is not set
343 270
344# 271#
345# ATA/ATAPI/MFM/RLL support 272# ATA/ATAPI/MFM/RLL support
@@ -398,81 +325,8 @@ CONFIG_IDE_GENERIC=y
398# 325#
399 326
400# 327#
401# Network device support
402#
403CONFIG_NETDEVICES=y
404# CONFIG_DUMMY is not set
405# CONFIG_BONDING is not set
406# CONFIG_EQUALIZER is not set
407# CONFIG_TUN is not set
408
409#
410# ARCnet devices
411#
412# CONFIG_ARCNET is not set
413
414#
415# PHY device support
416#
417CONFIG_PHYLIB=m
418
419#
420# MII PHY device drivers
421#
422CONFIG_MARVELL_PHY=m
423CONFIG_DAVICOM_PHY=m
424CONFIG_QSEMI_PHY=m
425CONFIG_LXT_PHY=m
426CONFIG_CICADA_PHY=m
427
428#
429# Ethernet (10 or 100Mbit)
430#
431CONFIG_NET_ETHERNET=y
432# CONFIG_MII is not set
433# CONFIG_NET_VENDOR_3COM is not set
434# CONFIG_NET_VENDOR_SMC is not set
435# CONFIG_DM9000 is not set
436# CONFIG_NET_VENDOR_RACAL is not set
437# CONFIG_AT1700 is not set
438# CONFIG_DEPCA is not set
439# CONFIG_HP100 is not set
440# CONFIG_NET_ISA is not set
441# CONFIG_NET_PCI is not set
442
443#
444# Ethernet (1000 Mbit)
445#
446
447#
448# Ethernet (10000 Mbit)
449#
450
451#
452# Token Ring devices
453#
454# CONFIG_TR is not set
455
456#
457# Wireless LAN (non-hamradio)
458#
459# CONFIG_NET_RADIO is not set
460
461#
462# Wan interfaces
463#
464# CONFIG_WAN is not set
465# CONFIG_PPP is not set
466# CONFIG_SLIP is not set
467# CONFIG_SHAPER is not set
468# CONFIG_NETCONSOLE is not set
469# CONFIG_NETPOLL is not set
470# CONFIG_NET_POLL_CONTROLLER is not set
471
472#
473# ISDN subsystem 328# ISDN subsystem
474# 329#
475# CONFIG_ISDN is not set
476 330
477# 331#
478# Telephony Support 332# Telephony Support
@@ -508,11 +362,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
508# 362#
509# Hardware I/O ports 363# Hardware I/O ports
510# 364#
511CONFIG_SERIO=y 365# CONFIG_SERIO is not set
512# CONFIG_SERIO_I8042 is not set
513CONFIG_SERIO_SERPORT=y
514# CONFIG_SERIO_LIBPS2 is not set
515CONFIG_SERIO_RAW=m
516# CONFIG_GAMEPORT is not set 366# CONFIG_GAMEPORT is not set
517 367
518# 368#
@@ -531,6 +381,10 @@ CONFIG_HW_CONSOLE=y
531# 381#
532# Non-8250 serial port support 382# Non-8250 serial port support
533# 383#
384CONFIG_SERIAL_CORE=y
385CONFIG_SERIAL_CORE_CONSOLE=y
386CONFIG_SERIAL_VR41XX=y
387CONFIG_SERIAL_VR41XX_CONSOLE=y
534CONFIG_UNIX98_PTYS=y 388CONFIG_UNIX98_PTYS=y
535CONFIG_LEGACY_PTYS=y 389CONFIG_LEGACY_PTYS=y
536CONFIG_LEGACY_PTY_COUNT=256 390CONFIG_LEGACY_PTY_COUNT=256
@@ -565,6 +419,7 @@ CONFIG_WATCHDOG=y
565# 419#
566# Ftape, the floppy tape device driver 420# Ftape, the floppy tape device driver
567# 421#
422CONFIG_GPIO_VR41XX=y
568# CONFIG_RAW_DRIVER is not set 423# CONFIG_RAW_DRIVER is not set
569 424
570# 425#
@@ -600,10 +455,6 @@ CONFIG_WATCHDOG=y
600# 455#
601 456
602# 457#
603# Multimedia Capabilities Port drivers
604#
605
606#
607# Multimedia devices 458# Multimedia devices
608# 459#
609# CONFIG_VIDEO_DEV is not set 460# CONFIG_VIDEO_DEV is not set
@@ -611,7 +462,6 @@ CONFIG_WATCHDOG=y
611# 462#
612# Digital Video Broadcasting Devices 463# Digital Video Broadcasting Devices
613# 464#
614# CONFIG_DVB is not set
615 465
616# 466#
617# Graphics support 467# Graphics support
@@ -635,6 +485,7 @@ CONFIG_DUMMY_CONSOLE=y
635# 485#
636# CONFIG_USB_ARCH_HAS_HCD is not set 486# CONFIG_USB_ARCH_HAS_HCD is not set
637# CONFIG_USB_ARCH_HAS_OHCI is not set 487# CONFIG_USB_ARCH_HAS_OHCI is not set
488# CONFIG_USB_ARCH_HAS_EHCI is not set
638 489
639# 490#
640# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 491# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -651,12 +502,30 @@ CONFIG_DUMMY_CONSOLE=y
651# CONFIG_MMC is not set 502# CONFIG_MMC is not set
652 503
653# 504#
505# LED devices
506#
507# CONFIG_NEW_LEDS is not set
508
509#
510# LED drivers
511#
512
513#
514# LED Triggers
515#
516
517#
654# InfiniBand support 518# InfiniBand support
655# 519#
656 520
657# 521#
658# SN Devices 522# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
523#
524
525#
526# Real Time Clock
659# 527#
528# CONFIG_RTC_CLASS is not set
660 529
661# 530#
662# File systems 531# File systems
@@ -669,13 +538,12 @@ CONFIG_EXT2_FS=y
669# CONFIG_JFS_FS is not set 538# CONFIG_JFS_FS is not set
670# CONFIG_FS_POSIX_ACL is not set 539# CONFIG_FS_POSIX_ACL is not set
671# CONFIG_XFS_FS is not set 540# CONFIG_XFS_FS is not set
672# CONFIG_OCFS2_FS is not set
673# CONFIG_MINIX_FS is not set 541# CONFIG_MINIX_FS is not set
674# CONFIG_ROMFS_FS is not set 542# CONFIG_ROMFS_FS is not set
675CONFIG_INOTIFY=y 543CONFIG_INOTIFY=y
676# CONFIG_QUOTA is not set 544# CONFIG_QUOTA is not set
677CONFIG_DNOTIFY=y 545CONFIG_DNOTIFY=y
678CONFIG_AUTOFS_FS=y 546# CONFIG_AUTOFS_FS is not set
679CONFIG_AUTOFS4_FS=y 547CONFIG_AUTOFS4_FS=y
680CONFIG_FUSE_FS=m 548CONFIG_FUSE_FS=m
681 549
@@ -698,10 +566,9 @@ CONFIG_FUSE_FS=m
698CONFIG_PROC_FS=y 566CONFIG_PROC_FS=y
699CONFIG_PROC_KCORE=y 567CONFIG_PROC_KCORE=y
700CONFIG_SYSFS=y 568CONFIG_SYSFS=y
701# CONFIG_TMPFS is not set 569CONFIG_TMPFS=y
702# CONFIG_HUGETLB_PAGE is not set 570# CONFIG_HUGETLB_PAGE is not set
703CONFIG_RAMFS=y 571CONFIG_RAMFS=y
704CONFIG_RELAYFS_FS=m
705# CONFIG_CONFIGFS_FS is not set 572# CONFIG_CONFIGFS_FS is not set
706 573
707# 574#
@@ -722,29 +589,6 @@ CONFIG_RELAYFS_FS=m
722# CONFIG_UFS_FS is not set 589# CONFIG_UFS_FS is not set
723 590
724# 591#
725# Network File Systems
726#
727CONFIG_NFS_FS=m
728# CONFIG_NFS_V3 is not set
729# CONFIG_NFS_V4 is not set
730# CONFIG_NFS_DIRECTIO is not set
731CONFIG_NFSD=m
732# CONFIG_NFSD_V3 is not set
733# CONFIG_NFSD_TCP is not set
734CONFIG_LOCKD=m
735CONFIG_EXPORTFS=m
736CONFIG_NFS_COMMON=y
737CONFIG_SUNRPC=m
738# CONFIG_RPCSEC_GSS_KRB5 is not set
739# CONFIG_RPCSEC_GSS_SPKM3 is not set
740# CONFIG_SMB_FS is not set
741# CONFIG_CIFS is not set
742# CONFIG_NCP_FS is not set
743# CONFIG_CODA_FS is not set
744# CONFIG_AFS_FS is not set
745# CONFIG_9P_FS is not set
746
747#
748# Partition Types 592# Partition Types
749# 593#
750# CONFIG_PARTITION_ADVANCED is not set 594# CONFIG_PARTITION_ADVANCED is not set
@@ -767,44 +611,20 @@ CONFIG_MSDOS_PARTITION=y
767# CONFIG_MAGIC_SYSRQ is not set 611# CONFIG_MAGIC_SYSRQ is not set
768# CONFIG_DEBUG_KERNEL is not set 612# CONFIG_DEBUG_KERNEL is not set
769CONFIG_LOG_BUF_SHIFT=14 613CONFIG_LOG_BUF_SHIFT=14
614# CONFIG_DEBUG_FS is not set
770CONFIG_CROSSCOMPILE=y 615CONFIG_CROSSCOMPILE=y
771CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M" 616CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M"
772 617
773# 618#
774# Security options 619# Security options
775# 620#
776CONFIG_KEYS=y 621# CONFIG_KEYS is not set
777CONFIG_KEYS_DEBUG_PROC_KEYS=y
778# CONFIG_SECURITY is not set 622# CONFIG_SECURITY is not set
779 623
780# 624#
781# Cryptographic options 625# Cryptographic options
782# 626#
783CONFIG_CRYPTO=y 627# CONFIG_CRYPTO is not set
784CONFIG_CRYPTO_HMAC=y
785CONFIG_CRYPTO_NULL=m
786CONFIG_CRYPTO_MD4=m
787CONFIG_CRYPTO_MD5=m
788CONFIG_CRYPTO_SHA1=m
789CONFIG_CRYPTO_SHA256=m
790CONFIG_CRYPTO_SHA512=m
791CONFIG_CRYPTO_WP512=m
792CONFIG_CRYPTO_TGR192=m
793CONFIG_CRYPTO_DES=m
794CONFIG_CRYPTO_BLOWFISH=m
795CONFIG_CRYPTO_TWOFISH=m
796CONFIG_CRYPTO_SERPENT=m
797CONFIG_CRYPTO_AES=m
798CONFIG_CRYPTO_CAST5=m
799CONFIG_CRYPTO_CAST6=m
800CONFIG_CRYPTO_TEA=m
801CONFIG_CRYPTO_ARC4=m
802CONFIG_CRYPTO_KHAZAD=m
803CONFIG_CRYPTO_ANUBIS=m
804CONFIG_CRYPTO_DEFLATE=m
805CONFIG_CRYPTO_MICHAEL_MIC=m
806CONFIG_CRYPTO_CRC32C=m
807# CONFIG_CRYPTO_TEST is not set
808 628
809# 629#
810# Hardware crypto devices 630# Hardware crypto devices
@@ -814,8 +634,6 @@ CONFIG_CRYPTO_CRC32C=m
814# Library routines 634# Library routines
815# 635#
816# CONFIG_CRC_CCITT is not set 636# CONFIG_CRC_CCITT is not set
817CONFIG_CRC16=m 637# CONFIG_CRC16 is not set
818CONFIG_CRC32=m 638# CONFIG_CRC32 is not set
819CONFIG_LIBCRC32C=m 639# CONFIG_LIBCRC32C is not set
820CONFIG_ZLIB_INFLATE=m
821CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index f2d43be69007..7067f608b22c 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:05 2006 4# Mon Apr 24 14:51:02 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -65,6 +65,8 @@ 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
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
68CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
70CONFIG_DMA_NEED_PCI_MAP_STATE=y 72CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -116,7 +118,6 @@ CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_64KB is not set 118# CONFIG_PAGE_SIZE_64KB is not set
117# CONFIG_MIPS_MT is not set 119# CONFIG_MIPS_MT is not set
118# CONFIG_64BIT_PHYS_ADDR is not set 120# CONFIG_64BIT_PHYS_ADDR is not set
119# CONFIG_CPU_ADVANCED is not set
120CONFIG_CPU_HAS_LLSC=y 121CONFIG_CPU_HAS_LLSC=y
121CONFIG_CPU_HAS_SYNC=y 122CONFIG_CPU_HAS_SYNC=y
122CONFIG_GENERIC_HARDIRQS=y 123CONFIG_GENERIC_HARDIRQS=y
@@ -138,7 +139,6 @@ CONFIG_PREEMPT_NONE=y
138# Code maturity level options 139# Code maturity level options
139# 140#
140CONFIG_EXPERIMENTAL=y 141CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y 142CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32 143CONFIG_INIT_ENV_ARG_LIMIT=32
144 144
@@ -154,6 +154,7 @@ CONFIG_SYSVIPC=y
154CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
156# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
157CONFIG_RELAY=y
157CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -167,10 +168,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 168CONFIG_FUTEX=y
168CONFIG_EPOLL=y 169CONFIG_EPOLL=y
169CONFIG_SHMEM=y 170CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 171CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -182,7 +179,6 @@ CONFIG_BASE_SMALL=0
182CONFIG_MODULES=y 179CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y 180CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set 181# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y 182CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y 183CONFIG_MODULE_SRCVERSION_ALL=y
188# CONFIG_KMOD is not set 184# CONFIG_KMOD is not set
@@ -191,6 +187,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y
191# Block layer 187# Block layer
192# 188#
193# CONFIG_LBD is not set 189# CONFIG_LBD is not set
190# CONFIG_BLK_DEV_IO_TRACE is not set
191# CONFIG_LSF is not set
194 192
195# 193#
196# IO Schedulers 194# IO Schedulers
@@ -210,7 +208,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
210# 208#
211CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
212CONFIG_PCI=y 210CONFIG_PCI=y
213CONFIG_PCI_LEGACY_PROC=y
214CONFIG_MMU=y 211CONFIG_MMU=y
215 212
216# 213#
@@ -238,6 +235,7 @@ CONFIG_NET=y
238# 235#
239# Networking options 236# Networking options
240# 237#
238# CONFIG_NETDEBUG is not set
241# CONFIG_PACKET is not set 239# CONFIG_PACKET is not set
242CONFIG_UNIX=y 240CONFIG_UNIX=y
243CONFIG_XFRM=y 241CONFIG_XFRM=y
@@ -258,12 +256,15 @@ CONFIG_IP_PNP=y
258# CONFIG_INET_AH is not set 256# CONFIG_INET_AH is not set
259# CONFIG_INET_ESP is not set 257# CONFIG_INET_ESP is not set
260# CONFIG_INET_IPCOMP is not set 258# CONFIG_INET_IPCOMP is not set
261CONFIG_INET_TUNNEL=m 259# CONFIG_INET_XFRM_TUNNEL is not set
260# CONFIG_INET_TUNNEL is not set
262CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
263CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
264# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
265CONFIG_TCP_CONG_BIC=y 264CONFIG_TCP_CONG_BIC=y
266# CONFIG_IPV6 is not set 265# CONFIG_IPV6 is not set
266# CONFIG_INET6_XFRM_TUNNEL is not set
267# CONFIG_INET6_TUNNEL is not set
267# CONFIG_NETFILTER is not set 268# CONFIG_NETFILTER is not set
268 269
269# 270#
@@ -275,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y
275# SCTP Configuration (EXPERIMENTAL) 276# SCTP Configuration (EXPERIMENTAL)
276# 277#
277# CONFIG_IP_SCTP is not set 278# CONFIG_IP_SCTP is not set
279
280#
281# TIPC Configuration (EXPERIMENTAL)
282#
283# CONFIG_TIPC is not set
278# CONFIG_ATM is not set 284# CONFIG_ATM is not set
279# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
280# CONFIG_VLAN_8021Q is not set 286# CONFIG_VLAN_8021Q is not set
@@ -284,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_ATALK is not set 290# CONFIG_ATALK is not set
285# CONFIG_X25 is not set 291# CONFIG_X25 is not set
286# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
292# CONFIG_NET_DIVERT is not set 293# CONFIG_NET_DIVERT is not set
293# CONFIG_ECONET is not set 294# CONFIG_ECONET is not set
294# CONFIG_WAN_ROUTER is not set 295# CONFIG_WAN_ROUTER is not set
@@ -309,6 +310,9 @@ CONFIG_IEEE80211=m
309# CONFIG_IEEE80211_DEBUG is not set 310# CONFIG_IEEE80211_DEBUG is not set
310CONFIG_IEEE80211_CRYPT_WEP=m 311CONFIG_IEEE80211_CRYPT_WEP=m
311CONFIG_IEEE80211_CRYPT_CCMP=m 312CONFIG_IEEE80211_CRYPT_CCMP=m
313CONFIG_IEEE80211_SOFTMAC=m
314# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
315CONFIG_WIRELESS_EXT=y
312 316
313# 317#
314# Device Drivers 318# Device Drivers
@@ -352,7 +356,7 @@ CONFIG_CONNECTOR=m
352# CONFIG_BLK_DEV_NBD is not set 356# CONFIG_BLK_DEV_NBD is not set
353# CONFIG_BLK_DEV_SX8 is not set 357# CONFIG_BLK_DEV_SX8 is not set
354# CONFIG_BLK_DEV_RAM is not set 358# CONFIG_BLK_DEV_RAM is not set
355CONFIG_BLK_DEV_RAM_COUNT=16 359# CONFIG_BLK_DEV_INITRD is not set
356CONFIG_CDROM_PKTCDVD=m 360CONFIG_CDROM_PKTCDVD=m
357CONFIG_CDROM_PKTCDVD_BUFFERS=8 361CONFIG_CDROM_PKTCDVD_BUFFERS=8
358# CONFIG_CDROM_PKTCDVD_WCACHE is not set 362# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -550,6 +554,7 @@ CONFIG_HW_CONSOLE=y
550# 554#
551CONFIG_SERIAL_8250=y 555CONFIG_SERIAL_8250=y
552CONFIG_SERIAL_8250_CONSOLE=y 556CONFIG_SERIAL_8250_CONSOLE=y
557CONFIG_SERIAL_8250_PCI=y
553CONFIG_SERIAL_8250_NR_UARTS=4 558CONFIG_SERIAL_8250_NR_UARTS=4
554CONFIG_SERIAL_8250_RUNTIME_UARTS=4 559CONFIG_SERIAL_8250_RUNTIME_UARTS=4
555# CONFIG_SERIAL_8250_EXTENDED is not set 560# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -559,6 +564,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
559# 564#
560CONFIG_SERIAL_CORE=y 565CONFIG_SERIAL_CORE=y
561CONFIG_SERIAL_CORE_CONSOLE=y 566CONFIG_SERIAL_CORE_CONSOLE=y
567# CONFIG_SERIAL_JSM is not set
562CONFIG_UNIX98_PTYS=y 568CONFIG_UNIX98_PTYS=y
563CONFIG_LEGACY_PTYS=y 569CONFIG_LEGACY_PTYS=y
564CONFIG_LEGACY_PTY_COUNT=256 570CONFIG_LEGACY_PTY_COUNT=256
@@ -617,10 +623,6 @@ CONFIG_LEGACY_PTY_COUNT=256
617# 623#
618 624
619# 625#
620# Multimedia Capabilities Port drivers
621#
622
623#
624# Multimedia devices 626# Multimedia devices
625# 627#
626# CONFIG_VIDEO_DEV is not set 628# CONFIG_VIDEO_DEV is not set
@@ -651,6 +653,7 @@ CONFIG_DUMMY_CONSOLE=y
651# 653#
652CONFIG_USB_ARCH_HAS_HCD=y 654CONFIG_USB_ARCH_HAS_HCD=y
653CONFIG_USB_ARCH_HAS_OHCI=y 655CONFIG_USB_ARCH_HAS_OHCI=y
656CONFIG_USB_ARCH_HAS_EHCI=y
654# CONFIG_USB is not set 657# CONFIG_USB is not set
655 658
656# 659#
@@ -668,13 +671,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
668# CONFIG_MMC is not set 671# CONFIG_MMC is not set
669 672
670# 673#
674# LED devices
675#
676# CONFIG_NEW_LEDS is not set
677
678#
679# LED drivers
680#
681
682#
683# LED Triggers
684#
685
686#
671# InfiniBand support 687# InfiniBand support
672# 688#
673# CONFIG_INFINIBAND is not set 689# CONFIG_INFINIBAND is not set
674 690
675# 691#
676# SN Devices 692# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
693#
694
695#
696# Real Time Clock
677# 697#
698# CONFIG_RTC_CLASS is not set
678 699
679# 700#
680# File systems 701# File systems
@@ -719,7 +740,6 @@ CONFIG_SYSFS=y
719# CONFIG_TMPFS is not set 740# CONFIG_TMPFS is not set
720# CONFIG_HUGETLB_PAGE is not set 741# CONFIG_HUGETLB_PAGE is not set
721CONFIG_RAMFS=y 742CONFIG_RAMFS=y
722CONFIG_RELAYFS_FS=m
723# CONFIG_CONFIGFS_FS is not set 743# CONFIG_CONFIGFS_FS is not set
724 744
725# 745#
@@ -783,6 +803,7 @@ CONFIG_MSDOS_PARTITION=y
783# CONFIG_MAGIC_SYSRQ is not set 803# CONFIG_MAGIC_SYSRQ is not set
784# CONFIG_DEBUG_KERNEL is not set 804# CONFIG_DEBUG_KERNEL is not set
785CONFIG_LOG_BUF_SHIFT=14 805CONFIG_LOG_BUF_SHIFT=14
806# CONFIG_DEBUG_FS is not set
786CONFIG_CROSSCOMPILE=y 807CONFIG_CROSSCOMPILE=y
787CONFIG_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::" 808CONFIG_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::"
788 809
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig
index ac5841c4b698..00b56ed0e638 100644
--- a/arch/mips/configs/ev96100_defconfig
+++ b/arch/mips/configs/ev96100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:06 2006 4# Mon Apr 24 14:51:03 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_MIPS_EV96100=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -119,7 +121,6 @@ CONFIG_RM7000_CPU_SCACHE=y
119CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
120# CONFIG_MIPS_MT is not set 122# CONFIG_MIPS_MT is not set
121# CONFIG_64BIT_PHYS_ADDR is not set 123# CONFIG_64BIT_PHYS_ADDR is not set
122# CONFIG_CPU_ADVANCED is not set
123CONFIG_CPU_HAS_LLSC=y 124CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 125CONFIG_CPU_HAS_SYNC=y
125CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
@@ -142,7 +143,6 @@ CONFIG_PREEMPT_NONE=y
142# Code maturity level options 143# Code maturity level options
143# 144#
144CONFIG_EXPERIMENTAL=y 145CONFIG_EXPERIMENTAL=y
145CONFIG_CLEAN_COMPILE=y
146CONFIG_BROKEN_ON_SMP=y 146CONFIG_BROKEN_ON_SMP=y
147CONFIG_INIT_ENV_ARG_LIMIT=32 147CONFIG_INIT_ENV_ARG_LIMIT=32
148 148
@@ -158,6 +158,7 @@ CONFIG_SYSVIPC=y
158CONFIG_SYSCTL=y 158CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set 159# CONFIG_AUDIT is not set
160# CONFIG_IKCONFIG is not set 160# CONFIG_IKCONFIG is not set
161CONFIG_RELAY=y
161CONFIG_INITRAMFS_SOURCE="" 162CONFIG_INITRAMFS_SOURCE=""
162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 163# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163CONFIG_EMBEDDED=y 164CONFIG_EMBEDDED=y
@@ -171,10 +172,6 @@ CONFIG_BASE_FULL=y
171CONFIG_FUTEX=y 172CONFIG_FUTEX=y
172CONFIG_EPOLL=y 173CONFIG_EPOLL=y
173CONFIG_SHMEM=y 174CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178CONFIG_SLAB=y 175CONFIG_SLAB=y
179# CONFIG_TINY_SHMEM is not set 176# CONFIG_TINY_SHMEM is not set
180CONFIG_BASE_SMALL=0 177CONFIG_BASE_SMALL=0
@@ -186,7 +183,6 @@ CONFIG_BASE_SMALL=0
186CONFIG_MODULES=y 183CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y 184CONFIG_MODULE_UNLOAD=y
188# CONFIG_MODULE_FORCE_UNLOAD is not set 185# CONFIG_MODULE_FORCE_UNLOAD is not set
189CONFIG_OBSOLETE_MODPARM=y
190CONFIG_MODVERSIONS=y 186CONFIG_MODVERSIONS=y
191CONFIG_MODULE_SRCVERSION_ALL=y 187CONFIG_MODULE_SRCVERSION_ALL=y
192# CONFIG_KMOD is not set 188# CONFIG_KMOD is not set
@@ -195,6 +191,8 @@ CONFIG_MODULE_SRCVERSION_ALL=y
195# Block layer 191# Block layer
196# 192#
197# CONFIG_LBD is not set 193# CONFIG_LBD is not set
194# CONFIG_BLK_DEV_IO_TRACE is not set
195# CONFIG_LSF is not set
198 196
199# 197#
200# IO Schedulers 198# IO Schedulers
@@ -240,6 +238,7 @@ CONFIG_NET=y
240# 238#
241# Networking options 239# Networking options
242# 240#
241# CONFIG_NETDEBUG is not set
243# CONFIG_PACKET is not set 242# CONFIG_PACKET is not set
244CONFIG_UNIX=y 243CONFIG_UNIX=y
245CONFIG_XFRM=y 244CONFIG_XFRM=y
@@ -260,12 +259,15 @@ CONFIG_IP_PNP_BOOTP=y
260# CONFIG_INET_AH is not set 259# CONFIG_INET_AH is not set
261# CONFIG_INET_ESP is not set 260# CONFIG_INET_ESP is not set
262# CONFIG_INET_IPCOMP is not set 261# CONFIG_INET_IPCOMP is not set
263CONFIG_INET_TUNNEL=m 262# CONFIG_INET_XFRM_TUNNEL is not set
263# CONFIG_INET_TUNNEL is not set
264CONFIG_INET_DIAG=y 264CONFIG_INET_DIAG=y
265CONFIG_INET_TCP_DIAG=y 265CONFIG_INET_TCP_DIAG=y
266# CONFIG_TCP_CONG_ADVANCED is not set 266# CONFIG_TCP_CONG_ADVANCED is not set
267CONFIG_TCP_CONG_BIC=y 267CONFIG_TCP_CONG_BIC=y
268# CONFIG_IPV6 is not set 268# CONFIG_IPV6 is not set
269# CONFIG_INET6_XFRM_TUNNEL is not set
270# CONFIG_INET6_TUNNEL is not set
269# CONFIG_NETFILTER is not set 271# CONFIG_NETFILTER is not set
270 272
271# 273#
@@ -277,6 +279,11 @@ CONFIG_TCP_CONG_BIC=y
277# SCTP Configuration (EXPERIMENTAL) 279# SCTP Configuration (EXPERIMENTAL)
278# 280#
279# CONFIG_IP_SCTP is not set 281# CONFIG_IP_SCTP is not set
282
283#
284# TIPC Configuration (EXPERIMENTAL)
285#
286# CONFIG_TIPC is not set
280# CONFIG_ATM is not set 287# CONFIG_ATM is not set
281# CONFIG_BRIDGE is not set 288# CONFIG_BRIDGE is not set
282# CONFIG_VLAN_8021Q is not set 289# CONFIG_VLAN_8021Q is not set
@@ -286,11 +293,6 @@ CONFIG_TCP_CONG_BIC=y
286# CONFIG_ATALK is not set 293# CONFIG_ATALK is not set
287# CONFIG_X25 is not set 294# CONFIG_X25 is not set
288# CONFIG_LAPB is not set 295# CONFIG_LAPB is not set
289
290#
291# TIPC Configuration (EXPERIMENTAL)
292#
293# CONFIG_TIPC is not set
294# CONFIG_NET_DIVERT is not set 296# CONFIG_NET_DIVERT is not set
295# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
296# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
@@ -311,6 +313,9 @@ CONFIG_IEEE80211=m
311# CONFIG_IEEE80211_DEBUG is not set 313# CONFIG_IEEE80211_DEBUG is not set
312CONFIG_IEEE80211_CRYPT_WEP=m 314CONFIG_IEEE80211_CRYPT_WEP=m
313CONFIG_IEEE80211_CRYPT_CCMP=m 315CONFIG_IEEE80211_CRYPT_CCMP=m
316CONFIG_IEEE80211_SOFTMAC=m
317# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
318CONFIG_WIRELESS_EXT=y
314 319
315# 320#
316# Device Drivers 321# Device Drivers
@@ -349,7 +354,7 @@ CONFIG_CONNECTOR=m
349# CONFIG_BLK_DEV_LOOP is not set 354# CONFIG_BLK_DEV_LOOP is not set
350# CONFIG_BLK_DEV_NBD is not set 355# CONFIG_BLK_DEV_NBD is not set
351# CONFIG_BLK_DEV_RAM is not set 356# CONFIG_BLK_DEV_RAM is not set
352CONFIG_BLK_DEV_RAM_COUNT=16 357# CONFIG_BLK_DEV_INITRD is not set
353CONFIG_CDROM_PKTCDVD=m 358CONFIG_CDROM_PKTCDVD=m
354CONFIG_CDROM_PKTCDVD_BUFFERS=8 359CONFIG_CDROM_PKTCDVD_BUFFERS=8
355# CONFIG_CDROM_PKTCDVD_WCACHE is not set 360# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -567,10 +572,6 @@ CONFIG_LEGACY_PTY_COUNT=256
567# 572#
568 573
569# 574#
570# Multimedia Capabilities Port drivers
571#
572
573#
574# Multimedia devices 575# Multimedia devices
575# 576#
576# CONFIG_VIDEO_DEV is not set 577# CONFIG_VIDEO_DEV is not set
@@ -601,6 +602,7 @@ CONFIG_DUMMY_CONSOLE=y
601# 602#
602# CONFIG_USB_ARCH_HAS_HCD is not set 603# CONFIG_USB_ARCH_HAS_HCD is not set
603# CONFIG_USB_ARCH_HAS_OHCI is not set 604# CONFIG_USB_ARCH_HAS_OHCI is not set
605# CONFIG_USB_ARCH_HAS_EHCI is not set
604 606
605# 607#
606# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 608# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -617,12 +619,30 @@ CONFIG_DUMMY_CONSOLE=y
617# CONFIG_MMC is not set 619# CONFIG_MMC is not set
618 620
619# 621#
622# LED devices
623#
624# CONFIG_NEW_LEDS is not set
625
626#
627# LED drivers
628#
629
630#
631# LED Triggers
632#
633
634#
620# InfiniBand support 635# InfiniBand support
621# 636#
622 637
623# 638#
624# SN Devices 639# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
640#
641
642#
643# Real Time Clock
625# 644#
645# CONFIG_RTC_CLASS is not set
626 646
627# 647#
628# File systems 648# File systems
@@ -667,7 +687,6 @@ CONFIG_SYSFS=y
667# CONFIG_TMPFS is not set 687# CONFIG_TMPFS is not set
668# CONFIG_HUGETLB_PAGE is not set 688# CONFIG_HUGETLB_PAGE is not set
669CONFIG_RAMFS=y 689CONFIG_RAMFS=y
670CONFIG_RELAYFS_FS=m
671# CONFIG_CONFIGFS_FS is not set 690# CONFIG_CONFIGFS_FS is not set
672 691
673# 692#
@@ -731,6 +750,7 @@ CONFIG_MSDOS_PARTITION=y
731# CONFIG_MAGIC_SYSRQ is not set 750# CONFIG_MAGIC_SYSRQ is not set
732# CONFIG_DEBUG_KERNEL is not set 751# CONFIG_DEBUG_KERNEL is not set
733CONFIG_LOG_BUF_SHIFT=14 752CONFIG_LOG_BUF_SHIFT=14
753# CONFIG_DEBUG_FS is not set
734CONFIG_CROSSCOMPILE=y 754CONFIG_CROSSCOMPILE=y
735CONFIG_CMDLINE="" 755CONFIG_CMDLINE=""
736 756
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 42d5cd7927cb..607e2985ffe3 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:51 2006 4# Mon Apr 24 14:50:54 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_ARC=y 70CONFIG_ARC=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
@@ -121,7 +123,6 @@ CONFIG_BOARD_SCACHE=y
121CONFIG_IP22_CPU_SCACHE=y 123CONFIG_IP22_CPU_SCACHE=y
122# CONFIG_MIPS_MT is not set 124# CONFIG_MIPS_MT is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 125# CONFIG_64BIT_PHYS_ADDR is not set
124# CONFIG_CPU_ADVANCED is not set
125CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
126CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
127CONFIG_GENERIC_HARDIRQS=y 128CONFIG_GENERIC_HARDIRQS=y
@@ -143,7 +144,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
143# Code maturity level options 144# Code maturity level options
144# 145#
145CONFIG_EXPERIMENTAL=y 146CONFIG_EXPERIMENTAL=y
146CONFIG_CLEAN_COMPILE=y
147CONFIG_BROKEN_ON_SMP=y 147CONFIG_BROKEN_ON_SMP=y
148CONFIG_INIT_ENV_ARG_LIMIT=32 148CONFIG_INIT_ENV_ARG_LIMIT=32
149 149
@@ -160,6 +160,7 @@ CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161CONFIG_IKCONFIG=y 161CONFIG_IKCONFIG=y
162CONFIG_IKCONFIG_PROC=y 162CONFIG_IKCONFIG_PROC=y
163CONFIG_RELAY=y
163CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
165CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
@@ -173,10 +174,6 @@ CONFIG_BASE_FULL=y
173CONFIG_FUTEX=y 174CONFIG_FUTEX=y
174CONFIG_EPOLL=y 175CONFIG_EPOLL=y
175CONFIG_SHMEM=y 176CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180CONFIG_SLAB=y 177CONFIG_SLAB=y
181# CONFIG_TINY_SHMEM is not set 178# CONFIG_TINY_SHMEM is not set
182CONFIG_BASE_SMALL=0 179CONFIG_BASE_SMALL=0
@@ -188,7 +185,6 @@ CONFIG_BASE_SMALL=0
188CONFIG_MODULES=y 185CONFIG_MODULES=y
189CONFIG_MODULE_UNLOAD=y 186CONFIG_MODULE_UNLOAD=y
190# CONFIG_MODULE_FORCE_UNLOAD is not set 187# CONFIG_MODULE_FORCE_UNLOAD is not set
191CONFIG_OBSOLETE_MODPARM=y
192CONFIG_MODVERSIONS=y 188CONFIG_MODVERSIONS=y
193CONFIG_MODULE_SRCVERSION_ALL=y 189CONFIG_MODULE_SRCVERSION_ALL=y
194CONFIG_KMOD=y 190CONFIG_KMOD=y
@@ -197,6 +193,8 @@ CONFIG_KMOD=y
197# Block layer 193# Block layer
198# 194#
199# CONFIG_LBD is not set 195# CONFIG_LBD is not set
196# CONFIG_BLK_DEV_IO_TRACE is not set
197# CONFIG_LSF is not set
200 198
201# 199#
202# IO Schedulers 200# IO Schedulers
@@ -242,6 +240,7 @@ CONFIG_NET=y
242# 240#
243# Networking options 241# Networking options
244# 242#
243# CONFIG_NETDEBUG is not set
245CONFIG_PACKET=y 244CONFIG_PACKET=y
246CONFIG_PACKET_MMAP=y 245CONFIG_PACKET_MMAP=y
247CONFIG_UNIX=y 246CONFIG_UNIX=y
@@ -264,6 +263,7 @@ CONFIG_IP_PNP_BOOTP=y
264CONFIG_INET_AH=m 263CONFIG_INET_AH=m
265CONFIG_INET_ESP=m 264CONFIG_INET_ESP=m
266CONFIG_INET_IPCOMP=m 265CONFIG_INET_IPCOMP=m
266CONFIG_INET_XFRM_TUNNEL=m
267CONFIG_INET_TUNNEL=m 267CONFIG_INET_TUNNEL=m
268CONFIG_INET_DIAG=y 268CONFIG_INET_DIAG=y
269CONFIG_INET_TCP_DIAG=y 269CONFIG_INET_TCP_DIAG=y
@@ -305,9 +305,12 @@ CONFIG_IP_VS_NQ=m
305CONFIG_IP_VS_FTP=m 305CONFIG_IP_VS_FTP=m
306CONFIG_IPV6=m 306CONFIG_IPV6=m
307CONFIG_IPV6_PRIVACY=y 307CONFIG_IPV6_PRIVACY=y
308CONFIG_IPV6_ROUTER_PREF=y
309CONFIG_IPV6_ROUTE_INFO=y
308CONFIG_INET6_AH=m 310CONFIG_INET6_AH=m
309CONFIG_INET6_ESP=m 311CONFIG_INET6_ESP=m
310CONFIG_INET6_IPCOMP=m 312CONFIG_INET6_IPCOMP=m
313CONFIG_INET6_XFRM_TUNNEL=m
311CONFIG_INET6_TUNNEL=m 314CONFIG_INET6_TUNNEL=m
312CONFIG_IPV6_TUNNEL=m 315CONFIG_IPV6_TUNNEL=m
313CONFIG_NETFILTER=y 316CONFIG_NETFILTER=y
@@ -330,11 +333,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
330CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 333CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
331CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 334CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
332CONFIG_NETFILTER_XT_MATCH_DCCP=m 335CONFIG_NETFILTER_XT_MATCH_DCCP=m
336CONFIG_NETFILTER_XT_MATCH_ESP=m
333CONFIG_NETFILTER_XT_MATCH_HELPER=m 337CONFIG_NETFILTER_XT_MATCH_HELPER=m
334CONFIG_NETFILTER_XT_MATCH_LENGTH=m 338CONFIG_NETFILTER_XT_MATCH_LENGTH=m
335CONFIG_NETFILTER_XT_MATCH_LIMIT=m 339CONFIG_NETFILTER_XT_MATCH_LIMIT=m
336CONFIG_NETFILTER_XT_MATCH_MAC=m 340CONFIG_NETFILTER_XT_MATCH_MAC=m
337CONFIG_NETFILTER_XT_MATCH_MARK=m 341CONFIG_NETFILTER_XT_MATCH_MARK=m
342CONFIG_NETFILTER_XT_MATCH_POLICY=m
343CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
338CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 344CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
339CONFIG_NETFILTER_XT_MATCH_REALM=m 345CONFIG_NETFILTER_XT_MATCH_REALM=m
340CONFIG_NETFILTER_XT_MATCH_SCTP=m 346CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -357,20 +363,19 @@ CONFIG_IP_NF_IRC=m
357CONFIG_IP_NF_TFTP=m 363CONFIG_IP_NF_TFTP=m
358CONFIG_IP_NF_AMANDA=m 364CONFIG_IP_NF_AMANDA=m
359CONFIG_IP_NF_PPTP=m 365CONFIG_IP_NF_PPTP=m
366CONFIG_IP_NF_H323=m
360CONFIG_IP_NF_QUEUE=m 367CONFIG_IP_NF_QUEUE=m
361CONFIG_IP_NF_IPTABLES=m 368CONFIG_IP_NF_IPTABLES=m
362CONFIG_IP_NF_MATCH_IPRANGE=m 369CONFIG_IP_NF_MATCH_IPRANGE=m
363CONFIG_IP_NF_MATCH_MULTIPORT=m
364CONFIG_IP_NF_MATCH_TOS=m 370CONFIG_IP_NF_MATCH_TOS=m
365CONFIG_IP_NF_MATCH_RECENT=m 371CONFIG_IP_NF_MATCH_RECENT=m
366CONFIG_IP_NF_MATCH_ECN=m 372CONFIG_IP_NF_MATCH_ECN=m
367CONFIG_IP_NF_MATCH_DSCP=m 373CONFIG_IP_NF_MATCH_DSCP=m
368CONFIG_IP_NF_MATCH_AH_ESP=m 374CONFIG_IP_NF_MATCH_AH=m
369CONFIG_IP_NF_MATCH_TTL=m 375CONFIG_IP_NF_MATCH_TTL=m
370CONFIG_IP_NF_MATCH_OWNER=m 376CONFIG_IP_NF_MATCH_OWNER=m
371CONFIG_IP_NF_MATCH_ADDRTYPE=m 377CONFIG_IP_NF_MATCH_ADDRTYPE=m
372CONFIG_IP_NF_MATCH_HASHLIMIT=m 378CONFIG_IP_NF_MATCH_HASHLIMIT=m
373CONFIG_IP_NF_MATCH_POLICY=m
374CONFIG_IP_NF_FILTER=m 379CONFIG_IP_NF_FILTER=m
375CONFIG_IP_NF_TARGET_REJECT=m 380CONFIG_IP_NF_TARGET_REJECT=m
376CONFIG_IP_NF_TARGET_LOG=m 381CONFIG_IP_NF_TARGET_LOG=m
@@ -388,6 +393,7 @@ CONFIG_IP_NF_NAT_FTP=m
388CONFIG_IP_NF_NAT_TFTP=m 393CONFIG_IP_NF_NAT_TFTP=m
389CONFIG_IP_NF_NAT_AMANDA=m 394CONFIG_IP_NF_NAT_AMANDA=m
390CONFIG_IP_NF_NAT_PPTP=m 395CONFIG_IP_NF_NAT_PPTP=m
396CONFIG_IP_NF_NAT_H323=m
391CONFIG_IP_NF_MANGLE=m 397CONFIG_IP_NF_MANGLE=m
392CONFIG_IP_NF_TARGET_TOS=m 398CONFIG_IP_NF_TARGET_TOS=m
393CONFIG_IP_NF_TARGET_ECN=m 399CONFIG_IP_NF_TARGET_ECN=m
@@ -408,12 +414,10 @@ CONFIG_IP6_NF_MATCH_RT=m
408CONFIG_IP6_NF_MATCH_OPTS=m 414CONFIG_IP6_NF_MATCH_OPTS=m
409CONFIG_IP6_NF_MATCH_FRAG=m 415CONFIG_IP6_NF_MATCH_FRAG=m
410CONFIG_IP6_NF_MATCH_HL=m 416CONFIG_IP6_NF_MATCH_HL=m
411CONFIG_IP6_NF_MATCH_MULTIPORT=m
412CONFIG_IP6_NF_MATCH_OWNER=m 417CONFIG_IP6_NF_MATCH_OWNER=m
413CONFIG_IP6_NF_MATCH_IPV6HEADER=m 418CONFIG_IP6_NF_MATCH_IPV6HEADER=m
414CONFIG_IP6_NF_MATCH_AHESP=m 419CONFIG_IP6_NF_MATCH_AH=m
415CONFIG_IP6_NF_MATCH_EUI64=m 420CONFIG_IP6_NF_MATCH_EUI64=m
416CONFIG_IP6_NF_MATCH_POLICY=m
417CONFIG_IP6_NF_FILTER=m 421CONFIG_IP6_NF_FILTER=m
418CONFIG_IP6_NF_TARGET_LOG=m 422CONFIG_IP6_NF_TARGET_LOG=m
419CONFIG_IP6_NF_TARGET_REJECT=m 423CONFIG_IP6_NF_TARGET_REJECT=m
@@ -435,6 +439,11 @@ CONFIG_IP_SCTP=m
435# CONFIG_SCTP_HMAC_NONE is not set 439# CONFIG_SCTP_HMAC_NONE is not set
436# CONFIG_SCTP_HMAC_SHA1 is not set 440# CONFIG_SCTP_HMAC_SHA1 is not set
437CONFIG_SCTP_HMAC_MD5=y 441CONFIG_SCTP_HMAC_MD5=y
442
443#
444# TIPC Configuration (EXPERIMENTAL)
445#
446# CONFIG_TIPC is not set
438# CONFIG_ATM is not set 447# CONFIG_ATM is not set
439# CONFIG_BRIDGE is not set 448# CONFIG_BRIDGE is not set
440# CONFIG_VLAN_8021Q is not set 449# CONFIG_VLAN_8021Q is not set
@@ -444,11 +453,6 @@ CONFIG_SCTP_HMAC_MD5=y
444# CONFIG_ATALK is not set 453# CONFIG_ATALK is not set
445# CONFIG_X25 is not set 454# CONFIG_X25 is not set
446# CONFIG_LAPB is not set 455# CONFIG_LAPB is not set
447
448#
449# TIPC Configuration (EXPERIMENTAL)
450#
451# CONFIG_TIPC is not set
452CONFIG_NET_DIVERT=y 456CONFIG_NET_DIVERT=y
453# CONFIG_ECONET is not set 457# CONFIG_ECONET is not set
454# CONFIG_WAN_ROUTER is not set 458# CONFIG_WAN_ROUTER is not set
@@ -508,6 +512,9 @@ CONFIG_IEEE80211=m
508# CONFIG_IEEE80211_DEBUG is not set 512# CONFIG_IEEE80211_DEBUG is not set
509CONFIG_IEEE80211_CRYPT_WEP=m 513CONFIG_IEEE80211_CRYPT_WEP=m
510CONFIG_IEEE80211_CRYPT_CCMP=m 514CONFIG_IEEE80211_CRYPT_CCMP=m
515CONFIG_IEEE80211_SOFTMAC=m
516# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
517CONFIG_WIRELESS_EXT=y
511 518
512# 519#
513# Device Drivers 520# Device Drivers
@@ -546,7 +553,7 @@ CONFIG_CONNECTOR=m
546# CONFIG_BLK_DEV_LOOP is not set 553# CONFIG_BLK_DEV_LOOP is not set
547# CONFIG_BLK_DEV_NBD is not set 554# CONFIG_BLK_DEV_NBD is not set
548# CONFIG_BLK_DEV_RAM is not set 555# CONFIG_BLK_DEV_RAM is not set
549CONFIG_BLK_DEV_RAM_COUNT=16 556# CONFIG_BLK_DEV_INITRD is not set
550CONFIG_CDROM_PKTCDVD=m 557CONFIG_CDROM_PKTCDVD=m
551CONFIG_CDROM_PKTCDVD_BUFFERS=8 558CONFIG_CDROM_PKTCDVD_BUFFERS=8
552# CONFIG_CDROM_PKTCDVD_WCACHE is not set 559# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -812,10 +819,6 @@ CONFIG_MAX_RAW_DEVS=256
812# 819#
813 820
814# 821#
815# Multimedia Capabilities Port drivers
816#
817
818#
819# Multimedia devices 822# Multimedia devices
820# 823#
821# CONFIG_VIDEO_DEV is not set 824# CONFIG_VIDEO_DEV is not set
@@ -857,6 +860,7 @@ CONFIG_LOGO_SGI_CLUT224=y
857# 860#
858# CONFIG_USB_ARCH_HAS_HCD is not set 861# CONFIG_USB_ARCH_HAS_HCD is not set
859# CONFIG_USB_ARCH_HAS_OHCI is not set 862# CONFIG_USB_ARCH_HAS_OHCI is not set
863# CONFIG_USB_ARCH_HAS_EHCI is not set
860 864
861# 865#
862# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 866# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -873,12 +877,30 @@ CONFIG_LOGO_SGI_CLUT224=y
873# CONFIG_MMC is not set 877# CONFIG_MMC is not set
874 878
875# 879#
880# LED devices
881#
882# CONFIG_NEW_LEDS is not set
883
884#
885# LED drivers
886#
887
888#
889# LED Triggers
890#
891
892#
876# InfiniBand support 893# InfiniBand support
877# 894#
878 895
879# 896#
880# SN Devices 897# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
898#
899
900#
901# Real Time Clock
881# 902#
903# CONFIG_RTC_CLASS is not set
882 904
883# 905#
884# File systems 906# File systems
@@ -944,7 +966,6 @@ CONFIG_SYSFS=y
944# CONFIG_TMPFS is not set 966# CONFIG_TMPFS is not set
945# CONFIG_HUGETLB_PAGE is not set 967# CONFIG_HUGETLB_PAGE is not set
946CONFIG_RAMFS=y 968CONFIG_RAMFS=y
947CONFIG_RELAYFS_FS=m
948# CONFIG_CONFIGFS_FS is not set 969# CONFIG_CONFIGFS_FS is not set
949 970
950# 971#
@@ -963,7 +984,6 @@ CONFIG_EFS_FS=m
963# CONFIG_QNX4FS_FS is not set 984# CONFIG_QNX4FS_FS is not set
964# CONFIG_SYSV_FS is not set 985# CONFIG_SYSV_FS is not set
965CONFIG_UFS_FS=m 986CONFIG_UFS_FS=m
966# CONFIG_UFS_FS_WRITE is not set
967 987
968# 988#
969# Network File Systems 989# Network File Systems
@@ -1078,6 +1098,7 @@ CONFIG_NLS_UTF8=m
1078# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1079# CONFIG_DEBUG_KERNEL is not set 1099# CONFIG_DEBUG_KERNEL is not set
1080CONFIG_LOG_BUF_SHIFT=14 1100CONFIG_LOG_BUF_SHIFT=14
1101# CONFIG_DEBUG_FS is not set
1081CONFIG_CROSSCOMPILE=y 1102CONFIG_CROSSCOMPILE=y
1082CONFIG_CMDLINE="" 1103CONFIG_CMDLINE=""
1083 1104
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 8c40590737e1..f724b4b2ecf2 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc4 3# Linux kernel version: 2.6.17-rc2
4# Tue Feb 21 13:44:31 2006 4# Mon Apr 24 14:51:04 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -70,6 +70,8 @@ CONFIG_NUMA=y
70# CONFIG_REPLICATE_KTEXT is not set 70# CONFIG_REPLICATE_KTEXT is not set
71# CONFIG_REPLICATE_EXHANDLERS is not set 71# CONFIG_REPLICATE_EXHANDLERS is not set
72CONFIG_RWSEM_GENERIC_SPINLOCK=y 72CONFIG_RWSEM_GENERIC_SPINLOCK=y
73CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y
73CONFIG_GENERIC_CALIBRATE_DELAY=y 75CONFIG_GENERIC_CALIBRATE_DELAY=y
74CONFIG_ARC=y 76CONFIG_ARC=y
75CONFIG_DMA_IP27=y 77CONFIG_DMA_IP27=y
@@ -123,6 +125,7 @@ CONFIG_CPU_HAS_SYNC=y
123CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
124CONFIG_GENERIC_IRQ_PROBE=y 126CONFIG_GENERIC_IRQ_PROBE=y
125CONFIG_CPU_SUPPORTS_HIGHMEM=y 127CONFIG_CPU_SUPPORTS_HIGHMEM=y
128CONFIG_NODES_SHIFT=6
126CONFIG_SELECT_MEMORY_MODEL=y 129CONFIG_SELECT_MEMORY_MODEL=y
127# CONFIG_FLATMEM_MANUAL is not set 130# CONFIG_FLATMEM_MANUAL is not set
128CONFIG_DISCONTIGMEM_MANUAL=y 131CONFIG_DISCONTIGMEM_MANUAL=y
@@ -162,6 +165,7 @@ CONFIG_SYSCTL=y
162CONFIG_IKCONFIG=y 165CONFIG_IKCONFIG=y
163CONFIG_IKCONFIG_PROC=y 166CONFIG_IKCONFIG_PROC=y
164CONFIG_CPUSETS=y 167CONFIG_CPUSETS=y
168CONFIG_RELAY=y
165CONFIG_INITRAMFS_SOURCE="" 169CONFIG_INITRAMFS_SOURCE=""
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 170# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_EMBEDDED=y 171CONFIG_EMBEDDED=y
@@ -175,10 +179,6 @@ CONFIG_BASE_FULL=y
175CONFIG_FUTEX=y 179CONFIG_FUTEX=y
176CONFIG_EPOLL=y 180CONFIG_EPOLL=y
177CONFIG_SHMEM=y 181CONFIG_SHMEM=y
178CONFIG_CC_ALIGN_FUNCTIONS=0
179CONFIG_CC_ALIGN_LABELS=0
180CONFIG_CC_ALIGN_LOOPS=0
181CONFIG_CC_ALIGN_JUMPS=0
182CONFIG_SLAB=y 182CONFIG_SLAB=y
183# CONFIG_TINY_SHMEM is not set 183# CONFIG_TINY_SHMEM is not set
184CONFIG_BASE_SMALL=0 184CONFIG_BASE_SMALL=0
@@ -190,7 +190,6 @@ CONFIG_BASE_SMALL=0
190CONFIG_MODULES=y 190CONFIG_MODULES=y
191CONFIG_MODULE_UNLOAD=y 191CONFIG_MODULE_UNLOAD=y
192# CONFIG_MODULE_FORCE_UNLOAD is not set 192# CONFIG_MODULE_FORCE_UNLOAD is not set
193CONFIG_OBSOLETE_MODPARM=y
194# CONFIG_MODVERSIONS is not set 193# CONFIG_MODVERSIONS is not set
195CONFIG_MODULE_SRCVERSION_ALL=y 194CONFIG_MODULE_SRCVERSION_ALL=y
196CONFIG_KMOD=y 195CONFIG_KMOD=y
@@ -199,6 +198,7 @@ CONFIG_STOP_MACHINE=y
199# 198#
200# Block layer 199# Block layer
201# 200#
201# CONFIG_BLK_DEV_IO_TRACE is not set
202 202
203# 203#
204# IO Schedulers 204# IO Schedulers
@@ -219,7 +219,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
219CONFIG_HW_HAS_PCI=y 219CONFIG_HW_HAS_PCI=y
220CONFIG_PCI=y 220CONFIG_PCI=y
221CONFIG_PCI_DOMAINS=y 221CONFIG_PCI_DOMAINS=y
222CONFIG_PCI_LEGACY_PROC=y
223CONFIG_MMU=y 222CONFIG_MMU=y
224 223
225# 224#
@@ -237,6 +236,7 @@ CONFIG_MMU=y
237# 236#
238CONFIG_BINFMT_ELF=y 237CONFIG_BINFMT_ELF=y
239# CONFIG_BINFMT_MISC is not set 238# CONFIG_BINFMT_MISC is not set
239# CONFIG_BUILD_ELF64 is not set
240CONFIG_MIPS32_COMPAT=y 240CONFIG_MIPS32_COMPAT=y
241CONFIG_COMPAT=y 241CONFIG_COMPAT=y
242CONFIG_MIPS32_O32=y 242CONFIG_MIPS32_O32=y
@@ -274,12 +274,15 @@ CONFIG_IP_PNP=y
274# CONFIG_INET_AH is not set 274# CONFIG_INET_AH is not set
275# CONFIG_INET_ESP is not set 275# CONFIG_INET_ESP is not set
276# CONFIG_INET_IPCOMP is not set 276# CONFIG_INET_IPCOMP is not set
277CONFIG_INET_TUNNEL=m 277# CONFIG_INET_XFRM_TUNNEL is not set
278# CONFIG_INET_TUNNEL is not set
278CONFIG_INET_DIAG=y 279CONFIG_INET_DIAG=y
279CONFIG_INET_TCP_DIAG=y 280CONFIG_INET_TCP_DIAG=y
280# CONFIG_TCP_CONG_ADVANCED is not set 281# CONFIG_TCP_CONG_ADVANCED is not set
281CONFIG_TCP_CONG_BIC=y 282CONFIG_TCP_CONG_BIC=y
282# CONFIG_IPV6 is not set 283# CONFIG_IPV6 is not set
284# CONFIG_INET6_XFRM_TUNNEL is not set
285# CONFIG_INET6_TUNNEL is not set
283# CONFIG_NETFILTER is not set 286# CONFIG_NETFILTER is not set
284 287
285# 288#
@@ -363,6 +366,9 @@ CONFIG_IEEE80211=m
363# CONFIG_IEEE80211_DEBUG is not set 366# CONFIG_IEEE80211_DEBUG is not set
364CONFIG_IEEE80211_CRYPT_WEP=m 367CONFIG_IEEE80211_CRYPT_WEP=m
365CONFIG_IEEE80211_CRYPT_CCMP=m 368CONFIG_IEEE80211_CRYPT_CCMP=m
369CONFIG_IEEE80211_SOFTMAC=m
370# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
371CONFIG_WIRELESS_EXT=y
366 372
367# 373#
368# Device Drivers 374# Device Drivers
@@ -407,7 +413,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
407# CONFIG_BLK_DEV_NBD is not set 413# CONFIG_BLK_DEV_NBD is not set
408# CONFIG_BLK_DEV_SX8 is not set 414# CONFIG_BLK_DEV_SX8 is not set
409# CONFIG_BLK_DEV_RAM is not set 415# CONFIG_BLK_DEV_RAM is not set
410CONFIG_BLK_DEV_RAM_COUNT=16 416# CONFIG_BLK_DEV_INITRD is not set
411CONFIG_CDROM_PKTCDVD=m 417CONFIG_CDROM_PKTCDVD=m
412CONFIG_CDROM_PKTCDVD_BUFFERS=8 418CONFIG_CDROM_PKTCDVD_BUFFERS=8
413# CONFIG_CDROM_PKTCDVD_WCACHE is not set 419# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -473,7 +479,6 @@ CONFIG_SCSI_SAS_ATTRS=m
473# CONFIG_SCSI_INIA100 is not set 479# CONFIG_SCSI_INIA100 is not set
474# CONFIG_SCSI_SYM53C8XX_2 is not set 480# CONFIG_SCSI_SYM53C8XX_2 is not set
475# CONFIG_SCSI_IPR is not set 481# CONFIG_SCSI_IPR is not set
476# CONFIG_SCSI_QLOGIC_FC is not set
477CONFIG_SCSI_QLOGIC_1280=y 482CONFIG_SCSI_QLOGIC_1280=y
478# CONFIG_SCSI_QLA_FC is not set 483# CONFIG_SCSI_QLA_FC is not set
479# CONFIG_SCSI_LPFC is not set 484# CONFIG_SCSI_LPFC is not set
@@ -491,6 +496,7 @@ CONFIG_MD_RAID0=y
491CONFIG_MD_RAID1=y 496CONFIG_MD_RAID1=y
492CONFIG_MD_RAID10=m 497CONFIG_MD_RAID10=m
493CONFIG_MD_RAID5=y 498CONFIG_MD_RAID5=y
499CONFIG_MD_RAID5_RESHAPE=y
494CONFIG_MD_RAID6=m 500CONFIG_MD_RAID6=m
495CONFIG_MD_MULTIPATH=m 501CONFIG_MD_MULTIPATH=m
496CONFIG_MD_FAULTY=m 502CONFIG_MD_FAULTY=m
@@ -654,6 +660,7 @@ CONFIG_SERIO_RAW=m
654# 660#
655CONFIG_SERIAL_8250=y 661CONFIG_SERIAL_8250=y
656CONFIG_SERIAL_8250_CONSOLE=y 662CONFIG_SERIAL_8250_CONSOLE=y
663CONFIG_SERIAL_8250_PCI=y
657CONFIG_SERIAL_8250_NR_UARTS=4 664CONFIG_SERIAL_8250_NR_UARTS=4
658CONFIG_SERIAL_8250_RUNTIME_UARTS=4 665CONFIG_SERIAL_8250_RUNTIME_UARTS=4
659CONFIG_SERIAL_8250_EXTENDED=y 666CONFIG_SERIAL_8250_EXTENDED=y
@@ -727,10 +734,6 @@ CONFIG_SGI_IP27_RTC=y
727# 734#
728 735
729# 736#
730# Multimedia Capabilities Port drivers
731#
732
733#
734# Multimedia devices 737# Multimedia devices
735# 738#
736# CONFIG_VIDEO_DEV is not set 739# CONFIG_VIDEO_DEV is not set
@@ -755,6 +758,7 @@ CONFIG_SGI_IP27_RTC=y
755# 758#
756CONFIG_USB_ARCH_HAS_HCD=y 759CONFIG_USB_ARCH_HAS_HCD=y
757CONFIG_USB_ARCH_HAS_OHCI=y 760CONFIG_USB_ARCH_HAS_OHCI=y
761CONFIG_USB_ARCH_HAS_EHCI=y
758# CONFIG_USB is not set 762# CONFIG_USB is not set
759 763
760# 764#
@@ -772,17 +776,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
772# CONFIG_MMC is not set 776# CONFIG_MMC is not set
773 777
774# 778#
779# LED devices
780#
781# CONFIG_NEW_LEDS is not set
782
783#
784# LED drivers
785#
786
787#
788# LED Triggers
789#
790
791#
775# InfiniBand support 792# InfiniBand support
776# 793#
777# CONFIG_INFINIBAND is not set 794# CONFIG_INFINIBAND is not set
778 795
779# 796#
780# SN Devices 797# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
781# 798#
782 799
783# 800#
784# EDAC - error detection and reporting (RAS) 801# Real Time Clock
785# 802#
803# CONFIG_RTC_CLASS is not set
786 804
787# 805#
788# File systems 806# File systems
@@ -840,7 +858,6 @@ CONFIG_SYSFS=y
840# CONFIG_TMPFS is not set 858# CONFIG_TMPFS is not set
841# CONFIG_HUGETLB_PAGE is not set 859# CONFIG_HUGETLB_PAGE is not set
842CONFIG_RAMFS=y 860CONFIG_RAMFS=y
843CONFIG_RELAYFS_FS=m
844# CONFIG_CONFIGFS_FS is not set 861# CONFIG_CONFIGFS_FS is not set
845 862
846# 863#
@@ -922,6 +939,7 @@ CONFIG_SGI_PARTITION=y
922# CONFIG_MAGIC_SYSRQ is not set 939# CONFIG_MAGIC_SYSRQ is not set
923# CONFIG_DEBUG_KERNEL is not set 940# CONFIG_DEBUG_KERNEL is not set
924CONFIG_LOG_BUF_SHIFT=15 941CONFIG_LOG_BUF_SHIFT=15
942# CONFIG_DEBUG_FS is not set
925CONFIG_CROSSCOMPILE=y 943CONFIG_CROSSCOMPILE=y
926CONFIG_CMDLINE="" 944CONFIG_CMDLINE=""
927 945
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index 7fdcaf51face..8f11d3565b2d 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:09 2006 4# Mon Apr 24 14:51:05 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_ARC=y 70CONFIG_ARC=y
69CONFIG_DMA_IP32=y 71CONFIG_DMA_IP32=y
@@ -142,7 +144,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
142# Code maturity level options 144# Code maturity level options
143# 145#
144CONFIG_EXPERIMENTAL=y 146CONFIG_EXPERIMENTAL=y
145CONFIG_CLEAN_COMPILE=y
146CONFIG_BROKEN_ON_SMP=y 147CONFIG_BROKEN_ON_SMP=y
147CONFIG_INIT_ENV_ARG_LIMIT=32 148CONFIG_INIT_ENV_ARG_LIMIT=32
148 149
@@ -159,6 +160,7 @@ CONFIG_BSD_PROCESS_ACCT=y
159CONFIG_SYSCTL=y 160CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 161# CONFIG_AUDIT is not set
161# CONFIG_IKCONFIG is not set 162# CONFIG_IKCONFIG is not set
163CONFIG_RELAY=y
162CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
163# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
164CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
@@ -172,10 +174,6 @@ CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y 174CONFIG_FUTEX=y
173CONFIG_EPOLL=y 175CONFIG_EPOLL=y
174CONFIG_SHMEM=y 176CONFIG_SHMEM=y
175CONFIG_CC_ALIGN_FUNCTIONS=0
176CONFIG_CC_ALIGN_LABELS=0
177CONFIG_CC_ALIGN_LOOPS=0
178CONFIG_CC_ALIGN_JUMPS=0
179CONFIG_SLAB=y 177CONFIG_SLAB=y
180# CONFIG_TINY_SHMEM is not set 178# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0 179CONFIG_BASE_SMALL=0
@@ -189,6 +187,7 @@ CONFIG_BASE_SMALL=0
189# 187#
190# Block layer 188# Block layer
191# 189#
190# CONFIG_BLK_DEV_IO_TRACE is not set
192 191
193# 192#
194# IO Schedulers 193# IO Schedulers
@@ -208,7 +207,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
208# 207#
209CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
210CONFIG_PCI=y 209CONFIG_PCI=y
211CONFIG_PCI_LEGACY_PROC=y
212CONFIG_MMU=y 210CONFIG_MMU=y
213 211
214# 212#
@@ -226,6 +224,7 @@ CONFIG_MMU=y
226# 224#
227CONFIG_BINFMT_ELF=y 225CONFIG_BINFMT_ELF=y
228CONFIG_BINFMT_MISC=y 226CONFIG_BINFMT_MISC=y
227# CONFIG_BUILD_ELF64 is not set
229CONFIG_MIPS32_COMPAT=y 228CONFIG_MIPS32_COMPAT=y
230CONFIG_COMPAT=y 229CONFIG_COMPAT=y
231CONFIG_MIPS32_O32=y 230CONFIG_MIPS32_O32=y
@@ -240,6 +239,7 @@ CONFIG_NET=y
240# 239#
241# Networking options 240# Networking options
242# 241#
242# CONFIG_NETDEBUG is not set
243CONFIG_PACKET=y 243CONFIG_PACKET=y
244CONFIG_PACKET_MMAP=y 244CONFIG_PACKET_MMAP=y
245CONFIG_UNIX=y 245CONFIG_UNIX=y
@@ -261,12 +261,15 @@ CONFIG_IP_PNP_BOOTP=y
261# CONFIG_INET_AH is not set 261# CONFIG_INET_AH is not set
262# CONFIG_INET_ESP is not set 262# CONFIG_INET_ESP is not set
263# CONFIG_INET_IPCOMP is not set 263# CONFIG_INET_IPCOMP is not set
264CONFIG_INET_TUNNEL=y 264# CONFIG_INET_XFRM_TUNNEL is not set
265# CONFIG_INET_TUNNEL is not set
265CONFIG_INET_DIAG=y 266CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y 267CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set 268# CONFIG_TCP_CONG_ADVANCED is not set
268CONFIG_TCP_CONG_BIC=y 269CONFIG_TCP_CONG_BIC=y
269# CONFIG_IPV6 is not set 270# CONFIG_IPV6 is not set
271# CONFIG_INET6_XFRM_TUNNEL is not set
272# CONFIG_INET6_TUNNEL is not set
270# CONFIG_NETFILTER is not set 273# CONFIG_NETFILTER is not set
271 274
272# 275#
@@ -278,6 +281,11 @@ CONFIG_TCP_CONG_BIC=y
278# SCTP Configuration (EXPERIMENTAL) 281# SCTP Configuration (EXPERIMENTAL)
279# 282#
280# CONFIG_IP_SCTP is not set 283# CONFIG_IP_SCTP is not set
284
285#
286# TIPC Configuration (EXPERIMENTAL)
287#
288# CONFIG_TIPC is not set
281# CONFIG_ATM is not set 289# CONFIG_ATM is not set
282# CONFIG_BRIDGE is not set 290# CONFIG_BRIDGE is not set
283# CONFIG_VLAN_8021Q is not set 291# CONFIG_VLAN_8021Q is not set
@@ -287,11 +295,6 @@ CONFIG_TCP_CONG_BIC=y
287# CONFIG_ATALK is not set 295# CONFIG_ATALK is not set
288# CONFIG_X25 is not set 296# CONFIG_X25 is not set
289# CONFIG_LAPB is not set 297# CONFIG_LAPB is not set
290
291#
292# TIPC Configuration (EXPERIMENTAL)
293#
294# CONFIG_TIPC is not set
295# CONFIG_NET_DIVERT is not set 298# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
@@ -312,6 +315,9 @@ CONFIG_IEEE80211=y
312# CONFIG_IEEE80211_DEBUG is not set 315# CONFIG_IEEE80211_DEBUG is not set
313CONFIG_IEEE80211_CRYPT_WEP=y 316CONFIG_IEEE80211_CRYPT_WEP=y
314CONFIG_IEEE80211_CRYPT_CCMP=y 317CONFIG_IEEE80211_CRYPT_CCMP=y
318CONFIG_IEEE80211_SOFTMAC=y
319# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
320CONFIG_WIRELESS_EXT=y
315 321
316# 322#
317# Device Drivers 323# Device Drivers
@@ -357,7 +363,7 @@ CONFIG_BLK_DEV_LOOP=y
357# CONFIG_BLK_DEV_NBD is not set 363# CONFIG_BLK_DEV_NBD is not set
358# CONFIG_BLK_DEV_SX8 is not set 364# CONFIG_BLK_DEV_SX8 is not set
359# CONFIG_BLK_DEV_RAM is not set 365# CONFIG_BLK_DEV_RAM is not set
360CONFIG_BLK_DEV_RAM_COUNT=16 366# CONFIG_BLK_DEV_INITRD is not set
361CONFIG_CDROM_PKTCDVD=y 367CONFIG_CDROM_PKTCDVD=y
362CONFIG_CDROM_PKTCDVD_BUFFERS=8 368CONFIG_CDROM_PKTCDVD_BUFFERS=8
363# CONFIG_CDROM_PKTCDVD_WCACHE is not set 369# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -428,7 +434,6 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
428# CONFIG_SCSI_INIA100 is not set 434# CONFIG_SCSI_INIA100 is not set
429# CONFIG_SCSI_SYM53C8XX_2 is not set 435# CONFIG_SCSI_SYM53C8XX_2 is not set
430# CONFIG_SCSI_IPR is not set 436# CONFIG_SCSI_IPR is not set
431# CONFIG_SCSI_QLOGIC_FC is not set
432# CONFIG_SCSI_QLOGIC_1280 is not set 437# CONFIG_SCSI_QLOGIC_1280 is not set
433# CONFIG_SCSI_QLA_FC is not set 438# CONFIG_SCSI_QLA_FC is not set
434# CONFIG_SCSI_LPFC is not set 439# CONFIG_SCSI_LPFC is not set
@@ -615,6 +620,7 @@ CONFIG_HW_CONSOLE=y
615# 620#
616CONFIG_SERIAL_8250=y 621CONFIG_SERIAL_8250=y
617CONFIG_SERIAL_8250_CONSOLE=y 622CONFIG_SERIAL_8250_CONSOLE=y
623CONFIG_SERIAL_8250_PCI=y
618CONFIG_SERIAL_8250_NR_UARTS=4 624CONFIG_SERIAL_8250_NR_UARTS=4
619CONFIG_SERIAL_8250_RUNTIME_UARTS=4 625CONFIG_SERIAL_8250_RUNTIME_UARTS=4
620# CONFIG_SERIAL_8250_EXTENDED is not set 626# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -624,6 +630,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
624# 630#
625CONFIG_SERIAL_CORE=y 631CONFIG_SERIAL_CORE=y
626CONFIG_SERIAL_CORE_CONSOLE=y 632CONFIG_SERIAL_CORE_CONSOLE=y
633# CONFIG_SERIAL_JSM is not set
627CONFIG_UNIX98_PTYS=y 634CONFIG_UNIX98_PTYS=y
628CONFIG_LEGACY_PTYS=y 635CONFIG_LEGACY_PTYS=y
629CONFIG_LEGACY_PTY_COUNT=256 636CONFIG_LEGACY_PTY_COUNT=256
@@ -682,10 +689,6 @@ CONFIG_LEGACY_PTY_COUNT=256
682# 689#
683 690
684# 691#
685# Multimedia Capabilities Port drivers
686#
687
688#
689# Multimedia devices 692# Multimedia devices
690# 693#
691# CONFIG_VIDEO_DEV is not set 694# CONFIG_VIDEO_DEV is not set
@@ -716,6 +719,7 @@ CONFIG_DUMMY_CONSOLE=y
716# 719#
717CONFIG_USB_ARCH_HAS_HCD=y 720CONFIG_USB_ARCH_HAS_HCD=y
718CONFIG_USB_ARCH_HAS_OHCI=y 721CONFIG_USB_ARCH_HAS_OHCI=y
722CONFIG_USB_ARCH_HAS_EHCI=y
719# CONFIG_USB is not set 723# CONFIG_USB is not set
720 724
721# 725#
@@ -733,13 +737,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
733# CONFIG_MMC is not set 737# CONFIG_MMC is not set
734 738
735# 739#
740# LED devices
741#
742# CONFIG_NEW_LEDS is not set
743
744#
745# LED drivers
746#
747
748#
749# LED Triggers
750#
751
752#
736# InfiniBand support 753# InfiniBand support
737# 754#
738# CONFIG_INFINIBAND is not set 755# CONFIG_INFINIBAND is not set
739 756
740# 757#
741# SN Devices 758# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
759#
760
761#
762# Real Time Clock
742# 763#
764# CONFIG_RTC_CLASS is not set
743 765
744# 766#
745# File systems 767# File systems
@@ -784,7 +806,6 @@ CONFIG_SYSFS=y
784CONFIG_TMPFS=y 806CONFIG_TMPFS=y
785# CONFIG_HUGETLB_PAGE is not set 807# CONFIG_HUGETLB_PAGE is not set
786CONFIG_RAMFS=y 808CONFIG_RAMFS=y
787CONFIG_RELAYFS_FS=y
788# CONFIG_CONFIGFS_FS is not set 809# CONFIG_CONFIGFS_FS is not set
789 810
790# 811#
@@ -861,6 +882,8 @@ CONFIG_SGI_PARTITION=y
861# CONFIG_MAGIC_SYSRQ is not set 882# CONFIG_MAGIC_SYSRQ is not set
862# CONFIG_DEBUG_KERNEL is not set 883# CONFIG_DEBUG_KERNEL is not set
863CONFIG_LOG_BUF_SHIFT=14 884CONFIG_LOG_BUF_SHIFT=14
885# CONFIG_DEBUG_FS is not set
886# CONFIG_UNWIND_INFO is not set
864CONFIG_CROSSCOMPILE=y 887CONFIG_CROSSCOMPILE=y
865CONFIG_CMDLINE="" 888CONFIG_CMDLINE=""
866 889
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig
index c716996d9eca..757adf23853d 100644
--- a/arch/mips/configs/it8172_defconfig
+++ b/arch/mips/configs/it8172_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:10 2006 4# Mon Apr 24 14:51:05 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -65,6 +65,8 @@ CONFIG_MIPS_ITE8172=y
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_IT8172_REVC is not set 66# CONFIG_IT8172_REVC is not set
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 67CONFIG_RWSEM_GENERIC_SPINLOCK=y
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
68CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
70CONFIG_DMA_NEED_PCI_MAP_STATE=y 72CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -115,7 +117,6 @@ CONFIG_PAGE_SIZE_4KB=y
115# CONFIG_PAGE_SIZE_16KB is not set 117# CONFIG_PAGE_SIZE_16KB is not set
116# CONFIG_PAGE_SIZE_64KB is not set 118# CONFIG_PAGE_SIZE_64KB is not set
117# CONFIG_MIPS_MT is not set 119# CONFIG_MIPS_MT is not set
118# CONFIG_CPU_ADVANCED is not set
119CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
@@ -137,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 138# Code maturity level options
138# 139#
139CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
143 143
@@ -154,6 +154,7 @@ CONFIG_BSD_PROCESS_ACCT=y
154CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
156# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
157CONFIG_RELAY=y
157CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -167,10 +168,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 168CONFIG_FUTEX=y
168CONFIG_EPOLL=y 169CONFIG_EPOLL=y
169CONFIG_SHMEM=y 170CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 171CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -183,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
183CONFIG_MODULES=y 180CONFIG_MODULES=y
184CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
185# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
186CONFIG_OBSOLETE_MODPARM=y
187CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
188CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
189CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -192,6 +188,8 @@ CONFIG_KMOD=y
192# Block layer 188# Block layer
193# 189#
194# CONFIG_LBD is not set 190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
195 193
196# 194#
197# IO Schedulers 195# IO Schedulers
@@ -237,6 +235,7 @@ CONFIG_NET=y
237# 235#
238# Networking options 236# Networking options
239# 237#
238# CONFIG_NETDEBUG is not set
240CONFIG_PACKET=y 239CONFIG_PACKET=y
241CONFIG_PACKET_MMAP=y 240CONFIG_PACKET_MMAP=y
242CONFIG_UNIX=y 241CONFIG_UNIX=y
@@ -258,12 +257,15 @@ CONFIG_IP_PNP_BOOTP=y
258# CONFIG_INET_AH is not set 257# CONFIG_INET_AH is not set
259# CONFIG_INET_ESP is not set 258# CONFIG_INET_ESP is not set
260# CONFIG_INET_IPCOMP is not set 259# CONFIG_INET_IPCOMP is not set
261CONFIG_INET_TUNNEL=m 260# CONFIG_INET_XFRM_TUNNEL is not set
261# CONFIG_INET_TUNNEL is not set
262CONFIG_INET_DIAG=y 262CONFIG_INET_DIAG=y
263CONFIG_INET_TCP_DIAG=y 263CONFIG_INET_TCP_DIAG=y
264# CONFIG_TCP_CONG_ADVANCED is not set 264# CONFIG_TCP_CONG_ADVANCED is not set
265CONFIG_TCP_CONG_BIC=y 265CONFIG_TCP_CONG_BIC=y
266# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
267# CONFIG_INET6_XFRM_TUNNEL is not set
268# CONFIG_INET6_TUNNEL is not set
267# CONFIG_NETFILTER is not set 269# CONFIG_NETFILTER is not set
268 270
269# 271#
@@ -275,6 +277,11 @@ CONFIG_TCP_CONG_BIC=y
275# SCTP Configuration (EXPERIMENTAL) 277# SCTP Configuration (EXPERIMENTAL)
276# 278#
277# CONFIG_IP_SCTP is not set 279# CONFIG_IP_SCTP is not set
280
281#
282# TIPC Configuration (EXPERIMENTAL)
283#
284# CONFIG_TIPC is not set
278# CONFIG_ATM is not set 285# CONFIG_ATM is not set
279# CONFIG_BRIDGE is not set 286# CONFIG_BRIDGE is not set
280# CONFIG_VLAN_8021Q is not set 287# CONFIG_VLAN_8021Q is not set
@@ -284,11 +291,6 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_ATALK is not set 291# CONFIG_ATALK is not set
285# CONFIG_X25 is not set 292# CONFIG_X25 is not set
286# CONFIG_LAPB is not set 293# CONFIG_LAPB is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
292# CONFIG_NET_DIVERT is not set 294# CONFIG_NET_DIVERT is not set
293# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
294# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
@@ -309,6 +311,9 @@ CONFIG_IEEE80211=m
309# CONFIG_IEEE80211_DEBUG is not set 311# CONFIG_IEEE80211_DEBUG is not set
310CONFIG_IEEE80211_CRYPT_WEP=m 312CONFIG_IEEE80211_CRYPT_WEP=m
311CONFIG_IEEE80211_CRYPT_CCMP=m 313CONFIG_IEEE80211_CRYPT_CCMP=m
314CONFIG_IEEE80211_SOFTMAC=m
315# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
316CONFIG_WIRELESS_EXT=y
312 317
313# 318#
314# Device Drivers 319# Device Drivers
@@ -387,7 +392,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
387# CONFIG_MTD_SLRAM is not set 392# CONFIG_MTD_SLRAM is not set
388# CONFIG_MTD_PHRAM is not set 393# CONFIG_MTD_PHRAM is not set
389# CONFIG_MTD_MTDRAM is not set 394# CONFIG_MTD_MTDRAM is not set
390# CONFIG_MTD_BLKMTD is not set
391# CONFIG_MTD_BLOCK2MTD is not set 395# CONFIG_MTD_BLOCK2MTD is not set
392 396
393# 397#
@@ -424,7 +428,7 @@ CONFIG_BLK_DEV_LOOP=y
424# CONFIG_BLK_DEV_CRYPTOLOOP is not set 428# CONFIG_BLK_DEV_CRYPTOLOOP is not set
425# CONFIG_BLK_DEV_NBD is not set 429# CONFIG_BLK_DEV_NBD is not set
426# CONFIG_BLK_DEV_RAM is not set 430# CONFIG_BLK_DEV_RAM is not set
427CONFIG_BLK_DEV_RAM_COUNT=16 431# CONFIG_BLK_DEV_INITRD is not set
428CONFIG_CDROM_PKTCDVD=m 432CONFIG_CDROM_PKTCDVD=m
429CONFIG_CDROM_PKTCDVD_BUFFERS=8 433CONFIG_CDROM_PKTCDVD_BUFFERS=8
430# CONFIG_CDROM_PKTCDVD_WCACHE is not set 434# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -666,10 +670,6 @@ CONFIG_LEGACY_PTY_COUNT=256
666# 670#
667 671
668# 672#
669# Multimedia Capabilities Port drivers
670#
671
672#
673# Multimedia devices 673# Multimedia devices
674# 674#
675# CONFIG_VIDEO_DEV is not set 675# CONFIG_VIDEO_DEV is not set
@@ -704,7 +704,6 @@ CONFIG_SOUND=y
704# Open Sound System 704# Open Sound System
705# 705#
706CONFIG_SOUND_PRIME=y 706CONFIG_SOUND_PRIME=y
707# CONFIG_OBSOLETE_OSS_DRIVER is not set
708CONFIG_SOUND_IT8172=y 707CONFIG_SOUND_IT8172=y
709# CONFIG_SOUND_MSNDCLAS is not set 708# CONFIG_SOUND_MSNDCLAS is not set
710# CONFIG_SOUND_MSNDPIN is not set 709# CONFIG_SOUND_MSNDPIN is not set
@@ -714,6 +713,7 @@ CONFIG_SOUND_IT8172=y
714# 713#
715# CONFIG_USB_ARCH_HAS_HCD is not set 714# CONFIG_USB_ARCH_HAS_HCD is not set
716# CONFIG_USB_ARCH_HAS_OHCI is not set 715# CONFIG_USB_ARCH_HAS_OHCI is not set
716# CONFIG_USB_ARCH_HAS_EHCI is not set
717 717
718# 718#
719# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 719# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -730,12 +730,30 @@ CONFIG_SOUND_IT8172=y
730# CONFIG_MMC is not set 730# CONFIG_MMC is not set
731 731
732# 732#
733# LED devices
734#
735# CONFIG_NEW_LEDS is not set
736
737#
738# LED drivers
739#
740
741#
742# LED Triggers
743#
744
745#
733# InfiniBand support 746# InfiniBand support
734# 747#
735 748
736# 749#
737# SN Devices 750# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
751#
752
753#
754# Real Time Clock
738# 755#
756# CONFIG_RTC_CLASS is not set
739 757
740# 758#
741# File systems 759# File systems
@@ -780,7 +798,6 @@ CONFIG_SYSFS=y
780# CONFIG_TMPFS is not set 798# CONFIG_TMPFS is not set
781# CONFIG_HUGETLB_PAGE is not set 799# CONFIG_HUGETLB_PAGE is not set
782CONFIG_RAMFS=y 800CONFIG_RAMFS=y
783CONFIG_RELAYFS_FS=m
784# CONFIG_CONFIGFS_FS is not set 801# CONFIG_CONFIGFS_FS is not set
785 802
786# 803#
@@ -846,6 +863,7 @@ CONFIG_MSDOS_PARTITION=y
846# CONFIG_MAGIC_SYSRQ is not set 863# CONFIG_MAGIC_SYSRQ is not set
847# CONFIG_DEBUG_KERNEL is not set 864# CONFIG_DEBUG_KERNEL is not set
848CONFIG_LOG_BUF_SHIFT=14 865CONFIG_LOG_BUF_SHIFT=14
866# CONFIG_DEBUG_FS is not set
849CONFIG_CROSSCOMPILE=y 867CONFIG_CROSSCOMPILE=y
850CONFIG_CMDLINE="" 868CONFIG_CMDLINE=""
851 869
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig
index a8376d125e11..021761a8a237 100644
--- a/arch/mips/configs/ivr_defconfig
+++ b/arch/mips/configs/ivr_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:11 2006 4# Mon Apr 24 14:51:06 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_MIPS_IVR=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -112,7 +114,6 @@ CONFIG_PAGE_SIZE_4KB=y
112# CONFIG_PAGE_SIZE_16KB is not set 114# CONFIG_PAGE_SIZE_16KB is not set
113# CONFIG_PAGE_SIZE_64KB is not set 115# CONFIG_PAGE_SIZE_64KB is not set
114# CONFIG_MIPS_MT is not set 116# CONFIG_MIPS_MT is not set
115# CONFIG_CPU_ADVANCED is not set
116CONFIG_CPU_HAS_LLSC=y 117CONFIG_CPU_HAS_LLSC=y
117CONFIG_CPU_HAS_SYNC=y 118CONFIG_CPU_HAS_SYNC=y
118CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
@@ -134,7 +135,6 @@ CONFIG_PREEMPT_NONE=y
134# Code maturity level options 135# Code maturity level options
135# 136#
136CONFIG_EXPERIMENTAL=y 137CONFIG_EXPERIMENTAL=y
137CONFIG_CLEAN_COMPILE=y
138CONFIG_BROKEN_ON_SMP=y 138CONFIG_BROKEN_ON_SMP=y
139CONFIG_INIT_ENV_ARG_LIMIT=32 139CONFIG_INIT_ENV_ARG_LIMIT=32
140 140
@@ -151,6 +151,7 @@ CONFIG_BSD_PROCESS_ACCT=y
151CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
153# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
154CONFIG_RELAY=y
154CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
156CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
@@ -164,10 +165,6 @@ CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 165CONFIG_FUTEX=y
165CONFIG_EPOLL=y 166CONFIG_EPOLL=y
166CONFIG_SHMEM=y 167CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y 168CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 169# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 170CONFIG_BASE_SMALL=0
@@ -179,7 +176,6 @@ CONFIG_BASE_SMALL=0
179CONFIG_MODULES=y 176CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y 177CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set 178# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y 179CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y 180CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y 181CONFIG_KMOD=y
@@ -188,6 +184,8 @@ CONFIG_KMOD=y
188# Block layer 184# Block layer
189# 185#
190# CONFIG_LBD is not set 186# CONFIG_LBD is not set
187# CONFIG_BLK_DEV_IO_TRACE is not set
188# CONFIG_LSF is not set
191 189
192# 190#
193# IO Schedulers 191# IO Schedulers
@@ -207,7 +205,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
207# 205#
208CONFIG_HW_HAS_PCI=y 206CONFIG_HW_HAS_PCI=y
209CONFIG_PCI=y 207CONFIG_PCI=y
210CONFIG_PCI_LEGACY_PROC=y
211CONFIG_MMU=y 208CONFIG_MMU=y
212 209
213# 210#
@@ -235,6 +232,7 @@ CONFIG_NET=y
235# 232#
236# Networking options 233# Networking options
237# 234#
235# CONFIG_NETDEBUG is not set
238CONFIG_PACKET=y 236CONFIG_PACKET=y
239CONFIG_PACKET_MMAP=y 237CONFIG_PACKET_MMAP=y
240CONFIG_UNIX=y 238CONFIG_UNIX=y
@@ -256,12 +254,15 @@ CONFIG_IP_PNP_BOOTP=y
256# CONFIG_INET_AH is not set 254# CONFIG_INET_AH is not set
257# CONFIG_INET_ESP is not set 255# CONFIG_INET_ESP is not set
258# CONFIG_INET_IPCOMP is not set 256# CONFIG_INET_IPCOMP is not set
259CONFIG_INET_TUNNEL=m 257# CONFIG_INET_XFRM_TUNNEL is not set
258# CONFIG_INET_TUNNEL is not set
260CONFIG_INET_DIAG=y 259CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 260CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set 261# CONFIG_TCP_CONG_ADVANCED is not set
263CONFIG_TCP_CONG_BIC=y 262CONFIG_TCP_CONG_BIC=y
264# CONFIG_IPV6 is not set 263# CONFIG_IPV6 is not set
264# CONFIG_INET6_XFRM_TUNNEL is not set
265# CONFIG_INET6_TUNNEL is not set
265# CONFIG_NETFILTER is not set 266# CONFIG_NETFILTER is not set
266 267
267# 268#
@@ -273,6 +274,11 @@ CONFIG_TCP_CONG_BIC=y
273# SCTP Configuration (EXPERIMENTAL) 274# SCTP Configuration (EXPERIMENTAL)
274# 275#
275# CONFIG_IP_SCTP is not set 276# CONFIG_IP_SCTP is not set
277
278#
279# TIPC Configuration (EXPERIMENTAL)
280#
281# CONFIG_TIPC is not set
276# CONFIG_ATM is not set 282# CONFIG_ATM is not set
277# CONFIG_BRIDGE is not set 283# CONFIG_BRIDGE is not set
278# CONFIG_VLAN_8021Q is not set 284# CONFIG_VLAN_8021Q is not set
@@ -282,11 +288,6 @@ CONFIG_TCP_CONG_BIC=y
282# CONFIG_ATALK is not set 288# CONFIG_ATALK is not set
283# CONFIG_X25 is not set 289# CONFIG_X25 is not set
284# CONFIG_LAPB is not set 290# CONFIG_LAPB is not set
285
286#
287# TIPC Configuration (EXPERIMENTAL)
288#
289# CONFIG_TIPC is not set
290# CONFIG_NET_DIVERT is not set 291# CONFIG_NET_DIVERT is not set
291# CONFIG_ECONET is not set 292# CONFIG_ECONET is not set
292# CONFIG_WAN_ROUTER is not set 293# CONFIG_WAN_ROUTER is not set
@@ -307,6 +308,9 @@ CONFIG_IEEE80211=m
307# CONFIG_IEEE80211_DEBUG is not set 308# CONFIG_IEEE80211_DEBUG is not set
308CONFIG_IEEE80211_CRYPT_WEP=m 309CONFIG_IEEE80211_CRYPT_WEP=m
309CONFIG_IEEE80211_CRYPT_CCMP=m 310CONFIG_IEEE80211_CRYPT_CCMP=m
311CONFIG_IEEE80211_SOFTMAC=m
312# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
313CONFIG_WIRELESS_EXT=y
310 314
311# 315#
312# Device Drivers 316# Device Drivers
@@ -350,7 +354,7 @@ CONFIG_CONNECTOR=m
350# CONFIG_BLK_DEV_NBD is not set 354# CONFIG_BLK_DEV_NBD is not set
351# CONFIG_BLK_DEV_SX8 is not set 355# CONFIG_BLK_DEV_SX8 is not set
352# CONFIG_BLK_DEV_RAM is not set 356# CONFIG_BLK_DEV_RAM is not set
353CONFIG_BLK_DEV_RAM_COUNT=16 357# CONFIG_BLK_DEV_INITRD is not set
354CONFIG_CDROM_PKTCDVD=m 358CONFIG_CDROM_PKTCDVD=m
355CONFIG_CDROM_PKTCDVD_BUFFERS=8 359CONFIG_CDROM_PKTCDVD_BUFFERS=8
356# CONFIG_CDROM_PKTCDVD_WCACHE is not set 360# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -565,6 +569,7 @@ CONFIG_IT8172_SCR1=y
565# 569#
566CONFIG_SERIAL_8250=y 570CONFIG_SERIAL_8250=y
567CONFIG_SERIAL_8250_CONSOLE=y 571CONFIG_SERIAL_8250_CONSOLE=y
572CONFIG_SERIAL_8250_PCI=y
568CONFIG_SERIAL_8250_NR_UARTS=4 573CONFIG_SERIAL_8250_NR_UARTS=4
569CONFIG_SERIAL_8250_RUNTIME_UARTS=4 574CONFIG_SERIAL_8250_RUNTIME_UARTS=4
570# CONFIG_SERIAL_8250_EXTENDED is not set 575# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -574,6 +579,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
574# 579#
575CONFIG_SERIAL_CORE=y 580CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 581CONFIG_SERIAL_CORE_CONSOLE=y
582# CONFIG_SERIAL_JSM is not set
577CONFIG_UNIX98_PTYS=y 583CONFIG_UNIX98_PTYS=y
578CONFIG_LEGACY_PTYS=y 584CONFIG_LEGACY_PTYS=y
579CONFIG_LEGACY_PTY_COUNT=256 585CONFIG_LEGACY_PTY_COUNT=256
@@ -631,10 +637,6 @@ CONFIG_RTC=y
631# 637#
632 638
633# 639#
634# Multimedia Capabilities Port drivers
635#
636
637#
638# Multimedia devices 640# Multimedia devices
639# 641#
640# CONFIG_VIDEO_DEV is not set 642# CONFIG_VIDEO_DEV is not set
@@ -665,6 +667,7 @@ CONFIG_DUMMY_CONSOLE=y
665# 667#
666CONFIG_USB_ARCH_HAS_HCD=y 668CONFIG_USB_ARCH_HAS_HCD=y
667CONFIG_USB_ARCH_HAS_OHCI=y 669CONFIG_USB_ARCH_HAS_OHCI=y
670CONFIG_USB_ARCH_HAS_EHCI=y
668# CONFIG_USB is not set 671# CONFIG_USB is not set
669 672
670# 673#
@@ -682,13 +685,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
682# CONFIG_MMC is not set 685# CONFIG_MMC is not set
683 686
684# 687#
688# LED devices
689#
690# CONFIG_NEW_LEDS is not set
691
692#
693# LED drivers
694#
695
696#
697# LED Triggers
698#
699
700#
685# InfiniBand support 701# InfiniBand support
686# 702#
687# CONFIG_INFINIBAND is not set 703# CONFIG_INFINIBAND is not set
688 704
689# 705#
690# SN Devices 706# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
707#
708
709#
710# Real Time Clock
691# 711#
712# CONFIG_RTC_CLASS is not set
692 713
693# 714#
694# File systems 715# File systems
@@ -733,7 +754,6 @@ CONFIG_SYSFS=y
733# CONFIG_TMPFS is not set 754# CONFIG_TMPFS is not set
734# CONFIG_HUGETLB_PAGE is not set 755# CONFIG_HUGETLB_PAGE is not set
735CONFIG_RAMFS=y 756CONFIG_RAMFS=y
736CONFIG_RELAYFS_FS=m
737# CONFIG_CONFIGFS_FS is not set 757# CONFIG_CONFIGFS_FS is not set
738 758
739# 759#
@@ -797,6 +817,7 @@ CONFIG_MSDOS_PARTITION=y
797# CONFIG_MAGIC_SYSRQ is not set 817# CONFIG_MAGIC_SYSRQ is not set
798# CONFIG_DEBUG_KERNEL is not set 818# CONFIG_DEBUG_KERNEL is not set
799CONFIG_LOG_BUF_SHIFT=14 819CONFIG_LOG_BUF_SHIFT=14
820# CONFIG_DEBUG_FS is not set
800CONFIG_CROSSCOMPILE=y 821CONFIG_CROSSCOMPILE=y
801CONFIG_CMDLINE="" 822CONFIG_CMDLINE=""
802 823
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 316015379dbc..08f6c30b0abc 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:12 2006 4# Mon Apr 24 14:51:06 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -65,6 +65,8 @@ 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
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
68CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
70CONFIG_DMA_NEED_PCI_MAP_STATE=y 72CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -122,7 +124,6 @@ CONFIG_RM7000_CPU_SCACHE=y
122CONFIG_CPU_HAS_PREFETCH=y 124CONFIG_CPU_HAS_PREFETCH=y
123# CONFIG_MIPS_MT is not set 125# CONFIG_MIPS_MT is not set
124# CONFIG_64BIT_PHYS_ADDR is not set 126# CONFIG_64BIT_PHYS_ADDR is not set
125# CONFIG_CPU_ADVANCED is not set
126CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
127CONFIG_CPU_HAS_SYNC=y 128CONFIG_CPU_HAS_SYNC=y
128CONFIG_GENERIC_HARDIRQS=y 129CONFIG_GENERIC_HARDIRQS=y
@@ -144,7 +145,6 @@ CONFIG_PREEMPT_NONE=y
144# Code maturity level options 145# Code maturity level options
145# 146#
146# CONFIG_EXPERIMENTAL is not set 147# CONFIG_EXPERIMENTAL is not set
147CONFIG_CLEAN_COMPILE=y
148CONFIG_BROKEN_ON_SMP=y 148CONFIG_BROKEN_ON_SMP=y
149CONFIG_INIT_ENV_ARG_LIMIT=32 149CONFIG_INIT_ENV_ARG_LIMIT=32
150 150
@@ -160,6 +160,7 @@ CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161CONFIG_IKCONFIG=y 161CONFIG_IKCONFIG=y
162CONFIG_IKCONFIG_PROC=y 162CONFIG_IKCONFIG_PROC=y
163CONFIG_RELAY=y
163CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
164CONFIG_EMBEDDED=y 165CONFIG_EMBEDDED=y
165CONFIG_KALLSYMS=y 166CONFIG_KALLSYMS=y
@@ -172,10 +173,6 @@ CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y 173CONFIG_FUTEX=y
173CONFIG_EPOLL=y 174CONFIG_EPOLL=y
174CONFIG_SHMEM=y 175CONFIG_SHMEM=y
175CONFIG_CC_ALIGN_FUNCTIONS=0
176CONFIG_CC_ALIGN_LABELS=0
177CONFIG_CC_ALIGN_LOOPS=0
178CONFIG_CC_ALIGN_JUMPS=0
179CONFIG_SLAB=y 176CONFIG_SLAB=y
180# CONFIG_TINY_SHMEM is not set 177# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0 178CONFIG_BASE_SMALL=0
@@ -186,7 +183,6 @@ CONFIG_BASE_SMALL=0
186# 183#
187CONFIG_MODULES=y 184CONFIG_MODULES=y
188CONFIG_MODULE_UNLOAD=y 185CONFIG_MODULE_UNLOAD=y
189CONFIG_OBSOLETE_MODPARM=y
190# CONFIG_MODVERSIONS is not set 186# CONFIG_MODVERSIONS is not set
191CONFIG_MODULE_SRCVERSION_ALL=y 187CONFIG_MODULE_SRCVERSION_ALL=y
192CONFIG_KMOD=y 188CONFIG_KMOD=y
@@ -195,6 +191,8 @@ CONFIG_KMOD=y
195# Block layer 191# Block layer
196# 192#
197# CONFIG_LBD is not set 193# CONFIG_LBD is not set
194# CONFIG_BLK_DEV_IO_TRACE is not set
195# CONFIG_LSF is not set
198 196
199# 197#
200# IO Schedulers 198# IO Schedulers
@@ -214,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
214# 212#
215CONFIG_HW_HAS_PCI=y 213CONFIG_HW_HAS_PCI=y
216CONFIG_PCI=y 214CONFIG_PCI=y
217CONFIG_PCI_LEGACY_PROC=y
218CONFIG_MMU=y 215CONFIG_MMU=y
219 216
220# 217#
@@ -241,6 +238,7 @@ CONFIG_NET=y
241# 238#
242# Networking options 239# Networking options
243# 240#
241# CONFIG_NETDEBUG is not set
244# CONFIG_PACKET is not set 242# CONFIG_PACKET is not set
245CONFIG_UNIX=y 243CONFIG_UNIX=y
246CONFIG_XFRM=y 244CONFIG_XFRM=y
@@ -260,16 +258,19 @@ CONFIG_IP_PNP_BOOTP=y
260# CONFIG_INET_AH is not set 258# CONFIG_INET_AH is not set
261# CONFIG_INET_ESP is not set 259# CONFIG_INET_ESP is not set
262# CONFIG_INET_IPCOMP is not set 260# CONFIG_INET_IPCOMP is not set
263CONFIG_INET_TUNNEL=m 261# CONFIG_INET_XFRM_TUNNEL is not set
262# CONFIG_INET_TUNNEL is not set
264CONFIG_INET_DIAG=y 263CONFIG_INET_DIAG=y
265CONFIG_INET_TCP_DIAG=y 264CONFIG_INET_TCP_DIAG=y
266# CONFIG_TCP_CONG_ADVANCED is not set 265# CONFIG_TCP_CONG_ADVANCED is not set
267CONFIG_TCP_CONG_BIC=y 266CONFIG_TCP_CONG_BIC=y
268CONFIG_IPV6=m 267CONFIG_IPV6=m
269CONFIG_IPV6_PRIVACY=y 268CONFIG_IPV6_PRIVACY=y
269CONFIG_IPV6_ROUTER_PREF=y
270CONFIG_INET6_AH=m 270CONFIG_INET6_AH=m
271CONFIG_INET6_ESP=m 271CONFIG_INET6_ESP=m
272CONFIG_INET6_IPCOMP=m 272CONFIG_INET6_IPCOMP=m
273CONFIG_INET6_XFRM_TUNNEL=m
273CONFIG_INET6_TUNNEL=m 274CONFIG_INET6_TUNNEL=m
274CONFIG_IPV6_TUNNEL=m 275CONFIG_IPV6_TUNNEL=m
275# CONFIG_NETFILTER is not set 276# CONFIG_NETFILTER is not set
@@ -338,10 +339,9 @@ CONFIG_CONNECTOR=m
338# CONFIG_BLK_DEV_NBD is not set 339# CONFIG_BLK_DEV_NBD is not set
339# CONFIG_BLK_DEV_SX8 is not set 340# CONFIG_BLK_DEV_SX8 is not set
340# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
341CONFIG_BLK_DEV_RAM_COUNT=16 342# CONFIG_BLK_DEV_INITRD is not set
342CONFIG_CDROM_PKTCDVD=m 343CONFIG_CDROM_PKTCDVD=m
343CONFIG_CDROM_PKTCDVD_BUFFERS=8 344CONFIG_CDROM_PKTCDVD_BUFFERS=8
344# CONFIG_CDROM_PKTCDVD_WCACHE is not set
345CONFIG_ATA_OVER_ETH=m 345CONFIG_ATA_OVER_ETH=m
346 346
347# 347#
@@ -423,6 +423,7 @@ CONFIG_NET_PCI=y
423# CONFIG_PCNET32 is not set 423# CONFIG_PCNET32 is not set
424# CONFIG_AMD8111_ETH is not set 424# CONFIG_AMD8111_ETH is not set
425# CONFIG_ADAPTEC_STARFIRE is not set 425# CONFIG_ADAPTEC_STARFIRE is not set
426# CONFIG_FORCEDETH is not set
426# CONFIG_DGRS is not set 427# CONFIG_DGRS is not set
427CONFIG_EEPRO100=y 428CONFIG_EEPRO100=y
428# CONFIG_E100 is not set 429# CONFIG_E100 is not set
@@ -446,6 +447,7 @@ CONFIG_EEPRO100=y
446# CONFIG_HAMACHI is not set 447# CONFIG_HAMACHI is not set
447# CONFIG_R8169 is not set 448# CONFIG_R8169 is not set
448# CONFIG_SIS190 is not set 449# CONFIG_SIS190 is not set
450# CONFIG_SKGE is not set
449# CONFIG_SK98LIN is not set 451# CONFIG_SK98LIN is not set
450# CONFIG_VIA_VELOCITY is not set 452# CONFIG_VIA_VELOCITY is not set
451# CONFIG_TIGON3 is not set 453# CONFIG_TIGON3 is not set
@@ -514,6 +516,7 @@ CONFIG_MV643XX_ETH_2=y
514# 516#
515CONFIG_SERIAL_8250=y 517CONFIG_SERIAL_8250=y
516CONFIG_SERIAL_8250_CONSOLE=y 518CONFIG_SERIAL_8250_CONSOLE=y
519CONFIG_SERIAL_8250_PCI=y
517CONFIG_SERIAL_8250_NR_UARTS=4 520CONFIG_SERIAL_8250_NR_UARTS=4
518CONFIG_SERIAL_8250_RUNTIME_UARTS=4 521CONFIG_SERIAL_8250_RUNTIME_UARTS=4
519# CONFIG_SERIAL_8250_EXTENDED is not set 522# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -523,6 +526,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
523# 526#
524CONFIG_SERIAL_CORE=y 527CONFIG_SERIAL_CORE=y
525CONFIG_SERIAL_CORE_CONSOLE=y 528CONFIG_SERIAL_CORE_CONSOLE=y
529# CONFIG_SERIAL_JSM is not set
526CONFIG_UNIX98_PTYS=y 530CONFIG_UNIX98_PTYS=y
527CONFIG_LEGACY_PTYS=y 531CONFIG_LEGACY_PTYS=y
528CONFIG_LEGACY_PTY_COUNT=256 532CONFIG_LEGACY_PTY_COUNT=256
@@ -579,10 +583,6 @@ CONFIG_LEGACY_PTY_COUNT=256
579# 583#
580 584
581# 585#
582# Multimedia Capabilities Port drivers
583#
584
585#
586# Multimedia devices 586# Multimedia devices
587# 587#
588# CONFIG_VIDEO_DEV is not set 588# CONFIG_VIDEO_DEV is not set
@@ -607,6 +607,7 @@ CONFIG_LEGACY_PTY_COUNT=256
607# 607#
608CONFIG_USB_ARCH_HAS_HCD=y 608CONFIG_USB_ARCH_HAS_HCD=y
609CONFIG_USB_ARCH_HAS_OHCI=y 609CONFIG_USB_ARCH_HAS_OHCI=y
610CONFIG_USB_ARCH_HAS_EHCI=y
610# CONFIG_USB is not set 611# CONFIG_USB is not set
611 612
612# 613#
@@ -624,12 +625,29 @@ CONFIG_USB_ARCH_HAS_OHCI=y
624# CONFIG_MMC is not set 625# CONFIG_MMC is not set
625 626
626# 627#
628# LED devices
629#
630# CONFIG_NEW_LEDS is not set
631
632#
633# LED drivers
634#
635
636#
637# LED Triggers
638#
639
640#
627# InfiniBand support 641# InfiniBand support
628# 642#
629# CONFIG_INFINIBAND is not set 643# CONFIG_INFINIBAND is not set
630 644
631# 645#
632# SN Devices 646# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
647#
648
649#
650# Real Time Clock
633# 651#
634 652
635# 653#
@@ -672,7 +690,6 @@ CONFIG_SYSFS=y
672# CONFIG_TMPFS is not set 690# CONFIG_TMPFS is not set
673# CONFIG_HUGETLB_PAGE is not set 691# CONFIG_HUGETLB_PAGE is not set
674CONFIG_RAMFS=y 692CONFIG_RAMFS=y
675CONFIG_RELAYFS_FS=m
676 693
677# 694#
678# Miscellaneous filesystems 695# Miscellaneous filesystems
@@ -718,6 +735,7 @@ CONFIG_MSDOS_PARTITION=y
718# CONFIG_MAGIC_SYSRQ is not set 735# CONFIG_MAGIC_SYSRQ is not set
719# CONFIG_DEBUG_KERNEL is not set 736# CONFIG_DEBUG_KERNEL is not set
720CONFIG_LOG_BUF_SHIFT=14 737CONFIG_LOG_BUF_SHIFT=14
738# CONFIG_DEBUG_FS is not set
721CONFIG_CROSSCOMPILE=y 739CONFIG_CROSSCOMPILE=y
722CONFIG_CMDLINE="" 740CONFIG_CMDLINE=""
723 741
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 53fbef1ac25d..38b1e026e10d 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:13 2006 4# Mon Apr 24 14:51:07 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -111,7 +113,6 @@ CONFIG_PAGE_SIZE_4KB=y
111# CONFIG_PAGE_SIZE_16KB is not set 113# CONFIG_PAGE_SIZE_16KB is not set
112# CONFIG_PAGE_SIZE_64KB is not set 114# CONFIG_PAGE_SIZE_64KB is not set
113# CONFIG_MIPS_MT is not set 115# CONFIG_MIPS_MT is not set
114# CONFIG_CPU_ADVANCED is not set
115CONFIG_CPU_HAS_SYNC=y 116CONFIG_CPU_HAS_SYNC=y
116CONFIG_GENERIC_HARDIRQS=y 117CONFIG_GENERIC_HARDIRQS=y
117CONFIG_GENERIC_IRQ_PROBE=y 118CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,7 +134,6 @@ CONFIG_RTC_DS1742=y
133# Code maturity level options 134# Code maturity level options
134# 135#
135CONFIG_EXPERIMENTAL=y 136CONFIG_EXPERIMENTAL=y
136CONFIG_CLEAN_COMPILE=y
137CONFIG_BROKEN_ON_SMP=y 137CONFIG_BROKEN_ON_SMP=y
138CONFIG_INIT_ENV_ARG_LIMIT=32 138CONFIG_INIT_ENV_ARG_LIMIT=32
139 139
@@ -149,6 +149,7 @@ CONFIG_SYSVIPC=y
149CONFIG_SYSCTL=y 149CONFIG_SYSCTL=y
150# CONFIG_AUDIT is not set 150# CONFIG_AUDIT is not set
151# CONFIG_IKCONFIG is not set 151# CONFIG_IKCONFIG is not set
152CONFIG_RELAY=y
152CONFIG_INITRAMFS_SOURCE="" 153CONFIG_INITRAMFS_SOURCE=""
153# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 154# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
154CONFIG_EMBEDDED=y 155CONFIG_EMBEDDED=y
@@ -162,10 +163,6 @@ CONFIG_BASE_FULL=y
162CONFIG_FUTEX=y 163CONFIG_FUTEX=y
163CONFIG_EPOLL=y 164CONFIG_EPOLL=y
164CONFIG_SHMEM=y 165CONFIG_SHMEM=y
165CONFIG_CC_ALIGN_FUNCTIONS=0
166CONFIG_CC_ALIGN_LABELS=0
167CONFIG_CC_ALIGN_LOOPS=0
168CONFIG_CC_ALIGN_JUMPS=0
169CONFIG_SLAB=y 166CONFIG_SLAB=y
170# CONFIG_TINY_SHMEM is not set 167# CONFIG_TINY_SHMEM is not set
171CONFIG_BASE_SMALL=0 168CONFIG_BASE_SMALL=0
@@ -180,6 +177,8 @@ CONFIG_BASE_SMALL=0
180# Block layer 177# Block layer
181# 178#
182# CONFIG_LBD is not set 179# CONFIG_LBD is not set
180# CONFIG_BLK_DEV_IO_TRACE is not set
181# CONFIG_LSF is not set
183 182
184# 183#
185# IO Schedulers 184# IO Schedulers
@@ -199,7 +198,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
199# 198#
200CONFIG_HW_HAS_PCI=y 199CONFIG_HW_HAS_PCI=y
201CONFIG_PCI=y 200CONFIG_PCI=y
202CONFIG_PCI_LEGACY_PROC=y
203CONFIG_MMU=y 201CONFIG_MMU=y
204 202
205# 203#
@@ -227,6 +225,7 @@ CONFIG_NET=y
227# 225#
228# Networking options 226# Networking options
229# 227#
228# CONFIG_NETDEBUG is not set
230CONFIG_PACKET=y 229CONFIG_PACKET=y
231# CONFIG_PACKET_MMAP is not set 230# CONFIG_PACKET_MMAP is not set
232CONFIG_UNIX=y 231CONFIG_UNIX=y
@@ -248,12 +247,15 @@ CONFIG_IP_PNP_BOOTP=y
248# CONFIG_INET_AH is not set 247# CONFIG_INET_AH is not set
249# CONFIG_INET_ESP is not set 248# CONFIG_INET_ESP is not set
250# CONFIG_INET_IPCOMP is not set 249# CONFIG_INET_IPCOMP is not set
251CONFIG_INET_TUNNEL=y 250# CONFIG_INET_XFRM_TUNNEL is not set
251# CONFIG_INET_TUNNEL is not set
252CONFIG_INET_DIAG=y 252CONFIG_INET_DIAG=y
253CONFIG_INET_TCP_DIAG=y 253CONFIG_INET_TCP_DIAG=y
254# CONFIG_TCP_CONG_ADVANCED is not set 254# CONFIG_TCP_CONG_ADVANCED is not set
255CONFIG_TCP_CONG_BIC=y 255CONFIG_TCP_CONG_BIC=y
256# CONFIG_IPV6 is not set 256# CONFIG_IPV6 is not set
257# CONFIG_INET6_XFRM_TUNNEL is not set
258# CONFIG_INET6_TUNNEL is not set
257# CONFIG_NETFILTER is not set 259# CONFIG_NETFILTER is not set
258 260
259# 261#
@@ -265,6 +267,11 @@ CONFIG_TCP_CONG_BIC=y
265# SCTP Configuration (EXPERIMENTAL) 267# SCTP Configuration (EXPERIMENTAL)
266# 268#
267# CONFIG_IP_SCTP is not set 269# CONFIG_IP_SCTP is not set
270
271#
272# TIPC Configuration (EXPERIMENTAL)
273#
274# CONFIG_TIPC is not set
268# CONFIG_ATM is not set 275# CONFIG_ATM is not set
269# CONFIG_BRIDGE is not set 276# CONFIG_BRIDGE is not set
270# CONFIG_VLAN_8021Q is not set 277# CONFIG_VLAN_8021Q is not set
@@ -274,11 +281,6 @@ CONFIG_TCP_CONG_BIC=y
274# CONFIG_ATALK is not set 281# CONFIG_ATALK is not set
275# CONFIG_X25 is not set 282# CONFIG_X25 is not set
276# CONFIG_LAPB is not set 283# CONFIG_LAPB is not set
277
278#
279# TIPC Configuration (EXPERIMENTAL)
280#
281# CONFIG_TIPC is not set
282# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
283# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
284# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
@@ -299,6 +301,9 @@ CONFIG_IEEE80211=y
299# CONFIG_IEEE80211_DEBUG is not set 301# CONFIG_IEEE80211_DEBUG is not set
300CONFIG_IEEE80211_CRYPT_WEP=y 302CONFIG_IEEE80211_CRYPT_WEP=y
301CONFIG_IEEE80211_CRYPT_CCMP=y 303CONFIG_IEEE80211_CRYPT_CCMP=y
304CONFIG_IEEE80211_SOFTMAC=y
305# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
306CONFIG_WIRELESS_EXT=y
302 307
303# 308#
304# Device Drivers 309# Device Drivers
@@ -343,7 +348,7 @@ CONFIG_PROC_EVENTS=y
343# CONFIG_BLK_DEV_NBD is not set 348# CONFIG_BLK_DEV_NBD is not set
344# CONFIG_BLK_DEV_SX8 is not set 349# CONFIG_BLK_DEV_SX8 is not set
345# CONFIG_BLK_DEV_RAM is not set 350# CONFIG_BLK_DEV_RAM is not set
346CONFIG_BLK_DEV_RAM_COUNT=16 351# CONFIG_BLK_DEV_INITRD is not set
347CONFIG_CDROM_PKTCDVD=y 352CONFIG_CDROM_PKTCDVD=y
348CONFIG_CDROM_PKTCDVD_BUFFERS=8 353CONFIG_CDROM_PKTCDVD_BUFFERS=8
349# CONFIG_CDROM_PKTCDVD_WCACHE is not set 354# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -551,7 +556,12 @@ CONFIG_SERIAL_NONSTANDARD=y
551# 556#
552# Non-8250 serial port support 557# Non-8250 serial port support
553# 558#
559CONFIG_SERIAL_CORE=y
560CONFIG_SERIAL_TXX9=y
554CONFIG_HAS_TXX9_SERIAL=y 561CONFIG_HAS_TXX9_SERIAL=y
562# CONFIG_SERIAL_TXX9_CONSOLE is not set
563# CONFIG_SERIAL_TXX9_STDSERIAL is not set
564# CONFIG_SERIAL_JSM is not set
555# CONFIG_UNIX98_PTYS is not set 565# CONFIG_UNIX98_PTYS is not set
556CONFIG_LEGACY_PTYS=y 566CONFIG_LEGACY_PTYS=y
557CONFIG_LEGACY_PTY_COUNT=256 567CONFIG_LEGACY_PTY_COUNT=256
@@ -610,10 +620,6 @@ CONFIG_LEGACY_PTY_COUNT=256
610# 620#
611 621
612# 622#
613# Multimedia Capabilities Port drivers
614#
615
616#
617# Multimedia devices 623# Multimedia devices
618# 624#
619# CONFIG_VIDEO_DEV is not set 625# CONFIG_VIDEO_DEV is not set
@@ -631,6 +637,7 @@ CONFIG_FB=y
631# CONFIG_FB_CFB_COPYAREA is not set 637# CONFIG_FB_CFB_COPYAREA is not set
632# CONFIG_FB_CFB_IMAGEBLIT is not set 638# CONFIG_FB_CFB_IMAGEBLIT is not set
633# CONFIG_FB_MACMODES is not set 639# CONFIG_FB_MACMODES is not set
640CONFIG_FB_FIRMWARE_EDID=y
634# CONFIG_FB_MODE_HELPERS is not set 641# CONFIG_FB_MODE_HELPERS is not set
635# CONFIG_FB_TILEBLITTING is not set 642# CONFIG_FB_TILEBLITTING is not set
636# CONFIG_FB_CIRRUS is not set 643# CONFIG_FB_CIRRUS is not set
@@ -642,7 +649,6 @@ CONFIG_FB=y
642# CONFIG_FB_NVIDIA is not set 649# CONFIG_FB_NVIDIA is not set
643# CONFIG_FB_RIVA is not set 650# CONFIG_FB_RIVA is not set
644# CONFIG_FB_MATROX is not set 651# CONFIG_FB_MATROX is not set
645# CONFIG_FB_RADEON_OLD is not set
646# CONFIG_FB_RADEON is not set 652# CONFIG_FB_RADEON is not set
647# CONFIG_FB_ATY128 is not set 653# CONFIG_FB_ATY128 is not set
648# CONFIG_FB_ATY is not set 654# CONFIG_FB_ATY is not set
@@ -679,6 +685,7 @@ CONFIG_DUMMY_CONSOLE=y
679# 685#
680CONFIG_USB_ARCH_HAS_HCD=y 686CONFIG_USB_ARCH_HAS_HCD=y
681CONFIG_USB_ARCH_HAS_OHCI=y 687CONFIG_USB_ARCH_HAS_OHCI=y
688CONFIG_USB_ARCH_HAS_EHCI=y
682# CONFIG_USB is not set 689# CONFIG_USB is not set
683 690
684# 691#
@@ -696,13 +703,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
696# CONFIG_MMC is not set 703# CONFIG_MMC is not set
697 704
698# 705#
706# LED devices
707#
708# CONFIG_NEW_LEDS is not set
709
710#
711# LED drivers
712#
713
714#
715# LED Triggers
716#
717
718#
699# InfiniBand support 719# InfiniBand support
700# 720#
701# CONFIG_INFINIBAND is not set 721# CONFIG_INFINIBAND is not set
702 722
703# 723#
704# SN Devices 724# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
725#
726
727#
728# Real Time Clock
705# 729#
730# CONFIG_RTC_CLASS is not set
706 731
707# 732#
708# File systems 733# File systems
@@ -745,7 +770,6 @@ CONFIG_SYSFS=y
745# CONFIG_TMPFS is not set 770# CONFIG_TMPFS is not set
746# CONFIG_HUGETLB_PAGE is not set 771# CONFIG_HUGETLB_PAGE is not set
747CONFIG_RAMFS=y 772CONFIG_RAMFS=y
748CONFIG_RELAYFS_FS=y
749# CONFIG_CONFIGFS_FS is not set 773# CONFIG_CONFIGFS_FS is not set
750 774
751# 775#
@@ -809,6 +833,8 @@ CONFIG_MSDOS_PARTITION=y
809# CONFIG_MAGIC_SYSRQ is not set 833# CONFIG_MAGIC_SYSRQ is not set
810# CONFIG_DEBUG_KERNEL is not set 834# CONFIG_DEBUG_KERNEL is not set
811CONFIG_LOG_BUF_SHIFT=14 835CONFIG_LOG_BUF_SHIFT=14
836# CONFIG_DEBUG_FS is not set
837# CONFIG_UNWIND_INFO is not set
812CONFIG_CROSSCOMPILE=y 838CONFIG_CROSSCOMPILE=y
813CONFIG_CMDLINE="" 839CONFIG_CMDLINE=""
814 840
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index ef0fa9fc79d6..4d25990a0a05 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:14 2006 4# Mon Apr 24 14:51:07 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -68,6 +68,8 @@ 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
71CONFIG_GENERIC_FIND_NEXT_BIT=y
72CONFIG_GENERIC_HWEIGHT=y
71CONFIG_GENERIC_CALIBRATE_DELAY=y 73CONFIG_GENERIC_CALIBRATE_DELAY=y
72CONFIG_DMA_NONCOHERENT=y 74CONFIG_DMA_NONCOHERENT=y
73CONFIG_DMA_NEED_PCI_MAP_STATE=y 75CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -119,7 +121,6 @@ CONFIG_BOARD_SCACHE=y
119CONFIG_R5000_CPU_SCACHE=y 121CONFIG_R5000_CPU_SCACHE=y
120# CONFIG_MIPS_MT is not set 122# CONFIG_MIPS_MT is not set
121# CONFIG_64BIT_PHYS_ADDR is not set 123# CONFIG_64BIT_PHYS_ADDR is not set
122# CONFIG_CPU_ADVANCED is not set
123CONFIG_CPU_HAS_LLSC=y 124CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 125CONFIG_CPU_HAS_SYNC=y
125CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
@@ -141,7 +142,6 @@ CONFIG_PREEMPT_NONE=y
141# Code maturity level options 142# Code maturity level options
142# 143#
143CONFIG_EXPERIMENTAL=y 144CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y 145CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32 146CONFIG_INIT_ENV_ARG_LIMIT=32
147 147
@@ -157,6 +157,7 @@ CONFIG_SYSVIPC=y
157CONFIG_SYSCTL=y 157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 158# CONFIG_AUDIT is not set
159# CONFIG_IKCONFIG is not set 159# CONFIG_IKCONFIG is not set
160CONFIG_RELAY=y
160CONFIG_INITRAMFS_SOURCE="" 161CONFIG_INITRAMFS_SOURCE=""
161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
162CONFIG_EMBEDDED=y 163CONFIG_EMBEDDED=y
@@ -170,10 +171,6 @@ CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 171CONFIG_FUTEX=y
171CONFIG_EPOLL=y 172CONFIG_EPOLL=y
172CONFIG_SHMEM=y 173CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0
177CONFIG_SLAB=y 174CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
@@ -186,7 +183,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
186CONFIG_MODULES=y 183CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y 184CONFIG_MODULE_UNLOAD=y
188# CONFIG_MODULE_FORCE_UNLOAD is not set 185# CONFIG_MODULE_FORCE_UNLOAD is not set
189CONFIG_OBSOLETE_MODPARM=y
190CONFIG_MODVERSIONS=y 186CONFIG_MODVERSIONS=y
191CONFIG_MODULE_SRCVERSION_ALL=y 187CONFIG_MODULE_SRCVERSION_ALL=y
192CONFIG_KMOD=y 188CONFIG_KMOD=y
@@ -195,6 +191,8 @@ CONFIG_KMOD=y
195# Block layer 191# Block layer
196# 192#
197# CONFIG_LBD is not set 193# CONFIG_LBD is not set
194# CONFIG_BLK_DEV_IO_TRACE is not set
195# CONFIG_LSF is not set
198 196
199# 197#
200# IO Schedulers 198# IO Schedulers
@@ -214,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
214# 212#
215CONFIG_HW_HAS_PCI=y 213CONFIG_HW_HAS_PCI=y
216CONFIG_PCI=y 214CONFIG_PCI=y
217CONFIG_PCI_LEGACY_PROC=y
218CONFIG_MMU=y 215CONFIG_MMU=y
219 216
220# 217#
@@ -242,6 +239,7 @@ CONFIG_NET=y
242# 239#
243# Networking options 240# Networking options
244# 241#
242# CONFIG_NETDEBUG is not set
245# CONFIG_PACKET is not set 243# CONFIG_PACKET is not set
246CONFIG_UNIX=y 244CONFIG_UNIX=y
247CONFIG_XFRM=y 245CONFIG_XFRM=y
@@ -259,12 +257,15 @@ CONFIG_IP_FIB_HASH=y
259# CONFIG_INET_AH is not set 257# CONFIG_INET_AH is not set
260# CONFIG_INET_ESP is not set 258# CONFIG_INET_ESP is not set
261# CONFIG_INET_IPCOMP is not set 259# CONFIG_INET_IPCOMP is not set
262CONFIG_INET_TUNNEL=m 260# CONFIG_INET_XFRM_TUNNEL is not set
261# CONFIG_INET_TUNNEL is not set
263CONFIG_INET_DIAG=y 262CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 263CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 264# CONFIG_TCP_CONG_ADVANCED is not set
266CONFIG_TCP_CONG_BIC=y 265CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
267# CONFIG_INET6_XFRM_TUNNEL is not set
268# CONFIG_INET6_TUNNEL is not set
268# CONFIG_NETFILTER is not set 269# CONFIG_NETFILTER is not set
269 270
270# 271#
@@ -276,6 +277,11 @@ CONFIG_TCP_CONG_BIC=y
276# SCTP Configuration (EXPERIMENTAL) 277# SCTP Configuration (EXPERIMENTAL)
277# 278#
278# CONFIG_IP_SCTP is not set 279# CONFIG_IP_SCTP is not set
280
281#
282# TIPC Configuration (EXPERIMENTAL)
283#
284# CONFIG_TIPC is not set
279# CONFIG_ATM is not set 285# CONFIG_ATM is not set
280# CONFIG_BRIDGE is not set 286# CONFIG_BRIDGE is not set
281# CONFIG_VLAN_8021Q is not set 287# CONFIG_VLAN_8021Q is not set
@@ -285,11 +291,6 @@ CONFIG_TCP_CONG_BIC=y
285# CONFIG_ATALK is not set 291# CONFIG_ATALK is not set
286# CONFIG_X25 is not set 292# CONFIG_X25 is not set
287# CONFIG_LAPB is not set 293# CONFIG_LAPB is not set
288
289#
290# TIPC Configuration (EXPERIMENTAL)
291#
292# CONFIG_TIPC is not set
293# CONFIG_NET_DIVERT is not set 294# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
@@ -310,6 +311,9 @@ CONFIG_IEEE80211=m
310# CONFIG_IEEE80211_DEBUG is not set 311# CONFIG_IEEE80211_DEBUG is not set
311CONFIG_IEEE80211_CRYPT_WEP=m 312CONFIG_IEEE80211_CRYPT_WEP=m
312CONFIG_IEEE80211_CRYPT_CCMP=m 313CONFIG_IEEE80211_CRYPT_CCMP=m
314CONFIG_IEEE80211_SOFTMAC=m
315# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
316CONFIG_WIRELESS_EXT=y
313 317
314# 318#
315# Device Drivers 319# Device Drivers
@@ -366,7 +370,6 @@ CONFIG_MTD_CFI_I2=y
366# CONFIG_MTD_CFI_I8 is not set 370# CONFIG_MTD_CFI_I8 is not set
367# CONFIG_MTD_CFI_INTELEXT is not set 371# CONFIG_MTD_CFI_INTELEXT is not set
368CONFIG_MTD_CFI_AMDSTD=y 372CONFIG_MTD_CFI_AMDSTD=y
369CONFIG_MTD_CFI_AMDSTD_RETRY=0
370# CONFIG_MTD_CFI_STAA is not set 373# CONFIG_MTD_CFI_STAA is not set
371CONFIG_MTD_CFI_UTIL=y 374CONFIG_MTD_CFI_UTIL=y
372# CONFIG_MTD_RAM is not set 375# CONFIG_MTD_RAM is not set
@@ -389,7 +392,6 @@ CONFIG_MTD_LASAT=y
389# CONFIG_MTD_SLRAM is not set 392# CONFIG_MTD_SLRAM is not set
390# CONFIG_MTD_PHRAM is not set 393# CONFIG_MTD_PHRAM is not set
391# CONFIG_MTD_MTDRAM is not set 394# CONFIG_MTD_MTDRAM is not set
392# CONFIG_MTD_BLKMTD is not set
393# CONFIG_MTD_BLOCK2MTD is not set 395# CONFIG_MTD_BLOCK2MTD is not set
394 396
395# 397#
@@ -430,7 +432,7 @@ CONFIG_MTD_LASAT=y
430# CONFIG_BLK_DEV_NBD is not set 432# CONFIG_BLK_DEV_NBD is not set
431# CONFIG_BLK_DEV_SX8 is not set 433# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 434# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 435# CONFIG_BLK_DEV_INITRD is not set
434CONFIG_CDROM_PKTCDVD=m 436CONFIG_CDROM_PKTCDVD=m
435CONFIG_CDROM_PKTCDVD_BUFFERS=8 437CONFIG_CDROM_PKTCDVD_BUFFERS=8
436# CONFIG_CDROM_PKTCDVD_WCACHE is not set 438# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -672,6 +674,7 @@ CONFIG_HW_CONSOLE=y
672# 674#
673CONFIG_SERIAL_8250=y 675CONFIG_SERIAL_8250=y
674CONFIG_SERIAL_8250_CONSOLE=y 676CONFIG_SERIAL_8250_CONSOLE=y
677CONFIG_SERIAL_8250_PCI=y
675CONFIG_SERIAL_8250_NR_UARTS=4 678CONFIG_SERIAL_8250_NR_UARTS=4
676CONFIG_SERIAL_8250_RUNTIME_UARTS=4 679CONFIG_SERIAL_8250_RUNTIME_UARTS=4
677# CONFIG_SERIAL_8250_EXTENDED is not set 680# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -681,6 +684,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
681# 684#
682CONFIG_SERIAL_CORE=y 685CONFIG_SERIAL_CORE=y
683CONFIG_SERIAL_CORE_CONSOLE=y 686CONFIG_SERIAL_CORE_CONSOLE=y
687# CONFIG_SERIAL_JSM is not set
684CONFIG_UNIX98_PTYS=y 688CONFIG_UNIX98_PTYS=y
685CONFIG_LEGACY_PTYS=y 689CONFIG_LEGACY_PTYS=y
686CONFIG_LEGACY_PTY_COUNT=256 690CONFIG_LEGACY_PTY_COUNT=256
@@ -739,10 +743,6 @@ CONFIG_LEGACY_PTY_COUNT=256
739# 743#
740 744
741# 745#
742# Multimedia Capabilities Port drivers
743#
744
745#
746# Multimedia devices 746# Multimedia devices
747# 747#
748# CONFIG_VIDEO_DEV is not set 748# CONFIG_VIDEO_DEV is not set
@@ -773,6 +773,7 @@ CONFIG_DUMMY_CONSOLE=y
773# 773#
774CONFIG_USB_ARCH_HAS_HCD=y 774CONFIG_USB_ARCH_HAS_HCD=y
775CONFIG_USB_ARCH_HAS_OHCI=y 775CONFIG_USB_ARCH_HAS_OHCI=y
776CONFIG_USB_ARCH_HAS_EHCI=y
776# CONFIG_USB is not set 777# CONFIG_USB is not set
777 778
778# 779#
@@ -790,13 +791,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
790# CONFIG_MMC is not set 791# CONFIG_MMC is not set
791 792
792# 793#
794# LED devices
795#
796# CONFIG_NEW_LEDS is not set
797
798#
799# LED drivers
800#
801
802#
803# LED Triggers
804#
805
806#
793# InfiniBand support 807# InfiniBand support
794# 808#
795# CONFIG_INFINIBAND is not set 809# CONFIG_INFINIBAND is not set
796 810
797# 811#
798# SN Devices 812# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
813#
814
815#
816# Real Time Clock
799# 817#
818# CONFIG_RTC_CLASS is not set
800 819
801# 820#
802# File systems 821# File systems
@@ -847,7 +866,6 @@ CONFIG_SYSFS=y
847# CONFIG_TMPFS is not set 866# CONFIG_TMPFS is not set
848# CONFIG_HUGETLB_PAGE is not set 867# CONFIG_HUGETLB_PAGE is not set
849CONFIG_RAMFS=y 868CONFIG_RAMFS=y
850CONFIG_RELAYFS_FS=m
851# CONFIG_CONFIGFS_FS is not set 869# CONFIG_CONFIGFS_FS is not set
852 870
853# 871#
@@ -914,6 +932,7 @@ CONFIG_MSDOS_PARTITION=y
914# CONFIG_MAGIC_SYSRQ is not set 932# CONFIG_MAGIC_SYSRQ is not set
915# CONFIG_DEBUG_KERNEL is not set 933# CONFIG_DEBUG_KERNEL is not set
916CONFIG_LOG_BUF_SHIFT=14 934CONFIG_LOG_BUF_SHIFT=14
935# CONFIG_DEBUG_FS is not set
917CONFIG_CROSSCOMPILE=y 936CONFIG_CROSSCOMPILE=y
918CONFIG_CMDLINE="" 937CONFIG_CMDLINE=""
919 938
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 367d279efdd9..977f52be51dc 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:15 2006 4# Mon Apr 24 14:51:08 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_MIPS_MALTA=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_ARCH_MAY_HAVE_PC_FDC=y 70CONFIG_ARCH_MAY_HAVE_PC_FDC=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
@@ -128,16 +130,21 @@ CONFIG_PAGE_SIZE_4KB=y
128# CONFIG_PAGE_SIZE_64KB is not set 130# CONFIG_PAGE_SIZE_64KB is not set
129CONFIG_CPU_HAS_PREFETCH=y 131CONFIG_CPU_HAS_PREFETCH=y
130CONFIG_MIPS_MT=y 132CONFIG_MIPS_MT=y
133# CONFIG_MIPS_MT_SMTC is not set
131# CONFIG_MIPS_MT_SMP is not set 134# CONFIG_MIPS_MT_SMP is not set
132CONFIG_MIPS_VPE_LOADER=y 135CONFIG_MIPS_VPE_LOADER=y
136CONFIG_MIPS_MT_FPAFF=y
133CONFIG_MIPS_VPE_LOADER_TOM=y 137CONFIG_MIPS_VPE_LOADER_TOM=y
134CONFIG_MIPS_VPE_APSP_API=y 138CONFIG_MIPS_VPE_APSP_API=y
139CONFIG_MIPS_APSP_KSPD=y
135# CONFIG_64BIT_PHYS_ADDR is not set 140# CONFIG_64BIT_PHYS_ADDR is not set
136# CONFIG_CPU_ADVANCED is not set
137CONFIG_CPU_HAS_LLSC=y 141CONFIG_CPU_HAS_LLSC=y
142# CONFIG_CPU_MIPSR2_IRQ_VI is not set
143# CONFIG_CPU_MIPSR2_IRQ_EI is not set
138CONFIG_CPU_HAS_SYNC=y 144CONFIG_CPU_HAS_SYNC=y
139CONFIG_GENERIC_HARDIRQS=y 145CONFIG_GENERIC_HARDIRQS=y
140CONFIG_GENERIC_IRQ_PROBE=y 146CONFIG_GENERIC_IRQ_PROBE=y
147CONFIG_CPU_SUPPORTS_HIGHMEM=y
141CONFIG_ARCH_FLATMEM_ENABLE=y 148CONFIG_ARCH_FLATMEM_ENABLE=y
142CONFIG_SELECT_MEMORY_MODEL=y 149CONFIG_SELECT_MEMORY_MODEL=y
143CONFIG_FLATMEM_MANUAL=y 150CONFIG_FLATMEM_MANUAL=y
@@ -155,7 +162,6 @@ CONFIG_PREEMPT_NONE=y
155# Code maturity level options 162# Code maturity level options
156# 163#
157CONFIG_EXPERIMENTAL=y 164CONFIG_EXPERIMENTAL=y
158CONFIG_CLEAN_COMPILE=y
159CONFIG_BROKEN_ON_SMP=y 165CONFIG_BROKEN_ON_SMP=y
160CONFIG_INIT_ENV_ARG_LIMIT=32 166CONFIG_INIT_ENV_ARG_LIMIT=32
161 167
@@ -171,6 +177,7 @@ CONFIG_SYSVIPC=y
171CONFIG_SYSCTL=y 177CONFIG_SYSCTL=y
172# CONFIG_AUDIT is not set 178# CONFIG_AUDIT is not set
173# CONFIG_IKCONFIG is not set 179# CONFIG_IKCONFIG is not set
180CONFIG_RELAY=y
174CONFIG_INITRAMFS_SOURCE="" 181CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
176CONFIG_EMBEDDED=y 183CONFIG_EMBEDDED=y
@@ -184,10 +191,6 @@ CONFIG_BASE_FULL=y
184CONFIG_FUTEX=y 191CONFIG_FUTEX=y
185CONFIG_EPOLL=y 192CONFIG_EPOLL=y
186CONFIG_SHMEM=y 193CONFIG_SHMEM=y
187CONFIG_CC_ALIGN_FUNCTIONS=0
188CONFIG_CC_ALIGN_LABELS=0
189CONFIG_CC_ALIGN_LOOPS=0
190CONFIG_CC_ALIGN_JUMPS=0
191CONFIG_SLAB=y 194CONFIG_SLAB=y
192# CONFIG_TINY_SHMEM is not set 195# CONFIG_TINY_SHMEM is not set
193CONFIG_BASE_SMALL=0 196CONFIG_BASE_SMALL=0
@@ -199,7 +202,6 @@ CONFIG_BASE_SMALL=0
199CONFIG_MODULES=y 202CONFIG_MODULES=y
200CONFIG_MODULE_UNLOAD=y 203CONFIG_MODULE_UNLOAD=y
201# CONFIG_MODULE_FORCE_UNLOAD is not set 204# CONFIG_MODULE_FORCE_UNLOAD is not set
202CONFIG_OBSOLETE_MODPARM=y
203CONFIG_MODVERSIONS=y 205CONFIG_MODVERSIONS=y
204CONFIG_MODULE_SRCVERSION_ALL=y 206CONFIG_MODULE_SRCVERSION_ALL=y
205CONFIG_KMOD=y 207CONFIG_KMOD=y
@@ -208,6 +210,8 @@ CONFIG_KMOD=y
208# Block layer 210# Block layer
209# 211#
210# CONFIG_LBD is not set 212# CONFIG_LBD is not set
213# CONFIG_BLK_DEV_IO_TRACE is not set
214# CONFIG_LSF is not set
211 215
212# 216#
213# IO Schedulers 217# IO Schedulers
@@ -227,7 +231,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
227# 231#
228CONFIG_HW_HAS_PCI=y 232CONFIG_HW_HAS_PCI=y
229CONFIG_PCI=y 233CONFIG_PCI=y
230CONFIG_PCI_LEGACY_PROC=y
231CONFIG_MMU=y 234CONFIG_MMU=y
232 235
233# 236#
@@ -255,6 +258,7 @@ CONFIG_NET=y
255# 258#
256# Networking options 259# Networking options
257# 260#
261# CONFIG_NETDEBUG is not set
258CONFIG_PACKET=y 262CONFIG_PACKET=y
259CONFIG_PACKET_MMAP=y 263CONFIG_PACKET_MMAP=y
260CONFIG_UNIX=y 264CONFIG_UNIX=y
@@ -287,6 +291,7 @@ CONFIG_SYN_COOKIES=y
287CONFIG_INET_AH=m 291CONFIG_INET_AH=m
288CONFIG_INET_ESP=m 292CONFIG_INET_ESP=m
289CONFIG_INET_IPCOMP=m 293CONFIG_INET_IPCOMP=m
294CONFIG_INET_XFRM_TUNNEL=m
290CONFIG_INET_TUNNEL=m 295CONFIG_INET_TUNNEL=m
291CONFIG_INET_DIAG=y 296CONFIG_INET_DIAG=y
292CONFIG_INET_TCP_DIAG=y 297CONFIG_INET_TCP_DIAG=y
@@ -328,9 +333,12 @@ CONFIG_IP_VS_NQ=m
328CONFIG_IP_VS_FTP=m 333CONFIG_IP_VS_FTP=m
329CONFIG_IPV6=m 334CONFIG_IPV6=m
330CONFIG_IPV6_PRIVACY=y 335CONFIG_IPV6_PRIVACY=y
336CONFIG_IPV6_ROUTER_PREF=y
337CONFIG_IPV6_ROUTE_INFO=y
331CONFIG_INET6_AH=m 338CONFIG_INET6_AH=m
332CONFIG_INET6_ESP=m 339CONFIG_INET6_ESP=m
333CONFIG_INET6_IPCOMP=m 340CONFIG_INET6_IPCOMP=m
341CONFIG_INET6_XFRM_TUNNEL=m
334CONFIG_INET6_TUNNEL=m 342CONFIG_INET6_TUNNEL=m
335CONFIG_IPV6_TUNNEL=m 343CONFIG_IPV6_TUNNEL=m
336CONFIG_NETFILTER=y 344CONFIG_NETFILTER=y
@@ -354,11 +362,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
354CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 362CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
355CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 363CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
356CONFIG_NETFILTER_XT_MATCH_DCCP=m 364CONFIG_NETFILTER_XT_MATCH_DCCP=m
365CONFIG_NETFILTER_XT_MATCH_ESP=m
357CONFIG_NETFILTER_XT_MATCH_HELPER=m 366CONFIG_NETFILTER_XT_MATCH_HELPER=m
358CONFIG_NETFILTER_XT_MATCH_LENGTH=m 367CONFIG_NETFILTER_XT_MATCH_LENGTH=m
359CONFIG_NETFILTER_XT_MATCH_LIMIT=m 368CONFIG_NETFILTER_XT_MATCH_LIMIT=m
360CONFIG_NETFILTER_XT_MATCH_MAC=m 369CONFIG_NETFILTER_XT_MATCH_MAC=m
361CONFIG_NETFILTER_XT_MATCH_MARK=m 370CONFIG_NETFILTER_XT_MATCH_MARK=m
371CONFIG_NETFILTER_XT_MATCH_POLICY=m
372CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
362# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set 373# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
363CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 374CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
364CONFIG_NETFILTER_XT_MATCH_REALM=m 375CONFIG_NETFILTER_XT_MATCH_REALM=m
@@ -382,20 +393,19 @@ CONFIG_IP_NF_IRC=m
382CONFIG_IP_NF_TFTP=m 393CONFIG_IP_NF_TFTP=m
383CONFIG_IP_NF_AMANDA=m 394CONFIG_IP_NF_AMANDA=m
384CONFIG_IP_NF_PPTP=m 395CONFIG_IP_NF_PPTP=m
396CONFIG_IP_NF_H323=m
385CONFIG_IP_NF_QUEUE=m 397CONFIG_IP_NF_QUEUE=m
386CONFIG_IP_NF_IPTABLES=m 398CONFIG_IP_NF_IPTABLES=m
387CONFIG_IP_NF_MATCH_IPRANGE=m 399CONFIG_IP_NF_MATCH_IPRANGE=m
388CONFIG_IP_NF_MATCH_MULTIPORT=m
389CONFIG_IP_NF_MATCH_TOS=m 400CONFIG_IP_NF_MATCH_TOS=m
390CONFIG_IP_NF_MATCH_RECENT=m 401CONFIG_IP_NF_MATCH_RECENT=m
391CONFIG_IP_NF_MATCH_ECN=m 402CONFIG_IP_NF_MATCH_ECN=m
392CONFIG_IP_NF_MATCH_DSCP=m 403CONFIG_IP_NF_MATCH_DSCP=m
393CONFIG_IP_NF_MATCH_AH_ESP=m 404CONFIG_IP_NF_MATCH_AH=m
394CONFIG_IP_NF_MATCH_TTL=m 405CONFIG_IP_NF_MATCH_TTL=m
395CONFIG_IP_NF_MATCH_OWNER=m 406CONFIG_IP_NF_MATCH_OWNER=m
396CONFIG_IP_NF_MATCH_ADDRTYPE=m 407CONFIG_IP_NF_MATCH_ADDRTYPE=m
397CONFIG_IP_NF_MATCH_HASHLIMIT=m 408CONFIG_IP_NF_MATCH_HASHLIMIT=m
398CONFIG_IP_NF_MATCH_POLICY=m
399CONFIG_IP_NF_FILTER=m 409CONFIG_IP_NF_FILTER=m
400CONFIG_IP_NF_TARGET_REJECT=m 410CONFIG_IP_NF_TARGET_REJECT=m
401CONFIG_IP_NF_TARGET_LOG=m 411CONFIG_IP_NF_TARGET_LOG=m
@@ -413,6 +423,7 @@ CONFIG_IP_NF_NAT_FTP=m
413CONFIG_IP_NF_NAT_TFTP=m 423CONFIG_IP_NF_NAT_TFTP=m
414CONFIG_IP_NF_NAT_AMANDA=m 424CONFIG_IP_NF_NAT_AMANDA=m
415CONFIG_IP_NF_NAT_PPTP=m 425CONFIG_IP_NF_NAT_PPTP=m
426CONFIG_IP_NF_NAT_H323=m
416CONFIG_IP_NF_MANGLE=m 427CONFIG_IP_NF_MANGLE=m
417CONFIG_IP_NF_TARGET_TOS=m 428CONFIG_IP_NF_TARGET_TOS=m
418CONFIG_IP_NF_TARGET_ECN=m 429CONFIG_IP_NF_TARGET_ECN=m
@@ -433,12 +444,10 @@ CONFIG_IP6_NF_MATCH_RT=m
433CONFIG_IP6_NF_MATCH_OPTS=m 444CONFIG_IP6_NF_MATCH_OPTS=m
434CONFIG_IP6_NF_MATCH_FRAG=m 445CONFIG_IP6_NF_MATCH_FRAG=m
435CONFIG_IP6_NF_MATCH_HL=m 446CONFIG_IP6_NF_MATCH_HL=m
436CONFIG_IP6_NF_MATCH_MULTIPORT=m
437CONFIG_IP6_NF_MATCH_OWNER=m 447CONFIG_IP6_NF_MATCH_OWNER=m
438CONFIG_IP6_NF_MATCH_IPV6HEADER=m 448CONFIG_IP6_NF_MATCH_IPV6HEADER=m
439CONFIG_IP6_NF_MATCH_AHESP=m 449CONFIG_IP6_NF_MATCH_AH=m
440CONFIG_IP6_NF_MATCH_EUI64=m 450CONFIG_IP6_NF_MATCH_EUI64=m
441CONFIG_IP6_NF_MATCH_POLICY=m
442CONFIG_IP6_NF_FILTER=m 451CONFIG_IP6_NF_FILTER=m
443CONFIG_IP6_NF_TARGET_LOG=m 452CONFIG_IP6_NF_TARGET_LOG=m
444CONFIG_IP6_NF_TARGET_REJECT=m 453CONFIG_IP6_NF_TARGET_REJECT=m
@@ -484,6 +493,11 @@ CONFIG_IP_SCTP=m
484# CONFIG_SCTP_HMAC_NONE is not set 493# CONFIG_SCTP_HMAC_NONE is not set
485# CONFIG_SCTP_HMAC_SHA1 is not set 494# CONFIG_SCTP_HMAC_SHA1 is not set
486CONFIG_SCTP_HMAC_MD5=y 495CONFIG_SCTP_HMAC_MD5=y
496
497#
498# TIPC Configuration (EXPERIMENTAL)
499#
500# CONFIG_TIPC is not set
487# CONFIG_ATM is not set 501# CONFIG_ATM is not set
488CONFIG_BRIDGE=m 502CONFIG_BRIDGE=m
489CONFIG_VLAN_8021Q=m 503CONFIG_VLAN_8021Q=m
@@ -498,11 +512,6 @@ CONFIG_IPDDP_ENCAP=y
498CONFIG_IPDDP_DECAP=y 512CONFIG_IPDDP_DECAP=y
499# CONFIG_X25 is not set 513# CONFIG_X25 is not set
500# CONFIG_LAPB is not set 514# CONFIG_LAPB is not set
501
502#
503# TIPC Configuration (EXPERIMENTAL)
504#
505# CONFIG_TIPC is not set
506CONFIG_NET_DIVERT=y 515CONFIG_NET_DIVERT=y
507# CONFIG_ECONET is not set 516# CONFIG_ECONET is not set
508# CONFIG_WAN_ROUTER is not set 517# CONFIG_WAN_ROUTER is not set
@@ -562,6 +571,9 @@ CONFIG_IEEE80211=m
562# CONFIG_IEEE80211_DEBUG is not set 571# CONFIG_IEEE80211_DEBUG is not set
563CONFIG_IEEE80211_CRYPT_WEP=m 572CONFIG_IEEE80211_CRYPT_WEP=m
564CONFIG_IEEE80211_CRYPT_CCMP=m 573CONFIG_IEEE80211_CRYPT_CCMP=m
574CONFIG_IEEE80211_SOFTMAC=m
575# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
576CONFIG_WIRELESS_EXT=y
565 577
566# 578#
567# Device Drivers 579# Device Drivers
@@ -734,7 +746,6 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
734# CONFIG_SCSI_INIA100 is not set 746# CONFIG_SCSI_INIA100 is not set
735# CONFIG_SCSI_SYM53C8XX_2 is not set 747# CONFIG_SCSI_SYM53C8XX_2 is not set
736# CONFIG_SCSI_IPR is not set 748# CONFIG_SCSI_IPR is not set
737# CONFIG_SCSI_QLOGIC_FC is not set
738# CONFIG_SCSI_QLOGIC_1280 is not set 749# CONFIG_SCSI_QLOGIC_1280 is not set
739# CONFIG_SCSI_QLA_FC is not set 750# CONFIG_SCSI_QLA_FC is not set
740# CONFIG_SCSI_LPFC is not set 751# CONFIG_SCSI_LPFC is not set
@@ -753,6 +764,7 @@ CONFIG_MD_RAID0=m
753CONFIG_MD_RAID1=m 764CONFIG_MD_RAID1=m
754CONFIG_MD_RAID10=m 765CONFIG_MD_RAID10=m
755CONFIG_MD_RAID5=m 766CONFIG_MD_RAID5=m
767CONFIG_MD_RAID5_RESHAPE=y
756CONFIG_MD_RAID6=m 768CONFIG_MD_RAID6=m
757CONFIG_MD_MULTIPATH=m 769CONFIG_MD_MULTIPATH=m
758CONFIG_MD_FAULTY=m 770CONFIG_MD_FAULTY=m
@@ -956,6 +968,7 @@ CONFIG_HW_CONSOLE=y
956# 968#
957CONFIG_SERIAL_8250=y 969CONFIG_SERIAL_8250=y
958CONFIG_SERIAL_8250_CONSOLE=y 970CONFIG_SERIAL_8250_CONSOLE=y
971CONFIG_SERIAL_8250_PCI=y
959CONFIG_SERIAL_8250_NR_UARTS=4 972CONFIG_SERIAL_8250_NR_UARTS=4
960CONFIG_SERIAL_8250_RUNTIME_UARTS=4 973CONFIG_SERIAL_8250_RUNTIME_UARTS=4
961# CONFIG_SERIAL_8250_EXTENDED is not set 974# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -965,6 +978,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
965# 978#
966CONFIG_SERIAL_CORE=y 979CONFIG_SERIAL_CORE=y
967CONFIG_SERIAL_CORE_CONSOLE=y 980CONFIG_SERIAL_CORE_CONSOLE=y
981# CONFIG_SERIAL_JSM is not set
968CONFIG_UNIX98_PTYS=y 982CONFIG_UNIX98_PTYS=y
969CONFIG_LEGACY_PTYS=y 983CONFIG_LEGACY_PTYS=y
970CONFIG_LEGACY_PTY_COUNT=256 984CONFIG_LEGACY_PTY_COUNT=256
@@ -1022,10 +1036,6 @@ CONFIG_RTC=y
1022# 1036#
1023 1037
1024# 1038#
1025# Multimedia Capabilities Port drivers
1026#
1027
1028#
1029# Multimedia devices 1039# Multimedia devices
1030# 1040#
1031# CONFIG_VIDEO_DEV is not set 1041# CONFIG_VIDEO_DEV is not set
@@ -1056,6 +1066,7 @@ CONFIG_DUMMY_CONSOLE=y
1056# 1066#
1057CONFIG_USB_ARCH_HAS_HCD=y 1067CONFIG_USB_ARCH_HAS_HCD=y
1058CONFIG_USB_ARCH_HAS_OHCI=y 1068CONFIG_USB_ARCH_HAS_OHCI=y
1069CONFIG_USB_ARCH_HAS_EHCI=y
1059# CONFIG_USB is not set 1070# CONFIG_USB is not set
1060 1071
1061# 1072#
@@ -1073,13 +1084,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1073# CONFIG_MMC is not set 1084# CONFIG_MMC is not set
1074 1085
1075# 1086#
1087# LED devices
1088#
1089# CONFIG_NEW_LEDS is not set
1090
1091#
1092# LED drivers
1093#
1094
1095#
1096# LED Triggers
1097#
1098
1099#
1076# InfiniBand support 1100# InfiniBand support
1077# 1101#
1078# CONFIG_INFINIBAND is not set 1102# CONFIG_INFINIBAND is not set
1079 1103
1080# 1104#
1081# SN Devices 1105# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1106#
1107
1108#
1109# Real Time Clock
1082# 1110#
1111# CONFIG_RTC_CLASS is not set
1083 1112
1084# 1113#
1085# File systems 1114# File systems
@@ -1154,7 +1183,6 @@ CONFIG_SYSFS=y
1154# CONFIG_TMPFS is not set 1183# CONFIG_TMPFS is not set
1155# CONFIG_HUGETLB_PAGE is not set 1184# CONFIG_HUGETLB_PAGE is not set
1156CONFIG_RAMFS=y 1185CONFIG_RAMFS=y
1157CONFIG_RELAYFS_FS=m
1158# CONFIG_CONFIGFS_FS is not set 1186# CONFIG_CONFIGFS_FS is not set
1159 1187
1160# 1188#
@@ -1174,7 +1202,6 @@ CONFIG_VXFS_FS=m
1174# CONFIG_QNX4FS_FS is not set 1202# CONFIG_QNX4FS_FS is not set
1175CONFIG_SYSV_FS=m 1203CONFIG_SYSV_FS=m
1176CONFIG_UFS_FS=m 1204CONFIG_UFS_FS=m
1177# CONFIG_UFS_FS_WRITE is not set
1178 1205
1179# 1206#
1180# Network File Systems 1207# Network File Systems
@@ -1266,6 +1293,7 @@ CONFIG_NLS_UTF8=m
1266# CONFIG_MAGIC_SYSRQ is not set 1293# CONFIG_MAGIC_SYSRQ is not set
1267# CONFIG_DEBUG_KERNEL is not set 1294# CONFIG_DEBUG_KERNEL is not set
1268CONFIG_LOG_BUF_SHIFT=14 1295CONFIG_LOG_BUF_SHIFT=14
1296# CONFIG_DEBUG_FS is not set
1269CONFIG_CROSSCOMPILE=y 1297CONFIG_CROSSCOMPILE=y
1270CONFIG_CMDLINE="" 1298CONFIG_CMDLINE=""
1271 1299
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index fe78961762b8..00560e0143f1 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:16 2006 4# Mon Apr 24 14:51:09 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,16 +116,19 @@ CONFIG_PAGE_SIZE_4KB=y
114# CONFIG_PAGE_SIZE_64KB is not set 116# CONFIG_PAGE_SIZE_64KB is not set
115CONFIG_CPU_HAS_PREFETCH=y 117CONFIG_CPU_HAS_PREFETCH=y
116CONFIG_MIPS_MT=y 118CONFIG_MIPS_MT=y
119# CONFIG_MIPS_MT_SMTC is not set
117# CONFIG_MIPS_MT_SMP is not set 120# CONFIG_MIPS_MT_SMP is not set
118CONFIG_MIPS_VPE_LOADER=y 121CONFIG_MIPS_VPE_LOADER=y
122CONFIG_MIPS_MT_FPAFF=y
119CONFIG_MIPS_VPE_LOADER_TOM=y 123CONFIG_MIPS_VPE_LOADER_TOM=y
120CONFIG_MIPS_VPE_APSP_API=y 124CONFIG_MIPS_VPE_APSP_API=y
125CONFIG_MIPS_APSP_KSPD=y
121# CONFIG_64BIT_PHYS_ADDR is not set 126# CONFIG_64BIT_PHYS_ADDR is not set
122# CONFIG_CPU_ADVANCED is not set
123CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 128CONFIG_CPU_HAS_SYNC=y
125CONFIG_GENERIC_HARDIRQS=y 129CONFIG_GENERIC_HARDIRQS=y
126CONFIG_GENERIC_IRQ_PROBE=y 130CONFIG_GENERIC_IRQ_PROBE=y
131CONFIG_CPU_SUPPORTS_HIGHMEM=y
127CONFIG_ARCH_FLATMEM_ENABLE=y 132CONFIG_ARCH_FLATMEM_ENABLE=y
128CONFIG_SELECT_MEMORY_MODEL=y 133CONFIG_SELECT_MEMORY_MODEL=y
129CONFIG_FLATMEM_MANUAL=y 134CONFIG_FLATMEM_MANUAL=y
@@ -141,7 +146,6 @@ CONFIG_PREEMPT_NONE=y
141# Code maturity level options 146# Code maturity level options
142# 147#
143CONFIG_EXPERIMENTAL=y 148CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y 149CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32 150CONFIG_INIT_ENV_ARG_LIMIT=32
147 151
@@ -157,6 +161,7 @@ CONFIG_SYSVIPC=y
157CONFIG_SYSCTL=y 161CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 162# CONFIG_AUDIT is not set
159# CONFIG_IKCONFIG is not set 163# CONFIG_IKCONFIG is not set
164# CONFIG_RELAY is not set
160CONFIG_INITRAMFS_SOURCE="" 165CONFIG_INITRAMFS_SOURCE=""
161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
162CONFIG_EMBEDDED=y 167CONFIG_EMBEDDED=y
@@ -171,10 +176,6 @@ CONFIG_BASE_FULL=y
171CONFIG_FUTEX=y 176CONFIG_FUTEX=y
172CONFIG_EPOLL=y 177CONFIG_EPOLL=y
173CONFIG_SHMEM=y 178CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178CONFIG_SLAB=y 179CONFIG_SLAB=y
179# CONFIG_TINY_SHMEM is not set 180# CONFIG_TINY_SHMEM is not set
180CONFIG_BASE_SMALL=0 181CONFIG_BASE_SMALL=0
@@ -186,7 +187,6 @@ CONFIG_BASE_SMALL=0
186CONFIG_MODULES=y 187CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y 188CONFIG_MODULE_UNLOAD=y
188# CONFIG_MODULE_FORCE_UNLOAD is not set 189# CONFIG_MODULE_FORCE_UNLOAD is not set
189CONFIG_OBSOLETE_MODPARM=y
190CONFIG_MODVERSIONS=y 190CONFIG_MODVERSIONS=y
191CONFIG_MODULE_SRCVERSION_ALL=y 191CONFIG_MODULE_SRCVERSION_ALL=y
192CONFIG_KMOD=y 192CONFIG_KMOD=y
@@ -195,6 +195,7 @@ CONFIG_KMOD=y
195# Block layer 195# Block layer
196# 196#
197# CONFIG_LBD is not set 197# CONFIG_LBD is not set
198# CONFIG_LSF is not set
198 199
199# 200#
200# IO Schedulers 201# IO Schedulers
@@ -238,6 +239,7 @@ CONFIG_NET=y
238# 239#
239# Networking options 240# Networking options
240# 241#
242# CONFIG_NETDEBUG is not set
241CONFIG_PACKET=y 243CONFIG_PACKET=y
242CONFIG_PACKET_MMAP=y 244CONFIG_PACKET_MMAP=y
243CONFIG_UNIX=y 245CONFIG_UNIX=y
@@ -268,12 +270,15 @@ CONFIG_SYN_COOKIES=y
268# CONFIG_INET_AH is not set 270# CONFIG_INET_AH is not set
269# CONFIG_INET_ESP is not set 271# CONFIG_INET_ESP is not set
270# CONFIG_INET_IPCOMP is not set 272# CONFIG_INET_IPCOMP is not set
273# CONFIG_INET_XFRM_TUNNEL is not set
271# CONFIG_INET_TUNNEL is not set 274# CONFIG_INET_TUNNEL is not set
272CONFIG_INET_DIAG=y 275CONFIG_INET_DIAG=y
273CONFIG_INET_TCP_DIAG=y 276CONFIG_INET_TCP_DIAG=y
274# CONFIG_TCP_CONG_ADVANCED is not set 277# CONFIG_TCP_CONG_ADVANCED is not set
275CONFIG_TCP_CONG_BIC=y 278CONFIG_TCP_CONG_BIC=y
276# CONFIG_IPV6 is not set 279# CONFIG_IPV6 is not set
280# CONFIG_INET6_XFRM_TUNNEL is not set
281# CONFIG_INET6_TUNNEL is not set
277# CONFIG_NETFILTER is not set 282# CONFIG_NETFILTER is not set
278 283
279# 284#
@@ -290,6 +295,11 @@ CONFIG_IP_SCTP=m
290# CONFIG_SCTP_HMAC_NONE is not set 295# CONFIG_SCTP_HMAC_NONE is not set
291# CONFIG_SCTP_HMAC_SHA1 is not set 296# CONFIG_SCTP_HMAC_SHA1 is not set
292CONFIG_SCTP_HMAC_MD5=y 297CONFIG_SCTP_HMAC_MD5=y
298
299#
300# TIPC Configuration (EXPERIMENTAL)
301#
302# CONFIG_TIPC is not set
293# CONFIG_ATM is not set 303# CONFIG_ATM is not set
294# CONFIG_BRIDGE is not set 304# CONFIG_BRIDGE is not set
295# CONFIG_VLAN_8021Q is not set 305# CONFIG_VLAN_8021Q is not set
@@ -299,11 +309,6 @@ CONFIG_SCTP_HMAC_MD5=y
299# CONFIG_ATALK is not set 309# CONFIG_ATALK is not set
300# CONFIG_X25 is not set 310# CONFIG_X25 is not set
301# CONFIG_LAPB is not set 311# CONFIG_LAPB is not set
302
303#
304# TIPC Configuration (EXPERIMENTAL)
305#
306# CONFIG_TIPC is not set
307CONFIG_NET_DIVERT=y 312CONFIG_NET_DIVERT=y
308# CONFIG_ECONET is not set 313# CONFIG_ECONET is not set
309# CONFIG_WAN_ROUTER is not set 314# CONFIG_WAN_ROUTER is not set
@@ -397,7 +402,7 @@ CONFIG_BLK_DEV_LOOP=y
397# CONFIG_BLK_DEV_CRYPTOLOOP is not set 402# CONFIG_BLK_DEV_CRYPTOLOOP is not set
398CONFIG_BLK_DEV_NBD=y 403CONFIG_BLK_DEV_NBD=y
399# CONFIG_BLK_DEV_RAM is not set 404# CONFIG_BLK_DEV_RAM is not set
400CONFIG_BLK_DEV_RAM_COUNT=16 405# CONFIG_BLK_DEV_INITRD is not set
401# CONFIG_CDROM_PKTCDVD is not set 406# CONFIG_CDROM_PKTCDVD is not set
402# CONFIG_ATA_OVER_ETH is not set 407# CONFIG_ATA_OVER_ETH is not set
403 408
@@ -532,7 +537,7 @@ CONFIG_SERIO_SERPORT=y
532CONFIG_SERIAL_8250=y 537CONFIG_SERIAL_8250=y
533CONFIG_SERIAL_8250_CONSOLE=y 538CONFIG_SERIAL_8250_CONSOLE=y
534CONFIG_SERIAL_8250_NR_UARTS=1 539CONFIG_SERIAL_8250_NR_UARTS=1
535CONFIG_SERIAL_8250_RUNTIME_UARTS=4 540CONFIG_SERIAL_8250_RUNTIME_UARTS=1
536# CONFIG_SERIAL_8250_EXTENDED is not set 541# CONFIG_SERIAL_8250_EXTENDED is not set
537 542
538# 543#
@@ -596,10 +601,6 @@ CONFIG_LEGACY_PTY_COUNT=256
596# 601#
597 602
598# 603#
599# Multimedia Capabilities Port drivers
600#
601
602#
603# Multimedia devices 604# Multimedia devices
604# 605#
605# CONFIG_VIDEO_DEV is not set 606# CONFIG_VIDEO_DEV is not set
@@ -624,6 +625,7 @@ CONFIG_LEGACY_PTY_COUNT=256
624# 625#
625# CONFIG_USB_ARCH_HAS_HCD is not set 626# CONFIG_USB_ARCH_HAS_HCD is not set
626# CONFIG_USB_ARCH_HAS_OHCI is not set 627# CONFIG_USB_ARCH_HAS_OHCI is not set
628# CONFIG_USB_ARCH_HAS_EHCI is not set
627 629
628# 630#
629# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 631# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -640,12 +642,30 @@ CONFIG_LEGACY_PTY_COUNT=256
640# CONFIG_MMC is not set 642# CONFIG_MMC is not set
641 643
642# 644#
645# LED devices
646#
647# CONFIG_NEW_LEDS is not set
648
649#
650# LED drivers
651#
652
653#
654# LED Triggers
655#
656
657#
643# InfiniBand support 658# InfiniBand support
644# 659#
645 660
646# 661#
647# SN Devices 662# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
663#
664
665#
666# Real Time Clock
648# 667#
668# CONFIG_RTC_CLASS is not set
649 669
650# 670#
651# File systems 671# File systems
@@ -690,8 +710,6 @@ CONFIG_PROC_FS=y
690# CONFIG_TMPFS is not set 710# CONFIG_TMPFS is not set
691# CONFIG_HUGETLB_PAGE is not set 711# CONFIG_HUGETLB_PAGE is not set
692CONFIG_RAMFS=y 712CONFIG_RAMFS=y
693# CONFIG_RELAYFS_FS is not set
694# CONFIG_CONFIGFS_FS is not set
695 713
696# 714#
697# Miscellaneous filesystems 715# Miscellaneous filesystems
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index e4620e7f0a5e..286a018375b2 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:17 2006 4# Mon Apr 24 14:51:09 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -72,6 +72,8 @@ CONFIG_VICTOR_MPC30X=y
72CONFIG_PCI_VR41XX=y 72CONFIG_PCI_VR41XX=y
73CONFIG_VRC4173=y 73CONFIG_VRC4173=y
74CONFIG_RWSEM_GENERIC_SPINLOCK=y 74CONFIG_RWSEM_GENERIC_SPINLOCK=y
75CONFIG_GENERIC_FIND_NEXT_BIT=y
76CONFIG_GENERIC_HWEIGHT=y
75CONFIG_GENERIC_CALIBRATE_DELAY=y 77CONFIG_GENERIC_CALIBRATE_DELAY=y
76CONFIG_DMA_NONCOHERENT=y 78CONFIG_DMA_NONCOHERENT=y
77CONFIG_DMA_NEED_PCI_MAP_STATE=y 79CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -90,7 +92,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
90# CONFIG_CPU_MIPS64_R2 is not set 92# CONFIG_CPU_MIPS64_R2 is not set
91# CONFIG_CPU_R3000 is not set 93# CONFIG_CPU_R3000 is not set
92# CONFIG_CPU_TX39XX is not set 94# CONFIG_CPU_TX39XX is not set
93# CONFIG_CPU_VR41XX is not set 95CONFIG_CPU_VR41XX=y
94# CONFIG_CPU_R4300 is not set 96# CONFIG_CPU_R4300 is not set
95# CONFIG_CPU_R4X00 is not set 97# CONFIG_CPU_R4X00 is not set
96# CONFIG_CPU_TX49XX is not set 98# CONFIG_CPU_TX49XX is not set
@@ -103,18 +105,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
103# CONFIG_CPU_RM7000 is not set 105# CONFIG_CPU_RM7000 is not set
104# CONFIG_CPU_RM9000 is not set 106# CONFIG_CPU_RM9000 is not set
105# CONFIG_CPU_SB1 is not set 107# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_VR41XX=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
106 112
107# 113#
108# Kernel type 114# Kernel type
109# 115#
110# CONFIG_32BIT is not set 116CONFIG_32BIT=y
111# CONFIG_64BIT is not set 117# CONFIG_64BIT is not set
112CONFIG_PAGE_SIZE_4KB=y 118CONFIG_PAGE_SIZE_4KB=y
113# CONFIG_PAGE_SIZE_8KB is not set 119# CONFIG_PAGE_SIZE_8KB is not set
114# CONFIG_PAGE_SIZE_16KB is not set 120# CONFIG_PAGE_SIZE_16KB is not set
115# CONFIG_PAGE_SIZE_64KB is not set 121# CONFIG_PAGE_SIZE_64KB is not set
116# CONFIG_MIPS_MT is not set 122# CONFIG_MIPS_MT is not set
117CONFIG_CPU_HAS_LLSC=y
118CONFIG_CPU_HAS_SYNC=y 123CONFIG_CPU_HAS_SYNC=y
119CONFIG_GENERIC_HARDIRQS=y 124CONFIG_GENERIC_HARDIRQS=y
120CONFIG_GENERIC_IRQ_PROBE=y 125CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,7 +140,6 @@ CONFIG_PREEMPT_NONE=y
135# Code maturity level options 140# Code maturity level options
136# 141#
137CONFIG_EXPERIMENTAL=y 142CONFIG_EXPERIMENTAL=y
138CONFIG_CLEAN_COMPILE=y
139CONFIG_BROKEN_ON_SMP=y 143CONFIG_BROKEN_ON_SMP=y
140CONFIG_INIT_ENV_ARG_LIMIT=32 144CONFIG_INIT_ENV_ARG_LIMIT=32
141 145
@@ -151,6 +155,7 @@ CONFIG_SYSVIPC=y
151CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 156# CONFIG_AUDIT is not set
153# CONFIG_IKCONFIG is not set 157# CONFIG_IKCONFIG is not set
158CONFIG_RELAY=y
154CONFIG_INITRAMFS_SOURCE="" 159CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 160# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
156CONFIG_EMBEDDED=y 161CONFIG_EMBEDDED=y
@@ -164,10 +169,6 @@ CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 169CONFIG_FUTEX=y
165CONFIG_EPOLL=y 170CONFIG_EPOLL=y
166CONFIG_SHMEM=y 171CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y 172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
@@ -179,7 +180,6 @@ CONFIG_BASE_SMALL=0
179CONFIG_MODULES=y 180CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -187,6 +187,9 @@ CONFIG_KMOD=y
187# 187#
188# Block layer 188# Block layer
189# 189#
190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
190 193
191# 194#
192# IO Schedulers 195# IO Schedulers
@@ -206,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
206# 209#
207CONFIG_HW_HAS_PCI=y 210CONFIG_HW_HAS_PCI=y
208CONFIG_PCI=y 211CONFIG_PCI=y
209CONFIG_PCI_LEGACY_PROC=y
210CONFIG_MMU=y 212CONFIG_MMU=y
211 213
212# 214#
@@ -225,6 +227,7 @@ CONFIG_PCMCIA_IOCTL=y
225# CONFIG_YENTA is not set 227# CONFIG_YENTA is not set
226# CONFIG_PD6729 is not set 228# CONFIG_PD6729 is not set
227# CONFIG_I82092 is not set 229# CONFIG_I82092 is not set
230# CONFIG_PCMCIA_VRC4173 is not set
228 231
229# 232#
230# PCI Hotplug Support 233# PCI Hotplug Support
@@ -236,6 +239,7 @@ CONFIG_PCMCIA_IOCTL=y
236# 239#
237CONFIG_BINFMT_ELF=y 240CONFIG_BINFMT_ELF=y
238# CONFIG_BINFMT_MISC is not set 241# CONFIG_BINFMT_MISC is not set
242CONFIG_TRAD_SIGNALS=y
239 243
240# 244#
241# Networking 245# Networking
@@ -245,6 +249,7 @@ CONFIG_NET=y
245# 249#
246# Networking options 250# Networking options
247# 251#
252# CONFIG_NETDEBUG is not set
248CONFIG_PACKET=y 253CONFIG_PACKET=y
249CONFIG_PACKET_MMAP=y 254CONFIG_PACKET_MMAP=y
250CONFIG_UNIX=y 255CONFIG_UNIX=y
@@ -264,12 +269,15 @@ CONFIG_IP_FIB_HASH=y
264# CONFIG_INET_AH is not set 269# CONFIG_INET_AH is not set
265# CONFIG_INET_ESP is not set 270# CONFIG_INET_ESP is not set
266# CONFIG_INET_IPCOMP is not set 271# CONFIG_INET_IPCOMP is not set
267CONFIG_INET_TUNNEL=m 272# CONFIG_INET_XFRM_TUNNEL is not set
273# CONFIG_INET_TUNNEL is not set
268CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
269CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
270# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
271CONFIG_TCP_CONG_BIC=y 277CONFIG_TCP_CONG_BIC=y
272# CONFIG_IPV6 is not set 278# CONFIG_IPV6 is not set
279# CONFIG_INET6_XFRM_TUNNEL is not set
280# CONFIG_INET6_TUNNEL is not set
273# CONFIG_NETFILTER is not set 281# CONFIG_NETFILTER is not set
274 282
275# 283#
@@ -281,6 +289,11 @@ CONFIG_TCP_CONG_BIC=y
281# SCTP Configuration (EXPERIMENTAL) 289# SCTP Configuration (EXPERIMENTAL)
282# 290#
283# CONFIG_IP_SCTP is not set 291# CONFIG_IP_SCTP is not set
292
293#
294# TIPC Configuration (EXPERIMENTAL)
295#
296# CONFIG_TIPC is not set
284# CONFIG_ATM is not set 297# CONFIG_ATM is not set
285# CONFIG_BRIDGE is not set 298# CONFIG_BRIDGE is not set
286# CONFIG_VLAN_8021Q is not set 299# CONFIG_VLAN_8021Q is not set
@@ -290,11 +303,6 @@ CONFIG_TCP_CONG_BIC=y
290# CONFIG_ATALK is not set 303# CONFIG_ATALK is not set
291# CONFIG_X25 is not set 304# CONFIG_X25 is not set
292# CONFIG_LAPB is not set 305# CONFIG_LAPB is not set
293
294#
295# TIPC Configuration (EXPERIMENTAL)
296#
297# CONFIG_TIPC is not set
298# CONFIG_NET_DIVERT is not set 306# CONFIG_NET_DIVERT is not set
299# CONFIG_ECONET is not set 307# CONFIG_ECONET is not set
300# CONFIG_WAN_ROUTER is not set 308# CONFIG_WAN_ROUTER is not set
@@ -316,6 +324,9 @@ CONFIG_IEEE80211=m
316CONFIG_IEEE80211_CRYPT_WEP=m 324CONFIG_IEEE80211_CRYPT_WEP=m
317CONFIG_IEEE80211_CRYPT_CCMP=m 325CONFIG_IEEE80211_CRYPT_CCMP=m
318CONFIG_IEEE80211_CRYPT_TKIP=m 326CONFIG_IEEE80211_CRYPT_TKIP=m
327CONFIG_IEEE80211_SOFTMAC=m
328# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
329CONFIG_WIRELESS_EXT=y
319 330
320# 331#
321# Device Drivers 332# Device Drivers
@@ -360,7 +371,7 @@ CONFIG_CONNECTOR=m
360# CONFIG_BLK_DEV_SX8 is not set 371# CONFIG_BLK_DEV_SX8 is not set
361# CONFIG_BLK_DEV_UB is not set 372# CONFIG_BLK_DEV_UB is not set
362# CONFIG_BLK_DEV_RAM is not set 373# CONFIG_BLK_DEV_RAM is not set
363CONFIG_BLK_DEV_RAM_COUNT=16 374# CONFIG_BLK_DEV_INITRD is not set
364# CONFIG_CDROM_PKTCDVD is not set 375# CONFIG_CDROM_PKTCDVD is not set
365CONFIG_ATA_OVER_ETH=m 376CONFIG_ATA_OVER_ETH=m
366 377
@@ -475,6 +486,7 @@ CONFIG_MII=m
475# Wireless LAN (non-hamradio) 486# Wireless LAN (non-hamradio)
476# 487#
477CONFIG_NET_RADIO=y 488CONFIG_NET_RADIO=y
489# CONFIG_NET_WIRELESS_RTNETLINK is not set
478 490
479# 491#
480# Obsolete Wireless cards support (pre-802.11) 492# Obsolete Wireless cards support (pre-802.11)
@@ -513,6 +525,7 @@ CONFIG_PCMCIA_HERMES=m
513# 525#
514# CONFIG_PRISM54 is not set 526# CONFIG_PRISM54 is not set
515# CONFIG_HOSTAP is not set 527# CONFIG_HOSTAP is not set
528# CONFIG_BCM43XX is not set
516CONFIG_NET_WIRELESS=y 529CONFIG_NET_WIRELESS=y
517 530
518# 531#
@@ -604,6 +617,8 @@ CONFIG_HW_CONSOLE=y
604# 617#
605# Non-8250 serial port support 618# Non-8250 serial port support
606# 619#
620# CONFIG_SERIAL_VR41XX is not set
621# CONFIG_SERIAL_JSM is not set
607CONFIG_UNIX98_PTYS=y 622CONFIG_UNIX98_PTYS=y
608CONFIG_LEGACY_PTYS=y 623CONFIG_LEGACY_PTYS=y
609CONFIG_LEGACY_PTY_COUNT=256 624CONFIG_LEGACY_PTY_COUNT=256
@@ -634,6 +649,7 @@ CONFIG_LEGACY_PTY_COUNT=256
634# CONFIG_SYNCLINK_CS is not set 649# CONFIG_SYNCLINK_CS is not set
635# CONFIG_CARDMAN_4000 is not set 650# CONFIG_CARDMAN_4000 is not set
636# CONFIG_CARDMAN_4040 is not set 651# CONFIG_CARDMAN_4040 is not set
652# CONFIG_GPIO_VR41XX is not set
637# CONFIG_RAW_DRIVER is not set 653# CONFIG_RAW_DRIVER is not set
638 654
639# 655#
@@ -669,10 +685,6 @@ CONFIG_LEGACY_PTY_COUNT=256
669# 685#
670 686
671# 687#
672# Multimedia Capabilities Port drivers
673#
674
675#
676# Multimedia devices 688# Multimedia devices
677# 689#
678# CONFIG_VIDEO_DEV is not set 690# CONFIG_VIDEO_DEV is not set
@@ -681,6 +693,7 @@ CONFIG_LEGACY_PTY_COUNT=256
681# Digital Video Broadcasting Devices 693# Digital Video Broadcasting Devices
682# 694#
683# CONFIG_DVB is not set 695# CONFIG_DVB is not set
696# CONFIG_USB_DABUSB is not set
684 697
685# 698#
686# Graphics support 699# Graphics support
@@ -703,6 +716,7 @@ CONFIG_DUMMY_CONSOLE=y
703# 716#
704CONFIG_USB_ARCH_HAS_HCD=y 717CONFIG_USB_ARCH_HAS_HCD=y
705CONFIG_USB_ARCH_HAS_OHCI=y 718CONFIG_USB_ARCH_HAS_OHCI=y
719CONFIG_USB_ARCH_HAS_EHCI=y
706CONFIG_USB=m 720CONFIG_USB=m
707# CONFIG_USB_DEBUG is not set 721# CONFIG_USB_DEBUG is not set
708 722
@@ -756,9 +770,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
756# CONFIG_USB_ACECAD is not set 770# CONFIG_USB_ACECAD is not set
757# CONFIG_USB_KBTAB is not set 771# CONFIG_USB_KBTAB is not set
758# CONFIG_USB_POWERMATE is not set 772# CONFIG_USB_POWERMATE is not set
759# CONFIG_USB_MTOUCH is not set 773# CONFIG_USB_TOUCHSCREEN is not set
760# CONFIG_USB_ITMTOUCH is not set
761# CONFIG_USB_EGALAX is not set
762# CONFIG_USB_YEALINK is not set 774# CONFIG_USB_YEALINK is not set
763# CONFIG_USB_XPAD is not set 775# CONFIG_USB_XPAD is not set
764# CONFIG_USB_ATI_REMOTE is not set 776# CONFIG_USB_ATI_REMOTE is not set
@@ -772,15 +784,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
772# CONFIG_USB_MDC800 is not set 784# CONFIG_USB_MDC800 is not set
773 785
774# 786#
775# USB Multimedia devices
776#
777# CONFIG_USB_DABUSB is not set
778
779#
780# Video4Linux support is needed for USB Multimedia device support
781#
782
783#
784# USB Network Adapters 787# USB Network Adapters
785# 788#
786# CONFIG_USB_CATC is not set 789# CONFIG_USB_CATC is not set
@@ -832,13 +835,31 @@ CONFIG_USB_PEGASUS=m
832# CONFIG_MMC is not set 835# CONFIG_MMC is not set
833 836
834# 837#
838# LED devices
839#
840# CONFIG_NEW_LEDS is not set
841
842#
843# LED drivers
844#
845
846#
847# LED Triggers
848#
849
850#
835# InfiniBand support 851# InfiniBand support
836# 852#
837# CONFIG_INFINIBAND is not set 853# CONFIG_INFINIBAND is not set
838 854
839# 855#
840# SN Devices 856# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
857#
858
859#
860# Real Time Clock
841# 861#
862# CONFIG_RTC_CLASS is not set
842 863
843# 864#
844# File systems 865# File systems
@@ -883,7 +904,6 @@ CONFIG_SYSFS=y
883# CONFIG_TMPFS is not set 904# CONFIG_TMPFS is not set
884# CONFIG_HUGETLB_PAGE is not set 905# CONFIG_HUGETLB_PAGE is not set
885CONFIG_RAMFS=y 906CONFIG_RAMFS=y
886CONFIG_RELAYFS_FS=m
887# CONFIG_CONFIGFS_FS is not set 907# CONFIG_CONFIGFS_FS is not set
888 908
889# 909#
@@ -946,6 +966,7 @@ CONFIG_MSDOS_PARTITION=y
946# CONFIG_MAGIC_SYSRQ is not set 966# CONFIG_MAGIC_SYSRQ is not set
947# CONFIG_DEBUG_KERNEL is not set 967# CONFIG_DEBUG_KERNEL is not set
948CONFIG_LOG_BUF_SHIFT=14 968CONFIG_LOG_BUF_SHIFT=14
969# CONFIG_DEBUG_FS is not set
949CONFIG_CROSSCOMPILE=y 970CONFIG_CROSSCOMPILE=y
950CONFIG_CMDLINE="mem=32M console=ttyVR0,19200" 971CONFIG_CMDLINE="mem=32M console=ttyVR0,19200"
951 972
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index 925d8adef88d..1ce4310fd92a 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:18 2006 4# Mon Apr 24 14:51:10 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -120,7 +122,6 @@ CONFIG_RM7000_CPU_SCACHE=y
120CONFIG_CPU_HAS_PREFETCH=y 122CONFIG_CPU_HAS_PREFETCH=y
121# CONFIG_MIPS_MT is not set 123# CONFIG_MIPS_MT is not set
122# CONFIG_64BIT_PHYS_ADDR is not set 124# CONFIG_64BIT_PHYS_ADDR is not set
123# CONFIG_CPU_ADVANCED is not set
124CONFIG_CPU_HAS_LLSC=y 125CONFIG_CPU_HAS_LLSC=y
125CONFIG_CPU_HAS_SYNC=y 126CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 127CONFIG_GENERIC_HARDIRQS=y
@@ -144,7 +145,6 @@ CONFIG_PREEMPT_NONE=y
144# Code maturity level options 145# Code maturity level options
145# 146#
146CONFIG_EXPERIMENTAL=y 147CONFIG_EXPERIMENTAL=y
147CONFIG_CLEAN_COMPILE=y
148CONFIG_BROKEN_ON_SMP=y 148CONFIG_BROKEN_ON_SMP=y
149CONFIG_INIT_ENV_ARG_LIMIT=32 149CONFIG_INIT_ENV_ARG_LIMIT=32
150 150
@@ -161,6 +161,7 @@ CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set 161# CONFIG_AUDIT is not set
162CONFIG_IKCONFIG=y 162CONFIG_IKCONFIG=y
163CONFIG_IKCONFIG_PROC=y 163CONFIG_IKCONFIG_PROC=y
164CONFIG_RELAY=y
164CONFIG_INITRAMFS_SOURCE="" 165CONFIG_INITRAMFS_SOURCE=""
165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_EMBEDDED=y 167CONFIG_EMBEDDED=y
@@ -174,10 +175,6 @@ CONFIG_BASE_FULL=y
174CONFIG_FUTEX=y 175CONFIG_FUTEX=y
175CONFIG_EPOLL=y 176CONFIG_EPOLL=y
176CONFIG_SHMEM=y 177CONFIG_SHMEM=y
177CONFIG_CC_ALIGN_FUNCTIONS=0
178CONFIG_CC_ALIGN_LABELS=0
179CONFIG_CC_ALIGN_LOOPS=0
180CONFIG_CC_ALIGN_JUMPS=0
181CONFIG_SLAB=y 178CONFIG_SLAB=y
182# CONFIG_TINY_SHMEM is not set 179# CONFIG_TINY_SHMEM is not set
183CONFIG_BASE_SMALL=0 180CONFIG_BASE_SMALL=0
@@ -189,7 +186,6 @@ CONFIG_BASE_SMALL=0
189CONFIG_MODULES=y 186CONFIG_MODULES=y
190CONFIG_MODULE_UNLOAD=y 187CONFIG_MODULE_UNLOAD=y
191# CONFIG_MODULE_FORCE_UNLOAD is not set 188# CONFIG_MODULE_FORCE_UNLOAD is not set
192CONFIG_OBSOLETE_MODPARM=y
193CONFIG_MODVERSIONS=y 189CONFIG_MODVERSIONS=y
194# CONFIG_MODULE_SRCVERSION_ALL is not set 190# CONFIG_MODULE_SRCVERSION_ALL is not set
195CONFIG_KMOD=y 191CONFIG_KMOD=y
@@ -198,6 +194,8 @@ CONFIG_KMOD=y
198# Block layer 194# Block layer
199# 195#
200# CONFIG_LBD is not set 196# CONFIG_LBD is not set
197# CONFIG_BLK_DEV_IO_TRACE is not set
198# CONFIG_LSF is not set
201 199
202# 200#
203# IO Schedulers 201# IO Schedulers
@@ -217,7 +215,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
217# 215#
218CONFIG_HW_HAS_PCI=y 216CONFIG_HW_HAS_PCI=y
219CONFIG_PCI=y 217CONFIG_PCI=y
220CONFIG_PCI_LEGACY_PROC=y
221CONFIG_MMU=y 218CONFIG_MMU=y
222 219
223# 220#
@@ -245,6 +242,7 @@ CONFIG_NET=y
245# 242#
246# Networking options 243# Networking options
247# 244#
245# CONFIG_NETDEBUG is not set
248CONFIG_PACKET=y 246CONFIG_PACKET=y
249# CONFIG_PACKET_MMAP is not set 247# CONFIG_PACKET_MMAP is not set
250CONFIG_UNIX=y 248CONFIG_UNIX=y
@@ -266,6 +264,7 @@ CONFIG_IP_PNP_BOOTP=y
266# CONFIG_INET_AH is not set 264# CONFIG_INET_AH is not set
267# CONFIG_INET_ESP is not set 265# CONFIG_INET_ESP is not set
268# CONFIG_INET_IPCOMP is not set 266# CONFIG_INET_IPCOMP is not set
267# CONFIG_INET_XFRM_TUNNEL is not set
269# CONFIG_INET_TUNNEL is not set 268# CONFIG_INET_TUNNEL is not set
270CONFIG_INET_DIAG=y 269CONFIG_INET_DIAG=y
271CONFIG_INET_TCP_DIAG=y 270CONFIG_INET_TCP_DIAG=y
@@ -278,9 +277,12 @@ CONFIG_TCP_CONG_BIC=y
278# CONFIG_IP_VS is not set 277# CONFIG_IP_VS is not set
279CONFIG_IPV6=m 278CONFIG_IPV6=m
280# CONFIG_IPV6_PRIVACY is not set 279# CONFIG_IPV6_PRIVACY is not set
280CONFIG_IPV6_ROUTER_PREF=y
281CONFIG_IPV6_ROUTE_INFO=y
281# CONFIG_INET6_AH is not set 282# CONFIG_INET6_AH is not set
282# CONFIG_INET6_ESP is not set 283# CONFIG_INET6_ESP is not set
283# CONFIG_INET6_IPCOMP is not set 284# CONFIG_INET6_IPCOMP is not set
285# CONFIG_INET6_XFRM_TUNNEL is not set
284# CONFIG_INET6_TUNNEL is not set 286# CONFIG_INET6_TUNNEL is not set
285# CONFIG_IPV6_TUNNEL is not set 287# CONFIG_IPV6_TUNNEL is not set
286CONFIG_NETFILTER=y 288CONFIG_NETFILTER=y
@@ -299,10 +301,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
299CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 301CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
300CONFIG_NETFILTER_XT_MATCH_COMMENT=m 302CONFIG_NETFILTER_XT_MATCH_COMMENT=m
301CONFIG_NETFILTER_XT_MATCH_DCCP=m 303CONFIG_NETFILTER_XT_MATCH_DCCP=m
304CONFIG_NETFILTER_XT_MATCH_ESP=m
302CONFIG_NETFILTER_XT_MATCH_LENGTH=m 305CONFIG_NETFILTER_XT_MATCH_LENGTH=m
303CONFIG_NETFILTER_XT_MATCH_LIMIT=m 306CONFIG_NETFILTER_XT_MATCH_LIMIT=m
304CONFIG_NETFILTER_XT_MATCH_MAC=m 307CONFIG_NETFILTER_XT_MATCH_MAC=m
305CONFIG_NETFILTER_XT_MATCH_MARK=m 308CONFIG_NETFILTER_XT_MATCH_MARK=m
309CONFIG_NETFILTER_XT_MATCH_POLICY=m
310CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
306CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 311CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
307CONFIG_NETFILTER_XT_MATCH_REALM=m 312CONFIG_NETFILTER_XT_MATCH_REALM=m
308CONFIG_NETFILTER_XT_MATCH_SCTP=m 313CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -332,6 +337,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
332# SCTP Configuration (EXPERIMENTAL) 337# SCTP Configuration (EXPERIMENTAL)
333# 338#
334# CONFIG_IP_SCTP is not set 339# CONFIG_IP_SCTP is not set
340
341#
342# TIPC Configuration (EXPERIMENTAL)
343#
344# CONFIG_TIPC is not set
335# CONFIG_ATM is not set 345# CONFIG_ATM is not set
336# CONFIG_BRIDGE is not set 346# CONFIG_BRIDGE is not set
337# CONFIG_VLAN_8021Q is not set 347# CONFIG_VLAN_8021Q is not set
@@ -341,11 +351,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
341# CONFIG_ATALK is not set 351# CONFIG_ATALK is not set
342# CONFIG_X25 is not set 352# CONFIG_X25 is not set
343# CONFIG_LAPB is not set 353# CONFIG_LAPB is not set
344
345#
346# TIPC Configuration (EXPERIMENTAL)
347#
348# CONFIG_TIPC is not set
349# CONFIG_NET_DIVERT is not set 354# CONFIG_NET_DIVERT is not set
350# CONFIG_ECONET is not set 355# CONFIG_ECONET is not set
351# CONFIG_WAN_ROUTER is not set 356# CONFIG_WAN_ROUTER is not set
@@ -367,6 +372,9 @@ CONFIG_IEEE80211=m
367# CONFIG_IEEE80211_DEBUG is not set 372# CONFIG_IEEE80211_DEBUG is not set
368CONFIG_IEEE80211_CRYPT_WEP=m 373CONFIG_IEEE80211_CRYPT_WEP=m
369CONFIG_IEEE80211_CRYPT_CCMP=m 374CONFIG_IEEE80211_CRYPT_CCMP=m
375CONFIG_IEEE80211_SOFTMAC=m
376# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
377CONFIG_WIRELESS_EXT=y
370 378
371# 379#
372# Device Drivers 380# Device Drivers
@@ -411,7 +419,7 @@ CONFIG_BLK_DEV_LOOP=y
411# CONFIG_BLK_DEV_NBD is not set 419# CONFIG_BLK_DEV_NBD is not set
412# CONFIG_BLK_DEV_SX8 is not set 420# CONFIG_BLK_DEV_SX8 is not set
413# CONFIG_BLK_DEV_RAM is not set 421# CONFIG_BLK_DEV_RAM is not set
414CONFIG_BLK_DEV_RAM_COUNT=16 422# CONFIG_BLK_DEV_INITRD is not set
415# CONFIG_CDROM_PKTCDVD is not set 423# CONFIG_CDROM_PKTCDVD is not set
416CONFIG_ATA_OVER_ETH=m 424CONFIG_ATA_OVER_ETH=m
417 425
@@ -475,7 +483,6 @@ CONFIG_ISCSI_TCP=m
475# CONFIG_SCSI_INIA100 is not set 483# CONFIG_SCSI_INIA100 is not set
476# CONFIG_SCSI_SYM53C8XX_2 is not set 484# CONFIG_SCSI_SYM53C8XX_2 is not set
477# CONFIG_SCSI_IPR is not set 485# CONFIG_SCSI_IPR is not set
478# CONFIG_SCSI_QLOGIC_FC is not set
479# CONFIG_SCSI_QLOGIC_1280 is not set 486# CONFIG_SCSI_QLOGIC_1280 is not set
480# CONFIG_SCSI_QLA_FC is not set 487# CONFIG_SCSI_QLA_FC is not set
481# CONFIG_SCSI_LPFC is not set 488# CONFIG_SCSI_LPFC is not set
@@ -690,6 +697,7 @@ CONFIG_HW_CONSOLE=y
690# 697#
691CONFIG_SERIAL_8250=y 698CONFIG_SERIAL_8250=y
692CONFIG_SERIAL_8250_CONSOLE=y 699CONFIG_SERIAL_8250_CONSOLE=y
700CONFIG_SERIAL_8250_PCI=y
693CONFIG_SERIAL_8250_NR_UARTS=4 701CONFIG_SERIAL_8250_NR_UARTS=4
694CONFIG_SERIAL_8250_RUNTIME_UARTS=4 702CONFIG_SERIAL_8250_RUNTIME_UARTS=4
695# CONFIG_SERIAL_8250_EXTENDED is not set 703# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -699,6 +707,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
699# 707#
700CONFIG_SERIAL_CORE=y 708CONFIG_SERIAL_CORE=y
701CONFIG_SERIAL_CORE_CONSOLE=y 709CONFIG_SERIAL_CORE_CONSOLE=y
710# CONFIG_SERIAL_JSM is not set
702CONFIG_UNIX98_PTYS=y 711CONFIG_UNIX98_PTYS=y
703CONFIG_LEGACY_PTYS=y 712CONFIG_LEGACY_PTYS=y
704CONFIG_LEGACY_PTY_COUNT=256 713CONFIG_LEGACY_PTY_COUNT=256
@@ -756,10 +765,6 @@ CONFIG_RTC=y
756# 765#
757 766
758# 767#
759# Multimedia Capabilities Port drivers
760#
761
762#
763# Multimedia devices 768# Multimedia devices
764# 769#
765# CONFIG_VIDEO_DEV is not set 770# CONFIG_VIDEO_DEV is not set
@@ -777,6 +782,7 @@ CONFIG_FB=y
777# CONFIG_FB_CFB_COPYAREA is not set 782# CONFIG_FB_CFB_COPYAREA is not set
778# CONFIG_FB_CFB_IMAGEBLIT is not set 783# CONFIG_FB_CFB_IMAGEBLIT is not set
779# CONFIG_FB_MACMODES is not set 784# CONFIG_FB_MACMODES is not set
785CONFIG_FB_FIRMWARE_EDID=y
780CONFIG_FB_MODE_HELPERS=y 786CONFIG_FB_MODE_HELPERS=y
781# CONFIG_FB_TILEBLITTING is not set 787# CONFIG_FB_TILEBLITTING is not set
782# CONFIG_FB_CIRRUS is not set 788# CONFIG_FB_CIRRUS is not set
@@ -788,7 +794,6 @@ CONFIG_FB_MODE_HELPERS=y
788# CONFIG_FB_NVIDIA is not set 794# CONFIG_FB_NVIDIA is not set
789# CONFIG_FB_RIVA is not set 795# CONFIG_FB_RIVA is not set
790# CONFIG_FB_MATROX is not set 796# CONFIG_FB_MATROX is not set
791# CONFIG_FB_RADEON_OLD is not set
792# CONFIG_FB_RADEON is not set 797# CONFIG_FB_RADEON is not set
793# CONFIG_FB_ATY128 is not set 798# CONFIG_FB_ATY128 is not set
794# CONFIG_FB_ATY is not set 799# CONFIG_FB_ATY is not set
@@ -832,6 +837,7 @@ CONFIG_LOGO_LINUX_CLUT224=y
832# 837#
833CONFIG_USB_ARCH_HAS_HCD=y 838CONFIG_USB_ARCH_HAS_HCD=y
834CONFIG_USB_ARCH_HAS_OHCI=y 839CONFIG_USB_ARCH_HAS_OHCI=y
840CONFIG_USB_ARCH_HAS_EHCI=y
835# CONFIG_USB is not set 841# CONFIG_USB is not set
836 842
837# 843#
@@ -849,13 +855,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
849# CONFIG_MMC is not set 855# CONFIG_MMC is not set
850 856
851# 857#
858# LED devices
859#
860# CONFIG_NEW_LEDS is not set
861
862#
863# LED drivers
864#
865
866#
867# LED Triggers
868#
869
870#
852# InfiniBand support 871# InfiniBand support
853# 872#
854# CONFIG_INFINIBAND is not set 873# CONFIG_INFINIBAND is not set
855 874
856# 875#
857# SN Devices 876# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
877#
878
879#
880# Real Time Clock
858# 881#
882# CONFIG_RTC_CLASS is not set
859 883
860# 884#
861# File systems 885# File systems
@@ -914,7 +938,6 @@ CONFIG_SYSFS=y
914CONFIG_TMPFS=y 938CONFIG_TMPFS=y
915# CONFIG_HUGETLB_PAGE is not set 939# CONFIG_HUGETLB_PAGE is not set
916CONFIG_RAMFS=y 940CONFIG_RAMFS=y
917CONFIG_RELAYFS_FS=m
918# CONFIG_CONFIGFS_FS is not set 941# CONFIG_CONFIGFS_FS is not set
919 942
920# 943#
@@ -1025,6 +1048,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1025# CONFIG_MAGIC_SYSRQ is not set 1048# CONFIG_MAGIC_SYSRQ is not set
1026# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1027CONFIG_LOG_BUF_SHIFT=14 1050CONFIG_LOG_BUF_SHIFT=14
1051# CONFIG_DEBUG_FS is not set
1028CONFIG_CROSSCOMPILE=y 1052CONFIG_CROSSCOMPILE=y
1029CONFIG_CMDLINE="ip=any root=nfs" 1053CONFIG_CMDLINE="ip=any root=nfs"
1030 1054
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index ee1cf9b9eb9a..8a6aa5012f89 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:19 2006 4# Mon Apr 24 14:51:10 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -139,7 +141,6 @@ CONFIG_PREEMPT_NONE=y
139# Code maturity level options 141# Code maturity level options
140# 142#
141CONFIG_EXPERIMENTAL=y 143CONFIG_EXPERIMENTAL=y
142CONFIG_CLEAN_COMPILE=y
143CONFIG_BROKEN_ON_SMP=y 144CONFIG_BROKEN_ON_SMP=y
144CONFIG_INIT_ENV_ARG_LIMIT=32 145CONFIG_INIT_ENV_ARG_LIMIT=32
145 146
@@ -155,6 +156,7 @@ CONFIG_SYSVIPC=y
155CONFIG_SYSCTL=y 156CONFIG_SYSCTL=y
156# CONFIG_AUDIT is not set 157# CONFIG_AUDIT is not set
157# CONFIG_IKCONFIG is not set 158# CONFIG_IKCONFIG is not set
159CONFIG_RELAY=y
158CONFIG_INITRAMFS_SOURCE="" 160CONFIG_INITRAMFS_SOURCE=""
159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 162CONFIG_EMBEDDED=y
@@ -168,10 +170,6 @@ CONFIG_BASE_FULL=y
168CONFIG_FUTEX=y 170CONFIG_FUTEX=y
169CONFIG_EPOLL=y 171CONFIG_EPOLL=y
170CONFIG_SHMEM=y 172CONFIG_SHMEM=y
171CONFIG_CC_ALIGN_FUNCTIONS=0
172CONFIG_CC_ALIGN_LABELS=0
173CONFIG_CC_ALIGN_LOOPS=0
174CONFIG_CC_ALIGN_JUMPS=0
175CONFIG_SLAB=y 173CONFIG_SLAB=y
176# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
177CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
@@ -185,6 +183,7 @@ CONFIG_BASE_SMALL=0
185# 183#
186# Block layer 184# Block layer
187# 185#
186# CONFIG_BLK_DEV_IO_TRACE is not set
188 187
189# 188#
190# IO Schedulers 189# IO Schedulers
@@ -204,7 +203,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
204# 203#
205CONFIG_HW_HAS_PCI=y 204CONFIG_HW_HAS_PCI=y
206CONFIG_PCI=y 205CONFIG_PCI=y
207CONFIG_PCI_LEGACY_PROC=y
208CONFIG_MMU=y 206CONFIG_MMU=y
209 207
210# 208#
@@ -222,6 +220,7 @@ CONFIG_MMU=y
222# 220#
223CONFIG_BINFMT_ELF=y 221CONFIG_BINFMT_ELF=y
224# CONFIG_BINFMT_MISC is not set 222# CONFIG_BINFMT_MISC is not set
223# CONFIG_BUILD_ELF64 is not set
225CONFIG_MIPS32_COMPAT=y 224CONFIG_MIPS32_COMPAT=y
226CONFIG_COMPAT=y 225CONFIG_COMPAT=y
227CONFIG_MIPS32_O32=y 226CONFIG_MIPS32_O32=y
@@ -236,6 +235,7 @@ CONFIG_NET=y
236# 235#
237# Networking options 236# Networking options
238# 237#
238# CONFIG_NETDEBUG is not set
239# CONFIG_PACKET is not set 239# CONFIG_PACKET is not set
240CONFIG_UNIX=y 240CONFIG_UNIX=y
241CONFIG_XFRM=y 241CONFIG_XFRM=y
@@ -256,12 +256,15 @@ CONFIG_IP_PNP_DHCP=y
256# CONFIG_INET_AH is not set 256# CONFIG_INET_AH is not set
257# CONFIG_INET_ESP is not set 257# CONFIG_INET_ESP is not set
258# CONFIG_INET_IPCOMP is not set 258# CONFIG_INET_IPCOMP is not set
259CONFIG_INET_TUNNEL=y 259# CONFIG_INET_XFRM_TUNNEL is not set
260# CONFIG_INET_TUNNEL is not set
260CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
263CONFIG_TCP_CONG_BIC=y 264CONFIG_TCP_CONG_BIC=y
264# CONFIG_IPV6 is not set 265# CONFIG_IPV6 is not set
266# CONFIG_INET6_XFRM_TUNNEL is not set
267# CONFIG_INET6_TUNNEL is not set
265# CONFIG_NETFILTER is not set 268# CONFIG_NETFILTER is not set
266 269
267# 270#
@@ -273,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y
273# SCTP Configuration (EXPERIMENTAL) 276# SCTP Configuration (EXPERIMENTAL)
274# 277#
275# CONFIG_IP_SCTP is not set 278# CONFIG_IP_SCTP is not set
279
280#
281# TIPC Configuration (EXPERIMENTAL)
282#
283# CONFIG_TIPC is not set
276# CONFIG_ATM is not set 284# CONFIG_ATM is not set
277# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
278# CONFIG_VLAN_8021Q is not set 286# CONFIG_VLAN_8021Q is not set
@@ -282,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y
282# CONFIG_ATALK is not set 290# CONFIG_ATALK is not set
283# CONFIG_X25 is not set 291# CONFIG_X25 is not set
284# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
285
286#
287# TIPC Configuration (EXPERIMENTAL)
288#
289# CONFIG_TIPC is not set
290# CONFIG_NET_DIVERT is not set 293# CONFIG_NET_DIVERT is not set
291# CONFIG_ECONET is not set 294# CONFIG_ECONET is not set
292# CONFIG_WAN_ROUTER is not set 295# CONFIG_WAN_ROUTER is not set
@@ -307,6 +310,9 @@ CONFIG_IEEE80211=y
307# CONFIG_IEEE80211_DEBUG is not set 310# CONFIG_IEEE80211_DEBUG is not set
308CONFIG_IEEE80211_CRYPT_WEP=y 311CONFIG_IEEE80211_CRYPT_WEP=y
309CONFIG_IEEE80211_CRYPT_CCMP=y 312CONFIG_IEEE80211_CRYPT_CCMP=y
313CONFIG_IEEE80211_SOFTMAC=y
314# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
315CONFIG_WIRELESS_EXT=y
310 316
311# 317#
312# Device Drivers 318# Device Drivers
@@ -351,7 +357,7 @@ CONFIG_PROC_EVENTS=y
351# CONFIG_BLK_DEV_NBD is not set 357# CONFIG_BLK_DEV_NBD is not set
352# CONFIG_BLK_DEV_SX8 is not set 358# CONFIG_BLK_DEV_SX8 is not set
353# CONFIG_BLK_DEV_RAM is not set 359# CONFIG_BLK_DEV_RAM is not set
354CONFIG_BLK_DEV_RAM_COUNT=16 360# CONFIG_BLK_DEV_INITRD is not set
355CONFIG_CDROM_PKTCDVD=y 361CONFIG_CDROM_PKTCDVD=y
356CONFIG_CDROM_PKTCDVD_BUFFERS=8 362CONFIG_CDROM_PKTCDVD_BUFFERS=8
357# CONFIG_CDROM_PKTCDVD_WCACHE is not set 363# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -542,6 +548,7 @@ CONFIG_HW_CONSOLE=y
542# 548#
543CONFIG_SERIAL_8250=y 549CONFIG_SERIAL_8250=y
544CONFIG_SERIAL_8250_CONSOLE=y 550CONFIG_SERIAL_8250_CONSOLE=y
551CONFIG_SERIAL_8250_PCI=y
545CONFIG_SERIAL_8250_NR_UARTS=4 552CONFIG_SERIAL_8250_NR_UARTS=4
546CONFIG_SERIAL_8250_RUNTIME_UARTS=4 553CONFIG_SERIAL_8250_RUNTIME_UARTS=4
547# CONFIG_SERIAL_8250_EXTENDED is not set 554# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -551,6 +558,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
551# 558#
552CONFIG_SERIAL_CORE=y 559CONFIG_SERIAL_CORE=y
553CONFIG_SERIAL_CORE_CONSOLE=y 560CONFIG_SERIAL_CORE_CONSOLE=y
561# CONFIG_SERIAL_JSM is not set
554CONFIG_UNIX98_PTYS=y 562CONFIG_UNIX98_PTYS=y
555CONFIG_LEGACY_PTYS=y 563CONFIG_LEGACY_PTYS=y
556CONFIG_LEGACY_PTY_COUNT=256 564CONFIG_LEGACY_PTY_COUNT=256
@@ -609,10 +617,6 @@ CONFIG_LEGACY_PTY_COUNT=256
609# 617#
610 618
611# 619#
612# Multimedia Capabilities Port drivers
613#
614
615#
616# Multimedia devices 620# Multimedia devices
617# 621#
618# CONFIG_VIDEO_DEV is not set 622# CONFIG_VIDEO_DEV is not set
@@ -643,6 +647,7 @@ CONFIG_DUMMY_CONSOLE=y
643# 647#
644CONFIG_USB_ARCH_HAS_HCD=y 648CONFIG_USB_ARCH_HAS_HCD=y
645CONFIG_USB_ARCH_HAS_OHCI=y 649CONFIG_USB_ARCH_HAS_OHCI=y
650CONFIG_USB_ARCH_HAS_EHCI=y
646# CONFIG_USB is not set 651# CONFIG_USB is not set
647 652
648# 653#
@@ -660,13 +665,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
660# CONFIG_MMC is not set 665# CONFIG_MMC is not set
661 666
662# 667#
668# LED devices
669#
670# CONFIG_NEW_LEDS is not set
671
672#
673# LED drivers
674#
675
676#
677# LED Triggers
678#
679
680#
663# InfiniBand support 681# InfiniBand support
664# 682#
665# CONFIG_INFINIBAND is not set 683# CONFIG_INFINIBAND is not set
666 684
667# 685#
668# SN Devices 686# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
687#
688
689#
690# Real Time Clock
669# 691#
692# CONFIG_RTC_CLASS is not set
670 693
671# 694#
672# File systems 695# File systems
@@ -711,7 +734,6 @@ CONFIG_SYSFS=y
711# CONFIG_TMPFS is not set 734# CONFIG_TMPFS is not set
712# CONFIG_HUGETLB_PAGE is not set 735# CONFIG_HUGETLB_PAGE is not set
713CONFIG_RAMFS=y 736CONFIG_RAMFS=y
714CONFIG_RELAYFS_FS=y
715# CONFIG_CONFIGFS_FS is not set 737# CONFIG_CONFIGFS_FS is not set
716 738
717# 739#
@@ -778,6 +800,8 @@ CONFIG_MSDOS_PARTITION=y
778# CONFIG_MAGIC_SYSRQ is not set 800# CONFIG_MAGIC_SYSRQ is not set
779# CONFIG_DEBUG_KERNEL is not set 801# CONFIG_DEBUG_KERNEL is not set
780CONFIG_LOG_BUF_SHIFT=14 802CONFIG_LOG_BUF_SHIFT=14
803# CONFIG_DEBUG_FS is not set
804# CONFIG_UNWIND_INFO is not set
781CONFIG_CROSSCOMPILE=y 805CONFIG_CROSSCOMPILE=y
782CONFIG_CMDLINE="" 806CONFIG_CMDLINE=""
783 807
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index d80ff278f2af..f9ee35eeb762 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:20 2006 4# Mon Apr 24 14:51:11 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -121,7 +123,6 @@ CONFIG_RM7000_CPU_SCACHE=y
121CONFIG_CPU_HAS_PREFETCH=y 123CONFIG_CPU_HAS_PREFETCH=y
122# CONFIG_MIPS_MT is not set 124# CONFIG_MIPS_MT is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 125# CONFIG_64BIT_PHYS_ADDR is not set
124# CONFIG_CPU_ADVANCED is not set
125CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
126CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
127CONFIG_GENERIC_HARDIRQS=y 128CONFIG_GENERIC_HARDIRQS=y
@@ -144,7 +145,6 @@ CONFIG_PREEMPT_NONE=y
144# Code maturity level options 145# Code maturity level options
145# 146#
146CONFIG_EXPERIMENTAL=y 147CONFIG_EXPERIMENTAL=y
147CONFIG_CLEAN_COMPILE=y
148CONFIG_BROKEN_ON_SMP=y 148CONFIG_BROKEN_ON_SMP=y
149CONFIG_INIT_ENV_ARG_LIMIT=32 149CONFIG_INIT_ENV_ARG_LIMIT=32
150 150
@@ -160,6 +160,7 @@ CONFIG_SYSVIPC=y
160CONFIG_SYSCTL=y 160CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set 161# CONFIG_AUDIT is not set
162# CONFIG_IKCONFIG is not set 162# CONFIG_IKCONFIG is not set
163CONFIG_RELAY=y
163CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
165CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
@@ -173,10 +174,6 @@ CONFIG_BASE_FULL=y
173CONFIG_FUTEX=y 174CONFIG_FUTEX=y
174CONFIG_EPOLL=y 175CONFIG_EPOLL=y
175CONFIG_SHMEM=y 176CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180CONFIG_SLAB=y 177CONFIG_SLAB=y
181# CONFIG_TINY_SHMEM is not set 178# CONFIG_TINY_SHMEM is not set
182CONFIG_BASE_SMALL=0 179CONFIG_BASE_SMALL=0
@@ -191,6 +188,8 @@ CONFIG_BASE_SMALL=0
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set 190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
194 193
195# 194#
196# IO Schedulers 195# IO Schedulers
@@ -236,6 +235,7 @@ CONFIG_NET=y
236# 235#
237# Networking options 236# Networking options
238# 237#
238# CONFIG_NETDEBUG is not set
239# CONFIG_PACKET is not set 239# CONFIG_PACKET is not set
240CONFIG_UNIX=y 240CONFIG_UNIX=y
241CONFIG_XFRM=y 241CONFIG_XFRM=y
@@ -256,12 +256,15 @@ CONFIG_IP_PNP_BOOTP=y
256# CONFIG_INET_AH is not set 256# CONFIG_INET_AH is not set
257# CONFIG_INET_ESP is not set 257# CONFIG_INET_ESP is not set
258# CONFIG_INET_IPCOMP is not set 258# CONFIG_INET_IPCOMP is not set
259CONFIG_INET_TUNNEL=y 259# CONFIG_INET_XFRM_TUNNEL is not set
260# CONFIG_INET_TUNNEL is not set
260CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
263CONFIG_TCP_CONG_BIC=y 264CONFIG_TCP_CONG_BIC=y
264# CONFIG_IPV6 is not set 265# CONFIG_IPV6 is not set
266# CONFIG_INET6_XFRM_TUNNEL is not set
267# CONFIG_INET6_TUNNEL is not set
265# CONFIG_NETFILTER is not set 268# CONFIG_NETFILTER is not set
266 269
267# 270#
@@ -273,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y
273# SCTP Configuration (EXPERIMENTAL) 276# SCTP Configuration (EXPERIMENTAL)
274# 277#
275# CONFIG_IP_SCTP is not set 278# CONFIG_IP_SCTP is not set
279
280#
281# TIPC Configuration (EXPERIMENTAL)
282#
283# CONFIG_TIPC is not set
276# CONFIG_ATM is not set 284# CONFIG_ATM is not set
277# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
278# CONFIG_VLAN_8021Q is not set 286# CONFIG_VLAN_8021Q is not set
@@ -282,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y
282# CONFIG_ATALK is not set 290# CONFIG_ATALK is not set
283# CONFIG_X25 is not set 291# CONFIG_X25 is not set
284# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
285
286#
287# TIPC Configuration (EXPERIMENTAL)
288#
289# CONFIG_TIPC is not set
290# CONFIG_NET_DIVERT is not set 293# CONFIG_NET_DIVERT is not set
291# CONFIG_ECONET is not set 294# CONFIG_ECONET is not set
292# CONFIG_WAN_ROUTER is not set 295# CONFIG_WAN_ROUTER is not set
@@ -307,6 +310,9 @@ CONFIG_IEEE80211=y
307# CONFIG_IEEE80211_DEBUG is not set 310# CONFIG_IEEE80211_DEBUG is not set
308CONFIG_IEEE80211_CRYPT_WEP=y 311CONFIG_IEEE80211_CRYPT_WEP=y
309CONFIG_IEEE80211_CRYPT_CCMP=y 312CONFIG_IEEE80211_CRYPT_CCMP=y
313CONFIG_IEEE80211_SOFTMAC=y
314# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
315CONFIG_WIRELESS_EXT=y
310 316
311# 317#
312# Device Drivers 318# Device Drivers
@@ -346,7 +352,7 @@ CONFIG_PROC_EVENTS=y
346# CONFIG_BLK_DEV_LOOP is not set 352# CONFIG_BLK_DEV_LOOP is not set
347# CONFIG_BLK_DEV_NBD is not set 353# CONFIG_BLK_DEV_NBD is not set
348# CONFIG_BLK_DEV_RAM is not set 354# CONFIG_BLK_DEV_RAM is not set
349CONFIG_BLK_DEV_RAM_COUNT=16 355# CONFIG_BLK_DEV_INITRD is not set
350CONFIG_CDROM_PKTCDVD=y 356CONFIG_CDROM_PKTCDVD=y
351CONFIG_CDROM_PKTCDVD_BUFFERS=8 357CONFIG_CDROM_PKTCDVD_BUFFERS=8
352# CONFIG_CDROM_PKTCDVD_WCACHE is not set 358# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -563,10 +569,6 @@ CONFIG_LEGACY_PTY_COUNT=256
563# 569#
564 570
565# 571#
566# Multimedia Capabilities Port drivers
567#
568
569#
570# Multimedia devices 572# Multimedia devices
571# 573#
572# CONFIG_VIDEO_DEV is not set 574# CONFIG_VIDEO_DEV is not set
@@ -597,6 +599,7 @@ CONFIG_DUMMY_CONSOLE=y
597# 599#
598# CONFIG_USB_ARCH_HAS_HCD is not set 600# CONFIG_USB_ARCH_HAS_HCD is not set
599# CONFIG_USB_ARCH_HAS_OHCI is not set 601# CONFIG_USB_ARCH_HAS_OHCI is not set
602# CONFIG_USB_ARCH_HAS_EHCI is not set
600 603
601# 604#
602# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 605# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -613,12 +616,30 @@ CONFIG_DUMMY_CONSOLE=y
613# CONFIG_MMC is not set 616# CONFIG_MMC is not set
614 617
615# 618#
619# LED devices
620#
621# CONFIG_NEW_LEDS is not set
622
623#
624# LED drivers
625#
626
627#
628# LED Triggers
629#
630
631#
616# InfiniBand support 632# InfiniBand support
617# 633#
618 634
619# 635#
620# SN Devices 636# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
637#
638
639#
640# Real Time Clock
621# 641#
642# CONFIG_RTC_CLASS is not set
622 643
623# 644#
624# File systems 645# File systems
@@ -663,7 +684,6 @@ CONFIG_SYSFS=y
663# CONFIG_TMPFS is not set 684# CONFIG_TMPFS is not set
664# CONFIG_HUGETLB_PAGE is not set 685# CONFIG_HUGETLB_PAGE is not set
665CONFIG_RAMFS=y 686CONFIG_RAMFS=y
666CONFIG_RELAYFS_FS=y
667# CONFIG_CONFIGFS_FS is not set 687# CONFIG_CONFIGFS_FS is not set
668 688
669# 689#
@@ -730,6 +750,8 @@ CONFIG_MSDOS_PARTITION=y
730# CONFIG_MAGIC_SYSRQ is not set 750# CONFIG_MAGIC_SYSRQ is not set
731# CONFIG_DEBUG_KERNEL is not set 751# CONFIG_DEBUG_KERNEL is not set
732CONFIG_LOG_BUF_SHIFT=14 752CONFIG_LOG_BUF_SHIFT=14
753# CONFIG_DEBUG_FS is not set
754# CONFIG_UNWIND_INFO is not set
733CONFIG_CROSSCOMPILE=y 755CONFIG_CROSSCOMPILE=y
734CONFIG_CMDLINE="" 756CONFIG_CMDLINE=""
735 757
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index c0f508d180c4..b48bdee2411f 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:21 2006 4# Mon Apr 24 14:51:11 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -142,7 +144,6 @@ CONFIG_PREEMPT_NONE=y
142# Code maturity level options 144# Code maturity level options
143# 145#
144CONFIG_EXPERIMENTAL=y 146CONFIG_EXPERIMENTAL=y
145CONFIG_CLEAN_COMPILE=y
146CONFIG_BROKEN_ON_SMP=y 147CONFIG_BROKEN_ON_SMP=y
147CONFIG_INIT_ENV_ARG_LIMIT=32 148CONFIG_INIT_ENV_ARG_LIMIT=32
148 149
@@ -158,6 +159,7 @@ CONFIG_SYSVIPC=y
158CONFIG_SYSCTL=y 159CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
160# CONFIG_IKCONFIG is not set 161# CONFIG_IKCONFIG is not set
162CONFIG_RELAY=y
161CONFIG_INITRAMFS_SOURCE="" 163CONFIG_INITRAMFS_SOURCE=""
162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163CONFIG_EMBEDDED=y 165CONFIG_EMBEDDED=y
@@ -171,10 +173,6 @@ CONFIG_BASE_FULL=y
171CONFIG_FUTEX=y 173CONFIG_FUTEX=y
172CONFIG_EPOLL=y 174CONFIG_EPOLL=y
173CONFIG_SHMEM=y 175CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178CONFIG_SLAB=y 176CONFIG_SLAB=y
179# CONFIG_TINY_SHMEM is not set 177# CONFIG_TINY_SHMEM is not set
180CONFIG_BASE_SMALL=0 178CONFIG_BASE_SMALL=0
@@ -188,6 +186,7 @@ CONFIG_BASE_SMALL=0
188# 186#
189# Block layer 187# Block layer
190# 188#
189# CONFIG_BLK_DEV_IO_TRACE is not set
191 190
192# 191#
193# IO Schedulers 192# IO Schedulers
@@ -207,7 +206,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
207# 206#
208CONFIG_HW_HAS_PCI=y 207CONFIG_HW_HAS_PCI=y
209CONFIG_PCI=y 208CONFIG_PCI=y
210CONFIG_PCI_LEGACY_PROC=y
211CONFIG_MMU=y 209CONFIG_MMU=y
212 210
213# 211#
@@ -225,6 +223,7 @@ CONFIG_MMU=y
225# 223#
226CONFIG_BINFMT_ELF=y 224CONFIG_BINFMT_ELF=y
227# CONFIG_BINFMT_MISC is not set 225# CONFIG_BINFMT_MISC is not set
226# CONFIG_BUILD_ELF64 is not set
228CONFIG_MIPS32_COMPAT=y 227CONFIG_MIPS32_COMPAT=y
229CONFIG_COMPAT=y 228CONFIG_COMPAT=y
230CONFIG_MIPS32_O32=y 229CONFIG_MIPS32_O32=y
@@ -239,6 +238,7 @@ CONFIG_NET=y
239# 238#
240# Networking options 239# Networking options
241# 240#
241# CONFIG_NETDEBUG is not set
242# CONFIG_PACKET is not set 242# CONFIG_PACKET is not set
243CONFIG_UNIX=y 243CONFIG_UNIX=y
244CONFIG_XFRM=y 244CONFIG_XFRM=y
@@ -259,12 +259,15 @@ CONFIG_IP_PNP_DHCP=y
259# CONFIG_INET_AH is not set 259# CONFIG_INET_AH is not set
260# CONFIG_INET_ESP is not set 260# CONFIG_INET_ESP is not set
261# CONFIG_INET_IPCOMP is not set 261# CONFIG_INET_IPCOMP is not set
262CONFIG_INET_TUNNEL=y 262# CONFIG_INET_XFRM_TUNNEL is not set
263# CONFIG_INET_TUNNEL is not set
263CONFIG_INET_DIAG=y 264CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 265CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 266# CONFIG_TCP_CONG_ADVANCED is not set
266CONFIG_TCP_CONG_BIC=y 267CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 268# CONFIG_IPV6 is not set
269# CONFIG_INET6_XFRM_TUNNEL is not set
270# CONFIG_INET6_TUNNEL is not set
268# CONFIG_NETFILTER is not set 271# CONFIG_NETFILTER is not set
269 272
270# 273#
@@ -276,6 +279,11 @@ CONFIG_TCP_CONG_BIC=y
276# SCTP Configuration (EXPERIMENTAL) 279# SCTP Configuration (EXPERIMENTAL)
277# 280#
278# CONFIG_IP_SCTP is not set 281# CONFIG_IP_SCTP is not set
282
283#
284# TIPC Configuration (EXPERIMENTAL)
285#
286# CONFIG_TIPC is not set
279# CONFIG_ATM is not set 287# CONFIG_ATM is not set
280# CONFIG_BRIDGE is not set 288# CONFIG_BRIDGE is not set
281# CONFIG_VLAN_8021Q is not set 289# CONFIG_VLAN_8021Q is not set
@@ -285,11 +293,6 @@ CONFIG_TCP_CONG_BIC=y
285# CONFIG_ATALK is not set 293# CONFIG_ATALK is not set
286# CONFIG_X25 is not set 294# CONFIG_X25 is not set
287# CONFIG_LAPB is not set 295# CONFIG_LAPB is not set
288
289#
290# TIPC Configuration (EXPERIMENTAL)
291#
292# CONFIG_TIPC is not set
293# CONFIG_NET_DIVERT is not set 296# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
@@ -310,6 +313,9 @@ CONFIG_IEEE80211=y
310# CONFIG_IEEE80211_DEBUG is not set 313# CONFIG_IEEE80211_DEBUG is not set
311CONFIG_IEEE80211_CRYPT_WEP=y 314CONFIG_IEEE80211_CRYPT_WEP=y
312CONFIG_IEEE80211_CRYPT_CCMP=y 315CONFIG_IEEE80211_CRYPT_CCMP=y
316CONFIG_IEEE80211_SOFTMAC=y
317# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
318CONFIG_WIRELESS_EXT=y
313 319
314# 320#
315# Device Drivers 321# Device Drivers
@@ -354,7 +360,7 @@ CONFIG_PROC_EVENTS=y
354# CONFIG_BLK_DEV_NBD is not set 360# CONFIG_BLK_DEV_NBD is not set
355# CONFIG_BLK_DEV_SX8 is not set 361# CONFIG_BLK_DEV_SX8 is not set
356# CONFIG_BLK_DEV_RAM is not set 362# CONFIG_BLK_DEV_RAM is not set
357CONFIG_BLK_DEV_RAM_COUNT=16 363# CONFIG_BLK_DEV_INITRD is not set
358CONFIG_CDROM_PKTCDVD=y 364CONFIG_CDROM_PKTCDVD=y
359CONFIG_CDROM_PKTCDVD_BUFFERS=8 365CONFIG_CDROM_PKTCDVD_BUFFERS=8
360# CONFIG_CDROM_PKTCDVD_WCACHE is not set 366# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -545,6 +551,7 @@ CONFIG_HW_CONSOLE=y
545# 551#
546CONFIG_SERIAL_8250=y 552CONFIG_SERIAL_8250=y
547CONFIG_SERIAL_8250_CONSOLE=y 553CONFIG_SERIAL_8250_CONSOLE=y
554CONFIG_SERIAL_8250_PCI=y
548CONFIG_SERIAL_8250_NR_UARTS=4 555CONFIG_SERIAL_8250_NR_UARTS=4
549CONFIG_SERIAL_8250_RUNTIME_UARTS=4 556CONFIG_SERIAL_8250_RUNTIME_UARTS=4
550# CONFIG_SERIAL_8250_EXTENDED is not set 557# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -554,6 +561,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
554# 561#
555CONFIG_SERIAL_CORE=y 562CONFIG_SERIAL_CORE=y
556CONFIG_SERIAL_CORE_CONSOLE=y 563CONFIG_SERIAL_CORE_CONSOLE=y
564# CONFIG_SERIAL_JSM is not set
557CONFIG_UNIX98_PTYS=y 565CONFIG_UNIX98_PTYS=y
558CONFIG_LEGACY_PTYS=y 566CONFIG_LEGACY_PTYS=y
559CONFIG_LEGACY_PTY_COUNT=256 567CONFIG_LEGACY_PTY_COUNT=256
@@ -612,10 +620,6 @@ CONFIG_LEGACY_PTY_COUNT=256
612# 620#
613 621
614# 622#
615# Multimedia Capabilities Port drivers
616#
617
618#
619# Multimedia devices 623# Multimedia devices
620# 624#
621# CONFIG_VIDEO_DEV is not set 625# CONFIG_VIDEO_DEV is not set
@@ -646,6 +650,7 @@ CONFIG_DUMMY_CONSOLE=y
646# 650#
647CONFIG_USB_ARCH_HAS_HCD=y 651CONFIG_USB_ARCH_HAS_HCD=y
648CONFIG_USB_ARCH_HAS_OHCI=y 652CONFIG_USB_ARCH_HAS_OHCI=y
653CONFIG_USB_ARCH_HAS_EHCI=y
649# CONFIG_USB is not set 654# CONFIG_USB is not set
650 655
651# 656#
@@ -663,13 +668,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
663# CONFIG_MMC is not set 668# CONFIG_MMC is not set
664 669
665# 670#
671# LED devices
672#
673# CONFIG_NEW_LEDS is not set
674
675#
676# LED drivers
677#
678
679#
680# LED Triggers
681#
682
683#
666# InfiniBand support 684# InfiniBand support
667# 685#
668# CONFIG_INFINIBAND is not set 686# CONFIG_INFINIBAND is not set
669 687
670# 688#
671# SN Devices 689# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
690#
691
692#
693# Real Time Clock
672# 694#
695# CONFIG_RTC_CLASS is not set
673 696
674# 697#
675# File systems 698# File systems
@@ -714,7 +737,6 @@ CONFIG_SYSFS=y
714# CONFIG_TMPFS is not set 737# CONFIG_TMPFS is not set
715# CONFIG_HUGETLB_PAGE is not set 738# CONFIG_HUGETLB_PAGE is not set
716CONFIG_RAMFS=y 739CONFIG_RAMFS=y
717CONFIG_RELAYFS_FS=y
718# CONFIG_CONFIGFS_FS is not set 740# CONFIG_CONFIGFS_FS is not set
719 741
720# 742#
@@ -781,6 +803,8 @@ CONFIG_MSDOS_PARTITION=y
781# CONFIG_MAGIC_SYSRQ is not set 803# CONFIG_MAGIC_SYSRQ is not set
782# CONFIG_DEBUG_KERNEL is not set 804# CONFIG_DEBUG_KERNEL is not set
783CONFIG_LOG_BUF_SHIFT=14 805CONFIG_LOG_BUF_SHIFT=14
806# CONFIG_DEBUG_FS is not set
807# CONFIG_UNWIND_INFO is not set
784CONFIG_CROSSCOMPILE=y 808CONFIG_CROSSCOMPILE=y
785CONFIG_CMDLINE="" 809CONFIG_CMDLINE=""
786 810
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 194b3c772bb7..01aac40634b4 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:22 2006 4# Mon Apr 24 14:51:12 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -116,11 +118,11 @@ CONFIG_PAGE_SIZE_4KB=y
116CONFIG_CPU_HAS_PREFETCH=y 118CONFIG_CPU_HAS_PREFETCH=y
117# CONFIG_MIPS_MT is not set 119# CONFIG_MIPS_MT is not set
118CONFIG_64BIT_PHYS_ADDR=y 120CONFIG_64BIT_PHYS_ADDR=y
119# CONFIG_CPU_ADVANCED is not set
120CONFIG_CPU_HAS_LLSC=y 121CONFIG_CPU_HAS_LLSC=y
121CONFIG_CPU_HAS_SYNC=y 122CONFIG_CPU_HAS_SYNC=y
122CONFIG_GENERIC_HARDIRQS=y 123CONFIG_GENERIC_HARDIRQS=y
123CONFIG_GENERIC_IRQ_PROBE=y 124CONFIG_GENERIC_IRQ_PROBE=y
125CONFIG_CPU_SUPPORTS_HIGHMEM=y
124CONFIG_ARCH_FLATMEM_ENABLE=y 126CONFIG_ARCH_FLATMEM_ENABLE=y
125CONFIG_SELECT_MEMORY_MODEL=y 127CONFIG_SELECT_MEMORY_MODEL=y
126CONFIG_FLATMEM_MANUAL=y 128CONFIG_FLATMEM_MANUAL=y
@@ -138,7 +140,6 @@ CONFIG_PREEMPT_NONE=y
138# Code maturity level options 140# Code maturity level options
139# 141#
140CONFIG_EXPERIMENTAL=y 142CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y 143CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32 144CONFIG_INIT_ENV_ARG_LIMIT=32
144 145
@@ -154,6 +155,7 @@ CONFIG_SYSVIPC=y
154CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 156# CONFIG_AUDIT is not set
156# CONFIG_IKCONFIG is not set 157# CONFIG_IKCONFIG is not set
158CONFIG_RELAY=y
157CONFIG_INITRAMFS_SOURCE="" 159CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 160# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 161CONFIG_EMBEDDED=y
@@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 169CONFIG_FUTEX=y
168CONFIG_EPOLL=y 170CONFIG_EPOLL=y
169CONFIG_SHMEM=y 171CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 172CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
@@ -183,7 +181,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
183CONFIG_MODULES=y 181CONFIG_MODULES=y
184CONFIG_MODULE_UNLOAD=y 182CONFIG_MODULE_UNLOAD=y
185# CONFIG_MODULE_FORCE_UNLOAD is not set 183# CONFIG_MODULE_FORCE_UNLOAD is not set
186CONFIG_OBSOLETE_MODPARM=y
187CONFIG_MODVERSIONS=y 184CONFIG_MODVERSIONS=y
188CONFIG_MODULE_SRCVERSION_ALL=y 185CONFIG_MODULE_SRCVERSION_ALL=y
189CONFIG_KMOD=y 186CONFIG_KMOD=y
@@ -192,6 +189,8 @@ CONFIG_KMOD=y
192# Block layer 189# Block layer
193# 190#
194# CONFIG_LBD is not set 191# CONFIG_LBD is not set
192# CONFIG_BLK_DEV_IO_TRACE is not set
193# CONFIG_LSF is not set
195 194
196# 195#
197# IO Schedulers 196# IO Schedulers
@@ -247,6 +246,7 @@ CONFIG_NET=y
247# 246#
248# Networking options 247# Networking options
249# 248#
249# CONFIG_NETDEBUG is not set
250CONFIG_PACKET=y 250CONFIG_PACKET=y
251# CONFIG_PACKET_MMAP is not set 251# CONFIG_PACKET_MMAP is not set
252CONFIG_UNIX=y 252CONFIG_UNIX=y
@@ -269,7 +269,8 @@ CONFIG_IP_PNP_BOOTP=y
269# CONFIG_INET_AH is not set 269# CONFIG_INET_AH is not set
270# CONFIG_INET_ESP is not set 270# CONFIG_INET_ESP is not set
271# CONFIG_INET_IPCOMP is not set 271# CONFIG_INET_IPCOMP is not set
272CONFIG_INET_TUNNEL=m 272# CONFIG_INET_XFRM_TUNNEL is not set
273# CONFIG_INET_TUNNEL is not set
273CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
274CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
275# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
@@ -280,6 +281,8 @@ CONFIG_TCP_CONG_BIC=y
280# 281#
281# CONFIG_IP_VS is not set 282# CONFIG_IP_VS is not set
282# CONFIG_IPV6 is not set 283# CONFIG_IPV6 is not set
284# CONFIG_INET6_XFRM_TUNNEL is not set
285# CONFIG_INET6_TUNNEL is not set
283CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
284# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
285 288
@@ -296,10 +299,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
296CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 299CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
297CONFIG_NETFILTER_XT_MATCH_COMMENT=m 300CONFIG_NETFILTER_XT_MATCH_COMMENT=m
298CONFIG_NETFILTER_XT_MATCH_DCCP=m 301CONFIG_NETFILTER_XT_MATCH_DCCP=m
302CONFIG_NETFILTER_XT_MATCH_ESP=m
299CONFIG_NETFILTER_XT_MATCH_LENGTH=m 303CONFIG_NETFILTER_XT_MATCH_LENGTH=m
300CONFIG_NETFILTER_XT_MATCH_LIMIT=m 304CONFIG_NETFILTER_XT_MATCH_LIMIT=m
301CONFIG_NETFILTER_XT_MATCH_MAC=m 305CONFIG_NETFILTER_XT_MATCH_MAC=m
302CONFIG_NETFILTER_XT_MATCH_MARK=m 306CONFIG_NETFILTER_XT_MATCH_MARK=m
307CONFIG_NETFILTER_XT_MATCH_POLICY=m
308CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
303CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
304CONFIG_NETFILTER_XT_MATCH_REALM=m 310CONFIG_NETFILTER_XT_MATCH_REALM=m
305CONFIG_NETFILTER_XT_MATCH_SCTP=m 311CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -323,6 +329,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
323# SCTP Configuration (EXPERIMENTAL) 329# SCTP Configuration (EXPERIMENTAL)
324# 330#
325# CONFIG_IP_SCTP is not set 331# CONFIG_IP_SCTP is not set
332
333#
334# TIPC Configuration (EXPERIMENTAL)
335#
336# CONFIG_TIPC is not set
326# CONFIG_ATM is not set 337# CONFIG_ATM is not set
327# CONFIG_BRIDGE is not set 338# CONFIG_BRIDGE is not set
328# CONFIG_VLAN_8021Q is not set 339# CONFIG_VLAN_8021Q is not set
@@ -332,11 +343,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
332# CONFIG_ATALK is not set 343# CONFIG_ATALK is not set
333# CONFIG_X25 is not set 344# CONFIG_X25 is not set
334# CONFIG_LAPB is not set 345# CONFIG_LAPB is not set
335
336#
337# TIPC Configuration (EXPERIMENTAL)
338#
339# CONFIG_TIPC is not set
340# CONFIG_NET_DIVERT is not set 346# CONFIG_NET_DIVERT is not set
341# CONFIG_ECONET is not set 347# CONFIG_ECONET is not set
342# CONFIG_WAN_ROUTER is not set 348# CONFIG_WAN_ROUTER is not set
@@ -358,6 +364,9 @@ CONFIG_IEEE80211=m
358# CONFIG_IEEE80211_DEBUG is not set 364# CONFIG_IEEE80211_DEBUG is not set
359CONFIG_IEEE80211_CRYPT_WEP=m 365CONFIG_IEEE80211_CRYPT_WEP=m
360CONFIG_IEEE80211_CRYPT_CCMP=m 366CONFIG_IEEE80211_CRYPT_CCMP=m
367CONFIG_IEEE80211_SOFTMAC=m
368# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
369CONFIG_WIRELESS_EXT=y
361 370
362# 371#
363# Device Drivers 372# Device Drivers
@@ -414,7 +423,6 @@ CONFIG_MTD_CFI_I2=y
414# CONFIG_MTD_CFI_I8 is not set 423# CONFIG_MTD_CFI_I8 is not set
415# CONFIG_MTD_CFI_INTELEXT is not set 424# CONFIG_MTD_CFI_INTELEXT is not set
416CONFIG_MTD_CFI_AMDSTD=y 425CONFIG_MTD_CFI_AMDSTD=y
417CONFIG_MTD_CFI_AMDSTD_RETRY=0
418# CONFIG_MTD_CFI_STAA is not set 426# CONFIG_MTD_CFI_STAA is not set
419CONFIG_MTD_CFI_UTIL=y 427CONFIG_MTD_CFI_UTIL=y
420# CONFIG_MTD_RAM is not set 428# CONFIG_MTD_RAM is not set
@@ -436,7 +444,6 @@ CONFIG_MTD_ALCHEMY=y
436# CONFIG_MTD_SLRAM is not set 444# CONFIG_MTD_SLRAM is not set
437# CONFIG_MTD_PHRAM is not set 445# CONFIG_MTD_PHRAM is not set
438# CONFIG_MTD_MTDRAM is not set 446# CONFIG_MTD_MTDRAM is not set
439# CONFIG_MTD_BLKMTD is not set
440# CONFIG_MTD_BLOCK2MTD is not set 447# CONFIG_MTD_BLOCK2MTD is not set
441 448
442# 449#
@@ -473,7 +480,7 @@ CONFIG_BLK_DEV_LOOP=y
473# CONFIG_BLK_DEV_CRYPTOLOOP is not set 480# CONFIG_BLK_DEV_CRYPTOLOOP is not set
474# CONFIG_BLK_DEV_NBD is not set 481# CONFIG_BLK_DEV_NBD is not set
475# CONFIG_BLK_DEV_RAM is not set 482# CONFIG_BLK_DEV_RAM is not set
476CONFIG_BLK_DEV_RAM_COUNT=16 483# CONFIG_BLK_DEV_INITRD is not set
477CONFIG_CDROM_PKTCDVD=m 484CONFIG_CDROM_PKTCDVD=m
478CONFIG_CDROM_PKTCDVD_BUFFERS=8 485CONFIG_CDROM_PKTCDVD_BUFFERS=8
479# CONFIG_CDROM_PKTCDVD_WCACHE is not set 486# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -716,10 +723,6 @@ CONFIG_SYNCLINK_CS=m
716# 723#
717 724
718# 725#
719# Multimedia Capabilities Port drivers
720#
721
722#
723# Multimedia devices 726# Multimedia devices
724# 727#
725# CONFIG_VIDEO_DEV is not set 728# CONFIG_VIDEO_DEV is not set
@@ -750,6 +753,7 @@ CONFIG_DUMMY_CONSOLE=y
750# 753#
751CONFIG_USB_ARCH_HAS_HCD=y 754CONFIG_USB_ARCH_HAS_HCD=y
752CONFIG_USB_ARCH_HAS_OHCI=y 755CONFIG_USB_ARCH_HAS_OHCI=y
756# CONFIG_USB_ARCH_HAS_EHCI is not set
753# CONFIG_USB is not set 757# CONFIG_USB is not set
754 758
755# 759#
@@ -767,12 +771,30 @@ CONFIG_USB_ARCH_HAS_OHCI=y
767# CONFIG_MMC is not set 771# CONFIG_MMC is not set
768 772
769# 773#
774# LED devices
775#
776# CONFIG_NEW_LEDS is not set
777
778#
779# LED drivers
780#
781
782#
783# LED Triggers
784#
785
786#
770# InfiniBand support 787# InfiniBand support
771# 788#
772 789
773# 790#
774# SN Devices 791# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
792#
793
794#
795# Real Time Clock
775# 796#
797# CONFIG_RTC_CLASS is not set
776 798
777# 799#
778# File systems 800# File systems
@@ -830,7 +852,6 @@ CONFIG_SYSFS=y
830CONFIG_TMPFS=y 852CONFIG_TMPFS=y
831# CONFIG_HUGETLB_PAGE is not set 853# CONFIG_HUGETLB_PAGE is not set
832CONFIG_RAMFS=y 854CONFIG_RAMFS=y
833CONFIG_RELAYFS_FS=m
834# CONFIG_CONFIGFS_FS is not set 855# CONFIG_CONFIGFS_FS is not set
835 856
836# 857#
@@ -939,6 +960,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
939# CONFIG_MAGIC_SYSRQ is not set 960# CONFIG_MAGIC_SYSRQ is not set
940# CONFIG_DEBUG_KERNEL is not set 961# CONFIG_DEBUG_KERNEL is not set
941CONFIG_LOG_BUF_SHIFT=14 962CONFIG_LOG_BUF_SHIFT=14
963# CONFIG_DEBUG_FS is not set
942CONFIG_CROSSCOMPILE=y 964CONFIG_CROSSCOMPILE=y
943CONFIG_CMDLINE="" 965CONFIG_CMDLINE=""
944 966
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index 8985725e6a98..398c3c265b9f 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:24 2006 4# Mon Apr 24 14:51:13 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -115,11 +117,11 @@ CONFIG_PAGE_SIZE_4KB=y
115CONFIG_CPU_HAS_PREFETCH=y 117CONFIG_CPU_HAS_PREFETCH=y
116# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
117CONFIG_64BIT_PHYS_ADDR=y 119CONFIG_64BIT_PHYS_ADDR=y
118# CONFIG_CPU_ADVANCED is not set
119CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
124CONFIG_CPU_SUPPORTS_HIGHMEM=y
123CONFIG_ARCH_FLATMEM_ENABLE=y 125CONFIG_ARCH_FLATMEM_ENABLE=y
124CONFIG_SELECT_MEMORY_MODEL=y 126CONFIG_SELECT_MEMORY_MODEL=y
125CONFIG_FLATMEM_MANUAL=y 127CONFIG_FLATMEM_MANUAL=y
@@ -137,7 +139,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 139# Code maturity level options
138# 140#
139CONFIG_EXPERIMENTAL=y 141CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 142CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 143CONFIG_INIT_ENV_ARG_LIMIT=32
143 144
@@ -153,6 +154,7 @@ CONFIG_SYSVIPC=y
153CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
155# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
157CONFIG_RELAY=y
156CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 168CONFIG_FUTEX=y
167CONFIG_EPOLL=y 169CONFIG_EPOLL=y
168CONFIG_SHMEM=y 170CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y 171CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
182CONFIG_MODULES=y 180CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
188CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -191,6 +188,8 @@ CONFIG_KMOD=y
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set 190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
194 193
195# 194#
196# IO Schedulers 195# IO Schedulers
@@ -210,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
210# 209#
211CONFIG_HW_HAS_PCI=y 210CONFIG_HW_HAS_PCI=y
212CONFIG_PCI=y 211CONFIG_PCI=y
213CONFIG_PCI_LEGACY_PROC=y
214CONFIG_MMU=y 212CONFIG_MMU=y
215 213
216# 214#
@@ -253,6 +251,7 @@ CONFIG_NET=y
253# 251#
254# Networking options 252# Networking options
255# 253#
254# CONFIG_NETDEBUG is not set
256CONFIG_PACKET=y 255CONFIG_PACKET=y
257# CONFIG_PACKET_MMAP is not set 256# CONFIG_PACKET_MMAP is not set
258CONFIG_UNIX=y 257CONFIG_UNIX=y
@@ -275,7 +274,8 @@ CONFIG_IP_PNP_BOOTP=y
275# CONFIG_INET_AH is not set 274# CONFIG_INET_AH is not set
276# CONFIG_INET_ESP is not set 275# CONFIG_INET_ESP is not set
277# CONFIG_INET_IPCOMP is not set 276# CONFIG_INET_IPCOMP is not set
278CONFIG_INET_TUNNEL=m 277# CONFIG_INET_XFRM_TUNNEL is not set
278# CONFIG_INET_TUNNEL is not set
279CONFIG_INET_DIAG=y 279CONFIG_INET_DIAG=y
280CONFIG_INET_TCP_DIAG=y 280CONFIG_INET_TCP_DIAG=y
281# CONFIG_TCP_CONG_ADVANCED is not set 281# CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,6 +286,8 @@ CONFIG_TCP_CONG_BIC=y
286# 286#
287# CONFIG_IP_VS is not set 287# CONFIG_IP_VS is not set
288# CONFIG_IPV6 is not set 288# CONFIG_IPV6 is not set
289# CONFIG_INET6_XFRM_TUNNEL is not set
290# CONFIG_INET6_TUNNEL is not set
289CONFIG_NETFILTER=y 291CONFIG_NETFILTER=y
290# CONFIG_NETFILTER_DEBUG is not set 292# CONFIG_NETFILTER_DEBUG is not set
291 293
@@ -302,10 +304,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 304CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
303CONFIG_NETFILTER_XT_MATCH_COMMENT=m 305CONFIG_NETFILTER_XT_MATCH_COMMENT=m
304CONFIG_NETFILTER_XT_MATCH_DCCP=m 306CONFIG_NETFILTER_XT_MATCH_DCCP=m
307CONFIG_NETFILTER_XT_MATCH_ESP=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m 308CONFIG_NETFILTER_XT_MATCH_LENGTH=m
306CONFIG_NETFILTER_XT_MATCH_LIMIT=m 309CONFIG_NETFILTER_XT_MATCH_LIMIT=m
307CONFIG_NETFILTER_XT_MATCH_MAC=m 310CONFIG_NETFILTER_XT_MATCH_MAC=m
308CONFIG_NETFILTER_XT_MATCH_MARK=m 311CONFIG_NETFILTER_XT_MATCH_MARK=m
312CONFIG_NETFILTER_XT_MATCH_POLICY=m
313CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 314CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
310CONFIG_NETFILTER_XT_MATCH_REALM=m 315CONFIG_NETFILTER_XT_MATCH_REALM=m
311CONFIG_NETFILTER_XT_MATCH_SCTP=m 316CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -329,6 +334,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
329# SCTP Configuration (EXPERIMENTAL) 334# SCTP Configuration (EXPERIMENTAL)
330# 335#
331# CONFIG_IP_SCTP is not set 336# CONFIG_IP_SCTP is not set
337
338#
339# TIPC Configuration (EXPERIMENTAL)
340#
341# CONFIG_TIPC is not set
332# CONFIG_ATM is not set 342# CONFIG_ATM is not set
333# CONFIG_BRIDGE is not set 343# CONFIG_BRIDGE is not set
334# CONFIG_VLAN_8021Q is not set 344# CONFIG_VLAN_8021Q is not set
@@ -338,11 +348,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
338# CONFIG_ATALK is not set 348# CONFIG_ATALK is not set
339# CONFIG_X25 is not set 349# CONFIG_X25 is not set
340# CONFIG_LAPB is not set 350# CONFIG_LAPB is not set
341
342#
343# TIPC Configuration (EXPERIMENTAL)
344#
345# CONFIG_TIPC is not set
346# CONFIG_NET_DIVERT is not set 351# CONFIG_NET_DIVERT is not set
347# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
348# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
@@ -364,6 +369,9 @@ CONFIG_IEEE80211=m
364# CONFIG_IEEE80211_DEBUG is not set 369# CONFIG_IEEE80211_DEBUG is not set
365CONFIG_IEEE80211_CRYPT_WEP=m 370CONFIG_IEEE80211_CRYPT_WEP=m
366CONFIG_IEEE80211_CRYPT_CCMP=m 371CONFIG_IEEE80211_CRYPT_CCMP=m
372CONFIG_IEEE80211_SOFTMAC=m
373# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
374CONFIG_WIRELESS_EXT=y
367 375
368# 376#
369# Device Drivers 377# Device Drivers
@@ -420,7 +428,6 @@ CONFIG_MTD_CFI_I2=y
420# CONFIG_MTD_CFI_I8 is not set 428# CONFIG_MTD_CFI_I8 is not set
421# CONFIG_MTD_CFI_INTELEXT is not set 429# CONFIG_MTD_CFI_INTELEXT is not set
422CONFIG_MTD_CFI_AMDSTD=y 430CONFIG_MTD_CFI_AMDSTD=y
423CONFIG_MTD_CFI_AMDSTD_RETRY=0
424# CONFIG_MTD_CFI_STAA is not set 431# CONFIG_MTD_CFI_STAA is not set
425CONFIG_MTD_CFI_UTIL=y 432CONFIG_MTD_CFI_UTIL=y
426# CONFIG_MTD_RAM is not set 433# CONFIG_MTD_RAM is not set
@@ -443,7 +450,6 @@ CONFIG_MTD_ALCHEMY=y
443# CONFIG_MTD_SLRAM is not set 450# CONFIG_MTD_SLRAM is not set
444# CONFIG_MTD_PHRAM is not set 451# CONFIG_MTD_PHRAM is not set
445# CONFIG_MTD_MTDRAM is not set 452# CONFIG_MTD_MTDRAM is not set
446# CONFIG_MTD_BLKMTD is not set
447# CONFIG_MTD_BLOCK2MTD is not set 453# CONFIG_MTD_BLOCK2MTD is not set
448 454
449# 455#
@@ -485,7 +491,7 @@ CONFIG_BLK_DEV_LOOP=y
485# CONFIG_BLK_DEV_NBD is not set 491# CONFIG_BLK_DEV_NBD is not set
486# CONFIG_BLK_DEV_SX8 is not set 492# CONFIG_BLK_DEV_SX8 is not set
487# CONFIG_BLK_DEV_RAM is not set 493# CONFIG_BLK_DEV_RAM is not set
488CONFIG_BLK_DEV_RAM_COUNT=16 494# CONFIG_BLK_DEV_INITRD is not set
489CONFIG_CDROM_PKTCDVD=m 495CONFIG_CDROM_PKTCDVD=m
490CONFIG_CDROM_PKTCDVD_BUFFERS=8 496CONFIG_CDROM_PKTCDVD_BUFFERS=8
491# CONFIG_CDROM_PKTCDVD_WCACHE is not set 497# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -750,6 +756,7 @@ CONFIG_SERIO_RAW=m
750# 756#
751CONFIG_SERIAL_8250=y 757CONFIG_SERIAL_8250=y
752CONFIG_SERIAL_8250_CONSOLE=y 758CONFIG_SERIAL_8250_CONSOLE=y
759CONFIG_SERIAL_8250_PCI=y
753# CONFIG_SERIAL_8250_CS is not set 760# CONFIG_SERIAL_8250_CS is not set
754CONFIG_SERIAL_8250_NR_UARTS=4 761CONFIG_SERIAL_8250_NR_UARTS=4
755CONFIG_SERIAL_8250_RUNTIME_UARTS=4 762CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -761,6 +768,7 @@ CONFIG_SERIAL_8250_AU1X00=y
761# 768#
762CONFIG_SERIAL_CORE=y 769CONFIG_SERIAL_CORE=y
763CONFIG_SERIAL_CORE_CONSOLE=y 770CONFIG_SERIAL_CORE_CONSOLE=y
771# CONFIG_SERIAL_JSM is not set
764CONFIG_UNIX98_PTYS=y 772CONFIG_UNIX98_PTYS=y
765CONFIG_LEGACY_PTYS=y 773CONFIG_LEGACY_PTYS=y
766CONFIG_LEGACY_PTY_COUNT=256 774CONFIG_LEGACY_PTY_COUNT=256
@@ -826,10 +834,6 @@ CONFIG_SYNCLINK_CS=m
826# 834#
827 835
828# 836#
829# Multimedia Capabilities Port drivers
830#
831
832#
833# Multimedia devices 837# Multimedia devices
834# 838#
835# CONFIG_VIDEO_DEV is not set 839# CONFIG_VIDEO_DEV is not set
@@ -854,6 +858,7 @@ CONFIG_SYNCLINK_CS=m
854# 858#
855CONFIG_USB_ARCH_HAS_HCD=y 859CONFIG_USB_ARCH_HAS_HCD=y
856CONFIG_USB_ARCH_HAS_OHCI=y 860CONFIG_USB_ARCH_HAS_OHCI=y
861CONFIG_USB_ARCH_HAS_EHCI=y
857# CONFIG_USB is not set 862# CONFIG_USB is not set
858 863
859# 864#
@@ -871,13 +876,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
871# CONFIG_MMC is not set 876# CONFIG_MMC is not set
872 877
873# 878#
879# LED devices
880#
881# CONFIG_NEW_LEDS is not set
882
883#
884# LED drivers
885#
886
887#
888# LED Triggers
889#
890
891#
874# InfiniBand support 892# InfiniBand support
875# 893#
876# CONFIG_INFINIBAND is not set 894# CONFIG_INFINIBAND is not set
877 895
878# 896#
879# SN Devices 897# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
898#
899
900#
901# Real Time Clock
880# 902#
903# CONFIG_RTC_CLASS is not set
881 904
882# 905#
883# File systems 906# File systems
@@ -935,7 +958,6 @@ CONFIG_SYSFS=y
935CONFIG_TMPFS=y 958CONFIG_TMPFS=y
936# CONFIG_HUGETLB_PAGE is not set 959# CONFIG_HUGETLB_PAGE is not set
937CONFIG_RAMFS=y 960CONFIG_RAMFS=y
938CONFIG_RELAYFS_FS=m
939# CONFIG_CONFIGFS_FS is not set 961# CONFIG_CONFIGFS_FS is not set
940 962
941# 963#
@@ -1044,6 +1066,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1044# CONFIG_MAGIC_SYSRQ is not set 1066# CONFIG_MAGIC_SYSRQ is not set
1045# CONFIG_DEBUG_KERNEL is not set 1067# CONFIG_DEBUG_KERNEL is not set
1046CONFIG_LOG_BUF_SHIFT=14 1068CONFIG_LOG_BUF_SHIFT=14
1069# CONFIG_DEBUG_FS is not set
1047CONFIG_CROSSCOMPILE=y 1070CONFIG_CROSSCOMPILE=y
1048CONFIG_CMDLINE="" 1071CONFIG_CMDLINE=""
1049 1072
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index adbf997b540e..ea282a53bb66 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:25 2006 4# Mon Apr 24 14:51:13 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -115,11 +117,11 @@ CONFIG_PAGE_SIZE_4KB=y
115CONFIG_CPU_HAS_PREFETCH=y 117CONFIG_CPU_HAS_PREFETCH=y
116# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
117CONFIG_64BIT_PHYS_ADDR=y 119CONFIG_64BIT_PHYS_ADDR=y
118# CONFIG_CPU_ADVANCED is not set
119CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
124CONFIG_CPU_SUPPORTS_HIGHMEM=y
123CONFIG_ARCH_FLATMEM_ENABLE=y 125CONFIG_ARCH_FLATMEM_ENABLE=y
124CONFIG_SELECT_MEMORY_MODEL=y 126CONFIG_SELECT_MEMORY_MODEL=y
125CONFIG_FLATMEM_MANUAL=y 127CONFIG_FLATMEM_MANUAL=y
@@ -137,7 +139,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 139# Code maturity level options
138# 140#
139CONFIG_EXPERIMENTAL=y 141CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 142CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 143CONFIG_INIT_ENV_ARG_LIMIT=32
143 144
@@ -153,6 +154,7 @@ CONFIG_SYSVIPC=y
153CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
155# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
157CONFIG_RELAY=y
156CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -166,10 +168,6 @@ CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 168CONFIG_FUTEX=y
167CONFIG_EPOLL=y 169CONFIG_EPOLL=y
168CONFIG_SHMEM=y 170CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y 171CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -182,7 +180,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
182CONFIG_MODULES=y 180CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y 181CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set 182# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y 183CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y 184CONFIG_MODULE_SRCVERSION_ALL=y
188CONFIG_KMOD=y 185CONFIG_KMOD=y
@@ -191,6 +188,8 @@ CONFIG_KMOD=y
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set 190# CONFIG_LBD is not set
191# CONFIG_BLK_DEV_IO_TRACE is not set
192# CONFIG_LSF is not set
194 193
195# 194#
196# IO Schedulers 195# IO Schedulers
@@ -210,7 +209,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
210# 209#
211CONFIG_HW_HAS_PCI=y 210CONFIG_HW_HAS_PCI=y
212CONFIG_PCI=y 211CONFIG_PCI=y
213CONFIG_PCI_LEGACY_PROC=y
214CONFIG_MMU=y 212CONFIG_MMU=y
215 213
216# 214#
@@ -253,6 +251,7 @@ CONFIG_NET=y
253# 251#
254# Networking options 252# Networking options
255# 253#
254# CONFIG_NETDEBUG is not set
256CONFIG_PACKET=y 255CONFIG_PACKET=y
257# CONFIG_PACKET_MMAP is not set 256# CONFIG_PACKET_MMAP is not set
258CONFIG_UNIX=y 257CONFIG_UNIX=y
@@ -275,7 +274,8 @@ CONFIG_IP_PNP_BOOTP=y
275# CONFIG_INET_AH is not set 274# CONFIG_INET_AH is not set
276# CONFIG_INET_ESP is not set 275# CONFIG_INET_ESP is not set
277# CONFIG_INET_IPCOMP is not set 276# CONFIG_INET_IPCOMP is not set
278CONFIG_INET_TUNNEL=m 277# CONFIG_INET_XFRM_TUNNEL is not set
278# CONFIG_INET_TUNNEL is not set
279CONFIG_INET_DIAG=y 279CONFIG_INET_DIAG=y
280CONFIG_INET_TCP_DIAG=y 280CONFIG_INET_TCP_DIAG=y
281# CONFIG_TCP_CONG_ADVANCED is not set 281# CONFIG_TCP_CONG_ADVANCED is not set
@@ -286,6 +286,8 @@ CONFIG_TCP_CONG_BIC=y
286# 286#
287# CONFIG_IP_VS is not set 287# CONFIG_IP_VS is not set
288# CONFIG_IPV6 is not set 288# CONFIG_IPV6 is not set
289# CONFIG_INET6_XFRM_TUNNEL is not set
290# CONFIG_INET6_TUNNEL is not set
289CONFIG_NETFILTER=y 291CONFIG_NETFILTER=y
290# CONFIG_NETFILTER_DEBUG is not set 292# CONFIG_NETFILTER_DEBUG is not set
291 293
@@ -302,10 +304,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 304CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
303CONFIG_NETFILTER_XT_MATCH_COMMENT=m 305CONFIG_NETFILTER_XT_MATCH_COMMENT=m
304CONFIG_NETFILTER_XT_MATCH_DCCP=m 306CONFIG_NETFILTER_XT_MATCH_DCCP=m
307CONFIG_NETFILTER_XT_MATCH_ESP=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m 308CONFIG_NETFILTER_XT_MATCH_LENGTH=m
306CONFIG_NETFILTER_XT_MATCH_LIMIT=m 309CONFIG_NETFILTER_XT_MATCH_LIMIT=m
307CONFIG_NETFILTER_XT_MATCH_MAC=m 310CONFIG_NETFILTER_XT_MATCH_MAC=m
308CONFIG_NETFILTER_XT_MATCH_MARK=m 311CONFIG_NETFILTER_XT_MATCH_MARK=m
312CONFIG_NETFILTER_XT_MATCH_POLICY=m
313CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 314CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
310CONFIG_NETFILTER_XT_MATCH_REALM=m 315CONFIG_NETFILTER_XT_MATCH_REALM=m
311CONFIG_NETFILTER_XT_MATCH_SCTP=m 316CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -329,6 +334,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
329# SCTP Configuration (EXPERIMENTAL) 334# SCTP Configuration (EXPERIMENTAL)
330# 335#
331# CONFIG_IP_SCTP is not set 336# CONFIG_IP_SCTP is not set
337
338#
339# TIPC Configuration (EXPERIMENTAL)
340#
341# CONFIG_TIPC is not set
332# CONFIG_ATM is not set 342# CONFIG_ATM is not set
333# CONFIG_BRIDGE is not set 343# CONFIG_BRIDGE is not set
334# CONFIG_VLAN_8021Q is not set 344# CONFIG_VLAN_8021Q is not set
@@ -338,11 +348,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
338# CONFIG_ATALK is not set 348# CONFIG_ATALK is not set
339# CONFIG_X25 is not set 349# CONFIG_X25 is not set
340# CONFIG_LAPB is not set 350# CONFIG_LAPB is not set
341
342#
343# TIPC Configuration (EXPERIMENTAL)
344#
345# CONFIG_TIPC is not set
346# CONFIG_NET_DIVERT is not set 351# CONFIG_NET_DIVERT is not set
347# CONFIG_ECONET is not set 352# CONFIG_ECONET is not set
348# CONFIG_WAN_ROUTER is not set 353# CONFIG_WAN_ROUTER is not set
@@ -364,6 +369,9 @@ CONFIG_IEEE80211=m
364# CONFIG_IEEE80211_DEBUG is not set 369# CONFIG_IEEE80211_DEBUG is not set
365CONFIG_IEEE80211_CRYPT_WEP=m 370CONFIG_IEEE80211_CRYPT_WEP=m
366CONFIG_IEEE80211_CRYPT_CCMP=m 371CONFIG_IEEE80211_CRYPT_CCMP=m
372CONFIG_IEEE80211_SOFTMAC=m
373# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
374CONFIG_WIRELESS_EXT=y
367 375
368# 376#
369# Device Drivers 377# Device Drivers
@@ -420,7 +428,6 @@ CONFIG_MTD_CFI_I2=y
420# CONFIG_MTD_CFI_I8 is not set 428# CONFIG_MTD_CFI_I8 is not set
421# CONFIG_MTD_CFI_INTELEXT is not set 429# CONFIG_MTD_CFI_INTELEXT is not set
422CONFIG_MTD_CFI_AMDSTD=y 430CONFIG_MTD_CFI_AMDSTD=y
423CONFIG_MTD_CFI_AMDSTD_RETRY=0
424# CONFIG_MTD_CFI_STAA is not set 431# CONFIG_MTD_CFI_STAA is not set
425CONFIG_MTD_CFI_UTIL=y 432CONFIG_MTD_CFI_UTIL=y
426# CONFIG_MTD_RAM is not set 433# CONFIG_MTD_RAM is not set
@@ -443,7 +450,6 @@ CONFIG_MTD_ALCHEMY=y
443# CONFIG_MTD_SLRAM is not set 450# CONFIG_MTD_SLRAM is not set
444# CONFIG_MTD_PHRAM is not set 451# CONFIG_MTD_PHRAM is not set
445# CONFIG_MTD_MTDRAM is not set 452# CONFIG_MTD_MTDRAM is not set
446# CONFIG_MTD_BLKMTD is not set
447# CONFIG_MTD_BLOCK2MTD is not set 453# CONFIG_MTD_BLOCK2MTD is not set
448 454
449# 455#
@@ -485,7 +491,7 @@ CONFIG_BLK_DEV_LOOP=y
485# CONFIG_BLK_DEV_NBD is not set 491# CONFIG_BLK_DEV_NBD is not set
486# CONFIG_BLK_DEV_SX8 is not set 492# CONFIG_BLK_DEV_SX8 is not set
487# CONFIG_BLK_DEV_RAM is not set 493# CONFIG_BLK_DEV_RAM is not set
488CONFIG_BLK_DEV_RAM_COUNT=16 494# CONFIG_BLK_DEV_INITRD is not set
489CONFIG_CDROM_PKTCDVD=m 495CONFIG_CDROM_PKTCDVD=m
490CONFIG_CDROM_PKTCDVD_BUFFERS=8 496CONFIG_CDROM_PKTCDVD_BUFFERS=8
491# CONFIG_CDROM_PKTCDVD_WCACHE is not set 497# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -742,6 +748,7 @@ CONFIG_SERIO_RAW=m
742# 748#
743CONFIG_SERIAL_8250=y 749CONFIG_SERIAL_8250=y
744CONFIG_SERIAL_8250_CONSOLE=y 750CONFIG_SERIAL_8250_CONSOLE=y
751CONFIG_SERIAL_8250_PCI=y
745# CONFIG_SERIAL_8250_CS is not set 752# CONFIG_SERIAL_8250_CS is not set
746CONFIG_SERIAL_8250_NR_UARTS=4 753CONFIG_SERIAL_8250_NR_UARTS=4
747CONFIG_SERIAL_8250_RUNTIME_UARTS=4 754CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@@ -753,6 +760,7 @@ CONFIG_SERIAL_8250_AU1X00=y
753# 760#
754CONFIG_SERIAL_CORE=y 761CONFIG_SERIAL_CORE=y
755CONFIG_SERIAL_CORE_CONSOLE=y 762CONFIG_SERIAL_CORE_CONSOLE=y
763# CONFIG_SERIAL_JSM is not set
756CONFIG_UNIX98_PTYS=y 764CONFIG_UNIX98_PTYS=y
757CONFIG_LEGACY_PTYS=y 765CONFIG_LEGACY_PTYS=y
758CONFIG_LEGACY_PTY_COUNT=256 766CONFIG_LEGACY_PTY_COUNT=256
@@ -818,10 +826,6 @@ CONFIG_SYNCLINK_CS=m
818# 826#
819 827
820# 828#
821# Multimedia Capabilities Port drivers
822#
823
824#
825# Multimedia devices 829# Multimedia devices
826# 830#
827# CONFIG_VIDEO_DEV is not set 831# CONFIG_VIDEO_DEV is not set
@@ -846,6 +850,7 @@ CONFIG_SYNCLINK_CS=m
846# 850#
847CONFIG_USB_ARCH_HAS_HCD=y 851CONFIG_USB_ARCH_HAS_HCD=y
848CONFIG_USB_ARCH_HAS_OHCI=y 852CONFIG_USB_ARCH_HAS_OHCI=y
853CONFIG_USB_ARCH_HAS_EHCI=y
849# CONFIG_USB is not set 854# CONFIG_USB is not set
850 855
851# 856#
@@ -863,13 +868,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
863# CONFIG_MMC is not set 868# CONFIG_MMC is not set
864 869
865# 870#
871# LED devices
872#
873# CONFIG_NEW_LEDS is not set
874
875#
876# LED drivers
877#
878
879#
880# LED Triggers
881#
882
883#
866# InfiniBand support 884# InfiniBand support
867# 885#
868# CONFIG_INFINIBAND is not set 886# CONFIG_INFINIBAND is not set
869 887
870# 888#
871# SN Devices 889# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
890#
891
892#
893# Real Time Clock
872# 894#
895# CONFIG_RTC_CLASS is not set
873 896
874# 897#
875# File systems 898# File systems
@@ -927,7 +950,6 @@ CONFIG_SYSFS=y
927CONFIG_TMPFS=y 950CONFIG_TMPFS=y
928# CONFIG_HUGETLB_PAGE is not set 951# CONFIG_HUGETLB_PAGE is not set
929CONFIG_RAMFS=y 952CONFIG_RAMFS=y
930CONFIG_RELAYFS_FS=m
931# CONFIG_CONFIGFS_FS is not set 953# CONFIG_CONFIGFS_FS is not set
932 954
933# 955#
@@ -1036,6 +1058,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1036# CONFIG_MAGIC_SYSRQ is not set 1058# CONFIG_MAGIC_SYSRQ is not set
1037# CONFIG_DEBUG_KERNEL is not set 1059# CONFIG_DEBUG_KERNEL is not set
1038CONFIG_LOG_BUF_SHIFT=14 1060CONFIG_LOG_BUF_SHIFT=14
1061# CONFIG_DEBUG_FS is not set
1039CONFIG_CROSSCOMPILE=y 1062CONFIG_CROSSCOMPILE=y
1040CONFIG_CMDLINE="" 1063CONFIG_CMDLINE=""
1041 1064
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index b5db700450ba..4c57e564db0b 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:26 2006 4# Mon Apr 24 14:51:14 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_PNX8550_JBS=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,11 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y
114CONFIG_CPU_HAS_PREFETCH=y 116CONFIG_CPU_HAS_PREFETCH=y
115# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
116# CONFIG_64BIT_PHYS_ADDR is not set 118# CONFIG_64BIT_PHYS_ADDR is not set
117# CONFIG_CPU_ADVANCED is not set
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
121CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
123CONFIG_CPU_SUPPORTS_HIGHMEM=y
122CONFIG_ARCH_FLATMEM_ENABLE=y 124CONFIG_ARCH_FLATMEM_ENABLE=y
123CONFIG_SELECT_MEMORY_MODEL=y 125CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y 126CONFIG_FLATMEM_MANUAL=y
@@ -136,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
136# Code maturity level options 138# Code maturity level options
137# 139#
138CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
142 143
@@ -153,6 +154,7 @@ CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
154CONFIG_IKCONFIG=y 155CONFIG_IKCONFIG=y
155CONFIG_IKCONFIG_PROC=y 156CONFIG_IKCONFIG_PROC=y
157# CONFIG_RELAY is not set
156CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 169CONFIG_FUTEX=y
168CONFIG_EPOLL=y 170CONFIG_EPOLL=y
169CONFIG_SHMEM=y 171CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 172CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
@@ -181,7 +179,6 @@ CONFIG_BASE_SMALL=0
181# 179#
182CONFIG_MODULES=y 180CONFIG_MODULES=y
183# CONFIG_MODULE_UNLOAD is not set 181# CONFIG_MODULE_UNLOAD is not set
184CONFIG_OBSOLETE_MODPARM=y
185# CONFIG_MODVERSIONS is not set 182# CONFIG_MODVERSIONS is not set
186# CONFIG_MODULE_SRCVERSION_ALL is not set 183# CONFIG_MODULE_SRCVERSION_ALL is not set
187CONFIG_KMOD=y 184CONFIG_KMOD=y
@@ -190,6 +187,8 @@ CONFIG_KMOD=y
190# Block layer 187# Block layer
191# 188#
192# CONFIG_LBD is not set 189# CONFIG_LBD is not set
190# CONFIG_BLK_DEV_IO_TRACE is not set
191# CONFIG_LSF is not set
193 192
194# 193#
195# IO Schedulers 194# IO Schedulers
@@ -209,7 +208,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
209# 208#
210CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
211CONFIG_PCI=y 210CONFIG_PCI=y
212# CONFIG_PCI_LEGACY_PROC is not set
213# CONFIG_PCI_DEBUG is not set 211# CONFIG_PCI_DEBUG is not set
214CONFIG_MMU=y 212CONFIG_MMU=y
215 213
@@ -238,6 +236,7 @@ CONFIG_NET=y
238# 236#
239# Networking options 237# Networking options
240# 238#
239# CONFIG_NETDEBUG is not set
241CONFIG_PACKET=y 240CONFIG_PACKET=y
242# CONFIG_PACKET_MMAP is not set 241# CONFIG_PACKET_MMAP is not set
243CONFIG_UNIX=y 242CONFIG_UNIX=y
@@ -257,12 +256,15 @@ CONFIG_IP_PNP_BOOTP=y
257# CONFIG_INET_AH is not set 256# CONFIG_INET_AH is not set
258# CONFIG_INET_ESP is not set 257# CONFIG_INET_ESP is not set
259# CONFIG_INET_IPCOMP is not set 258# CONFIG_INET_IPCOMP is not set
259# CONFIG_INET_XFRM_TUNNEL is not set
260# CONFIG_INET_TUNNEL is not set 260# CONFIG_INET_TUNNEL is not set
261CONFIG_INET_DIAG=y 261CONFIG_INET_DIAG=y
262CONFIG_INET_TCP_DIAG=y 262CONFIG_INET_TCP_DIAG=y
263# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
264CONFIG_TCP_CONG_BIC=y 264CONFIG_TCP_CONG_BIC=y
265# CONFIG_IPV6 is not set 265# CONFIG_IPV6 is not set
266# CONFIG_INET6_XFRM_TUNNEL is not set
267# CONFIG_INET6_TUNNEL is not set
266# CONFIG_NETFILTER is not set 268# CONFIG_NETFILTER is not set
267 269
268# 270#
@@ -274,6 +276,11 @@ CONFIG_TCP_CONG_BIC=y
274# SCTP Configuration (EXPERIMENTAL) 276# SCTP Configuration (EXPERIMENTAL)
275# 277#
276# CONFIG_IP_SCTP is not set 278# CONFIG_IP_SCTP is not set
279
280#
281# TIPC Configuration (EXPERIMENTAL)
282#
283# CONFIG_TIPC is not set
277# CONFIG_ATM is not set 284# CONFIG_ATM is not set
278# CONFIG_BRIDGE is not set 285# CONFIG_BRIDGE is not set
279# CONFIG_VLAN_8021Q is not set 286# CONFIG_VLAN_8021Q is not set
@@ -283,11 +290,6 @@ CONFIG_TCP_CONG_BIC=y
283# CONFIG_ATALK is not set 290# CONFIG_ATALK is not set
284# CONFIG_X25 is not set 291# CONFIG_X25 is not set
285# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
286
287#
288# TIPC Configuration (EXPERIMENTAL)
289#
290# CONFIG_TIPC is not set
291# CONFIG_NET_DIVERT is not set 293# CONFIG_NET_DIVERT is not set
292# CONFIG_ECONET is not set 294# CONFIG_ECONET is not set
293# CONFIG_WAN_ROUTER is not set 295# CONFIG_WAN_ROUTER is not set
@@ -469,7 +471,6 @@ CONFIG_ISCSI_TCP=m
469# CONFIG_SCSI_INIA100 is not set 471# CONFIG_SCSI_INIA100 is not set
470# CONFIG_SCSI_SYM53C8XX_2 is not set 472# CONFIG_SCSI_SYM53C8XX_2 is not set
471# CONFIG_SCSI_IPR is not set 473# CONFIG_SCSI_IPR is not set
472# CONFIG_SCSI_QLOGIC_FC is not set
473# CONFIG_SCSI_QLOGIC_1280 is not set 474# CONFIG_SCSI_QLOGIC_1280 is not set
474# CONFIG_SCSI_QLA_FC is not set 475# CONFIG_SCSI_QLA_FC is not set
475# CONFIG_SCSI_LPFC is not set 476# CONFIG_SCSI_LPFC is not set
@@ -671,6 +672,7 @@ CONFIG_HW_CONSOLE=y
671# Non-8250 serial port support 672# Non-8250 serial port support
672# 673#
673# CONFIG_SERIAL_IP3106 is not set 674# CONFIG_SERIAL_IP3106 is not set
675# CONFIG_SERIAL_JSM is not set
674CONFIG_UNIX98_PTYS=y 676CONFIG_UNIX98_PTYS=y
675CONFIG_LEGACY_PTYS=y 677CONFIG_LEGACY_PTYS=y
676CONFIG_LEGACY_PTY_COUNT=256 678CONFIG_LEGACY_PTY_COUNT=256
@@ -723,6 +725,7 @@ CONFIG_LEGACY_PTY_COUNT=256
723# 725#
724CONFIG_HWMON=y 726CONFIG_HWMON=y
725# CONFIG_HWMON_VID is not set 727# CONFIG_HWMON_VID is not set
728# CONFIG_SENSORS_F71805F is not set
726# CONFIG_HWMON_DEBUG_CHIP is not set 729# CONFIG_HWMON_DEBUG_CHIP is not set
727 730
728# 731#
@@ -730,10 +733,6 @@ CONFIG_HWMON=y
730# 733#
731 734
732# 735#
733# Multimedia Capabilities Port drivers
734#
735
736#
737# Multimedia devices 736# Multimedia devices
738# 737#
739# CONFIG_VIDEO_DEV is not set 738# CONFIG_VIDEO_DEV is not set
@@ -742,6 +741,7 @@ CONFIG_HWMON=y
742# Digital Video Broadcasting Devices 741# Digital Video Broadcasting Devices
743# 742#
744# CONFIG_DVB is not set 743# CONFIG_DVB is not set
744# CONFIG_USB_DABUSB is not set
745 745
746# 746#
747# Graphics support 747# Graphics support
@@ -764,6 +764,7 @@ CONFIG_DUMMY_CONSOLE=y
764# 764#
765CONFIG_USB_ARCH_HAS_HCD=y 765CONFIG_USB_ARCH_HAS_HCD=y
766CONFIG_USB_ARCH_HAS_OHCI=y 766CONFIG_USB_ARCH_HAS_OHCI=y
767CONFIG_USB_ARCH_HAS_EHCI=y
767CONFIG_USB=y 768CONFIG_USB=y
768# CONFIG_USB_DEBUG is not set 769# CONFIG_USB_DEBUG is not set
769 770
@@ -827,9 +828,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
827# CONFIG_USB_ACECAD is not set 828# CONFIG_USB_ACECAD is not set
828# CONFIG_USB_KBTAB is not set 829# CONFIG_USB_KBTAB is not set
829# CONFIG_USB_POWERMATE is not set 830# CONFIG_USB_POWERMATE is not set
830# CONFIG_USB_MTOUCH is not set 831# CONFIG_USB_TOUCHSCREEN is not set
831# CONFIG_USB_ITMTOUCH is not set
832# CONFIG_USB_EGALAX is not set
833# CONFIG_USB_YEALINK is not set 832# CONFIG_USB_YEALINK is not set
834# CONFIG_USB_XPAD is not set 833# CONFIG_USB_XPAD is not set
835# CONFIG_USB_ATI_REMOTE is not set 834# CONFIG_USB_ATI_REMOTE is not set
@@ -844,15 +843,6 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
844# CONFIG_USB_MICROTEK is not set 843# CONFIG_USB_MICROTEK is not set
845 844
846# 845#
847# USB Multimedia devices
848#
849# CONFIG_USB_DABUSB is not set
850
851#
852# Video4Linux support is needed for USB Multimedia device support
853#
854
855#
856# USB Network Adapters 846# USB Network Adapters
857# 847#
858# CONFIG_USB_CATC is not set 848# CONFIG_USB_CATC is not set
@@ -902,13 +892,31 @@ CONFIG_USB_MON=y
902# CONFIG_MMC is not set 892# CONFIG_MMC is not set
903 893
904# 894#
895# LED devices
896#
897# CONFIG_NEW_LEDS is not set
898
899#
900# LED drivers
901#
902
903#
904# LED Triggers
905#
906
907#
905# InfiniBand support 908# InfiniBand support
906# 909#
907# CONFIG_INFINIBAND is not set 910# CONFIG_INFINIBAND is not set
908 911
909# 912#
910# SN Devices 913# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
914#
915
916#
917# Real Time Clock
911# 918#
919# CONFIG_RTC_CLASS is not set
912 920
913# 921#
914# File systems 922# File systems
@@ -956,7 +964,6 @@ CONFIG_SYSFS=y
956CONFIG_TMPFS=y 964CONFIG_TMPFS=y
957# CONFIG_HUGETLB_PAGE is not set 965# CONFIG_HUGETLB_PAGE is not set
958CONFIG_RAMFS=y 966CONFIG_RAMFS=y
959# CONFIG_RELAYFS_FS is not set
960# CONFIG_CONFIGFS_FS is not set 967# CONFIG_CONFIGFS_FS is not set
961 968
962# 969#
@@ -1067,6 +1074,7 @@ CONFIG_LOG_BUF_SHIFT=14
1067CONFIG_DETECT_SOFTLOCKUP=y 1074CONFIG_DETECT_SOFTLOCKUP=y
1068# CONFIG_SCHEDSTATS is not set 1075# CONFIG_SCHEDSTATS is not set
1069CONFIG_DEBUG_SLAB=y 1076CONFIG_DEBUG_SLAB=y
1077# CONFIG_DEBUG_SLAB_LEAK is not set
1070CONFIG_DEBUG_MUTEXES=y 1078CONFIG_DEBUG_MUTEXES=y
1071# CONFIG_DEBUG_SPINLOCK is not set 1079# CONFIG_DEBUG_SPINLOCK is not set
1072# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1080# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 4187287f0763..3c8f35162fec 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:28 2006 4# Mon Apr 24 14:51:14 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_PNX8550_V2PCI=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -114,12 +116,11 @@ CONFIG_PAGE_SIZE_4KB=y
114CONFIG_CPU_HAS_PREFETCH=y 116CONFIG_CPU_HAS_PREFETCH=y
115# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
116# CONFIG_64BIT_PHYS_ADDR is not set 118# CONFIG_64BIT_PHYS_ADDR is not set
117CONFIG_CPU_ADVANCED=y
118CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
119# CONFIG_CPU_HAS_WB is not set
120CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
123CONFIG_CPU_SUPPORTS_HIGHMEM=y
123CONFIG_ARCH_FLATMEM_ENABLE=y 124CONFIG_ARCH_FLATMEM_ENABLE=y
124CONFIG_SELECT_MEMORY_MODEL=y 125CONFIG_SELECT_MEMORY_MODEL=y
125CONFIG_FLATMEM_MANUAL=y 126CONFIG_FLATMEM_MANUAL=y
@@ -137,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 138# Code maturity level options
138# 139#
139CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
143 143
@@ -154,6 +154,7 @@ CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
155CONFIG_IKCONFIG=y 155CONFIG_IKCONFIG=y
156CONFIG_IKCONFIG_PROC=y 156CONFIG_IKCONFIG_PROC=y
157# CONFIG_RELAY is not set
157CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
@@ -167,10 +168,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 168CONFIG_FUTEX=y
168CONFIG_EPOLL=y 169CONFIG_EPOLL=y
169CONFIG_SHMEM=y 170CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 171CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
@@ -181,7 +178,6 @@ CONFIG_BASE_SMALL=0
181# 178#
182CONFIG_MODULES=y 179CONFIG_MODULES=y
183# CONFIG_MODULE_UNLOAD is not set 180# CONFIG_MODULE_UNLOAD is not set
184CONFIG_OBSOLETE_MODPARM=y
185# CONFIG_MODVERSIONS is not set 181# CONFIG_MODVERSIONS is not set
186# CONFIG_MODULE_SRCVERSION_ALL is not set 182# CONFIG_MODULE_SRCVERSION_ALL is not set
187CONFIG_KMOD=y 183CONFIG_KMOD=y
@@ -190,6 +186,8 @@ CONFIG_KMOD=y
190# Block layer 186# Block layer
191# 187#
192# CONFIG_LBD is not set 188# CONFIG_LBD is not set
189# CONFIG_BLK_DEV_IO_TRACE is not set
190# CONFIG_LSF is not set
193 191
194# 192#
195# IO Schedulers 193# IO Schedulers
@@ -209,7 +207,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
209# 207#
210CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
211CONFIG_PCI=y 209CONFIG_PCI=y
212# CONFIG_PCI_LEGACY_PROC is not set
213CONFIG_MMU=y 210CONFIG_MMU=y
214 211
215# 212#
@@ -237,6 +234,7 @@ CONFIG_NET=y
237# 234#
238# Networking options 235# Networking options
239# 236#
237# CONFIG_NETDEBUG is not set
240CONFIG_PACKET=y 238CONFIG_PACKET=y
241# CONFIG_PACKET_MMAP is not set 239# CONFIG_PACKET_MMAP is not set
242CONFIG_UNIX=y 240CONFIG_UNIX=y
@@ -256,6 +254,7 @@ CONFIG_IP_PNP=y
256# CONFIG_INET_AH is not set 254# CONFIG_INET_AH is not set
257# CONFIG_INET_ESP is not set 255# CONFIG_INET_ESP is not set
258# CONFIG_INET_IPCOMP is not set 256# CONFIG_INET_IPCOMP is not set
257# CONFIG_INET_XFRM_TUNNEL is not set
259# CONFIG_INET_TUNNEL is not set 258# CONFIG_INET_TUNNEL is not set
260CONFIG_INET_DIAG=y 259CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y 260CONFIG_INET_TCP_DIAG=y
@@ -268,9 +267,12 @@ CONFIG_TCP_CONG_BIC=y
268# CONFIG_IP_VS is not set 267# CONFIG_IP_VS is not set
269CONFIG_IPV6=m 268CONFIG_IPV6=m
270# CONFIG_IPV6_PRIVACY is not set 269# CONFIG_IPV6_PRIVACY is not set
270CONFIG_IPV6_ROUTER_PREF=y
271CONFIG_IPV6_ROUTE_INFO=y
271# CONFIG_INET6_AH is not set 272# CONFIG_INET6_AH is not set
272# CONFIG_INET6_ESP is not set 273# CONFIG_INET6_ESP is not set
273# CONFIG_INET6_IPCOMP is not set 274# CONFIG_INET6_IPCOMP is not set
275# CONFIG_INET6_XFRM_TUNNEL is not set
274# CONFIG_INET6_TUNNEL is not set 276# CONFIG_INET6_TUNNEL is not set
275# CONFIG_IPV6_TUNNEL is not set 277# CONFIG_IPV6_TUNNEL is not set
276CONFIG_NETFILTER=y 278CONFIG_NETFILTER=y
@@ -287,10 +289,12 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
287CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 289CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
288CONFIG_NETFILTER_XT_MATCH_COMMENT=m 290CONFIG_NETFILTER_XT_MATCH_COMMENT=m
289CONFIG_NETFILTER_XT_MATCH_DCCP=m 291CONFIG_NETFILTER_XT_MATCH_DCCP=m
292CONFIG_NETFILTER_XT_MATCH_ESP=m
290CONFIG_NETFILTER_XT_MATCH_LENGTH=m 293CONFIG_NETFILTER_XT_MATCH_LENGTH=m
291CONFIG_NETFILTER_XT_MATCH_LIMIT=m 294CONFIG_NETFILTER_XT_MATCH_LIMIT=m
292CONFIG_NETFILTER_XT_MATCH_MAC=m 295CONFIG_NETFILTER_XT_MATCH_MAC=m
293CONFIG_NETFILTER_XT_MATCH_MARK=m 296CONFIG_NETFILTER_XT_MATCH_MARK=m
297CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
294CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 298CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
295CONFIG_NETFILTER_XT_MATCH_REALM=m 299CONFIG_NETFILTER_XT_MATCH_REALM=m
296CONFIG_NETFILTER_XT_MATCH_SCTP=m 300CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -320,6 +324,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
320# SCTP Configuration (EXPERIMENTAL) 324# SCTP Configuration (EXPERIMENTAL)
321# 325#
322# CONFIG_IP_SCTP is not set 326# CONFIG_IP_SCTP is not set
327
328#
329# TIPC Configuration (EXPERIMENTAL)
330#
331# CONFIG_TIPC is not set
323# CONFIG_ATM is not set 332# CONFIG_ATM is not set
324# CONFIG_BRIDGE is not set 333# CONFIG_BRIDGE is not set
325# CONFIG_VLAN_8021Q is not set 334# CONFIG_VLAN_8021Q is not set
@@ -329,11 +338,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
329# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
330# CONFIG_X25 is not set 339# CONFIG_X25 is not set
331# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
332
333#
334# TIPC Configuration (EXPERIMENTAL)
335#
336# CONFIG_TIPC is not set
337# CONFIG_NET_DIVERT is not set 341# CONFIG_NET_DIVERT is not set
338# CONFIG_ECONET is not set 342# CONFIG_ECONET is not set
339# CONFIG_WAN_ROUTER is not set 343# CONFIG_WAN_ROUTER is not set
@@ -521,7 +525,6 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
521# CONFIG_SCSI_INIA100 is not set 525# CONFIG_SCSI_INIA100 is not set
522# CONFIG_SCSI_SYM53C8XX_2 is not set 526# CONFIG_SCSI_SYM53C8XX_2 is not set
523# CONFIG_SCSI_IPR is not set 527# CONFIG_SCSI_IPR is not set
524# CONFIG_SCSI_QLOGIC_FC is not set
525# CONFIG_SCSI_QLOGIC_1280 is not set 528# CONFIG_SCSI_QLOGIC_1280 is not set
526# CONFIG_SCSI_QLA_FC is not set 529# CONFIG_SCSI_QLA_FC is not set
527# CONFIG_SCSI_LPFC is not set 530# CONFIG_SCSI_LPFC is not set
@@ -757,6 +760,7 @@ CONFIG_SERIAL_NONSTANDARD=y
757# Non-8250 serial port support 760# Non-8250 serial port support
758# 761#
759# CONFIG_SERIAL_IP3106 is not set 762# CONFIG_SERIAL_IP3106 is not set
763# CONFIG_SERIAL_JSM is not set
760CONFIG_UNIX98_PTYS=y 764CONFIG_UNIX98_PTYS=y
761CONFIG_LEGACY_PTYS=y 765CONFIG_LEGACY_PTYS=y
762CONFIG_LEGACY_PTY_COUNT=256 766CONFIG_LEGACY_PTY_COUNT=256
@@ -816,7 +820,6 @@ CONFIG_I2C_ALGOBIT=m
816# CONFIG_I2C_PARPORT_LIGHT is not set 820# CONFIG_I2C_PARPORT_LIGHT is not set
817# CONFIG_I2C_PROSAVAGE is not set 821# CONFIG_I2C_PROSAVAGE is not set
818# CONFIG_I2C_SAVAGE4 is not set 822# CONFIG_I2C_SAVAGE4 is not set
819# CONFIG_SCx200_ACB is not set
820# CONFIG_I2C_SIS5595 is not set 823# CONFIG_I2C_SIS5595 is not set
821# CONFIG_I2C_SIS630 is not set 824# CONFIG_I2C_SIS630 is not set
822# CONFIG_I2C_SIS96X is not set 825# CONFIG_I2C_SIS96X is not set
@@ -835,9 +838,7 @@ CONFIG_I2C_ALGOBIT=m
835# CONFIG_SENSORS_PCF8574 is not set 838# CONFIG_SENSORS_PCF8574 is not set
836# CONFIG_SENSORS_PCA9539 is not set 839# CONFIG_SENSORS_PCA9539 is not set
837# CONFIG_SENSORS_PCF8591 is not set 840# CONFIG_SENSORS_PCF8591 is not set
838# CONFIG_SENSORS_RTC8564 is not set
839# CONFIG_SENSORS_MAX6875 is not set 841# CONFIG_SENSORS_MAX6875 is not set
840# CONFIG_RTC_X1205_I2C is not set
841# CONFIG_I2C_DEBUG_CORE is not set 842# CONFIG_I2C_DEBUG_CORE is not set
842# CONFIG_I2C_DEBUG_ALGO is not set 843# CONFIG_I2C_DEBUG_ALGO is not set
843# CONFIG_I2C_DEBUG_BUS is not set 844# CONFIG_I2C_DEBUG_BUS is not set
@@ -867,6 +868,7 @@ CONFIG_HWMON=y
867# CONFIG_SENSORS_ASB100 is not set 868# CONFIG_SENSORS_ASB100 is not set
868# CONFIG_SENSORS_ATXP1 is not set 869# CONFIG_SENSORS_ATXP1 is not set
869# CONFIG_SENSORS_DS1621 is not set 870# CONFIG_SENSORS_DS1621 is not set
871# CONFIG_SENSORS_F71805F is not set
870# CONFIG_SENSORS_FSCHER is not set 872# CONFIG_SENSORS_FSCHER is not set
871# CONFIG_SENSORS_FSCPOS is not set 873# CONFIG_SENSORS_FSCPOS is not set
872# CONFIG_SENSORS_GL518SM is not set 874# CONFIG_SENSORS_GL518SM is not set
@@ -901,10 +903,6 @@ CONFIG_HWMON=y
901# 903#
902 904
903# 905#
904# Multimedia Capabilities Port drivers
905#
906
907#
908# Multimedia devices 906# Multimedia devices
909# 907#
910# CONFIG_VIDEO_DEV is not set 908# CONFIG_VIDEO_DEV is not set
@@ -913,6 +911,7 @@ CONFIG_HWMON=y
913# Digital Video Broadcasting Devices 911# Digital Video Broadcasting Devices
914# 912#
915# CONFIG_DVB is not set 913# CONFIG_DVB is not set
914# CONFIG_USB_DABUSB is not set
916 915
917# 916#
918# Graphics support 917# Graphics support
@@ -922,6 +921,7 @@ CONFIG_FB=y
922# CONFIG_FB_CFB_COPYAREA is not set 921# CONFIG_FB_CFB_COPYAREA is not set
923# CONFIG_FB_CFB_IMAGEBLIT is not set 922# CONFIG_FB_CFB_IMAGEBLIT is not set
924# CONFIG_FB_MACMODES is not set 923# CONFIG_FB_MACMODES is not set
924CONFIG_FB_FIRMWARE_EDID=y
925# CONFIG_FB_MODE_HELPERS is not set 925# CONFIG_FB_MODE_HELPERS is not set
926# CONFIG_FB_TILEBLITTING is not set 926# CONFIG_FB_TILEBLITTING is not set
927# CONFIG_FB_CIRRUS is not set 927# CONFIG_FB_CIRRUS is not set
@@ -933,7 +933,6 @@ CONFIG_FB=y
933# CONFIG_FB_NVIDIA is not set 933# CONFIG_FB_NVIDIA is not set
934# CONFIG_FB_RIVA is not set 934# CONFIG_FB_RIVA is not set
935# CONFIG_FB_MATROX is not set 935# CONFIG_FB_MATROX is not set
936# CONFIG_FB_RADEON_OLD is not set
937# CONFIG_FB_RADEON is not set 936# CONFIG_FB_RADEON is not set
938# CONFIG_FB_ATY128 is not set 937# CONFIG_FB_ATY128 is not set
939# CONFIG_FB_ATY is not set 938# CONFIG_FB_ATY is not set
@@ -970,6 +969,7 @@ CONFIG_DUMMY_CONSOLE=y
970# 969#
971CONFIG_USB_ARCH_HAS_HCD=y 970CONFIG_USB_ARCH_HAS_HCD=y
972CONFIG_USB_ARCH_HAS_OHCI=y 971CONFIG_USB_ARCH_HAS_OHCI=y
972CONFIG_USB_ARCH_HAS_EHCI=y
973CONFIG_USB=y 973CONFIG_USB=y
974# CONFIG_USB_DEBUG is not set 974# CONFIG_USB_DEBUG is not set
975 975
@@ -1030,9 +1030,7 @@ CONFIG_USB_HIDDEV=y
1030# CONFIG_USB_ACECAD is not set 1030# CONFIG_USB_ACECAD is not set
1031# CONFIG_USB_KBTAB is not set 1031# CONFIG_USB_KBTAB is not set
1032# CONFIG_USB_POWERMATE is not set 1032# CONFIG_USB_POWERMATE is not set
1033# CONFIG_USB_MTOUCH is not set 1033# CONFIG_USB_TOUCHSCREEN is not set
1034# CONFIG_USB_ITMTOUCH is not set
1035# CONFIG_USB_EGALAX is not set
1036# CONFIG_USB_YEALINK is not set 1034# CONFIG_USB_YEALINK is not set
1037# CONFIG_USB_XPAD is not set 1035# CONFIG_USB_XPAD is not set
1038# CONFIG_USB_ATI_REMOTE is not set 1036# CONFIG_USB_ATI_REMOTE is not set
@@ -1047,15 +1045,6 @@ CONFIG_USB_HIDDEV=y
1047# CONFIG_USB_MICROTEK is not set 1045# CONFIG_USB_MICROTEK is not set
1048 1046
1049# 1047#
1050# USB Multimedia devices
1051#
1052# CONFIG_USB_DABUSB is not set
1053
1054#
1055# Video4Linux support is needed for USB Multimedia device support
1056#
1057
1058#
1059# USB Network Adapters 1048# USB Network Adapters
1060# 1049#
1061# CONFIG_USB_CATC is not set 1050# CONFIG_USB_CATC is not set
@@ -1106,13 +1095,31 @@ CONFIG_USB_MON=y
1106# CONFIG_MMC is not set 1095# CONFIG_MMC is not set
1107 1096
1108# 1097#
1098# LED devices
1099#
1100# CONFIG_NEW_LEDS is not set
1101
1102#
1103# LED drivers
1104#
1105
1106#
1107# LED Triggers
1108#
1109
1110#
1109# InfiniBand support 1111# InfiniBand support
1110# 1112#
1111# CONFIG_INFINIBAND is not set 1113# CONFIG_INFINIBAND is not set
1112 1114
1113# 1115#
1114# SN Devices 1116# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1117#
1118
1119#
1120# Real Time Clock
1115# 1121#
1122# CONFIG_RTC_CLASS is not set
1116 1123
1117# 1124#
1118# File systems 1125# File systems
@@ -1171,7 +1178,6 @@ CONFIG_SYSFS=y
1171CONFIG_TMPFS=y 1178CONFIG_TMPFS=y
1172# CONFIG_HUGETLB_PAGE is not set 1179# CONFIG_HUGETLB_PAGE is not set
1173CONFIG_RAMFS=y 1180CONFIG_RAMFS=y
1174# CONFIG_RELAYFS_FS is not set
1175# CONFIG_CONFIGFS_FS is not set 1181# CONFIG_CONFIGFS_FS is not set
1176 1182
1177# 1183#
@@ -1280,6 +1286,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1280# CONFIG_MAGIC_SYSRQ is not set 1286# CONFIG_MAGIC_SYSRQ is not set
1281# CONFIG_DEBUG_KERNEL is not set 1287# CONFIG_DEBUG_KERNEL is not set
1282CONFIG_LOG_BUF_SHIFT=14 1288CONFIG_LOG_BUF_SHIFT=14
1289# CONFIG_DEBUG_FS is not set
1283CONFIG_CROSSCOMPILE=y 1290CONFIG_CROSSCOMPILE=y
1284CONFIG_CMDLINE="" 1291CONFIG_CMDLINE=""
1285 1292
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 31f5afabafa8..4bcc01dea041 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc2 3# Linux kernel version: 2.6.17-rc2
4# Sun Feb 12 19:18:55 2006 4# Mon Apr 24 14:51:15 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_COHERENT=y 70CONFIG_DMA_COHERENT=y
69CONFIG_GENERIC_ISA_DMA=y 71CONFIG_GENERIC_ISA_DMA=y
@@ -115,16 +117,17 @@ CONFIG_PAGE_SIZE_4KB=y
115CONFIG_CPU_HAS_PREFETCH=y 117CONFIG_CPU_HAS_PREFETCH=y
116# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
117# CONFIG_64BIT_PHYS_ADDR is not set 119# CONFIG_64BIT_PHYS_ADDR is not set
118# CONFIG_CPU_ADVANCED is not set
119CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
124CONFIG_CPU_SUPPORTS_HIGHMEM=y
123CONFIG_ARCH_FLATMEM_ENABLE=y 125CONFIG_ARCH_FLATMEM_ENABLE=y
124CONFIG_FLATMEM=y 126CONFIG_FLATMEM=y
125CONFIG_FLAT_NODE_MEM_MAP=y 127CONFIG_FLAT_NODE_MEM_MAP=y
126# CONFIG_SPARSEMEM_STATIC is not set 128# CONFIG_SPARSEMEM_STATIC is not set
127CONFIG_SPLIT_PTLOCK_CPUS=4 129CONFIG_SPLIT_PTLOCK_CPUS=4
130# CONFIG_SMP is not set
128CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
129# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
130# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
@@ -147,6 +150,7 @@ CONFIG_LOCALVERSION_AUTO=y
147CONFIG_SYSCTL=y 150CONFIG_SYSCTL=y
148# CONFIG_AUDIT is not set 151# CONFIG_AUDIT is not set
149# CONFIG_IKCONFIG is not set 152# CONFIG_IKCONFIG is not set
153CONFIG_RELAY=y
150CONFIG_INITRAMFS_SOURCE="" 154CONFIG_INITRAMFS_SOURCE=""
151CONFIG_EMBEDDED=y 155CONFIG_EMBEDDED=y
152CONFIG_KALLSYMS=y 156CONFIG_KALLSYMS=y
@@ -159,10 +163,6 @@ CONFIG_ELF_CORE=y
159# CONFIG_FUTEX is not set 163# CONFIG_FUTEX is not set
160# CONFIG_EPOLL is not set 164# CONFIG_EPOLL is not set
161# CONFIG_SHMEM is not set 165# CONFIG_SHMEM is not set
162CONFIG_CC_ALIGN_FUNCTIONS=0
163CONFIG_CC_ALIGN_LABELS=0
164CONFIG_CC_ALIGN_LOOPS=0
165CONFIG_CC_ALIGN_JUMPS=0
166CONFIG_SLAB=y 166CONFIG_SLAB=y
167CONFIG_TINY_SHMEM=y 167CONFIG_TINY_SHMEM=y
168CONFIG_BASE_SMALL=1 168CONFIG_BASE_SMALL=1
@@ -177,6 +177,8 @@ CONFIG_BASE_SMALL=1
177# Block layer 177# Block layer
178# 178#
179# CONFIG_LBD is not set 179# CONFIG_LBD is not set
180# CONFIG_BLK_DEV_IO_TRACE is not set
181# CONFIG_LSF is not set
180 182
181# 183#
182# IO Schedulers 184# IO Schedulers
@@ -196,6 +198,7 @@ CONFIG_DEFAULT_IOSCHED="noop"
196# 198#
197CONFIG_ISA=y 199CONFIG_ISA=y
198CONFIG_MMU=y 200CONFIG_MMU=y
201CONFIG_I8253=y
199 202
200# 203#
201# PCCARD (PCMCIA/CardBus) support 204# PCCARD (PCMCIA/CardBus) support
@@ -241,12 +244,15 @@ CONFIG_IP_PNP_BOOTP=y
241# CONFIG_INET_AH is not set 244# CONFIG_INET_AH is not set
242# CONFIG_INET_ESP is not set 245# CONFIG_INET_ESP is not set
243# CONFIG_INET_IPCOMP is not set 246# CONFIG_INET_IPCOMP is not set
247# CONFIG_INET_XFRM_TUNNEL is not set
244# CONFIG_INET_TUNNEL is not set 248# CONFIG_INET_TUNNEL is not set
245CONFIG_INET_DIAG=y 249CONFIG_INET_DIAG=y
246CONFIG_INET_TCP_DIAG=y 250CONFIG_INET_TCP_DIAG=y
247# CONFIG_TCP_CONG_ADVANCED is not set 251# CONFIG_TCP_CONG_ADVANCED is not set
248CONFIG_TCP_CONG_BIC=y 252CONFIG_TCP_CONG_BIC=y
249# CONFIG_IPV6 is not set 253# CONFIG_IPV6 is not set
254# CONFIG_INET6_XFRM_TUNNEL is not set
255# CONFIG_INET6_TUNNEL is not set
250# CONFIG_NETFILTER is not set 256# CONFIG_NETFILTER is not set
251# CONFIG_BRIDGE is not set 257# CONFIG_BRIDGE is not set
252# CONFIG_VLAN_8021Q is not set 258# CONFIG_VLAN_8021Q is not set
@@ -308,7 +314,7 @@ CONFIG_PROC_EVENTS=y
308# CONFIG_BLK_DEV_LOOP is not set 314# CONFIG_BLK_DEV_LOOP is not set
309# CONFIG_BLK_DEV_NBD is not set 315# CONFIG_BLK_DEV_NBD is not set
310# CONFIG_BLK_DEV_RAM is not set 316# CONFIG_BLK_DEV_RAM is not set
311CONFIG_BLK_DEV_RAM_COUNT=16 317# CONFIG_BLK_DEV_INITRD is not set
312# CONFIG_CDROM_PKTCDVD is not set 318# CONFIG_CDROM_PKTCDVD is not set
313# CONFIG_ATA_OVER_ETH is not set 319# CONFIG_ATA_OVER_ETH is not set
314 320
@@ -530,10 +536,6 @@ CONFIG_LEGACY_PTY_COUNT=256
530# 536#
531 537
532# 538#
533# Multimedia Capabilities Port drivers
534#
535
536#
537# Multimedia devices 539# Multimedia devices
538# 540#
539# CONFIG_VIDEO_DEV is not set 541# CONFIG_VIDEO_DEV is not set
@@ -552,6 +554,7 @@ CONFIG_LEGACY_PTY_COUNT=256
552# Console display driver support 554# Console display driver support
553# 555#
554CONFIG_VGA_CONSOLE=y 556CONFIG_VGA_CONSOLE=y
557# CONFIG_VGACON_SOFT_SCROLLBACK is not set
555# CONFIG_MDA_CONSOLE is not set 558# CONFIG_MDA_CONSOLE is not set
556CONFIG_DUMMY_CONSOLE=y 559CONFIG_DUMMY_CONSOLE=y
557 560
@@ -565,6 +568,7 @@ CONFIG_DUMMY_CONSOLE=y
565# 568#
566# CONFIG_USB_ARCH_HAS_HCD is not set 569# CONFIG_USB_ARCH_HAS_HCD is not set
567# CONFIG_USB_ARCH_HAS_OHCI is not set 570# CONFIG_USB_ARCH_HAS_OHCI is not set
571# CONFIG_USB_ARCH_HAS_EHCI is not set
568 572
569# 573#
570# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 574# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -581,15 +585,28 @@ CONFIG_DUMMY_CONSOLE=y
581# CONFIG_MMC is not set 585# CONFIG_MMC is not set
582 586
583# 587#
588# LED devices
589#
590# CONFIG_NEW_LEDS is not set
591
592#
593# LED drivers
594#
595
596#
597# LED Triggers
598#
599
600#
584# InfiniBand support 601# InfiniBand support
585# 602#
586 603
587# 604#
588# SN Devices 605# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
589# 606#
590 607
591# 608#
592# EDAC - error detection and reporting (RAS) 609# Real Time Clock
593# 610#
594 611
595# 612#
@@ -632,7 +649,6 @@ CONFIG_SYSFS=y
632# CONFIG_TMPFS is not set 649# CONFIG_TMPFS is not set
633# CONFIG_HUGETLB_PAGE is not set 650# CONFIG_HUGETLB_PAGE is not set
634CONFIG_RAMFS=y 651CONFIG_RAMFS=y
635CONFIG_RELAYFS_FS=y
636 652
637# 653#
638# Miscellaneous filesystems 654# Miscellaneous filesystems
@@ -680,6 +696,8 @@ CONFIG_MSDOS_PARTITION=y
680# CONFIG_MAGIC_SYSRQ is not set 696# CONFIG_MAGIC_SYSRQ is not set
681# CONFIG_DEBUG_KERNEL is not set 697# CONFIG_DEBUG_KERNEL is not set
682CONFIG_LOG_BUF_SHIFT=14 698CONFIG_LOG_BUF_SHIFT=14
699# CONFIG_DEBUG_FS is not set
700# CONFIG_UNWIND_INFO is not set
683CONFIG_CROSSCOMPILE=y 701CONFIG_CROSSCOMPILE=y
684CONFIG_CMDLINE="" 702CONFIG_CMDLINE=""
685 703
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index b126f763cf51..3d441932e43a 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:30 2006 4# Mon Apr 24 14:51:16 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -71,6 +71,8 @@ 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
74CONFIG_GENERIC_FIND_NEXT_BIT=y
75CONFIG_GENERIC_HWEIGHT=y
74CONFIG_GENERIC_CALIBRATE_DELAY=y 76CONFIG_GENERIC_CALIBRATE_DELAY=y
75CONFIG_DMA_NONCOHERENT=y 77CONFIG_DMA_NONCOHERENT=y
76CONFIG_DMA_NEED_PCI_MAP_STATE=y 78CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -121,10 +123,9 @@ CONFIG_PAGE_SIZE_4KB=y
121# CONFIG_PAGE_SIZE_8KB is not set 123# CONFIG_PAGE_SIZE_8KB is not set
122# CONFIG_PAGE_SIZE_16KB is not set 124# CONFIG_PAGE_SIZE_16KB is not set
123# CONFIG_PAGE_SIZE_64KB is not set 125# CONFIG_PAGE_SIZE_64KB is not set
126CONFIG_CPU_HAS_PREFETCH=y
124# CONFIG_MIPS_MT is not set 127# CONFIG_MIPS_MT is not set
125CONFIG_CPU_ADVANCED=y
126CONFIG_CPU_HAS_LLSC=y 128CONFIG_CPU_HAS_LLSC=y
127CONFIG_CPU_HAS_WB=y
128CONFIG_CPU_HAS_SYNC=y 129CONFIG_CPU_HAS_SYNC=y
129CONFIG_GENERIC_HARDIRQS=y 130CONFIG_GENERIC_HARDIRQS=y
130CONFIG_GENERIC_IRQ_PROBE=y 131CONFIG_GENERIC_IRQ_PROBE=y
@@ -145,7 +146,6 @@ CONFIG_PREEMPT_NONE=y
145# Code maturity level options 146# Code maturity level options
146# 147#
147CONFIG_EXPERIMENTAL=y 148CONFIG_EXPERIMENTAL=y
148CONFIG_CLEAN_COMPILE=y
149CONFIG_BROKEN_ON_SMP=y 149CONFIG_BROKEN_ON_SMP=y
150CONFIG_INIT_ENV_ARG_LIMIT=32 150CONFIG_INIT_ENV_ARG_LIMIT=32
151 151
@@ -162,6 +162,7 @@ CONFIG_SYSCTL=y
162# CONFIG_AUDIT is not set 162# CONFIG_AUDIT is not set
163CONFIG_IKCONFIG=y 163CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y 164CONFIG_IKCONFIG_PROC=y
165CONFIG_RELAY=y
165CONFIG_INITRAMFS_SOURCE="" 166CONFIG_INITRAMFS_SOURCE=""
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_EMBEDDED=y 168CONFIG_EMBEDDED=y
@@ -175,10 +176,6 @@ CONFIG_BASE_FULL=y
175# CONFIG_FUTEX is not set 176# CONFIG_FUTEX is not set
176# CONFIG_EPOLL is not set 177# CONFIG_EPOLL is not set
177CONFIG_SHMEM=y 178CONFIG_SHMEM=y
178CONFIG_CC_ALIGN_FUNCTIONS=0
179CONFIG_CC_ALIGN_LABELS=0
180CONFIG_CC_ALIGN_LOOPS=0
181CONFIG_CC_ALIGN_JUMPS=0
182CONFIG_SLAB=y 179CONFIG_SLAB=y
183# CONFIG_TINY_SHMEM is not set 180# CONFIG_TINY_SHMEM is not set
184CONFIG_BASE_SMALL=0 181CONFIG_BASE_SMALL=0
@@ -190,7 +187,6 @@ CONFIG_OBSOLETE_INTERMODULE=y
190# 187#
191CONFIG_MODULES=y 188CONFIG_MODULES=y
192# CONFIG_MODULE_UNLOAD is not set 189# CONFIG_MODULE_UNLOAD is not set
193CONFIG_OBSOLETE_MODPARM=y
194# CONFIG_MODVERSIONS is not set 190# CONFIG_MODVERSIONS is not set
195# CONFIG_MODULE_SRCVERSION_ALL is not set 191# CONFIG_MODULE_SRCVERSION_ALL is not set
196CONFIG_KMOD=y 192CONFIG_KMOD=y
@@ -199,6 +195,8 @@ CONFIG_KMOD=y
199# Block layer 195# Block layer
200# 196#
201# CONFIG_LBD is not set 197# CONFIG_LBD is not set
198# CONFIG_BLK_DEV_IO_TRACE is not set
199# CONFIG_LSF is not set
202 200
203# 201#
204# IO Schedulers 202# IO Schedulers
@@ -218,7 +216,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
218# 216#
219CONFIG_HW_HAS_PCI=y 217CONFIG_HW_HAS_PCI=y
220CONFIG_PCI=y 218CONFIG_PCI=y
221# CONFIG_PCI_LEGACY_PROC is not set
222CONFIG_ISA=y 219CONFIG_ISA=y
223CONFIG_MMU=y 220CONFIG_MMU=y
224 221
@@ -247,6 +244,7 @@ CONFIG_NET=y
247# 244#
248# Networking options 245# Networking options
249# 246#
247# CONFIG_NETDEBUG is not set
250CONFIG_PACKET=y 248CONFIG_PACKET=y
251# CONFIG_PACKET_MMAP is not set 249# CONFIG_PACKET_MMAP is not set
252CONFIG_UNIX=y 250CONFIG_UNIX=y
@@ -267,6 +265,7 @@ CONFIG_IP_PNP_BOOTP=y
267# CONFIG_INET_AH is not set 265# CONFIG_INET_AH is not set
268# CONFIG_INET_ESP is not set 266# CONFIG_INET_ESP is not set
269# CONFIG_INET_IPCOMP is not set 267# CONFIG_INET_IPCOMP is not set
268# CONFIG_INET_XFRM_TUNNEL is not set
270# CONFIG_INET_TUNNEL is not set 269# CONFIG_INET_TUNNEL is not set
271CONFIG_INET_DIAG=y 270CONFIG_INET_DIAG=y
272CONFIG_INET_TCP_DIAG=y 271CONFIG_INET_TCP_DIAG=y
@@ -279,9 +278,12 @@ CONFIG_TCP_CONG_BIC=y
279# CONFIG_IP_VS is not set 278# CONFIG_IP_VS is not set
280CONFIG_IPV6=m 279CONFIG_IPV6=m
281# CONFIG_IPV6_PRIVACY is not set 280# CONFIG_IPV6_PRIVACY is not set
281CONFIG_IPV6_ROUTER_PREF=y
282CONFIG_IPV6_ROUTE_INFO=y
282# CONFIG_INET6_AH is not set 283# CONFIG_INET6_AH is not set
283# CONFIG_INET6_ESP is not set 284# CONFIG_INET6_ESP is not set
284# CONFIG_INET6_IPCOMP is not set 285# CONFIG_INET6_IPCOMP is not set
286# CONFIG_INET6_XFRM_TUNNEL is not set
285# CONFIG_INET6_TUNNEL is not set 287# CONFIG_INET6_TUNNEL is not set
286# CONFIG_IPV6_TUNNEL is not set 288# CONFIG_IPV6_TUNNEL is not set
287CONFIG_NETFILTER=y 289CONFIG_NETFILTER=y
@@ -300,10 +302,12 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
300CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
301CONFIG_NETFILTER_XT_MATCH_COMMENT=m 303CONFIG_NETFILTER_XT_MATCH_COMMENT=m
302CONFIG_NETFILTER_XT_MATCH_DCCP=m 304CONFIG_NETFILTER_XT_MATCH_DCCP=m
305CONFIG_NETFILTER_XT_MATCH_ESP=m
303CONFIG_NETFILTER_XT_MATCH_LENGTH=m 306CONFIG_NETFILTER_XT_MATCH_LENGTH=m
304CONFIG_NETFILTER_XT_MATCH_LIMIT=m 307CONFIG_NETFILTER_XT_MATCH_LIMIT=m
305CONFIG_NETFILTER_XT_MATCH_MAC=m 308CONFIG_NETFILTER_XT_MATCH_MAC=m
306CONFIG_NETFILTER_XT_MATCH_MARK=m 309CONFIG_NETFILTER_XT_MATCH_MARK=m
310CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
307CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 311CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
308CONFIG_NETFILTER_XT_MATCH_REALM=m 312CONFIG_NETFILTER_XT_MATCH_REALM=m
309CONFIG_NETFILTER_XT_MATCH_SCTP=m 313CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -333,6 +337,11 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
333# SCTP Configuration (EXPERIMENTAL) 337# SCTP Configuration (EXPERIMENTAL)
334# 338#
335# CONFIG_IP_SCTP is not set 339# CONFIG_IP_SCTP is not set
340
341#
342# TIPC Configuration (EXPERIMENTAL)
343#
344# CONFIG_TIPC is not set
336# CONFIG_ATM is not set 345# CONFIG_ATM is not set
337# CONFIG_BRIDGE is not set 346# CONFIG_BRIDGE is not set
338# CONFIG_VLAN_8021Q is not set 347# CONFIG_VLAN_8021Q is not set
@@ -342,11 +351,6 @@ CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
342# CONFIG_ATALK is not set 351# CONFIG_ATALK is not set
343# CONFIG_X25 is not set 352# CONFIG_X25 is not set
344# CONFIG_LAPB is not set 353# CONFIG_LAPB is not set
345
346#
347# TIPC Configuration (EXPERIMENTAL)
348#
349# CONFIG_TIPC is not set
350# CONFIG_NET_DIVERT is not set 354# CONFIG_NET_DIVERT is not set
351# CONFIG_ECONET is not set 355# CONFIG_ECONET is not set
352# CONFIG_WAN_ROUTER is not set 356# CONFIG_WAN_ROUTER is not set
@@ -369,6 +373,9 @@ CONFIG_IEEE80211=m
369CONFIG_IEEE80211_CRYPT_WEP=m 373CONFIG_IEEE80211_CRYPT_WEP=m
370CONFIG_IEEE80211_CRYPT_CCMP=m 374CONFIG_IEEE80211_CRYPT_CCMP=m
371CONFIG_IEEE80211_CRYPT_TKIP=m 375CONFIG_IEEE80211_CRYPT_TKIP=m
376CONFIG_IEEE80211_SOFTMAC=m
377# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
378CONFIG_WIRELESS_EXT=y
372 379
373# 380#
374# Device Drivers 381# Device Drivers
@@ -425,7 +432,6 @@ CONFIG_MTD_CFI_I2=y
425# CONFIG_MTD_CFI_I8 is not set 432# CONFIG_MTD_CFI_I8 is not set
426CONFIG_MTD_CFI_INTELEXT=y 433CONFIG_MTD_CFI_INTELEXT=y
427CONFIG_MTD_CFI_AMDSTD=y 434CONFIG_MTD_CFI_AMDSTD=y
428CONFIG_MTD_CFI_AMDSTD_RETRY=0
429# CONFIG_MTD_CFI_STAA is not set 435# CONFIG_MTD_CFI_STAA is not set
430CONFIG_MTD_CFI_UTIL=y 436CONFIG_MTD_CFI_UTIL=y
431# CONFIG_MTD_RAM is not set 437# CONFIG_MTD_RAM is not set
@@ -447,7 +453,6 @@ CONFIG_MTD_CFI_UTIL=y
447# CONFIG_MTD_SLRAM is not set 453# CONFIG_MTD_SLRAM is not set
448# CONFIG_MTD_PHRAM is not set 454# CONFIG_MTD_PHRAM is not set
449# CONFIG_MTD_MTDRAM is not set 455# CONFIG_MTD_MTDRAM is not set
450# CONFIG_MTD_BLKMTD is not set
451# CONFIG_MTD_BLOCK2MTD is not set 456# CONFIG_MTD_BLOCK2MTD is not set
452 457
453# 458#
@@ -702,6 +707,7 @@ CONFIG_NET_PCI=y
702# Wireless LAN (non-hamradio) 707# Wireless LAN (non-hamradio)
703# 708#
704CONFIG_NET_RADIO=y 709CONFIG_NET_RADIO=y
710# CONFIG_NET_WIRELESS_RTNETLINK is not set
705 711
706# 712#
707# Obsolete Wireless cards support (pre-802.11) 713# Obsolete Wireless cards support (pre-802.11)
@@ -715,6 +721,8 @@ CONFIG_NET_RADIO=y
715# 721#
716# CONFIG_IPW2100 is not set 722# CONFIG_IPW2100 is not set
717CONFIG_IPW2200=m 723CONFIG_IPW2200=m
724# CONFIG_IPW2200_MONITOR is not set
725# CONFIG_IPW_QOS is not set
718# CONFIG_IPW2200_DEBUG is not set 726# CONFIG_IPW2200_DEBUG is not set
719# CONFIG_HERMES is not set 727# CONFIG_HERMES is not set
720# CONFIG_ATMEL is not set 728# CONFIG_ATMEL is not set
@@ -724,6 +732,7 @@ CONFIG_IPW2200=m
724# 732#
725# CONFIG_PRISM54 is not set 733# CONFIG_PRISM54 is not set
726# CONFIG_HOSTAP is not set 734# CONFIG_HOSTAP is not set
735# CONFIG_BCM43XX is not set
727CONFIG_NET_WIRELESS=y 736CONFIG_NET_WIRELESS=y
728 737
729# 738#
@@ -821,7 +830,12 @@ CONFIG_HW_CONSOLE=y
821# 830#
822# Non-8250 serial port support 831# Non-8250 serial port support
823# 832#
833CONFIG_SERIAL_CORE=y
834CONFIG_SERIAL_TXX9=y
824CONFIG_HAS_TXX9_SERIAL=y 835CONFIG_HAS_TXX9_SERIAL=y
836# CONFIG_SERIAL_TXX9_CONSOLE is not set
837# CONFIG_SERIAL_TXX9_STDSERIAL is not set
838# CONFIG_SERIAL_JSM is not set
825CONFIG_UNIX98_PTYS=y 839CONFIG_UNIX98_PTYS=y
826CONFIG_LEGACY_PTYS=y 840CONFIG_LEGACY_PTYS=y
827CONFIG_LEGACY_PTY_COUNT=256 841CONFIG_LEGACY_PTY_COUNT=256
@@ -874,6 +888,7 @@ CONFIG_LEGACY_PTY_COUNT=256
874# 888#
875CONFIG_HWMON=y 889CONFIG_HWMON=y
876# CONFIG_HWMON_VID is not set 890# CONFIG_HWMON_VID is not set
891# CONFIG_SENSORS_F71805F is not set
877# CONFIG_HWMON_DEBUG_CHIP is not set 892# CONFIG_HWMON_DEBUG_CHIP is not set
878 893
879# 894#
@@ -881,10 +896,6 @@ CONFIG_HWMON=y
881# 896#
882 897
883# 898#
884# Multimedia Capabilities Port drivers
885#
886
887#
888# Multimedia devices 899# Multimedia devices
889# 900#
890# CONFIG_VIDEO_DEV is not set 901# CONFIG_VIDEO_DEV is not set
@@ -893,6 +904,7 @@ CONFIG_HWMON=y
893# Digital Video Broadcasting Devices 904# Digital Video Broadcasting Devices
894# 905#
895# CONFIG_DVB is not set 906# CONFIG_DVB is not set
907# CONFIG_USB_DABUSB is not set
896 908
897# 909#
898# Graphics support 910# Graphics support
@@ -902,6 +914,7 @@ CONFIG_FB_CFB_FILLRECT=y
902CONFIG_FB_CFB_COPYAREA=y 914CONFIG_FB_CFB_COPYAREA=y
903CONFIG_FB_CFB_IMAGEBLIT=y 915CONFIG_FB_CFB_IMAGEBLIT=y
904# CONFIG_FB_MACMODES is not set 916# CONFIG_FB_MACMODES is not set
917CONFIG_FB_FIRMWARE_EDID=y
905# CONFIG_FB_MODE_HELPERS is not set 918# CONFIG_FB_MODE_HELPERS is not set
906# CONFIG_FB_TILEBLITTING is not set 919# CONFIG_FB_TILEBLITTING is not set
907# CONFIG_FB_CIRRUS is not set 920# CONFIG_FB_CIRRUS is not set
@@ -913,7 +926,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
913# CONFIG_FB_NVIDIA is not set 926# CONFIG_FB_NVIDIA is not set
914# CONFIG_FB_RIVA is not set 927# CONFIG_FB_RIVA is not set
915# CONFIG_FB_MATROX is not set 928# CONFIG_FB_MATROX is not set
916# CONFIG_FB_RADEON_OLD is not set
917# CONFIG_FB_RADEON is not set 929# CONFIG_FB_RADEON is not set
918# CONFIG_FB_ATY128 is not set 930# CONFIG_FB_ATY128 is not set
919CONFIG_FB_ATY=y 931CONFIG_FB_ATY=y
@@ -934,6 +946,7 @@ CONFIG_FB_ATY_CT=y
934# Console display driver support 946# Console display driver support
935# 947#
936CONFIG_VGA_CONSOLE=y 948CONFIG_VGA_CONSOLE=y
949# CONFIG_VGACON_SOFT_SCROLLBACK is not set
937# CONFIG_MDA_CONSOLE is not set 950# CONFIG_MDA_CONSOLE is not set
938CONFIG_DUMMY_CONSOLE=y 951CONFIG_DUMMY_CONSOLE=y
939# CONFIG_FRAMEBUFFER_CONSOLE is not set 952# CONFIG_FRAMEBUFFER_CONSOLE is not set
@@ -954,6 +967,7 @@ CONFIG_DUMMY_CONSOLE=y
954# 967#
955CONFIG_USB_ARCH_HAS_HCD=y 968CONFIG_USB_ARCH_HAS_HCD=y
956CONFIG_USB_ARCH_HAS_OHCI=y 969CONFIG_USB_ARCH_HAS_OHCI=y
970CONFIG_USB_ARCH_HAS_EHCI=y
957CONFIG_USB=y 971CONFIG_USB=y
958# CONFIG_USB_DEBUG is not set 972# CONFIG_USB_DEBUG is not set
959 973
@@ -1003,9 +1017,7 @@ CONFIG_USB_HIDDEV=y
1003# CONFIG_USB_ACECAD is not set 1017# CONFIG_USB_ACECAD is not set
1004# CONFIG_USB_KBTAB is not set 1018# CONFIG_USB_KBTAB is not set
1005# CONFIG_USB_POWERMATE is not set 1019# CONFIG_USB_POWERMATE is not set
1006# CONFIG_USB_MTOUCH is not set 1020# CONFIG_USB_TOUCHSCREEN is not set
1007# CONFIG_USB_ITMTOUCH is not set
1008# CONFIG_USB_EGALAX is not set
1009CONFIG_USB_YEALINK=m 1021CONFIG_USB_YEALINK=m
1010# CONFIG_USB_XPAD is not set 1022# CONFIG_USB_XPAD is not set
1011# CONFIG_USB_ATI_REMOTE is not set 1023# CONFIG_USB_ATI_REMOTE is not set
@@ -1019,15 +1031,6 @@ CONFIG_USB_YEALINK=m
1019# CONFIG_USB_MDC800 is not set 1031# CONFIG_USB_MDC800 is not set
1020 1032
1021# 1033#
1022# USB Multimedia devices
1023#
1024# CONFIG_USB_DABUSB is not set
1025
1026#
1027# Video4Linux support is needed for USB Multimedia device support
1028#
1029
1030#
1031# USB Network Adapters 1034# USB Network Adapters
1032# 1035#
1033# CONFIG_USB_CATC is not set 1036# CONFIG_USB_CATC is not set
@@ -1078,13 +1081,31 @@ CONFIG_USB_MON=y
1078# CONFIG_MMC is not set 1081# CONFIG_MMC is not set
1079 1082
1080# 1083#
1084# LED devices
1085#
1086# CONFIG_NEW_LEDS is not set
1087
1088#
1089# LED drivers
1090#
1091
1092#
1093# LED Triggers
1094#
1095
1096#
1081# InfiniBand support 1097# InfiniBand support
1082# 1098#
1083# CONFIG_INFINIBAND is not set 1099# CONFIG_INFINIBAND is not set
1084 1100
1085# 1101#
1086# SN Devices 1102# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1103#
1104
1105#
1106# Real Time Clock
1087# 1107#
1108# CONFIG_RTC_CLASS is not set
1088 1109
1089# 1110#
1090# File systems 1111# File systems
@@ -1148,7 +1169,6 @@ CONFIG_SYSFS=y
1148CONFIG_TMPFS=y 1169CONFIG_TMPFS=y
1149# CONFIG_HUGETLB_PAGE is not set 1170# CONFIG_HUGETLB_PAGE is not set
1150CONFIG_RAMFS=y 1171CONFIG_RAMFS=y
1151CONFIG_RELAYFS_FS=m
1152# CONFIG_CONFIGFS_FS is not set 1172# CONFIG_CONFIGFS_FS is not set
1153 1173
1154# 1174#
@@ -1266,6 +1286,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1266# CONFIG_MAGIC_SYSRQ is not set 1286# CONFIG_MAGIC_SYSRQ is not set
1267# CONFIG_DEBUG_KERNEL is not set 1287# CONFIG_DEBUG_KERNEL is not set
1268CONFIG_LOG_BUF_SHIFT=14 1288CONFIG_LOG_BUF_SHIFT=14
1289# CONFIG_DEBUG_FS is not set
1269CONFIG_CROSSCOMPILE=y 1290CONFIG_CROSSCOMPILE=y
1270CONFIG_CMDLINE="" 1291CONFIG_CMDLINE=""
1271 1292
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 463ed3dbf6ae..edfb9679a25a 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:31 2006 4# Mon Apr 24 14:51:16 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ CONFIG_SNI_RM200_PCI=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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_ARC=y 70CONFIG_ARC=y
69CONFIG_ARCH_MAY_HAVE_PC_FDC=y 71CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -122,7 +124,6 @@ CONFIG_PAGE_SIZE_4KB=y
122# CONFIG_PAGE_SIZE_64KB is not set 124# CONFIG_PAGE_SIZE_64KB is not set
123# CONFIG_MIPS_MT is not set 125# CONFIG_MIPS_MT is not set
124# CONFIG_64BIT_PHYS_ADDR is not set 126# CONFIG_64BIT_PHYS_ADDR is not set
125# CONFIG_CPU_ADVANCED is not set
126CONFIG_CPU_HAS_LLSC=y 127CONFIG_CPU_HAS_LLSC=y
127CONFIG_CPU_HAS_SYNC=y 128CONFIG_CPU_HAS_SYNC=y
128CONFIG_GENERIC_HARDIRQS=y 129CONFIG_GENERIC_HARDIRQS=y
@@ -145,7 +146,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
145# Code maturity level options 146# Code maturity level options
146# 147#
147CONFIG_EXPERIMENTAL=y 148CONFIG_EXPERIMENTAL=y
148CONFIG_CLEAN_COMPILE=y
149CONFIG_BROKEN_ON_SMP=y 149CONFIG_BROKEN_ON_SMP=y
150CONFIG_INIT_ENV_ARG_LIMIT=32 150CONFIG_INIT_ENV_ARG_LIMIT=32
151 151
@@ -163,6 +163,7 @@ CONFIG_SYSCTL=y
163# CONFIG_AUDIT is not set 163# CONFIG_AUDIT is not set
164CONFIG_IKCONFIG=y 164CONFIG_IKCONFIG=y
165CONFIG_IKCONFIG_PROC=y 165CONFIG_IKCONFIG_PROC=y
166CONFIG_RELAY=y
166CONFIG_INITRAMFS_SOURCE="" 167CONFIG_INITRAMFS_SOURCE=""
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_EMBEDDED=y 169CONFIG_EMBEDDED=y
@@ -176,10 +177,6 @@ CONFIG_BASE_FULL=y
176CONFIG_FUTEX=y 177CONFIG_FUTEX=y
177CONFIG_EPOLL=y 178CONFIG_EPOLL=y
178CONFIG_SHMEM=y 179CONFIG_SHMEM=y
179CONFIG_CC_ALIGN_FUNCTIONS=0
180CONFIG_CC_ALIGN_LABELS=0
181CONFIG_CC_ALIGN_LOOPS=0
182CONFIG_CC_ALIGN_JUMPS=0
183CONFIG_SLAB=y 180CONFIG_SLAB=y
184# CONFIG_TINY_SHMEM is not set 181# CONFIG_TINY_SHMEM is not set
185CONFIG_BASE_SMALL=0 182CONFIG_BASE_SMALL=0
@@ -191,7 +188,6 @@ CONFIG_BASE_SMALL=0
191CONFIG_MODULES=y 188CONFIG_MODULES=y
192CONFIG_MODULE_UNLOAD=y 189CONFIG_MODULE_UNLOAD=y
193# CONFIG_MODULE_FORCE_UNLOAD is not set 190# CONFIG_MODULE_FORCE_UNLOAD is not set
194CONFIG_OBSOLETE_MODPARM=y
195CONFIG_MODVERSIONS=y 191CONFIG_MODVERSIONS=y
196# CONFIG_MODULE_SRCVERSION_ALL is not set 192# CONFIG_MODULE_SRCVERSION_ALL is not set
197CONFIG_KMOD=y 193CONFIG_KMOD=y
@@ -200,6 +196,8 @@ CONFIG_KMOD=y
200# Block layer 196# Block layer
201# 197#
202# CONFIG_LBD is not set 198# CONFIG_LBD is not set
199# CONFIG_BLK_DEV_IO_TRACE is not set
200# CONFIG_LSF is not set
203 201
204# 202#
205# IO Schedulers 203# IO Schedulers
@@ -220,10 +218,10 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
220CONFIG_HW_HAS_EISA=y 218CONFIG_HW_HAS_EISA=y
221CONFIG_HW_HAS_PCI=y 219CONFIG_HW_HAS_PCI=y
222CONFIG_PCI=y 220CONFIG_PCI=y
223CONFIG_PCI_LEGACY_PROC=y
224CONFIG_ISA=y 221CONFIG_ISA=y
225# CONFIG_EISA is not set 222# CONFIG_EISA is not set
226CONFIG_MMU=y 223CONFIG_MMU=y
224CONFIG_I8253=y
227 225
228# 226#
229# PCCARD (PCMCIA/CardBus) support 227# PCCARD (PCMCIA/CardBus) support
@@ -250,6 +248,7 @@ CONFIG_NET=y
250# 248#
251# Networking options 249# Networking options
252# 250#
251# CONFIG_NETDEBUG is not set
253CONFIG_PACKET=m 252CONFIG_PACKET=m
254CONFIG_PACKET_MMAP=y 253CONFIG_PACKET_MMAP=y
255CONFIG_UNIX=y 254CONFIG_UNIX=y
@@ -272,6 +271,7 @@ CONFIG_IP_PIMSM_V2=y
272# CONFIG_INET_AH is not set 271# CONFIG_INET_AH is not set
273# CONFIG_INET_ESP is not set 272# CONFIG_INET_ESP is not set
274# CONFIG_INET_IPCOMP is not set 273# CONFIG_INET_IPCOMP is not set
274# CONFIG_INET_XFRM_TUNNEL is not set
275CONFIG_INET_TUNNEL=m 275CONFIG_INET_TUNNEL=m
276CONFIG_INET_DIAG=y 276CONFIG_INET_DIAG=y
277CONFIG_INET_TCP_DIAG=y 277CONFIG_INET_TCP_DIAG=y
@@ -284,9 +284,12 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_IP_VS is not set 284# CONFIG_IP_VS is not set
285CONFIG_IPV6=m 285CONFIG_IPV6=m
286CONFIG_IPV6_PRIVACY=y 286CONFIG_IPV6_PRIVACY=y
287CONFIG_IPV6_ROUTER_PREF=y
288CONFIG_IPV6_ROUTE_INFO=y
287CONFIG_INET6_AH=m 289CONFIG_INET6_AH=m
288CONFIG_INET6_ESP=m 290CONFIG_INET6_ESP=m
289CONFIG_INET6_IPCOMP=m 291CONFIG_INET6_IPCOMP=m
292CONFIG_INET6_XFRM_TUNNEL=m
290CONFIG_INET6_TUNNEL=m 293CONFIG_INET6_TUNNEL=m
291CONFIG_IPV6_TUNNEL=m 294CONFIG_IPV6_TUNNEL=m
292CONFIG_NETFILTER=y 295CONFIG_NETFILTER=y
@@ -309,11 +312,14 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m
309CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 312CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
310CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 313CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
311CONFIG_NETFILTER_XT_MATCH_DCCP=m 314CONFIG_NETFILTER_XT_MATCH_DCCP=m
315CONFIG_NETFILTER_XT_MATCH_ESP=m
312CONFIG_NETFILTER_XT_MATCH_HELPER=m 316CONFIG_NETFILTER_XT_MATCH_HELPER=m
313CONFIG_NETFILTER_XT_MATCH_LENGTH=m 317CONFIG_NETFILTER_XT_MATCH_LENGTH=m
314CONFIG_NETFILTER_XT_MATCH_LIMIT=m 318CONFIG_NETFILTER_XT_MATCH_LIMIT=m
315CONFIG_NETFILTER_XT_MATCH_MAC=m 319CONFIG_NETFILTER_XT_MATCH_MAC=m
316CONFIG_NETFILTER_XT_MATCH_MARK=m 320CONFIG_NETFILTER_XT_MATCH_MARK=m
321CONFIG_NETFILTER_XT_MATCH_POLICY=m
322CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
317CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m 323CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
318CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 324CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
319CONFIG_NETFILTER_XT_MATCH_REALM=m 325CONFIG_NETFILTER_XT_MATCH_REALM=m
@@ -337,20 +343,19 @@ CONFIG_IP_NF_IRC=m
337CONFIG_IP_NF_TFTP=m 343CONFIG_IP_NF_TFTP=m
338CONFIG_IP_NF_AMANDA=m 344CONFIG_IP_NF_AMANDA=m
339CONFIG_IP_NF_PPTP=m 345CONFIG_IP_NF_PPTP=m
346CONFIG_IP_NF_H323=m
340CONFIG_IP_NF_QUEUE=m 347CONFIG_IP_NF_QUEUE=m
341CONFIG_IP_NF_IPTABLES=m 348CONFIG_IP_NF_IPTABLES=m
342CONFIG_IP_NF_MATCH_IPRANGE=m 349CONFIG_IP_NF_MATCH_IPRANGE=m
343CONFIG_IP_NF_MATCH_MULTIPORT=m
344CONFIG_IP_NF_MATCH_TOS=m 350CONFIG_IP_NF_MATCH_TOS=m
345CONFIG_IP_NF_MATCH_RECENT=m 351CONFIG_IP_NF_MATCH_RECENT=m
346CONFIG_IP_NF_MATCH_ECN=m 352CONFIG_IP_NF_MATCH_ECN=m
347CONFIG_IP_NF_MATCH_DSCP=m 353CONFIG_IP_NF_MATCH_DSCP=m
348CONFIG_IP_NF_MATCH_AH_ESP=m 354CONFIG_IP_NF_MATCH_AH=m
349CONFIG_IP_NF_MATCH_TTL=m 355CONFIG_IP_NF_MATCH_TTL=m
350CONFIG_IP_NF_MATCH_OWNER=m 356CONFIG_IP_NF_MATCH_OWNER=m
351CONFIG_IP_NF_MATCH_ADDRTYPE=m 357CONFIG_IP_NF_MATCH_ADDRTYPE=m
352CONFIG_IP_NF_MATCH_HASHLIMIT=m 358CONFIG_IP_NF_MATCH_HASHLIMIT=m
353CONFIG_IP_NF_MATCH_POLICY=m
354CONFIG_IP_NF_FILTER=m 359CONFIG_IP_NF_FILTER=m
355CONFIG_IP_NF_TARGET_REJECT=m 360CONFIG_IP_NF_TARGET_REJECT=m
356CONFIG_IP_NF_TARGET_LOG=m 361CONFIG_IP_NF_TARGET_LOG=m
@@ -368,6 +373,7 @@ CONFIG_IP_NF_NAT_FTP=m
368CONFIG_IP_NF_NAT_TFTP=m 373CONFIG_IP_NF_NAT_TFTP=m
369CONFIG_IP_NF_NAT_AMANDA=m 374CONFIG_IP_NF_NAT_AMANDA=m
370CONFIG_IP_NF_NAT_PPTP=m 375CONFIG_IP_NF_NAT_PPTP=m
376CONFIG_IP_NF_NAT_H323=m
371CONFIG_IP_NF_MANGLE=m 377CONFIG_IP_NF_MANGLE=m
372CONFIG_IP_NF_TARGET_TOS=m 378CONFIG_IP_NF_TARGET_TOS=m
373CONFIG_IP_NF_TARGET_ECN=m 379CONFIG_IP_NF_TARGET_ECN=m
@@ -388,12 +394,10 @@ CONFIG_IP6_NF_MATCH_RT=m
388CONFIG_IP6_NF_MATCH_OPTS=m 394CONFIG_IP6_NF_MATCH_OPTS=m
389CONFIG_IP6_NF_MATCH_FRAG=m 395CONFIG_IP6_NF_MATCH_FRAG=m
390CONFIG_IP6_NF_MATCH_HL=m 396CONFIG_IP6_NF_MATCH_HL=m
391CONFIG_IP6_NF_MATCH_MULTIPORT=m
392CONFIG_IP6_NF_MATCH_OWNER=m 397CONFIG_IP6_NF_MATCH_OWNER=m
393CONFIG_IP6_NF_MATCH_IPV6HEADER=m 398CONFIG_IP6_NF_MATCH_IPV6HEADER=m
394CONFIG_IP6_NF_MATCH_AHESP=m 399CONFIG_IP6_NF_MATCH_AH=m
395CONFIG_IP6_NF_MATCH_EUI64=m 400CONFIG_IP6_NF_MATCH_EUI64=m
396CONFIG_IP6_NF_MATCH_POLICY=m
397CONFIG_IP6_NF_FILTER=m 401CONFIG_IP6_NF_FILTER=m
398CONFIG_IP6_NF_TARGET_LOG=m 402CONFIG_IP6_NF_TARGET_LOG=m
399CONFIG_IP6_NF_TARGET_REJECT=m 403CONFIG_IP6_NF_TARGET_REJECT=m
@@ -439,21 +443,22 @@ CONFIG_BRIDGE_EBT_ULOG=m
439# SCTP Configuration (EXPERIMENTAL) 443# SCTP Configuration (EXPERIMENTAL)
440# 444#
441# CONFIG_IP_SCTP is not set 445# CONFIG_IP_SCTP is not set
446
447#
448# TIPC Configuration (EXPERIMENTAL)
449#
450# CONFIG_TIPC is not set
442# CONFIG_ATM is not set 451# CONFIG_ATM is not set
443CONFIG_BRIDGE=m 452CONFIG_BRIDGE=m
444# CONFIG_VLAN_8021Q is not set 453# CONFIG_VLAN_8021Q is not set
445CONFIG_DECNET=m 454CONFIG_DECNET=m
446# CONFIG_DECNET_ROUTER is not set 455# CONFIG_DECNET_ROUTER is not set
456CONFIG_LLC=m
447# CONFIG_LLC2 is not set 457# CONFIG_LLC2 is not set
448# CONFIG_IPX is not set 458# CONFIG_IPX is not set
449# CONFIG_ATALK is not set 459# CONFIG_ATALK is not set
450# CONFIG_X25 is not set 460# CONFIG_X25 is not set
451# CONFIG_LAPB is not set 461# CONFIG_LAPB is not set
452
453#
454# TIPC Configuration (EXPERIMENTAL)
455#
456# CONFIG_TIPC is not set
457# CONFIG_NET_DIVERT is not set 462# CONFIG_NET_DIVERT is not set
458# CONFIG_ECONET is not set 463# CONFIG_ECONET is not set
459# CONFIG_WAN_ROUTER is not set 464# CONFIG_WAN_ROUTER is not set
@@ -533,6 +538,9 @@ CONFIG_IEEE80211=m
533# CONFIG_IEEE80211_DEBUG is not set 538# CONFIG_IEEE80211_DEBUG is not set
534CONFIG_IEEE80211_CRYPT_WEP=m 539CONFIG_IEEE80211_CRYPT_WEP=m
535CONFIG_IEEE80211_CRYPT_CCMP=m 540CONFIG_IEEE80211_CRYPT_CCMP=m
541CONFIG_IEEE80211_SOFTMAC=m
542# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
543CONFIG_WIRELESS_EXT=y
536 544
537# 545#
538# Device Drivers 546# Device Drivers
@@ -620,6 +628,7 @@ CONFIG_BLK_DEV_UB=m
620CONFIG_BLK_DEV_RAM=m 628CONFIG_BLK_DEV_RAM=m
621CONFIG_BLK_DEV_RAM_COUNT=16 629CONFIG_BLK_DEV_RAM_COUNT=16
622CONFIG_BLK_DEV_RAM_SIZE=4096 630CONFIG_BLK_DEV_RAM_SIZE=4096
631# CONFIG_BLK_DEV_INITRD is not set
623CONFIG_CDROM_PKTCDVD=m 632CONFIG_CDROM_PKTCDVD=m
624CONFIG_CDROM_PKTCDVD_BUFFERS=8 633CONFIG_CDROM_PKTCDVD_BUFFERS=8
625# CONFIG_CDROM_PKTCDVD_WCACHE is not set 634# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -700,12 +709,11 @@ CONFIG_SCSI_SYM53C8XX_2=y
700CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 709CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
701CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 710CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
702CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 711CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
703# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set 712CONFIG_SCSI_SYM53C8XX_MMIO=y
704# CONFIG_SCSI_IPR is not set 713# CONFIG_SCSI_IPR is not set
705# CONFIG_SCSI_PAS16 is not set 714# CONFIG_SCSI_PAS16 is not set
706# CONFIG_SCSI_PSI240I is not set 715# CONFIG_SCSI_PSI240I is not set
707# CONFIG_SCSI_QLOGIC_FAS is not set 716# CONFIG_SCSI_QLOGIC_FAS is not set
708# CONFIG_SCSI_QLOGIC_FC is not set
709# CONFIG_SCSI_QLOGIC_1280 is not set 717# CONFIG_SCSI_QLOGIC_1280 is not set
710# CONFIG_SCSI_QLA_FC is not set 718# CONFIG_SCSI_QLA_FC is not set
711# CONFIG_SCSI_LPFC is not set 719# CONFIG_SCSI_LPFC is not set
@@ -731,6 +739,7 @@ CONFIG_MD_RAID0=m
731CONFIG_MD_RAID1=m 739CONFIG_MD_RAID1=m
732CONFIG_MD_RAID10=m 740CONFIG_MD_RAID10=m
733CONFIG_MD_RAID5=m 741CONFIG_MD_RAID5=m
742CONFIG_MD_RAID5_RESHAPE=y
734# CONFIG_MD_RAID6 is not set 743# CONFIG_MD_RAID6 is not set
735CONFIG_MD_MULTIPATH=m 744CONFIG_MD_MULTIPATH=m
736CONFIG_MD_FAULTY=m 745CONFIG_MD_FAULTY=m
@@ -965,6 +974,7 @@ CONFIG_HW_CONSOLE=y
965# Serial drivers 974# Serial drivers
966# 975#
967CONFIG_SERIAL_8250=m 976CONFIG_SERIAL_8250=m
977CONFIG_SERIAL_8250_PCI=m
968CONFIG_SERIAL_8250_NR_UARTS=4 978CONFIG_SERIAL_8250_NR_UARTS=4
969CONFIG_SERIAL_8250_RUNTIME_UARTS=4 979CONFIG_SERIAL_8250_RUNTIME_UARTS=4
970CONFIG_SERIAL_8250_EXTENDED=y 980CONFIG_SERIAL_8250_EXTENDED=y
@@ -977,6 +987,7 @@ CONFIG_SERIAL_8250_RSA=y
977# Non-8250 serial port support 987# Non-8250 serial port support
978# 988#
979CONFIG_SERIAL_CORE=m 989CONFIG_SERIAL_CORE=m
990# CONFIG_SERIAL_JSM is not set
980CONFIG_UNIX98_PTYS=y 991CONFIG_UNIX98_PTYS=y
981CONFIG_LEGACY_PTYS=y 992CONFIG_LEGACY_PTYS=y
982CONFIG_LEGACY_PTY_COUNT=256 993CONFIG_LEGACY_PTY_COUNT=256
@@ -1027,12 +1038,19 @@ CONFIG_RTC=m
1027# Dallas's 1-wire bus 1038# Dallas's 1-wire bus
1028# 1039#
1029CONFIG_W1=m 1040CONFIG_W1=m
1030CONFIG_W1_MATROX=m 1041
1031CONFIG_W1_DS9490=m 1042#
1032# CONFIG_W1_DS9490_BRIDGE is not set 1043# 1-wire Bus Masters
1033CONFIG_W1_THERM=m 1044#
1034CONFIG_W1_SMEM=m 1045# CONFIG_W1_MASTER_MATROX is not set
1035# CONFIG_W1_DS2433 is not set 1046# CONFIG_W1_MASTER_DS9490 is not set
1047
1048#
1049# 1-wire Slaves
1050#
1051# CONFIG_W1_SLAVE_THERM is not set
1052# CONFIG_W1_SLAVE_SMEM is not set
1053# CONFIG_W1_SLAVE_DS2433 is not set
1036 1054
1037# 1055#
1038# Hardware Monitoring support 1056# Hardware Monitoring support
@@ -1045,10 +1063,6 @@ CONFIG_W1_SMEM=m
1045# 1063#
1046 1064
1047# 1065#
1048# Multimedia Capabilities Port drivers
1049#
1050
1051#
1052# Multimedia devices 1066# Multimedia devices
1053# 1067#
1054# CONFIG_VIDEO_DEV is not set 1068# CONFIG_VIDEO_DEV is not set
@@ -1057,6 +1071,7 @@ CONFIG_W1_SMEM=m
1057# Digital Video Broadcasting Devices 1071# Digital Video Broadcasting Devices
1058# 1072#
1059# CONFIG_DVB is not set 1073# CONFIG_DVB is not set
1074CONFIG_USB_DABUSB=m
1060 1075
1061# 1076#
1062# Graphics support 1077# Graphics support
@@ -1067,6 +1082,7 @@ CONFIG_W1_SMEM=m
1067# Console display driver support 1082# Console display driver support
1068# 1083#
1069CONFIG_VGA_CONSOLE=y 1084CONFIG_VGA_CONSOLE=y
1085# CONFIG_VGACON_SOFT_SCROLLBACK is not set
1070# CONFIG_MDA_CONSOLE is not set 1086# CONFIG_MDA_CONSOLE is not set
1071CONFIG_DUMMY_CONSOLE=y 1087CONFIG_DUMMY_CONSOLE=y
1072 1088
@@ -1080,6 +1096,7 @@ CONFIG_DUMMY_CONSOLE=y
1080# 1096#
1081CONFIG_USB_ARCH_HAS_HCD=y 1097CONFIG_USB_ARCH_HAS_HCD=y
1082CONFIG_USB_ARCH_HAS_OHCI=y 1098CONFIG_USB_ARCH_HAS_OHCI=y
1099CONFIG_USB_ARCH_HAS_EHCI=y
1083CONFIG_USB=m 1100CONFIG_USB=m
1084# CONFIG_USB_DEBUG is not set 1101# CONFIG_USB_DEBUG is not set
1085 1102
@@ -1151,9 +1168,7 @@ CONFIG_USB_WACOM=m
1151# CONFIG_USB_ACECAD is not set 1168# CONFIG_USB_ACECAD is not set
1152CONFIG_USB_KBTAB=m 1169CONFIG_USB_KBTAB=m
1153CONFIG_USB_POWERMATE=m 1170CONFIG_USB_POWERMATE=m
1154# CONFIG_USB_MTOUCH is not set 1171# CONFIG_USB_TOUCHSCREEN is not set
1155# CONFIG_USB_ITMTOUCH is not set
1156CONFIG_USB_EGALAX=m
1157CONFIG_USB_YEALINK=m 1172CONFIG_USB_YEALINK=m
1158CONFIG_USB_XPAD=m 1173CONFIG_USB_XPAD=m
1159# CONFIG_USB_ATI_REMOTE is not set 1174# CONFIG_USB_ATI_REMOTE is not set
@@ -1168,15 +1183,6 @@ CONFIG_USB_MDC800=m
1168CONFIG_USB_MICROTEK=m 1183CONFIG_USB_MICROTEK=m
1169 1184
1170# 1185#
1171# USB Multimedia devices
1172#
1173CONFIG_USB_DABUSB=m
1174
1175#
1176# Video4Linux support is needed for USB Multimedia device support
1177#
1178
1179#
1180# USB Network Adapters 1186# USB Network Adapters
1181# 1187#
1182CONFIG_USB_CATC=m 1188CONFIG_USB_CATC=m
@@ -1213,6 +1219,7 @@ CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1213CONFIG_USB_SERIAL_CYPRESS_M8=m 1219CONFIG_USB_SERIAL_CYPRESS_M8=m
1214CONFIG_USB_SERIAL_EMPEG=m 1220CONFIG_USB_SERIAL_EMPEG=m
1215CONFIG_USB_SERIAL_FTDI_SIO=m 1221CONFIG_USB_SERIAL_FTDI_SIO=m
1222# CONFIG_USB_SERIAL_FUNSOFT is not set
1216CONFIG_USB_SERIAL_VISOR=m 1223CONFIG_USB_SERIAL_VISOR=m
1217CONFIG_USB_SERIAL_IPAQ=m 1224CONFIG_USB_SERIAL_IPAQ=m
1218CONFIG_USB_SERIAL_IR=m 1225CONFIG_USB_SERIAL_IR=m
@@ -1237,6 +1244,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1237CONFIG_USB_SERIAL_KLSI=m 1244CONFIG_USB_SERIAL_KLSI=m
1238CONFIG_USB_SERIAL_KOBIL_SCT=m 1245CONFIG_USB_SERIAL_KOBIL_SCT=m
1239CONFIG_USB_SERIAL_MCT_U232=m 1246CONFIG_USB_SERIAL_MCT_U232=m
1247# CONFIG_USB_SERIAL_NAVMAN is not set
1240CONFIG_USB_SERIAL_PL2303=m 1248CONFIG_USB_SERIAL_PL2303=m
1241CONFIG_USB_SERIAL_HP4X=m 1249CONFIG_USB_SERIAL_HP4X=m
1242CONFIG_USB_SERIAL_SAFE=m 1250CONFIG_USB_SERIAL_SAFE=m
@@ -1281,13 +1289,31 @@ CONFIG_USB_TEST=m
1281# CONFIG_MMC is not set 1289# CONFIG_MMC is not set
1282 1290
1283# 1291#
1292# LED devices
1293#
1294# CONFIG_NEW_LEDS is not set
1295
1296#
1297# LED drivers
1298#
1299
1300#
1301# LED Triggers
1302#
1303
1304#
1284# InfiniBand support 1305# InfiniBand support
1285# 1306#
1286# CONFIG_INFINIBAND is not set 1307# CONFIG_INFINIBAND is not set
1287 1308
1288# 1309#
1289# SN Devices 1310# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1311#
1312
1313#
1314# Real Time Clock
1290# 1315#
1316# CONFIG_RTC_CLASS is not set
1291 1317
1292# 1318#
1293# File systems 1319# File systems
@@ -1358,7 +1384,6 @@ CONFIG_SYSFS=y
1358# CONFIG_TMPFS is not set 1384# CONFIG_TMPFS is not set
1359# CONFIG_HUGETLB_PAGE is not set 1385# CONFIG_HUGETLB_PAGE is not set
1360CONFIG_RAMFS=y 1386CONFIG_RAMFS=y
1361CONFIG_RELAYFS_FS=m
1362# CONFIG_CONFIGFS_FS is not set 1387# CONFIG_CONFIGFS_FS is not set
1363 1388
1364# 1389#
@@ -1379,7 +1404,6 @@ CONFIG_HPFS_FS=m
1379CONFIG_QNX4FS_FS=m 1404CONFIG_QNX4FS_FS=m
1380CONFIG_SYSV_FS=m 1405CONFIG_SYSV_FS=m
1381CONFIG_UFS_FS=m 1406CONFIG_UFS_FS=m
1382# CONFIG_UFS_FS_WRITE is not set
1383 1407
1384# 1408#
1385# Network File Systems 1409# Network File Systems
@@ -1500,6 +1524,7 @@ CONFIG_NLS_UTF8=m
1500# CONFIG_MAGIC_SYSRQ is not set 1524# CONFIG_MAGIC_SYSRQ is not set
1501# CONFIG_DEBUG_KERNEL is not set 1525# CONFIG_DEBUG_KERNEL is not set
1502CONFIG_LOG_BUF_SHIFT=14 1526CONFIG_LOG_BUF_SHIFT=14
1527# CONFIG_DEBUG_FS is not set
1503CONFIG_CROSSCOMPILE=y 1528CONFIG_CROSSCOMPILE=y
1504CONFIG_CMDLINE="" 1529CONFIG_CMDLINE=""
1505 1530
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index da68c3f72050..e388a3dae0a9 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:32 2006 4# Mon Apr 24 14:51:17 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -81,6 +81,8 @@ 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
84CONFIG_GENERIC_FIND_NEXT_BIT=y
85CONFIG_GENERIC_HWEIGHT=y
84CONFIG_GENERIC_CALIBRATE_DELAY=y 86CONFIG_GENERIC_CALIBRATE_DELAY=y
85CONFIG_DMA_COHERENT=y 87CONFIG_DMA_COHERENT=y
86CONFIG_CPU_BIG_ENDIAN=y 88CONFIG_CPU_BIG_ENDIAN=y
@@ -158,7 +160,6 @@ CONFIG_PREEMPT_BKL=y
158# Code maturity level options 160# Code maturity level options
159# 161#
160CONFIG_EXPERIMENTAL=y 162CONFIG_EXPERIMENTAL=y
161CONFIG_CLEAN_COMPILE=y
162CONFIG_LOCK_KERNEL=y 163CONFIG_LOCK_KERNEL=y
163CONFIG_INIT_ENV_ARG_LIMIT=32 164CONFIG_INIT_ENV_ARG_LIMIT=32
164 165
@@ -175,6 +176,7 @@ CONFIG_SYSCTL=y
175# CONFIG_AUDIT is not set 176# CONFIG_AUDIT is not set
176# CONFIG_IKCONFIG is not set 177# CONFIG_IKCONFIG is not set
177CONFIG_CPUSETS=y 178CONFIG_CPUSETS=y
179CONFIG_RELAY=y
178CONFIG_INITRAMFS_SOURCE="" 180CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 181# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
180CONFIG_EMBEDDED=y 182CONFIG_EMBEDDED=y
@@ -188,10 +190,6 @@ CONFIG_BASE_FULL=y
188CONFIG_FUTEX=y 190CONFIG_FUTEX=y
189CONFIG_EPOLL=y 191CONFIG_EPOLL=y
190CONFIG_SHMEM=y 192CONFIG_SHMEM=y
191CONFIG_CC_ALIGN_FUNCTIONS=0
192CONFIG_CC_ALIGN_LABELS=0
193CONFIG_CC_ALIGN_LOOPS=0
194CONFIG_CC_ALIGN_JUMPS=0
195CONFIG_SLAB=y 193CONFIG_SLAB=y
196# CONFIG_TINY_SHMEM is not set 194# CONFIG_TINY_SHMEM is not set
197CONFIG_BASE_SMALL=0 195CONFIG_BASE_SMALL=0
@@ -203,7 +201,6 @@ CONFIG_BASE_SMALL=0
203CONFIG_MODULES=y 201CONFIG_MODULES=y
204CONFIG_MODULE_UNLOAD=y 202CONFIG_MODULE_UNLOAD=y
205# CONFIG_MODULE_FORCE_UNLOAD is not set 203# CONFIG_MODULE_FORCE_UNLOAD is not set
206CONFIG_OBSOLETE_MODPARM=y
207CONFIG_MODVERSIONS=y 204CONFIG_MODVERSIONS=y
208CONFIG_MODULE_SRCVERSION_ALL=y 205CONFIG_MODULE_SRCVERSION_ALL=y
209CONFIG_KMOD=y 206CONFIG_KMOD=y
@@ -212,6 +209,7 @@ CONFIG_STOP_MACHINE=y
212# 209#
213# Block layer 210# Block layer
214# 211#
212# CONFIG_BLK_DEV_IO_TRACE is not set
215 213
216# 214#
217# IO Schedulers 215# IO Schedulers
@@ -231,7 +229,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
231# 229#
232CONFIG_HW_HAS_PCI=y 230CONFIG_HW_HAS_PCI=y
233CONFIG_PCI=y 231CONFIG_PCI=y
234CONFIG_PCI_LEGACY_PROC=y
235CONFIG_MMU=y 232CONFIG_MMU=y
236 233
237# 234#
@@ -249,6 +246,7 @@ CONFIG_MMU=y
249# 246#
250CONFIG_BINFMT_ELF=y 247CONFIG_BINFMT_ELF=y
251# CONFIG_BINFMT_MISC is not set 248# CONFIG_BINFMT_MISC is not set
249# CONFIG_BUILD_ELF64 is not set
252CONFIG_MIPS32_COMPAT=y 250CONFIG_MIPS32_COMPAT=y
253CONFIG_COMPAT=y 251CONFIG_COMPAT=y
254CONFIG_MIPS32_O32=y 252CONFIG_MIPS32_O32=y
@@ -263,6 +261,7 @@ CONFIG_NET=y
263# 261#
264# Networking options 262# Networking options
265# 263#
264# CONFIG_NETDEBUG is not set
266CONFIG_PACKET=y 265CONFIG_PACKET=y
267CONFIG_PACKET_MMAP=y 266CONFIG_PACKET_MMAP=y
268CONFIG_UNIX=y 267CONFIG_UNIX=y
@@ -284,12 +283,15 @@ CONFIG_IP_PNP_BOOTP=y
284# CONFIG_INET_AH is not set 283# CONFIG_INET_AH is not set
285# CONFIG_INET_ESP is not set 284# CONFIG_INET_ESP is not set
286# CONFIG_INET_IPCOMP is not set 285# CONFIG_INET_IPCOMP is not set
287CONFIG_INET_TUNNEL=m 286# CONFIG_INET_XFRM_TUNNEL is not set
287# CONFIG_INET_TUNNEL is not set
288CONFIG_INET_DIAG=y 288CONFIG_INET_DIAG=y
289CONFIG_INET_TCP_DIAG=y 289CONFIG_INET_TCP_DIAG=y
290# CONFIG_TCP_CONG_ADVANCED is not set 290# CONFIG_TCP_CONG_ADVANCED is not set
291CONFIG_TCP_CONG_BIC=y 291CONFIG_TCP_CONG_BIC=y
292# CONFIG_IPV6 is not set 292# CONFIG_IPV6 is not set
293# CONFIG_INET6_XFRM_TUNNEL is not set
294# CONFIG_INET6_TUNNEL is not set
293# CONFIG_NETFILTER is not set 295# CONFIG_NETFILTER is not set
294 296
295# 297#
@@ -301,6 +303,11 @@ CONFIG_TCP_CONG_BIC=y
301# SCTP Configuration (EXPERIMENTAL) 303# SCTP Configuration (EXPERIMENTAL)
302# 304#
303# CONFIG_IP_SCTP is not set 305# CONFIG_IP_SCTP is not set
306
307#
308# TIPC Configuration (EXPERIMENTAL)
309#
310# CONFIG_TIPC is not set
304# CONFIG_ATM is not set 311# CONFIG_ATM is not set
305# CONFIG_BRIDGE is not set 312# CONFIG_BRIDGE is not set
306# CONFIG_VLAN_8021Q is not set 313# CONFIG_VLAN_8021Q is not set
@@ -310,11 +317,6 @@ CONFIG_TCP_CONG_BIC=y
310# CONFIG_ATALK is not set 317# CONFIG_ATALK is not set
311# CONFIG_X25 is not set 318# CONFIG_X25 is not set
312# CONFIG_LAPB is not set 319# CONFIG_LAPB is not set
313
314#
315# TIPC Configuration (EXPERIMENTAL)
316#
317# CONFIG_TIPC is not set
318# CONFIG_NET_DIVERT is not set 320# CONFIG_NET_DIVERT is not set
319# CONFIG_ECONET is not set 321# CONFIG_ECONET is not set
320# CONFIG_WAN_ROUTER is not set 322# CONFIG_WAN_ROUTER is not set
@@ -335,6 +337,9 @@ CONFIG_IEEE80211=m
335# CONFIG_IEEE80211_DEBUG is not set 337# CONFIG_IEEE80211_DEBUG is not set
336CONFIG_IEEE80211_CRYPT_WEP=m 338CONFIG_IEEE80211_CRYPT_WEP=m
337CONFIG_IEEE80211_CRYPT_CCMP=m 339CONFIG_IEEE80211_CRYPT_CCMP=m
340CONFIG_IEEE80211_SOFTMAC=m
341# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
342CONFIG_WIRELESS_EXT=y
338 343
339# 344#
340# Device Drivers 345# Device Drivers
@@ -589,6 +594,7 @@ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
589# 594#
590# Non-8250 serial port support 595# Non-8250 serial port support
591# 596#
597# CONFIG_SERIAL_JSM is not set
592CONFIG_UNIX98_PTYS=y 598CONFIG_UNIX98_PTYS=y
593CONFIG_LEGACY_PTYS=y 599CONFIG_LEGACY_PTYS=y
594CONFIG_LEGACY_PTY_COUNT=256 600CONFIG_LEGACY_PTY_COUNT=256
@@ -647,10 +653,6 @@ CONFIG_LEGACY_PTY_COUNT=256
647# 653#
648 654
649# 655#
650# Multimedia Capabilities Port drivers
651#
652
653#
654# Multimedia devices 656# Multimedia devices
655# 657#
656# CONFIG_VIDEO_DEV is not set 658# CONFIG_VIDEO_DEV is not set
@@ -675,6 +677,7 @@ CONFIG_LEGACY_PTY_COUNT=256
675# 677#
676CONFIG_USB_ARCH_HAS_HCD=y 678CONFIG_USB_ARCH_HAS_HCD=y
677CONFIG_USB_ARCH_HAS_OHCI=y 679CONFIG_USB_ARCH_HAS_OHCI=y
680CONFIG_USB_ARCH_HAS_EHCI=y
678# CONFIG_USB is not set 681# CONFIG_USB is not set
679 682
680# 683#
@@ -692,13 +695,31 @@ CONFIG_USB_ARCH_HAS_OHCI=y
692# CONFIG_MMC is not set 695# CONFIG_MMC is not set
693 696
694# 697#
698# LED devices
699#
700# CONFIG_NEW_LEDS is not set
701
702#
703# LED drivers
704#
705
706#
707# LED Triggers
708#
709
710#
695# InfiniBand support 711# InfiniBand support
696# 712#
697# CONFIG_INFINIBAND is not set 713# CONFIG_INFINIBAND is not set
698 714
699# 715#
700# SN Devices 716# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
717#
718
719#
720# Real Time Clock
701# 721#
722# CONFIG_RTC_CLASS is not set
702 723
703# 724#
704# File systems 725# File systems
@@ -746,7 +767,6 @@ CONFIG_SYSFS=y
746# CONFIG_TMPFS is not set 767# CONFIG_TMPFS is not set
747# CONFIG_HUGETLB_PAGE is not set 768# CONFIG_HUGETLB_PAGE is not set
748CONFIG_RAMFS=y 769CONFIG_RAMFS=y
749CONFIG_RELAYFS_FS=m
750# CONFIG_CONFIGFS_FS is not set 770# CONFIG_CONFIGFS_FS is not set
751 771
752# 772#
@@ -812,6 +832,7 @@ CONFIG_MSDOS_PARTITION=y
812# CONFIG_MAGIC_SYSRQ is not set 832# CONFIG_MAGIC_SYSRQ is not set
813# CONFIG_DEBUG_KERNEL is not set 833# CONFIG_DEBUG_KERNEL is not set
814CONFIG_LOG_BUF_SHIFT=15 834CONFIG_LOG_BUF_SHIFT=15
835# CONFIG_DEBUG_FS is not set
815CONFIG_CROSSCOMPILE=y 836CONFIG_CROSSCOMPILE=y
816CONFIG_CMDLINE="" 837CONFIG_CMDLINE=""
817# CONFIG_SB1XXX_CORELIS is not set 838# CONFIG_SB1XXX_CORELIS is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 9a936d7b7c0c..6b8a6a416a25 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:33 2006 4# Mon Apr 24 14:51:17 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_DMA_NONCOHERENT=y 70CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 71CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -118,11 +120,11 @@ CONFIG_PAGE_SIZE_4KB=y
118CONFIG_CPU_HAS_PREFETCH=y 120CONFIG_CPU_HAS_PREFETCH=y
119# CONFIG_MIPS_MT is not set 121# CONFIG_MIPS_MT is not set
120# CONFIG_64BIT_PHYS_ADDR is not set 122# CONFIG_64BIT_PHYS_ADDR is not set
121# CONFIG_CPU_ADVANCED is not set
122CONFIG_CPU_HAS_LLSC=y 123CONFIG_CPU_HAS_LLSC=y
123CONFIG_CPU_HAS_SYNC=y 124CONFIG_CPU_HAS_SYNC=y
124CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
125CONFIG_GENERIC_IRQ_PROBE=y 126CONFIG_GENERIC_IRQ_PROBE=y
127CONFIG_CPU_SUPPORTS_HIGHMEM=y
126CONFIG_ARCH_FLATMEM_ENABLE=y 128CONFIG_ARCH_FLATMEM_ENABLE=y
127CONFIG_SELECT_MEMORY_MODEL=y 129CONFIG_SELECT_MEMORY_MODEL=y
128CONFIG_FLATMEM_MANUAL=y 130CONFIG_FLATMEM_MANUAL=y
@@ -140,7 +142,6 @@ CONFIG_PREEMPT_NONE=y
140# Code maturity level options 142# Code maturity level options
141# 143#
142CONFIG_EXPERIMENTAL=y 144CONFIG_EXPERIMENTAL=y
143CONFIG_CLEAN_COMPILE=y
144CONFIG_BROKEN_ON_SMP=y 145CONFIG_BROKEN_ON_SMP=y
145CONFIG_INIT_ENV_ARG_LIMIT=32 146CONFIG_INIT_ENV_ARG_LIMIT=32
146 147
@@ -154,6 +155,7 @@ CONFIG_SYSVIPC=y
154# CONFIG_BSD_PROCESS_ACCT is not set 155# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y 156CONFIG_SYSCTL=y
156# CONFIG_IKCONFIG is not set 157# CONFIG_IKCONFIG is not set
158CONFIG_RELAY=y
157CONFIG_INITRAMFS_SOURCE="" 159CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 160# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 161CONFIG_EMBEDDED=y
@@ -167,10 +169,6 @@ CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 169CONFIG_FUTEX=y
168CONFIG_EPOLL=y 170CONFIG_EPOLL=y
169CONFIG_SHMEM=y 171CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y 172CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
@@ -185,6 +183,8 @@ CONFIG_BASE_SMALL=0
185# Block layer 183# Block layer
186# 184#
187# CONFIG_LBD is not set 185# CONFIG_LBD is not set
186# CONFIG_BLK_DEV_IO_TRACE is not set
187# CONFIG_LSF is not set
188 188
189# 189#
190# IO Schedulers 190# IO Schedulers
@@ -296,12 +296,6 @@ CONFIG_RAID_ATTRS=y
296# 296#
297 297
298# 298#
299# Network device support
300#
301# CONFIG_NETPOLL is not set
302# CONFIG_NET_POLL_CONTROLLER is not set
303
304#
305# ISDN subsystem 299# ISDN subsystem
306# 300#
307 301
@@ -397,10 +391,6 @@ CONFIG_LEGACY_PTY_COUNT=256
397# 391#
398 392
399# 393#
400# Multimedia Capabilities Port drivers
401#
402
403#
404# Multimedia devices 394# Multimedia devices
405# 395#
406# CONFIG_VIDEO_DEV is not set 396# CONFIG_VIDEO_DEV is not set
@@ -424,6 +414,7 @@ CONFIG_LEGACY_PTY_COUNT=256
424# 414#
425# CONFIG_USB_ARCH_HAS_HCD is not set 415# CONFIG_USB_ARCH_HAS_HCD is not set
426# CONFIG_USB_ARCH_HAS_OHCI is not set 416# CONFIG_USB_ARCH_HAS_OHCI is not set
417# CONFIG_USB_ARCH_HAS_EHCI is not set
427 418
428# 419#
429# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 420# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -440,12 +431,30 @@ CONFIG_LEGACY_PTY_COUNT=256
440# CONFIG_MMC is not set 431# CONFIG_MMC is not set
441 432
442# 433#
434# LED devices
435#
436# CONFIG_NEW_LEDS is not set
437
438#
439# LED drivers
440#
441
442#
443# LED Triggers
444#
445
446#
443# InfiniBand support 447# InfiniBand support
444# 448#
445 449
446# 450#
447# SN Devices 451# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
452#
453
454#
455# Real Time Clock
448# 456#
457# CONFIG_RTC_CLASS is not set
449 458
450# 459#
451# File systems 460# File systems
@@ -489,7 +498,6 @@ CONFIG_SYSFS=y
489# CONFIG_TMPFS is not set 498# CONFIG_TMPFS is not set
490# CONFIG_HUGETLB_PAGE is not set 499# CONFIG_HUGETLB_PAGE is not set
491CONFIG_RAMFS=y 500CONFIG_RAMFS=y
492CONFIG_RELAYFS_FS=y
493# CONFIG_CONFIGFS_FS is not set 501# CONFIG_CONFIGFS_FS is not set
494 502
495# 503#
@@ -543,6 +551,8 @@ CONFIG_PARTITION_ADVANCED=y
543# CONFIG_MAGIC_SYSRQ is not set 551# CONFIG_MAGIC_SYSRQ is not set
544# CONFIG_DEBUG_KERNEL is not set 552# CONFIG_DEBUG_KERNEL is not set
545CONFIG_LOG_BUF_SHIFT=14 553CONFIG_LOG_BUF_SHIFT=14
554# CONFIG_DEBUG_FS is not set
555# CONFIG_UNWIND_INFO is not set
546CONFIG_CROSSCOMPILE=y 556CONFIG_CROSSCOMPILE=y
547CONFIG_CMDLINE="" 557CONFIG_CMDLINE=""
548 558
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index c2dee0d1c72c..dba0bdcdcf29 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:34 2006 4# Tue Apr 25 00:08:41 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -68,12 +68,14 @@ CONFIG_MACH_VR41XX=y
68# CONFIG_NEC_CMBVR4133 is not set 68# CONFIG_NEC_CMBVR4133 is not set
69CONFIG_TANBAC_TB022X=y 69CONFIG_TANBAC_TB022X=y
70CONFIG_TANBAC_TB0226=y 70CONFIG_TANBAC_TB0226=y
71CONFIG_TANBAC_TB0287=y 71# CONFIG_TANBAC_TB0287 is not set
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 75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 76CONFIG_RWSEM_GENERIC_SPINLOCK=y
77CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y
77CONFIG_GENERIC_CALIBRATE_DELAY=y 79CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_DMA_NONCOHERENT=y 80CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 81CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -92,7 +94,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
92# CONFIG_CPU_MIPS64_R2 is not set 94# CONFIG_CPU_MIPS64_R2 is not set
93# CONFIG_CPU_R3000 is not set 95# CONFIG_CPU_R3000 is not set
94# CONFIG_CPU_TX39XX is not set 96# CONFIG_CPU_TX39XX is not set
95# CONFIG_CPU_VR41XX is not set 97CONFIG_CPU_VR41XX=y
96# CONFIG_CPU_R4300 is not set 98# CONFIG_CPU_R4300 is not set
97# CONFIG_CPU_R4X00 is not set 99# CONFIG_CPU_R4X00 is not set
98# CONFIG_CPU_TX49XX is not set 100# CONFIG_CPU_TX49XX is not set
@@ -105,18 +107,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
105# CONFIG_CPU_RM7000 is not set 107# CONFIG_CPU_RM7000 is not set
106# CONFIG_CPU_RM9000 is not set 108# CONFIG_CPU_RM9000 is not set
107# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
110CONFIG_SYS_HAS_CPU_VR41XX=y
111CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
113CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
108 114
109# 115#
110# Kernel type 116# Kernel type
111# 117#
112# CONFIG_32BIT is not set 118CONFIG_32BIT=y
113# CONFIG_64BIT is not set 119# CONFIG_64BIT is not set
114CONFIG_PAGE_SIZE_4KB=y 120CONFIG_PAGE_SIZE_4KB=y
115# CONFIG_PAGE_SIZE_8KB is not set 121# CONFIG_PAGE_SIZE_8KB is not set
116# CONFIG_PAGE_SIZE_16KB is not set 122# CONFIG_PAGE_SIZE_16KB is not set
117# CONFIG_PAGE_SIZE_64KB is not set 123# CONFIG_PAGE_SIZE_64KB is not set
118# CONFIG_MIPS_MT is not set 124# CONFIG_MIPS_MT is not set
119CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 125CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 127CONFIG_GENERIC_IRQ_PROBE=y
@@ -137,7 +142,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 142# Code maturity level options
138# 143#
139CONFIG_EXPERIMENTAL=y 144CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 145CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 146CONFIG_INIT_ENV_ARG_LIMIT=32
143 147
@@ -153,6 +157,7 @@ CONFIG_SYSVIPC=y
153CONFIG_SYSCTL=y 157CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 158# CONFIG_AUDIT is not set
155# CONFIG_IKCONFIG is not set 159# CONFIG_IKCONFIG is not set
160# CONFIG_RELAY is not set
156CONFIG_INITRAMFS_SOURCE="" 161CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 163CONFIG_EMBEDDED=y
@@ -166,10 +171,6 @@ CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 171CONFIG_FUTEX=y
167CONFIG_EPOLL=y 172CONFIG_EPOLL=y
168CONFIG_SHMEM=y 173CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y 174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
@@ -181,7 +182,6 @@ CONFIG_BASE_SMALL=0
181CONFIG_MODULES=y 182CONFIG_MODULES=y
182CONFIG_MODULE_UNLOAD=y 183CONFIG_MODULE_UNLOAD=y
183# CONFIG_MODULE_FORCE_UNLOAD is not set 184# CONFIG_MODULE_FORCE_UNLOAD is not set
184CONFIG_OBSOLETE_MODPARM=y
185CONFIG_MODVERSIONS=y 185CONFIG_MODVERSIONS=y
186CONFIG_MODULE_SRCVERSION_ALL=y 186CONFIG_MODULE_SRCVERSION_ALL=y
187CONFIG_KMOD=y 187CONFIG_KMOD=y
@@ -189,6 +189,9 @@ CONFIG_KMOD=y
189# 189#
190# Block layer 190# Block layer
191# 191#
192# CONFIG_LBD is not set
193# CONFIG_BLK_DEV_IO_TRACE is not set
194# CONFIG_LSF is not set
192 195
193# 196#
194# IO Schedulers 197# IO Schedulers
@@ -208,7 +211,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
208# 211#
209CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
210CONFIG_PCI=y 213CONFIG_PCI=y
211# CONFIG_PCI_LEGACY_PROC is not set
212CONFIG_MMU=y 214CONFIG_MMU=y
213 215
214# 216#
@@ -226,6 +228,7 @@ CONFIG_MMU=y
226# 228#
227CONFIG_BINFMT_ELF=y 229CONFIG_BINFMT_ELF=y
228# CONFIG_BINFMT_MISC is not set 230# CONFIG_BINFMT_MISC is not set
231CONFIG_TRAD_SIGNALS=y
229 232
230# 233#
231# Networking 234# Networking
@@ -235,11 +238,10 @@ CONFIG_NET=y
235# 238#
236# Networking options 239# Networking options
237# 240#
241# CONFIG_NETDEBUG is not set
238CONFIG_PACKET=y 242CONFIG_PACKET=y
239# CONFIG_PACKET_MMAP is not set 243# CONFIG_PACKET_MMAP is not set
240CONFIG_UNIX=y 244CONFIG_UNIX=y
241CONFIG_XFRM=y
242CONFIG_XFRM_USER=m
243# CONFIG_NET_KEY is not set 245# CONFIG_NET_KEY is not set
244CONFIG_INET=y 246CONFIG_INET=y
245CONFIG_IP_MULTICAST=y 247CONFIG_IP_MULTICAST=y
@@ -263,12 +265,15 @@ CONFIG_SYN_COOKIES=y
263# CONFIG_INET_AH is not set 265# CONFIG_INET_AH is not set
264# CONFIG_INET_ESP is not set 266# CONFIG_INET_ESP is not set
265# CONFIG_INET_IPCOMP is not set 267# CONFIG_INET_IPCOMP is not set
266CONFIG_INET_TUNNEL=m 268# CONFIG_INET_XFRM_TUNNEL is not set
269# CONFIG_INET_TUNNEL is not set
267CONFIG_INET_DIAG=y 270CONFIG_INET_DIAG=y
268CONFIG_INET_TCP_DIAG=y 271CONFIG_INET_TCP_DIAG=y
269# CONFIG_TCP_CONG_ADVANCED is not set 272# CONFIG_TCP_CONG_ADVANCED is not set
270CONFIG_TCP_CONG_BIC=y 273CONFIG_TCP_CONG_BIC=y
271# CONFIG_IPV6 is not set 274# CONFIG_IPV6 is not set
275# CONFIG_INET6_XFRM_TUNNEL is not set
276# CONFIG_INET6_TUNNEL is not set
272# CONFIG_NETFILTER is not set 277# CONFIG_NETFILTER is not set
273 278
274# 279#
@@ -280,6 +285,11 @@ CONFIG_TCP_CONG_BIC=y
280# SCTP Configuration (EXPERIMENTAL) 285# SCTP Configuration (EXPERIMENTAL)
281# 286#
282# CONFIG_IP_SCTP is not set 287# CONFIG_IP_SCTP is not set
288
289#
290# TIPC Configuration (EXPERIMENTAL)
291#
292# CONFIG_TIPC is not set
283# CONFIG_ATM is not set 293# CONFIG_ATM is not set
284# CONFIG_BRIDGE is not set 294# CONFIG_BRIDGE is not set
285# CONFIG_VLAN_8021Q is not set 295# CONFIG_VLAN_8021Q is not set
@@ -289,11 +299,6 @@ CONFIG_TCP_CONG_BIC=y
289# CONFIG_ATALK is not set 299# CONFIG_ATALK is not set
290# CONFIG_X25 is not set 300# CONFIG_X25 is not set
291# CONFIG_LAPB is not set 301# CONFIG_LAPB is not set
292
293#
294# TIPC Configuration (EXPERIMENTAL)
295#
296# CONFIG_TIPC is not set
297# CONFIG_NET_DIVERT is not set 302# CONFIG_NET_DIVERT is not set
298# CONFIG_ECONET is not set 303# CONFIG_ECONET is not set
299# CONFIG_WAN_ROUTER is not set 304# CONFIG_WAN_ROUTER is not set
@@ -310,10 +315,7 @@ CONFIG_TCP_CONG_BIC=y
310# CONFIG_HAMRADIO is not set 315# CONFIG_HAMRADIO is not set
311# CONFIG_IRDA is not set 316# CONFIG_IRDA is not set
312# CONFIG_BT is not set 317# CONFIG_BT is not set
313CONFIG_IEEE80211=m 318# CONFIG_IEEE80211 is not set
314# CONFIG_IEEE80211_DEBUG is not set
315CONFIG_IEEE80211_CRYPT_WEP=m
316CONFIG_IEEE80211_CRYPT_CCMP=m
317 319
318# 320#
319# Device Drivers 321# Device Drivers
@@ -358,11 +360,12 @@ CONFIG_BLK_DEV_LOOP=m
358CONFIG_BLK_DEV_NBD=m 360CONFIG_BLK_DEV_NBD=m
359# CONFIG_BLK_DEV_SX8 is not set 361# CONFIG_BLK_DEV_SX8 is not set
360# CONFIG_BLK_DEV_UB is not set 362# CONFIG_BLK_DEV_UB is not set
361CONFIG_BLK_DEV_RAM=m 363CONFIG_BLK_DEV_RAM=y
362CONFIG_BLK_DEV_RAM_COUNT=16 364CONFIG_BLK_DEV_RAM_COUNT=16
363CONFIG_BLK_DEV_RAM_SIZE=4096 365CONFIG_BLK_DEV_RAM_SIZE=4096
366# CONFIG_BLK_DEV_INITRD is not set
364# CONFIG_CDROM_PKTCDVD is not set 367# CONFIG_CDROM_PKTCDVD is not set
365CONFIG_ATA_OVER_ETH=m 368# CONFIG_ATA_OVER_ETH is not set
366 369
367# 370#
368# ATA/ATAPI/MFM/RLL support 371# ATA/ATAPI/MFM/RLL support
@@ -397,14 +400,14 @@ CONFIG_SCSI_MULTI_LUN=y
397# SCSI Transport Attributes 400# SCSI Transport Attributes
398# 401#
399# CONFIG_SCSI_SPI_ATTRS is not set 402# CONFIG_SCSI_SPI_ATTRS is not set
400CONFIG_SCSI_FC_ATTRS=y 403# CONFIG_SCSI_FC_ATTRS is not set
401CONFIG_SCSI_ISCSI_ATTRS=m 404# CONFIG_SCSI_ISCSI_ATTRS is not set
402# CONFIG_SCSI_SAS_ATTRS is not set 405# CONFIG_SCSI_SAS_ATTRS is not set
403 406
404# 407#
405# SCSI low-level drivers 408# SCSI low-level drivers
406# 409#
407CONFIG_ISCSI_TCP=m 410# CONFIG_ISCSI_TCP is not set
408# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 411# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
409# CONFIG_SCSI_3W_9XXX is not set 412# CONFIG_SCSI_3W_9XXX is not set
410# CONFIG_SCSI_ACARD is not set 413# CONFIG_SCSI_ACARD is not set
@@ -424,7 +427,6 @@ CONFIG_ISCSI_TCP=m
424# CONFIG_SCSI_INIA100 is not set 427# CONFIG_SCSI_INIA100 is not set
425# CONFIG_SCSI_SYM53C8XX_2 is not set 428# CONFIG_SCSI_SYM53C8XX_2 is not set
426# CONFIG_SCSI_IPR is not set 429# CONFIG_SCSI_IPR is not set
427# CONFIG_SCSI_QLOGIC_FC is not set
428# CONFIG_SCSI_QLOGIC_1280 is not set 430# CONFIG_SCSI_QLOGIC_1280 is not set
429# CONFIG_SCSI_QLA_FC is not set 431# CONFIG_SCSI_QLA_FC is not set
430# CONFIG_SCSI_LPFC is not set 432# CONFIG_SCSI_LPFC is not set
@@ -507,8 +509,8 @@ CONFIG_NET_PCI=y
507# CONFIG_B44 is not set 509# CONFIG_B44 is not set
508# CONFIG_FORCEDETH is not set 510# CONFIG_FORCEDETH is not set
509# CONFIG_DGRS is not set 511# CONFIG_DGRS is not set
510CONFIG_EEPRO100=y 512# CONFIG_EEPRO100 is not set
511# CONFIG_E100 is not set 513CONFIG_E100=y
512# CONFIG_FEALNX is not set 514# CONFIG_FEALNX is not set
513# CONFIG_NATSEMI is not set 515# CONFIG_NATSEMI is not set
514# CONFIG_NE2K_PCI is not set 516# CONFIG_NE2K_PCI is not set
@@ -625,6 +627,11 @@ CONFIG_HW_CONSOLE=y
625# 627#
626# Non-8250 serial port support 628# Non-8250 serial port support
627# 629#
630CONFIG_SERIAL_CORE=y
631CONFIG_SERIAL_CORE_CONSOLE=y
632CONFIG_SERIAL_VR41XX=y
633CONFIG_SERIAL_VR41XX_CONSOLE=y
634# CONFIG_SERIAL_JSM is not set
628CONFIG_UNIX98_PTYS=y 635CONFIG_UNIX98_PTYS=y
629CONFIG_LEGACY_PTYS=y 636CONFIG_LEGACY_PTYS=y
630CONFIG_LEGACY_PTY_COUNT=256 637CONFIG_LEGACY_PTY_COUNT=256
@@ -685,10 +692,6 @@ CONFIG_GPIO_VR41XX=y
685# 692#
686 693
687# 694#
688# Multimedia Capabilities Port drivers
689#
690
691#
692# Multimedia devices 695# Multimedia devices
693# 696#
694# CONFIG_VIDEO_DEV is not set 697# CONFIG_VIDEO_DEV is not set
@@ -697,6 +700,7 @@ CONFIG_GPIO_VR41XX=y
697# Digital Video Broadcasting Devices 700# Digital Video Broadcasting Devices
698# 701#
699# CONFIG_DVB is not set 702# CONFIG_DVB is not set
703# CONFIG_USB_DABUSB is not set
700 704
701# 705#
702# Graphics support 706# Graphics support
@@ -719,6 +723,7 @@ CONFIG_DUMMY_CONSOLE=y
719# 723#
720CONFIG_USB_ARCH_HAS_HCD=y 724CONFIG_USB_ARCH_HAS_HCD=y
721CONFIG_USB_ARCH_HAS_OHCI=y 725CONFIG_USB_ARCH_HAS_OHCI=y
726CONFIG_USB_ARCH_HAS_EHCI=y
722CONFIG_USB=y 727CONFIG_USB=y
723# CONFIG_USB_DEBUG is not set 728# CONFIG_USB_DEBUG is not set
724 729
@@ -756,7 +761,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
756# 761#
757# may also be needed; see USB_STORAGE Help for more information 762# may also be needed; see USB_STORAGE Help for more information
758# 763#
759CONFIG_USB_STORAGE=m 764CONFIG_USB_STORAGE=y
760# CONFIG_USB_STORAGE_DEBUG is not set 765# CONFIG_USB_STORAGE_DEBUG is not set
761# CONFIG_USB_STORAGE_DATAFAB is not set 766# CONFIG_USB_STORAGE_DATAFAB is not set
762# CONFIG_USB_STORAGE_FREECOM is not set 767# CONFIG_USB_STORAGE_FREECOM is not set
@@ -783,9 +788,7 @@ CONFIG_USB_STORAGE=m
783# CONFIG_USB_ACECAD is not set 788# CONFIG_USB_ACECAD is not set
784# CONFIG_USB_KBTAB is not set 789# CONFIG_USB_KBTAB is not set
785# CONFIG_USB_POWERMATE is not set 790# CONFIG_USB_POWERMATE is not set
786# CONFIG_USB_MTOUCH is not set 791# CONFIG_USB_TOUCHSCREEN is not set
787# CONFIG_USB_ITMTOUCH is not set
788# CONFIG_USB_EGALAX is not set
789# CONFIG_USB_YEALINK is not set 792# CONFIG_USB_YEALINK is not set
790# CONFIG_USB_XPAD is not set 793# CONFIG_USB_XPAD is not set
791# CONFIG_USB_ATI_REMOTE is not set 794# CONFIG_USB_ATI_REMOTE is not set
@@ -800,15 +803,6 @@ CONFIG_USB_STORAGE=m
800# CONFIG_USB_MICROTEK is not set 803# CONFIG_USB_MICROTEK is not set
801 804
802# 805#
803# USB Multimedia devices
804#
805# CONFIG_USB_DABUSB is not set
806
807#
808# Video4Linux support is needed for USB Multimedia device support
809#
810
811#
812# USB Network Adapters 806# USB Network Adapters
813# 807#
814# CONFIG_USB_CATC is not set 808# CONFIG_USB_CATC is not set
@@ -816,7 +810,7 @@ CONFIG_USB_STORAGE=m
816# CONFIG_USB_PEGASUS is not set 810# CONFIG_USB_PEGASUS is not set
817# CONFIG_USB_RTL8150 is not set 811# CONFIG_USB_RTL8150 is not set
818# CONFIG_USB_USBNET is not set 812# CONFIG_USB_USBNET is not set
819CONFIG_USB_MON=y 813# CONFIG_USB_MON is not set
820 814
821# 815#
822# USB port drivers 816# USB port drivers
@@ -860,13 +854,48 @@ CONFIG_USB_MON=y
860# CONFIG_MMC is not set 854# CONFIG_MMC is not set
861 855
862# 856#
857# LED devices
858#
859# CONFIG_NEW_LEDS is not set
860
861#
862# LED drivers
863#
864
865#
866# LED Triggers
867#
868
869#
863# InfiniBand support 870# InfiniBand support
864# 871#
865# CONFIG_INFINIBAND is not set 872# CONFIG_INFINIBAND is not set
866 873
867# 874#
868# SN Devices 875# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
876#
877
878#
879# Real Time Clock
880#
881CONFIG_RTC_LIB=y
882CONFIG_RTC_CLASS=y
883CONFIG_RTC_HCTOSYS=y
884CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
885
886#
887# RTC interfaces
888#
889CONFIG_RTC_INTF_SYSFS=y
890CONFIG_RTC_INTF_PROC=y
891CONFIG_RTC_INTF_DEV=y
892
893#
894# RTC drivers
869# 895#
896# CONFIG_RTC_DRV_M48T86 is not set
897CONFIG_RTC_DRV_VR41XX=y
898# CONFIG_RTC_DRV_TEST is not set
870 899
871# 900#
872# File systems 901# File systems
@@ -911,7 +940,6 @@ CONFIG_SYSFS=y
911CONFIG_TMPFS=y 940CONFIG_TMPFS=y
912# CONFIG_HUGETLB_PAGE is not set 941# CONFIG_HUGETLB_PAGE is not set
913CONFIG_RAMFS=y 942CONFIG_RAMFS=y
914CONFIG_RELAYFS_FS=m
915# CONFIG_CONFIGFS_FS is not set 943# CONFIG_CONFIGFS_FS is not set
916 944
917# 945#
@@ -952,9 +980,7 @@ CONFIG_NFS_COMMON=y
952CONFIG_SUNRPC=y 980CONFIG_SUNRPC=y
953# CONFIG_RPCSEC_GSS_KRB5 is not set 981# CONFIG_RPCSEC_GSS_KRB5 is not set
954# CONFIG_RPCSEC_GSS_SPKM3 is not set 982# CONFIG_RPCSEC_GSS_SPKM3 is not set
955CONFIG_SMB_FS=m 983# CONFIG_SMB_FS is not set
956CONFIG_SMB_NLS_DEFAULT=y
957CONFIG_SMB_NLS_REMOTE="cp932"
958# CONFIG_CIFS is not set 984# CONFIG_CIFS is not set
959# CONFIG_NCP_FS is not set 985# CONFIG_NCP_FS is not set
960# CONFIG_CODA_FS is not set 986# CONFIG_CODA_FS is not set
@@ -970,46 +996,7 @@ CONFIG_MSDOS_PARTITION=y
970# 996#
971# Native Language Support 997# Native Language Support
972# 998#
973CONFIG_NLS=y 999# CONFIG_NLS is not set
974CONFIG_NLS_DEFAULT="iso8859-1"
975CONFIG_NLS_CODEPAGE_437=m
976# CONFIG_NLS_CODEPAGE_737 is not set
977# CONFIG_NLS_CODEPAGE_775 is not set
978# CONFIG_NLS_CODEPAGE_850 is not set
979# CONFIG_NLS_CODEPAGE_852 is not set
980# CONFIG_NLS_CODEPAGE_855 is not set
981# CONFIG_NLS_CODEPAGE_857 is not set
982# CONFIG_NLS_CODEPAGE_860 is not set
983# CONFIG_NLS_CODEPAGE_861 is not set
984# CONFIG_NLS_CODEPAGE_862 is not set
985# CONFIG_NLS_CODEPAGE_863 is not set
986# CONFIG_NLS_CODEPAGE_864 is not set
987# CONFIG_NLS_CODEPAGE_865 is not set
988# CONFIG_NLS_CODEPAGE_866 is not set
989# CONFIG_NLS_CODEPAGE_869 is not set
990# CONFIG_NLS_CODEPAGE_936 is not set
991# CONFIG_NLS_CODEPAGE_950 is not set
992CONFIG_NLS_CODEPAGE_932=m
993# CONFIG_NLS_CODEPAGE_949 is not set
994# CONFIG_NLS_CODEPAGE_874 is not set
995# CONFIG_NLS_ISO8859_8 is not set
996# CONFIG_NLS_CODEPAGE_1250 is not set
997# CONFIG_NLS_CODEPAGE_1251 is not set
998# CONFIG_NLS_ASCII is not set
999CONFIG_NLS_ISO8859_1=m
1000# CONFIG_NLS_ISO8859_2 is not set
1001# CONFIG_NLS_ISO8859_3 is not set
1002# CONFIG_NLS_ISO8859_4 is not set
1003# CONFIG_NLS_ISO8859_5 is not set
1004# CONFIG_NLS_ISO8859_6 is not set
1005# CONFIG_NLS_ISO8859_7 is not set
1006# CONFIG_NLS_ISO8859_9 is not set
1007# CONFIG_NLS_ISO8859_13 is not set
1008# CONFIG_NLS_ISO8859_14 is not set
1009# CONFIG_NLS_ISO8859_15 is not set
1010# CONFIG_NLS_KOI8_R is not set
1011# CONFIG_NLS_KOI8_U is not set
1012# CONFIG_NLS_UTF8 is not set
1013 1000
1014# 1001#
1015# Profiling support 1002# Profiling support
@@ -1023,44 +1010,20 @@ CONFIG_NLS_ISO8859_1=m
1023# CONFIG_MAGIC_SYSRQ is not set 1010# CONFIG_MAGIC_SYSRQ is not set
1024# CONFIG_DEBUG_KERNEL is not set 1011# CONFIG_DEBUG_KERNEL is not set
1025CONFIG_LOG_BUF_SHIFT=14 1012CONFIG_LOG_BUF_SHIFT=14
1013# CONFIG_DEBUG_FS is not set
1026CONFIG_CROSSCOMPILE=y 1014CONFIG_CROSSCOMPILE=y
1027CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" 1015CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1028 1016
1029# 1017#
1030# Security options 1018# Security options
1031# 1019#
1032CONFIG_KEYS=y 1020# CONFIG_KEYS is not set
1033CONFIG_KEYS_DEBUG_PROC_KEYS=y
1034# CONFIG_SECURITY is not set 1021# CONFIG_SECURITY is not set
1035 1022
1036# 1023#
1037# Cryptographic options 1024# Cryptographic options
1038# 1025#
1039CONFIG_CRYPTO=y 1026# CONFIG_CRYPTO is not set
1040CONFIG_CRYPTO_HMAC=y
1041CONFIG_CRYPTO_NULL=m
1042CONFIG_CRYPTO_MD4=m
1043CONFIG_CRYPTO_MD5=m
1044CONFIG_CRYPTO_SHA1=m
1045CONFIG_CRYPTO_SHA256=m
1046CONFIG_CRYPTO_SHA512=m
1047CONFIG_CRYPTO_WP512=m
1048CONFIG_CRYPTO_TGR192=m
1049CONFIG_CRYPTO_DES=m
1050CONFIG_CRYPTO_BLOWFISH=m
1051CONFIG_CRYPTO_TWOFISH=m
1052CONFIG_CRYPTO_SERPENT=m
1053CONFIG_CRYPTO_AES=m
1054CONFIG_CRYPTO_CAST5=m
1055CONFIG_CRYPTO_CAST6=m
1056CONFIG_CRYPTO_TEA=m
1057CONFIG_CRYPTO_ARC4=m
1058CONFIG_CRYPTO_KHAZAD=m
1059CONFIG_CRYPTO_ANUBIS=m
1060CONFIG_CRYPTO_DEFLATE=m
1061CONFIG_CRYPTO_MICHAEL_MIC=m
1062CONFIG_CRYPTO_CRC32C=m
1063# CONFIG_CRYPTO_TEST is not set
1064 1027
1065# 1028#
1066# Hardware crypto devices 1029# Hardware crypto devices
@@ -1069,9 +1032,8 @@ CONFIG_CRYPTO_CRC32C=m
1069# 1032#
1070# Library routines 1033# Library routines
1071# 1034#
1072CONFIG_CRC_CCITT=m 1035# CONFIG_CRC_CCITT is not set
1073CONFIG_CRC16=m 1036# CONFIG_CRC16 is not set
1074CONFIG_CRC32=m 1037# CONFIG_CRC32 is not set
1075CONFIG_LIBCRC32C=m 1038# CONFIG_LIBCRC32C is not set
1076CONFIG_ZLIB_INFLATE=m 1039CONFIG_ZLIB_INFLATE=m
1077CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index be99261d7997..5a924c1a5803 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:35 2006 4# Tue Apr 25 00:08:59 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -68,12 +68,14 @@ CONFIG_MACH_VR41XX=y
68# CONFIG_NEC_CMBVR4133 is not set 68# CONFIG_NEC_CMBVR4133 is not set
69CONFIG_TANBAC_TB022X=y 69CONFIG_TANBAC_TB022X=y
70# CONFIG_TANBAC_TB0226 is not set 70# CONFIG_TANBAC_TB0226 is not set
71CONFIG_TANBAC_TB0287=y 71# CONFIG_TANBAC_TB0287 is not set
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 75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 76CONFIG_RWSEM_GENERIC_SPINLOCK=y
77CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y
77CONFIG_GENERIC_CALIBRATE_DELAY=y 79CONFIG_GENERIC_CALIBRATE_DELAY=y
78CONFIG_DMA_NONCOHERENT=y 80CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 81CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -92,7 +94,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
92# CONFIG_CPU_MIPS64_R2 is not set 94# CONFIG_CPU_MIPS64_R2 is not set
93# CONFIG_CPU_R3000 is not set 95# CONFIG_CPU_R3000 is not set
94# CONFIG_CPU_TX39XX is not set 96# CONFIG_CPU_TX39XX is not set
95# CONFIG_CPU_VR41XX is not set 97CONFIG_CPU_VR41XX=y
96# CONFIG_CPU_R4300 is not set 98# CONFIG_CPU_R4300 is not set
97# CONFIG_CPU_R4X00 is not set 99# CONFIG_CPU_R4X00 is not set
98# CONFIG_CPU_TX49XX is not set 100# CONFIG_CPU_TX49XX is not set
@@ -105,18 +107,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
105# CONFIG_CPU_RM7000 is not set 107# CONFIG_CPU_RM7000 is not set
106# CONFIG_CPU_RM9000 is not set 108# CONFIG_CPU_RM9000 is not set
107# CONFIG_CPU_SB1 is not set 109# CONFIG_CPU_SB1 is not set
110CONFIG_SYS_HAS_CPU_VR41XX=y
111CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
113CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
108 114
109# 115#
110# Kernel type 116# Kernel type
111# 117#
112# CONFIG_32BIT is not set 118CONFIG_32BIT=y
113# CONFIG_64BIT is not set 119# CONFIG_64BIT is not set
114CONFIG_PAGE_SIZE_4KB=y 120CONFIG_PAGE_SIZE_4KB=y
115# CONFIG_PAGE_SIZE_8KB is not set 121# CONFIG_PAGE_SIZE_8KB is not set
116# CONFIG_PAGE_SIZE_16KB is not set 122# CONFIG_PAGE_SIZE_16KB is not set
117# CONFIG_PAGE_SIZE_64KB is not set 123# CONFIG_PAGE_SIZE_64KB is not set
118# CONFIG_MIPS_MT is not set 124# CONFIG_MIPS_MT is not set
119CONFIG_CPU_HAS_LLSC=y
120CONFIG_CPU_HAS_SYNC=y 125CONFIG_CPU_HAS_SYNC=y
121CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
122CONFIG_GENERIC_IRQ_PROBE=y 127CONFIG_GENERIC_IRQ_PROBE=y
@@ -137,7 +142,6 @@ CONFIG_PREEMPT_NONE=y
137# Code maturity level options 142# Code maturity level options
138# 143#
139CONFIG_EXPERIMENTAL=y 144CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y 145CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 146CONFIG_INIT_ENV_ARG_LIMIT=32
143 147
@@ -153,6 +157,7 @@ CONFIG_SYSVIPC=y
153CONFIG_SYSCTL=y 157CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 158# CONFIG_AUDIT is not set
155# CONFIG_IKCONFIG is not set 159# CONFIG_IKCONFIG is not set
160# CONFIG_RELAY is not set
156CONFIG_INITRAMFS_SOURCE="" 161CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 163CONFIG_EMBEDDED=y
@@ -166,10 +171,6 @@ CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 171CONFIG_FUTEX=y
167CONFIG_EPOLL=y 172CONFIG_EPOLL=y
168CONFIG_SHMEM=y 173CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y 174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
@@ -181,7 +182,6 @@ CONFIG_BASE_SMALL=0
181CONFIG_MODULES=y 182CONFIG_MODULES=y
182CONFIG_MODULE_UNLOAD=y 183CONFIG_MODULE_UNLOAD=y
183# CONFIG_MODULE_FORCE_UNLOAD is not set 184# CONFIG_MODULE_FORCE_UNLOAD is not set
184CONFIG_OBSOLETE_MODPARM=y
185CONFIG_MODVERSIONS=y 185CONFIG_MODVERSIONS=y
186CONFIG_MODULE_SRCVERSION_ALL=y 186CONFIG_MODULE_SRCVERSION_ALL=y
187CONFIG_KMOD=y 187CONFIG_KMOD=y
@@ -189,6 +189,9 @@ CONFIG_KMOD=y
189# 189#
190# Block layer 190# Block layer
191# 191#
192# CONFIG_LBD is not set
193# CONFIG_BLK_DEV_IO_TRACE is not set
194# CONFIG_LSF is not set
192 195
193# 196#
194# IO Schedulers 197# IO Schedulers
@@ -208,7 +211,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
208# 211#
209CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
210CONFIG_PCI=y 213CONFIG_PCI=y
211# CONFIG_PCI_LEGACY_PROC is not set
212CONFIG_MMU=y 214CONFIG_MMU=y
213 215
214# 216#
@@ -226,6 +228,7 @@ CONFIG_MMU=y
226# 228#
227CONFIG_BINFMT_ELF=y 229CONFIG_BINFMT_ELF=y
228# CONFIG_BINFMT_MISC is not set 230# CONFIG_BINFMT_MISC is not set
231CONFIG_TRAD_SIGNALS=y
229 232
230# 233#
231# Networking 234# Networking
@@ -235,11 +238,10 @@ CONFIG_NET=y
235# 238#
236# Networking options 239# Networking options
237# 240#
241# CONFIG_NETDEBUG is not set
238CONFIG_PACKET=y 242CONFIG_PACKET=y
239# CONFIG_PACKET_MMAP is not set 243# CONFIG_PACKET_MMAP is not set
240CONFIG_UNIX=y 244CONFIG_UNIX=y
241CONFIG_XFRM=y
242CONFIG_XFRM_USER=m
243# CONFIG_NET_KEY is not set 245# CONFIG_NET_KEY is not set
244CONFIG_INET=y 246CONFIG_INET=y
245CONFIG_IP_MULTICAST=y 247CONFIG_IP_MULTICAST=y
@@ -264,12 +266,15 @@ CONFIG_SYN_COOKIES=y
264# CONFIG_INET_AH is not set 266# CONFIG_INET_AH is not set
265# CONFIG_INET_ESP is not set 267# CONFIG_INET_ESP is not set
266# CONFIG_INET_IPCOMP is not set 268# CONFIG_INET_IPCOMP is not set
269# CONFIG_INET_XFRM_TUNNEL is not set
267CONFIG_INET_TUNNEL=m 270CONFIG_INET_TUNNEL=m
268CONFIG_INET_DIAG=y 271CONFIG_INET_DIAG=y
269CONFIG_INET_TCP_DIAG=y 272CONFIG_INET_TCP_DIAG=y
270# CONFIG_TCP_CONG_ADVANCED is not set 273# CONFIG_TCP_CONG_ADVANCED is not set
271CONFIG_TCP_CONG_BIC=y 274CONFIG_TCP_CONG_BIC=y
272# CONFIG_IPV6 is not set 275# CONFIG_IPV6 is not set
276# CONFIG_INET6_XFRM_TUNNEL is not set
277# CONFIG_INET6_TUNNEL is not set
273# CONFIG_NETFILTER is not set 278# CONFIG_NETFILTER is not set
274 279
275# 280#
@@ -281,6 +286,11 @@ CONFIG_TCP_CONG_BIC=y
281# SCTP Configuration (EXPERIMENTAL) 286# SCTP Configuration (EXPERIMENTAL)
282# 287#
283# CONFIG_IP_SCTP is not set 288# CONFIG_IP_SCTP is not set
289
290#
291# TIPC Configuration (EXPERIMENTAL)
292#
293# CONFIG_TIPC is not set
284# CONFIG_ATM is not set 294# CONFIG_ATM is not set
285# CONFIG_BRIDGE is not set 295# CONFIG_BRIDGE is not set
286# CONFIG_VLAN_8021Q is not set 296# CONFIG_VLAN_8021Q is not set
@@ -290,11 +300,6 @@ CONFIG_TCP_CONG_BIC=y
290# CONFIG_ATALK is not set 300# CONFIG_ATALK is not set
291# CONFIG_X25 is not set 301# CONFIG_X25 is not set
292# CONFIG_LAPB is not set 302# CONFIG_LAPB is not set
293
294#
295# TIPC Configuration (EXPERIMENTAL)
296#
297# CONFIG_TIPC is not set
298# CONFIG_NET_DIVERT is not set 303# CONFIG_NET_DIVERT is not set
299# CONFIG_ECONET is not set 304# CONFIG_ECONET is not set
300# CONFIG_WAN_ROUTER is not set 305# CONFIG_WAN_ROUTER is not set
@@ -311,10 +316,7 @@ CONFIG_TCP_CONG_BIC=y
311# CONFIG_HAMRADIO is not set 316# CONFIG_HAMRADIO is not set
312# CONFIG_IRDA is not set 317# CONFIG_IRDA is not set
313# CONFIG_BT is not set 318# CONFIG_BT is not set
314CONFIG_IEEE80211=m 319# CONFIG_IEEE80211 is not set
315# CONFIG_IEEE80211_DEBUG is not set
316CONFIG_IEEE80211_CRYPT_WEP=m
317CONFIG_IEEE80211_CRYPT_CCMP=m
318 320
319# 321#
320# Device Drivers 322# Device Drivers
@@ -325,12 +327,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m
325# 327#
326CONFIG_STANDALONE=y 328CONFIG_STANDALONE=y
327CONFIG_PREVENT_FIRMWARE_BUILD=y 329CONFIG_PREVENT_FIRMWARE_BUILD=y
328CONFIG_FW_LOADER=m 330# CONFIG_FW_LOADER is not set
329 331
330# 332#
331# Connector - unified userspace <-> kernelspace linker 333# Connector - unified userspace <-> kernelspace linker
332# 334#
333CONFIG_CONNECTOR=m 335# CONFIG_CONNECTOR is not set
334 336
335# 337#
336# Memory Technology Devices (MTD) 338# Memory Technology Devices (MTD)
@@ -363,10 +365,8 @@ CONFIG_BLK_DEV_RAM=y
363CONFIG_BLK_DEV_RAM_COUNT=16 365CONFIG_BLK_DEV_RAM_COUNT=16
364CONFIG_BLK_DEV_RAM_SIZE=4096 366CONFIG_BLK_DEV_RAM_SIZE=4096
365# CONFIG_BLK_DEV_INITRD is not set 367# CONFIG_BLK_DEV_INITRD is not set
366CONFIG_CDROM_PKTCDVD=m 368# CONFIG_CDROM_PKTCDVD is not set
367CONFIG_CDROM_PKTCDVD_BUFFERS=8 369# CONFIG_ATA_OVER_ETH is not set
368# CONFIG_CDROM_PKTCDVD_WCACHE is not set
369CONFIG_ATA_OVER_ETH=m
370 370
371# 371#
372# ATA/ATAPI/MFM/RLL support 372# ATA/ATAPI/MFM/RLL support
@@ -443,30 +443,7 @@ CONFIG_MII=y
443# 443#
444# CONFIG_NET_TULIP is not set 444# CONFIG_NET_TULIP is not set
445# CONFIG_HP100 is not set 445# CONFIG_HP100 is not set
446CONFIG_NET_PCI=y 446# CONFIG_NET_PCI is not set
447# CONFIG_PCNET32 is not set
448# CONFIG_AMD8111_ETH is not set
449# CONFIG_ADAPTEC_STARFIRE is not set
450# CONFIG_B44 is not set
451# CONFIG_FORCEDETH is not set
452# CONFIG_DGRS is not set
453CONFIG_EEPRO100=y
454# CONFIG_E100 is not set
455# CONFIG_FEALNX is not set
456# CONFIG_NATSEMI is not set
457# CONFIG_NE2K_PCI is not set
458# CONFIG_8139CP is not set
459CONFIG_8139TOO=y
460CONFIG_8139TOO_PIO=y
461# CONFIG_8139TOO_TUNE_TWISTER is not set
462# CONFIG_8139TOO_8129 is not set
463# CONFIG_8139_OLD_RX_RESET is not set
464# CONFIG_SIS900 is not set
465# CONFIG_EPIC100 is not set
466# CONFIG_SUNDANCE is not set
467# CONFIG_TLAN is not set
468# CONFIG_VIA_RHINE is not set
469# CONFIG_LAN_SAA9730 is not set
470 447
471# 448#
472# Ethernet (1000 Mbit) 449# Ethernet (1000 Mbit)
@@ -483,7 +460,6 @@ CONFIG_R8169=y
483# CONFIG_SKGE is not set 460# CONFIG_SKGE is not set
484# CONFIG_SKY2 is not set 461# CONFIG_SKY2 is not set
485# CONFIG_SK98LIN is not set 462# CONFIG_SK98LIN is not set
486# CONFIG_VIA_VELOCITY is not set
487# CONFIG_TIGON3 is not set 463# CONFIG_TIGON3 is not set
488# CONFIG_BNX2 is not set 464# CONFIG_BNX2 is not set
489 465
@@ -510,19 +486,8 @@ CONFIG_R8169=y
510# CONFIG_WAN is not set 486# CONFIG_WAN is not set
511# CONFIG_FDDI is not set 487# CONFIG_FDDI is not set
512# CONFIG_HIPPI is not set 488# CONFIG_HIPPI is not set
513CONFIG_PPP=m 489# CONFIG_PPP is not set
514CONFIG_PPP_MULTILINK=y 490# CONFIG_SLIP is not set
515CONFIG_PPP_FILTER=y
516CONFIG_PPP_ASYNC=m
517CONFIG_PPP_SYNC_TTY=m
518CONFIG_PPP_DEFLATE=m
519CONFIG_PPP_BSDCOMP=m
520CONFIG_PPP_MPPE=m
521CONFIG_PPPOE=m
522CONFIG_SLIP=m
523CONFIG_SLIP_COMPRESSED=y
524CONFIG_SLIP_SMART=y
525CONFIG_SLIP_MODE_SLIP6=y
526# CONFIG_SHAPER is not set 491# CONFIG_SHAPER is not set
527# CONFIG_NETCONSOLE is not set 492# CONFIG_NETCONSOLE is not set
528# CONFIG_NETPOLL is not set 493# CONFIG_NETPOLL is not set
@@ -583,6 +548,11 @@ CONFIG_HW_CONSOLE=y
583# 548#
584# Non-8250 serial port support 549# Non-8250 serial port support
585# 550#
551CONFIG_SERIAL_CORE=y
552CONFIG_SERIAL_CORE_CONSOLE=y
553CONFIG_SERIAL_VR41XX=y
554CONFIG_SERIAL_VR41XX_CONSOLE=y
555# CONFIG_SERIAL_JSM is not set
586CONFIG_UNIX98_PTYS=y 556CONFIG_UNIX98_PTYS=y
587CONFIG_LEGACY_PTYS=y 557CONFIG_LEGACY_PTYS=y
588CONFIG_LEGACY_PTY_COUNT=256 558CONFIG_LEGACY_PTY_COUNT=256
@@ -607,6 +577,7 @@ CONFIG_TANBAC_TB0219=y
607# Ftape, the floppy tape device driver 577# Ftape, the floppy tape device driver
608# 578#
609# CONFIG_DRM is not set 579# CONFIG_DRM is not set
580CONFIG_GPIO_VR41XX=y
610# CONFIG_RAW_DRIVER is not set 581# CONFIG_RAW_DRIVER is not set
611 582
612# 583#
@@ -642,10 +613,6 @@ CONFIG_TANBAC_TB0219=y
642# 613#
643 614
644# 615#
645# Multimedia Capabilities Port drivers
646#
647
648#
649# Multimedia devices 616# Multimedia devices
650# 617#
651# CONFIG_VIDEO_DEV is not set 618# CONFIG_VIDEO_DEV is not set
@@ -654,6 +621,7 @@ CONFIG_TANBAC_TB0219=y
654# Digital Video Broadcasting Devices 621# Digital Video Broadcasting Devices
655# 622#
656# CONFIG_DVB is not set 623# CONFIG_DVB is not set
624# CONFIG_USB_DABUSB is not set
657 625
658# 626#
659# Graphics support 627# Graphics support
@@ -676,6 +644,7 @@ CONFIG_DUMMY_CONSOLE=y
676# 644#
677CONFIG_USB_ARCH_HAS_HCD=y 645CONFIG_USB_ARCH_HAS_HCD=y
678CONFIG_USB_ARCH_HAS_OHCI=y 646CONFIG_USB_ARCH_HAS_OHCI=y
647CONFIG_USB_ARCH_HAS_EHCI=y
679CONFIG_USB=m 648CONFIG_USB=m
680# CONFIG_USB_DEBUG is not set 649# CONFIG_USB_DEBUG is not set
681 650
@@ -731,9 +700,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
731# CONFIG_USB_ACECAD is not set 700# CONFIG_USB_ACECAD is not set
732# CONFIG_USB_KBTAB is not set 701# CONFIG_USB_KBTAB is not set
733# CONFIG_USB_POWERMATE is not set 702# CONFIG_USB_POWERMATE is not set
734# CONFIG_USB_MTOUCH is not set 703# CONFIG_USB_TOUCHSCREEN is not set
735# CONFIG_USB_ITMTOUCH is not set
736# CONFIG_USB_EGALAX is not set
737# CONFIG_USB_YEALINK is not set 704# CONFIG_USB_YEALINK is not set
738# CONFIG_USB_XPAD is not set 705# CONFIG_USB_XPAD is not set
739# CONFIG_USB_ATI_REMOTE is not set 706# CONFIG_USB_ATI_REMOTE is not set
@@ -747,15 +714,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
747# CONFIG_USB_MDC800 is not set 714# CONFIG_USB_MDC800 is not set
748 715
749# 716#
750# USB Multimedia devices
751#
752# CONFIG_USB_DABUSB is not set
753
754#
755# Video4Linux support is needed for USB Multimedia device support
756#
757
758#
759# USB Network Adapters 717# USB Network Adapters
760# 718#
761# CONFIG_USB_CATC is not set 719# CONFIG_USB_CATC is not set
@@ -807,13 +765,48 @@ CONFIG_USB_MON=y
807# CONFIG_MMC is not set 765# CONFIG_MMC is not set
808 766
809# 767#
768# LED devices
769#
770# CONFIG_NEW_LEDS is not set
771
772#
773# LED drivers
774#
775
776#
777# LED Triggers
778#
779
780#
810# InfiniBand support 781# InfiniBand support
811# 782#
812# CONFIG_INFINIBAND is not set 783# CONFIG_INFINIBAND is not set
813 784
814# 785#
815# SN Devices 786# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
787#
788
789#
790# Real Time Clock
791#
792CONFIG_RTC_LIB=y
793CONFIG_RTC_CLASS=y
794CONFIG_RTC_HCTOSYS=y
795CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
796
797#
798# RTC interfaces
799#
800CONFIG_RTC_INTF_SYSFS=y
801CONFIG_RTC_INTF_PROC=y
802CONFIG_RTC_INTF_DEV=y
803
804#
805# RTC drivers
816# 806#
807# CONFIG_RTC_DRV_M48T86 is not set
808CONFIG_RTC_DRV_VR41XX=y
809# CONFIG_RTC_DRV_TEST is not set
817 810
818# 811#
819# File systems 812# File systems
@@ -821,32 +814,16 @@ CONFIG_USB_MON=y
821CONFIG_EXT2_FS=y 814CONFIG_EXT2_FS=y
822# CONFIG_EXT2_FS_XATTR is not set 815# CONFIG_EXT2_FS_XATTR is not set
823# CONFIG_EXT2_FS_XIP is not set 816# CONFIG_EXT2_FS_XIP is not set
824CONFIG_EXT3_FS=m 817# CONFIG_EXT3_FS is not set
825CONFIG_EXT3_FS_XATTR=y
826# CONFIG_EXT3_FS_POSIX_ACL is not set
827CONFIG_EXT3_FS_SECURITY=y
828CONFIG_JBD=m
829# CONFIG_JBD_DEBUG is not set
830CONFIG_FS_MBCACHE=y
831# CONFIG_REISERFS_FS is not set 818# CONFIG_REISERFS_FS is not set
832CONFIG_JFS_FS=m 819# CONFIG_JFS_FS is not set
833# CONFIG_JFS_POSIX_ACL is not set
834# CONFIG_JFS_SECURITY is not set
835# CONFIG_JFS_DEBUG is not set
836# CONFIG_JFS_STATISTICS is not set
837# CONFIG_FS_POSIX_ACL is not set 820# CONFIG_FS_POSIX_ACL is not set
838CONFIG_XFS_FS=y 821# CONFIG_XFS_FS is not set
839CONFIG_XFS_EXPORT=y
840CONFIG_XFS_QUOTA=y
841# CONFIG_XFS_SECURITY is not set
842CONFIG_XFS_POSIX_ACL=y
843# CONFIG_XFS_RT is not set
844# CONFIG_OCFS2_FS is not set 822# CONFIG_OCFS2_FS is not set
845# CONFIG_MINIX_FS is not set 823# CONFIG_MINIX_FS is not set
846CONFIG_ROMFS_FS=m 824CONFIG_ROMFS_FS=m
847CONFIG_INOTIFY=y 825CONFIG_INOTIFY=y
848# CONFIG_QUOTA is not set 826# CONFIG_QUOTA is not set
849CONFIG_QUOTACTL=y
850CONFIG_DNOTIFY=y 827CONFIG_DNOTIFY=y
851# CONFIG_AUTOFS_FS is not set 828# CONFIG_AUTOFS_FS is not set
852CONFIG_AUTOFS4_FS=y 829CONFIG_AUTOFS4_FS=y
@@ -855,20 +832,14 @@ CONFIG_FUSE_FS=m
855# 832#
856# CD-ROM/DVD Filesystems 833# CD-ROM/DVD Filesystems
857# 834#
858CONFIG_ISO9660_FS=y 835# CONFIG_ISO9660_FS is not set
859CONFIG_JOLIET=y
860CONFIG_ZISOFS=y
861CONFIG_ZISOFS_FS=y
862# CONFIG_UDF_FS is not set 836# CONFIG_UDF_FS is not set
863 837
864# 838#
865# DOS/FAT/NT Filesystems 839# DOS/FAT/NT Filesystems
866# 840#
867CONFIG_FAT_FS=m 841# CONFIG_MSDOS_FS is not set
868CONFIG_MSDOS_FS=m 842# CONFIG_VFAT_FS is not set
869CONFIG_VFAT_FS=m
870CONFIG_FAT_DEFAULT_CODEPAGE=437
871CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
872# CONFIG_NTFS_FS is not set 843# CONFIG_NTFS_FS is not set
873 844
874# 845#
@@ -880,7 +851,6 @@ CONFIG_SYSFS=y
880CONFIG_TMPFS=y 851CONFIG_TMPFS=y
881# CONFIG_HUGETLB_PAGE is not set 852# CONFIG_HUGETLB_PAGE is not set
882CONFIG_RAMFS=y 853CONFIG_RAMFS=y
883CONFIG_RELAYFS_FS=m
884# CONFIG_CONFIGFS_FS is not set 854# CONFIG_CONFIGFS_FS is not set
885 855
886# 856#
@@ -921,9 +891,7 @@ CONFIG_NFS_COMMON=y
921CONFIG_SUNRPC=y 891CONFIG_SUNRPC=y
922# CONFIG_RPCSEC_GSS_KRB5 is not set 892# CONFIG_RPCSEC_GSS_KRB5 is not set
923# CONFIG_RPCSEC_GSS_SPKM3 is not set 893# CONFIG_RPCSEC_GSS_SPKM3 is not set
924CONFIG_SMB_FS=m 894# CONFIG_SMB_FS is not set
925CONFIG_SMB_NLS_DEFAULT=y
926CONFIG_SMB_NLS_REMOTE="cp932"
927# CONFIG_CIFS is not set 895# CONFIG_CIFS is not set
928# CONFIG_NCP_FS is not set 896# CONFIG_NCP_FS is not set
929# CONFIG_CODA_FS is not set 897# CONFIG_CODA_FS is not set
@@ -939,46 +907,7 @@ CONFIG_MSDOS_PARTITION=y
939# 907#
940# Native Language Support 908# Native Language Support
941# 909#
942CONFIG_NLS=y 910# CONFIG_NLS is not set
943CONFIG_NLS_DEFAULT="iso8859-1"
944CONFIG_NLS_CODEPAGE_437=m
945# CONFIG_NLS_CODEPAGE_737 is not set
946# CONFIG_NLS_CODEPAGE_775 is not set
947# CONFIG_NLS_CODEPAGE_850 is not set
948# CONFIG_NLS_CODEPAGE_852 is not set
949# CONFIG_NLS_CODEPAGE_855 is not set
950# CONFIG_NLS_CODEPAGE_857 is not set
951# CONFIG_NLS_CODEPAGE_860 is not set
952# CONFIG_NLS_CODEPAGE_861 is not set
953# CONFIG_NLS_CODEPAGE_862 is not set
954# CONFIG_NLS_CODEPAGE_863 is not set
955# CONFIG_NLS_CODEPAGE_864 is not set
956# CONFIG_NLS_CODEPAGE_865 is not set
957# CONFIG_NLS_CODEPAGE_866 is not set
958# CONFIG_NLS_CODEPAGE_869 is not set
959# CONFIG_NLS_CODEPAGE_936 is not set
960# CONFIG_NLS_CODEPAGE_950 is not set
961CONFIG_NLS_CODEPAGE_932=m
962# CONFIG_NLS_CODEPAGE_949 is not set
963# CONFIG_NLS_CODEPAGE_874 is not set
964# CONFIG_NLS_ISO8859_8 is not set
965# CONFIG_NLS_CODEPAGE_1250 is not set
966# CONFIG_NLS_CODEPAGE_1251 is not set
967# CONFIG_NLS_ASCII is not set
968CONFIG_NLS_ISO8859_1=m
969# CONFIG_NLS_ISO8859_2 is not set
970# CONFIG_NLS_ISO8859_3 is not set
971# CONFIG_NLS_ISO8859_4 is not set
972# CONFIG_NLS_ISO8859_5 is not set
973# CONFIG_NLS_ISO8859_6 is not set
974# CONFIG_NLS_ISO8859_7 is not set
975# CONFIG_NLS_ISO8859_9 is not set
976# CONFIG_NLS_ISO8859_13 is not set
977# CONFIG_NLS_ISO8859_14 is not set
978# CONFIG_NLS_ISO8859_15 is not set
979# CONFIG_NLS_KOI8_R is not set
980# CONFIG_NLS_KOI8_U is not set
981# CONFIG_NLS_UTF8 is not set
982 911
983# 912#
984# Profiling support 913# Profiling support
@@ -992,44 +921,20 @@ CONFIG_NLS_ISO8859_1=m
992# CONFIG_MAGIC_SYSRQ is not set 921# CONFIG_MAGIC_SYSRQ is not set
993# CONFIG_DEBUG_KERNEL is not set 922# CONFIG_DEBUG_KERNEL is not set
994CONFIG_LOG_BUF_SHIFT=14 923CONFIG_LOG_BUF_SHIFT=14
924# CONFIG_DEBUG_FS is not set
995CONFIG_CROSSCOMPILE=y 925CONFIG_CROSSCOMPILE=y
996CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 926CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
997 927
998# 928#
999# Security options 929# Security options
1000# 930#
1001CONFIG_KEYS=y 931# CONFIG_KEYS is not set
1002CONFIG_KEYS_DEBUG_PROC_KEYS=y
1003# CONFIG_SECURITY is not set 932# CONFIG_SECURITY is not set
1004 933
1005# 934#
1006# Cryptographic options 935# Cryptographic options
1007# 936#
1008CONFIG_CRYPTO=y 937# CONFIG_CRYPTO is not set
1009CONFIG_CRYPTO_HMAC=y
1010CONFIG_CRYPTO_NULL=m
1011CONFIG_CRYPTO_MD4=m
1012CONFIG_CRYPTO_MD5=m
1013CONFIG_CRYPTO_SHA1=m
1014CONFIG_CRYPTO_SHA256=m
1015CONFIG_CRYPTO_SHA512=m
1016CONFIG_CRYPTO_WP512=m
1017CONFIG_CRYPTO_TGR192=m
1018CONFIG_CRYPTO_DES=m
1019CONFIG_CRYPTO_BLOWFISH=m
1020CONFIG_CRYPTO_TWOFISH=m
1021CONFIG_CRYPTO_SERPENT=m
1022CONFIG_CRYPTO_AES=m
1023CONFIG_CRYPTO_CAST5=m
1024CONFIG_CRYPTO_CAST6=m
1025CONFIG_CRYPTO_TEA=m
1026CONFIG_CRYPTO_ARC4=m
1027CONFIG_CRYPTO_KHAZAD=m
1028CONFIG_CRYPTO_ANUBIS=m
1029CONFIG_CRYPTO_DEFLATE=m
1030CONFIG_CRYPTO_MICHAEL_MIC=m
1031CONFIG_CRYPTO_CRC32C=m
1032# CONFIG_CRYPTO_TEST is not set
1033 938
1034# 939#
1035# Hardware crypto devices 940# Hardware crypto devices
@@ -1038,9 +943,8 @@ CONFIG_CRYPTO_CRC32C=m
1038# 943#
1039# Library routines 944# Library routines
1040# 945#
1041CONFIG_CRC_CCITT=m 946# CONFIG_CRC_CCITT is not set
1042CONFIG_CRC16=m 947# CONFIG_CRC16 is not set
1043CONFIG_CRC32=y 948CONFIG_CRC32=y
1044CONFIG_LIBCRC32C=m 949# CONFIG_LIBCRC32C is not set
1045CONFIG_ZLIB_INFLATE=y 950CONFIG_ZLIB_INFLATE=m
1046CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 8a1e3ace0b2c..9f215ea350dc 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16 3# Linux kernel version: 2.6.17-rc2
4# Wed Mar 22 11:07:34 2006 4# Tue Apr 25 00:09:17 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -74,7 +74,10 @@ CONFIG_TANBAC_TB0287=y
74CONFIG_PCI_VR41XX=y 74CONFIG_PCI_VR41XX=y
75# CONFIG_VRC4173 is not set 75# CONFIG_VRC4173 is not set
76CONFIG_RWSEM_GENERIC_SPINLOCK=y 76CONFIG_RWSEM_GENERIC_SPINLOCK=y
77CONFIG_GENERIC_FIND_NEXT_BIT=y
78CONFIG_GENERIC_HWEIGHT=y
77CONFIG_GENERIC_CALIBRATE_DELAY=y 79CONFIG_GENERIC_CALIBRATE_DELAY=y
80CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
78CONFIG_DMA_NONCOHERENT=y 81CONFIG_DMA_NONCOHERENT=y
79CONFIG_DMA_NEED_PCI_MAP_STATE=y 82CONFIG_DMA_NEED_PCI_MAP_STATE=y
80# CONFIG_CPU_BIG_ENDIAN is not set 83# CONFIG_CPU_BIG_ENDIAN is not set
@@ -107,7 +110,6 @@ CONFIG_CPU_VR41XX=y
107# CONFIG_CPU_SB1 is not set 110# CONFIG_CPU_SB1 is not set
108CONFIG_SYS_HAS_CPU_VR41XX=y 111CONFIG_SYS_HAS_CPU_VR41XX=y
109CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 112CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
110CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 113CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
112CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 114CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
113 115
@@ -121,7 +123,6 @@ CONFIG_PAGE_SIZE_4KB=y
121# CONFIG_PAGE_SIZE_16KB is not set 123# CONFIG_PAGE_SIZE_16KB is not set
122# CONFIG_PAGE_SIZE_64KB is not set 124# CONFIG_PAGE_SIZE_64KB is not set
123# CONFIG_MIPS_MT is not set 125# CONFIG_MIPS_MT is not set
124# CONFIG_CPU_ADVANCED is not set
125CONFIG_CPU_HAS_SYNC=y 126CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 127CONFIG_GENERIC_HARDIRQS=y
127CONFIG_GENERIC_IRQ_PROBE=y 128CONFIG_GENERIC_IRQ_PROBE=y
@@ -157,6 +158,7 @@ CONFIG_SYSVIPC=y
157CONFIG_SYSCTL=y 158CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 159# CONFIG_AUDIT is not set
159# CONFIG_IKCONFIG is not set 160# CONFIG_IKCONFIG is not set
161# CONFIG_RELAY is not set
160CONFIG_INITRAMFS_SOURCE="" 162CONFIG_INITRAMFS_SOURCE=""
161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 163# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
162CONFIG_EMBEDDED=y 164CONFIG_EMBEDDED=y
@@ -170,10 +172,6 @@ CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 172CONFIG_FUTEX=y
171CONFIG_EPOLL=y 173CONFIG_EPOLL=y
172CONFIG_SHMEM=y 174CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0
177CONFIG_SLAB=y 175CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 176# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 177CONFIG_BASE_SMALL=0
@@ -185,7 +183,6 @@ CONFIG_BASE_SMALL=0
185CONFIG_MODULES=y 183CONFIG_MODULES=y
186CONFIG_MODULE_UNLOAD=y 184CONFIG_MODULE_UNLOAD=y
187# CONFIG_MODULE_FORCE_UNLOAD is not set 185# CONFIG_MODULE_FORCE_UNLOAD is not set
188CONFIG_OBSOLETE_MODPARM=y
189CONFIG_MODVERSIONS=y 186CONFIG_MODVERSIONS=y
190CONFIG_MODULE_SRCVERSION_ALL=y 187CONFIG_MODULE_SRCVERSION_ALL=y
191CONFIG_KMOD=y 188CONFIG_KMOD=y
@@ -194,6 +191,8 @@ CONFIG_KMOD=y
194# Block layer 191# Block layer
195# 192#
196# CONFIG_LBD is not set 193# CONFIG_LBD is not set
194# CONFIG_BLK_DEV_IO_TRACE is not set
195# CONFIG_LSF is not set
197 196
198# 197#
199# IO Schedulers 198# IO Schedulers
@@ -213,7 +212,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
213# 212#
214CONFIG_HW_HAS_PCI=y 213CONFIG_HW_HAS_PCI=y
215CONFIG_PCI=y 214CONFIG_PCI=y
216# CONFIG_PCI_LEGACY_PROC is not set
217CONFIG_MMU=y 215CONFIG_MMU=y
218 216
219# 217#
@@ -245,8 +243,6 @@ CONFIG_NET=y
245CONFIG_PACKET=y 243CONFIG_PACKET=y
246# CONFIG_PACKET_MMAP is not set 244# CONFIG_PACKET_MMAP is not set
247CONFIG_UNIX=y 245CONFIG_UNIX=y
248CONFIG_XFRM=y
249CONFIG_XFRM_USER=m
250# CONFIG_NET_KEY is not set 246# CONFIG_NET_KEY is not set
251CONFIG_INET=y 247CONFIG_INET=y
252CONFIG_IP_MULTICAST=y 248CONFIG_IP_MULTICAST=y
@@ -271,6 +267,7 @@ CONFIG_SYN_COOKIES=y
271# CONFIG_INET_AH is not set 267# CONFIG_INET_AH is not set
272# CONFIG_INET_ESP is not set 268# CONFIG_INET_ESP is not set
273# CONFIG_INET_IPCOMP is not set 269# CONFIG_INET_IPCOMP is not set
270# CONFIG_INET_XFRM_TUNNEL is not set
274CONFIG_INET_TUNNEL=m 271CONFIG_INET_TUNNEL=m
275CONFIG_INET_DIAG=y 272CONFIG_INET_DIAG=y
276CONFIG_INET_TCP_DIAG=y 273CONFIG_INET_TCP_DIAG=y
@@ -288,6 +285,8 @@ CONFIG_TCP_CONG_HTCP=m
288# CONFIG_TCP_CONG_VEGAS is not set 285# CONFIG_TCP_CONG_VEGAS is not set
289# CONFIG_TCP_CONG_SCALABLE is not set 286# CONFIG_TCP_CONG_SCALABLE is not set
290# CONFIG_IPV6 is not set 287# CONFIG_IPV6 is not set
288# CONFIG_INET6_XFRM_TUNNEL is not set
289# CONFIG_INET6_TUNNEL is not set
291# CONFIG_NETFILTER is not set 290# CONFIG_NETFILTER is not set
292 291
293# 292#
@@ -493,7 +492,6 @@ CONFIG_BLK_DEV_SD=y
493# CONFIG_SCSI_INIA100 is not set 492# CONFIG_SCSI_INIA100 is not set
494# CONFIG_SCSI_SYM53C8XX_2 is not set 493# CONFIG_SCSI_SYM53C8XX_2 is not set
495# CONFIG_SCSI_IPR is not set 494# CONFIG_SCSI_IPR is not set
496# CONFIG_SCSI_QLOGIC_FC is not set
497# CONFIG_SCSI_QLOGIC_1280 is not set 495# CONFIG_SCSI_QLOGIC_1280 is not set
498# CONFIG_SCSI_QLA_FC is not set 496# CONFIG_SCSI_QLA_FC is not set
499# CONFIG_SCSI_LPFC is not set 497# CONFIG_SCSI_LPFC is not set
@@ -714,7 +712,6 @@ CONFIG_LEGACY_PTY_COUNT=256
714# CONFIG_WATCHDOG is not set 712# CONFIG_WATCHDOG is not set
715# CONFIG_RTC is not set 713# CONFIG_RTC is not set
716# CONFIG_GEN_RTC is not set 714# CONFIG_GEN_RTC is not set
717# CONFIG_RTC_VR41XX is not set
718# CONFIG_DTLK is not set 715# CONFIG_DTLK is not set
719# CONFIG_R3964 is not set 716# CONFIG_R3964 is not set
720# CONFIG_APPLICOM is not set 717# CONFIG_APPLICOM is not set
@@ -760,10 +757,6 @@ CONFIG_GPIO_VR41XX=y
760# 757#
761 758
762# 759#
763# Multimedia Capabilities Port drivers
764#
765
766#
767# Multimedia devices 760# Multimedia devices
768# 761#
769# CONFIG_VIDEO_DEV is not set 762# CONFIG_VIDEO_DEV is not set
@@ -772,17 +765,53 @@ CONFIG_GPIO_VR41XX=y
772# Digital Video Broadcasting Devices 765# Digital Video Broadcasting Devices
773# 766#
774# CONFIG_DVB is not set 767# CONFIG_DVB is not set
768# CONFIG_USB_DABUSB is not set
775 769
776# 770#
777# Graphics support 771# Graphics support
778# 772#
779# CONFIG_FB is not set 773CONFIG_FB=y
774CONFIG_FB_CFB_FILLRECT=y
775CONFIG_FB_CFB_COPYAREA=y
776CONFIG_FB_CFB_IMAGEBLIT=y
777# CONFIG_FB_MACMODES is not set
778CONFIG_FB_FIRMWARE_EDID=y
779# CONFIG_FB_MODE_HELPERS is not set
780# CONFIG_FB_TILEBLITTING is not set
781# CONFIG_FB_CIRRUS is not set
782# CONFIG_FB_PM2 is not set
783# CONFIG_FB_CYBER2000 is not set
784# CONFIG_FB_ASILIANT is not set
785# CONFIG_FB_IMSTT is not set
786# CONFIG_FB_S1D13XXX is not set
787# CONFIG_FB_NVIDIA is not set
788# CONFIG_FB_RIVA is not set
789# CONFIG_FB_MATROX is not set
790# CONFIG_FB_RADEON is not set
791# CONFIG_FB_ATY128 is not set
792# CONFIG_FB_ATY is not set
793# CONFIG_FB_SAVAGE is not set
794# CONFIG_FB_SIS is not set
795# CONFIG_FB_NEOMAGIC is not set
796# CONFIG_FB_KYRO is not set
797# CONFIG_FB_3DFX is not set
798# CONFIG_FB_VOODOO1 is not set
799CONFIG_FB_SMIVGX=y
800# CONFIG_FB_TRIDENT is not set
801# CONFIG_FB_VIRTUAL is not set
780 802
781# 803#
782# Console display driver support 804# Console display driver support
783# 805#
784# CONFIG_VGA_CONSOLE is not set 806# CONFIG_VGA_CONSOLE is not set
785CONFIG_DUMMY_CONSOLE=y 807CONFIG_DUMMY_CONSOLE=y
808# CONFIG_FRAMEBUFFER_CONSOLE is not set
809
810#
811# Logo configuration
812#
813# CONFIG_LOGO is not set
814# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
786 815
787# 816#
788# Sound 817# Sound
@@ -794,6 +823,7 @@ CONFIG_DUMMY_CONSOLE=y
794# 823#
795CONFIG_USB_ARCH_HAS_HCD=y 824CONFIG_USB_ARCH_HAS_HCD=y
796CONFIG_USB_ARCH_HAS_OHCI=y 825CONFIG_USB_ARCH_HAS_OHCI=y
826CONFIG_USB_ARCH_HAS_EHCI=y
797CONFIG_USB=m 827CONFIG_USB=m
798# CONFIG_USB_DEBUG is not set 828# CONFIG_USB_DEBUG is not set
799 829
@@ -863,9 +893,7 @@ CONFIG_USB_HIDINPUT=y
863# CONFIG_USB_ACECAD is not set 893# CONFIG_USB_ACECAD is not set
864# CONFIG_USB_KBTAB is not set 894# CONFIG_USB_KBTAB is not set
865# CONFIG_USB_POWERMATE is not set 895# CONFIG_USB_POWERMATE is not set
866# CONFIG_USB_MTOUCH is not set 896# CONFIG_USB_TOUCHSCREEN is not set
867# CONFIG_USB_ITMTOUCH is not set
868# CONFIG_USB_EGALAX is not set
869# CONFIG_USB_YEALINK is not set 897# CONFIG_USB_YEALINK is not set
870# CONFIG_USB_XPAD is not set 898# CONFIG_USB_XPAD is not set
871# CONFIG_USB_ATI_REMOTE is not set 899# CONFIG_USB_ATI_REMOTE is not set
@@ -880,15 +908,6 @@ CONFIG_USB_HIDINPUT=y
880# CONFIG_USB_MICROTEK is not set 908# CONFIG_USB_MICROTEK is not set
881 909
882# 910#
883# USB Multimedia devices
884#
885# CONFIG_USB_DABUSB is not set
886
887#
888# Video4Linux support is needed for USB Multimedia device support
889#
890
891#
892# USB Network Adapters 911# USB Network Adapters
893# 912#
894# CONFIG_USB_CATC is not set 913# CONFIG_USB_CATC is not set
@@ -939,6 +958,19 @@ CONFIG_USB_MON=y
939# CONFIG_MMC is not set 958# CONFIG_MMC is not set
940 959
941# 960#
961# LED devices
962#
963# CONFIG_NEW_LEDS is not set
964
965#
966# LED drivers
967#
968
969#
970# LED Triggers
971#
972
973#
942# InfiniBand support 974# InfiniBand support
943# 975#
944# CONFIG_INFINIBAND is not set 976# CONFIG_INFINIBAND is not set
@@ -948,6 +980,11 @@ CONFIG_USB_MON=y
948# 980#
949 981
950# 982#
983# Real Time Clock
984#
985# CONFIG_RTC_CLASS is not set
986
987#
951# File systems 988# File systems
952# 989#
953CONFIG_EXT2_FS=y 990CONFIG_EXT2_FS=y
@@ -1001,7 +1038,6 @@ CONFIG_SYSFS=y
1001CONFIG_TMPFS=y 1038CONFIG_TMPFS=y
1002# CONFIG_HUGETLB_PAGE is not set 1039# CONFIG_HUGETLB_PAGE is not set
1003CONFIG_RAMFS=y 1040CONFIG_RAMFS=y
1004# CONFIG_RELAYFS_FS is not set
1005# CONFIG_CONFIGFS_FS is not set 1041# CONFIG_CONFIGFS_FS is not set
1006 1042
1007# 1043#
@@ -1067,14 +1103,14 @@ CONFIG_MSDOS_PARTITION=y
1067# CONFIG_MAGIC_SYSRQ is not set 1103# CONFIG_MAGIC_SYSRQ is not set
1068# CONFIG_DEBUG_KERNEL is not set 1104# CONFIG_DEBUG_KERNEL is not set
1069CONFIG_LOG_BUF_SHIFT=14 1105CONFIG_LOG_BUF_SHIFT=14
1106# CONFIG_DEBUG_FS is not set
1070CONFIG_CROSSCOMPILE=y 1107CONFIG_CROSSCOMPILE=y
1071CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 1108CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1072 1109
1073# 1110#
1074# Security options 1111# Security options
1075# 1112#
1076CONFIG_KEYS=y 1113# CONFIG_KEYS is not set
1077CONFIG_KEYS_DEBUG_PROC_KEYS=y
1078# CONFIG_SECURITY is not set 1114# CONFIG_SECURITY is not set
1079 1115
1080# 1116#
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 7132e296d40a..ac7765eb8da7 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:36 2006 4# Tue Apr 25 00:09:33 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -70,6 +70,8 @@ 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
73CONFIG_GENERIC_FIND_NEXT_BIT=y
74CONFIG_GENERIC_HWEIGHT=y
73CONFIG_GENERIC_CALIBRATE_DELAY=y 75CONFIG_GENERIC_CALIBRATE_DELAY=y
74CONFIG_DMA_NONCOHERENT=y 76CONFIG_DMA_NONCOHERENT=y
75CONFIG_DMA_NEED_PCI_MAP_STATE=y 77CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -88,7 +90,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
88# CONFIG_CPU_MIPS64_R2 is not set 90# CONFIG_CPU_MIPS64_R2 is not set
89# CONFIG_CPU_R3000 is not set 91# CONFIG_CPU_R3000 is not set
90# CONFIG_CPU_TX39XX is not set 92# CONFIG_CPU_TX39XX is not set
91# CONFIG_CPU_VR41XX is not set 93CONFIG_CPU_VR41XX=y
92# CONFIG_CPU_R4300 is not set 94# CONFIG_CPU_R4300 is not set
93# CONFIG_CPU_R4X00 is not set 95# CONFIG_CPU_R4X00 is not set
94# CONFIG_CPU_TX49XX is not set 96# CONFIG_CPU_TX49XX is not set
@@ -101,18 +103,21 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
101# CONFIG_CPU_RM7000 is not set 103# CONFIG_CPU_RM7000 is not set
102# CONFIG_CPU_RM9000 is not set 104# CONFIG_CPU_RM9000 is not set
103# CONFIG_CPU_SB1 is not set 105# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_VR41XX=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
104 110
105# 111#
106# Kernel type 112# Kernel type
107# 113#
108# CONFIG_32BIT is not set 114CONFIG_32BIT=y
109# CONFIG_64BIT is not set 115# CONFIG_64BIT is not set
110CONFIG_PAGE_SIZE_4KB=y 116CONFIG_PAGE_SIZE_4KB=y
111# CONFIG_PAGE_SIZE_8KB is not set 117# CONFIG_PAGE_SIZE_8KB is not set
112# CONFIG_PAGE_SIZE_16KB is not set 118# CONFIG_PAGE_SIZE_16KB is not set
113# CONFIG_PAGE_SIZE_64KB is not set 119# CONFIG_PAGE_SIZE_64KB is not set
114# CONFIG_MIPS_MT is not set 120# CONFIG_MIPS_MT is not set
115CONFIG_CPU_HAS_LLSC=y
116CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
117CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
118CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,7 +138,6 @@ CONFIG_PREEMPT_NONE=y
133# Code maturity level options 138# Code maturity level options
134# 139#
135CONFIG_EXPERIMENTAL=y 140CONFIG_EXPERIMENTAL=y
136CONFIG_CLEAN_COMPILE=y
137CONFIG_BROKEN_ON_SMP=y 141CONFIG_BROKEN_ON_SMP=y
138CONFIG_INIT_ENV_ARG_LIMIT=32 142CONFIG_INIT_ENV_ARG_LIMIT=32
139 143
@@ -149,6 +153,7 @@ CONFIG_SYSVIPC=y
149CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
150# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
151# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
156# CONFIG_RELAY is not set
152CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
153# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
154CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
@@ -162,10 +167,6 @@ CONFIG_BASE_FULL=y
162CONFIG_FUTEX=y 167CONFIG_FUTEX=y
163CONFIG_EPOLL=y 168CONFIG_EPOLL=y
164CONFIG_SHMEM=y 169CONFIG_SHMEM=y
165CONFIG_CC_ALIGN_FUNCTIONS=0
166CONFIG_CC_ALIGN_LABELS=0
167CONFIG_CC_ALIGN_LOOPS=0
168CONFIG_CC_ALIGN_JUMPS=0
169CONFIG_SLAB=y 170CONFIG_SLAB=y
170# CONFIG_TINY_SHMEM is not set 171# CONFIG_TINY_SHMEM is not set
171CONFIG_BASE_SMALL=0 172CONFIG_BASE_SMALL=0
@@ -177,7 +178,6 @@ CONFIG_BASE_SMALL=0
177CONFIG_MODULES=y 178CONFIG_MODULES=y
178CONFIG_MODULE_UNLOAD=y 179CONFIG_MODULE_UNLOAD=y
179# CONFIG_MODULE_FORCE_UNLOAD is not set 180# CONFIG_MODULE_FORCE_UNLOAD is not set
180CONFIG_OBSOLETE_MODPARM=y
181CONFIG_MODVERSIONS=y 181CONFIG_MODVERSIONS=y
182CONFIG_MODULE_SRCVERSION_ALL=y 182CONFIG_MODULE_SRCVERSION_ALL=y
183CONFIG_KMOD=y 183CONFIG_KMOD=y
@@ -185,6 +185,9 @@ CONFIG_KMOD=y
185# 185#
186# Block layer 186# Block layer
187# 187#
188# CONFIG_LBD is not set
189# CONFIG_BLK_DEV_IO_TRACE is not set
190# CONFIG_LSF is not set
188 191
189# 192#
190# IO Schedulers 193# IO Schedulers
@@ -220,6 +223,7 @@ CONFIG_PCMCIA_IOCTL=y
220# CONFIG_I82365 is not set 223# CONFIG_I82365 is not set
221# CONFIG_TCIC is not set 224# CONFIG_TCIC is not set
222CONFIG_PCMCIA_PROBE=y 225CONFIG_PCMCIA_PROBE=y
226CONFIG_PCMCIA_VRC4171=y
223 227
224# 228#
225# PCI Hotplug Support 229# PCI Hotplug Support
@@ -230,6 +234,7 @@ CONFIG_PCMCIA_PROBE=y
230# 234#
231CONFIG_BINFMT_ELF=y 235CONFIG_BINFMT_ELF=y
232# CONFIG_BINFMT_MISC is not set 236# CONFIG_BINFMT_MISC is not set
237CONFIG_TRAD_SIGNALS=y
233 238
234# 239#
235# Networking 240# Networking
@@ -239,6 +244,7 @@ CONFIG_NET=y
239# 244#
240# Networking options 245# Networking options
241# 246#
247# CONFIG_NETDEBUG is not set
242CONFIG_PACKET=y 248CONFIG_PACKET=y
243CONFIG_PACKET_MMAP=y 249CONFIG_PACKET_MMAP=y
244CONFIG_UNIX=y 250CONFIG_UNIX=y
@@ -258,12 +264,15 @@ CONFIG_IP_FIB_HASH=y
258# CONFIG_INET_AH is not set 264# CONFIG_INET_AH is not set
259# CONFIG_INET_ESP is not set 265# CONFIG_INET_ESP is not set
260# CONFIG_INET_IPCOMP is not set 266# CONFIG_INET_IPCOMP is not set
261CONFIG_INET_TUNNEL=m 267# CONFIG_INET_XFRM_TUNNEL is not set
268# CONFIG_INET_TUNNEL is not set
262CONFIG_INET_DIAG=y 269CONFIG_INET_DIAG=y
263CONFIG_INET_TCP_DIAG=y 270CONFIG_INET_TCP_DIAG=y
264# CONFIG_TCP_CONG_ADVANCED is not set 271# CONFIG_TCP_CONG_ADVANCED is not set
265CONFIG_TCP_CONG_BIC=y 272CONFIG_TCP_CONG_BIC=y
266# CONFIG_IPV6 is not set 273# CONFIG_IPV6 is not set
274# CONFIG_INET6_XFRM_TUNNEL is not set
275# CONFIG_INET6_TUNNEL is not set
267# CONFIG_NETFILTER is not set 276# CONFIG_NETFILTER is not set
268 277
269# 278#
@@ -275,6 +284,11 @@ CONFIG_TCP_CONG_BIC=y
275# SCTP Configuration (EXPERIMENTAL) 284# SCTP Configuration (EXPERIMENTAL)
276# 285#
277# CONFIG_IP_SCTP is not set 286# CONFIG_IP_SCTP is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
278# CONFIG_ATM is not set 292# CONFIG_ATM is not set
279# CONFIG_BRIDGE is not set 293# CONFIG_BRIDGE is not set
280# CONFIG_VLAN_8021Q is not set 294# CONFIG_VLAN_8021Q is not set
@@ -284,11 +298,6 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_ATALK is not set 298# CONFIG_ATALK is not set
285# CONFIG_X25 is not set 299# CONFIG_X25 is not set
286# CONFIG_LAPB is not set 300# CONFIG_LAPB is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
292# CONFIG_NET_DIVERT is not set 301# CONFIG_NET_DIVERT is not set
293# CONFIG_ECONET is not set 302# CONFIG_ECONET is not set
294# CONFIG_WAN_ROUTER is not set 303# CONFIG_WAN_ROUTER is not set
@@ -305,10 +314,8 @@ CONFIG_TCP_CONG_BIC=y
305# CONFIG_HAMRADIO is not set 314# CONFIG_HAMRADIO is not set
306# CONFIG_IRDA is not set 315# CONFIG_IRDA is not set
307# CONFIG_BT is not set 316# CONFIG_BT is not set
308CONFIG_IEEE80211=m 317# CONFIG_IEEE80211 is not set
309# CONFIG_IEEE80211_DEBUG is not set 318CONFIG_WIRELESS_EXT=y
310CONFIG_IEEE80211_CRYPT_WEP=m
311CONFIG_IEEE80211_CRYPT_CCMP=m
312 319
313# 320#
314# Device Drivers 321# Device Drivers
@@ -347,10 +354,12 @@ CONFIG_CONNECTOR=m
347# CONFIG_BLK_DEV_COW_COMMON is not set 354# CONFIG_BLK_DEV_COW_COMMON is not set
348# CONFIG_BLK_DEV_LOOP is not set 355# CONFIG_BLK_DEV_LOOP is not set
349# CONFIG_BLK_DEV_NBD is not set 356# CONFIG_BLK_DEV_NBD is not set
350# CONFIG_BLK_DEV_RAM is not set 357CONFIG_BLK_DEV_RAM=m
351CONFIG_BLK_DEV_RAM_COUNT=16 358CONFIG_BLK_DEV_RAM_COUNT=16
359CONFIG_BLK_DEV_RAM_SIZE=4096
360# CONFIG_BLK_DEV_INITRD is not set
352# CONFIG_CDROM_PKTCDVD is not set 361# CONFIG_CDROM_PKTCDVD is not set
353CONFIG_ATA_OVER_ETH=m 362# CONFIG_ATA_OVER_ETH is not set
354 363
355# 364#
356# ATA/ATAPI/MFM/RLL support 365# ATA/ATAPI/MFM/RLL support
@@ -468,7 +477,38 @@ CONFIG_MII=m
468# 477#
469# Wireless LAN (non-hamradio) 478# Wireless LAN (non-hamradio)
470# 479#
471# CONFIG_NET_RADIO is not set 480CONFIG_NET_RADIO=y
481# CONFIG_NET_WIRELESS_RTNETLINK is not set
482
483#
484# Obsolete Wireless cards support (pre-802.11)
485#
486# CONFIG_STRIP is not set
487# CONFIG_ARLAN is not set
488# CONFIG_WAVELAN is not set
489# CONFIG_PCMCIA_WAVELAN is not set
490# CONFIG_PCMCIA_NETWAVE is not set
491
492#
493# Wireless 802.11 Frequency Hopping cards support
494#
495# CONFIG_PCMCIA_RAYCS is not set
496
497#
498# Wireless 802.11b ISA/PCI cards support
499#
500CONFIG_HERMES=m
501# CONFIG_ATMEL is not set
502
503#
504# Wireless 802.11b Pcmcia/Cardbus cards support
505#
506CONFIG_PCMCIA_HERMES=m
507# CONFIG_PCMCIA_SPECTRUM is not set
508# CONFIG_AIRO_CS is not set
509# CONFIG_PCMCIA_WL3501 is not set
510# CONFIG_HOSTAP is not set
511CONFIG_NET_WIRELESS=y
472 512
473# 513#
474# PCMCIA network device support 514# PCMCIA network device support
@@ -512,10 +552,7 @@ CONFIG_INPUT=y
512# 552#
513# Userland interfaces 553# Userland interfaces
514# 554#
515CONFIG_INPUT_MOUSEDEV=y 555# CONFIG_INPUT_MOUSEDEV is not set
516CONFIG_INPUT_MOUSEDEV_PSAUX=y
517CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
518CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
519# CONFIG_INPUT_JOYDEV is not set 556# CONFIG_INPUT_JOYDEV is not set
520# CONFIG_INPUT_TSDEV is not set 557# CONFIG_INPUT_TSDEV is not set
521# CONFIG_INPUT_EVDEV is not set 558# CONFIG_INPUT_EVDEV is not set
@@ -533,11 +570,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
533# 570#
534# Hardware I/O ports 571# Hardware I/O ports
535# 572#
536CONFIG_SERIO=y 573# CONFIG_SERIO is not set
537# CONFIG_SERIO_I8042 is not set
538CONFIG_SERIO_SERPORT=y
539# CONFIG_SERIO_LIBPS2 is not set
540CONFIG_SERIO_RAW=m
541# CONFIG_GAMEPORT is not set 574# CONFIG_GAMEPORT is not set
542 575
543# 576#
@@ -556,6 +589,10 @@ CONFIG_HW_CONSOLE=y
556# 589#
557# Non-8250 serial port support 590# Non-8250 serial port support
558# 591#
592CONFIG_SERIAL_CORE=y
593CONFIG_SERIAL_CORE_CONSOLE=y
594CONFIG_SERIAL_VR41XX=y
595CONFIG_SERIAL_VR41XX_CONSOLE=y
559CONFIG_UNIX98_PTYS=y 596CONFIG_UNIX98_PTYS=y
560CONFIG_LEGACY_PTYS=y 597CONFIG_LEGACY_PTYS=y
561CONFIG_LEGACY_PTY_COUNT=256 598CONFIG_LEGACY_PTY_COUNT=256
@@ -568,20 +605,7 @@ CONFIG_LEGACY_PTY_COUNT=256
568# 605#
569# Watchdog Cards 606# Watchdog Cards
570# 607#
571CONFIG_WATCHDOG=y 608# CONFIG_WATCHDOG is not set
572# CONFIG_WATCHDOG_NOWAYOUT is not set
573
574#
575# Watchdog Device Drivers
576#
577# CONFIG_SOFT_WATCHDOG is not set
578
579#
580# ISA-based Watchdog Cards
581#
582# CONFIG_PCWATCHDOG is not set
583# CONFIG_MIXCOMWD is not set
584# CONFIG_WDT is not set
585# CONFIG_RTC is not set 609# CONFIG_RTC is not set
586# CONFIG_GEN_RTC is not set 610# CONFIG_GEN_RTC is not set
587# CONFIG_DTLK is not set 611# CONFIG_DTLK is not set
@@ -597,6 +621,7 @@ CONFIG_WATCHDOG=y
597# CONFIG_SYNCLINK_CS is not set 621# CONFIG_SYNCLINK_CS is not set
598# CONFIG_CARDMAN_4000 is not set 622# CONFIG_CARDMAN_4000 is not set
599# CONFIG_CARDMAN_4040 is not set 623# CONFIG_CARDMAN_4040 is not set
624# CONFIG_GPIO_VR41XX is not set
600# CONFIG_RAW_DRIVER is not set 625# CONFIG_RAW_DRIVER is not set
601 626
602# 627#
@@ -632,10 +657,6 @@ CONFIG_WATCHDOG=y
632# 657#
633 658
634# 659#
635# Multimedia Capabilities Port drivers
636#
637
638#
639# Multimedia devices 660# Multimedia devices
640# 661#
641# CONFIG_VIDEO_DEV is not set 662# CONFIG_VIDEO_DEV is not set
@@ -667,6 +688,7 @@ CONFIG_DUMMY_CONSOLE=y
667# 688#
668# CONFIG_USB_ARCH_HAS_HCD is not set 689# CONFIG_USB_ARCH_HAS_HCD is not set
669# CONFIG_USB_ARCH_HAS_OHCI is not set 690# CONFIG_USB_ARCH_HAS_OHCI is not set
691# CONFIG_USB_ARCH_HAS_EHCI is not set
670 692
671# 693#
672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 694# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -683,12 +705,30 @@ CONFIG_DUMMY_CONSOLE=y
683# CONFIG_MMC is not set 705# CONFIG_MMC is not set
684 706
685# 707#
708# LED devices
709#
710# CONFIG_NEW_LEDS is not set
711
712#
713# LED drivers
714#
715
716#
717# LED Triggers
718#
719
720#
686# InfiniBand support 721# InfiniBand support
687# 722#
688 723
689# 724#
690# SN Devices 725# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
726#
727
728#
729# Real Time Clock
691# 730#
731# CONFIG_RTC_CLASS is not set
692 732
693# 733#
694# File systems 734# File systems
@@ -710,7 +750,7 @@ CONFIG_FS_POSIX_ACL=y
710CONFIG_INOTIFY=y 750CONFIG_INOTIFY=y
711# CONFIG_QUOTA is not set 751# CONFIG_QUOTA is not set
712CONFIG_DNOTIFY=y 752CONFIG_DNOTIFY=y
713CONFIG_AUTOFS_FS=y 753# CONFIG_AUTOFS_FS is not set
714CONFIG_AUTOFS4_FS=y 754CONFIG_AUTOFS4_FS=y
715CONFIG_FUSE_FS=m 755CONFIG_FUSE_FS=m
716 756
@@ -733,10 +773,9 @@ CONFIG_FUSE_FS=m
733CONFIG_PROC_FS=y 773CONFIG_PROC_FS=y
734CONFIG_PROC_KCORE=y 774CONFIG_PROC_KCORE=y
735CONFIG_SYSFS=y 775CONFIG_SYSFS=y
736# CONFIG_TMPFS is not set 776CONFIG_TMPFS=y
737# CONFIG_HUGETLB_PAGE is not set 777# CONFIG_HUGETLB_PAGE is not set
738CONFIG_RAMFS=y 778CONFIG_RAMFS=y
739CONFIG_RELAYFS_FS=m
740# CONFIG_CONFIGFS_FS is not set 779# CONFIG_CONFIGFS_FS is not set
741 780
742# 781#
@@ -802,44 +841,20 @@ CONFIG_MSDOS_PARTITION=y
802# CONFIG_MAGIC_SYSRQ is not set 841# CONFIG_MAGIC_SYSRQ is not set
803# CONFIG_DEBUG_KERNEL is not set 842# CONFIG_DEBUG_KERNEL is not set
804CONFIG_LOG_BUF_SHIFT=14 843CONFIG_LOG_BUF_SHIFT=14
844# CONFIG_DEBUG_FS is not set
805CONFIG_CROSSCOMPILE=y 845CONFIG_CROSSCOMPILE=y
806CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M" 846CONFIG_CMDLINE="console=ttyVR0,19200 mem=16M"
807 847
808# 848#
809# Security options 849# Security options
810# 850#
811CONFIG_KEYS=y 851# CONFIG_KEYS is not set
812CONFIG_KEYS_DEBUG_PROC_KEYS=y
813# CONFIG_SECURITY is not set 852# CONFIG_SECURITY is not set
814 853
815# 854#
816# Cryptographic options 855# Cryptographic options
817# 856#
818CONFIG_CRYPTO=y 857# CONFIG_CRYPTO is not set
819CONFIG_CRYPTO_HMAC=y
820CONFIG_CRYPTO_NULL=m
821CONFIG_CRYPTO_MD4=m
822CONFIG_CRYPTO_MD5=m
823CONFIG_CRYPTO_SHA1=m
824CONFIG_CRYPTO_SHA256=m
825CONFIG_CRYPTO_SHA512=m
826CONFIG_CRYPTO_WP512=m
827CONFIG_CRYPTO_TGR192=m
828CONFIG_CRYPTO_DES=m
829CONFIG_CRYPTO_BLOWFISH=m
830CONFIG_CRYPTO_TWOFISH=m
831CONFIG_CRYPTO_SERPENT=m
832CONFIG_CRYPTO_AES=m
833CONFIG_CRYPTO_CAST5=m
834CONFIG_CRYPTO_CAST6=m
835CONFIG_CRYPTO_TEA=m
836CONFIG_CRYPTO_ARC4=m
837CONFIG_CRYPTO_KHAZAD=m
838CONFIG_CRYPTO_ANUBIS=m
839CONFIG_CRYPTO_DEFLATE=m
840CONFIG_CRYPTO_MICHAEL_MIC=m
841CONFIG_CRYPTO_CRC32C=m
842# CONFIG_CRYPTO_TEST is not set
843 858
844# 859#
845# Hardware crypto devices 860# Hardware crypto devices
@@ -849,8 +864,6 @@ CONFIG_CRYPTO_CRC32C=m
849# Library routines 864# Library routines
850# 865#
851# CONFIG_CRC_CCITT is not set 866# CONFIG_CRC_CCITT is not set
852CONFIG_CRC16=m 867# CONFIG_CRC16 is not set
853CONFIG_CRC32=y 868CONFIG_CRC32=y
854CONFIG_LIBCRC32C=m 869# CONFIG_LIBCRC32C is not set
855CONFIG_ZLIB_INFLATE=m
856CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 67457850941d..b52d709de962 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:40:37 2006 4# Mon Apr 24 14:51:20 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -65,6 +65,8 @@ 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
68CONFIG_GENERIC_FIND_NEXT_BIT=y
69CONFIG_GENERIC_HWEIGHT=y
68CONFIG_GENERIC_CALIBRATE_DELAY=y 70CONFIG_GENERIC_CALIBRATE_DELAY=y
69CONFIG_DMA_COHERENT=y 71CONFIG_DMA_COHERENT=y
70CONFIG_CPU_BIG_ENDIAN=y 72CONFIG_CPU_BIG_ENDIAN=y
@@ -116,7 +118,6 @@ CONFIG_PAGE_SIZE_4KB=y
116CONFIG_CPU_HAS_PREFETCH=y 118CONFIG_CPU_HAS_PREFETCH=y
117# CONFIG_MIPS_MT is not set 119# CONFIG_MIPS_MT is not set
118# CONFIG_64BIT_PHYS_ADDR is not set 120# CONFIG_64BIT_PHYS_ADDR is not set
119# CONFIG_CPU_ADVANCED is not set
120CONFIG_CPU_HAS_LLSC=y 121CONFIG_CPU_HAS_LLSC=y
121CONFIG_CPU_HAS_SYNC=y 122CONFIG_CPU_HAS_SYNC=y
122CONFIG_GENERIC_HARDIRQS=y 123CONFIG_GENERIC_HARDIRQS=y
@@ -140,7 +141,6 @@ CONFIG_PREEMPT_BKL=y
140# Code maturity level options 141# Code maturity level options
141# 142#
142# CONFIG_EXPERIMENTAL is not set 143# CONFIG_EXPERIMENTAL is not set
143CONFIG_CLEAN_COMPILE=y
144CONFIG_LOCK_KERNEL=y 144CONFIG_LOCK_KERNEL=y
145CONFIG_INIT_ENV_ARG_LIMIT=32 145CONFIG_INIT_ENV_ARG_LIMIT=32
146 146
@@ -157,6 +157,7 @@ CONFIG_SYSCTL=y
157CONFIG_IKCONFIG=y 157CONFIG_IKCONFIG=y
158CONFIG_IKCONFIG_PROC=y 158CONFIG_IKCONFIG_PROC=y
159# CONFIG_CPUSETS is not set 159# CONFIG_CPUSETS is not set
160CONFIG_RELAY=y
160CONFIG_INITRAMFS_SOURCE="" 161CONFIG_INITRAMFS_SOURCE=""
161CONFIG_EMBEDDED=y 162CONFIG_EMBEDDED=y
162CONFIG_KALLSYMS=y 163CONFIG_KALLSYMS=y
@@ -170,10 +171,6 @@ CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 171CONFIG_FUTEX=y
171CONFIG_EPOLL=y 172CONFIG_EPOLL=y
172CONFIG_SHMEM=y 173CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0
177CONFIG_SLAB=y 174CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
@@ -184,7 +181,6 @@ CONFIG_BASE_SMALL=0
184# 181#
185CONFIG_MODULES=y 182CONFIG_MODULES=y
186CONFIG_MODULE_UNLOAD=y 183CONFIG_MODULE_UNLOAD=y
187CONFIG_OBSOLETE_MODPARM=y
188# CONFIG_MODVERSIONS is not set 184# CONFIG_MODVERSIONS is not set
189# CONFIG_MODULE_SRCVERSION_ALL is not set 185# CONFIG_MODULE_SRCVERSION_ALL is not set
190CONFIG_KMOD=y 186CONFIG_KMOD=y
@@ -194,6 +190,8 @@ CONFIG_STOP_MACHINE=y
194# Block layer 190# Block layer
195# 191#
196# CONFIG_LBD is not set 192# CONFIG_LBD is not set
193# CONFIG_BLK_DEV_IO_TRACE is not set
194# CONFIG_LSF is not set
197 195
198# 196#
199# IO Schedulers 197# IO Schedulers
@@ -213,7 +211,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
213# 211#
214CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
215CONFIG_PCI=y 213CONFIG_PCI=y
216CONFIG_PCI_LEGACY_PROC=y
217# CONFIG_PCI_DEBUG is not set 214# CONFIG_PCI_DEBUG is not set
218CONFIG_MMU=y 215CONFIG_MMU=y
219 216
@@ -241,6 +238,7 @@ CONFIG_NET=y
241# 238#
242# Networking options 239# Networking options
243# 240#
241# CONFIG_NETDEBUG is not set
244CONFIG_PACKET=m 242CONFIG_PACKET=m
245CONFIG_PACKET_MMAP=y 243CONFIG_PACKET_MMAP=y
246CONFIG_UNIX=y 244CONFIG_UNIX=y
@@ -261,16 +259,19 @@ CONFIG_IP_PNP_BOOTP=y
261# CONFIG_INET_AH is not set 259# CONFIG_INET_AH is not set
262# CONFIG_INET_ESP is not set 260# CONFIG_INET_ESP is not set
263# CONFIG_INET_IPCOMP is not set 261# CONFIG_INET_IPCOMP is not set
264CONFIG_INET_TUNNEL=m 262# CONFIG_INET_XFRM_TUNNEL is not set
263# CONFIG_INET_TUNNEL is not set
265CONFIG_INET_DIAG=y 264CONFIG_INET_DIAG=y
266CONFIG_INET_TCP_DIAG=y 265CONFIG_INET_TCP_DIAG=y
267# CONFIG_TCP_CONG_ADVANCED is not set 266# CONFIG_TCP_CONG_ADVANCED is not set
268CONFIG_TCP_CONG_BIC=y 267CONFIG_TCP_CONG_BIC=y
269CONFIG_IPV6=m 268CONFIG_IPV6=m
270CONFIG_IPV6_PRIVACY=y 269CONFIG_IPV6_PRIVACY=y
270CONFIG_IPV6_ROUTER_PREF=y
271CONFIG_INET6_AH=m 271CONFIG_INET6_AH=m
272CONFIG_INET6_ESP=m 272CONFIG_INET6_ESP=m
273CONFIG_INET6_IPCOMP=m 273CONFIG_INET6_IPCOMP=m
274CONFIG_INET6_XFRM_TUNNEL=m
274CONFIG_INET6_TUNNEL=m 275CONFIG_INET6_TUNNEL=m
275CONFIG_IPV6_TUNNEL=m 276CONFIG_IPV6_TUNNEL=m
276# CONFIG_NETFILTER is not set 277# CONFIG_NETFILTER is not set
@@ -340,10 +341,9 @@ CONFIG_CONNECTOR=m
340# CONFIG_BLK_DEV_NBD is not set 341# CONFIG_BLK_DEV_NBD is not set
341# CONFIG_BLK_DEV_SX8 is not set 342# CONFIG_BLK_DEV_SX8 is not set
342# CONFIG_BLK_DEV_RAM is not set 343# CONFIG_BLK_DEV_RAM is not set
343CONFIG_BLK_DEV_RAM_COUNT=16 344# CONFIG_BLK_DEV_INITRD is not set
344CONFIG_CDROM_PKTCDVD=m 345CONFIG_CDROM_PKTCDVD=m
345CONFIG_CDROM_PKTCDVD_BUFFERS=8 346CONFIG_CDROM_PKTCDVD_BUFFERS=8
346# CONFIG_CDROM_PKTCDVD_WCACHE is not set
347CONFIG_ATA_OVER_ETH=m 347CONFIG_ATA_OVER_ETH=m
348 348
349# 349#
@@ -433,6 +433,7 @@ CONFIG_MII=y
433# CONFIG_HAMACHI is not set 433# CONFIG_HAMACHI is not set
434# CONFIG_R8169 is not set 434# CONFIG_R8169 is not set
435# CONFIG_SIS190 is not set 435# CONFIG_SIS190 is not set
436# CONFIG_SKGE is not set
436# CONFIG_SK98LIN is not set 437# CONFIG_SK98LIN is not set
437# CONFIG_TIGON3 is not set 438# CONFIG_TIGON3 is not set
438# CONFIG_BNX2 is not set 439# CONFIG_BNX2 is not set
@@ -497,6 +498,7 @@ CONFIG_TITAN_GE=y
497# 498#
498CONFIG_SERIAL_8250=y 499CONFIG_SERIAL_8250=y
499CONFIG_SERIAL_8250_CONSOLE=y 500CONFIG_SERIAL_8250_CONSOLE=y
501CONFIG_SERIAL_8250_PCI=y
500CONFIG_SERIAL_8250_NR_UARTS=4 502CONFIG_SERIAL_8250_NR_UARTS=4
501CONFIG_SERIAL_8250_RUNTIME_UARTS=4 503CONFIG_SERIAL_8250_RUNTIME_UARTS=4
502# CONFIG_SERIAL_8250_EXTENDED is not set 504# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -506,6 +508,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
506# 508#
507CONFIG_SERIAL_CORE=y 509CONFIG_SERIAL_CORE=y
508CONFIG_SERIAL_CORE_CONSOLE=y 510CONFIG_SERIAL_CORE_CONSOLE=y
511# CONFIG_SERIAL_JSM is not set
509CONFIG_UNIX98_PTYS=y 512CONFIG_UNIX98_PTYS=y
510CONFIG_LEGACY_PTYS=y 513CONFIG_LEGACY_PTYS=y
511CONFIG_LEGACY_PTY_COUNT=256 514CONFIG_LEGACY_PTY_COUNT=256
@@ -563,10 +566,6 @@ CONFIG_GEN_RTC_X=y
563# 566#
564 567
565# 568#
566# Multimedia Capabilities Port drivers
567#
568
569#
570# Multimedia devices 569# Multimedia devices
571# 570#
572# CONFIG_VIDEO_DEV is not set 571# CONFIG_VIDEO_DEV is not set
@@ -591,6 +590,7 @@ CONFIG_GEN_RTC_X=y
591# 590#
592CONFIG_USB_ARCH_HAS_HCD=y 591CONFIG_USB_ARCH_HAS_HCD=y
593CONFIG_USB_ARCH_HAS_OHCI=y 592CONFIG_USB_ARCH_HAS_OHCI=y
593CONFIG_USB_ARCH_HAS_EHCI=y
594# CONFIG_USB is not set 594# CONFIG_USB is not set
595 595
596# 596#
@@ -608,12 +608,29 @@ CONFIG_USB_ARCH_HAS_OHCI=y
608# CONFIG_MMC is not set 608# CONFIG_MMC is not set
609 609
610# 610#
611# LED devices
612#
613# CONFIG_NEW_LEDS is not set
614
615#
616# LED drivers
617#
618
619#
620# LED Triggers
621#
622
623#
611# InfiniBand support 624# InfiniBand support
612# 625#
613# CONFIG_INFINIBAND is not set 626# CONFIG_INFINIBAND is not set
614 627
615# 628#
616# SN Devices 629# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
630#
631
632#
633# Real Time Clock
617# 634#
618 635
619# 636#
@@ -656,7 +673,6 @@ CONFIG_SYSFS=y
656CONFIG_TMPFS=y 673CONFIG_TMPFS=y
657# CONFIG_HUGETLB_PAGE is not set 674# CONFIG_HUGETLB_PAGE is not set
658CONFIG_RAMFS=y 675CONFIG_RAMFS=y
659CONFIG_RELAYFS_FS=m
660 676
661# 677#
662# Miscellaneous filesystems 678# Miscellaneous filesystems
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 42d5cd7927cb..607e2985ffe3 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc1 3# Linux kernel version: 2.6.17-rc2
4# Fri Jan 27 15:39:51 2006 4# Mon Apr 24 14:50:54 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -64,6 +64,8 @@ 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
67CONFIG_GENERIC_FIND_NEXT_BIT=y
68CONFIG_GENERIC_HWEIGHT=y
67CONFIG_GENERIC_CALIBRATE_DELAY=y 69CONFIG_GENERIC_CALIBRATE_DELAY=y
68CONFIG_ARC=y 70CONFIG_ARC=y
69CONFIG_DMA_NONCOHERENT=y 71CONFIG_DMA_NONCOHERENT=y
@@ -121,7 +123,6 @@ CONFIG_BOARD_SCACHE=y
121CONFIG_IP22_CPU_SCACHE=y 123CONFIG_IP22_CPU_SCACHE=y
122# CONFIG_MIPS_MT is not set 124# CONFIG_MIPS_MT is not set
123# CONFIG_64BIT_PHYS_ADDR is not set 125# CONFIG_64BIT_PHYS_ADDR is not set
124# CONFIG_CPU_ADVANCED is not set
125CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
126CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
127CONFIG_GENERIC_HARDIRQS=y 128CONFIG_GENERIC_HARDIRQS=y
@@ -143,7 +144,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
143# Code maturity level options 144# Code maturity level options
144# 145#
145CONFIG_EXPERIMENTAL=y 146CONFIG_EXPERIMENTAL=y
146CONFIG_CLEAN_COMPILE=y
147CONFIG_BROKEN_ON_SMP=y 147CONFIG_BROKEN_ON_SMP=y
148CONFIG_INIT_ENV_ARG_LIMIT=32 148CONFIG_INIT_ENV_ARG_LIMIT=32
149 149
@@ -160,6 +160,7 @@ CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161CONFIG_IKCONFIG=y 161CONFIG_IKCONFIG=y
162CONFIG_IKCONFIG_PROC=y 162CONFIG_IKCONFIG_PROC=y
163CONFIG_RELAY=y
163CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
165CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
@@ -173,10 +174,6 @@ CONFIG_BASE_FULL=y
173CONFIG_FUTEX=y 174CONFIG_FUTEX=y
174CONFIG_EPOLL=y 175CONFIG_EPOLL=y
175CONFIG_SHMEM=y 176CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180CONFIG_SLAB=y 177CONFIG_SLAB=y
181# CONFIG_TINY_SHMEM is not set 178# CONFIG_TINY_SHMEM is not set
182CONFIG_BASE_SMALL=0 179CONFIG_BASE_SMALL=0
@@ -188,7 +185,6 @@ CONFIG_BASE_SMALL=0
188CONFIG_MODULES=y 185CONFIG_MODULES=y
189CONFIG_MODULE_UNLOAD=y 186CONFIG_MODULE_UNLOAD=y
190# CONFIG_MODULE_FORCE_UNLOAD is not set 187# CONFIG_MODULE_FORCE_UNLOAD is not set
191CONFIG_OBSOLETE_MODPARM=y
192CONFIG_MODVERSIONS=y 188CONFIG_MODVERSIONS=y
193CONFIG_MODULE_SRCVERSION_ALL=y 189CONFIG_MODULE_SRCVERSION_ALL=y
194CONFIG_KMOD=y 190CONFIG_KMOD=y
@@ -197,6 +193,8 @@ CONFIG_KMOD=y
197# Block layer 193# Block layer
198# 194#
199# CONFIG_LBD is not set 195# CONFIG_LBD is not set
196# CONFIG_BLK_DEV_IO_TRACE is not set
197# CONFIG_LSF is not set
200 198
201# 199#
202# IO Schedulers 200# IO Schedulers
@@ -242,6 +240,7 @@ CONFIG_NET=y
242# 240#
243# Networking options 241# Networking options
244# 242#
243# CONFIG_NETDEBUG is not set
245CONFIG_PACKET=y 244CONFIG_PACKET=y
246CONFIG_PACKET_MMAP=y 245CONFIG_PACKET_MMAP=y
247CONFIG_UNIX=y 246CONFIG_UNIX=y
@@ -264,6 +263,7 @@ CONFIG_IP_PNP_BOOTP=y
264CONFIG_INET_AH=m 263CONFIG_INET_AH=m
265CONFIG_INET_ESP=m 264CONFIG_INET_ESP=m
266CONFIG_INET_IPCOMP=m 265CONFIG_INET_IPCOMP=m
266CONFIG_INET_XFRM_TUNNEL=m
267CONFIG_INET_TUNNEL=m 267CONFIG_INET_TUNNEL=m
268CONFIG_INET_DIAG=y 268CONFIG_INET_DIAG=y
269CONFIG_INET_TCP_DIAG=y 269CONFIG_INET_TCP_DIAG=y
@@ -305,9 +305,12 @@ CONFIG_IP_VS_NQ=m
305CONFIG_IP_VS_FTP=m 305CONFIG_IP_VS_FTP=m
306CONFIG_IPV6=m 306CONFIG_IPV6=m
307CONFIG_IPV6_PRIVACY=y 307CONFIG_IPV6_PRIVACY=y
308CONFIG_IPV6_ROUTER_PREF=y
309CONFIG_IPV6_ROUTE_INFO=y
308CONFIG_INET6_AH=m 310CONFIG_INET6_AH=m
309CONFIG_INET6_ESP=m 311CONFIG_INET6_ESP=m
310CONFIG_INET6_IPCOMP=m 312CONFIG_INET6_IPCOMP=m
313CONFIG_INET6_XFRM_TUNNEL=m
311CONFIG_INET6_TUNNEL=m 314CONFIG_INET6_TUNNEL=m
312CONFIG_IPV6_TUNNEL=m 315CONFIG_IPV6_TUNNEL=m
313CONFIG_NETFILTER=y 316CONFIG_NETFILTER=y
@@ -330,11 +333,14 @@ CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
330CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 333CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
331CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 334CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
332CONFIG_NETFILTER_XT_MATCH_DCCP=m 335CONFIG_NETFILTER_XT_MATCH_DCCP=m
336CONFIG_NETFILTER_XT_MATCH_ESP=m
333CONFIG_NETFILTER_XT_MATCH_HELPER=m 337CONFIG_NETFILTER_XT_MATCH_HELPER=m
334CONFIG_NETFILTER_XT_MATCH_LENGTH=m 338CONFIG_NETFILTER_XT_MATCH_LENGTH=m
335CONFIG_NETFILTER_XT_MATCH_LIMIT=m 339CONFIG_NETFILTER_XT_MATCH_LIMIT=m
336CONFIG_NETFILTER_XT_MATCH_MAC=m 340CONFIG_NETFILTER_XT_MATCH_MAC=m
337CONFIG_NETFILTER_XT_MATCH_MARK=m 341CONFIG_NETFILTER_XT_MATCH_MARK=m
342CONFIG_NETFILTER_XT_MATCH_POLICY=m
343CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
338CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m 344CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
339CONFIG_NETFILTER_XT_MATCH_REALM=m 345CONFIG_NETFILTER_XT_MATCH_REALM=m
340CONFIG_NETFILTER_XT_MATCH_SCTP=m 346CONFIG_NETFILTER_XT_MATCH_SCTP=m
@@ -357,20 +363,19 @@ CONFIG_IP_NF_IRC=m
357CONFIG_IP_NF_TFTP=m 363CONFIG_IP_NF_TFTP=m
358CONFIG_IP_NF_AMANDA=m 364CONFIG_IP_NF_AMANDA=m
359CONFIG_IP_NF_PPTP=m 365CONFIG_IP_NF_PPTP=m
366CONFIG_IP_NF_H323=m
360CONFIG_IP_NF_QUEUE=m 367CONFIG_IP_NF_QUEUE=m
361CONFIG_IP_NF_IPTABLES=m 368CONFIG_IP_NF_IPTABLES=m
362CONFIG_IP_NF_MATCH_IPRANGE=m 369CONFIG_IP_NF_MATCH_IPRANGE=m
363CONFIG_IP_NF_MATCH_MULTIPORT=m
364CONFIG_IP_NF_MATCH_TOS=m 370CONFIG_IP_NF_MATCH_TOS=m
365CONFIG_IP_NF_MATCH_RECENT=m 371CONFIG_IP_NF_MATCH_RECENT=m
366CONFIG_IP_NF_MATCH_ECN=m 372CONFIG_IP_NF_MATCH_ECN=m
367CONFIG_IP_NF_MATCH_DSCP=m 373CONFIG_IP_NF_MATCH_DSCP=m
368CONFIG_IP_NF_MATCH_AH_ESP=m 374CONFIG_IP_NF_MATCH_AH=m
369CONFIG_IP_NF_MATCH_TTL=m 375CONFIG_IP_NF_MATCH_TTL=m
370CONFIG_IP_NF_MATCH_OWNER=m 376CONFIG_IP_NF_MATCH_OWNER=m
371CONFIG_IP_NF_MATCH_ADDRTYPE=m 377CONFIG_IP_NF_MATCH_ADDRTYPE=m
372CONFIG_IP_NF_MATCH_HASHLIMIT=m 378CONFIG_IP_NF_MATCH_HASHLIMIT=m
373CONFIG_IP_NF_MATCH_POLICY=m
374CONFIG_IP_NF_FILTER=m 379CONFIG_IP_NF_FILTER=m
375CONFIG_IP_NF_TARGET_REJECT=m 380CONFIG_IP_NF_TARGET_REJECT=m
376CONFIG_IP_NF_TARGET_LOG=m 381CONFIG_IP_NF_TARGET_LOG=m
@@ -388,6 +393,7 @@ CONFIG_IP_NF_NAT_FTP=m
388CONFIG_IP_NF_NAT_TFTP=m 393CONFIG_IP_NF_NAT_TFTP=m
389CONFIG_IP_NF_NAT_AMANDA=m 394CONFIG_IP_NF_NAT_AMANDA=m
390CONFIG_IP_NF_NAT_PPTP=m 395CONFIG_IP_NF_NAT_PPTP=m
396CONFIG_IP_NF_NAT_H323=m
391CONFIG_IP_NF_MANGLE=m 397CONFIG_IP_NF_MANGLE=m
392CONFIG_IP_NF_TARGET_TOS=m 398CONFIG_IP_NF_TARGET_TOS=m
393CONFIG_IP_NF_TARGET_ECN=m 399CONFIG_IP_NF_TARGET_ECN=m
@@ -408,12 +414,10 @@ CONFIG_IP6_NF_MATCH_RT=m
408CONFIG_IP6_NF_MATCH_OPTS=m 414CONFIG_IP6_NF_MATCH_OPTS=m
409CONFIG_IP6_NF_MATCH_FRAG=m 415CONFIG_IP6_NF_MATCH_FRAG=m
410CONFIG_IP6_NF_MATCH_HL=m 416CONFIG_IP6_NF_MATCH_HL=m
411CONFIG_IP6_NF_MATCH_MULTIPORT=m
412CONFIG_IP6_NF_MATCH_OWNER=m 417CONFIG_IP6_NF_MATCH_OWNER=m
413CONFIG_IP6_NF_MATCH_IPV6HEADER=m 418CONFIG_IP6_NF_MATCH_IPV6HEADER=m
414CONFIG_IP6_NF_MATCH_AHESP=m 419CONFIG_IP6_NF_MATCH_AH=m
415CONFIG_IP6_NF_MATCH_EUI64=m 420CONFIG_IP6_NF_MATCH_EUI64=m
416CONFIG_IP6_NF_MATCH_POLICY=m
417CONFIG_IP6_NF_FILTER=m 421CONFIG_IP6_NF_FILTER=m
418CONFIG_IP6_NF_TARGET_LOG=m 422CONFIG_IP6_NF_TARGET_LOG=m
419CONFIG_IP6_NF_TARGET_REJECT=m 423CONFIG_IP6_NF_TARGET_REJECT=m
@@ -435,6 +439,11 @@ CONFIG_IP_SCTP=m
435# CONFIG_SCTP_HMAC_NONE is not set 439# CONFIG_SCTP_HMAC_NONE is not set
436# CONFIG_SCTP_HMAC_SHA1 is not set 440# CONFIG_SCTP_HMAC_SHA1 is not set
437CONFIG_SCTP_HMAC_MD5=y 441CONFIG_SCTP_HMAC_MD5=y
442
443#
444# TIPC Configuration (EXPERIMENTAL)
445#
446# CONFIG_TIPC is not set
438# CONFIG_ATM is not set 447# CONFIG_ATM is not set
439# CONFIG_BRIDGE is not set 448# CONFIG_BRIDGE is not set
440# CONFIG_VLAN_8021Q is not set 449# CONFIG_VLAN_8021Q is not set
@@ -444,11 +453,6 @@ CONFIG_SCTP_HMAC_MD5=y
444# CONFIG_ATALK is not set 453# CONFIG_ATALK is not set
445# CONFIG_X25 is not set 454# CONFIG_X25 is not set
446# CONFIG_LAPB is not set 455# CONFIG_LAPB is not set
447
448#
449# TIPC Configuration (EXPERIMENTAL)
450#
451# CONFIG_TIPC is not set
452CONFIG_NET_DIVERT=y 456CONFIG_NET_DIVERT=y
453# CONFIG_ECONET is not set 457# CONFIG_ECONET is not set
454# CONFIG_WAN_ROUTER is not set 458# CONFIG_WAN_ROUTER is not set
@@ -508,6 +512,9 @@ CONFIG_IEEE80211=m
508# CONFIG_IEEE80211_DEBUG is not set 512# CONFIG_IEEE80211_DEBUG is not set
509CONFIG_IEEE80211_CRYPT_WEP=m 513CONFIG_IEEE80211_CRYPT_WEP=m
510CONFIG_IEEE80211_CRYPT_CCMP=m 514CONFIG_IEEE80211_CRYPT_CCMP=m
515CONFIG_IEEE80211_SOFTMAC=m
516# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
517CONFIG_WIRELESS_EXT=y
511 518
512# 519#
513# Device Drivers 520# Device Drivers
@@ -546,7 +553,7 @@ CONFIG_CONNECTOR=m
546# CONFIG_BLK_DEV_LOOP is not set 553# CONFIG_BLK_DEV_LOOP is not set
547# CONFIG_BLK_DEV_NBD is not set 554# CONFIG_BLK_DEV_NBD is not set
548# CONFIG_BLK_DEV_RAM is not set 555# CONFIG_BLK_DEV_RAM is not set
549CONFIG_BLK_DEV_RAM_COUNT=16 556# CONFIG_BLK_DEV_INITRD is not set
550CONFIG_CDROM_PKTCDVD=m 557CONFIG_CDROM_PKTCDVD=m
551CONFIG_CDROM_PKTCDVD_BUFFERS=8 558CONFIG_CDROM_PKTCDVD_BUFFERS=8
552# CONFIG_CDROM_PKTCDVD_WCACHE is not set 559# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -812,10 +819,6 @@ CONFIG_MAX_RAW_DEVS=256
812# 819#
813 820
814# 821#
815# Multimedia Capabilities Port drivers
816#
817
818#
819# Multimedia devices 822# Multimedia devices
820# 823#
821# CONFIG_VIDEO_DEV is not set 824# CONFIG_VIDEO_DEV is not set
@@ -857,6 +860,7 @@ CONFIG_LOGO_SGI_CLUT224=y
857# 860#
858# CONFIG_USB_ARCH_HAS_HCD is not set 861# CONFIG_USB_ARCH_HAS_HCD is not set
859# CONFIG_USB_ARCH_HAS_OHCI is not set 862# CONFIG_USB_ARCH_HAS_OHCI is not set
863# CONFIG_USB_ARCH_HAS_EHCI is not set
860 864
861# 865#
862# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 866# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -873,12 +877,30 @@ CONFIG_LOGO_SGI_CLUT224=y
873# CONFIG_MMC is not set 877# CONFIG_MMC is not set
874 878
875# 879#
880# LED devices
881#
882# CONFIG_NEW_LEDS is not set
883
884#
885# LED drivers
886#
887
888#
889# LED Triggers
890#
891
892#
876# InfiniBand support 893# InfiniBand support
877# 894#
878 895
879# 896#
880# SN Devices 897# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
898#
899
900#
901# Real Time Clock
881# 902#
903# CONFIG_RTC_CLASS is not set
882 904
883# 905#
884# File systems 906# File systems
@@ -944,7 +966,6 @@ CONFIG_SYSFS=y
944# CONFIG_TMPFS is not set 966# CONFIG_TMPFS is not set
945# CONFIG_HUGETLB_PAGE is not set 967# CONFIG_HUGETLB_PAGE is not set
946CONFIG_RAMFS=y 968CONFIG_RAMFS=y
947CONFIG_RELAYFS_FS=m
948# CONFIG_CONFIGFS_FS is not set 969# CONFIG_CONFIGFS_FS is not set
949 970
950# 971#
@@ -963,7 +984,6 @@ CONFIG_EFS_FS=m
963# CONFIG_QNX4FS_FS is not set 984# CONFIG_QNX4FS_FS is not set
964# CONFIG_SYSV_FS is not set 985# CONFIG_SYSV_FS is not set
965CONFIG_UFS_FS=m 986CONFIG_UFS_FS=m
966# CONFIG_UFS_FS_WRITE is not set
967 987
968# 988#
969# Network File Systems 989# Network File Systems
@@ -1078,6 +1098,7 @@ CONFIG_NLS_UTF8=m
1078# CONFIG_MAGIC_SYSRQ is not set 1098# CONFIG_MAGIC_SYSRQ is not set
1079# CONFIG_DEBUG_KERNEL is not set 1099# CONFIG_DEBUG_KERNEL is not set
1080CONFIG_LOG_BUF_SHIFT=14 1100CONFIG_LOG_BUF_SHIFT=14
1101# CONFIG_DEBUG_FS is not set
1081CONFIG_CROSSCOMPILE=y 1102CONFIG_CROSSCOMPILE=y
1082CONFIG_CMDLINE="" 1103CONFIG_CMDLINE=""
1083 1104
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-22 22:37:13 -0500