aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/mips/configs/atlas_defconfig67
-rw-r--r--arch/mips/configs/bigsur_defconfig47
-rw-r--r--arch/mips/configs/capcella_defconfig44
-rw-r--r--arch/mips/configs/cobalt_defconfig44
-rw-r--r--arch/mips/configs/db1000_defconfig69
-rw-r--r--arch/mips/configs/db1100_defconfig69
-rw-r--r--arch/mips/configs/db1200_defconfig72
-rw-r--r--arch/mips/configs/db1500_defconfig159
-rw-r--r--arch/mips/configs/db1550_defconfig70
-rw-r--r--arch/mips/configs/ddb5476_defconfig48
-rw-r--r--arch/mips/configs/ddb5477_defconfig44
-rw-r--r--arch/mips/configs/decstation_defconfig55
-rw-r--r--arch/mips/configs/e55_defconfig44
-rw-r--r--arch/mips/configs/ev64120_defconfig44
-rw-r--r--arch/mips/configs/ev96100_defconfig42
-rw-r--r--arch/mips/configs/ip22_defconfig64
-rw-r--r--arch/mips/configs/ip27_defconfig63
-rw-r--r--arch/mips/configs/ip32_defconfig45
-rw-r--r--arch/mips/configs/it8172_defconfig50
-rw-r--r--arch/mips/configs/ivr_defconfig46
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig42
-rw-r--r--arch/mips/configs/jmr3927_defconfig47
-rw-r--r--arch/mips/configs/lasat200_defconfig49
-rw-r--r--arch/mips/configs/malta_defconfig67
-rw-r--r--arch/mips/configs/mipssim_defconfig54
-rw-r--r--arch/mips/configs/mpc30x_defconfig48
-rw-r--r--arch/mips/configs/ocelot_3_defconfig59
-rw-r--r--arch/mips/configs/ocelot_c_defconfig42
-rw-r--r--arch/mips/configs/ocelot_defconfig43
-rw-r--r--arch/mips/configs/ocelot_g_defconfig42
-rw-r--r--arch/mips/configs/pb1100_defconfig68
-rw-r--r--arch/mips/configs/pb1500_defconfig70
-rw-r--r--arch/mips/configs/pb1550_defconfig70
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig80
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig89
-rw-r--r--arch/mips/configs/qemu_defconfig43
-rw-r--r--arch/mips/configs/rbhma4500_defconfig65
-rw-r--r--arch/mips/configs/rm200_defconfig71
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig45
-rw-r--r--arch/mips/configs/sead_defconfig37
-rw-r--r--arch/mips/configs/tb0226_defconfig52
-rw-r--r--arch/mips/configs/tb0229_defconfig48
-rw-r--r--arch/mips/configs/workpad_defconfig46
-rw-r--r--arch/mips/configs/yosemite_defconfig44
-rw-r--r--arch/mips/defconfig64
45 files changed, 1917 insertions, 654 deletions
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 132ec3dac63f..74990758154b 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:13 2005 4# Thu Nov 10 12:14:02 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -191,6 +209,7 @@ CONFIG_FLATMEM_MANUAL=y
191CONFIG_FLATMEM=y 209CONFIG_FLATMEM=y
192CONFIG_FLAT_NODE_MEM_MAP=y 210CONFIG_FLAT_NODE_MEM_MAP=y
193# CONFIG_SPARSEMEM_STATIC is not set 211# CONFIG_SPARSEMEM_STATIC is not set
212CONFIG_SPLIT_PTLOCK_CPUS=4
194CONFIG_PREEMPT_NONE=y 213CONFIG_PREEMPT_NONE=y
195# CONFIG_PREEMPT_VOLUNTARY is not set 214# CONFIG_PREEMPT_VOLUNTARY is not set
196# CONFIG_PREEMPT is not set 215# CONFIG_PREEMPT is not set
@@ -309,6 +328,10 @@ CONFIG_IPV6_TUNNEL=m
309CONFIG_NETFILTER=y 328CONFIG_NETFILTER=y
310# CONFIG_NETFILTER_DEBUG is not set 329# CONFIG_NETFILTER_DEBUG is not set
311CONFIG_BRIDGE_NETFILTER=y 330CONFIG_BRIDGE_NETFILTER=y
331
332#
333# Core Netfilter Configuration
334#
312CONFIG_NETFILTER_NETLINK=m 335CONFIG_NETFILTER_NETLINK=m
313CONFIG_NETFILTER_NETLINK_QUEUE=m 336CONFIG_NETFILTER_NETLINK_QUEUE=m
314CONFIG_NETFILTER_NETLINK_LOG=m 337CONFIG_NETFILTER_NETLINK_LOG=m
@@ -363,6 +386,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
363CONFIG_IP_NF_TARGET_LOG=m 386CONFIG_IP_NF_TARGET_LOG=m
364CONFIG_IP_NF_TARGET_ULOG=m 387CONFIG_IP_NF_TARGET_ULOG=m
365CONFIG_IP_NF_TARGET_TCPMSS=m 388CONFIG_IP_NF_TARGET_TCPMSS=m
389CONFIG_IP_NF_TARGET_NFQUEUE=m
366CONFIG_IP_NF_NAT=m 390CONFIG_IP_NF_NAT=m
367CONFIG_IP_NF_NAT_NEEDED=y 391CONFIG_IP_NF_NAT_NEEDED=y
368CONFIG_IP_NF_TARGET_MASQUERADE=m 392CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -412,6 +436,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
412CONFIG_IP6_NF_FILTER=m 436CONFIG_IP6_NF_FILTER=m
413CONFIG_IP6_NF_TARGET_LOG=m 437CONFIG_IP6_NF_TARGET_LOG=m
414CONFIG_IP6_NF_TARGET_REJECT=m 438CONFIG_IP6_NF_TARGET_REJECT=m
439CONFIG_IP6_NF_TARGET_NFQUEUE=m
415CONFIG_IP6_NF_MANGLE=m 440CONFIG_IP6_NF_MANGLE=m
416CONFIG_IP6_NF_TARGET_MARK=m 441CONFIG_IP6_NF_TARGET_MARK=m
417CONFIG_IP6_NF_TARGET_HL=m 442CONFIG_IP6_NF_TARGET_HL=m
@@ -472,10 +497,18 @@ CONFIG_IPDDP_DECAP=y
472CONFIG_NET_DIVERT=y 497CONFIG_NET_DIVERT=y
473# CONFIG_ECONET is not set 498# CONFIG_ECONET is not set
474# CONFIG_WAN_ROUTER is not set 499# CONFIG_WAN_ROUTER is not set
500
501#
502# QoS and/or fair queueing
503#
475CONFIG_NET_SCHED=y 504CONFIG_NET_SCHED=y
476CONFIG_NET_SCH_CLK_JIFFIES=y 505CONFIG_NET_SCH_CLK_JIFFIES=y
477# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 506# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
478# CONFIG_NET_SCH_CLK_CPU is not set 507# CONFIG_NET_SCH_CLK_CPU is not set
508
509#
510# Queueing/Scheduling
511#
479CONFIG_NET_SCH_CBQ=m 512CONFIG_NET_SCH_CBQ=m
480CONFIG_NET_SCH_HTB=m 513CONFIG_NET_SCH_HTB=m
481CONFIG_NET_SCH_HFSC=m 514CONFIG_NET_SCH_HFSC=m
@@ -488,8 +521,10 @@ CONFIG_NET_SCH_GRED=m
488CONFIG_NET_SCH_DSMARK=m 521CONFIG_NET_SCH_DSMARK=m
489CONFIG_NET_SCH_NETEM=m 522CONFIG_NET_SCH_NETEM=m
490CONFIG_NET_SCH_INGRESS=m 523CONFIG_NET_SCH_INGRESS=m
491CONFIG_NET_QOS=y 524
492CONFIG_NET_ESTIMATOR=y 525#
526# Classification
527#
493CONFIG_NET_CLS=y 528CONFIG_NET_CLS=y
494CONFIG_NET_CLS_BASIC=m 529CONFIG_NET_CLS_BASIC=m
495CONFIG_NET_CLS_TCINDEX=m 530CONFIG_NET_CLS_TCINDEX=m
@@ -498,13 +533,14 @@ CONFIG_NET_CLS_ROUTE=y
498CONFIG_NET_CLS_FW=m 533CONFIG_NET_CLS_FW=m
499CONFIG_NET_CLS_U32=m 534CONFIG_NET_CLS_U32=m
500# CONFIG_CLS_U32_PERF is not set 535# CONFIG_CLS_U32_PERF is not set
501CONFIG_NET_CLS_IND=y
502# CONFIG_CLS_U32_MARK is not set 536# CONFIG_CLS_U32_MARK is not set
503CONFIG_NET_CLS_RSVP=m 537CONFIG_NET_CLS_RSVP=m
504CONFIG_NET_CLS_RSVP6=m 538CONFIG_NET_CLS_RSVP6=m
505# CONFIG_NET_EMATCH is not set 539# CONFIG_NET_EMATCH is not set
506# CONFIG_NET_CLS_ACT is not set 540# CONFIG_NET_CLS_ACT is not set
507CONFIG_NET_CLS_POLICE=y 541CONFIG_NET_CLS_POLICE=y
542CONFIG_NET_CLS_IND=y
543CONFIG_NET_ESTIMATOR=y
508 544
509# 545#
510# Network testing 546# Network testing
@@ -565,18 +601,9 @@ CONFIG_BLK_DEV_RAM=y
565CONFIG_BLK_DEV_RAM_COUNT=16 601CONFIG_BLK_DEV_RAM_COUNT=16
566CONFIG_BLK_DEV_RAM_SIZE=4096 602CONFIG_BLK_DEV_RAM_SIZE=4096
567# CONFIG_BLK_DEV_INITRD is not set 603# CONFIG_BLK_DEV_INITRD is not set
568# CONFIG_LBD is not set
569CONFIG_CDROM_PKTCDVD=m 604CONFIG_CDROM_PKTCDVD=m
570CONFIG_CDROM_PKTCDVD_BUFFERS=8 605CONFIG_CDROM_PKTCDVD_BUFFERS=8
571# CONFIG_CDROM_PKTCDVD_WCACHE is not set 606# CONFIG_CDROM_PKTCDVD_WCACHE is not set
572
573#
574# IO Schedulers
575#
576CONFIG_IOSCHED_NOOP=y
577CONFIG_IOSCHED_AS=y
578CONFIG_IOSCHED_DEADLINE=y
579CONFIG_IOSCHED_CFQ=y
580CONFIG_ATA_OVER_ETH=m 607CONFIG_ATA_OVER_ETH=m
581 608
582# 609#
@@ -643,6 +670,7 @@ CONFIG_SCSI_SAS_ATTRS=m
643# 670#
644# SCSI low-level drivers 671# SCSI low-level drivers
645# 672#
673CONFIG_ISCSI_TCP=m
646# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 674# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
647# CONFIG_SCSI_3W_9XXX is not set 675# CONFIG_SCSI_3W_9XXX is not set
648# CONFIG_SCSI_ACARD is not set 676# CONFIG_SCSI_ACARD is not set
@@ -653,6 +681,7 @@ CONFIG_SCSI_SAS_ATTRS=m
653# CONFIG_SCSI_DPT_I2O is not set 681# CONFIG_SCSI_DPT_I2O is not set
654# CONFIG_MEGARAID_NEWGEN is not set 682# CONFIG_MEGARAID_NEWGEN is not set
655# CONFIG_MEGARAID_LEGACY is not set 683# CONFIG_MEGARAID_LEGACY is not set
684# CONFIG_MEGARAID_SAS is not set
656# CONFIG_SCSI_SATA is not set 685# CONFIG_SCSI_SATA is not set
657# CONFIG_SCSI_DMX3191D is not set 686# CONFIG_SCSI_DMX3191D is not set
658# CONFIG_SCSI_FUTURE_DOMAIN is not set 687# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -707,6 +736,7 @@ CONFIG_DM_MULTIPATH_EMC=m
707# CONFIG_FUSION is not set 736# CONFIG_FUSION is not set
708# CONFIG_FUSION_SPI is not set 737# CONFIG_FUSION_SPI is not set
709# CONFIG_FUSION_FC is not set 738# CONFIG_FUSION_FC is not set
739# CONFIG_FUSION_SAS is not set
710 740
711# 741#
712# IEEE 1394 (FireWire) support 742# IEEE 1394 (FireWire) support
@@ -736,7 +766,6 @@ CONFIG_TUN=m
736# PHY device support 766# PHY device support
737# 767#
738CONFIG_PHYLIB=m 768CONFIG_PHYLIB=m
739CONFIG_PHYCONTROL=y
740 769
741# 770#
742# MII PHY device drivers 771# MII PHY device drivers
@@ -754,6 +783,7 @@ CONFIG_NET_ETHERNET=y
754CONFIG_MII=y 783CONFIG_MII=y
755# CONFIG_HAPPYMEAL is not set 784# CONFIG_HAPPYMEAL is not set
756# CONFIG_SUNGEM is not set 785# CONFIG_SUNGEM is not set
786# CONFIG_CASSINI is not set
757# CONFIG_NET_VENDOR_3COM is not set 787# CONFIG_NET_VENDOR_3COM is not set
758 788
759# 789#
@@ -933,6 +963,7 @@ CONFIG_LEGACY_PTY_COUNT=256
933# TPM devices 963# TPM devices
934# 964#
935# CONFIG_TCG_TPM is not set 965# CONFIG_TCG_TPM is not set
966# CONFIG_TELCLOCK is not set
936 967
937# 968#
938# I2C support 969# I2C support
@@ -992,6 +1023,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
992# CONFIG_USB is not set 1023# CONFIG_USB is not set
993 1024
994# 1025#
1026# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1027#
1028
1029#
995# USB Gadget Support 1030# USB Gadget Support
996# 1031#
997# CONFIG_USB_GADGET is not set 1032# CONFIG_USB_GADGET is not set
@@ -1037,7 +1072,7 @@ CONFIG_JFS_SECURITY=y
1037CONFIG_FS_POSIX_ACL=y 1072CONFIG_FS_POSIX_ACL=y
1038CONFIG_XFS_FS=m 1073CONFIG_XFS_FS=m
1039CONFIG_XFS_EXPORT=y 1074CONFIG_XFS_EXPORT=y
1040CONFIG_XFS_QUOTA=m 1075CONFIG_XFS_QUOTA=y
1041CONFIG_XFS_SECURITY=y 1076CONFIG_XFS_SECURITY=y
1042CONFIG_XFS_POSIX_ACL=y 1077CONFIG_XFS_POSIX_ACL=y
1043# CONFIG_XFS_RT is not set 1078# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 25e8a08e68be..ea4b75604c23 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:17 2005 4# Mon Nov 7 23:04:36 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -61,6 +61,23 @@ CONFIG_KMOD=y
61CONFIG_STOP_MACHINE=y 61CONFIG_STOP_MACHINE=y
62 62
63# 63#
64# Block layer
65#
66
67#
68# IO Schedulers
69#
70CONFIG_IOSCHED_NOOP=y
71CONFIG_IOSCHED_AS=y
72CONFIG_IOSCHED_DEADLINE=y
73CONFIG_IOSCHED_CFQ=y
74CONFIG_DEFAULT_AS=y
75# CONFIG_DEFAULT_DEADLINE is not set
76# CONFIG_DEFAULT_CFQ is not set
77# CONFIG_DEFAULT_NOOP is not set
78CONFIG_DEFAULT_IOSCHED="anticipatory"
79
80#
64# Machine selection 81# Machine selection
65# 82#
66# CONFIG_MIPS_MTX1 is not set 83# CONFIG_MIPS_MTX1 is not set
@@ -127,8 +144,8 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
127# CONFIG_CPU_SB1_PASS_2_112x is not set 144# CONFIG_CPU_SB1_PASS_2_112x is not set
128# CONFIG_CPU_SB1_PASS_3 is not set 145# CONFIG_CPU_SB1_PASS_3 is not set
129# CONFIG_SIMULATION is not set 146# CONFIG_SIMULATION is not set
130# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set 147# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
131# CONFIG_CONFIG_SB1_CERR_STALL is not set 148# CONFIG_SB1_CERR_STALL is not set
132CONFIG_SIBYTE_CFE=y 149CONFIG_SIBYTE_CFE=y
133# CONFIG_SIBYTE_CFE_CONSOLE is not set 150# CONFIG_SIBYTE_CFE_CONSOLE is not set
134# CONFIG_SIBYTE_BUS_WATCHER is not set 151# CONFIG_SIBYTE_BUS_WATCHER is not set
@@ -198,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
198CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
199CONFIG_FLAT_NODE_MEM_MAP=y 216CONFIG_FLAT_NODE_MEM_MAP=y
200# CONFIG_SPARSEMEM_STATIC is not set 217# CONFIG_SPARSEMEM_STATIC is not set
218CONFIG_SPLIT_PTLOCK_CPUS=4
201CONFIG_SMP=y 219CONFIG_SMP=y
202CONFIG_NR_CPUS=4 220CONFIG_NR_CPUS=4
203CONFIG_PREEMPT_NONE=y 221CONFIG_PREEMPT_NONE=y
@@ -295,6 +313,10 @@ CONFIG_TCP_CONG_BIC=y
295# CONFIG_NET_DIVERT is not set 313# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 314# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 315# CONFIG_WAN_ROUTER is not set
316
317#
318# QoS and/or fair queueing
319#
298# CONFIG_NET_SCHED is not set 320# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set 321# CONFIG_NET_CLS_ROUTE is not set
300 322
@@ -353,14 +375,6 @@ CONFIG_BLK_DEV_NBD=m
353# CONFIG_BLK_DEV_RAM is not set 375# CONFIG_BLK_DEV_RAM is not set
354CONFIG_BLK_DEV_RAM_COUNT=16 376CONFIG_BLK_DEV_RAM_COUNT=16
355# CONFIG_CDROM_PKTCDVD is not set 377# CONFIG_CDROM_PKTCDVD is not set
356
357#
358# IO Schedulers
359#
360CONFIG_IOSCHED_NOOP=y
361CONFIG_IOSCHED_AS=y
362CONFIG_IOSCHED_DEADLINE=y
363CONFIG_IOSCHED_CFQ=y
364# CONFIG_ATA_OVER_ETH is not set 378# CONFIG_ATA_OVER_ETH is not set
365 379
366# 380#
@@ -443,6 +457,7 @@ CONFIG_NET_ETHERNET=y
443CONFIG_MII=y 457CONFIG_MII=y
444# CONFIG_HAPPYMEAL is not set 458# CONFIG_HAPPYMEAL is not set
445# CONFIG_SUNGEM is not set 459# CONFIG_SUNGEM is not set
460# CONFIG_CASSINI is not set
446# CONFIG_NET_VENDOR_3COM is not set 461# CONFIG_NET_VENDOR_3COM is not set
447 462
448# 463#
@@ -582,6 +597,7 @@ CONFIG_GEN_RTC=y
582# TPM devices 597# TPM devices
583# 598#
584# CONFIG_TCG_TPM is not set 599# CONFIG_TCG_TPM is not set
600# CONFIG_TELCLOCK is not set
585 601
586# 602#
587# I2C support 603# I2C support
@@ -634,6 +650,7 @@ CONFIG_SENSORS_PCA9539=y
634CONFIG_SENSORS_PCF8591=y 650CONFIG_SENSORS_PCF8591=y
635CONFIG_SENSORS_RTC8564=y 651CONFIG_SENSORS_RTC8564=y
636CONFIG_SENSORS_MAX6875=y 652CONFIG_SENSORS_MAX6875=y
653# CONFIG_RTC_X1205_I2C is not set
637CONFIG_I2C_DEBUG_CORE=y 654CONFIG_I2C_DEBUG_CORE=y
638CONFIG_I2C_DEBUG_ALGO=y 655CONFIG_I2C_DEBUG_ALGO=y
639CONFIG_I2C_DEBUG_BUS=y 656CONFIG_I2C_DEBUG_BUS=y
@@ -686,6 +703,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
686# CONFIG_USB is not set 703# CONFIG_USB is not set
687 704
688# 705#
706# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
707#
708
709#
689# USB Gadget Support 710# USB Gadget Support
690# 711#
691# CONFIG_USB_GADGET is not set 712# CONFIG_USB_GADGET is not set
@@ -823,6 +844,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
823# CONFIG_DEBUG_KOBJECT is not set 844# CONFIG_DEBUG_KOBJECT is not set
824# CONFIG_DEBUG_INFO is not set 845# CONFIG_DEBUG_INFO is not set
825# CONFIG_DEBUG_FS is not set 846# CONFIG_DEBUG_FS is not set
847# CONFIG_DEBUG_VM is not set
848# CONFIG_RCU_TORTURE_TEST is not set
826CONFIG_CROSSCOMPILE=y 849CONFIG_CROSSCOMPILE=y
827CONFIG_CMDLINE="" 850CONFIG_CMDLINE=""
828# CONFIG_DEBUG_STACK_USAGE is not set 851# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index bfbaa08c47cb..a86cc9d9bdae 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:20 2005 4# Mon Nov 7 23:04:39 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -182,6 +200,7 @@ CONFIG_FLATMEM_MANUAL=y
182CONFIG_FLATMEM=y 200CONFIG_FLATMEM=y
183CONFIG_FLAT_NODE_MEM_MAP=y 201CONFIG_FLAT_NODE_MEM_MAP=y
184# CONFIG_SPARSEMEM_STATIC is not set 202# CONFIG_SPARSEMEM_STATIC is not set
203CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_PREEMPT_NONE=y 204CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
@@ -270,6 +289,10 @@ CONFIG_TCP_CONG_BIC=y
270# CONFIG_NET_DIVERT is not set 289# CONFIG_NET_DIVERT is not set
271# CONFIG_ECONET is not set 290# CONFIG_ECONET is not set
272# CONFIG_WAN_ROUTER is not set 291# CONFIG_WAN_ROUTER is not set
292
293#
294# QoS and/or fair queueing
295#
273# CONFIG_NET_SCHED is not set 296# CONFIG_NET_SCHED is not set
274# CONFIG_NET_CLS_ROUTE is not set 297# CONFIG_NET_CLS_ROUTE is not set
275 298
@@ -329,16 +352,7 @@ CONFIG_CONNECTOR=m
329# CONFIG_BLK_DEV_SX8 is not set 352# CONFIG_BLK_DEV_SX8 is not set
330# CONFIG_BLK_DEV_RAM is not set 353# CONFIG_BLK_DEV_RAM is not set
331CONFIG_BLK_DEV_RAM_COUNT=16 354CONFIG_BLK_DEV_RAM_COUNT=16
332# CONFIG_LBD is not set
333# CONFIG_CDROM_PKTCDVD is not set 355# CONFIG_CDROM_PKTCDVD is not set
334
335#
336# IO Schedulers
337#
338CONFIG_IOSCHED_NOOP=y
339CONFIG_IOSCHED_AS=y
340CONFIG_IOSCHED_DEADLINE=y
341CONFIG_IOSCHED_CFQ=y
342CONFIG_ATA_OVER_ETH=m 356CONFIG_ATA_OVER_ETH=m
343 357
344# 358#
@@ -412,7 +426,6 @@ CONFIG_NETDEVICES=y
412# PHY device support 426# PHY device support
413# 427#
414CONFIG_PHYLIB=m 428CONFIG_PHYLIB=m
415CONFIG_PHYCONTROL=y
416 429
417# 430#
418# MII PHY device drivers 431# MII PHY device drivers
@@ -430,6 +443,7 @@ CONFIG_NET_ETHERNET=y
430CONFIG_MII=y 443CONFIG_MII=y
431# CONFIG_HAPPYMEAL is not set 444# CONFIG_HAPPYMEAL is not set
432# CONFIG_SUNGEM is not set 445# CONFIG_SUNGEM is not set
446# CONFIG_CASSINI is not set
433# CONFIG_NET_VENDOR_3COM is not set 447# CONFIG_NET_VENDOR_3COM is not set
434 448
435# 449#
@@ -586,6 +600,7 @@ CONFIG_LEGACY_PTY_COUNT=256
586# CONFIG_WATCHDOG is not set 600# CONFIG_WATCHDOG is not set
587# CONFIG_RTC is not set 601# CONFIG_RTC is not set
588# CONFIG_GEN_RTC is not set 602# CONFIG_GEN_RTC is not set
603# CONFIG_RTC_VR41XX is not set
589# CONFIG_DTLK is not set 604# CONFIG_DTLK is not set
590# CONFIG_R3964 is not set 605# CONFIG_R3964 is not set
591# CONFIG_APPLICOM is not set 606# CONFIG_APPLICOM is not set
@@ -601,6 +616,7 @@ CONFIG_GPIO_VR41XX=y
601# TPM devices 616# TPM devices
602# 617#
603# CONFIG_TCG_TPM is not set 618# CONFIG_TCG_TPM is not set
619# CONFIG_TELCLOCK is not set
604 620
605# 621#
606# I2C support 622# I2C support
@@ -660,6 +676,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
660# CONFIG_USB is not set 676# CONFIG_USB is not set
661 677
662# 678#
679# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
680#
681
682#
663# USB Gadget Support 683# USB Gadget Support
664# 684#
665# CONFIG_USB_GADGET is not set 685# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 4b4d1ddb3d42..3558c79b0eb7 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:23 2005 4# Mon Nov 7 23:04:42 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -172,6 +190,7 @@ CONFIG_FLATMEM_MANUAL=y
172CONFIG_FLATMEM=y 190CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 191CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
193CONFIG_SPLIT_PTLOCK_CPUS=4
175CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
@@ -256,6 +275,10 @@ CONFIG_TCP_CONG_BIC=y
256# CONFIG_NET_DIVERT is not set 275# CONFIG_NET_DIVERT is not set
257# CONFIG_ECONET is not set 276# CONFIG_ECONET is not set
258# CONFIG_WAN_ROUTER is not set 277# CONFIG_WAN_ROUTER is not set
278
279#
280# QoS and/or fair queueing
281#
259# CONFIG_NET_SCHED is not set 282# CONFIG_NET_SCHED is not set
260# CONFIG_NET_CLS_ROUTE is not set 283# CONFIG_NET_CLS_ROUTE is not set
261 284
@@ -287,6 +310,7 @@ CONFIG_FW_LOADER=y
287# Connector - unified userspace <-> kernelspace linker 310# Connector - unified userspace <-> kernelspace linker
288# 311#
289CONFIG_CONNECTOR=y 312CONFIG_CONNECTOR=y
313CONFIG_PROC_EVENTS=y
290 314
291# 315#
292# Memory Technology Devices (MTD) 316# Memory Technology Devices (MTD)
@@ -316,18 +340,9 @@ CONFIG_BLK_DEV_LOOP=y
316# CONFIG_BLK_DEV_SX8 is not set 340# CONFIG_BLK_DEV_SX8 is not set
317# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
318CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
319# CONFIG_LBD is not set
320CONFIG_CDROM_PKTCDVD=y 343CONFIG_CDROM_PKTCDVD=y
321CONFIG_CDROM_PKTCDVD_BUFFERS=8 344CONFIG_CDROM_PKTCDVD_BUFFERS=8
322# CONFIG_CDROM_PKTCDVD_WCACHE is not set 345# CONFIG_CDROM_PKTCDVD_WCACHE is not set
323
324#
325# IO Schedulers
326#
327CONFIG_IOSCHED_NOOP=y
328CONFIG_IOSCHED_AS=y
329CONFIG_IOSCHED_DEADLINE=y
330CONFIG_IOSCHED_CFQ=y
331CONFIG_ATA_OVER_ETH=y 346CONFIG_ATA_OVER_ETH=y
332 347
333# 348#
@@ -401,7 +416,6 @@ CONFIG_NETDEVICES=y
401# PHY device support 416# PHY device support
402# 417#
403CONFIG_PHYLIB=y 418CONFIG_PHYLIB=y
404CONFIG_PHYCONTROL=y
405 419
406# 420#
407# MII PHY device drivers 421# MII PHY device drivers
@@ -419,6 +433,7 @@ CONFIG_NET_ETHERNET=y
419# CONFIG_MII is not set 433# CONFIG_MII is not set
420# CONFIG_HAPPYMEAL is not set 434# CONFIG_HAPPYMEAL is not set
421# CONFIG_SUNGEM is not set 435# CONFIG_SUNGEM is not set
436# CONFIG_CASSINI is not set
422# CONFIG_NET_VENDOR_3COM is not set 437# CONFIG_NET_VENDOR_3COM is not set
423 438
424# 439#
@@ -574,6 +589,7 @@ CONFIG_COBALT_LCD=y
574# TPM devices 589# TPM devices
575# 590#
576# CONFIG_TCG_TPM is not set 591# CONFIG_TCG_TPM is not set
592# CONFIG_TELCLOCK is not set
577 593
578# 594#
579# I2C support 595# I2C support
@@ -633,6 +649,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
633# CONFIG_USB is not set 649# CONFIG_USB is not set
634 650
635# 651#
652# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
653#
654
655#
636# USB Gadget Support 656# USB Gadget Support
637# 657#
638# CONFIG_USB_GADGET is not set 658# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 6501144ec612..3b103fec7b86 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:26 2005 4# Tue Nov 15 11:11:04 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -201,7 +220,6 @@ CONFIG_PCMCIA_IOCTL=y
201# 220#
202# PC-card bridges 221# PC-card bridges
203# 222#
204# CONFIG_TCIC is not set
205# CONFIG_PCMCIA_AU1X00 is not set 223# CONFIG_PCMCIA_AU1X00 is not set
206 224
207# 225#
@@ -259,15 +277,19 @@ CONFIG_TCP_CONG_BIC=y
259# CONFIG_IPV6 is not set 277# CONFIG_IPV6 is not set
260CONFIG_NETFILTER=y 278CONFIG_NETFILTER=y
261# CONFIG_NETFILTER_DEBUG is not set 279# CONFIG_NETFILTER_DEBUG is not set
280
281#
282# Core Netfilter Configuration
283#
262CONFIG_NETFILTER_NETLINK=m 284CONFIG_NETFILTER_NETLINK=m
263CONFIG_NETFILTER_NETLINK_QUEUE=m 285CONFIG_NETFILTER_NETLINK_QUEUE=m
264CONFIG_NETFILTER_NETLINK_LOG=m 286CONFIG_NETFILTER_NETLINK_LOG=m
287# CONFIG_NF_CONNTRACK is not set
265 288
266# 289#
267# IP: Netfilter Configuration 290# IP: Netfilter Configuration
268# 291#
269# CONFIG_IP_NF_CONNTRACK is not set 292# CONFIG_IP_NF_CONNTRACK is not set
270CONFIG_IP_NF_PPTP=m
271# CONFIG_IP_NF_QUEUE is not set 293# CONFIG_IP_NF_QUEUE is not set
272# CONFIG_IP_NF_IPTABLES is not set 294# CONFIG_IP_NF_IPTABLES is not set
273# CONFIG_IP_NF_ARPTABLES is not set 295# CONFIG_IP_NF_ARPTABLES is not set
@@ -293,6 +315,10 @@ CONFIG_IP_NF_PPTP=m
293# CONFIG_NET_DIVERT is not set 315# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set 316# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set 317# CONFIG_WAN_ROUTER is not set
318
319#
320# QoS and/or fair queueing
321#
296# CONFIG_NET_SCHED is not set 322# CONFIG_NET_SCHED is not set
297# CONFIG_NET_CLS_ROUTE is not set 323# CONFIG_NET_CLS_ROUTE is not set
298 324
@@ -343,6 +369,7 @@ CONFIG_MTD_BLOCK=y
343# CONFIG_FTL is not set 369# CONFIG_FTL is not set
344# CONFIG_NFTL is not set 370# CONFIG_NFTL is not set
345# CONFIG_INFTL is not set 371# CONFIG_INFTL is not set
372# CONFIG_RFD_FTL is not set
346 373
347# 374#
348# RAM/ROM/Flash chip drivers 375# RAM/ROM/Flash chip drivers
@@ -400,6 +427,11 @@ CONFIG_MTD_ALCHEMY=y
400# CONFIG_MTD_NAND is not set 427# CONFIG_MTD_NAND is not set
401 428
402# 429#
430# OneNAND Flash Device Drivers
431#
432# CONFIG_MTD_ONENAND is not set
433
434#
403# Parallel port support 435# Parallel port support
404# 436#
405# CONFIG_PARPORT is not set 437# CONFIG_PARPORT is not set
@@ -417,18 +449,9 @@ CONFIG_BLK_DEV_LOOP=y
417# CONFIG_BLK_DEV_NBD is not set 449# CONFIG_BLK_DEV_NBD is not set
418# CONFIG_BLK_DEV_RAM is not set 450# CONFIG_BLK_DEV_RAM is not set
419CONFIG_BLK_DEV_RAM_COUNT=16 451CONFIG_BLK_DEV_RAM_COUNT=16
420# CONFIG_LBD is not set
421CONFIG_CDROM_PKTCDVD=m 452CONFIG_CDROM_PKTCDVD=m
422CONFIG_CDROM_PKTCDVD_BUFFERS=8 453CONFIG_CDROM_PKTCDVD_BUFFERS=8
423# CONFIG_CDROM_PKTCDVD_WCACHE is not set 454# CONFIG_CDROM_PKTCDVD_WCACHE is not set
424
425#
426# IO Schedulers
427#
428CONFIG_IOSCHED_NOOP=y
429CONFIG_IOSCHED_AS=y
430CONFIG_IOSCHED_DEADLINE=y
431CONFIG_IOSCHED_CFQ=y
432CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
433 456
434# 457#
@@ -473,7 +496,6 @@ CONFIG_NETDEVICES=y
473# PHY device support 496# PHY device support
474# 497#
475CONFIG_PHYLIB=m 498CONFIG_PHYLIB=m
476CONFIG_PHYCONTROL=y
477 499
478# 500#
479# MII PHY device drivers 501# MII PHY device drivers
@@ -490,6 +512,7 @@ CONFIG_CICADA_PHY=m
490CONFIG_NET_ETHERNET=y 512CONFIG_NET_ETHERNET=y
491CONFIG_MII=m 513CONFIG_MII=m
492CONFIG_MIPS_AU1X00_ENET=y 514CONFIG_MIPS_AU1X00_ENET=y
515# CONFIG_SMC91X is not set
493 516
494# 517#
495# Ethernet (1000 Mbit) 518# Ethernet (1000 Mbit)
@@ -532,6 +555,7 @@ CONFIG_PPP_ASYNC=m
532# CONFIG_PPP_SYNC_TTY is not set 555# CONFIG_PPP_SYNC_TTY is not set
533CONFIG_PPP_DEFLATE=m 556CONFIG_PPP_DEFLATE=m
534# CONFIG_PPP_BSDCOMP is not set 557# CONFIG_PPP_BSDCOMP is not set
558CONFIG_PPP_MPPE=m
535CONFIG_PPPOE=m 559CONFIG_PPPOE=m
536# CONFIG_SLIP is not set 560# CONFIG_SLIP is not set
537# CONFIG_SHAPER is not set 561# CONFIG_SHAPER is not set
@@ -598,13 +622,17 @@ CONFIG_HW_CONSOLE=y
598# 622#
599# Serial drivers 623# Serial drivers
600# 624#
601# CONFIG_SERIAL_8250 is not set 625CONFIG_SERIAL_8250=y
626CONFIG_SERIAL_8250_CONSOLE=y
627CONFIG_SERIAL_8250_CS=m
628CONFIG_SERIAL_8250_NR_UARTS=4
629# CONFIG_SERIAL_8250_EXTENDED is not set
630CONFIG_SERIAL_8250_AU1X00=y
602 631
603# 632#
604# Non-8250 serial port support 633# Non-8250 serial port support
605# 634#
606CONFIG_SERIAL_AU1X00=y 635# CONFIG_SERIAL_AU1X00 is not set
607CONFIG_SERIAL_AU1X00_CONSOLE=y
608CONFIG_SERIAL_CORE=y 636CONFIG_SERIAL_CORE=y
609CONFIG_SERIAL_CORE_CONSOLE=y 637CONFIG_SERIAL_CORE_CONSOLE=y
610CONFIG_UNIX98_PTYS=y 638CONFIG_UNIX98_PTYS=y
@@ -633,11 +661,14 @@ CONFIG_LEGACY_PTY_COUNT=256
633# PCMCIA character devices 661# PCMCIA character devices
634# 662#
635CONFIG_SYNCLINK_CS=m 663CONFIG_SYNCLINK_CS=m
664# CONFIG_CARDMAN_4000 is not set
665# CONFIG_CARDMAN_4040 is not set
636# CONFIG_RAW_DRIVER is not set 666# CONFIG_RAW_DRIVER is not set
637 667
638# 668#
639# TPM devices 669# TPM devices
640# 670#
671# CONFIG_TELCLOCK is not set
641 672
642# 673#
643# I2C support 674# I2C support
@@ -697,6 +728,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
697# CONFIG_USB is not set 728# CONFIG_USB is not set
698 729
699# 730#
731# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
732#
733
734#
700# USB Gadget Support 735# USB Gadget Support
701# 736#
702# CONFIG_USB_GADGET is not set 737# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index b8cd2cd923dd..79cdd940c6a8 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:29 2005 4# Tue Nov 15 11:11:07 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -247,15 +266,19 @@ CONFIG_TCP_CONG_BIC=y
247# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
248CONFIG_NETFILTER=y 267CONFIG_NETFILTER=y
249# CONFIG_NETFILTER_DEBUG is not set 268# CONFIG_NETFILTER_DEBUG is not set
269
270#
271# Core Netfilter Configuration
272#
250CONFIG_NETFILTER_NETLINK=m 273CONFIG_NETFILTER_NETLINK=m
251CONFIG_NETFILTER_NETLINK_QUEUE=m 274CONFIG_NETFILTER_NETLINK_QUEUE=m
252CONFIG_NETFILTER_NETLINK_LOG=m 275CONFIG_NETFILTER_NETLINK_LOG=m
276# CONFIG_NF_CONNTRACK is not set
253 277
254# 278#
255# IP: Netfilter Configuration 279# IP: Netfilter Configuration
256# 280#
257# CONFIG_IP_NF_CONNTRACK is not set 281# CONFIG_IP_NF_CONNTRACK is not set
258CONFIG_IP_NF_PPTP=m
259# CONFIG_IP_NF_QUEUE is not set 282# CONFIG_IP_NF_QUEUE is not set
260# CONFIG_IP_NF_IPTABLES is not set 283# CONFIG_IP_NF_IPTABLES is not set
261# CONFIG_IP_NF_ARPTABLES is not set 284# CONFIG_IP_NF_ARPTABLES is not set
@@ -281,6 +304,10 @@ CONFIG_IP_NF_PPTP=m
281# CONFIG_NET_DIVERT is not set 304# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 305# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 306# CONFIG_WAN_ROUTER is not set
307
308#
309# QoS and/or fair queueing
310#
284# CONFIG_NET_SCHED is not set 311# CONFIG_NET_SCHED is not set
285# CONFIG_NET_CLS_ROUTE is not set 312# CONFIG_NET_CLS_ROUTE is not set
286 313
@@ -331,6 +358,7 @@ CONFIG_MTD_BLOCK=y
331# CONFIG_FTL is not set 358# CONFIG_FTL is not set
332# CONFIG_NFTL is not set 359# CONFIG_NFTL is not set
333# CONFIG_INFTL is not set 360# CONFIG_INFTL is not set
361# CONFIG_RFD_FTL is not set
334 362
335# 363#
336# RAM/ROM/Flash chip drivers 364# RAM/ROM/Flash chip drivers
@@ -388,6 +416,11 @@ CONFIG_MTD_ALCHEMY=y
388# CONFIG_MTD_NAND is not set 416# CONFIG_MTD_NAND is not set
389 417
390# 418#
419# OneNAND Flash Device Drivers
420#
421# CONFIG_MTD_ONENAND is not set
422
423#
391# Parallel port support 424# Parallel port support
392# 425#
393# CONFIG_PARPORT is not set 426# CONFIG_PARPORT is not set
@@ -405,18 +438,9 @@ CONFIG_BLK_DEV_LOOP=y
405# CONFIG_BLK_DEV_NBD is not set 438# CONFIG_BLK_DEV_NBD is not set
406# CONFIG_BLK_DEV_RAM is not set 439# CONFIG_BLK_DEV_RAM is not set
407CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
408# CONFIG_LBD is not set
409CONFIG_CDROM_PKTCDVD=m 441CONFIG_CDROM_PKTCDVD=m
410CONFIG_CDROM_PKTCDVD_BUFFERS=8 442CONFIG_CDROM_PKTCDVD_BUFFERS=8
411# CONFIG_CDROM_PKTCDVD_WCACHE is not set 443# CONFIG_CDROM_PKTCDVD_WCACHE is not set
412
413#
414# IO Schedulers
415#
416CONFIG_IOSCHED_NOOP=y
417CONFIG_IOSCHED_AS=y
418CONFIG_IOSCHED_DEADLINE=y
419CONFIG_IOSCHED_CFQ=y
420CONFIG_ATA_OVER_ETH=m 444CONFIG_ATA_OVER_ETH=m
421 445
422# 446#
@@ -461,7 +485,6 @@ CONFIG_NETDEVICES=y
461# PHY device support 485# PHY device support
462# 486#
463CONFIG_PHYLIB=m 487CONFIG_PHYLIB=m
464CONFIG_PHYCONTROL=y
465 488
466# 489#
467# MII PHY device drivers 490# MII PHY device drivers
@@ -478,6 +501,7 @@ CONFIG_CICADA_PHY=m
478CONFIG_NET_ETHERNET=y 501CONFIG_NET_ETHERNET=y
479CONFIG_MII=m 502CONFIG_MII=m
480CONFIG_MIPS_AU1X00_ENET=y 503CONFIG_MIPS_AU1X00_ENET=y
504# CONFIG_SMC91X is not set
481 505
482# 506#
483# Ethernet (1000 Mbit) 507# Ethernet (1000 Mbit)
@@ -507,6 +531,7 @@ CONFIG_PPP_ASYNC=m
507# CONFIG_PPP_SYNC_TTY is not set 531# CONFIG_PPP_SYNC_TTY is not set
508CONFIG_PPP_DEFLATE=m 532CONFIG_PPP_DEFLATE=m
509# CONFIG_PPP_BSDCOMP is not set 533# CONFIG_PPP_BSDCOMP is not set
534CONFIG_PPP_MPPE=m
510CONFIG_PPPOE=m 535CONFIG_PPPOE=m
511# CONFIG_SLIP is not set 536# CONFIG_SLIP is not set
512# CONFIG_SHAPER is not set 537# CONFIG_SHAPER is not set
@@ -573,13 +598,16 @@ CONFIG_HW_CONSOLE=y
573# 598#
574# Serial drivers 599# Serial drivers
575# 600#
576# CONFIG_SERIAL_8250 is not set 601CONFIG_SERIAL_8250=y
602CONFIG_SERIAL_8250_CONSOLE=y
603CONFIG_SERIAL_8250_NR_UARTS=4
604# CONFIG_SERIAL_8250_EXTENDED is not set
605CONFIG_SERIAL_8250_AU1X00=y
577 606
578# 607#
579# Non-8250 serial port support 608# Non-8250 serial port support
580# 609#
581CONFIG_SERIAL_AU1X00=y 610# CONFIG_SERIAL_AU1X00 is not set
582CONFIG_SERIAL_AU1X00_CONSOLE=y
583CONFIG_SERIAL_CORE=y 611CONFIG_SERIAL_CORE=y
584CONFIG_SERIAL_CORE_CONSOLE=y 612CONFIG_SERIAL_CORE_CONSOLE=y
585CONFIG_UNIX98_PTYS=y 613CONFIG_UNIX98_PTYS=y
@@ -608,6 +636,7 @@ CONFIG_LEGACY_PTY_COUNT=256
608# 636#
609# TPM devices 637# TPM devices
610# 638#
639# CONFIG_TELCLOCK is not set
611 640
612# 641#
613# I2C support 642# I2C support
@@ -650,12 +679,11 @@ CONFIG_FB=y
650CONFIG_FB_CFB_FILLRECT=y 679CONFIG_FB_CFB_FILLRECT=y
651CONFIG_FB_CFB_COPYAREA=y 680CONFIG_FB_CFB_COPYAREA=y
652CONFIG_FB_CFB_IMAGEBLIT=y 681CONFIG_FB_CFB_IMAGEBLIT=y
653CONFIG_FB_SOFT_CURSOR=y
654# CONFIG_FB_MACMODES is not set 682# CONFIG_FB_MACMODES is not set
655# CONFIG_FB_MODE_HELPERS is not set 683# CONFIG_FB_MODE_HELPERS is not set
656# CONFIG_FB_TILEBLITTING is not set 684# CONFIG_FB_TILEBLITTING is not set
657CONFIG_FB_AU1100=y
658# CONFIG_FB_S1D13XXX is not set 685# CONFIG_FB_S1D13XXX is not set
686CONFIG_FB_AU1100=y
659# CONFIG_FB_VIRTUAL is not set 687# CONFIG_FB_VIRTUAL is not set
660 688
661# 689#
@@ -664,6 +692,7 @@ CONFIG_FB_AU1100=y
664# CONFIG_VGA_CONSOLE is not set 692# CONFIG_VGA_CONSOLE is not set
665CONFIG_DUMMY_CONSOLE=y 693CONFIG_DUMMY_CONSOLE=y
666CONFIG_FRAMEBUFFER_CONSOLE=y 694CONFIG_FRAMEBUFFER_CONSOLE=y
695# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
667CONFIG_FONTS=y 696CONFIG_FONTS=y
668CONFIG_FONT_8x8=y 697CONFIG_FONT_8x8=y
669CONFIG_FONT_8x16=y 698CONFIG_FONT_8x16=y
@@ -698,6 +727,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
698# CONFIG_USB is not set 727# CONFIG_USB is not set
699 728
700# 729#
730# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
731#
732
733#
701# USB Gadget Support 734# USB Gadget Support
702# 735#
703# CONFIG_USB_GADGET is not set 736# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 530b6c2d99f6..b6bad69398e1 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:32 2005 4# Tue Nov 15 11:11:10 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -200,7 +219,6 @@ CONFIG_PCMCIA_IOCTL=y
200# 219#
201# PC-card bridges 220# PC-card bridges
202# 221#
203# CONFIG_TCIC is not set
204CONFIG_PCMCIA_AU1X00=m 222CONFIG_PCMCIA_AU1X00=m
205 223
206# 224#
@@ -255,13 +273,17 @@ CONFIG_TCP_CONG_BIC=y
255# CONFIG_IPV6 is not set 273# CONFIG_IPV6 is not set
256CONFIG_NETFILTER=y 274CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 275# CONFIG_NETFILTER_DEBUG is not set
276
277#
278# Core Netfilter Configuration
279#
258# CONFIG_NETFILTER_NETLINK is not set 280# CONFIG_NETFILTER_NETLINK is not set
281# CONFIG_NF_CONNTRACK is not set
259 282
260# 283#
261# IP: Netfilter Configuration 284# IP: Netfilter Configuration
262# 285#
263# CONFIG_IP_NF_CONNTRACK is not set 286# CONFIG_IP_NF_CONNTRACK is not set
264CONFIG_IP_NF_PPTP=m
265# CONFIG_IP_NF_QUEUE is not set 287# CONFIG_IP_NF_QUEUE is not set
266# CONFIG_IP_NF_IPTABLES is not set 288# CONFIG_IP_NF_IPTABLES is not set
267# CONFIG_IP_NF_ARPTABLES is not set 289# CONFIG_IP_NF_ARPTABLES is not set
@@ -287,6 +309,10 @@ CONFIG_IP_NF_PPTP=m
287# CONFIG_NET_DIVERT is not set 309# CONFIG_NET_DIVERT is not set
288# CONFIG_ECONET is not set 310# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 311# CONFIG_WAN_ROUTER is not set
312
313#
314# QoS and/or fair queueing
315#
290# CONFIG_NET_SCHED is not set 316# CONFIG_NET_SCHED is not set
291# CONFIG_NET_CLS_ROUTE is not set 317# CONFIG_NET_CLS_ROUTE is not set
292 318
@@ -333,6 +359,7 @@ CONFIG_MTD_BLOCK=y
333# CONFIG_FTL is not set 359# CONFIG_FTL is not set
334# CONFIG_NFTL is not set 360# CONFIG_NFTL is not set
335# CONFIG_INFTL is not set 361# CONFIG_INFTL is not set
362# CONFIG_RFD_FTL is not set
336 363
337# 364#
338# RAM/ROM/Flash chip drivers 365# RAM/ROM/Flash chip drivers
@@ -395,6 +422,11 @@ CONFIG_MTD_NAND_IDS=y
395# CONFIG_MTD_NAND_NANDSIM is not set 422# CONFIG_MTD_NAND_NANDSIM is not set
396 423
397# 424#
425# OneNAND Flash Device Drivers
426#
427# CONFIG_MTD_ONENAND is not set
428
429#
398# Parallel port support 430# Parallel port support
399# 431#
400# CONFIG_PARPORT is not set 432# CONFIG_PARPORT is not set
@@ -414,16 +446,7 @@ CONFIG_BLK_DEV_RAM=y
414CONFIG_BLK_DEV_RAM_COUNT=16 446CONFIG_BLK_DEV_RAM_COUNT=16
415CONFIG_BLK_DEV_RAM_SIZE=4096 447CONFIG_BLK_DEV_RAM_SIZE=4096
416# CONFIG_BLK_DEV_INITRD is not set 448# CONFIG_BLK_DEV_INITRD is not set
417# CONFIG_LBD is not set
418# CONFIG_CDROM_PKTCDVD is not set 449# CONFIG_CDROM_PKTCDVD is not set
419
420#
421# IO Schedulers
422#
423CONFIG_IOSCHED_NOOP=y
424CONFIG_IOSCHED_AS=y
425CONFIG_IOSCHED_DEADLINE=y
426CONFIG_IOSCHED_CFQ=y
427# CONFIG_ATA_OVER_ETH is not set 450# CONFIG_ATA_OVER_ETH is not set
428 451
429# 452#
@@ -495,6 +518,7 @@ CONFIG_SCSI_MULTI_LUN=y
495# 518#
496# SCSI low-level drivers 519# SCSI low-level drivers
497# 520#
521# CONFIG_ISCSI_TCP is not set
498# CONFIG_SCSI_SATA is not set 522# CONFIG_SCSI_SATA is not set
499# CONFIG_SCSI_DEBUG is not set 523# CONFIG_SCSI_DEBUG is not set
500 524
@@ -545,6 +569,7 @@ CONFIG_NETDEVICES=y
545CONFIG_NET_ETHERNET=y 569CONFIG_NET_ETHERNET=y
546CONFIG_MII=m 570CONFIG_MII=m
547# CONFIG_MIPS_AU1X00_ENET is not set 571# CONFIG_MIPS_AU1X00_ENET is not set
572# CONFIG_SMC91X is not set
548 573
549# 574#
550# Ethernet (1000 Mbit) 575# Ethernet (1000 Mbit)
@@ -638,13 +663,17 @@ CONFIG_HW_CONSOLE=y
638# 663#
639# Serial drivers 664# Serial drivers
640# 665#
641# CONFIG_SERIAL_8250 is not set 666CONFIG_SERIAL_8250=y
667CONFIG_SERIAL_8250_CONSOLE=y
668# CONFIG_SERIAL_8250_CS is not set
669CONFIG_SERIAL_8250_NR_UARTS=4
670# CONFIG_SERIAL_8250_EXTENDED is not set
671CONFIG_SERIAL_8250_AU1X00=y
642 672
643# 673#
644# Non-8250 serial port support 674# Non-8250 serial port support
645# 675#
646CONFIG_SERIAL_AU1X00=y 676# CONFIG_SERIAL_AU1X00 is not set
647CONFIG_SERIAL_AU1X00_CONSOLE=y
648CONFIG_SERIAL_CORE=y 677CONFIG_SERIAL_CORE=y
649CONFIG_SERIAL_CORE_CONSOLE=y 678CONFIG_SERIAL_CORE_CONSOLE=y
650CONFIG_UNIX98_PTYS=y 679CONFIG_UNIX98_PTYS=y
@@ -673,11 +702,14 @@ CONFIG_LEGACY_PTY_COUNT=256
673# PCMCIA character devices 702# PCMCIA character devices
674# 703#
675# CONFIG_SYNCLINK_CS is not set 704# CONFIG_SYNCLINK_CS is not set
705# CONFIG_CARDMAN_4000 is not set
706# CONFIG_CARDMAN_4040 is not set
676# CONFIG_RAW_DRIVER is not set 707# CONFIG_RAW_DRIVER is not set
677 708
678# 709#
679# TPM devices 710# TPM devices
680# 711#
712# CONFIG_TELCLOCK is not set
681 713
682# 714#
683# I2C support 715# I2C support
@@ -720,12 +752,11 @@ CONFIG_FB=y
720CONFIG_FB_CFB_FILLRECT=y 752CONFIG_FB_CFB_FILLRECT=y
721CONFIG_FB_CFB_COPYAREA=y 753CONFIG_FB_CFB_COPYAREA=y
722CONFIG_FB_CFB_IMAGEBLIT=y 754CONFIG_FB_CFB_IMAGEBLIT=y
723CONFIG_FB_SOFT_CURSOR=y
724# CONFIG_FB_MACMODES is not set 755# CONFIG_FB_MACMODES is not set
725# CONFIG_FB_MODE_HELPERS is not set 756# CONFIG_FB_MODE_HELPERS is not set
726# CONFIG_FB_TILEBLITTING is not set 757# CONFIG_FB_TILEBLITTING is not set
727CONFIG_FB_AU1200=y
728# CONFIG_FB_S1D13XXX is not set 758# CONFIG_FB_S1D13XXX is not set
759CONFIG_FB_AU1200=y
729# CONFIG_FB_VIRTUAL is not set 760# CONFIG_FB_VIRTUAL is not set
730 761
731# 762#
@@ -757,6 +788,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
757# CONFIG_USB is not set 788# CONFIG_USB is not set
758 789
759# 790#
791# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
792#
793
794#
760# USB Gadget Support 795# USB Gadget Support
761# 796#
762CONFIG_USB_GADGET=m 797CONFIG_USB_GADGET=m
@@ -862,6 +897,7 @@ CONFIG_RAMFS=y
862CONFIG_JFFS2_FS=y 897CONFIG_JFFS2_FS=y
863CONFIG_JFFS2_FS_DEBUG=0 898CONFIG_JFFS2_FS_DEBUG=0
864CONFIG_JFFS2_FS_WRITEBUFFER=y 899CONFIG_JFFS2_FS_WRITEBUFFER=y
900# CONFIG_JFFS2_SUMMARY is not set
865# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 901# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
866CONFIG_JFFS2_ZLIB=y 902CONFIG_JFFS2_ZLIB=y
867CONFIG_JFFS2_RTIME=y 903CONFIG_JFFS2_RTIME=y
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 1c2784dee697..dbaf189fc9c0 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:36 2005 4# Tue Nov 15 11:11:15 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -208,7 +227,6 @@ CONFIG_CARDBUS=y
208# CONFIG_YENTA is not set 227# CONFIG_YENTA is not set
209# CONFIG_PD6729 is not set 228# CONFIG_PD6729 is not set
210# CONFIG_I82092 is not set 229# CONFIG_I82092 is not set
211# CONFIG_TCIC is not set
212CONFIG_PCMCIA_AU1X00=m 230CONFIG_PCMCIA_AU1X00=m
213 231
214# 232#
@@ -267,15 +285,19 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
268CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
269# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
288
289#
290# Core Netfilter Configuration
291#
270CONFIG_NETFILTER_NETLINK=m 292CONFIG_NETFILTER_NETLINK=m
271CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
272CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set
273 296
274# 297#
275# IP: Netfilter Configuration 298# IP: Netfilter Configuration
276# 299#
277# CONFIG_IP_NF_CONNTRACK is not set 300# CONFIG_IP_NF_CONNTRACK is not set
278CONFIG_IP_NF_PPTP=m
279# CONFIG_IP_NF_QUEUE is not set 301# CONFIG_IP_NF_QUEUE is not set
280# CONFIG_IP_NF_IPTABLES is not set 302# CONFIG_IP_NF_IPTABLES is not set
281# CONFIG_IP_NF_ARPTABLES is not set 303# CONFIG_IP_NF_ARPTABLES is not set
@@ -301,6 +323,10 @@ CONFIG_IP_NF_PPTP=m
301# CONFIG_NET_DIVERT is not set 323# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 324# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 325# CONFIG_WAN_ROUTER is not set
326
327#
328# QoS and/or fair queueing
329#
304# CONFIG_NET_SCHED is not set 330# CONFIG_NET_SCHED is not set
305# CONFIG_NET_CLS_ROUTE is not set 331# CONFIG_NET_CLS_ROUTE is not set
306 332
@@ -351,6 +377,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 377# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 378# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 379# CONFIG_INFTL is not set
380# CONFIG_RFD_FTL is not set
354 381
355# 382#
356# RAM/ROM/Flash chip drivers 383# RAM/ROM/Flash chip drivers
@@ -409,6 +436,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 436# CONFIG_MTD_NAND is not set
410 437
411# 438#
439# OneNAND Flash Device Drivers
440#
441# CONFIG_MTD_ONENAND is not set
442
443#
412# Parallel port support 444# Parallel port support
413# 445#
414# CONFIG_PARPORT is not set 446# CONFIG_PARPORT is not set
@@ -432,18 +464,9 @@ CONFIG_BLK_DEV_LOOP=y
432# CONFIG_BLK_DEV_UB is not set 464# CONFIG_BLK_DEV_UB is not set
433# CONFIG_BLK_DEV_RAM is not set 465# CONFIG_BLK_DEV_RAM is not set
434CONFIG_BLK_DEV_RAM_COUNT=16 466CONFIG_BLK_DEV_RAM_COUNT=16
435# CONFIG_LBD is not set
436CONFIG_CDROM_PKTCDVD=m 467CONFIG_CDROM_PKTCDVD=m
437CONFIG_CDROM_PKTCDVD_BUFFERS=8 468CONFIG_CDROM_PKTCDVD_BUFFERS=8
438# CONFIG_CDROM_PKTCDVD_WCACHE is not set 469# CONFIG_CDROM_PKTCDVD_WCACHE is not set
439
440#
441# IO Schedulers
442#
443CONFIG_IOSCHED_NOOP=y
444CONFIG_IOSCHED_AS=y
445CONFIG_IOSCHED_DEADLINE=y
446CONFIG_IOSCHED_CFQ=y
447CONFIG_ATA_OVER_ETH=m 470CONFIG_ATA_OVER_ETH=m
448 471
449# 472#
@@ -518,7 +541,6 @@ CONFIG_NETDEVICES=y
518# PHY device support 541# PHY device support
519# 542#
520CONFIG_PHYLIB=m 543CONFIG_PHYLIB=m
521CONFIG_PHYCONTROL=y
522 544
523# 545#
524# MII PHY device drivers 546# MII PHY device drivers
@@ -537,7 +559,9 @@ CONFIG_NET_ETHERNET=y
537CONFIG_MIPS_AU1X00_ENET=y 559CONFIG_MIPS_AU1X00_ENET=y
538# CONFIG_HAPPYMEAL is not set 560# CONFIG_HAPPYMEAL is not set
539# CONFIG_SUNGEM is not set 561# CONFIG_SUNGEM is not set
562# CONFIG_CASSINI is not set
540# CONFIG_NET_VENDOR_3COM is not set 563# CONFIG_NET_VENDOR_3COM is not set
564# CONFIG_SMC91X is not set
541 565
542# 566#
543# Tulip family network device support 567# Tulip family network device support
@@ -599,6 +623,7 @@ CONFIG_PPP_ASYNC=m
599# CONFIG_PPP_SYNC_TTY is not set 623# CONFIG_PPP_SYNC_TTY is not set
600CONFIG_PPP_DEFLATE=m 624CONFIG_PPP_DEFLATE=m
601# CONFIG_PPP_BSDCOMP is not set 625# CONFIG_PPP_BSDCOMP is not set
626CONFIG_PPP_MPPE=m
602CONFIG_PPPOE=m 627CONFIG_PPPOE=m
603# CONFIG_SLIP is not set 628# CONFIG_SLIP is not set
604# CONFIG_SHAPER is not set 629# CONFIG_SHAPER is not set
@@ -664,13 +689,17 @@ CONFIG_SERIO_RAW=m
664# 689#
665# Serial drivers 690# Serial drivers
666# 691#
667# CONFIG_SERIAL_8250 is not set 692CONFIG_SERIAL_8250=y
693CONFIG_SERIAL_8250_CONSOLE=y
694# CONFIG_SERIAL_8250_CS is not set
695CONFIG_SERIAL_8250_NR_UARTS=4
696# CONFIG_SERIAL_8250_EXTENDED is not set
697CONFIG_SERIAL_8250_AU1X00=y
668 698
669# 699#
670# Non-8250 serial port support 700# Non-8250 serial port support
671# 701#
672CONFIG_SERIAL_AU1X00=y 702# CONFIG_SERIAL_AU1X00 is not set
673CONFIG_SERIAL_AU1X00_CONSOLE=y
674CONFIG_SERIAL_CORE=y 703CONFIG_SERIAL_CORE=y
675CONFIG_SERIAL_CORE_CONSOLE=y 704CONFIG_SERIAL_CORE_CONSOLE=y
676# CONFIG_SERIAL_JSM is not set 705# CONFIG_SERIAL_JSM is not set
@@ -702,12 +731,15 @@ CONFIG_LEGACY_PTY_COUNT=256
702# PCMCIA character devices 731# PCMCIA character devices
703# 732#
704CONFIG_SYNCLINK_CS=m 733CONFIG_SYNCLINK_CS=m
734# CONFIG_CARDMAN_4000 is not set
735# CONFIG_CARDMAN_4040 is not set
705# CONFIG_RAW_DRIVER is not set 736# CONFIG_RAW_DRIVER is not set
706 737
707# 738#
708# TPM devices 739# TPM devices
709# 740#
710# CONFIG_TCG_TPM is not set 741# CONFIG_TCG_TPM is not set
742# CONFIG_TELCLOCK is not set
711 743
712# 744#
713# I2C support 745# I2C support
@@ -756,12 +788,94 @@ CONFIG_SOUND=y
756# 788#
757# Advanced Linux Sound Architecture 789# Advanced Linux Sound Architecture
758# 790#
759# CONFIG_SND is not set 791CONFIG_SND=m
792CONFIG_SND_AC97_CODEC=m
793CONFIG_SND_AC97_BUS=m
794CONFIG_SND_TIMER=m
795CONFIG_SND_PCM=m
796CONFIG_SND_RAWMIDI=m
797CONFIG_SND_SEQUENCER=m
798CONFIG_SND_SEQ_DUMMY=m
799CONFIG_SND_OSSEMUL=y
800CONFIG_SND_MIXER_OSS=m
801CONFIG_SND_PCM_OSS=m
802CONFIG_SND_SEQUENCER_OSS=y
803# CONFIG_SND_VERBOSE_PRINTK is not set
804# CONFIG_SND_DEBUG is not set
805CONFIG_SND_GENERIC_DRIVER=y
806
807#
808# Generic devices
809#
810# CONFIG_SND_DUMMY is not set
811CONFIG_SND_VIRMIDI=m
812CONFIG_SND_MTPAV=m
813# CONFIG_SND_SERIAL_U16550 is not set
814# CONFIG_SND_MPU401 is not set
815
816#
817# PCI devices
818#
819# CONFIG_SND_ALI5451 is not set
820# CONFIG_SND_ATIIXP is not set
821# CONFIG_SND_ATIIXP_MODEM is not set
822# CONFIG_SND_AU8810 is not set
823# CONFIG_SND_AU8820 is not set
824# CONFIG_SND_AU8830 is not set
825# CONFIG_SND_AZT3328 is not set
826# CONFIG_SND_BT87X is not set
827# CONFIG_SND_CS46XX is not set
828# CONFIG_SND_CS4281 is not set
829# CONFIG_SND_EMU10K1 is not set
830# CONFIG_SND_EMU10K1X is not set
831# CONFIG_SND_CA0106 is not set
832# CONFIG_SND_KORG1212 is not set
833# CONFIG_SND_MIXART is not set
834# CONFIG_SND_NM256 is not set
835# CONFIG_SND_RME32 is not set
836# CONFIG_SND_RME96 is not set
837# CONFIG_SND_RME9652 is not set
838# CONFIG_SND_HDSP is not set
839# CONFIG_SND_HDSPM is not set
840# CONFIG_SND_TRIDENT is not set
841# CONFIG_SND_YMFPCI is not set
842# CONFIG_SND_AD1889 is not set
843# CONFIG_SND_CMIPCI is not set
844# CONFIG_SND_ENS1370 is not set
845# CONFIG_SND_ENS1371 is not set
846# CONFIG_SND_ES1938 is not set
847# CONFIG_SND_ES1968 is not set
848# CONFIG_SND_MAESTRO3 is not set
849# CONFIG_SND_FM801 is not set
850# CONFIG_SND_ICE1712 is not set
851# CONFIG_SND_ICE1724 is not set
852# CONFIG_SND_INTEL8X0 is not set
853# CONFIG_SND_INTEL8X0M is not set
854# CONFIG_SND_SONICVIBES is not set
855# CONFIG_SND_VIA82XX is not set
856# CONFIG_SND_VIA82XX_MODEM is not set
857# CONFIG_SND_VX222 is not set
858# CONFIG_SND_HDA_INTEL is not set
859
860#
861# ALSA MIPS devices
862#
863CONFIG_SND_AU1X00=m
864
865#
866# USB devices
867#
868# CONFIG_SND_USB_AUDIO is not set
869
870#
871# PCMCIA devices
872#
760 873
761# 874#
762# Open Sound System 875# Open Sound System
763# 876#
764CONFIG_SOUND_PRIME=y 877CONFIG_SOUND_PRIME=y
878CONFIG_OBSOLETE_OSS_DRIVER=y
765# CONFIG_SOUND_BT878 is not set 879# CONFIG_SOUND_BT878 is not set
766# CONFIG_SOUND_CMPCI is not set 880# CONFIG_SOUND_CMPCI is not set
767# CONFIG_SOUND_EMU10K1 is not set 881# CONFIG_SOUND_EMU10K1 is not set
@@ -774,7 +888,7 @@ CONFIG_SOUND_PRIME=y
774# CONFIG_SOUND_MAESTRO3 is not set 888# CONFIG_SOUND_MAESTRO3 is not set
775# CONFIG_SOUND_ICH is not set 889# CONFIG_SOUND_ICH is not set
776# CONFIG_SOUND_SONICVIBES is not set 890# CONFIG_SOUND_SONICVIBES is not set
777CONFIG_SOUND_AU1000=y 891# CONFIG_SOUND_AU1000 is not set
778# CONFIG_SOUND_TRIDENT is not set 892# CONFIG_SOUND_TRIDENT is not set
779# CONFIG_SOUND_MSNDCLAS is not set 893# CONFIG_SOUND_MSNDCLAS is not set
780# CONFIG_SOUND_MSNDPIN is not set 894# CONFIG_SOUND_MSNDPIN is not set
@@ -815,12 +929,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
815# USB Device Class drivers 929# USB Device Class drivers
816# 930#
817# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set 931# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
818# CONFIG_USB_BLUETOOTH_TTY is not set
819# CONFIG_USB_ACM is not set 932# CONFIG_USB_ACM is not set
820# CONFIG_USB_PRINTER is not set 933# CONFIG_USB_PRINTER is not set
821 934
822# 935#
823# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 936# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
937#
938
939#
940# may also be needed; see USB_STORAGE Help for more information
824# 941#
825# CONFIG_USB_STORAGE is not set 942# CONFIG_USB_STORAGE is not set
826 943
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 64248e2e924a..59c1ef214fc0 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:39 2005 4# Tue Nov 15 11:11:18 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -207,7 +226,6 @@ CONFIG_CARDBUS=y
207# CONFIG_YENTA is not set 226# CONFIG_YENTA is not set
208# CONFIG_PD6729 is not set 227# CONFIG_PD6729 is not set
209# CONFIG_I82092 is not set 228# CONFIG_I82092 is not set
210# CONFIG_TCIC is not set
211CONFIG_PCMCIA_AU1X00=m 229CONFIG_PCMCIA_AU1X00=m
212 230
213# 231#
@@ -266,15 +284,19 @@ CONFIG_TCP_CONG_BIC=y
266# CONFIG_IPV6 is not set 284# CONFIG_IPV6 is not set
267CONFIG_NETFILTER=y 285CONFIG_NETFILTER=y
268# CONFIG_NETFILTER_DEBUG is not set 286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
269CONFIG_NETFILTER_NETLINK=m 291CONFIG_NETFILTER_NETLINK=m
270CONFIG_NETFILTER_NETLINK_QUEUE=m 292CONFIG_NETFILTER_NETLINK_QUEUE=m
271CONFIG_NETFILTER_NETLINK_LOG=m 293CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set
272 295
273# 296#
274# IP: Netfilter Configuration 297# IP: Netfilter Configuration
275# 298#
276# CONFIG_IP_NF_CONNTRACK is not set 299# CONFIG_IP_NF_CONNTRACK is not set
277CONFIG_IP_NF_PPTP=m
278# CONFIG_IP_NF_QUEUE is not set 300# CONFIG_IP_NF_QUEUE is not set
279# CONFIG_IP_NF_IPTABLES is not set 301# CONFIG_IP_NF_IPTABLES is not set
280# CONFIG_IP_NF_ARPTABLES is not set 302# CONFIG_IP_NF_ARPTABLES is not set
@@ -300,6 +322,10 @@ CONFIG_IP_NF_PPTP=m
300# CONFIG_NET_DIVERT is not set 322# CONFIG_NET_DIVERT is not set
301# CONFIG_ECONET is not set 323# CONFIG_ECONET is not set
302# CONFIG_WAN_ROUTER is not set 324# CONFIG_WAN_ROUTER is not set
325
326#
327# QoS and/or fair queueing
328#
303# CONFIG_NET_SCHED is not set 329# CONFIG_NET_SCHED is not set
304# CONFIG_NET_CLS_ROUTE is not set 330# CONFIG_NET_CLS_ROUTE is not set
305 331
@@ -350,6 +376,7 @@ CONFIG_MTD_BLOCK=y
350# CONFIG_FTL is not set 376# CONFIG_FTL is not set
351# CONFIG_NFTL is not set 377# CONFIG_NFTL is not set
352# CONFIG_INFTL is not set 378# CONFIG_INFTL is not set
379# CONFIG_RFD_FTL is not set
353 380
354# 381#
355# RAM/ROM/Flash chip drivers 382# RAM/ROM/Flash chip drivers
@@ -413,6 +440,11 @@ CONFIG_MTD_NAND_AU1550=m
413# CONFIG_MTD_NAND_NANDSIM is not set 440# CONFIG_MTD_NAND_NANDSIM is not set
414 441
415# 442#
443# OneNAND Flash Device Drivers
444#
445# CONFIG_MTD_ONENAND is not set
446
447#
416# Parallel port support 448# Parallel port support
417# 449#
418# CONFIG_PARPORT is not set 450# CONFIG_PARPORT is not set
@@ -435,18 +467,9 @@ CONFIG_BLK_DEV_LOOP=y
435# CONFIG_BLK_DEV_SX8 is not set 467# CONFIG_BLK_DEV_SX8 is not set
436# CONFIG_BLK_DEV_RAM is not set 468# CONFIG_BLK_DEV_RAM is not set
437CONFIG_BLK_DEV_RAM_COUNT=16 469CONFIG_BLK_DEV_RAM_COUNT=16
438# CONFIG_LBD is not set
439CONFIG_CDROM_PKTCDVD=m 470CONFIG_CDROM_PKTCDVD=m
440CONFIG_CDROM_PKTCDVD_BUFFERS=8 471CONFIG_CDROM_PKTCDVD_BUFFERS=8
441# CONFIG_CDROM_PKTCDVD_WCACHE is not set 472# CONFIG_CDROM_PKTCDVD_WCACHE is not set
442
443#
444# IO Schedulers
445#
446CONFIG_IOSCHED_NOOP=y
447CONFIG_IOSCHED_AS=y
448CONFIG_IOSCHED_DEADLINE=y
449CONFIG_IOSCHED_CFQ=y
450CONFIG_ATA_OVER_ETH=m 473CONFIG_ATA_OVER_ETH=m
451 474
452# 475#
@@ -550,7 +573,6 @@ CONFIG_NETDEVICES=y
550# PHY device support 573# PHY device support
551# 574#
552CONFIG_PHYLIB=m 575CONFIG_PHYLIB=m
553CONFIG_PHYCONTROL=y
554 576
555# 577#
556# MII PHY device drivers 578# MII PHY device drivers
@@ -569,7 +591,9 @@ CONFIG_MII=m
569CONFIG_MIPS_AU1X00_ENET=y 591CONFIG_MIPS_AU1X00_ENET=y
570# CONFIG_HAPPYMEAL is not set 592# CONFIG_HAPPYMEAL is not set
571# CONFIG_SUNGEM is not set 593# CONFIG_SUNGEM is not set
594# CONFIG_CASSINI is not set
572# CONFIG_NET_VENDOR_3COM is not set 595# CONFIG_NET_VENDOR_3COM is not set
596# CONFIG_SMC91X is not set
573 597
574# 598#
575# Tulip family network device support 599# Tulip family network device support
@@ -639,6 +663,7 @@ CONFIG_PPP_ASYNC=m
639# CONFIG_PPP_SYNC_TTY is not set 663# CONFIG_PPP_SYNC_TTY is not set
640CONFIG_PPP_DEFLATE=m 664CONFIG_PPP_DEFLATE=m
641# CONFIG_PPP_BSDCOMP is not set 665# CONFIG_PPP_BSDCOMP is not set
666CONFIG_PPP_MPPE=m
642CONFIG_PPPOE=m 667CONFIG_PPPOE=m
643# CONFIG_SLIP is not set 668# CONFIG_SLIP is not set
644# CONFIG_SHAPER is not set 669# CONFIG_SHAPER is not set
@@ -704,13 +729,17 @@ CONFIG_SERIO_RAW=m
704# 729#
705# Serial drivers 730# Serial drivers
706# 731#
707# CONFIG_SERIAL_8250 is not set 732CONFIG_SERIAL_8250=y
733CONFIG_SERIAL_8250_CONSOLE=y
734# CONFIG_SERIAL_8250_CS is not set
735CONFIG_SERIAL_8250_NR_UARTS=4
736# CONFIG_SERIAL_8250_EXTENDED is not set
737CONFIG_SERIAL_8250_AU1X00=y
708 738
709# 739#
710# Non-8250 serial port support 740# Non-8250 serial port support
711# 741#
712CONFIG_SERIAL_AU1X00=y 742# CONFIG_SERIAL_AU1X00 is not set
713CONFIG_SERIAL_AU1X00_CONSOLE=y
714CONFIG_SERIAL_CORE=y 743CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 744CONFIG_SERIAL_CORE_CONSOLE=y
716# CONFIG_SERIAL_JSM is not set 745# CONFIG_SERIAL_JSM is not set
@@ -742,12 +771,15 @@ CONFIG_LEGACY_PTY_COUNT=256
742# PCMCIA character devices 771# PCMCIA character devices
743# 772#
744CONFIG_SYNCLINK_CS=m 773CONFIG_SYNCLINK_CS=m
774# CONFIG_CARDMAN_4000 is not set
775# CONFIG_CARDMAN_4040 is not set
745# CONFIG_RAW_DRIVER is not set 776# CONFIG_RAW_DRIVER is not set
746 777
747# 778#
748# TPM devices 779# TPM devices
749# 780#
750# CONFIG_TCG_TPM is not set 781# CONFIG_TCG_TPM is not set
782# CONFIG_TELCLOCK is not set
751 783
752# 784#
753# I2C support 785# I2C support
@@ -801,6 +833,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
801# CONFIG_USB is not set 833# CONFIG_USB is not set
802 834
803# 835#
836# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
837#
838
839#
804# USB Gadget Support 840# USB Gadget Support
805# 841#
806# CONFIG_USB_GADGET is not set 842# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index 326f3aa63741..4ba29e612bdf 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:42 2005 4# Mon Nov 7 23:05:04 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -173,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
@@ -261,6 +280,10 @@ CONFIG_TCP_CONG_BIC=y
261# CONFIG_NET_DIVERT is not set 280# CONFIG_NET_DIVERT is not set
262# CONFIG_ECONET is not set 281# CONFIG_ECONET is not set
263# CONFIG_WAN_ROUTER is not set 282# CONFIG_WAN_ROUTER is not set
283
284#
285# QoS and/or fair queueing
286#
264# CONFIG_NET_SCHED is not set 287# CONFIG_NET_SCHED is not set
265# CONFIG_NET_CLS_ROUTE is not set 288# CONFIG_NET_CLS_ROUTE is not set
266 289
@@ -292,6 +315,7 @@ CONFIG_FW_LOADER=y
292# Connector - unified userspace <-> kernelspace linker 315# Connector - unified userspace <-> kernelspace linker
293# 316#
294CONFIG_CONNECTOR=y 317CONFIG_CONNECTOR=y
318CONFIG_PROC_EVENTS=y
295 319
296# 320#
297# Memory Technology Devices (MTD) 321# Memory Technology Devices (MTD)
@@ -321,18 +345,9 @@ CONFIG_CONNECTOR=y
321# CONFIG_BLK_DEV_SX8 is not set 345# CONFIG_BLK_DEV_SX8 is not set
322# CONFIG_BLK_DEV_RAM is not set 346# CONFIG_BLK_DEV_RAM is not set
323CONFIG_BLK_DEV_RAM_COUNT=16 347CONFIG_BLK_DEV_RAM_COUNT=16
324# CONFIG_LBD is not set
325CONFIG_CDROM_PKTCDVD=y 348CONFIG_CDROM_PKTCDVD=y
326CONFIG_CDROM_PKTCDVD_BUFFERS=8 349CONFIG_CDROM_PKTCDVD_BUFFERS=8
327# CONFIG_CDROM_PKTCDVD_WCACHE is not set 350# CONFIG_CDROM_PKTCDVD_WCACHE is not set
328
329#
330# IO Schedulers
331#
332CONFIG_IOSCHED_NOOP=y
333CONFIG_IOSCHED_AS=y
334CONFIG_IOSCHED_DEADLINE=y
335CONFIG_IOSCHED_CFQ=y
336CONFIG_ATA_OVER_ETH=y 351CONFIG_ATA_OVER_ETH=y
337 352
338# 353#
@@ -412,7 +427,6 @@ CONFIG_NETDEVICES=y
412# PHY device support 427# PHY device support
413# 428#
414CONFIG_PHYLIB=y 429CONFIG_PHYLIB=y
415CONFIG_PHYCONTROL=y
416 430
417# 431#
418# MII PHY device drivers 432# MII PHY device drivers
@@ -430,6 +444,7 @@ CONFIG_NET_ETHERNET=y
430# CONFIG_MII is not set 444# CONFIG_MII is not set
431# CONFIG_HAPPYMEAL is not set 445# CONFIG_HAPPYMEAL is not set
432# CONFIG_SUNGEM is not set 446# CONFIG_SUNGEM is not set
447# CONFIG_CASSINI is not set
433# CONFIG_NET_VENDOR_3COM is not set 448# CONFIG_NET_VENDOR_3COM is not set
434# CONFIG_NET_VENDOR_SMC is not set 449# CONFIG_NET_VENDOR_SMC is not set
435# CONFIG_NET_VENDOR_RACAL is not set 450# CONFIG_NET_VENDOR_RACAL is not set
@@ -443,7 +458,6 @@ CONFIG_NET_ETHERNET=y
443# CONFIG_HP100 is not set 458# CONFIG_HP100 is not set
444# CONFIG_NET_ISA is not set 459# CONFIG_NET_ISA is not set
445# CONFIG_NET_PCI is not set 460# CONFIG_NET_PCI is not set
446# CONFIG_NET_POCKET is not set
447 461
448# 462#
449# Ethernet (1000 Mbit) 463# Ethernet (1000 Mbit)
@@ -591,6 +605,7 @@ CONFIG_LEGACY_PTY_COUNT=256
591# TPM devices 605# TPM devices
592# 606#
593# CONFIG_TCG_TPM is not set 607# CONFIG_TCG_TPM is not set
608# CONFIG_TELCLOCK is not set
594 609
595# 610#
596# I2C support 611# I2C support
@@ -633,7 +648,6 @@ CONFIG_FB=y
633# CONFIG_FB_CFB_FILLRECT is not set 648# CONFIG_FB_CFB_FILLRECT is not set
634# CONFIG_FB_CFB_COPYAREA is not set 649# CONFIG_FB_CFB_COPYAREA is not set
635# CONFIG_FB_CFB_IMAGEBLIT is not set 650# CONFIG_FB_CFB_IMAGEBLIT is not set
636# CONFIG_FB_SOFT_CURSOR is not set
637# CONFIG_FB_MACMODES is not set 651# CONFIG_FB_MACMODES is not set
638# CONFIG_FB_MODE_HELPERS is not set 652# CONFIG_FB_MODE_HELPERS is not set
639# CONFIG_FB_TILEBLITTING is not set 653# CONFIG_FB_TILEBLITTING is not set
@@ -642,6 +656,7 @@ CONFIG_FB=y
642# CONFIG_FB_CYBER2000 is not set 656# CONFIG_FB_CYBER2000 is not set
643# CONFIG_FB_ASILIANT is not set 657# CONFIG_FB_ASILIANT is not set
644# CONFIG_FB_IMSTT is not set 658# CONFIG_FB_IMSTT is not set
659# CONFIG_FB_S1D13XXX is not set
645# CONFIG_FB_NVIDIA is not set 660# CONFIG_FB_NVIDIA is not set
646# CONFIG_FB_RIVA is not set 661# CONFIG_FB_RIVA is not set
647# CONFIG_FB_MATROX is not set 662# CONFIG_FB_MATROX is not set
@@ -658,7 +673,6 @@ CONFIG_FB=y
658# CONFIG_FB_SMIVGX is not set 673# CONFIG_FB_SMIVGX is not set
659# CONFIG_FB_CYBLA is not set 674# CONFIG_FB_CYBLA is not set
660# CONFIG_FB_TRIDENT is not set 675# CONFIG_FB_TRIDENT is not set
661# CONFIG_FB_S1D13XXX is not set
662# CONFIG_FB_VIRTUAL is not set 676# CONFIG_FB_VIRTUAL is not set
663 677
664# 678#
@@ -688,6 +702,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
688# CONFIG_USB is not set 702# CONFIG_USB is not set
689 703
690# 704#
705# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
706#
707
708#
691# USB Gadget Support 709# USB Gadget Support
692# 710#
693# CONFIG_USB_GADGET is not set 711# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index c2a01df3c8df..ea4e9046bbee 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:45 2005 4# Mon Nov 7 23:05:08 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -173,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
@@ -260,6 +279,10 @@ CONFIG_TCP_CONG_BIC=y
260# CONFIG_NET_DIVERT is not set 279# CONFIG_NET_DIVERT is not set
261# CONFIG_ECONET is not set 280# CONFIG_ECONET is not set
262# CONFIG_WAN_ROUTER is not set 281# CONFIG_WAN_ROUTER is not set
282
283#
284# QoS and/or fair queueing
285#
263# CONFIG_NET_SCHED is not set 286# CONFIG_NET_SCHED is not set
264# CONFIG_NET_CLS_ROUTE is not set 287# CONFIG_NET_CLS_ROUTE is not set
265 288
@@ -291,6 +314,7 @@ CONFIG_FW_LOADER=y
291# Connector - unified userspace <-> kernelspace linker 314# Connector - unified userspace <-> kernelspace linker
292# 315#
293CONFIG_CONNECTOR=y 316CONFIG_CONNECTOR=y
317CONFIG_PROC_EVENTS=y
294 318
295# 319#
296# Memory Technology Devices (MTD) 320# Memory Technology Devices (MTD)
@@ -319,18 +343,9 @@ CONFIG_CONNECTOR=y
319# CONFIG_BLK_DEV_SX8 is not set 343# CONFIG_BLK_DEV_SX8 is not set
320# CONFIG_BLK_DEV_RAM is not set 344# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 345CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=y 346CONFIG_CDROM_PKTCDVD=y
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 347CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 348# CONFIG_CDROM_PKTCDVD_WCACHE is not set
326
327#
328# IO Schedulers
329#
330CONFIG_IOSCHED_NOOP=y
331CONFIG_IOSCHED_AS=y
332CONFIG_IOSCHED_DEADLINE=y
333CONFIG_IOSCHED_CFQ=y
334CONFIG_ATA_OVER_ETH=y 349CONFIG_ATA_OVER_ETH=y
335 350
336# 351#
@@ -382,7 +397,6 @@ CONFIG_NETDEVICES=y
382# PHY device support 397# PHY device support
383# 398#
384CONFIG_PHYLIB=y 399CONFIG_PHYLIB=y
385CONFIG_PHYCONTROL=y
386 400
387# 401#
388# MII PHY device drivers 402# MII PHY device drivers
@@ -400,6 +414,7 @@ CONFIG_NET_ETHERNET=y
400CONFIG_MII=y 414CONFIG_MII=y
401# CONFIG_HAPPYMEAL is not set 415# CONFIG_HAPPYMEAL is not set
402# CONFIG_SUNGEM is not set 416# CONFIG_SUNGEM is not set
417# CONFIG_CASSINI is not set
403# CONFIG_NET_VENDOR_3COM is not set 418# CONFIG_NET_VENDOR_3COM is not set
404 419
405# 420#
@@ -575,6 +590,7 @@ CONFIG_LEGACY_PTY_COUNT=256
575# TPM devices 590# TPM devices
576# 591#
577# CONFIG_TCG_TPM is not set 592# CONFIG_TCG_TPM is not set
593# CONFIG_TELCLOCK is not set
578 594
579# 595#
580# I2C support 596# I2C support
@@ -634,6 +650,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
634# CONFIG_USB is not set 650# CONFIG_USB is not set
635 651
636# 652#
653# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
654#
655
656#
637# USB Gadget Support 657# USB Gadget Support
638# 658#
639# CONFIG_USB_GADGET is not set 659# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 5bc885b72d14..1ac6c9b7ef96 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:48 2005 4# Fri Nov 11 13:29:30 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -262,6 +281,10 @@ CONFIG_TCP_CONG_BIC=y
262# CONFIG_NET_DIVERT is not set 281# CONFIG_NET_DIVERT is not set
263# CONFIG_ECONET is not set 282# CONFIG_ECONET is not set
264# CONFIG_WAN_ROUTER is not set 283# CONFIG_WAN_ROUTER is not set
284
285#
286# QoS and/or fair queueing
287#
265# CONFIG_NET_SCHED is not set 288# CONFIG_NET_SCHED is not set
266# CONFIG_NET_CLS_ROUTE is not set 289# CONFIG_NET_CLS_ROUTE is not set
267 290
@@ -318,16 +341,7 @@ CONFIG_BLK_DEV_LOOP=m
318# CONFIG_BLK_DEV_NBD is not set 341# CONFIG_BLK_DEV_NBD is not set
319# CONFIG_BLK_DEV_RAM is not set 342# CONFIG_BLK_DEV_RAM is not set
320CONFIG_BLK_DEV_RAM_COUNT=16 343CONFIG_BLK_DEV_RAM_COUNT=16
321# CONFIG_LBD is not set
322# CONFIG_CDROM_PKTCDVD is not set 344# CONFIG_CDROM_PKTCDVD is not set
323
324#
325# IO Schedulers
326#
327CONFIG_IOSCHED_NOOP=y
328CONFIG_IOSCHED_AS=y
329CONFIG_IOSCHED_DEADLINE=y
330CONFIG_IOSCHED_CFQ=y
331# CONFIG_ATA_OVER_ETH is not set 345# CONFIG_ATA_OVER_ETH is not set
332 346
333# 347#
@@ -365,12 +379,13 @@ CONFIG_SCSI_CONSTANTS=y
365# 379#
366CONFIG_SCSI_SPI_ATTRS=m 380CONFIG_SCSI_SPI_ATTRS=m
367# CONFIG_SCSI_FC_ATTRS is not set 381# CONFIG_SCSI_FC_ATTRS is not set
368# CONFIG_SCSI_ISCSI_ATTRS is not set 382CONFIG_SCSI_ISCSI_ATTRS=m
369CONFIG_SCSI_SAS_ATTRS=m 383CONFIG_SCSI_SAS_ATTRS=m
370 384
371# 385#
372# SCSI low-level drivers 386# SCSI low-level drivers
373# 387#
388CONFIG_ISCSI_TCP=m
374CONFIG_SCSI_DECNCR=y 389CONFIG_SCSI_DECNCR=y
375# CONFIG_SCSI_DECSII is not set 390# CONFIG_SCSI_DECSII is not set
376# CONFIG_SCSI_SATA is not set 391# CONFIG_SCSI_SATA is not set
@@ -407,7 +422,6 @@ CONFIG_NETDEVICES=y
407# PHY device support 422# PHY device support
408# 423#
409CONFIG_PHYLIB=m 424CONFIG_PHYLIB=m
410CONFIG_PHYCONTROL=y
411 425
412# 426#
413# MII PHY device drivers 427# MII PHY device drivers
@@ -491,10 +505,7 @@ CONFIG_ZS=y
491# 505#
492# Non-8250 serial port support 506# Non-8250 serial port support
493# 507#
494CONFIG_SERIAL_DZ=y 508# CONFIG_SERIAL_DZ is not set
495CONFIG_SERIAL_DZ_CONSOLE=y
496CONFIG_SERIAL_CORE=y
497CONFIG_SERIAL_CORE_CONSOLE=y
498CONFIG_UNIX98_PTYS=y 509CONFIG_UNIX98_PTYS=y
499CONFIG_LEGACY_PTYS=y 510CONFIG_LEGACY_PTYS=y
500CONFIG_LEGACY_PTY_COUNT=256 511CONFIG_LEGACY_PTY_COUNT=256
@@ -520,6 +531,7 @@ CONFIG_RTC=y
520# 531#
521# TPM devices 532# TPM devices
522# 533#
534# CONFIG_TELCLOCK is not set
523 535
524# 536#
525# I2C support 537# I2C support
@@ -562,15 +574,14 @@ CONFIG_FB=y
562CONFIG_FB_CFB_FILLRECT=y 574CONFIG_FB_CFB_FILLRECT=y
563CONFIG_FB_CFB_COPYAREA=y 575CONFIG_FB_CFB_COPYAREA=y
564CONFIG_FB_CFB_IMAGEBLIT=y 576CONFIG_FB_CFB_IMAGEBLIT=y
565CONFIG_FB_SOFT_CURSOR=y
566# CONFIG_FB_MACMODES is not set 577# CONFIG_FB_MACMODES is not set
567# CONFIG_FB_MODE_HELPERS is not set 578# CONFIG_FB_MODE_HELPERS is not set
568# CONFIG_FB_TILEBLITTING is not set 579# CONFIG_FB_TILEBLITTING is not set
580# CONFIG_FB_S1D13XXX is not set
569# CONFIG_FB_PMAG_AA is not set 581# CONFIG_FB_PMAG_AA is not set
570CONFIG_FB_PMAG_BA=y 582CONFIG_FB_PMAG_BA=y
571CONFIG_FB_PMAGB_B=y 583CONFIG_FB_PMAGB_B=y
572# CONFIG_FB_MAXINE is not set 584# CONFIG_FB_MAXINE is not set
573# CONFIG_FB_S1D13XXX is not set
574# CONFIG_FB_VIRTUAL is not set 585# CONFIG_FB_VIRTUAL is not set
575 586
576# 587#
@@ -595,6 +606,10 @@ CONFIG_LOGO_DEC_CLUT224=y
595# CONFIG_USB_ARCH_HAS_OHCI is not set 606# CONFIG_USB_ARCH_HAS_OHCI is not set
596 607
597# 608#
609# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
610#
611
612#
598# USB Gadget Support 613# USB Gadget Support
599# 614#
600# CONFIG_USB_GADGET is not set 615# CONFIG_USB_GADGET is not set
@@ -746,6 +761,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
746# CONFIG_DEBUG_KOBJECT is not set 761# CONFIG_DEBUG_KOBJECT is not set
747# CONFIG_DEBUG_INFO is not set 762# CONFIG_DEBUG_INFO is not set
748# CONFIG_DEBUG_FS is not set 763# CONFIG_DEBUG_FS is not set
764# CONFIG_DEBUG_VM is not set
765# CONFIG_RCU_TORTURE_TEST is not set
749CONFIG_CROSSCOMPILE=y 766CONFIG_CROSSCOMPILE=y
750CONFIG_CMDLINE="" 767CONFIG_CMDLINE=""
751# CONFIG_DEBUG_STACK_USAGE is not set 768# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index c0d06ea5566c..a89d2f66cdfa 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:51 2005 4# Mon Nov 7 23:05:15 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -262,6 +281,10 @@ CONFIG_TCP_CONG_BIC=y
262# CONFIG_NET_DIVERT is not set 281# CONFIG_NET_DIVERT is not set
263# CONFIG_ECONET is not set 282# CONFIG_ECONET is not set
264# CONFIG_WAN_ROUTER is not set 283# CONFIG_WAN_ROUTER is not set
284
285#
286# QoS and/or fair queueing
287#
265# CONFIG_NET_SCHED is not set 288# CONFIG_NET_SCHED is not set
266# CONFIG_NET_CLS_ROUTE is not set 289# CONFIG_NET_CLS_ROUTE is not set
267 290
@@ -317,16 +340,7 @@ CONFIG_CONNECTOR=m
317# CONFIG_BLK_DEV_NBD is not set 340# CONFIG_BLK_DEV_NBD is not set
318# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
319CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
320# CONFIG_LBD is not set
321# CONFIG_CDROM_PKTCDVD is not set 343# CONFIG_CDROM_PKTCDVD is not set
322
323#
324# IO Schedulers
325#
326CONFIG_IOSCHED_NOOP=y
327CONFIG_IOSCHED_AS=y
328CONFIG_IOSCHED_DEADLINE=y
329CONFIG_IOSCHED_CFQ=y
330# CONFIG_ATA_OVER_ETH is not set 344# CONFIG_ATA_OVER_ETH is not set
331 345
332# 346#
@@ -403,7 +417,6 @@ CONFIG_NETDEVICES=y
403# PHY device support 417# PHY device support
404# 418#
405CONFIG_PHYLIB=m 419CONFIG_PHYLIB=m
406CONFIG_PHYCONTROL=y
407 420
408# 421#
409# MII PHY device drivers 422# MII PHY device drivers
@@ -427,7 +440,6 @@ CONFIG_NET_ETHERNET=y
427# CONFIG_HP100 is not set 440# CONFIG_HP100 is not set
428# CONFIG_NET_ISA is not set 441# CONFIG_NET_ISA is not set
429# CONFIG_NET_PCI is not set 442# CONFIG_NET_PCI is not set
430# CONFIG_NET_POCKET is not set
431 443
432# 444#
433# Ethernet (1000 Mbit) 445# Ethernet (1000 Mbit)
@@ -552,6 +564,7 @@ CONFIG_WATCHDOG=y
552# CONFIG_WDT is not set 564# CONFIG_WDT is not set
553# CONFIG_RTC is not set 565# CONFIG_RTC is not set
554# CONFIG_GEN_RTC is not set 566# CONFIG_GEN_RTC is not set
567# CONFIG_RTC_VR41XX is not set
555# CONFIG_DTLK is not set 568# CONFIG_DTLK is not set
556# CONFIG_R3964 is not set 569# CONFIG_R3964 is not set
557 570
@@ -564,6 +577,7 @@ CONFIG_GPIO_VR41XX=y
564# 577#
565# TPM devices 578# TPM devices
566# 579#
580# CONFIG_TELCLOCK is not set
567 581
568# 582#
569# I2C support 583# I2C support
@@ -623,6 +637,10 @@ CONFIG_DUMMY_CONSOLE=y
623# CONFIG_USB_ARCH_HAS_OHCI is not set 637# CONFIG_USB_ARCH_HAS_OHCI is not set
624 638
625# 639#
640# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
641#
642
643#
626# USB Gadget Support 644# USB Gadget Support
627# 645#
628# CONFIG_USB_GADGET is not set 646# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index f1309d84d2fe..e6c3c27f41fe 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:54 2005 4# Wed Nov 9 11:05:12 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_KMOD is not set 57# CONFIG_KMOD is not set
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
@@ -267,6 +286,10 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 286# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 287# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 288# CONFIG_WAN_ROUTER is not set
289
290#
291# QoS and/or fair queueing
292#
270# CONFIG_NET_SCHED is not set 293# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set 294# CONFIG_NET_CLS_ROUTE is not set
272 295
@@ -326,18 +349,9 @@ CONFIG_CONNECTOR=m
326# CONFIG_BLK_DEV_SX8 is not set 349# CONFIG_BLK_DEV_SX8 is not set
327# CONFIG_BLK_DEV_RAM is not set 350# CONFIG_BLK_DEV_RAM is not set
328CONFIG_BLK_DEV_RAM_COUNT=16 351CONFIG_BLK_DEV_RAM_COUNT=16
329# CONFIG_LBD is not set
330CONFIG_CDROM_PKTCDVD=m 352CONFIG_CDROM_PKTCDVD=m
331CONFIG_CDROM_PKTCDVD_BUFFERS=8 353CONFIG_CDROM_PKTCDVD_BUFFERS=8
332# CONFIG_CDROM_PKTCDVD_WCACHE is not set 354# CONFIG_CDROM_PKTCDVD_WCACHE is not set
333
334#
335# IO Schedulers
336#
337CONFIG_IOSCHED_NOOP=y
338CONFIG_IOSCHED_AS=y
339CONFIG_IOSCHED_DEADLINE=y
340CONFIG_IOSCHED_CFQ=y
341CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
342 356
343# 357#
@@ -389,7 +403,6 @@ CONFIG_NETDEVICES=y
389# PHY device support 403# PHY device support
390# 404#
391CONFIG_PHYLIB=m 405CONFIG_PHYLIB=m
392CONFIG_PHYCONTROL=y
393 406
394# 407#
395# MII PHY device drivers 408# MII PHY device drivers
@@ -407,6 +420,7 @@ CONFIG_NET_ETHERNET=y
407# CONFIG_MII is not set 420# CONFIG_MII is not set
408# CONFIG_HAPPYMEAL is not set 421# CONFIG_HAPPYMEAL is not set
409# CONFIG_SUNGEM is not set 422# CONFIG_SUNGEM is not set
423# CONFIG_CASSINI is not set
410# CONFIG_NET_VENDOR_3COM is not set 424# CONFIG_NET_VENDOR_3COM is not set
411 425
412# 426#
@@ -464,6 +478,7 @@ CONFIG_PPP_ASYNC=y
464# CONFIG_PPP_SYNC_TTY is not set 478# CONFIG_PPP_SYNC_TTY is not set
465# CONFIG_PPP_DEFLATE is not set 479# CONFIG_PPP_DEFLATE is not set
466# CONFIG_PPP_BSDCOMP is not set 480# CONFIG_PPP_BSDCOMP is not set
481CONFIG_PPP_MPPE=m
467# CONFIG_PPPOE is not set 482# CONFIG_PPPOE is not set
468# CONFIG_SLIP is not set 483# CONFIG_SLIP is not set
469# CONFIG_SHAPER is not set 484# CONFIG_SHAPER is not set
@@ -569,6 +584,7 @@ CONFIG_LEGACY_PTY_COUNT=256
569# TPM devices 584# TPM devices
570# 585#
571# CONFIG_TCG_TPM is not set 586# CONFIG_TCG_TPM is not set
587# CONFIG_TELCLOCK is not set
572 588
573# 589#
574# I2C support 590# I2C support
@@ -628,6 +644,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
628# CONFIG_USB is not set 644# CONFIG_USB is not set
629 645
630# 646#
647# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
648#
649
650#
631# USB Gadget Support 651# USB Gadget Support
632# 652#
633# CONFIG_USB_GADGET is not set 653# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig
index 8ac55b7acc01..52ca6bf5be66 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:57 2005 4# Mon Nov 7 23:05:22 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_KMOD is not set 57# CONFIG_KMOD is not set
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -185,6 +203,7 @@ CONFIG_FLATMEM_MANUAL=y
185CONFIG_FLATMEM=y 203CONFIG_FLATMEM=y
186CONFIG_FLAT_NODE_MEM_MAP=y 204CONFIG_FLAT_NODE_MEM_MAP=y
187# CONFIG_SPARSEMEM_STATIC is not set 205# CONFIG_SPARSEMEM_STATIC is not set
206CONFIG_SPLIT_PTLOCK_CPUS=4
188CONFIG_PREEMPT_NONE=y 207CONFIG_PREEMPT_NONE=y
189# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
190# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
@@ -269,6 +288,10 @@ CONFIG_TCP_CONG_BIC=y
269# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
270# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
271# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
291
292#
293# QoS and/or fair queueing
294#
272# CONFIG_NET_SCHED is not set 295# CONFIG_NET_SCHED is not set
273# CONFIG_NET_CLS_ROUTE is not set 296# CONFIG_NET_CLS_ROUTE is not set
274 297
@@ -323,18 +346,9 @@ CONFIG_CONNECTOR=m
323# CONFIG_BLK_DEV_NBD is not set 346# CONFIG_BLK_DEV_NBD is not set
324# CONFIG_BLK_DEV_RAM is not set 347# CONFIG_BLK_DEV_RAM is not set
325CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
326# CONFIG_LBD is not set
327CONFIG_CDROM_PKTCDVD=m 349CONFIG_CDROM_PKTCDVD=m
328CONFIG_CDROM_PKTCDVD_BUFFERS=8 350CONFIG_CDROM_PKTCDVD_BUFFERS=8
329# CONFIG_CDROM_PKTCDVD_WCACHE is not set 351# CONFIG_CDROM_PKTCDVD_WCACHE is not set
330
331#
332# IO Schedulers
333#
334CONFIG_IOSCHED_NOOP=y
335CONFIG_IOSCHED_AS=y
336CONFIG_IOSCHED_DEADLINE=y
337CONFIG_IOSCHED_CFQ=y
338CONFIG_ATA_OVER_ETH=m 352CONFIG_ATA_OVER_ETH=m
339 353
340# 354#
@@ -379,7 +393,6 @@ CONFIG_NETDEVICES=y
379# PHY device support 393# PHY device support
380# 394#
381CONFIG_PHYLIB=m 395CONFIG_PHYLIB=m
382CONFIG_PHYCONTROL=y
383 396
384# 397#
385# MII PHY device drivers 398# MII PHY device drivers
@@ -518,6 +531,7 @@ CONFIG_LEGACY_PTY_COUNT=256
518# 531#
519# TPM devices 532# TPM devices
520# 533#
534# CONFIG_TELCLOCK is not set
521 535
522# 536#
523# I2C support 537# I2C support
@@ -576,6 +590,10 @@ CONFIG_DUMMY_CONSOLE=y
576# CONFIG_USB_ARCH_HAS_OHCI is not set 590# CONFIG_USB_ARCH_HAS_OHCI is not set
577 591
578# 592#
593# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
594#
595
596#
579# USB Gadget Support 597# USB Gadget Support
580# 598#
581# CONFIG_USB_GADGET is not set 599# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 3ae3838f283c..79e3fe7e2d54 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:01 2005 4# Thu Nov 10 13:38:41 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -187,6 +205,7 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 205CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 206CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 207# CONFIG_SPARSEMEM_STATIC is not set
208CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PREEMPT_NONE is not set 209# CONFIG_PREEMPT_NONE is not set
191CONFIG_PREEMPT_VOLUNTARY=y 210CONFIG_PREEMPT_VOLUNTARY=y
192# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
@@ -292,6 +311,10 @@ CONFIG_INET6_TUNNEL=m
292CONFIG_IPV6_TUNNEL=m 311CONFIG_IPV6_TUNNEL=m
293CONFIG_NETFILTER=y 312CONFIG_NETFILTER=y
294# CONFIG_NETFILTER_DEBUG is not set 313# CONFIG_NETFILTER_DEBUG is not set
314
315#
316# Core Netfilter Configuration
317#
295CONFIG_NETFILTER_NETLINK=m 318CONFIG_NETFILTER_NETLINK=m
296CONFIG_NETFILTER_NETLINK_QUEUE=m 319CONFIG_NETFILTER_NETLINK_QUEUE=m
297CONFIG_NETFILTER_NETLINK_LOG=m 320CONFIG_NETFILTER_NETLINK_LOG=m
@@ -345,6 +368,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
345CONFIG_IP_NF_TARGET_LOG=m 368CONFIG_IP_NF_TARGET_LOG=m
346CONFIG_IP_NF_TARGET_ULOG=m 369CONFIG_IP_NF_TARGET_ULOG=m
347CONFIG_IP_NF_TARGET_TCPMSS=m 370CONFIG_IP_NF_TARGET_TCPMSS=m
371CONFIG_IP_NF_TARGET_NFQUEUE=m
348CONFIG_IP_NF_NAT=m 372CONFIG_IP_NF_NAT=m
349CONFIG_IP_NF_NAT_NEEDED=y 373CONFIG_IP_NF_NAT_NEEDED=y
350CONFIG_IP_NF_TARGET_MASQUERADE=m 374CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -393,6 +417,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
393CONFIG_IP6_NF_FILTER=m 417CONFIG_IP6_NF_FILTER=m
394CONFIG_IP6_NF_TARGET_LOG=m 418CONFIG_IP6_NF_TARGET_LOG=m
395CONFIG_IP6_NF_TARGET_REJECT=m 419CONFIG_IP6_NF_TARGET_REJECT=m
420CONFIG_IP6_NF_TARGET_NFQUEUE=m
396CONFIG_IP6_NF_MANGLE=m 421CONFIG_IP6_NF_MANGLE=m
397CONFIG_IP6_NF_TARGET_MARK=m 422CONFIG_IP6_NF_TARGET_MARK=m
398CONFIG_IP6_NF_TARGET_HL=m 423CONFIG_IP6_NF_TARGET_HL=m
@@ -424,10 +449,18 @@ CONFIG_SCTP_HMAC_MD5=y
424CONFIG_NET_DIVERT=y 449CONFIG_NET_DIVERT=y
425# CONFIG_ECONET is not set 450# CONFIG_ECONET is not set
426# CONFIG_WAN_ROUTER is not set 451# CONFIG_WAN_ROUTER is not set
452
453#
454# QoS and/or fair queueing
455#
427CONFIG_NET_SCHED=y 456CONFIG_NET_SCHED=y
428# CONFIG_NET_SCH_CLK_JIFFIES is not set 457# CONFIG_NET_SCH_CLK_JIFFIES is not set
429CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 458CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
430# CONFIG_NET_SCH_CLK_CPU is not set 459# CONFIG_NET_SCH_CLK_CPU is not set
460
461#
462# Queueing/Scheduling
463#
431CONFIG_NET_SCH_CBQ=m 464CONFIG_NET_SCH_CBQ=m
432CONFIG_NET_SCH_HTB=m 465CONFIG_NET_SCH_HTB=m
433CONFIG_NET_SCH_HFSC=m 466CONFIG_NET_SCH_HFSC=m
@@ -440,8 +473,10 @@ CONFIG_NET_SCH_GRED=m
440CONFIG_NET_SCH_DSMARK=m 473CONFIG_NET_SCH_DSMARK=m
441CONFIG_NET_SCH_NETEM=m 474CONFIG_NET_SCH_NETEM=m
442CONFIG_NET_SCH_INGRESS=m 475CONFIG_NET_SCH_INGRESS=m
443CONFIG_NET_QOS=y 476
444CONFIG_NET_ESTIMATOR=y 477#
478# Classification
479#
445CONFIG_NET_CLS=y 480CONFIG_NET_CLS=y
446CONFIG_NET_CLS_BASIC=m 481CONFIG_NET_CLS_BASIC=m
447CONFIG_NET_CLS_TCINDEX=m 482CONFIG_NET_CLS_TCINDEX=m
@@ -450,13 +485,14 @@ CONFIG_NET_CLS_ROUTE=y
450CONFIG_NET_CLS_FW=m 485CONFIG_NET_CLS_FW=m
451CONFIG_NET_CLS_U32=m 486CONFIG_NET_CLS_U32=m
452# CONFIG_CLS_U32_PERF is not set 487# CONFIG_CLS_U32_PERF is not set
453# CONFIG_NET_CLS_IND is not set
454# CONFIG_CLS_U32_MARK is not set 488# CONFIG_CLS_U32_MARK is not set
455CONFIG_NET_CLS_RSVP=m 489CONFIG_NET_CLS_RSVP=m
456CONFIG_NET_CLS_RSVP6=m 490CONFIG_NET_CLS_RSVP6=m
457# CONFIG_NET_EMATCH is not set 491# CONFIG_NET_EMATCH is not set
458# CONFIG_NET_CLS_ACT is not set 492# CONFIG_NET_CLS_ACT is not set
459CONFIG_NET_CLS_POLICE=y 493CONFIG_NET_CLS_POLICE=y
494# CONFIG_NET_CLS_IND is not set
495CONFIG_NET_ESTIMATOR=y
460 496
461# 497#
462# Network testing 498# Network testing
@@ -509,18 +545,9 @@ CONFIG_CONNECTOR=m
509# CONFIG_BLK_DEV_NBD is not set 545# CONFIG_BLK_DEV_NBD is not set
510# CONFIG_BLK_DEV_RAM is not set 546# CONFIG_BLK_DEV_RAM is not set
511CONFIG_BLK_DEV_RAM_COUNT=16 547CONFIG_BLK_DEV_RAM_COUNT=16
512# CONFIG_LBD is not set
513CONFIG_CDROM_PKTCDVD=m 548CONFIG_CDROM_PKTCDVD=m
514CONFIG_CDROM_PKTCDVD_BUFFERS=8 549CONFIG_CDROM_PKTCDVD_BUFFERS=8
515# CONFIG_CDROM_PKTCDVD_WCACHE is not set 550# CONFIG_CDROM_PKTCDVD_WCACHE is not set
516
517#
518# IO Schedulers
519#
520CONFIG_IOSCHED_NOOP=y
521CONFIG_IOSCHED_AS=y
522CONFIG_IOSCHED_DEADLINE=y
523CONFIG_IOSCHED_CFQ=y
524CONFIG_ATA_OVER_ETH=m 551CONFIG_ATA_OVER_ETH=m
525 552
526# 553#
@@ -564,6 +591,7 @@ CONFIG_SCSI_SAS_ATTRS=m
564# 591#
565# SCSI low-level drivers 592# SCSI low-level drivers
566# 593#
594CONFIG_ISCSI_TCP=m
567CONFIG_SGIWD93_SCSI=y 595CONFIG_SGIWD93_SCSI=y
568# CONFIG_SCSI_SATA is not set 596# CONFIG_SCSI_SATA is not set
569# CONFIG_SCSI_DEBUG is not set 597# CONFIG_SCSI_DEBUG is not set
@@ -599,7 +627,6 @@ CONFIG_TUN=m
599# PHY device support 627# PHY device support
600# 628#
601CONFIG_PHYLIB=m 629CONFIG_PHYLIB=m
602CONFIG_PHYCONTROL=y
603 630
604# 631#
605# MII PHY device drivers 632# MII PHY device drivers
@@ -752,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256
752# 779#
753# TPM devices 780# TPM devices
754# 781#
782# CONFIG_TELCLOCK is not set
755 783
756# 784#
757# I2C support 785# I2C support
@@ -821,6 +849,10 @@ CONFIG_LOGO_SGI_CLUT224=y
821# CONFIG_USB_ARCH_HAS_OHCI is not set 849# CONFIG_USB_ARCH_HAS_OHCI is not set
822 850
823# 851#
852# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
853#
854
855#
824# USB Gadget Support 856# USB Gadget Support
825# 857#
826# CONFIG_USB_GADGET is not set 858# CONFIG_USB_GADGET is not set
@@ -856,7 +888,7 @@ CONFIG_FS_MBCACHE=y
856CONFIG_FS_POSIX_ACL=y 888CONFIG_FS_POSIX_ACL=y
857CONFIG_XFS_FS=m 889CONFIG_XFS_FS=m
858CONFIG_XFS_EXPORT=y 890CONFIG_XFS_EXPORT=y
859CONFIG_XFS_QUOTA=m 891CONFIG_XFS_QUOTA=y
860CONFIG_XFS_SECURITY=y 892CONFIG_XFS_SECURITY=y
861# CONFIG_XFS_POSIX_ACL is not set 893# CONFIG_XFS_POSIX_ACL is not set
862# CONFIG_XFS_RT is not set 894# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index d962f61d5b98..72998ec35b0b 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:04 2005 4# Sun Nov 13 23:56:52 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -60,6 +60,23 @@ CONFIG_KMOD=y
60CONFIG_STOP_MACHINE=y 60CONFIG_STOP_MACHINE=y
61 61
62# 62#
63# Block layer
64#
65
66#
67# IO Schedulers
68#
69CONFIG_IOSCHED_NOOP=y
70CONFIG_IOSCHED_AS=y
71CONFIG_IOSCHED_DEADLINE=y
72CONFIG_IOSCHED_CFQ=y
73CONFIG_DEFAULT_AS=y
74# CONFIG_DEFAULT_DEADLINE is not set
75# CONFIG_DEFAULT_CFQ is not set
76# CONFIG_DEFAULT_NOOP is not set
77CONFIG_DEFAULT_IOSCHED="anticipatory"
78
79#
63# Machine selection 80# Machine selection
64# 81#
65# CONFIG_MIPS_MTX1 is not set 82# CONFIG_MIPS_MTX1 is not set
@@ -186,6 +203,7 @@ CONFIG_DISCONTIGMEM=y
186CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
187CONFIG_NEED_MULTIPLE_NODES=y 204CONFIG_NEED_MULTIPLE_NODES=y
188# CONFIG_SPARSEMEM_STATIC is not set 205# CONFIG_SPARSEMEM_STATIC is not set
206CONFIG_SPLIT_PTLOCK_CPUS=4
189CONFIG_SMP=y 207CONFIG_SMP=y
190CONFIG_NR_CPUS=64 208CONFIG_NR_CPUS=64
191CONFIG_PREEMPT_NONE=y 209CONFIG_PREEMPT_NONE=y
@@ -284,10 +302,18 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_NET_DIVERT is not set 302# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set 303# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 304# CONFIG_WAN_ROUTER is not set
305
306#
307# QoS and/or fair queueing
308#
287CONFIG_NET_SCHED=y 309CONFIG_NET_SCHED=y
288# CONFIG_NET_SCH_CLK_JIFFIES is not set 310# CONFIG_NET_SCH_CLK_JIFFIES is not set
289CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 311CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
290# CONFIG_NET_SCH_CLK_CPU is not set 312# CONFIG_NET_SCH_CLK_CPU is not set
313
314#
315# Queueing/Scheduling
316#
291CONFIG_NET_SCH_CBQ=m 317CONFIG_NET_SCH_CBQ=m
292CONFIG_NET_SCH_HTB=m 318CONFIG_NET_SCH_HTB=m
293CONFIG_NET_SCH_HFSC=m 319CONFIG_NET_SCH_HFSC=m
@@ -300,8 +326,10 @@ CONFIG_NET_SCH_GRED=m
300CONFIG_NET_SCH_DSMARK=m 326CONFIG_NET_SCH_DSMARK=m
301CONFIG_NET_SCH_NETEM=m 327CONFIG_NET_SCH_NETEM=m
302CONFIG_NET_SCH_INGRESS=m 328CONFIG_NET_SCH_INGRESS=m
303CONFIG_NET_QOS=y 329
304CONFIG_NET_ESTIMATOR=y 330#
331# Classification
332#
305CONFIG_NET_CLS=y 333CONFIG_NET_CLS=y
306CONFIG_NET_CLS_BASIC=m 334CONFIG_NET_CLS_BASIC=m
307CONFIG_NET_CLS_TCINDEX=m 335CONFIG_NET_CLS_TCINDEX=m
@@ -310,12 +338,13 @@ CONFIG_NET_CLS_ROUTE=y
310CONFIG_NET_CLS_FW=m 338CONFIG_NET_CLS_FW=m
311CONFIG_NET_CLS_U32=m 339CONFIG_NET_CLS_U32=m
312# CONFIG_CLS_U32_PERF is not set 340# CONFIG_CLS_U32_PERF is not set
313# CONFIG_NET_CLS_IND is not set
314CONFIG_NET_CLS_RSVP=m 341CONFIG_NET_CLS_RSVP=m
315CONFIG_NET_CLS_RSVP6=m 342CONFIG_NET_CLS_RSVP6=m
316# CONFIG_NET_EMATCH is not set 343# CONFIG_NET_EMATCH is not set
317# CONFIG_NET_CLS_ACT is not set 344# CONFIG_NET_CLS_ACT is not set
318CONFIG_NET_CLS_POLICE=y 345CONFIG_NET_CLS_POLICE=y
346# CONFIG_NET_CLS_IND is not set
347CONFIG_NET_ESTIMATOR=y
319 348
320# 349#
321# Network testing 350# Network testing
@@ -377,14 +406,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
377CONFIG_CDROM_PKTCDVD=m 406CONFIG_CDROM_PKTCDVD=m
378CONFIG_CDROM_PKTCDVD_BUFFERS=8 407CONFIG_CDROM_PKTCDVD_BUFFERS=8
379# CONFIG_CDROM_PKTCDVD_WCACHE is not set 408# CONFIG_CDROM_PKTCDVD_WCACHE is not set
380
381#
382# IO Schedulers
383#
384CONFIG_IOSCHED_NOOP=y
385CONFIG_IOSCHED_AS=y
386CONFIG_IOSCHED_DEADLINE=y
387CONFIG_IOSCHED_CFQ=y
388CONFIG_ATA_OVER_ETH=m 409CONFIG_ATA_OVER_ETH=m
389 410
390# 411#
@@ -428,6 +449,7 @@ CONFIG_SCSI_SAS_ATTRS=m
428# 449#
429# SCSI low-level drivers 450# SCSI low-level drivers
430# 451#
452CONFIG_ISCSI_TCP=m
431# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 453# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
432# CONFIG_SCSI_3W_9XXX is not set 454# CONFIG_SCSI_3W_9XXX is not set
433# CONFIG_SCSI_ACARD is not set 455# CONFIG_SCSI_ACARD is not set
@@ -437,6 +459,7 @@ CONFIG_SCSI_SAS_ATTRS=m
437# CONFIG_SCSI_AIC79XX is not set 459# CONFIG_SCSI_AIC79XX is not set
438# CONFIG_MEGARAID_NEWGEN is not set 460# CONFIG_MEGARAID_NEWGEN is not set
439# CONFIG_MEGARAID_LEGACY is not set 461# CONFIG_MEGARAID_LEGACY is not set
462# CONFIG_MEGARAID_SAS is not set
440# CONFIG_SCSI_SATA is not set 463# CONFIG_SCSI_SATA is not set
441# CONFIG_SCSI_DMX3191D is not set 464# CONFIG_SCSI_DMX3191D is not set
442# CONFIG_SCSI_FUTURE_DOMAIN is not set 465# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -447,7 +470,6 @@ CONFIG_SCSI_SAS_ATTRS=m
447# CONFIG_SCSI_IPR is not set 470# CONFIG_SCSI_IPR is not set
448# CONFIG_SCSI_QLOGIC_FC is not set 471# CONFIG_SCSI_QLOGIC_FC is not set
449CONFIG_SCSI_QLOGIC_1280=y 472CONFIG_SCSI_QLOGIC_1280=y
450CONFIG_SCSI_QLOGIC_1280_1040=y
451CONFIG_SCSI_QLA2XXX=y 473CONFIG_SCSI_QLA2XXX=y
452# CONFIG_SCSI_QLA21XX is not set 474# CONFIG_SCSI_QLA21XX is not set
453# CONFIG_SCSI_QLA22XX is not set 475# CONFIG_SCSI_QLA22XX is not set
@@ -487,6 +509,7 @@ CONFIG_DM_MULTIPATH_EMC=m
487# CONFIG_FUSION is not set 509# CONFIG_FUSION is not set
488# CONFIG_FUSION_SPI is not set 510# CONFIG_FUSION_SPI is not set
489# CONFIG_FUSION_FC is not set 511# CONFIG_FUSION_FC is not set
512# CONFIG_FUSION_SAS is not set
490 513
491# 514#
492# IEEE 1394 (FireWire) support 515# IEEE 1394 (FireWire) support
@@ -516,7 +539,6 @@ CONFIG_NETDEVICES=y
516# PHY device support 539# PHY device support
517# 540#
518CONFIG_PHYLIB=m 541CONFIG_PHYLIB=m
519CONFIG_PHYCONTROL=y
520 542
521# 543#
522# MII PHY device drivers 544# MII PHY device drivers
@@ -532,8 +554,12 @@ CONFIG_CICADA_PHY=m
532# 554#
533CONFIG_NET_ETHERNET=y 555CONFIG_NET_ETHERNET=y
534CONFIG_MII=y 556CONFIG_MII=y
557CONFIG_SGI_IOC3_ETH=y
558CONFIG_SGI_IOC3_ETH_HW_RX_CSUM=y
559CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y
535# CONFIG_HAPPYMEAL is not set 560# CONFIG_HAPPYMEAL is not set
536# CONFIG_SUNGEM is not set 561# CONFIG_SUNGEM is not set
562# CONFIG_CASSINI is not set
537# CONFIG_NET_VENDOR_3COM is not set 563# CONFIG_NET_VENDOR_3COM is not set
538 564
539# 565#
@@ -672,6 +698,7 @@ CONFIG_SGI_IP27_RTC=y
672# TPM devices 698# TPM devices
673# 699#
674# CONFIG_TCG_TPM is not set 700# CONFIG_TCG_TPM is not set
701# CONFIG_TELCLOCK is not set
675 702
676# 703#
677# I2C support 704# I2C support
@@ -725,6 +752,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
725# CONFIG_USB is not set 752# CONFIG_USB is not set
726 753
727# 754#
755# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
756#
757
758#
728# USB Gadget Support 759# USB Gadget Support
729# 760#
730# CONFIG_USB_GADGET is not set 761# CONFIG_USB_GADGET is not set
@@ -762,7 +793,7 @@ CONFIG_FS_MBCACHE=y
762# CONFIG_JFS_FS is not set 793# CONFIG_JFS_FS is not set
763CONFIG_FS_POSIX_ACL=y 794CONFIG_FS_POSIX_ACL=y
764CONFIG_XFS_FS=m 795CONFIG_XFS_FS=m
765CONFIG_XFS_QUOTA=m 796CONFIG_XFS_QUOTA=y
766CONFIG_XFS_SECURITY=y 797CONFIG_XFS_SECURITY=y
767CONFIG_XFS_POSIX_ACL=y 798CONFIG_XFS_POSIX_ACL=y
768# CONFIG_XFS_RT is not set 799# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index bf8fb95b21dc..955e30f1b1ad 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:07 2005 4# Mon Nov 7 23:05:32 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -52,6 +52,23 @@ CONFIG_BASE_SMALL=0
52# CONFIG_MODULES is not set 52# CONFIG_MODULES is not set
53 53
54# 54#
55# Block layer
56#
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
55# Machine selection 72# Machine selection
56# 73#
57# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_PREEMPT_NONE is not set 200# CONFIG_PREEMPT_NONE is not set
183CONFIG_PREEMPT_VOLUNTARY=y 201CONFIG_PREEMPT_VOLUNTARY=y
184# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -271,6 +289,10 @@ CONFIG_TCP_CONG_BIC=y
271# CONFIG_NET_DIVERT is not set 289# CONFIG_NET_DIVERT is not set
272# CONFIG_ECONET is not set 290# CONFIG_ECONET is not set
273# CONFIG_WAN_ROUTER is not set 291# CONFIG_WAN_ROUTER is not set
292
293#
294# QoS and/or fair queueing
295#
274# CONFIG_NET_SCHED is not set 296# CONFIG_NET_SCHED is not set
275# CONFIG_NET_CLS_ROUTE is not set 297# CONFIG_NET_CLS_ROUTE is not set
276 298
@@ -302,6 +324,7 @@ CONFIG_FW_LOADER=y
302# Connector - unified userspace <-> kernelspace linker 324# Connector - unified userspace <-> kernelspace linker
303# 325#
304CONFIG_CONNECTOR=y 326CONFIG_CONNECTOR=y
327CONFIG_PROC_EVENTS=y
305 328
306# 329#
307# Memory Technology Devices (MTD) 330# Memory Technology Devices (MTD)
@@ -334,14 +357,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
334CONFIG_CDROM_PKTCDVD=y 357CONFIG_CDROM_PKTCDVD=y
335CONFIG_CDROM_PKTCDVD_BUFFERS=8 358CONFIG_CDROM_PKTCDVD_BUFFERS=8
336# CONFIG_CDROM_PKTCDVD_WCACHE is not set 359# CONFIG_CDROM_PKTCDVD_WCACHE is not set
337
338#
339# IO Schedulers
340#
341CONFIG_IOSCHED_NOOP=y
342CONFIG_IOSCHED_AS=y
343CONFIG_IOSCHED_DEADLINE=y
344CONFIG_IOSCHED_CFQ=y
345CONFIG_ATA_OVER_ETH=y 360CONFIG_ATA_OVER_ETH=y
346 361
347# 362#
@@ -385,6 +400,7 @@ CONFIG_SCSI_SAS_ATTRS=y
385# 400#
386# SCSI low-level drivers 401# SCSI low-level drivers
387# 402#
403# CONFIG_ISCSI_TCP is not set
388# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 404# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
389# CONFIG_SCSI_3W_9XXX is not set 405# CONFIG_SCSI_3W_9XXX is not set
390# CONFIG_SCSI_ACARD is not set 406# CONFIG_SCSI_ACARD is not set
@@ -399,6 +415,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
399# CONFIG_SCSI_AIC79XX is not set 415# CONFIG_SCSI_AIC79XX is not set
400# CONFIG_MEGARAID_NEWGEN is not set 416# CONFIG_MEGARAID_NEWGEN is not set
401# CONFIG_MEGARAID_LEGACY is not set 417# CONFIG_MEGARAID_LEGACY is not set
418# CONFIG_MEGARAID_SAS is not set
402# CONFIG_SCSI_SATA is not set 419# CONFIG_SCSI_SATA is not set
403# CONFIG_SCSI_DMX3191D is not set 420# CONFIG_SCSI_DMX3191D is not set
404# CONFIG_SCSI_FUTURE_DOMAIN is not set 421# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -432,6 +449,7 @@ CONFIG_SCSI_QLA2XXX=y
432# CONFIG_FUSION is not set 449# CONFIG_FUSION is not set
433# CONFIG_FUSION_SPI is not set 450# CONFIG_FUSION_SPI is not set
434# CONFIG_FUSION_FC is not set 451# CONFIG_FUSION_FC is not set
452# CONFIG_FUSION_SAS is not set
435 453
436# 454#
437# IEEE 1394 (FireWire) support 455# IEEE 1394 (FireWire) support
@@ -461,7 +479,6 @@ CONFIG_NETDEVICES=y
461# PHY device support 479# PHY device support
462# 480#
463CONFIG_PHYLIB=y 481CONFIG_PHYLIB=y
464CONFIG_PHYCONTROL=y
465 482
466# 483#
467# MII PHY device drivers 484# MII PHY device drivers
@@ -480,6 +497,7 @@ CONFIG_NET_ETHERNET=y
480CONFIG_SGI_O2MACE_ETH=y 497CONFIG_SGI_O2MACE_ETH=y
481# CONFIG_HAPPYMEAL is not set 498# CONFIG_HAPPYMEAL is not set
482# CONFIG_SUNGEM is not set 499# CONFIG_SUNGEM is not set
500# CONFIG_CASSINI is not set
483# CONFIG_NET_VENDOR_3COM is not set 501# CONFIG_NET_VENDOR_3COM is not set
484 502
485# 503#
@@ -637,6 +655,7 @@ CONFIG_LEGACY_PTY_COUNT=256
637# TPM devices 655# TPM devices
638# 656#
639# CONFIG_TCG_TPM is not set 657# CONFIG_TCG_TPM is not set
658# CONFIG_TELCLOCK is not set
640 659
641# 660#
642# I2C support 661# I2C support
@@ -696,6 +715,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
696# CONFIG_USB is not set 715# CONFIG_USB is not set
697 716
698# 717#
718# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
719#
720
721#
699# USB Gadget Support 722# USB Gadget Support
700# 723#
701# CONFIG_USB_GADGET is not set 724# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig
index 0940771bafb1..f631385217db 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:09 2005 4# Thu Nov 10 13:42:45 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
@@ -266,6 +285,10 @@ CONFIG_TCP_CONG_BIC=y
266# CONFIG_NET_DIVERT is not set 285# CONFIG_NET_DIVERT is not set
267# CONFIG_ECONET is not set 286# CONFIG_ECONET is not set
268# CONFIG_WAN_ROUTER is not set 287# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
269# CONFIG_NET_SCHED is not set 292# CONFIG_NET_SCHED is not set
270# CONFIG_NET_CLS_ROUTE is not set 293# CONFIG_NET_CLS_ROUTE is not set
271 294
@@ -315,6 +338,7 @@ CONFIG_MTD_CHAR=y
315# CONFIG_FTL is not set 338# CONFIG_FTL is not set
316# CONFIG_NFTL is not set 339# CONFIG_NFTL is not set
317# CONFIG_INFTL is not set 340# CONFIG_INFTL is not set
341# CONFIG_RFD_FTL is not set
318 342
319# 343#
320# RAM/ROM/Flash chip drivers 344# RAM/ROM/Flash chip drivers
@@ -373,6 +397,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
373# CONFIG_MTD_NAND is not set 397# CONFIG_MTD_NAND is not set
374 398
375# 399#
400# OneNAND Flash Device Drivers
401#
402# CONFIG_MTD_ONENAND is not set
403
404#
376# Parallel port support 405# Parallel port support
377# 406#
378# CONFIG_PARPORT is not set 407# CONFIG_PARPORT is not set
@@ -390,18 +419,9 @@ CONFIG_BLK_DEV_LOOP=y
390# CONFIG_BLK_DEV_NBD is not set 419# CONFIG_BLK_DEV_NBD is not set
391# CONFIG_BLK_DEV_RAM is not set 420# CONFIG_BLK_DEV_RAM is not set
392CONFIG_BLK_DEV_RAM_COUNT=16 421CONFIG_BLK_DEV_RAM_COUNT=16
393# CONFIG_LBD is not set
394CONFIG_CDROM_PKTCDVD=m 422CONFIG_CDROM_PKTCDVD=m
395CONFIG_CDROM_PKTCDVD_BUFFERS=8 423CONFIG_CDROM_PKTCDVD_BUFFERS=8
396# CONFIG_CDROM_PKTCDVD_WCACHE is not set 424# CONFIG_CDROM_PKTCDVD_WCACHE is not set
397
398#
399# IO Schedulers
400#
401CONFIG_IOSCHED_NOOP=y
402CONFIG_IOSCHED_AS=y
403CONFIG_IOSCHED_DEADLINE=y
404CONFIG_IOSCHED_CFQ=y
405CONFIG_ATA_OVER_ETH=m 425CONFIG_ATA_OVER_ETH=m
406 426
407# 427#
@@ -467,7 +487,6 @@ CONFIG_NETDEVICES=y
467# PHY device support 487# PHY device support
468# 488#
469CONFIG_PHYLIB=m 489CONFIG_PHYLIB=m
470CONFIG_PHYCONTROL=y
471 490
472# 491#
473# MII PHY device drivers 492# MII PHY device drivers
@@ -609,6 +628,7 @@ CONFIG_LEGACY_PTY_COUNT=256
609# 628#
610# TPM devices 629# TPM devices
611# 630#
631# CONFIG_TELCLOCK is not set
612 632
613# 633#
614# I2C support 634# I2C support
@@ -669,10 +689,10 @@ CONFIG_SOUND=y
669# Open Sound System 689# Open Sound System
670# 690#
671CONFIG_SOUND_PRIME=y 691CONFIG_SOUND_PRIME=y
692# CONFIG_OBSOLETE_OSS_DRIVER is not set
672CONFIG_SOUND_IT8172=y 693CONFIG_SOUND_IT8172=y
673# CONFIG_SOUND_MSNDCLAS is not set 694# CONFIG_SOUND_MSNDCLAS is not set
674# CONFIG_SOUND_MSNDPIN is not set 695# CONFIG_SOUND_MSNDPIN is not set
675# CONFIG_SOUND_AD1980 is not set
676 696
677# 697#
678# USB support 698# USB support
@@ -681,6 +701,10 @@ CONFIG_SOUND_IT8172=y
681# CONFIG_USB_ARCH_HAS_OHCI is not set 701# CONFIG_USB_ARCH_HAS_OHCI is not set
682 702
683# 703#
704# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
705#
706
707#
684# USB Gadget Support 708# USB Gadget Support
685# 709#
686# CONFIG_USB_GADGET is not set 710# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig
index 9ba61dfc490d..8d94ac753e78 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:12 2005 4# Mon Nov 7 23:05:38 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -265,6 +284,10 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
268# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set 292# CONFIG_NET_CLS_ROUTE is not set
270 293
@@ -324,18 +347,9 @@ CONFIG_CONNECTOR=m
324# CONFIG_BLK_DEV_SX8 is not set 347# CONFIG_BLK_DEV_SX8 is not set
325# CONFIG_BLK_DEV_RAM is not set 348# CONFIG_BLK_DEV_RAM is not set
326CONFIG_BLK_DEV_RAM_COUNT=16 349CONFIG_BLK_DEV_RAM_COUNT=16
327# CONFIG_LBD is not set
328CONFIG_CDROM_PKTCDVD=m 350CONFIG_CDROM_PKTCDVD=m
329CONFIG_CDROM_PKTCDVD_BUFFERS=8 351CONFIG_CDROM_PKTCDVD_BUFFERS=8
330# CONFIG_CDROM_PKTCDVD_WCACHE is not set 352# CONFIG_CDROM_PKTCDVD_WCACHE is not set
331
332#
333# IO Schedulers
334#
335CONFIG_IOSCHED_NOOP=y
336CONFIG_IOSCHED_AS=y
337CONFIG_IOSCHED_DEADLINE=y
338CONFIG_IOSCHED_CFQ=y
339CONFIG_ATA_OVER_ETH=m 353CONFIG_ATA_OVER_ETH=m
340 354
341# 355#
@@ -409,7 +423,6 @@ CONFIG_NETDEVICES=y
409# PHY device support 423# PHY device support
410# 424#
411CONFIG_PHYLIB=m 425CONFIG_PHYLIB=m
412CONFIG_PHYCONTROL=y
413 426
414# 427#
415# MII PHY device drivers 428# MII PHY device drivers
@@ -427,6 +440,7 @@ CONFIG_NET_ETHERNET=y
427# CONFIG_MII is not set 440# CONFIG_MII is not set
428# CONFIG_HAPPYMEAL is not set 441# CONFIG_HAPPYMEAL is not set
429# CONFIG_SUNGEM is not set 442# CONFIG_SUNGEM is not set
443# CONFIG_CASSINI is not set
430# CONFIG_NET_VENDOR_3COM is not set 444# CONFIG_NET_VENDOR_3COM is not set
431 445
432# 446#
@@ -539,7 +553,8 @@ CONFIG_VT_CONSOLE=y
539CONFIG_HW_CONSOLE=y 553CONFIG_HW_CONSOLE=y
540# CONFIG_SERIAL_NONSTANDARD is not set 554# CONFIG_SERIAL_NONSTANDARD is not set
541CONFIG_QTRONIX_KEYBOARD=y 555CONFIG_QTRONIX_KEYBOARD=y
542# CONFIG_IT8172_SCR0 is not set 556CONFIG_IT8172_SCR0=y
557CONFIG_IT8172_SCR1=y
543 558
544# 559#
545# Serial drivers 560# Serial drivers
@@ -583,6 +598,7 @@ CONFIG_RTC=y
583# TPM devices 598# TPM devices
584# 599#
585# CONFIG_TCG_TPM is not set 600# CONFIG_TCG_TPM is not set
601# CONFIG_TELCLOCK is not set
586 602
587# 603#
588# I2C support 604# I2C support
@@ -642,6 +658,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
642# CONFIG_USB is not set 658# CONFIG_USB is not set
643 659
644# 660#
661# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
662#
663
664#
645# USB Gadget Support 665# USB Gadget Support
646# 666#
647# CONFIG_USB_GADGET is not set 667# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 21b2b8042f91..a8b4c9a9a63b 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:14 2005 4# Mon Nov 7 23:05:41 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -55,6 +55,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
55CONFIG_KMOD=y 55CONFIG_KMOD=y
56 56
57# 57#
58# Block layer
59#
60# CONFIG_LBD is not set
61
62#
63# IO Schedulers
64#
65CONFIG_IOSCHED_NOOP=y
66CONFIG_IOSCHED_AS=y
67CONFIG_IOSCHED_DEADLINE=y
68CONFIG_IOSCHED_CFQ=y
69CONFIG_DEFAULT_AS=y
70# CONFIG_DEFAULT_DEADLINE is not set
71# CONFIG_DEFAULT_CFQ is not set
72# CONFIG_DEFAULT_NOOP is not set
73CONFIG_DEFAULT_IOSCHED="anticipatory"
74
75#
58# Machine selection 76# Machine selection
59# 77#
60# CONFIG_MIPS_MTX1 is not set 78# CONFIG_MIPS_MTX1 is not set
@@ -184,6 +202,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_FLATMEM=y 202CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 204# CONFIG_SPARSEMEM_STATIC is not set
205CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_SMP is not set 206# CONFIG_SMP is not set
188CONFIG_PREEMPT_NONE=y 207CONFIG_PREEMPT_NONE=y
189# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
@@ -259,6 +278,10 @@ CONFIG_IPV6_TUNNEL=m
259# CONFIG_LLC2 is not set 278# CONFIG_LLC2 is not set
260# CONFIG_IPX is not set 279# CONFIG_IPX is not set
261# CONFIG_ATALK is not set 280# CONFIG_ATALK is not set
281
282#
283# QoS and/or fair queueing
284#
262# CONFIG_NET_SCHED is not set 285# CONFIG_NET_SCHED is not set
263# CONFIG_NET_CLS_ROUTE is not set 286# CONFIG_NET_CLS_ROUTE is not set
264 287
@@ -317,18 +340,9 @@ CONFIG_CONNECTOR=m
317# CONFIG_BLK_DEV_SX8 is not set 340# CONFIG_BLK_DEV_SX8 is not set
318# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
319CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
320# CONFIG_LBD is not set
321CONFIG_CDROM_PKTCDVD=m 343CONFIG_CDROM_PKTCDVD=m
322CONFIG_CDROM_PKTCDVD_BUFFERS=8 344CONFIG_CDROM_PKTCDVD_BUFFERS=8
323# CONFIG_CDROM_PKTCDVD_WCACHE is not set 345# CONFIG_CDROM_PKTCDVD_WCACHE is not set
324
325#
326# IO Schedulers
327#
328CONFIG_IOSCHED_NOOP=y
329CONFIG_IOSCHED_AS=y
330CONFIG_IOSCHED_DEADLINE=y
331CONFIG_IOSCHED_CFQ=y
332CONFIG_ATA_OVER_ETH=m 346CONFIG_ATA_OVER_ETH=m
333 347
334# 348#
@@ -380,7 +394,6 @@ CONFIG_NETDEVICES=y
380# PHY device support 394# PHY device support
381# 395#
382CONFIG_PHYLIB=m 396CONFIG_PHYLIB=m
383CONFIG_PHYCONTROL=y
384 397
385# 398#
386# MII PHY device drivers 399# MII PHY device drivers
@@ -398,6 +411,7 @@ CONFIG_NET_ETHERNET=y
398CONFIG_MII=y 411CONFIG_MII=y
399# CONFIG_HAPPYMEAL is not set 412# CONFIG_HAPPYMEAL is not set
400# CONFIG_SUNGEM is not set 413# CONFIG_SUNGEM is not set
414# CONFIG_CASSINI is not set
401# CONFIG_NET_VENDOR_3COM is not set 415# CONFIG_NET_VENDOR_3COM is not set
402 416
403# 417#
@@ -592,6 +606,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
592# CONFIG_USB is not set 606# CONFIG_USB is not set
593 607
594# 608#
609# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
610#
611
612#
595# USB Gadget Support 613# USB Gadget Support
596# 614#
597# CONFIG_USB_GADGET is not set 615# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 6390a753e80b..c0ac5c793ec7 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:17 2005 4# Mon Nov 7 23:05:44 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -168,6 +186,7 @@ CONFIG_FLATMEM_MANUAL=y
168CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189CONFIG_SPLIT_PTLOCK_CPUS=4
171CONFIG_PREEMPT_NONE=y 190CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 191# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 192# CONFIG_PREEMPT is not set
@@ -256,6 +275,10 @@ CONFIG_TCP_CONG_BIC=y
256# CONFIG_NET_DIVERT is not set 275# CONFIG_NET_DIVERT is not set
257# CONFIG_ECONET is not set 276# CONFIG_ECONET is not set
258# CONFIG_WAN_ROUTER is not set 277# CONFIG_WAN_ROUTER is not set
278
279#
280# QoS and/or fair queueing
281#
259# CONFIG_NET_SCHED is not set 282# CONFIG_NET_SCHED is not set
260# CONFIG_NET_CLS_ROUTE is not set 283# CONFIG_NET_CLS_ROUTE is not set
261 284
@@ -287,6 +310,7 @@ CONFIG_FW_LOADER=y
287# Connector - unified userspace <-> kernelspace linker 310# Connector - unified userspace <-> kernelspace linker
288# 311#
289CONFIG_CONNECTOR=y 312CONFIG_CONNECTOR=y
313CONFIG_PROC_EVENTS=y
290 314
291# 315#
292# Memory Technology Devices (MTD) 316# Memory Technology Devices (MTD)
@@ -315,18 +339,9 @@ CONFIG_CONNECTOR=y
315# CONFIG_BLK_DEV_SX8 is not set 339# CONFIG_BLK_DEV_SX8 is not set
316# CONFIG_BLK_DEV_RAM is not set 340# CONFIG_BLK_DEV_RAM is not set
317CONFIG_BLK_DEV_RAM_COUNT=16 341CONFIG_BLK_DEV_RAM_COUNT=16
318# CONFIG_LBD is not set
319CONFIG_CDROM_PKTCDVD=y 342CONFIG_CDROM_PKTCDVD=y
320CONFIG_CDROM_PKTCDVD_BUFFERS=8 343CONFIG_CDROM_PKTCDVD_BUFFERS=8
321# CONFIG_CDROM_PKTCDVD_WCACHE is not set 344# CONFIG_CDROM_PKTCDVD_WCACHE is not set
322
323#
324# IO Schedulers
325#
326CONFIG_IOSCHED_NOOP=y
327CONFIG_IOSCHED_AS=y
328CONFIG_IOSCHED_DEADLINE=y
329CONFIG_IOSCHED_CFQ=y
330CONFIG_ATA_OVER_ETH=y 345CONFIG_ATA_OVER_ETH=y
331 346
332# 347#
@@ -378,7 +393,6 @@ CONFIG_NETDEVICES=y
378# PHY device support 393# PHY device support
379# 394#
380CONFIG_PHYLIB=y 395CONFIG_PHYLIB=y
381CONFIG_PHYCONTROL=y
382 396
383# 397#
384# MII PHY device drivers 398# MII PHY device drivers
@@ -396,6 +410,7 @@ CONFIG_NET_ETHERNET=y
396# CONFIG_MII is not set 410# CONFIG_MII is not set
397# CONFIG_HAPPYMEAL is not set 411# CONFIG_HAPPYMEAL is not set
398# CONFIG_SUNGEM is not set 412# CONFIG_SUNGEM is not set
413# CONFIG_CASSINI is not set
399# CONFIG_NET_VENDOR_3COM is not set 414# CONFIG_NET_VENDOR_3COM is not set
400 415
401# 416#
@@ -561,6 +576,7 @@ CONFIG_LEGACY_PTY_COUNT=256
561# TPM devices 576# TPM devices
562# 577#
563# CONFIG_TCG_TPM is not set 578# CONFIG_TCG_TPM is not set
579# CONFIG_TELCLOCK is not set
564 580
565# 581#
566# I2C support 582# I2C support
@@ -603,7 +619,6 @@ CONFIG_FB=y
603# CONFIG_FB_CFB_FILLRECT is not set 619# CONFIG_FB_CFB_FILLRECT is not set
604# CONFIG_FB_CFB_COPYAREA is not set 620# CONFIG_FB_CFB_COPYAREA is not set
605# CONFIG_FB_CFB_IMAGEBLIT is not set 621# CONFIG_FB_CFB_IMAGEBLIT is not set
606# CONFIG_FB_SOFT_CURSOR is not set
607# CONFIG_FB_MACMODES is not set 622# CONFIG_FB_MACMODES is not set
608# CONFIG_FB_MODE_HELPERS is not set 623# CONFIG_FB_MODE_HELPERS is not set
609# CONFIG_FB_TILEBLITTING is not set 624# CONFIG_FB_TILEBLITTING is not set
@@ -612,6 +627,7 @@ CONFIG_FB=y
612# CONFIG_FB_CYBER2000 is not set 627# CONFIG_FB_CYBER2000 is not set
613# CONFIG_FB_ASILIANT is not set 628# CONFIG_FB_ASILIANT is not set
614# CONFIG_FB_IMSTT is not set 629# CONFIG_FB_IMSTT is not set
630# CONFIG_FB_S1D13XXX is not set
615# CONFIG_FB_NVIDIA is not set 631# CONFIG_FB_NVIDIA is not set
616# CONFIG_FB_RIVA is not set 632# CONFIG_FB_RIVA is not set
617# CONFIG_FB_MATROX is not set 633# CONFIG_FB_MATROX is not set
@@ -628,7 +644,6 @@ CONFIG_FB=y
628# CONFIG_FB_SMIVGX is not set 644# CONFIG_FB_SMIVGX is not set
629# CONFIG_FB_CYBLA is not set 645# CONFIG_FB_CYBLA is not set
630# CONFIG_FB_TRIDENT is not set 646# CONFIG_FB_TRIDENT is not set
631# CONFIG_FB_S1D13XXX is not set
632# CONFIG_FB_VIRTUAL is not set 647# CONFIG_FB_VIRTUAL is not set
633 648
634# 649#
@@ -657,6 +672,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
657# CONFIG_USB is not set 672# CONFIG_USB is not set
658 673
659# 674#
675# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
676#
677
678#
660# USB Gadget Support 679# USB Gadget Support
661# 680#
662# CONFIG_USB_GADGET is not set 681# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 03cd0ca6e639..f2bd620ff0fa 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:19 2005 4# Mon Nov 7 23:05:47 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -184,6 +202,7 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 202CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 204# CONFIG_SPARSEMEM_STATIC is not set
205CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
@@ -267,6 +286,10 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 286# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 287# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 288# CONFIG_WAN_ROUTER is not set
289
290#
291# QoS and/or fair queueing
292#
270# CONFIG_NET_SCHED is not set 293# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set 294# CONFIG_NET_CLS_ROUTE is not set
272 295
@@ -317,6 +340,7 @@ CONFIG_MTD_BLOCK=y
317# CONFIG_FTL is not set 340# CONFIG_FTL is not set
318# CONFIG_NFTL is not set 341# CONFIG_NFTL is not set
319# CONFIG_INFTL is not set 342# CONFIG_INFTL is not set
343# CONFIG_RFD_FTL is not set
320 344
321# 345#
322# RAM/ROM/Flash chip drivers 346# RAM/ROM/Flash chip drivers
@@ -375,6 +399,11 @@ CONFIG_MTD_LASAT=y
375# CONFIG_MTD_NAND is not set 399# CONFIG_MTD_NAND is not set
376 400
377# 401#
402# OneNAND Flash Device Drivers
403#
404# CONFIG_MTD_ONENAND is not set
405
406#
378# Parallel port support 407# Parallel port support
379# 408#
380# CONFIG_PARPORT is not set 409# CONFIG_PARPORT is not set
@@ -396,18 +425,9 @@ CONFIG_MTD_LASAT=y
396# CONFIG_BLK_DEV_SX8 is not set 425# CONFIG_BLK_DEV_SX8 is not set
397# CONFIG_BLK_DEV_RAM is not set 426# CONFIG_BLK_DEV_RAM is not set
398CONFIG_BLK_DEV_RAM_COUNT=16 427CONFIG_BLK_DEV_RAM_COUNT=16
399# CONFIG_LBD is not set
400CONFIG_CDROM_PKTCDVD=m 428CONFIG_CDROM_PKTCDVD=m
401CONFIG_CDROM_PKTCDVD_BUFFERS=8 429CONFIG_CDROM_PKTCDVD_BUFFERS=8
402# CONFIG_CDROM_PKTCDVD_WCACHE is not set 430# CONFIG_CDROM_PKTCDVD_WCACHE is not set
403
404#
405# IO Schedulers
406#
407CONFIG_IOSCHED_NOOP=y
408CONFIG_IOSCHED_AS=y
409CONFIG_IOSCHED_DEADLINE=y
410CONFIG_IOSCHED_CFQ=y
411CONFIG_ATA_OVER_ETH=m 431CONFIG_ATA_OVER_ETH=m
412 432
413# 433#
@@ -511,7 +531,6 @@ CONFIG_NETDEVICES=y
511# PHY device support 531# PHY device support
512# 532#
513CONFIG_PHYLIB=m 533CONFIG_PHYLIB=m
514CONFIG_PHYCONTROL=y
515 534
516# 535#
517# MII PHY device drivers 536# MII PHY device drivers
@@ -529,6 +548,7 @@ CONFIG_NET_ETHERNET=y
529# CONFIG_MII is not set 548# CONFIG_MII is not set
530# CONFIG_HAPPYMEAL is not set 549# CONFIG_HAPPYMEAL is not set
531# CONFIG_SUNGEM is not set 550# CONFIG_SUNGEM is not set
551# CONFIG_CASSINI is not set
532# CONFIG_NET_VENDOR_3COM is not set 552# CONFIG_NET_VENDOR_3COM is not set
533 553
534# 554#
@@ -684,6 +704,7 @@ CONFIG_LEGACY_PTY_COUNT=256
684# TPM devices 704# TPM devices
685# 705#
686# CONFIG_TCG_TPM is not set 706# CONFIG_TCG_TPM is not set
707# CONFIG_TELCLOCK is not set
687 708
688# 709#
689# I2C support 710# I2C support
@@ -743,6 +764,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
743# CONFIG_USB is not set 764# CONFIG_USB is not set
744 765
745# 766#
767# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
768#
769
770#
746# USB Gadget Support 771# USB Gadget Support
747# 772#
748# CONFIG_USB_GADGET is not set 773# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 2acdec959dd0..e48e1de442b4 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:22 2005 4# Thu Nov 10 13:42:55 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -197,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
197CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
198CONFIG_FLAT_NODE_MEM_MAP=y 216CONFIG_FLAT_NODE_MEM_MAP=y
199# CONFIG_SPARSEMEM_STATIC is not set 217# CONFIG_SPARSEMEM_STATIC is not set
218CONFIG_SPLIT_PTLOCK_CPUS=4
200CONFIG_PREEMPT_NONE=y 219CONFIG_PREEMPT_NONE=y
201# CONFIG_PREEMPT_VOLUNTARY is not set 220# CONFIG_PREEMPT_VOLUNTARY is not set
202# CONFIG_PREEMPT is not set 221# CONFIG_PREEMPT is not set
@@ -315,6 +334,10 @@ CONFIG_IPV6_TUNNEL=m
315CONFIG_NETFILTER=y 334CONFIG_NETFILTER=y
316# CONFIG_NETFILTER_DEBUG is not set 335# CONFIG_NETFILTER_DEBUG is not set
317CONFIG_BRIDGE_NETFILTER=y 336CONFIG_BRIDGE_NETFILTER=y
337
338#
339# Core Netfilter Configuration
340#
318CONFIG_NETFILTER_NETLINK=m 341CONFIG_NETFILTER_NETLINK=m
319CONFIG_NETFILTER_NETLINK_QUEUE=m 342CONFIG_NETFILTER_NETLINK_QUEUE=m
320CONFIG_NETFILTER_NETLINK_LOG=m 343CONFIG_NETFILTER_NETLINK_LOG=m
@@ -369,6 +392,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
369CONFIG_IP_NF_TARGET_LOG=m 392CONFIG_IP_NF_TARGET_LOG=m
370CONFIG_IP_NF_TARGET_ULOG=m 393CONFIG_IP_NF_TARGET_ULOG=m
371CONFIG_IP_NF_TARGET_TCPMSS=m 394CONFIG_IP_NF_TARGET_TCPMSS=m
395CONFIG_IP_NF_TARGET_NFQUEUE=m
372CONFIG_IP_NF_NAT=m 396CONFIG_IP_NF_NAT=m
373CONFIG_IP_NF_NAT_NEEDED=y 397CONFIG_IP_NF_NAT_NEEDED=y
374CONFIG_IP_NF_TARGET_MASQUERADE=m 398CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -418,6 +442,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
418CONFIG_IP6_NF_FILTER=m 442CONFIG_IP6_NF_FILTER=m
419CONFIG_IP6_NF_TARGET_LOG=m 443CONFIG_IP6_NF_TARGET_LOG=m
420CONFIG_IP6_NF_TARGET_REJECT=m 444CONFIG_IP6_NF_TARGET_REJECT=m
445CONFIG_IP6_NF_TARGET_NFQUEUE=m
421CONFIG_IP6_NF_MANGLE=m 446CONFIG_IP6_NF_MANGLE=m
422CONFIG_IP6_NF_TARGET_MARK=m 447CONFIG_IP6_NF_TARGET_MARK=m
423CONFIG_IP6_NF_TARGET_HL=m 448CONFIG_IP6_NF_TARGET_HL=m
@@ -478,10 +503,18 @@ CONFIG_IPDDP_DECAP=y
478CONFIG_NET_DIVERT=y 503CONFIG_NET_DIVERT=y
479# CONFIG_ECONET is not set 504# CONFIG_ECONET is not set
480# CONFIG_WAN_ROUTER is not set 505# CONFIG_WAN_ROUTER is not set
506
507#
508# QoS and/or fair queueing
509#
481CONFIG_NET_SCHED=y 510CONFIG_NET_SCHED=y
482CONFIG_NET_SCH_CLK_JIFFIES=y 511CONFIG_NET_SCH_CLK_JIFFIES=y
483# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 512# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
484# CONFIG_NET_SCH_CLK_CPU is not set 513# CONFIG_NET_SCH_CLK_CPU is not set
514
515#
516# Queueing/Scheduling
517#
485CONFIG_NET_SCH_CBQ=m 518CONFIG_NET_SCH_CBQ=m
486CONFIG_NET_SCH_HTB=m 519CONFIG_NET_SCH_HTB=m
487CONFIG_NET_SCH_HFSC=m 520CONFIG_NET_SCH_HFSC=m
@@ -494,8 +527,10 @@ CONFIG_NET_SCH_GRED=m
494CONFIG_NET_SCH_DSMARK=m 527CONFIG_NET_SCH_DSMARK=m
495CONFIG_NET_SCH_NETEM=m 528CONFIG_NET_SCH_NETEM=m
496CONFIG_NET_SCH_INGRESS=m 529CONFIG_NET_SCH_INGRESS=m
497CONFIG_NET_QOS=y 530
498CONFIG_NET_ESTIMATOR=y 531#
532# Classification
533#
499CONFIG_NET_CLS=y 534CONFIG_NET_CLS=y
500CONFIG_NET_CLS_BASIC=m 535CONFIG_NET_CLS_BASIC=m
501CONFIG_NET_CLS_TCINDEX=m 536CONFIG_NET_CLS_TCINDEX=m
@@ -504,13 +539,14 @@ CONFIG_NET_CLS_ROUTE=y
504CONFIG_NET_CLS_FW=m 539CONFIG_NET_CLS_FW=m
505CONFIG_NET_CLS_U32=m 540CONFIG_NET_CLS_U32=m
506# CONFIG_CLS_U32_PERF is not set 541# CONFIG_CLS_U32_PERF is not set
507CONFIG_NET_CLS_IND=y
508# CONFIG_CLS_U32_MARK is not set 542# CONFIG_CLS_U32_MARK is not set
509CONFIG_NET_CLS_RSVP=m 543CONFIG_NET_CLS_RSVP=m
510CONFIG_NET_CLS_RSVP6=m 544CONFIG_NET_CLS_RSVP6=m
511# CONFIG_NET_EMATCH is not set 545# CONFIG_NET_EMATCH is not set
512# CONFIG_NET_CLS_ACT is not set 546# CONFIG_NET_CLS_ACT is not set
513CONFIG_NET_CLS_POLICE=y 547CONFIG_NET_CLS_POLICE=y
548CONFIG_NET_CLS_IND=y
549CONFIG_NET_ESTIMATOR=y
514 550
515# 551#
516# Network testing 552# Network testing
@@ -572,18 +608,9 @@ CONFIG_BLK_DEV_RAM=y
572CONFIG_BLK_DEV_RAM_COUNT=16 608CONFIG_BLK_DEV_RAM_COUNT=16
573CONFIG_BLK_DEV_RAM_SIZE=4096 609CONFIG_BLK_DEV_RAM_SIZE=4096
574# CONFIG_BLK_DEV_INITRD is not set 610# CONFIG_BLK_DEV_INITRD is not set
575# CONFIG_LBD is not set
576CONFIG_CDROM_PKTCDVD=m 611CONFIG_CDROM_PKTCDVD=m
577CONFIG_CDROM_PKTCDVD_BUFFERS=8 612CONFIG_CDROM_PKTCDVD_BUFFERS=8
578# CONFIG_CDROM_PKTCDVD_WCACHE is not set 613# CONFIG_CDROM_PKTCDVD_WCACHE is not set
579
580#
581# IO Schedulers
582#
583CONFIG_IOSCHED_NOOP=y
584CONFIG_IOSCHED_AS=y
585CONFIG_IOSCHED_DEADLINE=y
586CONFIG_IOSCHED_CFQ=y
587CONFIG_ATA_OVER_ETH=m 614CONFIG_ATA_OVER_ETH=m
588 615
589# 616#
@@ -680,6 +707,7 @@ CONFIG_SCSI_SAS_ATTRS=m
680# 707#
681# SCSI low-level drivers 708# SCSI low-level drivers
682# 709#
710CONFIG_ISCSI_TCP=m
683CONFIG_BLK_DEV_3W_XXXX_RAID=m 711CONFIG_BLK_DEV_3W_XXXX_RAID=m
684CONFIG_SCSI_3W_9XXX=m 712CONFIG_SCSI_3W_9XXX=m
685CONFIG_SCSI_ACARD=m 713CONFIG_SCSI_ACARD=m
@@ -695,6 +723,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
695# CONFIG_SCSI_DPT_I2O is not set 723# CONFIG_SCSI_DPT_I2O is not set
696# CONFIG_MEGARAID_NEWGEN is not set 724# CONFIG_MEGARAID_NEWGEN is not set
697# CONFIG_MEGARAID_LEGACY is not set 725# CONFIG_MEGARAID_LEGACY is not set
726# CONFIG_MEGARAID_SAS is not set
698# CONFIG_SCSI_SATA is not set 727# CONFIG_SCSI_SATA is not set
699# CONFIG_SCSI_DMX3191D is not set 728# CONFIG_SCSI_DMX3191D is not set
700# CONFIG_SCSI_FUTURE_DOMAIN is not set 729# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -745,6 +774,7 @@ CONFIG_DM_MULTIPATH_EMC=m
745# CONFIG_FUSION is not set 774# CONFIG_FUSION is not set
746# CONFIG_FUSION_SPI is not set 775# CONFIG_FUSION_SPI is not set
747# CONFIG_FUSION_FC is not set 776# CONFIG_FUSION_FC is not set
777# CONFIG_FUSION_SAS is not set
748 778
749# 779#
750# IEEE 1394 (FireWire) support 780# IEEE 1394 (FireWire) support
@@ -774,7 +804,6 @@ CONFIG_TUN=m
774# PHY device support 804# PHY device support
775# 805#
776CONFIG_PHYLIB=m 806CONFIG_PHYLIB=m
777CONFIG_PHYCONTROL=y
778 807
779# 808#
780# MII PHY device drivers 809# MII PHY device drivers
@@ -792,6 +821,7 @@ CONFIG_NET_ETHERNET=y
792CONFIG_MII=y 821CONFIG_MII=y
793# CONFIG_HAPPYMEAL is not set 822# CONFIG_HAPPYMEAL is not set
794# CONFIG_SUNGEM is not set 823# CONFIG_SUNGEM is not set
824# CONFIG_CASSINI is not set
795# CONFIG_NET_VENDOR_3COM is not set 825# CONFIG_NET_VENDOR_3COM is not set
796 826
797# 827#
@@ -967,6 +997,7 @@ CONFIG_RTC=y
967# TPM devices 997# TPM devices
968# 998#
969# CONFIG_TCG_TPM is not set 999# CONFIG_TCG_TPM is not set
1000# CONFIG_TELCLOCK is not set
970 1001
971# 1002#
972# I2C support 1003# I2C support
@@ -1026,6 +1057,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1026# CONFIG_USB is not set 1057# CONFIG_USB is not set
1027 1058
1028# 1059#
1060# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1061#
1062
1063#
1029# USB Gadget Support 1064# USB Gadget Support
1030# 1065#
1031# CONFIG_USB_GADGET is not set 1066# CONFIG_USB_GADGET is not set
@@ -1071,7 +1106,7 @@ CONFIG_JFS_SECURITY=y
1071CONFIG_FS_POSIX_ACL=y 1106CONFIG_FS_POSIX_ACL=y
1072CONFIG_XFS_FS=m 1107CONFIG_XFS_FS=m
1073CONFIG_XFS_EXPORT=y 1108CONFIG_XFS_EXPORT=y
1074CONFIG_XFS_QUOTA=m 1109CONFIG_XFS_QUOTA=y
1075CONFIG_XFS_SECURITY=y 1110CONFIG_XFS_SECURITY=y
1076CONFIG_XFS_POSIX_ACL=y 1111CONFIG_XFS_POSIX_ACL=y
1077# CONFIG_XFS_RT is not set 1112# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index fb9bdd9e3151..04abd1b3202b 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:25 2005 4# Mon Nov 7 23:05:55 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -184,6 +202,7 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 202CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 204# CONFIG_SPARSEMEM_STATIC is not set
205CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
@@ -281,10 +300,18 @@ CONFIG_SCTP_HMAC_MD5=y
281CONFIG_NET_DIVERT=y 300CONFIG_NET_DIVERT=y
282# CONFIG_ECONET is not set 301# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 302# CONFIG_WAN_ROUTER is not set
303
304#
305# QoS and/or fair queueing
306#
284CONFIG_NET_SCHED=y 307CONFIG_NET_SCHED=y
285CONFIG_NET_SCH_CLK_JIFFIES=y 308CONFIG_NET_SCH_CLK_JIFFIES=y
286# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 309# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
287# CONFIG_NET_SCH_CLK_CPU is not set 310# CONFIG_NET_SCH_CLK_CPU is not set
311
312#
313# Queueing/Scheduling
314#
288CONFIG_NET_SCH_CBQ=m 315CONFIG_NET_SCH_CBQ=m
289CONFIG_NET_SCH_HTB=m 316CONFIG_NET_SCH_HTB=m
290CONFIG_NET_SCH_HFSC=m 317CONFIG_NET_SCH_HFSC=m
@@ -297,8 +324,10 @@ CONFIG_NET_SCH_GRED=m
297CONFIG_NET_SCH_DSMARK=m 324CONFIG_NET_SCH_DSMARK=m
298CONFIG_NET_SCH_NETEM=m 325CONFIG_NET_SCH_NETEM=m
299CONFIG_NET_SCH_INGRESS=m 326CONFIG_NET_SCH_INGRESS=m
300CONFIG_NET_QOS=y 327
301CONFIG_NET_ESTIMATOR=y 328#
329# Classification
330#
302CONFIG_NET_CLS=y 331CONFIG_NET_CLS=y
303CONFIG_NET_CLS_BASIC=m 332CONFIG_NET_CLS_BASIC=m
304CONFIG_NET_CLS_TCINDEX=m 333CONFIG_NET_CLS_TCINDEX=m
@@ -311,6 +340,7 @@ CONFIG_NET_CLS_ROUTE=y
311# CONFIG_NET_EMATCH is not set 340# CONFIG_NET_EMATCH is not set
312# CONFIG_NET_CLS_ACT is not set 341# CONFIG_NET_CLS_ACT is not set
313# CONFIG_NET_CLS_POLICE is not set 342# CONFIG_NET_CLS_POLICE is not set
343CONFIG_NET_ESTIMATOR=y
314 344
315# 345#
316# Network testing 346# Network testing
@@ -361,16 +391,7 @@ CONFIG_BLK_DEV_LOOP=y
361CONFIG_BLK_DEV_NBD=y 391CONFIG_BLK_DEV_NBD=y
362# CONFIG_BLK_DEV_RAM is not set 392# CONFIG_BLK_DEV_RAM is not set
363CONFIG_BLK_DEV_RAM_COUNT=16 393CONFIG_BLK_DEV_RAM_COUNT=16
364# CONFIG_LBD is not set
365# CONFIG_CDROM_PKTCDVD is not set 394# CONFIG_CDROM_PKTCDVD is not set
366
367#
368# IO Schedulers
369#
370CONFIG_IOSCHED_NOOP=y
371CONFIG_IOSCHED_AS=y
372CONFIG_IOSCHED_DEADLINE=y
373CONFIG_IOSCHED_CFQ=y
374# CONFIG_ATA_OVER_ETH is not set 395# CONFIG_ATA_OVER_ETH is not set
375 396
376# 397#
@@ -537,6 +558,7 @@ CONFIG_LEGACY_PTY_COUNT=256
537# 558#
538# TPM devices 559# TPM devices
539# 560#
561# CONFIG_TELCLOCK is not set
540 562
541# 563#
542# I2C support 564# I2C support
@@ -589,6 +611,10 @@ CONFIG_LEGACY_PTY_COUNT=256
589# CONFIG_USB_ARCH_HAS_OHCI is not set 611# CONFIG_USB_ARCH_HAS_OHCI is not set
590 612
591# 613#
614# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
615#
616
617#
592# USB Gadget Support 618# USB Gadget Support
593# 619#
594# CONFIG_USB_GADGET is not set 620# CONFIG_USB_GADGET is not set
@@ -721,6 +747,8 @@ CONFIG_LOG_BUF_SHIFT=14
721# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 747# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
722# CONFIG_DEBUG_KOBJECT is not set 748# CONFIG_DEBUG_KOBJECT is not set
723CONFIG_DEBUG_INFO=y 749CONFIG_DEBUG_INFO=y
750# CONFIG_DEBUG_VM is not set
751# CONFIG_RCU_TORTURE_TEST is not set
724CONFIG_CROSSCOMPILE=y 752CONFIG_CROSSCOMPILE=y
725CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" 753CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
726# CONFIG_DEBUG_STACK_USAGE is not set 754# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index e2c082128532..46814be0ac38 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:28 2005 4# Tue Nov 15 11:12:01 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -182,6 +200,7 @@ CONFIG_FLATMEM_MANUAL=y
182CONFIG_FLATMEM=y 200CONFIG_FLATMEM=y
183CONFIG_FLAT_NODE_MEM_MAP=y 201CONFIG_FLAT_NODE_MEM_MAP=y
184# CONFIG_SPARSEMEM_STATIC is not set 202# CONFIG_SPARSEMEM_STATIC is not set
203CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_PREEMPT_NONE=y 204CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
@@ -210,7 +229,6 @@ CONFIG_PCMCIA_IOCTL=y
210# CONFIG_YENTA is not set 229# CONFIG_YENTA is not set
211# CONFIG_PD6729 is not set 230# CONFIG_PD6729 is not set
212# CONFIG_I82092 is not set 231# CONFIG_I82092 is not set
213# CONFIG_TCIC is not set
214CONFIG_PCMCIA_VRC4173=y 232CONFIG_PCMCIA_VRC4173=y
215 233
216# 234#
@@ -281,6 +299,10 @@ CONFIG_TCP_CONG_BIC=y
281# CONFIG_NET_DIVERT is not set 299# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 300# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 301# CONFIG_WAN_ROUTER is not set
302
303#
304# QoS and/or fair queueing
305#
284# CONFIG_NET_SCHED is not set 306# CONFIG_NET_SCHED is not set
285# CONFIG_NET_CLS_ROUTE is not set 307# CONFIG_NET_CLS_ROUTE is not set
286 308
@@ -341,16 +363,7 @@ CONFIG_CONNECTOR=m
341# CONFIG_BLK_DEV_UB is not set 363# CONFIG_BLK_DEV_UB is not set
342# CONFIG_BLK_DEV_RAM is not set 364# CONFIG_BLK_DEV_RAM is not set
343CONFIG_BLK_DEV_RAM_COUNT=16 365CONFIG_BLK_DEV_RAM_COUNT=16
344# CONFIG_LBD is not set
345# CONFIG_CDROM_PKTCDVD is not set 366# CONFIG_CDROM_PKTCDVD is not set
346
347#
348# IO Schedulers
349#
350CONFIG_IOSCHED_NOOP=y
351CONFIG_IOSCHED_AS=y
352CONFIG_IOSCHED_DEADLINE=y
353CONFIG_IOSCHED_CFQ=y
354CONFIG_ATA_OVER_ETH=m 367CONFIG_ATA_OVER_ETH=m
355 368
356# 369#
@@ -612,6 +625,7 @@ CONFIG_LEGACY_PTY_COUNT=256
612# CONFIG_WATCHDOG is not set 625# CONFIG_WATCHDOG is not set
613# CONFIG_RTC is not set 626# CONFIG_RTC is not set
614# CONFIG_GEN_RTC is not set 627# CONFIG_GEN_RTC is not set
628# CONFIG_RTC_VR41XX is not set
615# CONFIG_DTLK is not set 629# CONFIG_DTLK is not set
616# CONFIG_R3964 is not set 630# CONFIG_R3964 is not set
617# CONFIG_APPLICOM is not set 631# CONFIG_APPLICOM is not set
@@ -625,6 +639,8 @@ CONFIG_LEGACY_PTY_COUNT=256
625# PCMCIA character devices 639# PCMCIA character devices
626# 640#
627# CONFIG_SYNCLINK_CS is not set 641# CONFIG_SYNCLINK_CS is not set
642# CONFIG_CARDMAN_4000 is not set
643# CONFIG_CARDMAN_4040 is not set
628CONFIG_GPIO_VR41XX=y 644CONFIG_GPIO_VR41XX=y
629# CONFIG_RAW_DRIVER is not set 645# CONFIG_RAW_DRIVER is not set
630 646
@@ -632,6 +648,7 @@ CONFIG_GPIO_VR41XX=y
632# TPM devices 648# TPM devices
633# 649#
634# CONFIG_TCG_TPM is not set 650# CONFIG_TCG_TPM is not set
651# CONFIG_TELCLOCK is not set
635 652
636# 653#
637# I2C support 654# I2C support
@@ -713,12 +730,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
713# 730#
714# USB Device Class drivers 731# USB Device Class drivers
715# 732#
716# CONFIG_USB_BLUETOOTH_TTY is not set
717# CONFIG_USB_ACM is not set 733# CONFIG_USB_ACM is not set
718# CONFIG_USB_PRINTER is not set 734# CONFIG_USB_PRINTER is not set
719 735
720# 736#
721# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 737# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
738#
739
740#
741# may also be needed; see USB_STORAGE Help for more information
722# 742#
723# CONFIG_USB_STORAGE is not set 743# CONFIG_USB_STORAGE is not set
724 744
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index f18d05c2ca77..e12118c30db4 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:30 2005 4# Thu Nov 10 14:01:36 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODVERSIONS=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -187,6 +205,7 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 205CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 206CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 207# CONFIG_SPARSEMEM_STATIC is not set
208CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_SMP is not set 209# CONFIG_SMP is not set
191CONFIG_PREEMPT_NONE=y 210CONFIG_PREEMPT_NONE=y
192# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
@@ -265,15 +284,19 @@ CONFIG_IPV6=m
265# CONFIG_IPV6_TUNNEL is not set 284# CONFIG_IPV6_TUNNEL is not set
266CONFIG_NETFILTER=y 285CONFIG_NETFILTER=y
267# CONFIG_NETFILTER_DEBUG is not set 286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
268CONFIG_NETFILTER_NETLINK=m 291CONFIG_NETFILTER_NETLINK=m
269CONFIG_NETFILTER_NETLINK_QUEUE=m 292CONFIG_NETFILTER_NETLINK_QUEUE=m
270CONFIG_NETFILTER_NETLINK_LOG=m 293CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set
271 295
272# 296#
273# IP: Netfilter Configuration 297# IP: Netfilter Configuration
274# 298#
275# CONFIG_IP_NF_CONNTRACK is not set 299# CONFIG_IP_NF_CONNTRACK is not set
276CONFIG_IP_NF_PPTP=m
277# CONFIG_IP_NF_QUEUE is not set 300# CONFIG_IP_NF_QUEUE is not set
278# CONFIG_IP_NF_IPTABLES is not set 301# CONFIG_IP_NF_IPTABLES is not set
279# CONFIG_IP_NF_ARPTABLES is not set 302# CONFIG_IP_NF_ARPTABLES is not set
@@ -305,6 +328,10 @@ CONFIG_IP_NF_PPTP=m
305# CONFIG_NET_DIVERT is not set 328# CONFIG_NET_DIVERT is not set
306# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
307# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
331
332#
333# QoS and/or fair queueing
334#
308# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
309# CONFIG_NET_CLS_ROUTE is not set 336# CONFIG_NET_CLS_ROUTE is not set
310 337
@@ -365,16 +392,7 @@ CONFIG_BLK_DEV_LOOP=y
365# CONFIG_BLK_DEV_SX8 is not set 392# CONFIG_BLK_DEV_SX8 is not set
366# CONFIG_BLK_DEV_RAM is not set 393# CONFIG_BLK_DEV_RAM is not set
367CONFIG_BLK_DEV_RAM_COUNT=16 394CONFIG_BLK_DEV_RAM_COUNT=16
368# CONFIG_LBD is not set
369# CONFIG_CDROM_PKTCDVD is not set 395# CONFIG_CDROM_PKTCDVD is not set
370
371#
372# IO Schedulers
373#
374CONFIG_IOSCHED_NOOP=y
375CONFIG_IOSCHED_AS=y
376CONFIG_IOSCHED_DEADLINE=y
377CONFIG_IOSCHED_CFQ=y
378CONFIG_ATA_OVER_ETH=m 396CONFIG_ATA_OVER_ETH=m
379 397
380# 398#
@@ -411,12 +429,13 @@ CONFIG_SCSI_PROC_FS=y
411# 429#
412# CONFIG_SCSI_SPI_ATTRS is not set 430# CONFIG_SCSI_SPI_ATTRS is not set
413# CONFIG_SCSI_FC_ATTRS is not set 431# CONFIG_SCSI_FC_ATTRS is not set
414# CONFIG_SCSI_ISCSI_ATTRS is not set 432CONFIG_SCSI_ISCSI_ATTRS=m
415CONFIG_SCSI_SAS_ATTRS=m 433CONFIG_SCSI_SAS_ATTRS=m
416 434
417# 435#
418# SCSI low-level drivers 436# SCSI low-level drivers
419# 437#
438CONFIG_ISCSI_TCP=m
420# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 439# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
421# CONFIG_SCSI_3W_9XXX is not set 440# CONFIG_SCSI_3W_9XXX is not set
422# CONFIG_SCSI_ACARD is not set 441# CONFIG_SCSI_ACARD is not set
@@ -427,6 +446,7 @@ CONFIG_SCSI_SAS_ATTRS=m
427# CONFIG_SCSI_DPT_I2O is not set 446# CONFIG_SCSI_DPT_I2O is not set
428# CONFIG_MEGARAID_NEWGEN is not set 447# CONFIG_MEGARAID_NEWGEN is not set
429# CONFIG_MEGARAID_LEGACY is not set 448# CONFIG_MEGARAID_LEGACY is not set
449# CONFIG_MEGARAID_SAS is not set
430# CONFIG_SCSI_SATA is not set 450# CONFIG_SCSI_SATA is not set
431# CONFIG_SCSI_DMX3191D is not set 451# CONFIG_SCSI_DMX3191D is not set
432# CONFIG_SCSI_FUTURE_DOMAIN is not set 452# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -461,6 +481,7 @@ CONFIG_SCSI_QLA2XXX=m
461# CONFIG_FUSION is not set 481# CONFIG_FUSION is not set
462# CONFIG_FUSION_SPI is not set 482# CONFIG_FUSION_SPI is not set
463# CONFIG_FUSION_FC is not set 483# CONFIG_FUSION_FC is not set
484# CONFIG_FUSION_SAS is not set
464 485
465# 486#
466# IEEE 1394 (FireWire) support 487# IEEE 1394 (FireWire) support
@@ -490,7 +511,6 @@ CONFIG_TUN=m
490# PHY device support 511# PHY device support
491# 512#
492CONFIG_PHYLIB=m 513CONFIG_PHYLIB=m
493CONFIG_PHYCONTROL=y
494 514
495# 515#
496# MII PHY device drivers 516# MII PHY device drivers
@@ -508,6 +528,7 @@ CONFIG_NET_ETHERNET=y
508CONFIG_MII=y 528CONFIG_MII=y
509# CONFIG_HAPPYMEAL is not set 529# CONFIG_HAPPYMEAL is not set
510# CONFIG_SUNGEM is not set 530# CONFIG_SUNGEM is not set
531# CONFIG_CASSINI is not set
511# CONFIG_NET_VENDOR_3COM is not set 532# CONFIG_NET_VENDOR_3COM is not set
512 533
513# 534#
@@ -589,6 +610,7 @@ CONFIG_PPP_ASYNC=m
589CONFIG_PPP_SYNC_TTY=m 610CONFIG_PPP_SYNC_TTY=m
590CONFIG_PPP_DEFLATE=m 611CONFIG_PPP_DEFLATE=m
591# CONFIG_PPP_BSDCOMP is not set 612# CONFIG_PPP_BSDCOMP is not set
613CONFIG_PPP_MPPE=m
592CONFIG_PPPOE=m 614CONFIG_PPPOE=m
593# CONFIG_SLIP is not set 615# CONFIG_SLIP is not set
594# CONFIG_NET_FC is not set 616# CONFIG_NET_FC is not set
@@ -691,6 +713,7 @@ CONFIG_RTC=y
691# TPM devices 713# TPM devices
692# 714#
693# CONFIG_TCG_TPM is not set 715# CONFIG_TCG_TPM is not set
716# CONFIG_TELCLOCK is not set
694 717
695# 718#
696# I2C support 719# I2C support
@@ -733,7 +756,6 @@ CONFIG_FB=y
733# CONFIG_FB_CFB_FILLRECT is not set 756# CONFIG_FB_CFB_FILLRECT is not set
734# CONFIG_FB_CFB_COPYAREA is not set 757# CONFIG_FB_CFB_COPYAREA is not set
735# CONFIG_FB_CFB_IMAGEBLIT is not set 758# CONFIG_FB_CFB_IMAGEBLIT is not set
736# CONFIG_FB_SOFT_CURSOR is not set
737# CONFIG_FB_MACMODES is not set 759# CONFIG_FB_MACMODES is not set
738CONFIG_FB_MODE_HELPERS=y 760CONFIG_FB_MODE_HELPERS=y
739# CONFIG_FB_TILEBLITTING is not set 761# CONFIG_FB_TILEBLITTING is not set
@@ -742,6 +764,7 @@ CONFIG_FB_MODE_HELPERS=y
742# CONFIG_FB_CYBER2000 is not set 764# CONFIG_FB_CYBER2000 is not set
743# CONFIG_FB_ASILIANT is not set 765# CONFIG_FB_ASILIANT is not set
744# CONFIG_FB_IMSTT is not set 766# CONFIG_FB_IMSTT is not set
767# CONFIG_FB_S1D13XXX is not set
745# CONFIG_FB_NVIDIA is not set 768# CONFIG_FB_NVIDIA is not set
746# CONFIG_FB_RIVA is not set 769# CONFIG_FB_RIVA is not set
747# CONFIG_FB_MATROX is not set 770# CONFIG_FB_MATROX is not set
@@ -758,7 +781,6 @@ CONFIG_FB_MODE_HELPERS=y
758# CONFIG_FB_SMIVGX is not set 781# CONFIG_FB_SMIVGX is not set
759# CONFIG_FB_CYBLA is not set 782# CONFIG_FB_CYBLA is not set
760# CONFIG_FB_TRIDENT is not set 783# CONFIG_FB_TRIDENT is not set
761# CONFIG_FB_S1D13XXX is not set
762# CONFIG_FB_VIRTUAL is not set 784# CONFIG_FB_VIRTUAL is not set
763 785
764# 786#
@@ -767,6 +789,7 @@ CONFIG_FB_MODE_HELPERS=y
767# CONFIG_VGA_CONSOLE is not set 789# CONFIG_VGA_CONSOLE is not set
768CONFIG_DUMMY_CONSOLE=y 790CONFIG_DUMMY_CONSOLE=y
769CONFIG_FRAMEBUFFER_CONSOLE=y 791CONFIG_FRAMEBUFFER_CONSOLE=y
792# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
770# CONFIG_FONTS is not set 793# CONFIG_FONTS is not set
771CONFIG_FONT_8x8=y 794CONFIG_FONT_8x8=y
772CONFIG_FONT_8x16=y 795CONFIG_FONT_8x16=y
@@ -793,6 +816,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
793# CONFIG_USB is not set 816# CONFIG_USB is not set
794 817
795# 818#
819# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
820#
821
822#
796# USB Gadget Support 823# USB Gadget Support
797# 824#
798# CONFIG_USB_GADGET is not set 825# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index d3a5fee02b79..99f0c980aee7 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:33 2005 4# Mon Nov 7 23:06:05 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,23 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56
57#
58# IO Schedulers
59#
60CONFIG_IOSCHED_NOOP=y
61CONFIG_IOSCHED_AS=y
62CONFIG_IOSCHED_DEADLINE=y
63CONFIG_IOSCHED_CFQ=y
64CONFIG_DEFAULT_AS=y
65# CONFIG_DEFAULT_DEADLINE is not set
66# CONFIG_DEFAULT_CFQ is not set
67# CONFIG_DEFAULT_NOOP is not set
68CONFIG_DEFAULT_IOSCHED="anticipatory"
69
70#
54# Machine selection 71# Machine selection
55# 72#
56# CONFIG_MIPS_MTX1 is not set 73# CONFIG_MIPS_MTX1 is not set
@@ -176,6 +193,7 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 193CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 194CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 195# CONFIG_SPARSEMEM_STATIC is not set
196CONFIG_SPLIT_PTLOCK_CPUS=4
179CONFIG_PREEMPT_NONE=y 197CONFIG_PREEMPT_NONE=y
180# CONFIG_PREEMPT_VOLUNTARY is not set 198# CONFIG_PREEMPT_VOLUNTARY is not set
181# CONFIG_PREEMPT is not set 199# CONFIG_PREEMPT is not set
@@ -267,6 +285,10 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 285# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 286# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 287# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
270# CONFIG_NET_SCHED is not set 292# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set 293# CONFIG_NET_CLS_ROUTE is not set
272 294
@@ -298,6 +320,7 @@ CONFIG_FW_LOADER=y
298# Connector - unified userspace <-> kernelspace linker 320# Connector - unified userspace <-> kernelspace linker
299# 321#
300CONFIG_CONNECTOR=y 322CONFIG_CONNECTOR=y
323CONFIG_PROC_EVENTS=y
301 324
302# 325#
303# Memory Technology Devices (MTD) 326# Memory Technology Devices (MTD)
@@ -329,14 +352,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
329CONFIG_CDROM_PKTCDVD=y 352CONFIG_CDROM_PKTCDVD=y
330CONFIG_CDROM_PKTCDVD_BUFFERS=8 353CONFIG_CDROM_PKTCDVD_BUFFERS=8
331# CONFIG_CDROM_PKTCDVD_WCACHE is not set 354# CONFIG_CDROM_PKTCDVD_WCACHE is not set
332
333#
334# IO Schedulers
335#
336CONFIG_IOSCHED_NOOP=y
337CONFIG_IOSCHED_AS=y
338CONFIG_IOSCHED_DEADLINE=y
339CONFIG_IOSCHED_CFQ=y
340CONFIG_ATA_OVER_ETH=y 355CONFIG_ATA_OVER_ETH=y
341 356
342# 357#
@@ -388,7 +403,6 @@ CONFIG_NETDEVICES=y
388# PHY device support 403# PHY device support
389# 404#
390CONFIG_PHYLIB=y 405CONFIG_PHYLIB=y
391CONFIG_PHYCONTROL=y
392 406
393# 407#
394# MII PHY device drivers 408# MII PHY device drivers
@@ -406,6 +420,7 @@ CONFIG_NET_ETHERNET=y
406# CONFIG_MII is not set 420# CONFIG_MII is not set
407# CONFIG_HAPPYMEAL is not set 421# CONFIG_HAPPYMEAL is not set
408# CONFIG_SUNGEM is not set 422# CONFIG_SUNGEM is not set
423# CONFIG_CASSINI is not set
409# CONFIG_NET_VENDOR_3COM is not set 424# CONFIG_NET_VENDOR_3COM is not set
410 425
411# 426#
@@ -562,6 +577,7 @@ CONFIG_LEGACY_PTY_COUNT=256
562# TPM devices 577# TPM devices
563# 578#
564# CONFIG_TCG_TPM is not set 579# CONFIG_TCG_TPM is not set
580# CONFIG_TELCLOCK is not set
565 581
566# 582#
567# I2C support 583# I2C support
@@ -621,6 +637,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
621# CONFIG_USB is not set 637# CONFIG_USB is not set
622 638
623# 639#
640# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
641#
642
643#
624# USB Gadget Support 644# USB Gadget Support
625# 645#
626# CONFIG_USB_GADGET is not set 646# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 1edde12ebff9..11c7d74ee1e5 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:35 2005 4# Mon Nov 7 23:06:08 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
@@ -265,6 +284,10 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
268# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set 292# CONFIG_NET_CLS_ROUTE is not set
270 293
@@ -296,6 +319,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
296# Connector - unified userspace <-> kernelspace linker 319# Connector - unified userspace <-> kernelspace linker
297# 320#
298CONFIG_CONNECTOR=y 321CONFIG_CONNECTOR=y
322CONFIG_PROC_EVENTS=y
299 323
300# 324#
301# Memory Technology Devices (MTD) 325# Memory Technology Devices (MTD)
@@ -319,18 +343,9 @@ CONFIG_CONNECTOR=y
319# CONFIG_BLK_DEV_NBD is not set 343# CONFIG_BLK_DEV_NBD is not set
320# CONFIG_BLK_DEV_RAM is not set 344# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 345CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=y 346CONFIG_CDROM_PKTCDVD=y
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 347CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 348# CONFIG_CDROM_PKTCDVD_WCACHE is not set
326
327#
328# IO Schedulers
329#
330CONFIG_IOSCHED_NOOP=y
331CONFIG_IOSCHED_AS=y
332CONFIG_IOSCHED_DEADLINE=y
333CONFIG_IOSCHED_CFQ=y
334CONFIG_ATA_OVER_ETH=y 349CONFIG_ATA_OVER_ETH=y
335 350
336# 351#
@@ -375,7 +390,6 @@ CONFIG_NETDEVICES=y
375# PHY device support 390# PHY device support
376# 391#
377CONFIG_PHYLIB=y 392CONFIG_PHYLIB=y
378CONFIG_PHYCONTROL=y
379 393
380# 394#
381# MII PHY device drivers 395# MII PHY device drivers
@@ -513,6 +527,7 @@ CONFIG_LEGACY_PTY_COUNT=256
513# 527#
514# TPM devices 528# TPM devices
515# 529#
530# CONFIG_TELCLOCK is not set
516 531
517# 532#
518# I2C support 533# I2C support
@@ -571,6 +586,10 @@ CONFIG_DUMMY_CONSOLE=y
571# CONFIG_USB_ARCH_HAS_OHCI is not set 586# CONFIG_USB_ARCH_HAS_OHCI is not set
572 587
573# 588#
589# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
590#
591
592#
574# USB Gadget Support 593# USB Gadget Support
575# 594#
576# CONFIG_USB_GADGET is not set 595# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index e2d5188cdc15..9ced1a9029d4 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:38 2005 4# Mon Nov 7 23:06:11 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,23 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56
57#
58# IO Schedulers
59#
60CONFIG_IOSCHED_NOOP=y
61CONFIG_IOSCHED_AS=y
62CONFIG_IOSCHED_DEADLINE=y
63CONFIG_IOSCHED_CFQ=y
64CONFIG_DEFAULT_AS=y
65# CONFIG_DEFAULT_DEADLINE is not set
66# CONFIG_DEFAULT_CFQ is not set
67# CONFIG_DEFAULT_NOOP is not set
68CONFIG_DEFAULT_IOSCHED="anticipatory"
69
70#
54# Machine selection 71# Machine selection
55# 72#
56# CONFIG_MIPS_MTX1 is not set 73# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -270,6 +288,10 @@ CONFIG_TCP_CONG_BIC=y
270# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
271# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
272# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
291
292#
293# QoS and/or fair queueing
294#
273# CONFIG_NET_SCHED is not set 295# CONFIG_NET_SCHED is not set
274# CONFIG_NET_CLS_ROUTE is not set 296# CONFIG_NET_CLS_ROUTE is not set
275 297
@@ -301,6 +323,7 @@ CONFIG_FW_LOADER=y
301# Connector - unified userspace <-> kernelspace linker 323# Connector - unified userspace <-> kernelspace linker
302# 324#
303CONFIG_CONNECTOR=y 325CONFIG_CONNECTOR=y
326CONFIG_PROC_EVENTS=y
304 327
305# 328#
306# Memory Technology Devices (MTD) 329# Memory Technology Devices (MTD)
@@ -332,14 +355,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
332CONFIG_CDROM_PKTCDVD=y 355CONFIG_CDROM_PKTCDVD=y
333CONFIG_CDROM_PKTCDVD_BUFFERS=8 356CONFIG_CDROM_PKTCDVD_BUFFERS=8
334# CONFIG_CDROM_PKTCDVD_WCACHE is not set 357# CONFIG_CDROM_PKTCDVD_WCACHE is not set
335
336#
337# IO Schedulers
338#
339CONFIG_IOSCHED_NOOP=y
340CONFIG_IOSCHED_AS=y
341CONFIG_IOSCHED_DEADLINE=y
342CONFIG_IOSCHED_CFQ=y
343CONFIG_ATA_OVER_ETH=y 358CONFIG_ATA_OVER_ETH=y
344 359
345# 360#
@@ -391,7 +406,6 @@ CONFIG_NETDEVICES=y
391# PHY device support 406# PHY device support
392# 407#
393CONFIG_PHYLIB=y 408CONFIG_PHYLIB=y
394CONFIG_PHYCONTROL=y
395 409
396# 410#
397# MII PHY device drivers 411# MII PHY device drivers
@@ -410,6 +424,7 @@ CONFIG_MII=y
410CONFIG_GALILEO_64240_ETH=y 424CONFIG_GALILEO_64240_ETH=y
411# CONFIG_HAPPYMEAL is not set 425# CONFIG_HAPPYMEAL is not set
412# CONFIG_SUNGEM is not set 426# CONFIG_SUNGEM is not set
427# CONFIG_CASSINI is not set
413# CONFIG_NET_VENDOR_3COM is not set 428# CONFIG_NET_VENDOR_3COM is not set
414 429
415# 430#
@@ -565,6 +580,7 @@ CONFIG_LEGACY_PTY_COUNT=256
565# TPM devices 580# TPM devices
566# 581#
567# CONFIG_TCG_TPM is not set 582# CONFIG_TCG_TPM is not set
583# CONFIG_TELCLOCK is not set
568 584
569# 585#
570# I2C support 586# I2C support
@@ -624,6 +640,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
624# CONFIG_USB is not set 640# CONFIG_USB is not set
625 641
626# 642#
643# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
644#
645
646#
627# USB Gadget Support 647# USB Gadget Support
628# 648#
629# CONFIG_USB_GADGET is not set 649# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 47247addee1b..dbcaa77add7c 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:41 2005 4# Tue Nov 15 11:12:31 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -203,7 +222,6 @@ CONFIG_PCMCIA_IOCTL=y
203# 222#
204# PC-card bridges 223# PC-card bridges
205# 224#
206# CONFIG_TCIC is not set
207# CONFIG_PCMCIA_AU1X00 is not set 225# CONFIG_PCMCIA_AU1X00 is not set
208 226
209# 227#
@@ -261,15 +279,19 @@ CONFIG_TCP_CONG_BIC=y
261# CONFIG_IPV6 is not set 279# CONFIG_IPV6 is not set
262CONFIG_NETFILTER=y 280CONFIG_NETFILTER=y
263# CONFIG_NETFILTER_DEBUG is not set 281# CONFIG_NETFILTER_DEBUG is not set
282
283#
284# Core Netfilter Configuration
285#
264CONFIG_NETFILTER_NETLINK=m 286CONFIG_NETFILTER_NETLINK=m
265CONFIG_NETFILTER_NETLINK_QUEUE=m 287CONFIG_NETFILTER_NETLINK_QUEUE=m
266CONFIG_NETFILTER_NETLINK_LOG=m 288CONFIG_NETFILTER_NETLINK_LOG=m
289# CONFIG_NF_CONNTRACK is not set
267 290
268# 291#
269# IP: Netfilter Configuration 292# IP: Netfilter Configuration
270# 293#
271# CONFIG_IP_NF_CONNTRACK is not set 294# CONFIG_IP_NF_CONNTRACK is not set
272CONFIG_IP_NF_PPTP=m
273# CONFIG_IP_NF_QUEUE is not set 295# CONFIG_IP_NF_QUEUE is not set
274# CONFIG_IP_NF_IPTABLES is not set 296# CONFIG_IP_NF_IPTABLES is not set
275# CONFIG_IP_NF_ARPTABLES is not set 297# CONFIG_IP_NF_ARPTABLES is not set
@@ -295,6 +317,10 @@ CONFIG_IP_NF_PPTP=m
295# CONFIG_NET_DIVERT is not set 317# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 318# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 319# CONFIG_WAN_ROUTER is not set
320
321#
322# QoS and/or fair queueing
323#
298# CONFIG_NET_SCHED is not set 324# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set 325# CONFIG_NET_CLS_ROUTE is not set
300 326
@@ -345,6 +371,7 @@ CONFIG_MTD_BLOCK=y
345# CONFIG_FTL is not set 371# CONFIG_FTL is not set
346# CONFIG_NFTL is not set 372# CONFIG_NFTL is not set
347# CONFIG_INFTL is not set 373# CONFIG_INFTL is not set
374# CONFIG_RFD_FTL is not set
348 375
349# 376#
350# RAM/ROM/Flash chip drivers 377# RAM/ROM/Flash chip drivers
@@ -402,6 +429,11 @@ CONFIG_MTD_ALCHEMY=y
402# CONFIG_MTD_NAND is not set 429# CONFIG_MTD_NAND is not set
403 430
404# 431#
432# OneNAND Flash Device Drivers
433#
434# CONFIG_MTD_ONENAND is not set
435
436#
405# Parallel port support 437# Parallel port support
406# 438#
407# CONFIG_PARPORT is not set 439# CONFIG_PARPORT is not set
@@ -419,18 +451,9 @@ CONFIG_BLK_DEV_LOOP=y
419# CONFIG_BLK_DEV_NBD is not set 451# CONFIG_BLK_DEV_NBD is not set
420# CONFIG_BLK_DEV_RAM is not set 452# CONFIG_BLK_DEV_RAM is not set
421CONFIG_BLK_DEV_RAM_COUNT=16 453CONFIG_BLK_DEV_RAM_COUNT=16
422# CONFIG_LBD is not set
423CONFIG_CDROM_PKTCDVD=m 454CONFIG_CDROM_PKTCDVD=m
424CONFIG_CDROM_PKTCDVD_BUFFERS=8 455CONFIG_CDROM_PKTCDVD_BUFFERS=8
425# CONFIG_CDROM_PKTCDVD_WCACHE is not set 456# CONFIG_CDROM_PKTCDVD_WCACHE is not set
426
427#
428# IO Schedulers
429#
430CONFIG_IOSCHED_NOOP=y
431CONFIG_IOSCHED_AS=y
432CONFIG_IOSCHED_DEADLINE=y
433CONFIG_IOSCHED_CFQ=y
434CONFIG_ATA_OVER_ETH=m 457CONFIG_ATA_OVER_ETH=m
435 458
436# 459#
@@ -475,7 +498,6 @@ CONFIG_NETDEVICES=y
475# PHY device support 498# PHY device support
476# 499#
477CONFIG_PHYLIB=m 500CONFIG_PHYLIB=m
478CONFIG_PHYCONTROL=y
479 501
480# 502#
481# MII PHY device drivers 503# MII PHY device drivers
@@ -492,6 +514,7 @@ CONFIG_CICADA_PHY=m
492CONFIG_NET_ETHERNET=y 514CONFIG_NET_ETHERNET=y
493# CONFIG_MII is not set 515# CONFIG_MII is not set
494# CONFIG_MIPS_AU1X00_ENET is not set 516# CONFIG_MIPS_AU1X00_ENET is not set
517# CONFIG_SMC91X is not set
495 518
496# 519#
497# Ethernet (1000 Mbit) 520# Ethernet (1000 Mbit)
@@ -526,6 +549,7 @@ CONFIG_PPP_ASYNC=m
526# CONFIG_PPP_SYNC_TTY is not set 549# CONFIG_PPP_SYNC_TTY is not set
527CONFIG_PPP_DEFLATE=m 550CONFIG_PPP_DEFLATE=m
528# CONFIG_PPP_BSDCOMP is not set 551# CONFIG_PPP_BSDCOMP is not set
552CONFIG_PPP_MPPE=m
529CONFIG_PPPOE=m 553CONFIG_PPPOE=m
530# CONFIG_SLIP is not set 554# CONFIG_SLIP is not set
531# CONFIG_SHAPER is not set 555# CONFIG_SHAPER is not set
@@ -592,12 +616,19 @@ CONFIG_HW_CONSOLE=y
592# 616#
593# Serial drivers 617# Serial drivers
594# 618#
595# CONFIG_SERIAL_8250 is not set 619CONFIG_SERIAL_8250=y
620CONFIG_SERIAL_8250_CONSOLE=y
621# CONFIG_SERIAL_8250_CS is not set
622CONFIG_SERIAL_8250_NR_UARTS=4
623# CONFIG_SERIAL_8250_EXTENDED is not set
624CONFIG_SERIAL_8250_AU1X00=y
596 625
597# 626#
598# Non-8250 serial port support 627# Non-8250 serial port support
599# 628#
600# CONFIG_SERIAL_AU1X00 is not set 629# CONFIG_SERIAL_AU1X00 is not set
630CONFIG_SERIAL_CORE=y
631CONFIG_SERIAL_CORE_CONSOLE=y
601CONFIG_UNIX98_PTYS=y 632CONFIG_UNIX98_PTYS=y
602CONFIG_LEGACY_PTYS=y 633CONFIG_LEGACY_PTYS=y
603CONFIG_LEGACY_PTY_COUNT=256 634CONFIG_LEGACY_PTY_COUNT=256
@@ -624,11 +655,14 @@ CONFIG_LEGACY_PTY_COUNT=256
624# PCMCIA character devices 655# PCMCIA character devices
625# 656#
626CONFIG_SYNCLINK_CS=m 657CONFIG_SYNCLINK_CS=m
658# CONFIG_CARDMAN_4000 is not set
659# CONFIG_CARDMAN_4040 is not set
627# CONFIG_RAW_DRIVER is not set 660# CONFIG_RAW_DRIVER is not set
628 661
629# 662#
630# TPM devices 663# TPM devices
631# 664#
665# CONFIG_TELCLOCK is not set
632 666
633# 667#
634# I2C support 668# I2C support
@@ -688,6 +722,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
688# CONFIG_USB is not set 722# CONFIG_USB is not set
689 723
690# 724#
725# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
726#
727
728#
691# USB Gadget Support 729# USB Gadget Support
692# 730#
693# CONFIG_USB_GADGET is not set 731# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index f91a4eaae51a..5b685ceb6fde 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:44 2005 4# Tue Nov 15 11:14:25 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -207,7 +226,6 @@ CONFIG_CARDBUS=y
207# CONFIG_YENTA is not set 226# CONFIG_YENTA is not set
208CONFIG_PD6729=m 227CONFIG_PD6729=m
209# CONFIG_I82092 is not set 228# CONFIG_I82092 is not set
210# CONFIG_TCIC is not set
211# CONFIG_PCMCIA_AU1X00 is not set 229# CONFIG_PCMCIA_AU1X00 is not set
212CONFIG_PCCARD_NONSTATIC=m 230CONFIG_PCCARD_NONSTATIC=m
213 231
@@ -267,15 +285,19 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
268CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
269# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
288
289#
290# Core Netfilter Configuration
291#
270CONFIG_NETFILTER_NETLINK=m 292CONFIG_NETFILTER_NETLINK=m
271CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
272CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set
273 296
274# 297#
275# IP: Netfilter Configuration 298# IP: Netfilter Configuration
276# 299#
277# CONFIG_IP_NF_CONNTRACK is not set 300# CONFIG_IP_NF_CONNTRACK is not set
278CONFIG_IP_NF_PPTP=m
279# CONFIG_IP_NF_QUEUE is not set 301# CONFIG_IP_NF_QUEUE is not set
280# CONFIG_IP_NF_IPTABLES is not set 302# CONFIG_IP_NF_IPTABLES is not set
281# CONFIG_IP_NF_ARPTABLES is not set 303# CONFIG_IP_NF_ARPTABLES is not set
@@ -301,6 +323,10 @@ CONFIG_IP_NF_PPTP=m
301# CONFIG_NET_DIVERT is not set 323# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 324# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 325# CONFIG_WAN_ROUTER is not set
326
327#
328# QoS and/or fair queueing
329#
304# CONFIG_NET_SCHED is not set 330# CONFIG_NET_SCHED is not set
305# CONFIG_NET_CLS_ROUTE is not set 331# CONFIG_NET_CLS_ROUTE is not set
306 332
@@ -351,6 +377,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 377# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 378# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 379# CONFIG_INFTL is not set
380# CONFIG_RFD_FTL is not set
354 381
355# 382#
356# RAM/ROM/Flash chip drivers 383# RAM/ROM/Flash chip drivers
@@ -409,6 +436,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 436# CONFIG_MTD_NAND is not set
410 437
411# 438#
439# OneNAND Flash Device Drivers
440#
441# CONFIG_MTD_ONENAND is not set
442
443#
412# Parallel port support 444# Parallel port support
413# 445#
414# CONFIG_PARPORT is not set 446# CONFIG_PARPORT is not set
@@ -431,18 +463,9 @@ CONFIG_BLK_DEV_LOOP=y
431# CONFIG_BLK_DEV_SX8 is not set 463# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 464# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 465CONFIG_BLK_DEV_RAM_COUNT=16
434# CONFIG_LBD is not set
435CONFIG_CDROM_PKTCDVD=m 466CONFIG_CDROM_PKTCDVD=m
436CONFIG_CDROM_PKTCDVD_BUFFERS=8 467CONFIG_CDROM_PKTCDVD_BUFFERS=8
437# CONFIG_CDROM_PKTCDVD_WCACHE is not set 468# CONFIG_CDROM_PKTCDVD_WCACHE is not set
438
439#
440# IO Schedulers
441#
442CONFIG_IOSCHED_NOOP=y
443CONFIG_IOSCHED_AS=y
444CONFIG_IOSCHED_DEADLINE=y
445CONFIG_IOSCHED_CFQ=y
446CONFIG_ATA_OVER_ETH=m 469CONFIG_ATA_OVER_ETH=m
447 470
448# 471#
@@ -546,7 +569,6 @@ CONFIG_NETDEVICES=y
546# PHY device support 569# PHY device support
547# 570#
548CONFIG_PHYLIB=m 571CONFIG_PHYLIB=m
549CONFIG_PHYCONTROL=y
550 572
551# 573#
552# MII PHY device drivers 574# MII PHY device drivers
@@ -565,7 +587,9 @@ CONFIG_MII=m
565CONFIG_MIPS_AU1X00_ENET=y 587CONFIG_MIPS_AU1X00_ENET=y
566# CONFIG_HAPPYMEAL is not set 588# CONFIG_HAPPYMEAL is not set
567# CONFIG_SUNGEM is not set 589# CONFIG_SUNGEM is not set
590# CONFIG_CASSINI is not set
568# CONFIG_NET_VENDOR_3COM is not set 591# CONFIG_NET_VENDOR_3COM is not set
592# CONFIG_SMC91X is not set
569 593
570# 594#
571# Tulip family network device support 595# Tulip family network device support
@@ -635,6 +659,7 @@ CONFIG_PPP_ASYNC=m
635# CONFIG_PPP_SYNC_TTY is not set 659# CONFIG_PPP_SYNC_TTY is not set
636CONFIG_PPP_DEFLATE=m 660CONFIG_PPP_DEFLATE=m
637# CONFIG_PPP_BSDCOMP is not set 661# CONFIG_PPP_BSDCOMP is not set
662CONFIG_PPP_MPPE=m
638CONFIG_PPPOE=m 663CONFIG_PPPOE=m
639# CONFIG_SLIP is not set 664# CONFIG_SLIP is not set
640# CONFIG_SHAPER is not set 665# CONFIG_SHAPER is not set
@@ -700,13 +725,17 @@ CONFIG_SERIO_RAW=m
700# 725#
701# Serial drivers 726# Serial drivers
702# 727#
703# CONFIG_SERIAL_8250 is not set 728CONFIG_SERIAL_8250=y
729CONFIG_SERIAL_8250_CONSOLE=y
730# CONFIG_SERIAL_8250_CS is not set
731CONFIG_SERIAL_8250_NR_UARTS=4
732# CONFIG_SERIAL_8250_EXTENDED is not set
733CONFIG_SERIAL_8250_AU1X00=y
704 734
705# 735#
706# Non-8250 serial port support 736# Non-8250 serial port support
707# 737#
708CONFIG_SERIAL_AU1X00=y 738# CONFIG_SERIAL_AU1X00 is not set
709CONFIG_SERIAL_AU1X00_CONSOLE=y
710CONFIG_SERIAL_CORE=y 739CONFIG_SERIAL_CORE=y
711CONFIG_SERIAL_CORE_CONSOLE=y 740CONFIG_SERIAL_CORE_CONSOLE=y
712# CONFIG_SERIAL_JSM is not set 741# CONFIG_SERIAL_JSM is not set
@@ -738,12 +767,15 @@ CONFIG_LEGACY_PTY_COUNT=256
738# PCMCIA character devices 767# PCMCIA character devices
739# 768#
740CONFIG_SYNCLINK_CS=m 769CONFIG_SYNCLINK_CS=m
770# CONFIG_CARDMAN_4000 is not set
771# CONFIG_CARDMAN_4040 is not set
741# CONFIG_RAW_DRIVER is not set 772# CONFIG_RAW_DRIVER is not set
742 773
743# 774#
744# TPM devices 775# TPM devices
745# 776#
746# CONFIG_TCG_TPM is not set 777# CONFIG_TCG_TPM is not set
778# CONFIG_TELCLOCK is not set
747 779
748# 780#
749# I2C support 781# I2C support
@@ -797,6 +829,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
797# CONFIG_USB is not set 829# CONFIG_USB is not set
798 830
799# 831#
832# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
833#
834
835#
800# USB Gadget Support 836# USB Gadget Support
801# 837#
802# CONFIG_USB_GADGET is not set 838# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index bbad27cb40a2..f8f32e99f72d 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:47 2005 4# Tue Nov 15 11:15:34 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -207,7 +226,6 @@ CONFIG_CARDBUS=y
207# CONFIG_YENTA is not set 226# CONFIG_YENTA is not set
208CONFIG_PD6729=m 227CONFIG_PD6729=m
209# CONFIG_I82092 is not set 228# CONFIG_I82092 is not set
210# CONFIG_TCIC is not set
211# CONFIG_PCMCIA_AU1X00 is not set 229# CONFIG_PCMCIA_AU1X00 is not set
212CONFIG_PCCARD_NONSTATIC=m 230CONFIG_PCCARD_NONSTATIC=m
213 231
@@ -267,15 +285,19 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
268CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
269# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
288
289#
290# Core Netfilter Configuration
291#
270CONFIG_NETFILTER_NETLINK=m 292CONFIG_NETFILTER_NETLINK=m
271CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
272CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set
273 296
274# 297#
275# IP: Netfilter Configuration 298# IP: Netfilter Configuration
276# 299#
277# CONFIG_IP_NF_CONNTRACK is not set 300# CONFIG_IP_NF_CONNTRACK is not set
278CONFIG_IP_NF_PPTP=m
279# CONFIG_IP_NF_QUEUE is not set 301# CONFIG_IP_NF_QUEUE is not set
280# CONFIG_IP_NF_IPTABLES is not set 302# CONFIG_IP_NF_IPTABLES is not set
281# CONFIG_IP_NF_ARPTABLES is not set 303# CONFIG_IP_NF_ARPTABLES is not set
@@ -301,6 +323,10 @@ CONFIG_IP_NF_PPTP=m
301# CONFIG_NET_DIVERT is not set 323# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 324# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 325# CONFIG_WAN_ROUTER is not set
326
327#
328# QoS and/or fair queueing
329#
304# CONFIG_NET_SCHED is not set 330# CONFIG_NET_SCHED is not set
305# CONFIG_NET_CLS_ROUTE is not set 331# CONFIG_NET_CLS_ROUTE is not set
306 332
@@ -351,6 +377,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 377# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 378# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 379# CONFIG_INFTL is not set
380# CONFIG_RFD_FTL is not set
354 381
355# 382#
356# RAM/ROM/Flash chip drivers 383# RAM/ROM/Flash chip drivers
@@ -409,6 +436,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 436# CONFIG_MTD_NAND is not set
410 437
411# 438#
439# OneNAND Flash Device Drivers
440#
441# CONFIG_MTD_ONENAND is not set
442
443#
412# Parallel port support 444# Parallel port support
413# 445#
414# CONFIG_PARPORT is not set 446# CONFIG_PARPORT is not set
@@ -431,18 +463,9 @@ CONFIG_BLK_DEV_LOOP=y
431# CONFIG_BLK_DEV_SX8 is not set 463# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 464# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 465CONFIG_BLK_DEV_RAM_COUNT=16
434# CONFIG_LBD is not set
435CONFIG_CDROM_PKTCDVD=m 466CONFIG_CDROM_PKTCDVD=m
436CONFIG_CDROM_PKTCDVD_BUFFERS=8 467CONFIG_CDROM_PKTCDVD_BUFFERS=8
437# CONFIG_CDROM_PKTCDVD_WCACHE is not set 468# CONFIG_CDROM_PKTCDVD_WCACHE is not set
438
439#
440# IO Schedulers
441#
442CONFIG_IOSCHED_NOOP=y
443CONFIG_IOSCHED_AS=y
444CONFIG_IOSCHED_DEADLINE=y
445CONFIG_IOSCHED_CFQ=y
446CONFIG_ATA_OVER_ETH=m 469CONFIG_ATA_OVER_ETH=m
447 470
448# 471#
@@ -546,7 +569,6 @@ CONFIG_NETDEVICES=y
546# PHY device support 569# PHY device support
547# 570#
548CONFIG_PHYLIB=m 571CONFIG_PHYLIB=m
549CONFIG_PHYCONTROL=y
550 572
551# 573#
552# MII PHY device drivers 574# MII PHY device drivers
@@ -565,7 +587,9 @@ CONFIG_NET_ETHERNET=y
565CONFIG_MIPS_AU1X00_ENET=y 587CONFIG_MIPS_AU1X00_ENET=y
566# CONFIG_HAPPYMEAL is not set 588# CONFIG_HAPPYMEAL is not set
567# CONFIG_SUNGEM is not set 589# CONFIG_SUNGEM is not set
590# CONFIG_CASSINI is not set
568# CONFIG_NET_VENDOR_3COM is not set 591# CONFIG_NET_VENDOR_3COM is not set
592# CONFIG_SMC91X is not set
569 593
570# 594#
571# Tulip family network device support 595# Tulip family network device support
@@ -627,6 +651,7 @@ CONFIG_PPP_ASYNC=m
627# CONFIG_PPP_SYNC_TTY is not set 651# CONFIG_PPP_SYNC_TTY is not set
628CONFIG_PPP_DEFLATE=m 652CONFIG_PPP_DEFLATE=m
629# CONFIG_PPP_BSDCOMP is not set 653# CONFIG_PPP_BSDCOMP is not set
654CONFIG_PPP_MPPE=m
630CONFIG_PPPOE=m 655CONFIG_PPPOE=m
631# CONFIG_SLIP is not set 656# CONFIG_SLIP is not set
632# CONFIG_SHAPER is not set 657# CONFIG_SHAPER is not set
@@ -692,13 +717,17 @@ CONFIG_SERIO_RAW=m
692# 717#
693# Serial drivers 718# Serial drivers
694# 719#
695# CONFIG_SERIAL_8250 is not set 720CONFIG_SERIAL_8250=y
721CONFIG_SERIAL_8250_CONSOLE=y
722# CONFIG_SERIAL_8250_CS is not set
723CONFIG_SERIAL_8250_NR_UARTS=4
724# CONFIG_SERIAL_8250_EXTENDED is not set
725CONFIG_SERIAL_8250_AU1X00=y
696 726
697# 727#
698# Non-8250 serial port support 728# Non-8250 serial port support
699# 729#
700CONFIG_SERIAL_AU1X00=y 730# CONFIG_SERIAL_AU1X00 is not set
701CONFIG_SERIAL_AU1X00_CONSOLE=y
702CONFIG_SERIAL_CORE=y 731CONFIG_SERIAL_CORE=y
703CONFIG_SERIAL_CORE_CONSOLE=y 732CONFIG_SERIAL_CORE_CONSOLE=y
704# CONFIG_SERIAL_JSM is not set 733# CONFIG_SERIAL_JSM is not set
@@ -730,12 +759,15 @@ CONFIG_LEGACY_PTY_COUNT=256
730# PCMCIA character devices 759# PCMCIA character devices
731# 760#
732CONFIG_SYNCLINK_CS=m 761CONFIG_SYNCLINK_CS=m
762# CONFIG_CARDMAN_4000 is not set
763# CONFIG_CARDMAN_4040 is not set
733# CONFIG_RAW_DRIVER is not set 764# CONFIG_RAW_DRIVER is not set
734 765
735# 766#
736# TPM devices 767# TPM devices
737# 768#
738# CONFIG_TCG_TPM is not set 769# CONFIG_TCG_TPM is not set
770# CONFIG_TELCLOCK is not set
739 771
740# 772#
741# I2C support 773# I2C support
@@ -789,6 +821,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
789# CONFIG_USB is not set 821# CONFIG_USB is not set
790 822
791# 823#
824# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
825#
826
827#
792# USB Gadget Support 828# USB Gadget Support
793# 829#
794# CONFIG_USB_GADGET is not set 830# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 555837e4c06f..5820e5f2295e 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:50 2005 4# Mon Nov 7 23:06:25 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_OBSOLETE_MODPARM=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -265,6 +284,10 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
268# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set 292# CONFIG_NET_CLS_ROUTE is not set
270 293
@@ -325,16 +348,7 @@ CONFIG_BLK_DEV_RAM=y
325CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
326CONFIG_BLK_DEV_RAM_SIZE=8192 349CONFIG_BLK_DEV_RAM_SIZE=8192
327CONFIG_BLK_DEV_INITRD=y 350CONFIG_BLK_DEV_INITRD=y
328# CONFIG_LBD is not set
329# CONFIG_CDROM_PKTCDVD is not set 351# CONFIG_CDROM_PKTCDVD is not set
330
331#
332# IO Schedulers
333#
334CONFIG_IOSCHED_NOOP=y
335CONFIG_IOSCHED_AS=y
336CONFIG_IOSCHED_DEADLINE=y
337CONFIG_IOSCHED_CFQ=y
338# CONFIG_ATA_OVER_ETH is not set 352# CONFIG_ATA_OVER_ETH is not set
339 353
340# 354#
@@ -423,12 +437,13 @@ CONFIG_SCSI_CONSTANTS=y
423# 437#
424# CONFIG_SCSI_SPI_ATTRS is not set 438# CONFIG_SCSI_SPI_ATTRS is not set
425# CONFIG_SCSI_FC_ATTRS is not set 439# CONFIG_SCSI_FC_ATTRS is not set
426# CONFIG_SCSI_ISCSI_ATTRS is not set 440CONFIG_SCSI_ISCSI_ATTRS=m
427# CONFIG_SCSI_SAS_ATTRS is not set 441# CONFIG_SCSI_SAS_ATTRS is not set
428 442
429# 443#
430# SCSI low-level drivers 444# SCSI low-level drivers
431# 445#
446CONFIG_ISCSI_TCP=m
432# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 447# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
433# CONFIG_SCSI_3W_9XXX is not set 448# CONFIG_SCSI_3W_9XXX is not set
434# CONFIG_SCSI_ACARD is not set 449# CONFIG_SCSI_ACARD is not set
@@ -439,6 +454,7 @@ CONFIG_SCSI_CONSTANTS=y
439# CONFIG_SCSI_DPT_I2O is not set 454# CONFIG_SCSI_DPT_I2O is not set
440# CONFIG_MEGARAID_NEWGEN is not set 455# CONFIG_MEGARAID_NEWGEN is not set
441# CONFIG_MEGARAID_LEGACY is not set 456# CONFIG_MEGARAID_LEGACY is not set
457# CONFIG_MEGARAID_SAS is not set
442# CONFIG_SCSI_SATA is not set 458# CONFIG_SCSI_SATA is not set
443# CONFIG_SCSI_DMX3191D is not set 459# CONFIG_SCSI_DMX3191D is not set
444# CONFIG_SCSI_FUTURE_DOMAIN is not set 460# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -473,6 +489,7 @@ CONFIG_SCSI_QLA2XXX=y
473# CONFIG_FUSION is not set 489# CONFIG_FUSION is not set
474# CONFIG_FUSION_SPI is not set 490# CONFIG_FUSION_SPI is not set
475# CONFIG_FUSION_FC is not set 491# CONFIG_FUSION_FC is not set
492# CONFIG_FUSION_SAS is not set
476 493
477# 494#
478# IEEE 1394 (FireWire) support 495# IEEE 1394 (FireWire) support
@@ -510,6 +527,7 @@ CONFIG_NET_ETHERNET=y
510CONFIG_MII=y 527CONFIG_MII=y
511# CONFIG_HAPPYMEAL is not set 528# CONFIG_HAPPYMEAL is not set
512# CONFIG_SUNGEM is not set 529# CONFIG_SUNGEM is not set
530# CONFIG_CASSINI is not set
513# CONFIG_NET_VENDOR_3COM is not set 531# CONFIG_NET_VENDOR_3COM is not set
514 532
515# 533#
@@ -681,6 +699,7 @@ CONFIG_LEGACY_PTY_COUNT=256
681# TPM devices 699# TPM devices
682# 700#
683# CONFIG_TCG_TPM is not set 701# CONFIG_TCG_TPM is not set
702# CONFIG_TELCLOCK is not set
684 703
685# 704#
686# I2C support 705# I2C support
@@ -763,12 +782,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
763# 782#
764# USB Device Class drivers 783# USB Device Class drivers
765# 784#
766# CONFIG_USB_BLUETOOTH_TTY is not set
767# CONFIG_USB_ACM is not set 785# CONFIG_USB_ACM is not set
768# CONFIG_USB_PRINTER is not set 786# CONFIG_USB_PRINTER is not set
769 787
770# 788#
771# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 789# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
790#
791
792#
793# may also be needed; see USB_STORAGE Help for more information
772# 794#
773CONFIG_USB_STORAGE=y 795CONFIG_USB_STORAGE=y
774# CONFIG_USB_STORAGE_DEBUG is not set 796# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1039,6 +1061,8 @@ CONFIG_DEBUG_SLAB=y
1039# CONFIG_DEBUG_KOBJECT is not set 1061# CONFIG_DEBUG_KOBJECT is not set
1040# CONFIG_DEBUG_INFO is not set 1062# CONFIG_DEBUG_INFO is not set
1041# CONFIG_DEBUG_FS is not set 1063# CONFIG_DEBUG_FS is not set
1064# CONFIG_DEBUG_VM is not set
1065# CONFIG_RCU_TORTURE_TEST is not set
1042CONFIG_CROSSCOMPILE=y 1066CONFIG_CROSSCOMPILE=y
1043CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1067CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1044# CONFIG_DEBUG_STACK_USAGE is not set 1068# CONFIG_DEBUG_STACK_USAGE is not set
@@ -1055,7 +1079,31 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1055# 1079#
1056# Cryptographic options 1080# Cryptographic options
1057# 1081#
1058# CONFIG_CRYPTO is not set 1082CONFIG_CRYPTO=y
1083# CONFIG_CRYPTO_HMAC is not set
1084# CONFIG_CRYPTO_NULL is not set
1085# CONFIG_CRYPTO_MD4 is not set
1086CONFIG_CRYPTO_MD5=m
1087# CONFIG_CRYPTO_SHA1 is not set
1088# CONFIG_CRYPTO_SHA256 is not set
1089# CONFIG_CRYPTO_SHA512 is not set
1090# CONFIG_CRYPTO_WP512 is not set
1091# CONFIG_CRYPTO_TGR192 is not set
1092# CONFIG_CRYPTO_DES is not set
1093# CONFIG_CRYPTO_BLOWFISH is not set
1094# CONFIG_CRYPTO_TWOFISH is not set
1095# CONFIG_CRYPTO_SERPENT is not set
1096# CONFIG_CRYPTO_AES is not set
1097# CONFIG_CRYPTO_CAST5 is not set
1098# CONFIG_CRYPTO_CAST6 is not set
1099# CONFIG_CRYPTO_TEA is not set
1100# CONFIG_CRYPTO_ARC4 is not set
1101# CONFIG_CRYPTO_KHAZAD is not set
1102# CONFIG_CRYPTO_ANUBIS is not set
1103# CONFIG_CRYPTO_DEFLATE is not set
1104# CONFIG_CRYPTO_MICHAEL_MIC is not set
1105CONFIG_CRYPTO_CRC32C=m
1106# CONFIG_CRYPTO_TEST is not set
1059 1107
1060# 1108#
1061# Hardware crypto devices 1109# Hardware crypto devices
@@ -1067,4 +1115,4 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1067CONFIG_CRC_CCITT=m 1115CONFIG_CRC_CCITT=m
1068# CONFIG_CRC16 is not set 1116# CONFIG_CRC16 is not set
1069CONFIG_CRC32=y 1117CONFIG_CRC32=y
1070# CONFIG_LIBCRC32C is not set 1118CONFIG_LIBCRC32C=m
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 37bd8d5c865d..a4ebb538e15c 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:53 2005 4# Thu Nov 10 14:02:38 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_OBSOLETE_MODPARM=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -255,13 +274,17 @@ CONFIG_IPV6=m
255# CONFIG_IPV6_TUNNEL is not set 274# CONFIG_IPV6_TUNNEL is not set
256CONFIG_NETFILTER=y 275CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 276# CONFIG_NETFILTER_DEBUG is not set
277
278#
279# Core Netfilter Configuration
280#
258# CONFIG_NETFILTER_NETLINK is not set 281# CONFIG_NETFILTER_NETLINK is not set
282# CONFIG_NF_CONNTRACK is not set
259 283
260# 284#
261# IP: Netfilter Configuration 285# IP: Netfilter Configuration
262# 286#
263# CONFIG_IP_NF_CONNTRACK is not set 287# CONFIG_IP_NF_CONNTRACK is not set
264CONFIG_IP_NF_PPTP=m
265# CONFIG_IP_NF_QUEUE is not set 288# CONFIG_IP_NF_QUEUE is not set
266# CONFIG_IP_NF_IPTABLES is not set 289# CONFIG_IP_NF_IPTABLES is not set
267# CONFIG_IP_NF_ARPTABLES is not set 290# CONFIG_IP_NF_ARPTABLES is not set
@@ -293,6 +316,10 @@ CONFIG_IP_NF_PPTP=m
293# CONFIG_NET_DIVERT is not set 316# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set 317# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set 318# CONFIG_WAN_ROUTER is not set
319
320#
321# QoS and/or fair queueing
322#
296# CONFIG_NET_SCHED is not set 323# CONFIG_NET_SCHED is not set
297# CONFIG_NET_CLS_ROUTE is not set 324# CONFIG_NET_CLS_ROUTE is not set
298 325
@@ -352,16 +379,7 @@ CONFIG_BLK_DEV_RAM=y
352CONFIG_BLK_DEV_RAM_COUNT=16 379CONFIG_BLK_DEV_RAM_COUNT=16
353CONFIG_BLK_DEV_RAM_SIZE=8192 380CONFIG_BLK_DEV_RAM_SIZE=8192
354CONFIG_BLK_DEV_INITRD=y 381CONFIG_BLK_DEV_INITRD=y
355# CONFIG_LBD is not set
356# CONFIG_CDROM_PKTCDVD is not set 382# CONFIG_CDROM_PKTCDVD is not set
357
358#
359# IO Schedulers
360#
361CONFIG_IOSCHED_NOOP=y
362CONFIG_IOSCHED_AS=y
363CONFIG_IOSCHED_DEADLINE=y
364CONFIG_IOSCHED_CFQ=y
365# CONFIG_ATA_OVER_ETH is not set 383# CONFIG_ATA_OVER_ETH is not set
366 384
367# 385#
@@ -451,12 +469,13 @@ CONFIG_BLK_DEV_SD=y
451# 469#
452CONFIG_SCSI_SPI_ATTRS=m 470CONFIG_SCSI_SPI_ATTRS=m
453# CONFIG_SCSI_FC_ATTRS is not set 471# CONFIG_SCSI_FC_ATTRS is not set
454# CONFIG_SCSI_ISCSI_ATTRS is not set 472CONFIG_SCSI_ISCSI_ATTRS=m
455# CONFIG_SCSI_SAS_ATTRS is not set 473# CONFIG_SCSI_SAS_ATTRS is not set
456 474
457# 475#
458# SCSI low-level drivers 476# SCSI low-level drivers
459# 477#
478CONFIG_ISCSI_TCP=m
460# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 479# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
461# CONFIG_SCSI_3W_9XXX is not set 480# CONFIG_SCSI_3W_9XXX is not set
462# CONFIG_SCSI_ACARD is not set 481# CONFIG_SCSI_ACARD is not set
@@ -472,6 +491,7 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
472# CONFIG_SCSI_DPT_I2O is not set 491# CONFIG_SCSI_DPT_I2O is not set
473# CONFIG_MEGARAID_NEWGEN is not set 492# CONFIG_MEGARAID_NEWGEN is not set
474# CONFIG_MEGARAID_LEGACY is not set 493# CONFIG_MEGARAID_LEGACY is not set
494# CONFIG_MEGARAID_SAS is not set
475# CONFIG_SCSI_SATA is not set 495# CONFIG_SCSI_SATA is not set
476# CONFIG_SCSI_DMX3191D is not set 496# CONFIG_SCSI_DMX3191D is not set
477# CONFIG_SCSI_FUTURE_DOMAIN is not set 497# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -506,6 +526,7 @@ CONFIG_SCSI_QLA2XXX=y
506# CONFIG_FUSION is not set 526# CONFIG_FUSION is not set
507# CONFIG_FUSION_SPI is not set 527# CONFIG_FUSION_SPI is not set
508# CONFIG_FUSION_FC is not set 528# CONFIG_FUSION_FC is not set
529# CONFIG_FUSION_SAS is not set
509 530
510# 531#
511# IEEE 1394 (FireWire) support 532# IEEE 1394 (FireWire) support
@@ -543,6 +564,7 @@ CONFIG_NET_ETHERNET=y
543CONFIG_MII=y 564CONFIG_MII=y
544# CONFIG_HAPPYMEAL is not set 565# CONFIG_HAPPYMEAL is not set
545# CONFIG_SUNGEM is not set 566# CONFIG_SUNGEM is not set
567# CONFIG_CASSINI is not set
546# CONFIG_NET_VENDOR_3COM is not set 568# CONFIG_NET_VENDOR_3COM is not set
547 569
548# 570#
@@ -622,6 +644,7 @@ CONFIG_PPP_ASYNC=m
622CONFIG_PPP_SYNC_TTY=m 644CONFIG_PPP_SYNC_TTY=m
623CONFIG_PPP_DEFLATE=m 645CONFIG_PPP_DEFLATE=m
624# CONFIG_PPP_BSDCOMP is not set 646# CONFIG_PPP_BSDCOMP is not set
647CONFIG_PPP_MPPE=m
625# CONFIG_PPPOE is not set 648# CONFIG_PPPOE is not set
626# CONFIG_SLIP is not set 649# CONFIG_SLIP is not set
627# CONFIG_NET_FC is not set 650# CONFIG_NET_FC is not set
@@ -746,6 +769,7 @@ CONFIG_LEGACY_PTY_COUNT=256
746# TPM devices 769# TPM devices
747# 770#
748# CONFIG_TCG_TPM is not set 771# CONFIG_TCG_TPM is not set
772# CONFIG_TELCLOCK is not set
749 773
750# 774#
751# I2C support 775# I2C support
@@ -796,6 +820,7 @@ CONFIG_I2C_ALGOBIT=m
796# CONFIG_SENSORS_PCF8591 is not set 820# CONFIG_SENSORS_PCF8591 is not set
797# CONFIG_SENSORS_RTC8564 is not set 821# CONFIG_SENSORS_RTC8564 is not set
798# CONFIG_SENSORS_MAX6875 is not set 822# CONFIG_SENSORS_MAX6875 is not set
823# CONFIG_RTC_X1205_I2C is not set
799# CONFIG_I2C_DEBUG_CORE is not set 824# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 825# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 826# CONFIG_I2C_DEBUG_BUS is not set
@@ -872,7 +897,6 @@ CONFIG_FB=y
872# CONFIG_FB_CFB_FILLRECT is not set 897# CONFIG_FB_CFB_FILLRECT is not set
873# CONFIG_FB_CFB_COPYAREA is not set 898# CONFIG_FB_CFB_COPYAREA is not set
874# CONFIG_FB_CFB_IMAGEBLIT is not set 899# CONFIG_FB_CFB_IMAGEBLIT is not set
875# CONFIG_FB_SOFT_CURSOR is not set
876# CONFIG_FB_MACMODES is not set 900# CONFIG_FB_MACMODES is not set
877# CONFIG_FB_MODE_HELPERS is not set 901# CONFIG_FB_MODE_HELPERS is not set
878# CONFIG_FB_TILEBLITTING is not set 902# CONFIG_FB_TILEBLITTING is not set
@@ -881,6 +905,7 @@ CONFIG_FB=y
881# CONFIG_FB_CYBER2000 is not set 905# CONFIG_FB_CYBER2000 is not set
882# CONFIG_FB_ASILIANT is not set 906# CONFIG_FB_ASILIANT is not set
883# CONFIG_FB_IMSTT is not set 907# CONFIG_FB_IMSTT is not set
908# CONFIG_FB_S1D13XXX is not set
884# CONFIG_FB_NVIDIA is not set 909# CONFIG_FB_NVIDIA is not set
885# CONFIG_FB_RIVA is not set 910# CONFIG_FB_RIVA is not set
886# CONFIG_FB_MATROX is not set 911# CONFIG_FB_MATROX is not set
@@ -897,7 +922,6 @@ CONFIG_FB=y
897# CONFIG_FB_SMIVGX is not set 922# CONFIG_FB_SMIVGX is not set
898# CONFIG_FB_CYBLA is not set 923# CONFIG_FB_CYBLA is not set
899# CONFIG_FB_TRIDENT is not set 924# CONFIG_FB_TRIDENT is not set
900# CONFIG_FB_S1D13XXX is not set
901# CONFIG_FB_VIRTUAL is not set 925# CONFIG_FB_VIRTUAL is not set
902 926
903# 927#
@@ -946,12 +970,15 @@ CONFIG_USB_DEVICEFS=y
946# 970#
947# USB Device Class drivers 971# USB Device Class drivers
948# 972#
949# CONFIG_USB_BLUETOOTH_TTY is not set
950# CONFIG_USB_ACM is not set 973# CONFIG_USB_ACM is not set
951# CONFIG_USB_PRINTER is not set 974# CONFIG_USB_PRINTER is not set
952 975
953# 976#
954# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 977# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
978#
979
980#
981# may also be needed; see USB_STORAGE Help for more information
955# 982#
956CONFIG_USB_STORAGE=y 983CONFIG_USB_STORAGE=y
957# CONFIG_USB_STORAGE_DEBUG is not set 984# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1235,7 +1262,31 @@ CONFIG_CMDLINE=""
1235# 1262#
1236# Cryptographic options 1263# Cryptographic options
1237# 1264#
1238# CONFIG_CRYPTO is not set 1265CONFIG_CRYPTO=y
1266# CONFIG_CRYPTO_HMAC is not set
1267# CONFIG_CRYPTO_NULL is not set
1268# CONFIG_CRYPTO_MD4 is not set
1269CONFIG_CRYPTO_MD5=m
1270CONFIG_CRYPTO_SHA1=m
1271# CONFIG_CRYPTO_SHA256 is not set
1272# CONFIG_CRYPTO_SHA512 is not set
1273# CONFIG_CRYPTO_WP512 is not set
1274# CONFIG_CRYPTO_TGR192 is not set
1275# CONFIG_CRYPTO_DES is not set
1276# CONFIG_CRYPTO_BLOWFISH is not set
1277# CONFIG_CRYPTO_TWOFISH is not set
1278# CONFIG_CRYPTO_SERPENT is not set
1279# CONFIG_CRYPTO_AES is not set
1280# CONFIG_CRYPTO_CAST5 is not set
1281# CONFIG_CRYPTO_CAST6 is not set
1282# CONFIG_CRYPTO_TEA is not set
1283CONFIG_CRYPTO_ARC4=m
1284# CONFIG_CRYPTO_KHAZAD is not set
1285# CONFIG_CRYPTO_ANUBIS is not set
1286# CONFIG_CRYPTO_DEFLATE is not set
1287# CONFIG_CRYPTO_MICHAEL_MIC is not set
1288CONFIG_CRYPTO_CRC32C=m
1289# CONFIG_CRYPTO_TEST is not set
1239 1290
1240# 1291#
1241# Hardware crypto devices 1292# Hardware crypto devices
@@ -1247,6 +1298,6 @@ CONFIG_CMDLINE=""
1247CONFIG_CRC_CCITT=m 1298CONFIG_CRC_CCITT=m
1248# CONFIG_CRC16 is not set 1299# CONFIG_CRC16 is not set
1249CONFIG_CRC32=y 1300CONFIG_CRC32=y
1250# CONFIG_LIBCRC32C is not set 1301CONFIG_LIBCRC32C=m
1251CONFIG_ZLIB_INFLATE=y 1302CONFIG_ZLIB_INFLATE=y
1252CONFIG_ZLIB_DEFLATE=m 1303CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 741a9a971367..5d39162077f4 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:56 2005 4# Mon Nov 7 23:06:31 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -50,6 +50,24 @@ CONFIG_BASE_SMALL=1
50# CONFIG_MODULES is not set 50# CONFIG_MODULES is not set
51 51
52# 52#
53# Block layer
54#
55# CONFIG_LBD is not set
56
57#
58# IO Schedulers
59#
60CONFIG_IOSCHED_NOOP=y
61# CONFIG_IOSCHED_AS is not set
62# CONFIG_IOSCHED_DEADLINE is not set
63# CONFIG_IOSCHED_CFQ is not set
64# CONFIG_DEFAULT_AS is not set
65# CONFIG_DEFAULT_DEADLINE is not set
66# CONFIG_DEFAULT_CFQ is not set
67CONFIG_DEFAULT_NOOP=y
68CONFIG_DEFAULT_IOSCHED="noop"
69
70#
53# Machine selection 71# Machine selection
54# 72#
55# CONFIG_MIPS_MTX1 is not set 73# CONFIG_MIPS_MTX1 is not set
@@ -168,6 +186,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
168CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189CONFIG_SPLIT_PTLOCK_CPUS=4
171CONFIG_PREEMPT_NONE=y 190CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 191# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 192# CONFIG_PREEMPT is not set
@@ -234,6 +253,10 @@ CONFIG_TCP_CONG_BIC=y
234# CONFIG_LLC2 is not set 253# CONFIG_LLC2 is not set
235# CONFIG_IPX is not set 254# CONFIG_IPX is not set
236# CONFIG_ATALK is not set 255# CONFIG_ATALK is not set
256
257#
258# QoS and/or fair queueing
259#
237# CONFIG_NET_SCHED is not set 260# CONFIG_NET_SCHED is not set
238# CONFIG_NET_CLS_ROUTE is not set 261# CONFIG_NET_CLS_ROUTE is not set
239 262
@@ -265,6 +288,7 @@ CONFIG_STANDALONE=y
265# Connector - unified userspace <-> kernelspace linker 288# Connector - unified userspace <-> kernelspace linker
266# 289#
267CONFIG_CONNECTOR=y 290CONFIG_CONNECTOR=y
291CONFIG_PROC_EVENTS=y
268 292
269# 293#
270# Memory Technology Devices (MTD) 294# Memory Technology Devices (MTD)
@@ -289,16 +313,7 @@ CONFIG_CONNECTOR=y
289# CONFIG_BLK_DEV_NBD is not set 313# CONFIG_BLK_DEV_NBD is not set
290# CONFIG_BLK_DEV_RAM is not set 314# CONFIG_BLK_DEV_RAM is not set
291CONFIG_BLK_DEV_RAM_COUNT=16 315CONFIG_BLK_DEV_RAM_COUNT=16
292# CONFIG_LBD is not set
293# CONFIG_CDROM_PKTCDVD is not set 316# CONFIG_CDROM_PKTCDVD is not set
294
295#
296# IO Schedulers
297#
298CONFIG_IOSCHED_NOOP=y
299# CONFIG_IOSCHED_AS is not set
300# CONFIG_IOSCHED_DEADLINE is not set
301# CONFIG_IOSCHED_CFQ is not set
302# CONFIG_ATA_OVER_ETH is not set 317# CONFIG_ATA_OVER_ETH is not set
303 318
304# 319#
@@ -353,7 +368,6 @@ CONFIG_NETDEVICES=y
353# PHY device support 368# PHY device support
354# 369#
355CONFIG_PHYLIB=y 370CONFIG_PHYLIB=y
356CONFIG_PHYCONTROL=y
357 371
358# 372#
359# MII PHY device drivers 373# MII PHY device drivers
@@ -385,7 +399,6 @@ CONFIG_NET_ISA=y
385# CONFIG_ETH16I is not set 399# CONFIG_ETH16I is not set
386CONFIG_NE2000=y 400CONFIG_NE2000=y
387# CONFIG_NET_PCI is not set 401# CONFIG_NET_PCI is not set
388# CONFIG_NET_POCKET is not set
389 402
390# 403#
391# Ethernet (1000 Mbit) 404# Ethernet (1000 Mbit)
@@ -558,6 +571,10 @@ CONFIG_DUMMY_CONSOLE=y
558# CONFIG_USB_ARCH_HAS_OHCI is not set 571# CONFIG_USB_ARCH_HAS_OHCI is not set
559 572
560# 573#
574# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
575#
576
577#
561# USB Gadget Support 578# USB Gadget Support
562# 579#
563# CONFIG_USB_GADGET is not set 580# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 897420d39053..047e0b4236f8 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:59 2005 4# Thu Nov 10 14:02:45 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_OBSOLETE_MODPARM=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -188,6 +206,7 @@ CONFIG_FLATMEM_MANUAL=y
188CONFIG_FLATMEM=y 206CONFIG_FLATMEM=y
189CONFIG_FLAT_NODE_MEM_MAP=y 207CONFIG_FLAT_NODE_MEM_MAP=y
190# CONFIG_SPARSEMEM_STATIC is not set 208# CONFIG_SPARSEMEM_STATIC is not set
209CONFIG_SPLIT_PTLOCK_CPUS=4
191CONFIG_PREEMPT_NONE=y 210CONFIG_PREEMPT_NONE=y
192# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
193# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
@@ -265,15 +284,19 @@ CONFIG_IPV6=m
265# CONFIG_IPV6_TUNNEL is not set 284# CONFIG_IPV6_TUNNEL is not set
266CONFIG_NETFILTER=y 285CONFIG_NETFILTER=y
267# CONFIG_NETFILTER_DEBUG is not set 286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
268CONFIG_NETFILTER_NETLINK=m 291CONFIG_NETFILTER_NETLINK=m
269CONFIG_NETFILTER_NETLINK_QUEUE=m 292CONFIG_NETFILTER_NETLINK_QUEUE=m
270CONFIG_NETFILTER_NETLINK_LOG=m 293CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set
271 295
272# 296#
273# IP: Netfilter Configuration 297# IP: Netfilter Configuration
274# 298#
275# CONFIG_IP_NF_CONNTRACK is not set 299# CONFIG_IP_NF_CONNTRACK is not set
276CONFIG_IP_NF_PPTP=m
277# CONFIG_IP_NF_QUEUE is not set 300# CONFIG_IP_NF_QUEUE is not set
278# CONFIG_IP_NF_IPTABLES is not set 301# CONFIG_IP_NF_IPTABLES is not set
279# CONFIG_IP_NF_ARPTABLES is not set 302# CONFIG_IP_NF_ARPTABLES is not set
@@ -305,6 +328,10 @@ CONFIG_IP_NF_PPTP=m
305# CONFIG_NET_DIVERT is not set 328# CONFIG_NET_DIVERT is not set
306# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
307# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
331
332#
333# QoS and/or fair queueing
334#
308# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
309# CONFIG_NET_CLS_ROUTE is not set 336# CONFIG_NET_CLS_ROUTE is not set
310 337
@@ -355,6 +382,7 @@ CONFIG_MTD_BLOCK=y
355# CONFIG_FTL is not set 382# CONFIG_FTL is not set
356# CONFIG_NFTL is not set 383# CONFIG_NFTL is not set
357# CONFIG_INFTL is not set 384# CONFIG_INFTL is not set
385# CONFIG_RFD_FTL is not set
358 386
359# 387#
360# RAM/ROM/Flash chip drivers 388# RAM/ROM/Flash chip drivers
@@ -412,6 +440,11 @@ CONFIG_MTD_CFI_UTIL=y
412# CONFIG_MTD_NAND is not set 440# CONFIG_MTD_NAND is not set
413 441
414# 442#
443# OneNAND Flash Device Drivers
444#
445# CONFIG_MTD_ONENAND is not set
446
447#
415# Parallel port support 448# Parallel port support
416# 449#
417# CONFIG_PARPORT is not set 450# CONFIG_PARPORT is not set
@@ -438,16 +471,7 @@ CONFIG_BLK_DEV_RAM=y
438CONFIG_BLK_DEV_RAM_COUNT=16 471CONFIG_BLK_DEV_RAM_COUNT=16
439CONFIG_BLK_DEV_RAM_SIZE=8192 472CONFIG_BLK_DEV_RAM_SIZE=8192
440CONFIG_BLK_DEV_INITRD=y 473CONFIG_BLK_DEV_INITRD=y
441# CONFIG_LBD is not set
442# CONFIG_CDROM_PKTCDVD is not set 474# CONFIG_CDROM_PKTCDVD is not set
443
444#
445# IO Schedulers
446#
447CONFIG_IOSCHED_NOOP=y
448CONFIG_IOSCHED_AS=y
449CONFIG_IOSCHED_DEADLINE=y
450CONFIG_IOSCHED_CFQ=y
451# CONFIG_ATA_OVER_ETH is not set 475# CONFIG_ATA_OVER_ETH is not set
452 476
453# 477#
@@ -556,7 +580,6 @@ CONFIG_TUN=m
556# PHY device support 580# PHY device support
557# 581#
558CONFIG_PHYLIB=m 582CONFIG_PHYLIB=m
559CONFIG_PHYCONTROL=y
560 583
561# 584#
562# MII PHY device drivers 585# MII PHY device drivers
@@ -574,6 +597,7 @@ CONFIG_NET_ETHERNET=y
574# CONFIG_MII is not set 597# CONFIG_MII is not set
575# CONFIG_HAPPYMEAL is not set 598# CONFIG_HAPPYMEAL is not set
576# CONFIG_SUNGEM is not set 599# CONFIG_SUNGEM is not set
600# CONFIG_CASSINI is not set
577# CONFIG_NET_VENDOR_3COM is not set 601# CONFIG_NET_VENDOR_3COM is not set
578# CONFIG_NET_VENDOR_SMC is not set 602# CONFIG_NET_VENDOR_SMC is not set
579# CONFIG_NET_VENDOR_RACAL is not set 603# CONFIG_NET_VENDOR_RACAL is not set
@@ -619,7 +643,6 @@ CONFIG_NET_PCI=y
619# CONFIG_TLAN is not set 643# CONFIG_TLAN is not set
620# CONFIG_VIA_RHINE is not set 644# CONFIG_VIA_RHINE is not set
621# CONFIG_LAN_SAA9730 is not set 645# CONFIG_LAN_SAA9730 is not set
622# CONFIG_NET_POCKET is not set
623 646
624# 647#
625# Ethernet (1000 Mbit) 648# Ethernet (1000 Mbit)
@@ -668,7 +691,6 @@ CONFIG_NET_RADIO=y
668# CONFIG_IPW2100 is not set 691# CONFIG_IPW2100 is not set
669# CONFIG_IPW_DEBUG is not set 692# CONFIG_IPW_DEBUG is not set
670CONFIG_IPW2200=m 693CONFIG_IPW2200=m
671# CONFIG_AIRO is not set
672# CONFIG_HERMES is not set 694# CONFIG_HERMES is not set
673# CONFIG_ATMEL is not set 695# CONFIG_ATMEL is not set
674 696
@@ -692,6 +714,7 @@ CONFIG_PPP_ASYNC=m
692CONFIG_PPP_SYNC_TTY=m 714CONFIG_PPP_SYNC_TTY=m
693CONFIG_PPP_DEFLATE=m 715CONFIG_PPP_DEFLATE=m
694# CONFIG_PPP_BSDCOMP is not set 716# CONFIG_PPP_BSDCOMP is not set
717CONFIG_PPP_MPPE=m
695CONFIG_PPPOE=m 718CONFIG_PPPOE=m
696# CONFIG_SLIP is not set 719# CONFIG_SLIP is not set
697# CONFIG_SHAPER is not set 720# CONFIG_SHAPER is not set
@@ -804,6 +827,7 @@ CONFIG_LEGACY_PTY_COUNT=256
804# TPM devices 827# TPM devices
805# 828#
806# CONFIG_TCG_TPM is not set 829# CONFIG_TCG_TPM is not set
830# CONFIG_TELCLOCK is not set
807 831
808# 832#
809# I2C support 833# I2C support
@@ -847,7 +871,6 @@ CONFIG_FB=y
847CONFIG_FB_CFB_FILLRECT=y 871CONFIG_FB_CFB_FILLRECT=y
848CONFIG_FB_CFB_COPYAREA=y 872CONFIG_FB_CFB_COPYAREA=y
849CONFIG_FB_CFB_IMAGEBLIT=y 873CONFIG_FB_CFB_IMAGEBLIT=y
850CONFIG_FB_SOFT_CURSOR=y
851# CONFIG_FB_MACMODES is not set 874# CONFIG_FB_MACMODES is not set
852# CONFIG_FB_MODE_HELPERS is not set 875# CONFIG_FB_MODE_HELPERS is not set
853# CONFIG_FB_TILEBLITTING is not set 876# CONFIG_FB_TILEBLITTING is not set
@@ -856,6 +879,7 @@ CONFIG_FB_SOFT_CURSOR=y
856# CONFIG_FB_CYBER2000 is not set 879# CONFIG_FB_CYBER2000 is not set
857# CONFIG_FB_ASILIANT is not set 880# CONFIG_FB_ASILIANT is not set
858# CONFIG_FB_IMSTT is not set 881# CONFIG_FB_IMSTT is not set
882# CONFIG_FB_S1D13XXX is not set
859# CONFIG_FB_NVIDIA is not set 883# CONFIG_FB_NVIDIA is not set
860# CONFIG_FB_RIVA is not set 884# CONFIG_FB_RIVA is not set
861# CONFIG_FB_MATROX is not set 885# CONFIG_FB_MATROX is not set
@@ -876,7 +900,6 @@ CONFIG_FB_ATY_CT=y
876# CONFIG_FB_SMIVGX is not set 900# CONFIG_FB_SMIVGX is not set
877# CONFIG_FB_CYBLA is not set 901# CONFIG_FB_CYBLA is not set
878# CONFIG_FB_TRIDENT is not set 902# CONFIG_FB_TRIDENT is not set
879# CONFIG_FB_S1D13XXX is not set
880# CONFIG_FB_VIRTUAL is not set 903# CONFIG_FB_VIRTUAL is not set
881 904
882# 905#
@@ -926,12 +949,15 @@ CONFIG_USB=y
926# 949#
927# USB Device Class drivers 950# USB Device Class drivers
928# 951#
929# CONFIG_USB_BLUETOOTH_TTY is not set
930# CONFIG_USB_ACM is not set 952# CONFIG_USB_ACM is not set
931# CONFIG_USB_PRINTER is not set 953# CONFIG_USB_PRINTER is not set
932 954
933# 955#
934# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 956# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
957#
958
959#
960# may also be needed; see USB_STORAGE Help for more information
935# 961#
936# CONFIG_USB_STORAGE is not set 962# CONFIG_USB_STORAGE is not set
937 963
@@ -1106,6 +1132,7 @@ CONFIG_RELAYFS_FS=m
1106CONFIG_JFFS2_FS=y 1132CONFIG_JFFS2_FS=y
1107CONFIG_JFFS2_FS_DEBUG=0 1133CONFIG_JFFS2_FS_DEBUG=0
1108CONFIG_JFFS2_FS_WRITEBUFFER=y 1134CONFIG_JFFS2_FS_WRITEBUFFER=y
1135# CONFIG_JFFS2_SUMMARY is not set
1109# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 1136# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1110CONFIG_JFFS2_ZLIB=y 1137CONFIG_JFFS2_ZLIB=y
1111CONFIG_JFFS2_RTIME=y 1138CONFIG_JFFS2_RTIME=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 988a05824f01..55458062352e 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:03 2005 4# Thu Nov 10 14:02:50 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -59,6 +59,24 @@ CONFIG_MODVERSIONS=y
59CONFIG_KMOD=y 59CONFIG_KMOD=y
60 60
61# 61#
62# Block layer
63#
64# CONFIG_LBD is not set
65
66#
67# IO Schedulers
68#
69CONFIG_IOSCHED_NOOP=y
70CONFIG_IOSCHED_AS=y
71CONFIG_IOSCHED_DEADLINE=y
72CONFIG_IOSCHED_CFQ=y
73CONFIG_DEFAULT_AS=y
74# CONFIG_DEFAULT_DEADLINE is not set
75# CONFIG_DEFAULT_CFQ is not set
76# CONFIG_DEFAULT_NOOP is not set
77CONFIG_DEFAULT_IOSCHED="anticipatory"
78
79#
62# Machine selection 80# Machine selection
63# 81#
64# CONFIG_MIPS_MTX1 is not set 82# CONFIG_MIPS_MTX1 is not set
@@ -190,6 +208,7 @@ CONFIG_FLATMEM_MANUAL=y
190CONFIG_FLATMEM=y 208CONFIG_FLATMEM=y
191CONFIG_FLAT_NODE_MEM_MAP=y 209CONFIG_FLAT_NODE_MEM_MAP=y
192# CONFIG_SPARSEMEM_STATIC is not set 210# CONFIG_SPARSEMEM_STATIC is not set
211CONFIG_SPLIT_PTLOCK_CPUS=4
193# CONFIG_PREEMPT_NONE is not set 212# CONFIG_PREEMPT_NONE is not set
194CONFIG_PREEMPT_VOLUNTARY=y 213CONFIG_PREEMPT_VOLUNTARY=y
195# CONFIG_PREEMPT is not set 214# CONFIG_PREEMPT is not set
@@ -272,6 +291,10 @@ CONFIG_IPV6_TUNNEL=m
272CONFIG_NETFILTER=y 291CONFIG_NETFILTER=y
273# CONFIG_NETFILTER_DEBUG is not set 292# CONFIG_NETFILTER_DEBUG is not set
274CONFIG_BRIDGE_NETFILTER=y 293CONFIG_BRIDGE_NETFILTER=y
294
295#
296# Core Netfilter Configuration
297#
275CONFIG_NETFILTER_NETLINK=m 298CONFIG_NETFILTER_NETLINK=m
276CONFIG_NETFILTER_NETLINK_QUEUE=m 299CONFIG_NETFILTER_NETLINK_QUEUE=m
277CONFIG_NETFILTER_NETLINK_LOG=m 300CONFIG_NETFILTER_NETLINK_LOG=m
@@ -325,6 +348,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
325CONFIG_IP_NF_TARGET_LOG=m 348CONFIG_IP_NF_TARGET_LOG=m
326CONFIG_IP_NF_TARGET_ULOG=m 349CONFIG_IP_NF_TARGET_ULOG=m
327CONFIG_IP_NF_TARGET_TCPMSS=m 350CONFIG_IP_NF_TARGET_TCPMSS=m
351CONFIG_IP_NF_TARGET_NFQUEUE=m
328CONFIG_IP_NF_NAT=m 352CONFIG_IP_NF_NAT=m
329CONFIG_IP_NF_NAT_NEEDED=y 353CONFIG_IP_NF_NAT_NEEDED=y
330CONFIG_IP_NF_TARGET_MASQUERADE=m 354CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -374,6 +398,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
374CONFIG_IP6_NF_FILTER=m 398CONFIG_IP6_NF_FILTER=m
375CONFIG_IP6_NF_TARGET_LOG=m 399CONFIG_IP6_NF_TARGET_LOG=m
376CONFIG_IP6_NF_TARGET_REJECT=m 400CONFIG_IP6_NF_TARGET_REJECT=m
401CONFIG_IP6_NF_TARGET_NFQUEUE=m
377CONFIG_IP6_NF_MANGLE=m 402CONFIG_IP6_NF_MANGLE=m
378CONFIG_IP6_NF_TARGET_MARK=m 403CONFIG_IP6_NF_TARGET_MARK=m
379CONFIG_IP6_NF_TARGET_HL=m 404CONFIG_IP6_NF_TARGET_HL=m
@@ -430,10 +455,18 @@ CONFIG_DECNET=m
430# CONFIG_NET_DIVERT is not set 455# CONFIG_NET_DIVERT is not set
431# CONFIG_ECONET is not set 456# CONFIG_ECONET is not set
432# CONFIG_WAN_ROUTER is not set 457# CONFIG_WAN_ROUTER is not set
458
459#
460# QoS and/or fair queueing
461#
433CONFIG_NET_SCHED=y 462CONFIG_NET_SCHED=y
434CONFIG_NET_SCH_CLK_JIFFIES=y 463CONFIG_NET_SCH_CLK_JIFFIES=y
435# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 464# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
436# CONFIG_NET_SCH_CLK_CPU is not set 465# CONFIG_NET_SCH_CLK_CPU is not set
466
467#
468# Queueing/Scheduling
469#
437CONFIG_NET_SCH_CBQ=m 470CONFIG_NET_SCH_CBQ=m
438CONFIG_NET_SCH_HTB=m 471CONFIG_NET_SCH_HTB=m
439CONFIG_NET_SCH_HFSC=m 472CONFIG_NET_SCH_HFSC=m
@@ -446,8 +479,10 @@ CONFIG_NET_SCH_GRED=m
446CONFIG_NET_SCH_DSMARK=m 479CONFIG_NET_SCH_DSMARK=m
447CONFIG_NET_SCH_NETEM=m 480CONFIG_NET_SCH_NETEM=m
448CONFIG_NET_SCH_INGRESS=m 481CONFIG_NET_SCH_INGRESS=m
449CONFIG_NET_QOS=y 482
450CONFIG_NET_ESTIMATOR=y 483#
484# Classification
485#
451CONFIG_NET_CLS=y 486CONFIG_NET_CLS=y
452CONFIG_NET_CLS_BASIC=m 487CONFIG_NET_CLS_BASIC=m
453CONFIG_NET_CLS_TCINDEX=m 488CONFIG_NET_CLS_TCINDEX=m
@@ -456,13 +491,14 @@ CONFIG_NET_CLS_ROUTE=y
456CONFIG_NET_CLS_FW=m 491CONFIG_NET_CLS_FW=m
457CONFIG_NET_CLS_U32=m 492CONFIG_NET_CLS_U32=m
458# CONFIG_CLS_U32_PERF is not set 493# CONFIG_CLS_U32_PERF is not set
459# CONFIG_NET_CLS_IND is not set
460# CONFIG_CLS_U32_MARK is not set 494# CONFIG_CLS_U32_MARK is not set
461CONFIG_NET_CLS_RSVP=m 495CONFIG_NET_CLS_RSVP=m
462CONFIG_NET_CLS_RSVP6=m 496CONFIG_NET_CLS_RSVP6=m
463# CONFIG_NET_EMATCH is not set 497# CONFIG_NET_EMATCH is not set
464# CONFIG_NET_CLS_ACT is not set 498# CONFIG_NET_CLS_ACT is not set
465CONFIG_NET_CLS_POLICE=y 499CONFIG_NET_CLS_POLICE=y
500# CONFIG_NET_CLS_IND is not set
501CONFIG_NET_ESTIMATOR=y
466 502
467# 503#
468# Network testing 504# Network testing
@@ -583,18 +619,9 @@ CONFIG_BLK_DEV_UB=m
583CONFIG_BLK_DEV_RAM=m 619CONFIG_BLK_DEV_RAM=m
584CONFIG_BLK_DEV_RAM_COUNT=16 620CONFIG_BLK_DEV_RAM_COUNT=16
585CONFIG_BLK_DEV_RAM_SIZE=4096 621CONFIG_BLK_DEV_RAM_SIZE=4096
586# CONFIG_LBD is not set
587CONFIG_CDROM_PKTCDVD=m 622CONFIG_CDROM_PKTCDVD=m
588CONFIG_CDROM_PKTCDVD_BUFFERS=8 623CONFIG_CDROM_PKTCDVD_BUFFERS=8
589# CONFIG_CDROM_PKTCDVD_WCACHE is not set 624# CONFIG_CDROM_PKTCDVD_WCACHE is not set
590
591#
592# IO Schedulers
593#
594CONFIG_IOSCHED_NOOP=y
595CONFIG_IOSCHED_AS=y
596CONFIG_IOSCHED_DEADLINE=y
597CONFIG_IOSCHED_CFQ=y
598CONFIG_ATA_OVER_ETH=m 625CONFIG_ATA_OVER_ETH=m
599 626
600# 627#
@@ -638,6 +665,7 @@ CONFIG_SCSI_SAS_ATTRS=m
638# 665#
639# SCSI low-level drivers 666# SCSI low-level drivers
640# 667#
668CONFIG_ISCSI_TCP=m
641# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 669# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
642# CONFIG_SCSI_3W_9XXX is not set 670# CONFIG_SCSI_3W_9XXX is not set
643# CONFIG_SCSI_ACARD is not set 671# CONFIG_SCSI_ACARD is not set
@@ -651,6 +679,7 @@ CONFIG_SCSI_SAS_ATTRS=m
651CONFIG_MEGARAID_NEWGEN=y 679CONFIG_MEGARAID_NEWGEN=y
652CONFIG_MEGARAID_MM=m 680CONFIG_MEGARAID_MM=m
653CONFIG_MEGARAID_MAILBOX=m 681CONFIG_MEGARAID_MAILBOX=m
682# CONFIG_MEGARAID_SAS is not set
654# CONFIG_SCSI_SATA is not set 683# CONFIG_SCSI_SATA is not set
655# CONFIG_SCSI_DMX3191D is not set 684# CONFIG_SCSI_DMX3191D is not set
656# CONFIG_SCSI_DTC3280 is not set 685# CONFIG_SCSI_DTC3280 is not set
@@ -723,6 +752,7 @@ CONFIG_DM_MULTIPATH_EMC=m
723# CONFIG_FUSION is not set 752# CONFIG_FUSION is not set
724# CONFIG_FUSION_SPI is not set 753# CONFIG_FUSION_SPI is not set
725# CONFIG_FUSION_FC is not set 754# CONFIG_FUSION_FC is not set
755# CONFIG_FUSION_SAS is not set
726 756
727# 757#
728# IEEE 1394 (FireWire) support 758# IEEE 1394 (FireWire) support
@@ -752,7 +782,6 @@ CONFIG_TUN=m
752# PHY device support 782# PHY device support
753# 783#
754CONFIG_PHYLIB=m 784CONFIG_PHYLIB=m
755CONFIG_PHYCONTROL=y
756 785
757# 786#
758# MII PHY device drivers 787# MII PHY device drivers
@@ -770,6 +799,7 @@ CONFIG_NET_ETHERNET=y
770CONFIG_MII=y 799CONFIG_MII=y
771# CONFIG_HAPPYMEAL is not set 800# CONFIG_HAPPYMEAL is not set
772# CONFIG_SUNGEM is not set 801# CONFIG_SUNGEM is not set
802# CONFIG_CASSINI is not set
773# CONFIG_NET_VENDOR_3COM is not set 803# CONFIG_NET_VENDOR_3COM is not set
774# CONFIG_NET_VENDOR_SMC is not set 804# CONFIG_NET_VENDOR_SMC is not set
775# CONFIG_NET_VENDOR_RACAL is not set 805# CONFIG_NET_VENDOR_RACAL is not set
@@ -984,6 +1014,7 @@ CONFIG_RTC=m
984# TPM devices 1014# TPM devices
985# 1015#
986# CONFIG_TCG_TPM is not set 1016# CONFIG_TCG_TPM is not set
1017# CONFIG_TELCLOCK is not set
987 1018
988# 1019#
989# I2C support 1020# I2C support
@@ -1074,12 +1105,15 @@ CONFIG_USB_UHCI_HCD=m
1074# 1105#
1075# USB Device Class drivers 1106# USB Device Class drivers
1076# 1107#
1077CONFIG_USB_BLUETOOTH_TTY=m
1078CONFIG_USB_ACM=m 1108CONFIG_USB_ACM=m
1079CONFIG_USB_PRINTER=m 1109CONFIG_USB_PRINTER=m
1080 1110
1081# 1111#
1082# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 1112# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1113#
1114
1115#
1116# may also be needed; see USB_STORAGE Help for more information
1083# 1117#
1084CONFIG_USB_STORAGE=m 1118CONFIG_USB_STORAGE=m
1085# CONFIG_USB_STORAGE_DEBUG is not set 1119# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1196,6 +1230,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1196CONFIG_USB_SERIAL_KLSI=m 1230CONFIG_USB_SERIAL_KLSI=m
1197CONFIG_USB_SERIAL_KOBIL_SCT=m 1231CONFIG_USB_SERIAL_KOBIL_SCT=m
1198CONFIG_USB_SERIAL_MCT_U232=m 1232CONFIG_USB_SERIAL_MCT_U232=m
1233# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
1199CONFIG_USB_SERIAL_PL2303=m 1234CONFIG_USB_SERIAL_PL2303=m
1200CONFIG_USB_SERIAL_HP4X=m 1235CONFIG_USB_SERIAL_HP4X=m
1201CONFIG_USB_SERIAL_SAFE=m 1236CONFIG_USB_SERIAL_SAFE=m
@@ -1271,7 +1306,7 @@ CONFIG_REISERFS_FS_SECURITY=y
1271CONFIG_FS_POSIX_ACL=y 1306CONFIG_FS_POSIX_ACL=y
1272CONFIG_XFS_FS=m 1307CONFIG_XFS_FS=m
1273CONFIG_XFS_EXPORT=y 1308CONFIG_XFS_EXPORT=y
1274CONFIG_XFS_QUOTA=m 1309CONFIG_XFS_QUOTA=y
1275CONFIG_XFS_SECURITY=y 1310CONFIG_XFS_SECURITY=y
1276# CONFIG_XFS_POSIX_ACL is not set 1311# CONFIG_XFS_POSIX_ACL is not set
1277# CONFIG_XFS_RT is not set 1312# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 4365d9c8c42e..dc453a1e4806 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:05 2005 4# Mon Nov 7 23:06:43 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -59,6 +59,23 @@ CONFIG_KMOD=y
59CONFIG_STOP_MACHINE=y 59CONFIG_STOP_MACHINE=y
60 60
61# 61#
62# Block layer
63#
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
62# Machine selection 79# Machine selection
63# 80#
64# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -126,8 +143,8 @@ CONFIG_CPU_SB1_PASS_1=y
126# CONFIG_CPU_SB1_PASS_3 is not set 143# CONFIG_CPU_SB1_PASS_3 is not set
127CONFIG_SIBYTE_HAS_LDT=y 144CONFIG_SIBYTE_HAS_LDT=y
128# CONFIG_SIMULATION is not set 145# CONFIG_SIMULATION is not set
129# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set 146# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
130# CONFIG_CONFIG_SB1_CERR_STALL is not set 147# CONFIG_SB1_CERR_STALL is not set
131CONFIG_SIBYTE_CFE=y 148CONFIG_SIBYTE_CFE=y
132# CONFIG_SIBYTE_CFE_CONSOLE is not set 149# CONFIG_SIBYTE_CFE_CONSOLE is not set
133# CONFIG_SIBYTE_BUS_WATCHER is not set 150# CONFIG_SIBYTE_BUS_WATCHER is not set
@@ -200,6 +217,7 @@ CONFIG_FLATMEM_MANUAL=y
200CONFIG_FLATMEM=y 217CONFIG_FLATMEM=y
201CONFIG_FLAT_NODE_MEM_MAP=y 218CONFIG_FLAT_NODE_MEM_MAP=y
202# CONFIG_SPARSEMEM_STATIC is not set 219# CONFIG_SPARSEMEM_STATIC is not set
220CONFIG_SPLIT_PTLOCK_CPUS=4
203CONFIG_SMP=y 221CONFIG_SMP=y
204CONFIG_NR_CPUS=2 222CONFIG_NR_CPUS=2
205CONFIG_PREEMPT_NONE=y 223CONFIG_PREEMPT_NONE=y
@@ -295,6 +313,10 @@ CONFIG_TCP_CONG_BIC=y
295# CONFIG_NET_DIVERT is not set 313# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 314# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 315# CONFIG_WAN_ROUTER is not set
316
317#
318# QoS and/or fair queueing
319#
298# CONFIG_NET_SCHED is not set 320# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set 321# CONFIG_NET_CLS_ROUTE is not set
300 322
@@ -359,14 +381,6 @@ CONFIG_BLK_DEV_INITRD=y
359CONFIG_CDROM_PKTCDVD=m 381CONFIG_CDROM_PKTCDVD=m
360CONFIG_CDROM_PKTCDVD_BUFFERS=8 382CONFIG_CDROM_PKTCDVD_BUFFERS=8
361# CONFIG_CDROM_PKTCDVD_WCACHE is not set 383# CONFIG_CDROM_PKTCDVD_WCACHE is not set
362
363#
364# IO Schedulers
365#
366CONFIG_IOSCHED_NOOP=y
367CONFIG_IOSCHED_AS=y
368CONFIG_IOSCHED_DEADLINE=y
369CONFIG_IOSCHED_CFQ=y
370CONFIG_ATA_OVER_ETH=m 384CONFIG_ATA_OVER_ETH=m
371 385
372# 386#
@@ -441,7 +455,6 @@ CONFIG_NETDEVICES=y
441# PHY device support 455# PHY device support
442# 456#
443CONFIG_PHYLIB=m 457CONFIG_PHYLIB=m
444CONFIG_PHYCONTROL=y
445 458
446# 459#
447# MII PHY device drivers 460# MII PHY device drivers
@@ -459,6 +472,7 @@ CONFIG_NET_ETHERNET=y
459CONFIG_MII=y 472CONFIG_MII=y
460# CONFIG_HAPPYMEAL is not set 473# CONFIG_HAPPYMEAL is not set
461# CONFIG_SUNGEM is not set 474# CONFIG_SUNGEM is not set
475# CONFIG_CASSINI is not set
462# CONFIG_NET_VENDOR_3COM is not set 476# CONFIG_NET_VENDOR_3COM is not set
463 477
464# 478#
@@ -599,6 +613,7 @@ CONFIG_LEGACY_PTY_COUNT=256
599# TPM devices 613# TPM devices
600# 614#
601# CONFIG_TCG_TPM is not set 615# CONFIG_TCG_TPM is not set
616# CONFIG_TELCLOCK is not set
602 617
603# 618#
604# I2C support 619# I2C support
@@ -652,6 +667,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
652# CONFIG_USB is not set 667# CONFIG_USB is not set
653 668
654# 669#
670# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
671#
672
673#
655# USB Gadget Support 674# USB Gadget Support
656# 675#
657# CONFIG_USB_GADGET is not set 676# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index d835f6db1f41..aa27d583162d 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:07 2005 4# Mon Nov 7 23:06:45 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -48,6 +48,24 @@ CONFIG_BASE_SMALL=0
48# CONFIG_MODULES is not set 48# CONFIG_MODULES is not set
49 49
50# 50#
51# Block layer
52#
53# CONFIG_LBD is not set
54
55#
56# IO Schedulers
57#
58CONFIG_IOSCHED_NOOP=y
59CONFIG_IOSCHED_AS=y
60CONFIG_IOSCHED_DEADLINE=y
61CONFIG_IOSCHED_CFQ=y
62CONFIG_DEFAULT_AS=y
63# CONFIG_DEFAULT_DEADLINE is not set
64# CONFIG_DEFAULT_CFQ is not set
65# CONFIG_DEFAULT_NOOP is not set
66CONFIG_DEFAULT_IOSCHED="anticipatory"
67
68#
51# Machine selection 69# Machine selection
52# 70#
53# CONFIG_MIPS_MTX1 is not set 71# CONFIG_MIPS_MTX1 is not set
@@ -173,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
@@ -242,18 +261,9 @@ CONFIG_BLK_DEV_RAM=y
242CONFIG_BLK_DEV_RAM_COUNT=16 261CONFIG_BLK_DEV_RAM_COUNT=16
243CONFIG_BLK_DEV_RAM_SIZE=18432 262CONFIG_BLK_DEV_RAM_SIZE=18432
244CONFIG_BLK_DEV_INITRD=y 263CONFIG_BLK_DEV_INITRD=y
245# CONFIG_LBD is not set
246# CONFIG_CDROM_PKTCDVD is not set 264# CONFIG_CDROM_PKTCDVD is not set
247 265
248# 266#
249# IO Schedulers
250#
251CONFIG_IOSCHED_NOOP=y
252CONFIG_IOSCHED_AS=y
253CONFIG_IOSCHED_DEADLINE=y
254CONFIG_IOSCHED_CFQ=y
255
256#
257# ATA/ATAPI/MFM/RLL support 267# ATA/ATAPI/MFM/RLL support
258# 268#
259# CONFIG_IDE is not set 269# CONFIG_IDE is not set
@@ -353,6 +363,7 @@ CONFIG_LEGACY_PTY_COUNT=256
353# 363#
354# TPM devices 364# TPM devices
355# 365#
366# CONFIG_TELCLOCK is not set
356 367
357# 368#
358# I2C support 369# I2C support
@@ -404,6 +415,10 @@ CONFIG_LEGACY_PTY_COUNT=256
404# CONFIG_USB_ARCH_HAS_OHCI is not set 415# CONFIG_USB_ARCH_HAS_OHCI is not set
405 416
406# 417#
418# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
419#
420
421#
407# USB Gadget Support 422# USB Gadget Support
408# 423#
409# CONFIG_USB_GADGET is not set 424# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index bf60a17de2b0..ddc7e45996f2 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:10 2005 4# Mon Nov 7 23:06:49 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -183,6 +201,7 @@ CONFIG_FLATMEM_MANUAL=y
183CONFIG_FLATMEM=y 201CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y 202CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set 203# CONFIG_SPARSEMEM_STATIC is not set
204CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_PREEMPT_NONE=y 205CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 206# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 207# CONFIG_PREEMPT is not set
@@ -277,6 +296,10 @@ CONFIG_TCP_CONG_BIC=y
277# CONFIG_NET_DIVERT is not set 296# CONFIG_NET_DIVERT is not set
278# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
279# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
299
300#
301# QoS and/or fair queueing
302#
280# CONFIG_NET_SCHED is not set 303# CONFIG_NET_SCHED is not set
281# CONFIG_NET_CLS_ROUTE is not set 304# CONFIG_NET_CLS_ROUTE is not set
282 305
@@ -339,16 +362,7 @@ CONFIG_BLK_DEV_NBD=m
339CONFIG_BLK_DEV_RAM=m 362CONFIG_BLK_DEV_RAM=m
340CONFIG_BLK_DEV_RAM_COUNT=16 363CONFIG_BLK_DEV_RAM_COUNT=16
341CONFIG_BLK_DEV_RAM_SIZE=4096 364CONFIG_BLK_DEV_RAM_SIZE=4096
342# CONFIG_LBD is not set
343# CONFIG_CDROM_PKTCDVD is not set 365# CONFIG_CDROM_PKTCDVD is not set
344
345#
346# IO Schedulers
347#
348CONFIG_IOSCHED_NOOP=y
349CONFIG_IOSCHED_AS=y
350CONFIG_IOSCHED_DEADLINE=y
351CONFIG_IOSCHED_CFQ=y
352CONFIG_ATA_OVER_ETH=m 366CONFIG_ATA_OVER_ETH=m
353 367
354# 368#
@@ -385,12 +399,13 @@ CONFIG_SCSI_MULTI_LUN=y
385# 399#
386# CONFIG_SCSI_SPI_ATTRS is not set 400# CONFIG_SCSI_SPI_ATTRS is not set
387# CONFIG_SCSI_FC_ATTRS is not set 401# CONFIG_SCSI_FC_ATTRS is not set
388# CONFIG_SCSI_ISCSI_ATTRS is not set 402CONFIG_SCSI_ISCSI_ATTRS=m
389# CONFIG_SCSI_SAS_ATTRS is not set 403# CONFIG_SCSI_SAS_ATTRS is not set
390 404
391# 405#
392# SCSI low-level drivers 406# SCSI low-level drivers
393# 407#
408CONFIG_ISCSI_TCP=m
394# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 409# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
395# CONFIG_SCSI_3W_9XXX is not set 410# CONFIG_SCSI_3W_9XXX is not set
396# CONFIG_SCSI_ACARD is not set 411# CONFIG_SCSI_ACARD is not set
@@ -401,6 +416,7 @@ CONFIG_SCSI_MULTI_LUN=y
401# CONFIG_SCSI_DPT_I2O is not set 416# CONFIG_SCSI_DPT_I2O is not set
402# CONFIG_MEGARAID_NEWGEN is not set 417# CONFIG_MEGARAID_NEWGEN is not set
403# CONFIG_MEGARAID_LEGACY is not set 418# CONFIG_MEGARAID_LEGACY is not set
419# CONFIG_MEGARAID_SAS is not set
404# CONFIG_SCSI_SATA is not set 420# CONFIG_SCSI_SATA is not set
405# CONFIG_SCSI_DMX3191D is not set 421# CONFIG_SCSI_DMX3191D is not set
406# CONFIG_SCSI_FUTURE_DOMAIN is not set 422# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -435,6 +451,7 @@ CONFIG_SCSI_QLA2XXX=y
435# CONFIG_FUSION is not set 451# CONFIG_FUSION is not set
436# CONFIG_FUSION_SPI is not set 452# CONFIG_FUSION_SPI is not set
437# CONFIG_FUSION_FC is not set 453# CONFIG_FUSION_FC is not set
454# CONFIG_FUSION_SAS is not set
438 455
439# 456#
440# IEEE 1394 (FireWire) support 457# IEEE 1394 (FireWire) support
@@ -464,7 +481,6 @@ CONFIG_NETDEVICES=y
464# PHY device support 481# PHY device support
465# 482#
466CONFIG_PHYLIB=m 483CONFIG_PHYLIB=m
467CONFIG_PHYCONTROL=y
468 484
469# 485#
470# MII PHY device drivers 486# MII PHY device drivers
@@ -482,6 +498,7 @@ CONFIG_NET_ETHERNET=y
482CONFIG_MII=y 498CONFIG_MII=y
483# CONFIG_HAPPYMEAL is not set 499# CONFIG_HAPPYMEAL is not set
484# CONFIG_SUNGEM is not set 500# CONFIG_SUNGEM is not set
501# CONFIG_CASSINI is not set
485# CONFIG_NET_VENDOR_3COM is not set 502# CONFIG_NET_VENDOR_3COM is not set
486 503
487# 504#
@@ -634,6 +651,7 @@ CONFIG_LEGACY_PTY_COUNT=256
634# CONFIG_WATCHDOG is not set 651# CONFIG_WATCHDOG is not set
635# CONFIG_RTC is not set 652# CONFIG_RTC is not set
636# CONFIG_GEN_RTC is not set 653# CONFIG_GEN_RTC is not set
654# CONFIG_RTC_VR41XX is not set
637# CONFIG_DTLK is not set 655# CONFIG_DTLK is not set
638# CONFIG_R3964 is not set 656# CONFIG_R3964 is not set
639# CONFIG_APPLICOM is not set 657# CONFIG_APPLICOM is not set
@@ -650,6 +668,7 @@ CONFIG_GPIO_VR41XX=y
650# TPM devices 668# TPM devices
651# 669#
652# CONFIG_TCG_TPM is not set 670# CONFIG_TCG_TPM is not set
671# CONFIG_TELCLOCK is not set
653 672
654# 673#
655# I2C support 674# I2C support
@@ -733,12 +752,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
733# 752#
734# USB Device Class drivers 753# USB Device Class drivers
735# 754#
736# CONFIG_USB_BLUETOOTH_TTY is not set
737# CONFIG_USB_ACM is not set 755# CONFIG_USB_ACM is not set
738# CONFIG_USB_PRINTER is not set 756# CONFIG_USB_PRINTER is not set
739 757
740# 758#
741# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 759# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
760#
761
762#
763# may also be needed; see USB_STORAGE Help for more information
742# 764#
743CONFIG_USB_STORAGE=m 765CONFIG_USB_STORAGE=m
744# CONFIG_USB_STORAGE_DEBUG is not set 766# CONFIG_USB_STORAGE_DEBUG is not set
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index ac8b64e87b8a..e8c82f011e98 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:13 2005 4# Wed Nov 9 11:11:47 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -183,6 +201,7 @@ CONFIG_FLATMEM_MANUAL=y
183CONFIG_FLATMEM=y 201CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y 202CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set 203# CONFIG_SPARSEMEM_STATIC is not set
204CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_PREEMPT_NONE=y 205CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 206# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 207# CONFIG_PREEMPT is not set
@@ -278,6 +297,10 @@ CONFIG_TCP_CONG_BIC=y
278# CONFIG_NET_DIVERT is not set 297# CONFIG_NET_DIVERT is not set
279# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
280# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
300
301#
302# QoS and/or fair queueing
303#
281# CONFIG_NET_SCHED is not set 304# CONFIG_NET_SCHED is not set
282# CONFIG_NET_CLS_ROUTE is not set 305# CONFIG_NET_CLS_ROUTE is not set
283 306
@@ -341,18 +364,9 @@ CONFIG_BLK_DEV_RAM=y
341CONFIG_BLK_DEV_RAM_COUNT=16 364CONFIG_BLK_DEV_RAM_COUNT=16
342CONFIG_BLK_DEV_RAM_SIZE=4096 365CONFIG_BLK_DEV_RAM_SIZE=4096
343# CONFIG_BLK_DEV_INITRD is not set 366# CONFIG_BLK_DEV_INITRD is not set
344# CONFIG_LBD is not set
345CONFIG_CDROM_PKTCDVD=m 367CONFIG_CDROM_PKTCDVD=m
346CONFIG_CDROM_PKTCDVD_BUFFERS=8 368CONFIG_CDROM_PKTCDVD_BUFFERS=8
347# CONFIG_CDROM_PKTCDVD_WCACHE is not set 369# CONFIG_CDROM_PKTCDVD_WCACHE is not set
348
349#
350# IO Schedulers
351#
352CONFIG_IOSCHED_NOOP=y
353CONFIG_IOSCHED_AS=y
354CONFIG_IOSCHED_DEADLINE=y
355CONFIG_IOSCHED_CFQ=y
356CONFIG_ATA_OVER_ETH=m 370CONFIG_ATA_OVER_ETH=m
357 371
358# 372#
@@ -404,7 +418,6 @@ CONFIG_DUMMY=m
404# PHY device support 418# PHY device support
405# 419#
406CONFIG_PHYLIB=m 420CONFIG_PHYLIB=m
407CONFIG_PHYCONTROL=y
408 421
409# 422#
410# MII PHY device drivers 423# MII PHY device drivers
@@ -422,6 +435,7 @@ CONFIG_NET_ETHERNET=y
422CONFIG_MII=y 435CONFIG_MII=y
423# CONFIG_HAPPYMEAL is not set 436# CONFIG_HAPPYMEAL is not set
424# CONFIG_SUNGEM is not set 437# CONFIG_SUNGEM is not set
438# CONFIG_CASSINI is not set
425# CONFIG_NET_VENDOR_3COM is not set 439# CONFIG_NET_VENDOR_3COM is not set
426 440
427# 441#
@@ -504,6 +518,7 @@ CONFIG_PPP_ASYNC=m
504CONFIG_PPP_SYNC_TTY=m 518CONFIG_PPP_SYNC_TTY=m
505CONFIG_PPP_DEFLATE=m 519CONFIG_PPP_DEFLATE=m
506CONFIG_PPP_BSDCOMP=m 520CONFIG_PPP_BSDCOMP=m
521CONFIG_PPP_MPPE=m
507CONFIG_PPPOE=m 522CONFIG_PPPOE=m
508CONFIG_SLIP=m 523CONFIG_SLIP=m
509CONFIG_SLIP_COMPRESSED=y 524CONFIG_SLIP_COMPRESSED=y
@@ -589,6 +604,7 @@ CONFIG_LEGACY_PTY_COUNT=256
589# CONFIG_WATCHDOG is not set 604# CONFIG_WATCHDOG is not set
590# CONFIG_RTC is not set 605# CONFIG_RTC is not set
591# CONFIG_GEN_RTC is not set 606# CONFIG_GEN_RTC is not set
607# CONFIG_RTC_VR41XX is not set
592# CONFIG_DTLK is not set 608# CONFIG_DTLK is not set
593# CONFIG_R3964 is not set 609# CONFIG_R3964 is not set
594# CONFIG_APPLICOM is not set 610# CONFIG_APPLICOM is not set
@@ -605,6 +621,7 @@ CONFIG_GPIO_VR41XX=y
605# TPM devices 621# TPM devices
606# 622#
607# CONFIG_TCG_TPM is not set 623# CONFIG_TCG_TPM is not set
624# CONFIG_TELCLOCK is not set
608 625
609# 626#
610# I2C support 627# I2C support
@@ -688,12 +705,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
688# 705#
689# USB Device Class drivers 706# USB Device Class drivers
690# 707#
691# CONFIG_USB_BLUETOOTH_TTY is not set
692# CONFIG_USB_ACM is not set 708# CONFIG_USB_ACM is not set
693# CONFIG_USB_PRINTER is not set 709# CONFIG_USB_PRINTER is not set
694 710
695# 711#
696# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
713#
714
715#
716# may also be needed; see USB_STORAGE Help for more information
697# 717#
698# CONFIG_USB_STORAGE is not set 718# CONFIG_USB_STORAGE is not set
699 719
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index ab13621ef3b9..125b2997abfe 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.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:27:16 2005 4# Tue Nov 15 11:17:02 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -273,6 +292,10 @@ CONFIG_TCP_CONG_BIC=y
273# CONFIG_NET_DIVERT is not set 292# CONFIG_NET_DIVERT is not set
274# CONFIG_ECONET is not set 293# CONFIG_ECONET is not set
275# CONFIG_WAN_ROUTER is not set 294# CONFIG_WAN_ROUTER is not set
295
296#
297# QoS and/or fair queueing
298#
276# CONFIG_NET_SCHED is not set 299# CONFIG_NET_SCHED is not set
277# CONFIG_NET_CLS_ROUTE is not set 300# CONFIG_NET_CLS_ROUTE is not set
278 301
@@ -328,16 +351,7 @@ CONFIG_CONNECTOR=m
328# CONFIG_BLK_DEV_NBD is not set 351# CONFIG_BLK_DEV_NBD is not set
329# CONFIG_BLK_DEV_RAM is not set 352# CONFIG_BLK_DEV_RAM is not set
330CONFIG_BLK_DEV_RAM_COUNT=16 353CONFIG_BLK_DEV_RAM_COUNT=16
331# CONFIG_LBD is not set
332# CONFIG_CDROM_PKTCDVD is not set 354# CONFIG_CDROM_PKTCDVD is not set
333
334#
335# IO Schedulers
336#
337CONFIG_IOSCHED_NOOP=y
338CONFIG_IOSCHED_AS=y
339CONFIG_IOSCHED_DEADLINE=y
340CONFIG_IOSCHED_CFQ=y
341CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
342 356
343# 357#
@@ -415,7 +429,6 @@ CONFIG_NETDEVICES=y
415# PHY device support 429# PHY device support
416# 430#
417CONFIG_PHYLIB=m 431CONFIG_PHYLIB=m
418CONFIG_PHYCONTROL=y
419 432
420# 433#
421# MII PHY device drivers 434# MII PHY device drivers
@@ -439,7 +452,6 @@ CONFIG_MII=m
439# CONFIG_HP100 is not set 452# CONFIG_HP100 is not set
440# CONFIG_NET_ISA is not set 453# CONFIG_NET_ISA is not set
441# CONFIG_NET_PCI is not set 454# CONFIG_NET_PCI is not set
442# CONFIG_NET_POCKET is not set
443 455
444# 456#
445# Ethernet (1000 Mbit) 457# Ethernet (1000 Mbit)
@@ -577,6 +589,7 @@ CONFIG_WATCHDOG=y
577# CONFIG_WDT is not set 589# CONFIG_WDT is not set
578# CONFIG_RTC is not set 590# CONFIG_RTC is not set
579# CONFIG_GEN_RTC is not set 591# CONFIG_GEN_RTC is not set
592# CONFIG_RTC_VR41XX is not set
580# CONFIG_DTLK is not set 593# CONFIG_DTLK is not set
581# CONFIG_R3964 is not set 594# CONFIG_R3964 is not set
582 595
@@ -588,12 +601,15 @@ CONFIG_WATCHDOG=y
588# PCMCIA character devices 601# PCMCIA character devices
589# 602#
590# CONFIG_SYNCLINK_CS is not set 603# CONFIG_SYNCLINK_CS is not set
604# CONFIG_CARDMAN_4000 is not set
605# CONFIG_CARDMAN_4040 is not set
591# CONFIG_GPIO_VR41XX is not set 606# CONFIG_GPIO_VR41XX is not set
592# CONFIG_RAW_DRIVER is not set 607# CONFIG_RAW_DRIVER is not set
593 608
594# 609#
595# TPM devices 610# TPM devices
596# 611#
612# CONFIG_TELCLOCK is not set
597 613
598# 614#
599# I2C support 615# I2C support
@@ -653,6 +669,10 @@ CONFIG_DUMMY_CONSOLE=y
653# CONFIG_USB_ARCH_HAS_OHCI is not set 669# CONFIG_USB_ARCH_HAS_OHCI is not set
654 670
655# 671#
672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
673#
674
675#
656# USB Gadget Support 676# USB Gadget Support
657# 677#
658# CONFIG_USB_GADGET is not set 678# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 5b0b7f30e205..d90790b2ab30 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:18 2005 4# Mon Nov 7 23:06:59 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_KMOD=y
58CONFIG_STOP_MACHINE=y 58CONFIG_STOP_MACHINE=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_SMP=y 203CONFIG_SMP=y
185CONFIG_NR_CPUS=2 204CONFIG_NR_CPUS=2
186CONFIG_PREEMPT_NONE=y 205CONFIG_PREEMPT_NONE=y
@@ -260,6 +279,10 @@ CONFIG_IPV6_TUNNEL=m
260# CONFIG_LLC2 is not set 279# CONFIG_LLC2 is not set
261# CONFIG_IPX is not set 280# CONFIG_IPX is not set
262# CONFIG_ATALK is not set 281# CONFIG_ATALK is not set
282
283#
284# QoS and/or fair queueing
285#
263# CONFIG_NET_SCHED is not set 286# CONFIG_NET_SCHED is not set
264# CONFIG_NET_CLS_ROUTE is not set 287# CONFIG_NET_CLS_ROUTE is not set
265 288
@@ -319,18 +342,9 @@ CONFIG_CONNECTOR=m
319# CONFIG_BLK_DEV_SX8 is not set 342# CONFIG_BLK_DEV_SX8 is not set
320# CONFIG_BLK_DEV_RAM is not set 343# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 344CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=m 345CONFIG_CDROM_PKTCDVD=m
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 346CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 347# CONFIG_CDROM_PKTCDVD_WCACHE is not set
326
327#
328# IO Schedulers
329#
330CONFIG_IOSCHED_NOOP=y
331CONFIG_IOSCHED_AS=y
332CONFIG_IOSCHED_DEADLINE=y
333CONFIG_IOSCHED_CFQ=y
334CONFIG_ATA_OVER_ETH=m 348CONFIG_ATA_OVER_ETH=m
335 349
336# 350#
@@ -382,7 +396,6 @@ CONFIG_NETDEVICES=y
382# PHY device support 396# PHY device support
383# 397#
384CONFIG_PHYLIB=m 398CONFIG_PHYLIB=m
385CONFIG_PHYCONTROL=y
386 399
387# 400#
388# MII PHY device drivers 401# MII PHY device drivers
@@ -400,6 +413,7 @@ CONFIG_NET_ETHERNET=y
400CONFIG_MII=y 413CONFIG_MII=y
401# CONFIG_HAPPYMEAL is not set 414# CONFIG_HAPPYMEAL is not set
402# CONFIG_SUNGEM is not set 415# CONFIG_SUNGEM is not set
416# CONFIG_CASSINI is not set
403# CONFIG_NET_VENDOR_3COM is not set 417# CONFIG_NET_VENDOR_3COM is not set
404 418
405# 419#
@@ -576,6 +590,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
576# CONFIG_USB is not set 590# CONFIG_USB is not set
577 591
578# 592#
593# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
594#
595
596#
579# USB Gadget Support 597# USB Gadget Support
580# 598#
581# CONFIG_USB_GADGET is not set 599# CONFIG_USB_GADGET is not set
@@ -690,6 +708,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
690# CONFIG_DEBUG_HIGHMEM is not set 708# CONFIG_DEBUG_HIGHMEM is not set
691# CONFIG_DEBUG_INFO is not set 709# CONFIG_DEBUG_INFO is not set
692# CONFIG_DEBUG_FS is not set 710# CONFIG_DEBUG_FS is not set
711# CONFIG_DEBUG_VM is not set
712# CONFIG_RCU_TORTURE_TEST is not set
693CONFIG_CROSSCOMPILE=y 713CONFIG_CROSSCOMPILE=y
694CONFIG_CMDLINE="" 714CONFIG_CMDLINE=""
695# CONFIG_DEBUG_STACK_USAGE is not set 715# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 4b585e642c2a..e9086da02e48 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.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:09 2005 4# Thu Nov 10 12:13:58 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -187,6 +205,7 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 205CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 206CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 207# CONFIG_SPARSEMEM_STATIC is not set
208CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PREEMPT_NONE is not set 209# CONFIG_PREEMPT_NONE is not set
191CONFIG_PREEMPT_VOLUNTARY=y 210CONFIG_PREEMPT_VOLUNTARY=y
192# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
@@ -292,6 +311,10 @@ CONFIG_INET6_TUNNEL=m
292CONFIG_IPV6_TUNNEL=m 311CONFIG_IPV6_TUNNEL=m
293CONFIG_NETFILTER=y 312CONFIG_NETFILTER=y
294# CONFIG_NETFILTER_DEBUG is not set 313# CONFIG_NETFILTER_DEBUG is not set
314
315#
316# Core Netfilter Configuration
317#
295CONFIG_NETFILTER_NETLINK=m 318CONFIG_NETFILTER_NETLINK=m
296CONFIG_NETFILTER_NETLINK_QUEUE=m 319CONFIG_NETFILTER_NETLINK_QUEUE=m
297CONFIG_NETFILTER_NETLINK_LOG=m 320CONFIG_NETFILTER_NETLINK_LOG=m
@@ -345,6 +368,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
345CONFIG_IP_NF_TARGET_LOG=m 368CONFIG_IP_NF_TARGET_LOG=m
346CONFIG_IP_NF_TARGET_ULOG=m 369CONFIG_IP_NF_TARGET_ULOG=m
347CONFIG_IP_NF_TARGET_TCPMSS=m 370CONFIG_IP_NF_TARGET_TCPMSS=m
371CONFIG_IP_NF_TARGET_NFQUEUE=m
348CONFIG_IP_NF_NAT=m 372CONFIG_IP_NF_NAT=m
349CONFIG_IP_NF_NAT_NEEDED=y 373CONFIG_IP_NF_NAT_NEEDED=y
350CONFIG_IP_NF_TARGET_MASQUERADE=m 374CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -393,6 +417,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
393CONFIG_IP6_NF_FILTER=m 417CONFIG_IP6_NF_FILTER=m
394CONFIG_IP6_NF_TARGET_LOG=m 418CONFIG_IP6_NF_TARGET_LOG=m
395CONFIG_IP6_NF_TARGET_REJECT=m 419CONFIG_IP6_NF_TARGET_REJECT=m
420CONFIG_IP6_NF_TARGET_NFQUEUE=m
396CONFIG_IP6_NF_MANGLE=m 421CONFIG_IP6_NF_MANGLE=m
397CONFIG_IP6_NF_TARGET_MARK=m 422CONFIG_IP6_NF_TARGET_MARK=m
398CONFIG_IP6_NF_TARGET_HL=m 423CONFIG_IP6_NF_TARGET_HL=m
@@ -424,10 +449,18 @@ CONFIG_SCTP_HMAC_MD5=y
424CONFIG_NET_DIVERT=y 449CONFIG_NET_DIVERT=y
425# CONFIG_ECONET is not set 450# CONFIG_ECONET is not set
426# CONFIG_WAN_ROUTER is not set 451# CONFIG_WAN_ROUTER is not set
452
453#
454# QoS and/or fair queueing
455#
427CONFIG_NET_SCHED=y 456CONFIG_NET_SCHED=y
428# CONFIG_NET_SCH_CLK_JIFFIES is not set 457# CONFIG_NET_SCH_CLK_JIFFIES is not set
429CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 458CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
430# CONFIG_NET_SCH_CLK_CPU is not set 459# CONFIG_NET_SCH_CLK_CPU is not set
460
461#
462# Queueing/Scheduling
463#
431CONFIG_NET_SCH_CBQ=m 464CONFIG_NET_SCH_CBQ=m
432CONFIG_NET_SCH_HTB=m 465CONFIG_NET_SCH_HTB=m
433CONFIG_NET_SCH_HFSC=m 466CONFIG_NET_SCH_HFSC=m
@@ -440,8 +473,10 @@ CONFIG_NET_SCH_GRED=m
440CONFIG_NET_SCH_DSMARK=m 473CONFIG_NET_SCH_DSMARK=m
441CONFIG_NET_SCH_NETEM=m 474CONFIG_NET_SCH_NETEM=m
442CONFIG_NET_SCH_INGRESS=m 475CONFIG_NET_SCH_INGRESS=m
443CONFIG_NET_QOS=y 476
444CONFIG_NET_ESTIMATOR=y 477#
478# Classification
479#
445CONFIG_NET_CLS=y 480CONFIG_NET_CLS=y
446CONFIG_NET_CLS_BASIC=m 481CONFIG_NET_CLS_BASIC=m
447CONFIG_NET_CLS_TCINDEX=m 482CONFIG_NET_CLS_TCINDEX=m
@@ -450,13 +485,14 @@ CONFIG_NET_CLS_ROUTE=y
450CONFIG_NET_CLS_FW=m 485CONFIG_NET_CLS_FW=m
451CONFIG_NET_CLS_U32=m 486CONFIG_NET_CLS_U32=m
452# CONFIG_CLS_U32_PERF is not set 487# CONFIG_CLS_U32_PERF is not set
453# CONFIG_NET_CLS_IND is not set
454# CONFIG_CLS_U32_MARK is not set 488# CONFIG_CLS_U32_MARK is not set
455CONFIG_NET_CLS_RSVP=m 489CONFIG_NET_CLS_RSVP=m
456CONFIG_NET_CLS_RSVP6=m 490CONFIG_NET_CLS_RSVP6=m
457# CONFIG_NET_EMATCH is not set 491# CONFIG_NET_EMATCH is not set
458# CONFIG_NET_CLS_ACT is not set 492# CONFIG_NET_CLS_ACT is not set
459CONFIG_NET_CLS_POLICE=y 493CONFIG_NET_CLS_POLICE=y
494# CONFIG_NET_CLS_IND is not set
495CONFIG_NET_ESTIMATOR=y
460 496
461# 497#
462# Network testing 498# Network testing
@@ -509,18 +545,9 @@ CONFIG_CONNECTOR=m
509# CONFIG_BLK_DEV_NBD is not set 545# CONFIG_BLK_DEV_NBD is not set
510# CONFIG_BLK_DEV_RAM is not set 546# CONFIG_BLK_DEV_RAM is not set
511CONFIG_BLK_DEV_RAM_COUNT=16 547CONFIG_BLK_DEV_RAM_COUNT=16
512# CONFIG_LBD is not set
513CONFIG_CDROM_PKTCDVD=m 548CONFIG_CDROM_PKTCDVD=m
514CONFIG_CDROM_PKTCDVD_BUFFERS=8 549CONFIG_CDROM_PKTCDVD_BUFFERS=8
515# CONFIG_CDROM_PKTCDVD_WCACHE is not set 550# CONFIG_CDROM_PKTCDVD_WCACHE is not set
516
517#
518# IO Schedulers
519#
520CONFIG_IOSCHED_NOOP=y
521CONFIG_IOSCHED_AS=y
522CONFIG_IOSCHED_DEADLINE=y
523CONFIG_IOSCHED_CFQ=y
524CONFIG_ATA_OVER_ETH=m 551CONFIG_ATA_OVER_ETH=m
525 552
526# 553#
@@ -564,6 +591,7 @@ CONFIG_SCSI_SAS_ATTRS=m
564# 591#
565# SCSI low-level drivers 592# SCSI low-level drivers
566# 593#
594CONFIG_ISCSI_TCP=m
567CONFIG_SGIWD93_SCSI=y 595CONFIG_SGIWD93_SCSI=y
568# CONFIG_SCSI_SATA is not set 596# CONFIG_SCSI_SATA is not set
569# CONFIG_SCSI_DEBUG is not set 597# CONFIG_SCSI_DEBUG is not set
@@ -599,7 +627,6 @@ CONFIG_TUN=m
599# PHY device support 627# PHY device support
600# 628#
601CONFIG_PHYLIB=m 629CONFIG_PHYLIB=m
602CONFIG_PHYCONTROL=y
603 630
604# 631#
605# MII PHY device drivers 632# MII PHY device drivers
@@ -752,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256
752# 779#
753# TPM devices 780# TPM devices
754# 781#
782# CONFIG_TELCLOCK is not set
755 783
756# 784#
757# I2C support 785# I2C support
@@ -821,6 +849,10 @@ CONFIG_LOGO_SGI_CLUT224=y
821# CONFIG_USB_ARCH_HAS_OHCI is not set 849# CONFIG_USB_ARCH_HAS_OHCI is not set
822 850
823# 851#
852# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
853#
854
855#
824# USB Gadget Support 856# USB Gadget Support
825# 857#
826# CONFIG_USB_GADGET is not set 858# CONFIG_USB_GADGET is not set
@@ -856,7 +888,7 @@ CONFIG_FS_MBCACHE=y
856CONFIG_FS_POSIX_ACL=y 888CONFIG_FS_POSIX_ACL=y
857CONFIG_XFS_FS=m 889CONFIG_XFS_FS=m
858CONFIG_XFS_EXPORT=y 890CONFIG_XFS_EXPORT=y
859CONFIG_XFS_QUOTA=m 891CONFIG_XFS_QUOTA=y
860CONFIG_XFS_SECURITY=y 892CONFIG_XFS_SECURITY=y
861# CONFIG_XFS_POSIX_ACL is not set 893# CONFIG_XFS_POSIX_ACL is not set
862# CONFIG_XFS_RT is not set 894# CONFIG_XFS_RT is not set
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-25 21:57:19 -0500