aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig14
-rw-r--r--arch/mips/Makefile2
-rw-r--r--arch/mips/au1000/common/power.c1
-rw-r--r--arch/mips/au1000/common/setup.c2
-rw-r--r--arch/mips/au1000/common/usbdev.c4
-rw-r--r--arch/mips/au1000/db1x00/board_setup.c7
-rw-r--r--arch/mips/au1000/db1x00/init.c12
-rw-r--r--arch/mips/configs/atlas_defconfig169
-rw-r--r--arch/mips/configs/bigsur_defconfig159
-rw-r--r--arch/mips/configs/capcella_defconfig147
-rw-r--r--arch/mips/configs/cobalt_defconfig136
-rw-r--r--arch/mips/configs/db1000_defconfig173
-rw-r--r--arch/mips/configs/db1100_defconfig173
-rw-r--r--arch/mips/configs/db1200_defconfig179
-rw-r--r--arch/mips/configs/db1500_defconfig262
-rw-r--r--arch/mips/configs/db1550_defconfig173
-rw-r--r--arch/mips/configs/ddb5476_defconfig140
-rw-r--r--arch/mips/configs/ddb5477_defconfig136
-rw-r--r--arch/mips/configs/decstation_defconfig161
-rw-r--r--arch/mips/configs/e55_defconfig148
-rw-r--r--arch/mips/configs/ev64120_defconfig148
-rw-r--r--arch/mips/configs/ev96100_defconfig147
-rw-r--r--arch/mips/configs/ip22_defconfig170
-rw-r--r--arch/mips/configs/ip27_defconfig172
-rw-r--r--arch/mips/configs/ip32_defconfig139
-rw-r--r--arch/mips/configs/it8172_defconfig157
-rw-r--r--arch/mips/configs/ivr_defconfig152
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig142
-rw-r--r--arch/mips/configs/jmr3927_defconfig138
-rw-r--r--arch/mips/configs/lasat200_defconfig153
-rw-r--r--arch/mips/configs/malta_defconfig175
-rw-r--r--arch/mips/configs/mipssim_defconfig159
-rw-r--r--arch/mips/configs/mpc30x_defconfig151
-rw-r--r--arch/mips/configs/ocelot_3_defconfig165
-rw-r--r--arch/mips/configs/ocelot_c_defconfig134
-rw-r--r--arch/mips/configs/ocelot_defconfig136
-rw-r--r--arch/mips/configs/ocelot_g_defconfig134
-rw-r--r--arch/mips/configs/pb1100_defconfig172
-rw-r--r--arch/mips/configs/pb1500_defconfig173
-rw-r--r--arch/mips/configs/pb1550_defconfig173
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig185
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig193
-rw-r--r--arch/mips/configs/qemu_defconfig132
-rw-r--r--arch/mips/configs/rbhma4500_defconfig169
-rw-r--r--arch/mips/configs/rm200_defconfig178
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig153
-rw-r--r--arch/mips/configs/sead_defconfig122
-rw-r--r--arch/mips/configs/tb0226_defconfig155
-rw-r--r--arch/mips/configs/tb0229_defconfig151
-rw-r--r--arch/mips/configs/workpad_defconfig150
-rw-r--r--arch/mips/configs/yosemite_defconfig150
-rw-r--r--arch/mips/ddb5xxx/ddb5477/lcd44780.c10
-rw-r--r--arch/mips/defconfig170
-rw-r--r--arch/mips/jmr3927/common/rtc_ds1742.c2
-rw-r--r--arch/mips/jmr3927/rbhma3100/irq.c28
-rw-r--r--arch/mips/jmr3927/rbhma3100/setup.c4
-rw-r--r--arch/mips/kernel/Makefile3
-rw-r--r--arch/mips/kernel/cpu-probe.c43
-rw-r--r--arch/mips/kernel/ioctl32.c50
-rw-r--r--arch/mips/kernel/irixsig.c4
-rw-r--r--arch/mips/kernel/linux32.c4
-rw-r--r--arch/mips/kernel/process.c12
-rw-r--r--arch/mips/kernel/ptrace.c22
-rw-r--r--arch/mips/kernel/ptrace32.c44
-rw-r--r--arch/mips/kernel/reset.c6
-rw-r--r--arch/mips/kernel/scall32-o32.S18
-rw-r--r--arch/mips/kernel/scall64-64.S18
-rw-r--r--arch/mips/kernel/scall64-n32.S4
-rw-r--r--arch/mips/kernel/scall64-o32.S4
-rw-r--r--arch/mips/kernel/signal.c2
-rw-r--r--arch/mips/kernel/signal32.c4
-rw-r--r--arch/mips/kernel/smp_mt.c7
-rw-r--r--arch/mips/kernel/syscall.c3
-rw-r--r--arch/mips/kernel/sysirix.c1
-rw-r--r--arch/mips/kernel/time.c32
-rw-r--r--arch/mips/kernel/traps.c7
-rw-r--r--arch/mips/kernel/vpe.c11
-rw-r--r--arch/mips/lib/iomap.c2
-rw-r--r--arch/mips/math-emu/dp_fint.c2
-rw-r--r--arch/mips/math-emu/dp_flong.c2
-rw-r--r--arch/mips/math-emu/sp_fint.c2
-rw-r--r--arch/mips/math-emu/sp_flong.c2
-rw-r--r--arch/mips/mips-boards/generic/time.c33
-rw-r--r--arch/mips/mips-boards/sead/sead_int.c12
-rw-r--r--arch/mips/mips-boards/sead/sead_setup.c4
-rw-r--r--arch/mips/mm/c-r4k.c4
-rw-r--r--arch/mips/mm/init.c4
-rw-r--r--arch/mips/momentum/ocelot_g/gt-irq.c2
-rw-r--r--arch/mips/oprofile/common.c3
-rw-r--r--arch/mips/oprofile/op_impl.h4
-rw-r--r--arch/mips/oprofile/op_model_mipsxx.c22
-rw-r--r--arch/mips/pci/Makefile2
-rw-r--r--arch/mips/pci/fixup-capcella.c2
-rw-r--r--arch/mips/pci/fixup-mpc30x.c2
-rw-r--r--arch/mips/pci/fixup-tb0219.c2
-rw-r--r--arch/mips/pci/fixup-tb0226.c2
-rw-r--r--arch/mips/pci/fixup-tb0287.c2
-rw-r--r--arch/mips/pci/ops-tx3927.c114
-rw-r--r--arch/mips/pci/ops-vr41xx.c2
-rw-r--r--arch/mips/pci/pci-jmr3927.c2
-rw-r--r--arch/mips/pci/pci-vr41xx.c2
-rw-r--r--arch/mips/pci/pci-vr41xx.h2
-rw-r--r--arch/mips/pmc-sierra/yosemite/smp.c4
-rw-r--r--arch/mips/qemu/q-firmware.c13
-rw-r--r--arch/mips/sgi-ip27/ip27-berr.c1
-rw-r--r--arch/mips/sgi-ip27/ip27-smp.c4
-rw-r--r--arch/mips/sgi-ip32/crime.c7
-rw-r--r--arch/mips/sibyte/cfe/smp.c2
-rw-r--r--arch/mips/vr41xx/casio-e55/setup.c2
-rw-r--r--arch/mips/vr41xx/common/bcu.c4
-rw-r--r--arch/mips/vr41xx/common/cmu.c4
-rw-r--r--arch/mips/vr41xx/common/icu.c4
-rw-r--r--arch/mips/vr41xx/common/init.c2
-rw-r--r--arch/mips/vr41xx/common/int-handler.S2
-rw-r--r--arch/mips/vr41xx/common/irq.c2
-rw-r--r--arch/mips/vr41xx/common/pmu.c2
-rw-r--r--arch/mips/vr41xx/common/type.c2
-rw-r--r--arch/mips/vr41xx/common/vrc4173.c4
-rw-r--r--arch/mips/vr41xx/ibm-workpad/setup.c2
119 files changed, 4506 insertions, 3326 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e380a8322a..c3e852e995 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -6,8 +6,6 @@ config MIPS
6 6
7mainmenu "Linux/MIPS Kernel Configuration" 7mainmenu "Linux/MIPS Kernel Configuration"
8 8
9source "init/Kconfig"
10
11menu "Machine selection" 9menu "Machine selection"
12 10
13choice 11choice
@@ -1473,7 +1471,7 @@ config SB1_PASS_2_1_WORKAROUNDS
1473 1471
1474config 64BIT_PHYS_ADDR 1472config 64BIT_PHYS_ADDR
1475 bool "Support for 64-bit physical address space" 1473 bool "Support for 64-bit physical address space"
1476 depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32_R1 || CPU_MIPS64_R1) && 32BIT 1474 depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
1477 1475
1478config CPU_ADVANCED 1476config CPU_ADVANCED
1479 bool "Override CPU Options" 1477 bool "Override CPU Options"
@@ -1494,14 +1492,6 @@ config CPU_HAS_LLSC
1494 for better performance, N if you don't know. You must say Y here 1492 for better performance, N if you don't know. You must say Y here
1495 for multiprocessor machines. 1493 for multiprocessor machines.
1496 1494
1497config CPU_HAS_LLDSCD
1498 bool "lld/scd Instructions available" if CPU_ADVANCED
1499 default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32_R1
1500 help
1501 Say Y here if your CPU has the lld and scd instructions, the 64-bit
1502 equivalents of ll and sc. Say Y here for better performance, N if
1503 you don't know. You must say Y here for multiprocessor machines.
1504
1505config CPU_HAS_WB 1495config CPU_HAS_WB
1506 bool "Writeback Buffer available" if CPU_ADVANCED 1496 bool "Writeback Buffer available" if CPU_ADVANCED
1507 default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION 1497 default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION
@@ -1643,6 +1633,8 @@ config RWSEM_GENERIC_SPINLOCK
1643 bool 1633 bool
1644 default y 1634 default y
1645 1635
1636source "init/Kconfig"
1637
1646menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)" 1638menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
1647 1639
1648config HW_HAS_EISA 1640config HW_HAS_EISA
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 0269202773..2a9f2ef27b 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -93,7 +93,6 @@ endif
93# 93#
94cflags-y += -I $(TOPDIR)/include/asm/gcc 94cflags-y += -I $(TOPDIR)/include/asm/gcc
95cflags-y += -G 0 -mno-abicalls -fno-pic -pipe 95cflags-y += -G 0 -mno-abicalls -fno-pic -pipe
96cflags-y += $(call cc-option, -finline-limit=100000)
97LDFLAGS_vmlinux += -G 0 -static -n -nostdlib 96LDFLAGS_vmlinux += -G 0 -static -n -nostdlib
98MODFLAGS += -mlong-calls 97MODFLAGS += -mlong-calls
99 98
@@ -700,6 +699,7 @@ load-$(CONFIG_SNI_RM200_PCI) += 0xffffffff80600000
700# 699#
701core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \ 700core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \
702 arch/mips/jmr3927/common/ 701 arch/mips/jmr3927/common/
702cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
703load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000 703load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
704 704
705# 705#
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index f85093b8d5..f4926315fb 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -32,6 +32,7 @@
32#include <linux/config.h> 32#include <linux/config.h>
33#include <linux/init.h> 33#include <linux/init.h>
34#include <linux/pm.h> 34#include <linux/pm.h>
35#include <linux/pm_legacy.h>
35#include <linux/slab.h> 36#include <linux/slab.h>
36#include <linux/sysctl.h> 37#include <linux/sysctl.h>
37#include <linux/jiffies.h> 38#include <linux/jiffies.h>
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 4f21f42d09..08c8c855cc 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -93,7 +93,7 @@ void __init plat_setup(void)
93 93
94 argptr = prom_getcmdline(); 94 argptr = prom_getcmdline();
95 95
96#ifdef CONFIG_SERIAL_AU1X00_CONSOLE 96#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
97 if ((argptr = strstr(argptr, "console=")) == NULL) { 97 if ((argptr = strstr(argptr, "console=")) == NULL) {
98 argptr = prom_getcmdline(); 98 argptr = prom_getcmdline();
99 strcat(argptr, " console=ttyS0,115200"); 99 strcat(argptr, " console=ttyS0,115200");
diff --git a/arch/mips/au1000/common/usbdev.c b/arch/mips/au1000/common/usbdev.c
index 0b21bed7ee..2cab762970 100644
--- a/arch/mips/au1000/common/usbdev.c
+++ b/arch/mips/au1000/common/usbdev.c
@@ -348,7 +348,7 @@ endpoint_stall(endpoint_t * ep)
348{ 348{
349 u32 cs; 349 u32 cs;
350 350
351 warn(__FUNCTION__); 351 warn("%s", __FUNCTION__);
352 352
353 cs = au_readl(ep->reg->ctrl_stat) | USBDEV_CS_STALL; 353 cs = au_readl(ep->reg->ctrl_stat) | USBDEV_CS_STALL;
354 au_writel(cs, ep->reg->ctrl_stat); 354 au_writel(cs, ep->reg->ctrl_stat);
@@ -360,7 +360,7 @@ endpoint_unstall(endpoint_t * ep)
360{ 360{
361 u32 cs; 361 u32 cs;
362 362
363 warn(__FUNCTION__); 363 warn("%s", __FUNCTION__);
364 364
365 cs = au_readl(ep->reg->ctrl_stat) & ~USBDEV_CS_STALL; 365 cs = au_readl(ep->reg->ctrl_stat) & ~USBDEV_CS_STALL;
366 au_writel(cs, ep->reg->ctrl_stat); 366 au_writel(cs, ep->reg->ctrl_stat);
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c
index ac05ba0ff6..f00ec3b175 100644
--- a/arch/mips/au1000/db1x00/board_setup.c
+++ b/arch/mips/au1000/db1x00/board_setup.c
@@ -45,13 +45,12 @@
45#include <asm/mach-au1x00/au1000.h> 45#include <asm/mach-au1x00/au1000.h>
46#include <asm/mach-db1x00/db1x00.h> 46#include <asm/mach-db1x00/db1x00.h>
47 47
48/* not correct for db1550 */ 48static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
49static BCSR * const bcsr = (BCSR *)0xAE000000;
50 49
51void board_reset (void) 50void board_reset (void)
52{ 51{
53 /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ 52 /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
54 au_writel(0x00000000, 0xAE00001C); 53 bcsr->swreset = 0x0000;
55} 54}
56 55
57void __init board_setup(void) 56void __init board_setup(void)
@@ -75,7 +74,7 @@ void __init board_setup(void)
75 bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF; 74 bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF;
76 au_sync(); 75 au_sync();
77#endif 76#endif
78 au_writel(0, 0xAE000010); /* turn off pcmcia power */ 77 bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */
79 78
80#ifdef CONFIG_MIPS_MIRAGE 79#ifdef CONFIG_MIPS_MIRAGE
81 /* enable GPIO[31:0] inputs */ 80 /* enable GPIO[31:0] inputs */
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 4b9d5e46ed..41e0522f3c 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -61,7 +61,17 @@ void __init prom_init(void)
61 prom_envp = (char **) fw_arg2; 61 prom_envp = (char **) fw_arg2;
62 62
63 mips_machgroup = MACH_GROUP_ALCHEMY; 63 mips_machgroup = MACH_GROUP_ALCHEMY;
64 mips_machtype = MACH_DB1000; /* set the platform # */ 64
65 /* Set the platform # */
66#if defined (CONFIG_MIPS_DB1550)
67 mips_machtype = MACH_DB1550;
68#elif defined (CONFIG_MIPS_DB1500)
69 mips_machtype = MACH_DB1500;
70#elif defined (CONFIG_MIPS_DB1100)
71 mips_machtype = MACH_DB1100;
72#else
73 mips_machtype = MACH_DB1000;
74#endif
65 75
66 prom_init_cmdline(); 76 prom_init_cmdline();
67 77
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 132ec3dac6..89c21572a5 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:13 2005 4# Thu Nov 24 01:05:52 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -191,11 +140,81 @@ CONFIG_FLATMEM_MANUAL=y
191CONFIG_FLATMEM=y 140CONFIG_FLATMEM=y
192CONFIG_FLAT_NODE_MEM_MAP=y 141CONFIG_FLAT_NODE_MEM_MAP=y
193# CONFIG_SPARSEMEM_STATIC is not set 142# CONFIG_SPARSEMEM_STATIC is not set
143CONFIG_SPLIT_PTLOCK_CPUS=4
194CONFIG_PREEMPT_NONE=y 144CONFIG_PREEMPT_NONE=y
195# CONFIG_PREEMPT_VOLUNTARY is not set 145# CONFIG_PREEMPT_VOLUNTARY is not set
196# CONFIG_PREEMPT is not set 146# CONFIG_PREEMPT is not set
197 147
198# 148#
149# Code maturity level options
150#
151CONFIG_EXPERIMENTAL=y
152CONFIG_CLEAN_COMPILE=y
153CONFIG_BROKEN_ON_SMP=y
154CONFIG_INIT_ENV_ARG_LIMIT=32
155
156#
157# General setup
158#
159CONFIG_LOCALVERSION=""
160CONFIG_LOCALVERSION_AUTO=y
161CONFIG_SWAP=y
162CONFIG_SYSVIPC=y
163# CONFIG_POSIX_MQUEUE is not set
164# CONFIG_BSD_PROCESS_ACCT is not set
165CONFIG_SYSCTL=y
166# CONFIG_AUDIT is not set
167CONFIG_HOTPLUG=y
168CONFIG_KOBJECT_UEVENT=y
169# CONFIG_IKCONFIG is not set
170CONFIG_INITRAMFS_SOURCE=""
171CONFIG_EMBEDDED=y
172CONFIG_KALLSYMS=y
173# CONFIG_KALLSYMS_EXTRA_PASS is not set
174CONFIG_PRINTK=y
175CONFIG_BUG=y
176CONFIG_BASE_FULL=y
177CONFIG_FUTEX=y
178CONFIG_EPOLL=y
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
180CONFIG_SHMEM=y
181CONFIG_CC_ALIGN_FUNCTIONS=0
182CONFIG_CC_ALIGN_LABELS=0
183CONFIG_CC_ALIGN_LOOPS=0
184CONFIG_CC_ALIGN_JUMPS=0
185# CONFIG_TINY_SHMEM is not set
186CONFIG_BASE_SMALL=0
187
188#
189# Loadable module support
190#
191CONFIG_MODULES=y
192CONFIG_MODULE_UNLOAD=y
193# CONFIG_MODULE_FORCE_UNLOAD is not set
194CONFIG_OBSOLETE_MODPARM=y
195CONFIG_MODVERSIONS=y
196CONFIG_MODULE_SRCVERSION_ALL=y
197CONFIG_KMOD=y
198
199#
200# Block layer
201#
202# CONFIG_LBD is not set
203
204#
205# IO Schedulers
206#
207CONFIG_IOSCHED_NOOP=y
208CONFIG_IOSCHED_AS=y
209CONFIG_IOSCHED_DEADLINE=y
210CONFIG_IOSCHED_CFQ=y
211CONFIG_DEFAULT_AS=y
212# CONFIG_DEFAULT_DEADLINE is not set
213# CONFIG_DEFAULT_CFQ is not set
214# CONFIG_DEFAULT_NOOP is not set
215CONFIG_DEFAULT_IOSCHED="anticipatory"
216
217#
199# Bus options (PCI, PCMCIA, EISA, ISA, TC) 218# Bus options (PCI, PCMCIA, EISA, ISA, TC)
200# 219#
201CONFIG_HW_HAS_PCI=y 220CONFIG_HW_HAS_PCI=y
@@ -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 25e8a08e68..6fd3537798 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,66 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:17 2005 4# Thu Nov 24 01:05:54 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_LOCK_KERNEL=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31# CONFIG_CPUSETS is not set
32CONFIG_INITRAMFS_SOURCE=""
33CONFIG_EMBEDDED=y
34CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_ALL is not set
36# CONFIG_KALLSYMS_EXTRA_PASS is not set
37CONFIG_PRINTK=y
38CONFIG_BUG=y
39CONFIG_BASE_FULL=y
40CONFIG_FUTEX=y
41CONFIG_EPOLL=y
42# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
43CONFIG_SHMEM=y
44CONFIG_CC_ALIGN_FUNCTIONS=0
45CONFIG_CC_ALIGN_LABELS=0
46CONFIG_CC_ALIGN_LOOPS=0
47CONFIG_CC_ALIGN_JUMPS=0
48# CONFIG_TINY_SHMEM is not set
49CONFIG_BASE_SMALL=0
50
51#
52# Loadable module support
53#
54CONFIG_MODULES=y
55CONFIG_MODULE_UNLOAD=y
56# CONFIG_MODULE_FORCE_UNLOAD is not set
57CONFIG_OBSOLETE_MODPARM=y
58CONFIG_MODVERSIONS=y
59CONFIG_MODULE_SRCVERSION_ALL=y
60CONFIG_KMOD=y
61CONFIG_STOP_MACHINE=y
62
63#
64# Machine selection 9# Machine selection
65# 10#
66# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -127,8 +72,8 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
127# CONFIG_CPU_SB1_PASS_2_112x is not set 72# CONFIG_CPU_SB1_PASS_2_112x is not set
128# CONFIG_CPU_SB1_PASS_3 is not set 73# CONFIG_CPU_SB1_PASS_3 is not set
129# CONFIG_SIMULATION is not set 74# CONFIG_SIMULATION is not set
130# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set 75# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
131# CONFIG_CONFIG_SB1_CERR_STALL is not set 76# CONFIG_SB1_CERR_STALL is not set
132CONFIG_SIBYTE_CFE=y 77CONFIG_SIBYTE_CFE=y
133# CONFIG_SIBYTE_CFE_CONSOLE is not set 78# CONFIG_SIBYTE_CFE_CONSOLE is not set
134# CONFIG_SIBYTE_BUS_WATCHER is not set 79# CONFIG_SIBYTE_BUS_WATCHER is not set
@@ -185,7 +130,6 @@ CONFIG_PAGE_SIZE_4KB=y
185# CONFIG_SIBYTE_DMA_PAGEOPS is not set 130# CONFIG_SIBYTE_DMA_PAGEOPS is not set
186# CONFIG_MIPS_MT is not set 131# CONFIG_MIPS_MT is not set
187CONFIG_CPU_HAS_LLSC=y 132CONFIG_CPU_HAS_LLSC=y
188CONFIG_CPU_HAS_LLDSCD=y
189CONFIG_CPU_HAS_SYNC=y 133CONFIG_CPU_HAS_SYNC=y
190CONFIG_GENERIC_HARDIRQS=y 134CONFIG_GENERIC_HARDIRQS=y
191CONFIG_GENERIC_IRQ_PROBE=y 135CONFIG_GENERIC_IRQ_PROBE=y
@@ -198,6 +142,7 @@ CONFIG_FLATMEM_MANUAL=y
198CONFIG_FLATMEM=y 142CONFIG_FLATMEM=y
199CONFIG_FLAT_NODE_MEM_MAP=y 143CONFIG_FLAT_NODE_MEM_MAP=y
200# CONFIG_SPARSEMEM_STATIC is not set 144# CONFIG_SPARSEMEM_STATIC is not set
145CONFIG_SPLIT_PTLOCK_CPUS=4
201CONFIG_SMP=y 146CONFIG_SMP=y
202CONFIG_NR_CPUS=4 147CONFIG_NR_CPUS=4
203CONFIG_PREEMPT_NONE=y 148CONFIG_PREEMPT_NONE=y
@@ -206,6 +151,78 @@ CONFIG_PREEMPT_NONE=y
206# CONFIG_PREEMPT_BKL is not set 151# CONFIG_PREEMPT_BKL is not set
207 152
208# 153#
154# Code maturity level options
155#
156CONFIG_EXPERIMENTAL=y
157CONFIG_CLEAN_COMPILE=y
158CONFIG_LOCK_KERNEL=y
159CONFIG_INIT_ENV_ARG_LIMIT=32
160
161#
162# General setup
163#
164CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y
167CONFIG_SYSVIPC=y
168# CONFIG_POSIX_MQUEUE is not set
169# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y
171# CONFIG_AUDIT is not set
172# CONFIG_HOTPLUG is not set
173CONFIG_KOBJECT_UEVENT=y
174CONFIG_IKCONFIG=y
175CONFIG_IKCONFIG_PROC=y
176# CONFIG_CPUSETS is not set
177CONFIG_INITRAMFS_SOURCE=""
178CONFIG_EMBEDDED=y
179CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_ALL is not set
181# CONFIG_KALLSYMS_EXTRA_PASS is not set
182CONFIG_PRINTK=y
183CONFIG_BUG=y
184CONFIG_BASE_FULL=y
185CONFIG_FUTEX=y
186CONFIG_EPOLL=y
187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SHMEM=y
189CONFIG_CC_ALIGN_FUNCTIONS=0
190CONFIG_CC_ALIGN_LABELS=0
191CONFIG_CC_ALIGN_LOOPS=0
192CONFIG_CC_ALIGN_JUMPS=0
193# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0
195
196#
197# Loadable module support
198#
199CONFIG_MODULES=y
200CONFIG_MODULE_UNLOAD=y
201# CONFIG_MODULE_FORCE_UNLOAD is not set
202CONFIG_OBSOLETE_MODPARM=y
203CONFIG_MODVERSIONS=y
204CONFIG_MODULE_SRCVERSION_ALL=y
205CONFIG_KMOD=y
206CONFIG_STOP_MACHINE=y
207
208#
209# Block layer
210#
211
212#
213# IO Schedulers
214#
215CONFIG_IOSCHED_NOOP=y
216CONFIG_IOSCHED_AS=y
217CONFIG_IOSCHED_DEADLINE=y
218CONFIG_IOSCHED_CFQ=y
219CONFIG_DEFAULT_AS=y
220# CONFIG_DEFAULT_DEADLINE is not set
221# CONFIG_DEFAULT_CFQ is not set
222# CONFIG_DEFAULT_NOOP is not set
223CONFIG_DEFAULT_IOSCHED="anticipatory"
224
225#
209# Bus options (PCI, PCMCIA, EISA, ISA, TC) 226# Bus options (PCI, PCMCIA, EISA, ISA, TC)
210# 227#
211CONFIG_HW_HAS_PCI=y 228CONFIG_HW_HAS_PCI=y
@@ -295,8 +312,11 @@ CONFIG_TCP_CONG_BIC=y
295# CONFIG_NET_DIVERT is not set 312# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 313# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 314# CONFIG_WAN_ROUTER is not set
315
316#
317# QoS and/or fair queueing
318#
298# CONFIG_NET_SCHED is not set 319# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set
300 320
301# 321#
302# Network testing 322# Network testing
@@ -353,14 +373,6 @@ CONFIG_BLK_DEV_NBD=m
353# CONFIG_BLK_DEV_RAM is not set 373# CONFIG_BLK_DEV_RAM is not set
354CONFIG_BLK_DEV_RAM_COUNT=16 374CONFIG_BLK_DEV_RAM_COUNT=16
355# CONFIG_CDROM_PKTCDVD is not set 375# 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 376# CONFIG_ATA_OVER_ETH is not set
365 377
366# 378#
@@ -443,6 +455,7 @@ CONFIG_NET_ETHERNET=y
443CONFIG_MII=y 455CONFIG_MII=y
444# CONFIG_HAPPYMEAL is not set 456# CONFIG_HAPPYMEAL is not set
445# CONFIG_SUNGEM is not set 457# CONFIG_SUNGEM is not set
458# CONFIG_CASSINI is not set
446# CONFIG_NET_VENDOR_3COM is not set 459# CONFIG_NET_VENDOR_3COM is not set
447 460
448# 461#
@@ -582,6 +595,7 @@ CONFIG_GEN_RTC=y
582# TPM devices 595# TPM devices
583# 596#
584# CONFIG_TCG_TPM is not set 597# CONFIG_TCG_TPM is not set
598# CONFIG_TELCLOCK is not set
585 599
586# 600#
587# I2C support 601# I2C support
@@ -634,6 +648,7 @@ CONFIG_SENSORS_PCA9539=y
634CONFIG_SENSORS_PCF8591=y 648CONFIG_SENSORS_PCF8591=y
635CONFIG_SENSORS_RTC8564=y 649CONFIG_SENSORS_RTC8564=y
636CONFIG_SENSORS_MAX6875=y 650CONFIG_SENSORS_MAX6875=y
651# CONFIG_RTC_X1205_I2C is not set
637CONFIG_I2C_DEBUG_CORE=y 652CONFIG_I2C_DEBUG_CORE=y
638CONFIG_I2C_DEBUG_ALGO=y 653CONFIG_I2C_DEBUG_ALGO=y
639CONFIG_I2C_DEBUG_BUS=y 654CONFIG_I2C_DEBUG_BUS=y
@@ -686,6 +701,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
686# CONFIG_USB is not set 701# CONFIG_USB is not set
687 702
688# 703#
704# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
705#
706
707#
689# USB Gadget Support 708# USB Gadget Support
690# 709#
691# CONFIG_USB_GADGET is not set 710# CONFIG_USB_GADGET is not set
@@ -823,6 +842,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
823# CONFIG_DEBUG_KOBJECT is not set 842# CONFIG_DEBUG_KOBJECT is not set
824# CONFIG_DEBUG_INFO is not set 843# CONFIG_DEBUG_INFO is not set
825# CONFIG_DEBUG_FS is not set 844# CONFIG_DEBUG_FS is not set
845# CONFIG_DEBUG_VM is not set
846# CONFIG_RCU_TORTURE_TEST is not set
826CONFIG_CROSSCOMPILE=y 847CONFIG_CROSSCOMPILE=y
827CONFIG_CMDLINE="" 848CONFIG_CMDLINE=""
828# CONFIG_DEBUG_STACK_USAGE is not set 849# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index bfbaa08c47..5261e29ccf 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:20 2005 4# Thu Nov 24 01:05:55 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -182,11 +131,81 @@ CONFIG_FLATMEM_MANUAL=y
182CONFIG_FLATMEM=y 131CONFIG_FLATMEM=y
183CONFIG_FLAT_NODE_MEM_MAP=y 132CONFIG_FLAT_NODE_MEM_MAP=y
184# CONFIG_SPARSEMEM_STATIC is not set 133# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_PREEMPT_NONE=y 135CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 136# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
188 138
189# 139#
140# Code maturity level options
141#
142CONFIG_EXPERIMENTAL=y
143CONFIG_CLEAN_COMPILE=y
144CONFIG_BROKEN_ON_SMP=y
145CONFIG_INIT_ENV_ARG_LIMIT=32
146
147#
148# General setup
149#
150CONFIG_LOCALVERSION=""
151CONFIG_LOCALVERSION_AUTO=y
152CONFIG_SWAP=y
153CONFIG_SYSVIPC=y
154# CONFIG_POSIX_MQUEUE is not set
155# CONFIG_BSD_PROCESS_ACCT is not set
156CONFIG_SYSCTL=y
157# CONFIG_AUDIT is not set
158CONFIG_HOTPLUG=y
159CONFIG_KOBJECT_UEVENT=y
160# CONFIG_IKCONFIG is not set
161CONFIG_INITRAMFS_SOURCE=""
162CONFIG_EMBEDDED=y
163CONFIG_KALLSYMS=y
164# CONFIG_KALLSYMS_EXTRA_PASS is not set
165CONFIG_PRINTK=y
166CONFIG_BUG=y
167CONFIG_BASE_FULL=y
168CONFIG_FUTEX=y
169CONFIG_EPOLL=y
170# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
171CONFIG_SHMEM=y
172CONFIG_CC_ALIGN_FUNCTIONS=0
173CONFIG_CC_ALIGN_LABELS=0
174CONFIG_CC_ALIGN_LOOPS=0
175CONFIG_CC_ALIGN_JUMPS=0
176# CONFIG_TINY_SHMEM is not set
177CONFIG_BASE_SMALL=0
178
179#
180# Loadable module support
181#
182CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y
188CONFIG_KMOD=y
189
190#
191# Block layer
192#
193# CONFIG_LBD is not set
194
195#
196# IO Schedulers
197#
198CONFIG_IOSCHED_NOOP=y
199CONFIG_IOSCHED_AS=y
200CONFIG_IOSCHED_DEADLINE=y
201CONFIG_IOSCHED_CFQ=y
202CONFIG_DEFAULT_AS=y
203# CONFIG_DEFAULT_DEADLINE is not set
204# CONFIG_DEFAULT_CFQ is not set
205# CONFIG_DEFAULT_NOOP is not set
206CONFIG_DEFAULT_IOSCHED="anticipatory"
207
208#
190# Bus options (PCI, PCMCIA, EISA, ISA, TC) 209# Bus options (PCI, PCMCIA, EISA, ISA, TC)
191# 210#
192CONFIG_HW_HAS_PCI=y 211CONFIG_HW_HAS_PCI=y
@@ -270,8 +289,11 @@ 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
275 297
276# 298#
277# Network testing 299# Network testing
@@ -329,16 +351,7 @@ CONFIG_CONNECTOR=m
329# CONFIG_BLK_DEV_SX8 is not set 351# CONFIG_BLK_DEV_SX8 is not set
330# CONFIG_BLK_DEV_RAM is not set 352# CONFIG_BLK_DEV_RAM is not set
331CONFIG_BLK_DEV_RAM_COUNT=16 353CONFIG_BLK_DEV_RAM_COUNT=16
332# CONFIG_LBD is not set
333# CONFIG_CDROM_PKTCDVD is not set 354# 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 355CONFIG_ATA_OVER_ETH=m
343 356
344# 357#
@@ -412,7 +425,6 @@ CONFIG_NETDEVICES=y
412# PHY device support 425# PHY device support
413# 426#
414CONFIG_PHYLIB=m 427CONFIG_PHYLIB=m
415CONFIG_PHYCONTROL=y
416 428
417# 429#
418# MII PHY device drivers 430# MII PHY device drivers
@@ -430,6 +442,7 @@ CONFIG_NET_ETHERNET=y
430CONFIG_MII=y 442CONFIG_MII=y
431# CONFIG_HAPPYMEAL is not set 443# CONFIG_HAPPYMEAL is not set
432# CONFIG_SUNGEM is not set 444# CONFIG_SUNGEM is not set
445# CONFIG_CASSINI is not set
433# CONFIG_NET_VENDOR_3COM is not set 446# CONFIG_NET_VENDOR_3COM is not set
434 447
435# 448#
@@ -586,6 +599,7 @@ CONFIG_LEGACY_PTY_COUNT=256
586# CONFIG_WATCHDOG is not set 599# CONFIG_WATCHDOG is not set
587# CONFIG_RTC is not set 600# CONFIG_RTC is not set
588# CONFIG_GEN_RTC is not set 601# CONFIG_GEN_RTC is not set
602# CONFIG_RTC_VR41XX is not set
589# CONFIG_DTLK is not set 603# CONFIG_DTLK is not set
590# CONFIG_R3964 is not set 604# CONFIG_R3964 is not set
591# CONFIG_APPLICOM is not set 605# CONFIG_APPLICOM is not set
@@ -601,6 +615,7 @@ CONFIG_GPIO_VR41XX=y
601# TPM devices 615# TPM devices
602# 616#
603# CONFIG_TCG_TPM is not set 617# CONFIG_TCG_TPM is not set
618# CONFIG_TELCLOCK is not set
604 619
605# 620#
606# I2C support 621# I2C support
@@ -660,6 +675,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
660# CONFIG_USB is not set 675# CONFIG_USB is not set
661 676
662# 677#
678# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
679#
680
681#
663# USB Gadget Support 682# USB Gadget Support
664# 683#
665# CONFIG_USB_GADGET is not set 684# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 4b4d1ddb3d..1d3ee18ea8 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:23 2005 4# Thu Nov 24 01:05:57 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -160,7 +115,6 @@ CONFIG_PAGE_SIZE_4KB=y
160# CONFIG_MIPS_MT is not set 115# CONFIG_MIPS_MT is not set
161# CONFIG_CPU_ADVANCED is not set 116# CONFIG_CPU_ADVANCED is not set
162CONFIG_CPU_HAS_LLSC=y 117CONFIG_CPU_HAS_LLSC=y
163CONFIG_CPU_HAS_LLDSCD=y
164CONFIG_CPU_HAS_SYNC=y 118CONFIG_CPU_HAS_SYNC=y
165CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
166CONFIG_GENERIC_IRQ_PROBE=y 120CONFIG_GENERIC_IRQ_PROBE=y
@@ -172,11 +126,75 @@ CONFIG_FLATMEM_MANUAL=y
172CONFIG_FLATMEM=y 126CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 127CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 128# CONFIG_SPARSEMEM_STATIC is not set
129CONFIG_SPLIT_PTLOCK_CPUS=4
175CONFIG_PREEMPT_NONE=y 130CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 131# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 132# CONFIG_PREEMPT is not set
178 133
179# 134#
135# Code maturity level options
136#
137CONFIG_EXPERIMENTAL=y
138CONFIG_CLEAN_COMPILE=y
139CONFIG_BROKEN_ON_SMP=y
140CONFIG_INIT_ENV_ARG_LIMIT=32
141
142#
143# General setup
144#
145CONFIG_LOCALVERSION=""
146CONFIG_LOCALVERSION_AUTO=y
147CONFIG_SWAP=y
148CONFIG_SYSVIPC=y
149# CONFIG_POSIX_MQUEUE is not set
150# CONFIG_BSD_PROCESS_ACCT is not set
151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set
153CONFIG_HOTPLUG=y
154CONFIG_KOBJECT_UEVENT=y
155# CONFIG_IKCONFIG is not set
156CONFIG_INITRAMFS_SOURCE=""
157CONFIG_EMBEDDED=y
158CONFIG_KALLSYMS=y
159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160CONFIG_PRINTK=y
161CONFIG_BUG=y
162CONFIG_BASE_FULL=y
163CONFIG_FUTEX=y
164CONFIG_EPOLL=y
165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0
171# CONFIG_TINY_SHMEM is not set
172CONFIG_BASE_SMALL=0
173
174#
175# Loadable module support
176#
177# CONFIG_MODULES is not set
178
179#
180# Block layer
181#
182# CONFIG_LBD is not set
183
184#
185# IO Schedulers
186#
187CONFIG_IOSCHED_NOOP=y
188CONFIG_IOSCHED_AS=y
189CONFIG_IOSCHED_DEADLINE=y
190CONFIG_IOSCHED_CFQ=y
191CONFIG_DEFAULT_AS=y
192# CONFIG_DEFAULT_DEADLINE is not set
193# CONFIG_DEFAULT_CFQ is not set
194# CONFIG_DEFAULT_NOOP is not set
195CONFIG_DEFAULT_IOSCHED="anticipatory"
196
197#
180# Bus options (PCI, PCMCIA, EISA, ISA, TC) 198# Bus options (PCI, PCMCIA, EISA, ISA, TC)
181# 199#
182CONFIG_HW_HAS_PCI=y 200CONFIG_HW_HAS_PCI=y
@@ -256,8 +274,11 @@ CONFIG_TCP_CONG_BIC=y
256# CONFIG_NET_DIVERT is not set 274# CONFIG_NET_DIVERT is not set
257# CONFIG_ECONET is not set 275# CONFIG_ECONET is not set
258# CONFIG_WAN_ROUTER is not set 276# CONFIG_WAN_ROUTER is not set
277
278#
279# QoS and/or fair queueing
280#
259# CONFIG_NET_SCHED is not set 281# CONFIG_NET_SCHED is not set
260# CONFIG_NET_CLS_ROUTE is not set
261 282
262# 283#
263# Network testing 284# Network testing
@@ -287,6 +308,7 @@ CONFIG_FW_LOADER=y
287# Connector - unified userspace <-> kernelspace linker 308# Connector - unified userspace <-> kernelspace linker
288# 309#
289CONFIG_CONNECTOR=y 310CONFIG_CONNECTOR=y
311CONFIG_PROC_EVENTS=y
290 312
291# 313#
292# Memory Technology Devices (MTD) 314# Memory Technology Devices (MTD)
@@ -316,18 +338,9 @@ CONFIG_BLK_DEV_LOOP=y
316# CONFIG_BLK_DEV_SX8 is not set 338# CONFIG_BLK_DEV_SX8 is not set
317# CONFIG_BLK_DEV_RAM is not set 339# CONFIG_BLK_DEV_RAM is not set
318CONFIG_BLK_DEV_RAM_COUNT=16 340CONFIG_BLK_DEV_RAM_COUNT=16
319# CONFIG_LBD is not set
320CONFIG_CDROM_PKTCDVD=y 341CONFIG_CDROM_PKTCDVD=y
321CONFIG_CDROM_PKTCDVD_BUFFERS=8 342CONFIG_CDROM_PKTCDVD_BUFFERS=8
322# CONFIG_CDROM_PKTCDVD_WCACHE is not set 343# 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 344CONFIG_ATA_OVER_ETH=y
332 345
333# 346#
@@ -401,7 +414,6 @@ CONFIG_NETDEVICES=y
401# PHY device support 414# PHY device support
402# 415#
403CONFIG_PHYLIB=y 416CONFIG_PHYLIB=y
404CONFIG_PHYCONTROL=y
405 417
406# 418#
407# MII PHY device drivers 419# MII PHY device drivers
@@ -419,6 +431,7 @@ CONFIG_NET_ETHERNET=y
419# CONFIG_MII is not set 431# CONFIG_MII is not set
420# CONFIG_HAPPYMEAL is not set 432# CONFIG_HAPPYMEAL is not set
421# CONFIG_SUNGEM is not set 433# CONFIG_SUNGEM is not set
434# CONFIG_CASSINI is not set
422# CONFIG_NET_VENDOR_3COM is not set 435# CONFIG_NET_VENDOR_3COM is not set
423 436
424# 437#
@@ -574,6 +587,7 @@ CONFIG_COBALT_LCD=y
574# TPM devices 587# TPM devices
575# 588#
576# CONFIG_TCG_TPM is not set 589# CONFIG_TCG_TPM is not set
590# CONFIG_TELCLOCK is not set
577 591
578# 592#
579# I2C support 593# I2C support
@@ -633,6 +647,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
633# CONFIG_USB is not set 647# CONFIG_USB is not set
634 648
635# 649#
650# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
651#
652
653#
636# USB Gadget Support 654# USB Gadget Support
637# 655#
638# CONFIG_USB_GADGET is not set 656# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 6501144ec6..18ac7926c0 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:26 2005 4# Thu Nov 24 01:05:59 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -178,11 +127,81 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 127CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 128CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
184 134
185# 135#
136# Code maturity level options
137#
138CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32
142
143#
144# General setup
145#
146CONFIG_LOCALVERSION=""
147CONFIG_LOCALVERSION_AUTO=y
148CONFIG_SWAP=y
149CONFIG_SYSVIPC=y
150# CONFIG_POSIX_MQUEUE is not set
151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE=""
158CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_PRINTK=y
162CONFIG_BUG=y
163CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y
165CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0
174
175#
176# Loadable module support
177#
178CONFIG_MODULES=y
179CONFIG_MODULE_UNLOAD=y
180# CONFIG_MODULE_FORCE_UNLOAD is not set
181CONFIG_OBSOLETE_MODPARM=y
182CONFIG_MODVERSIONS=y
183CONFIG_MODULE_SRCVERSION_ALL=y
184CONFIG_KMOD=y
185
186#
187# Block layer
188#
189# CONFIG_LBD is not set
190
191#
192# IO Schedulers
193#
194CONFIG_IOSCHED_NOOP=y
195CONFIG_IOSCHED_AS=y
196CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y
198CONFIG_DEFAULT_AS=y
199# CONFIG_DEFAULT_DEADLINE is not set
200# CONFIG_DEFAULT_CFQ is not set
201# CONFIG_DEFAULT_NOOP is not set
202CONFIG_DEFAULT_IOSCHED="anticipatory"
203
204#
186# Bus options (PCI, PCMCIA, EISA, ISA, TC) 205# Bus options (PCI, PCMCIA, EISA, ISA, TC)
187# 206#
188CONFIG_HW_HAS_PCI=y 207CONFIG_HW_HAS_PCI=y
@@ -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,8 +315,11 @@ 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
298 323
299# 324#
300# Network testing 325# Network testing
@@ -343,6 +368,7 @@ CONFIG_MTD_BLOCK=y
343# CONFIG_FTL is not set 368# CONFIG_FTL is not set
344# CONFIG_NFTL is not set 369# CONFIG_NFTL is not set
345# CONFIG_INFTL is not set 370# CONFIG_INFTL is not set
371# CONFIG_RFD_FTL is not set
346 372
347# 373#
348# RAM/ROM/Flash chip drivers 374# RAM/ROM/Flash chip drivers
@@ -400,6 +426,11 @@ CONFIG_MTD_ALCHEMY=y
400# CONFIG_MTD_NAND is not set 426# CONFIG_MTD_NAND is not set
401 427
402# 428#
429# OneNAND Flash Device Drivers
430#
431# CONFIG_MTD_ONENAND is not set
432
433#
403# Parallel port support 434# Parallel port support
404# 435#
405# CONFIG_PARPORT is not set 436# CONFIG_PARPORT is not set
@@ -417,18 +448,9 @@ CONFIG_BLK_DEV_LOOP=y
417# CONFIG_BLK_DEV_NBD is not set 448# CONFIG_BLK_DEV_NBD is not set
418# CONFIG_BLK_DEV_RAM is not set 449# CONFIG_BLK_DEV_RAM is not set
419CONFIG_BLK_DEV_RAM_COUNT=16 450CONFIG_BLK_DEV_RAM_COUNT=16
420# CONFIG_LBD is not set
421CONFIG_CDROM_PKTCDVD=m 451CONFIG_CDROM_PKTCDVD=m
422CONFIG_CDROM_PKTCDVD_BUFFERS=8 452CONFIG_CDROM_PKTCDVD_BUFFERS=8
423# CONFIG_CDROM_PKTCDVD_WCACHE is not set 453# 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 454CONFIG_ATA_OVER_ETH=m
433 455
434# 456#
@@ -473,7 +495,6 @@ CONFIG_NETDEVICES=y
473# PHY device support 495# PHY device support
474# 496#
475CONFIG_PHYLIB=m 497CONFIG_PHYLIB=m
476CONFIG_PHYCONTROL=y
477 498
478# 499#
479# MII PHY device drivers 500# MII PHY device drivers
@@ -490,6 +511,7 @@ CONFIG_CICADA_PHY=m
490CONFIG_NET_ETHERNET=y 511CONFIG_NET_ETHERNET=y
491CONFIG_MII=m 512CONFIG_MII=m
492CONFIG_MIPS_AU1X00_ENET=y 513CONFIG_MIPS_AU1X00_ENET=y
514# CONFIG_SMC91X is not set
493 515
494# 516#
495# Ethernet (1000 Mbit) 517# Ethernet (1000 Mbit)
@@ -532,6 +554,7 @@ CONFIG_PPP_ASYNC=m
532# CONFIG_PPP_SYNC_TTY is not set 554# CONFIG_PPP_SYNC_TTY is not set
533CONFIG_PPP_DEFLATE=m 555CONFIG_PPP_DEFLATE=m
534# CONFIG_PPP_BSDCOMP is not set 556# CONFIG_PPP_BSDCOMP is not set
557CONFIG_PPP_MPPE=m
535CONFIG_PPPOE=m 558CONFIG_PPPOE=m
536# CONFIG_SLIP is not set 559# CONFIG_SLIP is not set
537# CONFIG_SHAPER is not set 560# CONFIG_SHAPER is not set
@@ -598,13 +621,17 @@ CONFIG_HW_CONSOLE=y
598# 621#
599# Serial drivers 622# Serial drivers
600# 623#
601# CONFIG_SERIAL_8250 is not set 624CONFIG_SERIAL_8250=y
625CONFIG_SERIAL_8250_CONSOLE=y
626CONFIG_SERIAL_8250_CS=m
627CONFIG_SERIAL_8250_NR_UARTS=4
628# CONFIG_SERIAL_8250_EXTENDED is not set
629CONFIG_SERIAL_8250_AU1X00=y
602 630
603# 631#
604# Non-8250 serial port support 632# Non-8250 serial port support
605# 633#
606CONFIG_SERIAL_AU1X00=y 634# CONFIG_SERIAL_AU1X00 is not set
607CONFIG_SERIAL_AU1X00_CONSOLE=y
608CONFIG_SERIAL_CORE=y 635CONFIG_SERIAL_CORE=y
609CONFIG_SERIAL_CORE_CONSOLE=y 636CONFIG_SERIAL_CORE_CONSOLE=y
610CONFIG_UNIX98_PTYS=y 637CONFIG_UNIX98_PTYS=y
@@ -633,11 +660,15 @@ CONFIG_LEGACY_PTY_COUNT=256
633# PCMCIA character devices 660# PCMCIA character devices
634# 661#
635CONFIG_SYNCLINK_CS=m 662CONFIG_SYNCLINK_CS=m
663# CONFIG_CARDMAN_4000 is not set
664# CONFIG_CARDMAN_4040 is not set
636# CONFIG_RAW_DRIVER is not set 665# CONFIG_RAW_DRIVER is not set
637 666
638# 667#
639# TPM devices 668# TPM devices
640# 669#
670# CONFIG_TCG_TPM is not set
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 b8cd2cd923..4f55f7414c 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:29 2005 4# Thu Nov 24 01:06:00 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -178,11 +127,81 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 127CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 128CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
184 134
185# 135#
136# Code maturity level options
137#
138CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32
142
143#
144# General setup
145#
146CONFIG_LOCALVERSION=""
147CONFIG_LOCALVERSION_AUTO=y
148CONFIG_SWAP=y
149CONFIG_SYSVIPC=y
150# CONFIG_POSIX_MQUEUE is not set
151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE=""
158CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_PRINTK=y
162CONFIG_BUG=y
163CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y
165CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0
174
175#
176# Loadable module support
177#
178CONFIG_MODULES=y
179CONFIG_MODULE_UNLOAD=y
180# CONFIG_MODULE_FORCE_UNLOAD is not set
181CONFIG_OBSOLETE_MODPARM=y
182CONFIG_MODVERSIONS=y
183CONFIG_MODULE_SRCVERSION_ALL=y
184CONFIG_KMOD=y
185
186#
187# Block layer
188#
189# CONFIG_LBD is not set
190
191#
192# IO Schedulers
193#
194CONFIG_IOSCHED_NOOP=y
195CONFIG_IOSCHED_AS=y
196CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y
198CONFIG_DEFAULT_AS=y
199# CONFIG_DEFAULT_DEADLINE is not set
200# CONFIG_DEFAULT_CFQ is not set
201# CONFIG_DEFAULT_NOOP is not set
202CONFIG_DEFAULT_IOSCHED="anticipatory"
203
204#
186# Bus options (PCI, PCMCIA, EISA, ISA, TC) 205# Bus options (PCI, PCMCIA, EISA, ISA, TC)
187# 206#
188CONFIG_MMU=y 207CONFIG_MMU=y
@@ -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,8 +304,11 @@ 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
286 312
287# 313#
288# Network testing 314# Network testing
@@ -331,6 +357,7 @@ CONFIG_MTD_BLOCK=y
331# CONFIG_FTL is not set 357# CONFIG_FTL is not set
332# CONFIG_NFTL is not set 358# CONFIG_NFTL is not set
333# CONFIG_INFTL is not set 359# CONFIG_INFTL is not set
360# CONFIG_RFD_FTL is not set
334 361
335# 362#
336# RAM/ROM/Flash chip drivers 363# RAM/ROM/Flash chip drivers
@@ -388,6 +415,11 @@ CONFIG_MTD_ALCHEMY=y
388# CONFIG_MTD_NAND is not set 415# CONFIG_MTD_NAND is not set
389 416
390# 417#
418# OneNAND Flash Device Drivers
419#
420# CONFIG_MTD_ONENAND is not set
421
422#
391# Parallel port support 423# Parallel port support
392# 424#
393# CONFIG_PARPORT is not set 425# CONFIG_PARPORT is not set
@@ -405,18 +437,9 @@ CONFIG_BLK_DEV_LOOP=y
405# CONFIG_BLK_DEV_NBD is not set 437# CONFIG_BLK_DEV_NBD is not set
406# CONFIG_BLK_DEV_RAM is not set 438# CONFIG_BLK_DEV_RAM is not set
407CONFIG_BLK_DEV_RAM_COUNT=16 439CONFIG_BLK_DEV_RAM_COUNT=16
408# CONFIG_LBD is not set
409CONFIG_CDROM_PKTCDVD=m 440CONFIG_CDROM_PKTCDVD=m
410CONFIG_CDROM_PKTCDVD_BUFFERS=8 441CONFIG_CDROM_PKTCDVD_BUFFERS=8
411# CONFIG_CDROM_PKTCDVD_WCACHE is not set 442# 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 443CONFIG_ATA_OVER_ETH=m
421 444
422# 445#
@@ -461,7 +484,6 @@ CONFIG_NETDEVICES=y
461# PHY device support 484# PHY device support
462# 485#
463CONFIG_PHYLIB=m 486CONFIG_PHYLIB=m
464CONFIG_PHYCONTROL=y
465 487
466# 488#
467# MII PHY device drivers 489# MII PHY device drivers
@@ -478,6 +500,7 @@ CONFIG_CICADA_PHY=m
478CONFIG_NET_ETHERNET=y 500CONFIG_NET_ETHERNET=y
479CONFIG_MII=m 501CONFIG_MII=m
480CONFIG_MIPS_AU1X00_ENET=y 502CONFIG_MIPS_AU1X00_ENET=y
503# CONFIG_SMC91X is not set
481 504
482# 505#
483# Ethernet (1000 Mbit) 506# Ethernet (1000 Mbit)
@@ -507,6 +530,7 @@ CONFIG_PPP_ASYNC=m
507# CONFIG_PPP_SYNC_TTY is not set 530# CONFIG_PPP_SYNC_TTY is not set
508CONFIG_PPP_DEFLATE=m 531CONFIG_PPP_DEFLATE=m
509# CONFIG_PPP_BSDCOMP is not set 532# CONFIG_PPP_BSDCOMP is not set
533CONFIG_PPP_MPPE=m
510CONFIG_PPPOE=m 534CONFIG_PPPOE=m
511# CONFIG_SLIP is not set 535# CONFIG_SLIP is not set
512# CONFIG_SHAPER is not set 536# CONFIG_SHAPER is not set
@@ -573,13 +597,16 @@ CONFIG_HW_CONSOLE=y
573# 597#
574# Serial drivers 598# Serial drivers
575# 599#
576# CONFIG_SERIAL_8250 is not set 600CONFIG_SERIAL_8250=y
601CONFIG_SERIAL_8250_CONSOLE=y
602CONFIG_SERIAL_8250_NR_UARTS=4
603# CONFIG_SERIAL_8250_EXTENDED is not set
604CONFIG_SERIAL_8250_AU1X00=y
577 605
578# 606#
579# Non-8250 serial port support 607# Non-8250 serial port support
580# 608#
581CONFIG_SERIAL_AU1X00=y 609# CONFIG_SERIAL_AU1X00 is not set
582CONFIG_SERIAL_AU1X00_CONSOLE=y
583CONFIG_SERIAL_CORE=y 610CONFIG_SERIAL_CORE=y
584CONFIG_SERIAL_CORE_CONSOLE=y 611CONFIG_SERIAL_CORE_CONSOLE=y
585CONFIG_UNIX98_PTYS=y 612CONFIG_UNIX98_PTYS=y
@@ -608,6 +635,8 @@ CONFIG_LEGACY_PTY_COUNT=256
608# 635#
609# TPM devices 636# TPM devices
610# 637#
638# CONFIG_TCG_TPM is not set
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 530b6c2d99..0e5de7d05f 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:32 2005 4# Thu Nov 24 01:06:03 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -179,11 +127,82 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 127CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 128CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
185 134
186# 135#
136# Code maturity level options
137#
138CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32
142
143#
144# General setup
145#
146CONFIG_LOCALVERSION=""
147CONFIG_LOCALVERSION_AUTO=y
148CONFIG_SWAP=y
149CONFIG_SYSVIPC=y
150# CONFIG_POSIX_MQUEUE is not set
151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156CONFIG_IKCONFIG=y
157CONFIG_IKCONFIG_PROC=y
158CONFIG_INITRAMFS_SOURCE=""
159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_PRINTK=y
163CONFIG_BUG=y
164CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y
166CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0
175
176#
177# Loadable module support
178#
179CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y
186
187#
188# Block layer
189#
190# CONFIG_LBD is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_AS=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_DEFAULT_AS=y
200# CONFIG_DEFAULT_DEADLINE is not set
201# CONFIG_DEFAULT_CFQ is not set
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="anticipatory"
204
205#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 206# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 207#
189CONFIG_MMU=y 208CONFIG_MMU=y
@@ -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,8 +309,11 @@ 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
292 317
293# 318#
294# Network testing 319# Network testing
@@ -333,6 +358,7 @@ CONFIG_MTD_BLOCK=y
333# CONFIG_FTL is not set 358# CONFIG_FTL is not set
334# CONFIG_NFTL is not set 359# CONFIG_NFTL is not set
335# CONFIG_INFTL is not set 360# CONFIG_INFTL is not set
361# CONFIG_RFD_FTL is not set
336 362
337# 363#
338# RAM/ROM/Flash chip drivers 364# RAM/ROM/Flash chip drivers
@@ -395,6 +421,11 @@ CONFIG_MTD_NAND_IDS=y
395# CONFIG_MTD_NAND_NANDSIM is not set 421# CONFIG_MTD_NAND_NANDSIM is not set
396 422
397# 423#
424# OneNAND Flash Device Drivers
425#
426# CONFIG_MTD_ONENAND is not set
427
428#
398# Parallel port support 429# Parallel port support
399# 430#
400# CONFIG_PARPORT is not set 431# CONFIG_PARPORT is not set
@@ -414,16 +445,7 @@ CONFIG_BLK_DEV_RAM=y
414CONFIG_BLK_DEV_RAM_COUNT=16 445CONFIG_BLK_DEV_RAM_COUNT=16
415CONFIG_BLK_DEV_RAM_SIZE=4096 446CONFIG_BLK_DEV_RAM_SIZE=4096
416# CONFIG_BLK_DEV_INITRD is not set 447# CONFIG_BLK_DEV_INITRD is not set
417# CONFIG_LBD is not set
418# CONFIG_CDROM_PKTCDVD is not set 448# 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 449# CONFIG_ATA_OVER_ETH is not set
428 450
429# 451#
@@ -452,7 +474,6 @@ CONFIG_IDE_GENERIC=y
452CONFIG_BLK_DEV_IDE_AU1XXX=y 474CONFIG_BLK_DEV_IDE_AU1XXX=y
453CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA=y 475CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA=y
454# CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is not set 476# CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA is not set
455# CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON is not set
456CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128 477CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ=128
457# CONFIG_IDE_ARM is not set 478# CONFIG_IDE_ARM is not set
458# CONFIG_BLK_DEV_IDEDMA is not set 479# CONFIG_BLK_DEV_IDEDMA is not set
@@ -495,6 +516,7 @@ CONFIG_SCSI_MULTI_LUN=y
495# 516#
496# SCSI low-level drivers 517# SCSI low-level drivers
497# 518#
519# CONFIG_ISCSI_TCP is not set
498# CONFIG_SCSI_SATA is not set 520# CONFIG_SCSI_SATA is not set
499# CONFIG_SCSI_DEBUG is not set 521# CONFIG_SCSI_DEBUG is not set
500 522
@@ -545,6 +567,7 @@ CONFIG_NETDEVICES=y
545CONFIG_NET_ETHERNET=y 567CONFIG_NET_ETHERNET=y
546CONFIG_MII=m 568CONFIG_MII=m
547# CONFIG_MIPS_AU1X00_ENET is not set 569# CONFIG_MIPS_AU1X00_ENET is not set
570# CONFIG_SMC91X is not set
548 571
549# 572#
550# Ethernet (1000 Mbit) 573# Ethernet (1000 Mbit)
@@ -638,13 +661,17 @@ CONFIG_HW_CONSOLE=y
638# 661#
639# Serial drivers 662# Serial drivers
640# 663#
641# CONFIG_SERIAL_8250 is not set 664CONFIG_SERIAL_8250=y
665CONFIG_SERIAL_8250_CONSOLE=y
666# CONFIG_SERIAL_8250_CS is not set
667CONFIG_SERIAL_8250_NR_UARTS=4
668# CONFIG_SERIAL_8250_EXTENDED is not set
669CONFIG_SERIAL_8250_AU1X00=y
642 670
643# 671#
644# Non-8250 serial port support 672# Non-8250 serial port support
645# 673#
646CONFIG_SERIAL_AU1X00=y 674# CONFIG_SERIAL_AU1X00 is not set
647CONFIG_SERIAL_AU1X00_CONSOLE=y
648CONFIG_SERIAL_CORE=y 675CONFIG_SERIAL_CORE=y
649CONFIG_SERIAL_CORE_CONSOLE=y 676CONFIG_SERIAL_CORE_CONSOLE=y
650CONFIG_UNIX98_PTYS=y 677CONFIG_UNIX98_PTYS=y
@@ -673,11 +700,15 @@ CONFIG_LEGACY_PTY_COUNT=256
673# PCMCIA character devices 700# PCMCIA character devices
674# 701#
675# CONFIG_SYNCLINK_CS is not set 702# CONFIG_SYNCLINK_CS is not set
703# CONFIG_CARDMAN_4000 is not set
704# CONFIG_CARDMAN_4040 is not set
676# CONFIG_RAW_DRIVER is not set 705# CONFIG_RAW_DRIVER is not set
677 706
678# 707#
679# TPM devices 708# TPM devices
680# 709#
710# CONFIG_TCG_TPM is not set
711# CONFIG_TELCLOCK is not set
681 712
682# 713#
683# I2C support 714# I2C support
@@ -720,12 +751,11 @@ CONFIG_FB=y
720CONFIG_FB_CFB_FILLRECT=y 751CONFIG_FB_CFB_FILLRECT=y
721CONFIG_FB_CFB_COPYAREA=y 752CONFIG_FB_CFB_COPYAREA=y
722CONFIG_FB_CFB_IMAGEBLIT=y 753CONFIG_FB_CFB_IMAGEBLIT=y
723CONFIG_FB_SOFT_CURSOR=y
724# CONFIG_FB_MACMODES is not set 754# CONFIG_FB_MACMODES is not set
725# CONFIG_FB_MODE_HELPERS is not set 755# CONFIG_FB_MODE_HELPERS is not set
726# CONFIG_FB_TILEBLITTING is not set 756# CONFIG_FB_TILEBLITTING is not set
727CONFIG_FB_AU1200=y
728# CONFIG_FB_S1D13XXX is not set 757# CONFIG_FB_S1D13XXX is not set
758CONFIG_FB_AU1200=y
729# CONFIG_FB_VIRTUAL is not set 759# CONFIG_FB_VIRTUAL is not set
730 760
731# 761#
@@ -757,6 +787,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
757# CONFIG_USB is not set 787# CONFIG_USB is not set
758 788
759# 789#
790# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
791#
792
793#
760# USB Gadget Support 794# USB Gadget Support
761# 795#
762CONFIG_USB_GADGET=m 796CONFIG_USB_GADGET=m
@@ -862,6 +896,7 @@ CONFIG_RAMFS=y
862CONFIG_JFFS2_FS=y 896CONFIG_JFFS2_FS=y
863CONFIG_JFFS2_FS_DEBUG=0 897CONFIG_JFFS2_FS_DEBUG=0
864CONFIG_JFFS2_FS_WRITEBUFFER=y 898CONFIG_JFFS2_FS_WRITEBUFFER=y
899# CONFIG_JFFS2_SUMMARY is not set
865# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 900# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
866CONFIG_JFFS2_ZLIB=y 901CONFIG_JFFS2_ZLIB=y
867CONFIG_JFFS2_RTIME=y 902CONFIG_JFFS2_RTIME=y
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 1c2784dee6..86e7be8412 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:36 2005 4# Thu Nov 24 01:06:05 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -180,11 +129,81 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 129CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 130CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 131# CONFIG_SPARSEMEM_STATIC is not set
132CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 133CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 134# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 135# CONFIG_PREEMPT is not set
186 136
187# 137#
138# Code maturity level options
139#
140CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32
144
145#
146# General setup
147#
148CONFIG_LOCALVERSION=""
149CONFIG_LOCALVERSION_AUTO=y
150CONFIG_SWAP=y
151CONFIG_SYSVIPC=y
152# CONFIG_POSIX_MQUEUE is not set
153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184CONFIG_MODVERSIONS=y
185CONFIG_MODULE_SRCVERSION_ALL=y
186CONFIG_KMOD=y
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
188# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
189# 208#
190CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
@@ -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,8 +323,11 @@ 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
306 331
307# 332#
308# Network testing 333# Network testing
@@ -351,6 +376,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 376# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 377# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 378# CONFIG_INFTL is not set
379# CONFIG_RFD_FTL is not set
354 380
355# 381#
356# RAM/ROM/Flash chip drivers 382# RAM/ROM/Flash chip drivers
@@ -409,6 +435,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 435# CONFIG_MTD_NAND is not set
410 436
411# 437#
438# OneNAND Flash Device Drivers
439#
440# CONFIG_MTD_ONENAND is not set
441
442#
412# Parallel port support 443# Parallel port support
413# 444#
414# CONFIG_PARPORT is not set 445# CONFIG_PARPORT is not set
@@ -432,18 +463,9 @@ CONFIG_BLK_DEV_LOOP=y
432# CONFIG_BLK_DEV_UB is not set 463# CONFIG_BLK_DEV_UB is not set
433# CONFIG_BLK_DEV_RAM is not set 464# CONFIG_BLK_DEV_RAM is not set
434CONFIG_BLK_DEV_RAM_COUNT=16 465CONFIG_BLK_DEV_RAM_COUNT=16
435# CONFIG_LBD is not set
436CONFIG_CDROM_PKTCDVD=m 466CONFIG_CDROM_PKTCDVD=m
437CONFIG_CDROM_PKTCDVD_BUFFERS=8 467CONFIG_CDROM_PKTCDVD_BUFFERS=8
438# CONFIG_CDROM_PKTCDVD_WCACHE is not set 468# 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 469CONFIG_ATA_OVER_ETH=m
448 470
449# 471#
@@ -518,7 +540,6 @@ CONFIG_NETDEVICES=y
518# PHY device support 540# PHY device support
519# 541#
520CONFIG_PHYLIB=m 542CONFIG_PHYLIB=m
521CONFIG_PHYCONTROL=y
522 543
523# 544#
524# MII PHY device drivers 545# MII PHY device drivers
@@ -537,7 +558,9 @@ CONFIG_NET_ETHERNET=y
537CONFIG_MIPS_AU1X00_ENET=y 558CONFIG_MIPS_AU1X00_ENET=y
538# CONFIG_HAPPYMEAL is not set 559# CONFIG_HAPPYMEAL is not set
539# CONFIG_SUNGEM is not set 560# CONFIG_SUNGEM is not set
561# CONFIG_CASSINI is not set
540# CONFIG_NET_VENDOR_3COM is not set 562# CONFIG_NET_VENDOR_3COM is not set
563# CONFIG_SMC91X is not set
541 564
542# 565#
543# Tulip family network device support 566# Tulip family network device support
@@ -599,6 +622,7 @@ CONFIG_PPP_ASYNC=m
599# CONFIG_PPP_SYNC_TTY is not set 622# CONFIG_PPP_SYNC_TTY is not set
600CONFIG_PPP_DEFLATE=m 623CONFIG_PPP_DEFLATE=m
601# CONFIG_PPP_BSDCOMP is not set 624# CONFIG_PPP_BSDCOMP is not set
625CONFIG_PPP_MPPE=m
602CONFIG_PPPOE=m 626CONFIG_PPPOE=m
603# CONFIG_SLIP is not set 627# CONFIG_SLIP is not set
604# CONFIG_SHAPER is not set 628# CONFIG_SHAPER is not set
@@ -664,13 +688,17 @@ CONFIG_SERIO_RAW=m
664# 688#
665# Serial drivers 689# Serial drivers
666# 690#
667# CONFIG_SERIAL_8250 is not set 691CONFIG_SERIAL_8250=y
692CONFIG_SERIAL_8250_CONSOLE=y
693# CONFIG_SERIAL_8250_CS is not set
694CONFIG_SERIAL_8250_NR_UARTS=4
695# CONFIG_SERIAL_8250_EXTENDED is not set
696CONFIG_SERIAL_8250_AU1X00=y
668 697
669# 698#
670# Non-8250 serial port support 699# Non-8250 serial port support
671# 700#
672CONFIG_SERIAL_AU1X00=y 701# CONFIG_SERIAL_AU1X00 is not set
673CONFIG_SERIAL_AU1X00_CONSOLE=y
674CONFIG_SERIAL_CORE=y 702CONFIG_SERIAL_CORE=y
675CONFIG_SERIAL_CORE_CONSOLE=y 703CONFIG_SERIAL_CORE_CONSOLE=y
676# CONFIG_SERIAL_JSM is not set 704# CONFIG_SERIAL_JSM is not set
@@ -702,12 +730,15 @@ CONFIG_LEGACY_PTY_COUNT=256
702# PCMCIA character devices 730# PCMCIA character devices
703# 731#
704CONFIG_SYNCLINK_CS=m 732CONFIG_SYNCLINK_CS=m
733# CONFIG_CARDMAN_4000 is not set
734# CONFIG_CARDMAN_4040 is not set
705# CONFIG_RAW_DRIVER is not set 735# CONFIG_RAW_DRIVER is not set
706 736
707# 737#
708# TPM devices 738# TPM devices
709# 739#
710# CONFIG_TCG_TPM is not set 740# CONFIG_TCG_TPM is not set
741# CONFIG_TELCLOCK is not set
711 742
712# 743#
713# I2C support 744# I2C support
@@ -756,12 +787,94 @@ CONFIG_SOUND=y
756# 787#
757# Advanced Linux Sound Architecture 788# Advanced Linux Sound Architecture
758# 789#
759# CONFIG_SND is not set 790CONFIG_SND=m
791CONFIG_SND_AC97_CODEC=m
792CONFIG_SND_AC97_BUS=m
793CONFIG_SND_TIMER=m
794CONFIG_SND_PCM=m
795CONFIG_SND_RAWMIDI=m
796CONFIG_SND_SEQUENCER=m
797CONFIG_SND_SEQ_DUMMY=m
798CONFIG_SND_OSSEMUL=y
799CONFIG_SND_MIXER_OSS=m
800CONFIG_SND_PCM_OSS=m
801CONFIG_SND_SEQUENCER_OSS=y
802# CONFIG_SND_VERBOSE_PRINTK is not set
803# CONFIG_SND_DEBUG is not set
804CONFIG_SND_GENERIC_DRIVER=y
805
806#
807# Generic devices
808#
809# CONFIG_SND_DUMMY is not set
810CONFIG_SND_VIRMIDI=m
811CONFIG_SND_MTPAV=m
812# CONFIG_SND_SERIAL_U16550 is not set
813# CONFIG_SND_MPU401 is not set
814
815#
816# PCI devices
817#
818# CONFIG_SND_ALI5451 is not set
819# CONFIG_SND_ATIIXP is not set
820# CONFIG_SND_ATIIXP_MODEM is not set
821# CONFIG_SND_AU8810 is not set
822# CONFIG_SND_AU8820 is not set
823# CONFIG_SND_AU8830 is not set
824# CONFIG_SND_AZT3328 is not set
825# CONFIG_SND_BT87X is not set
826# CONFIG_SND_CS46XX is not set
827# CONFIG_SND_CS4281 is not set
828# CONFIG_SND_EMU10K1 is not set
829# CONFIG_SND_EMU10K1X is not set
830# CONFIG_SND_CA0106 is not set
831# CONFIG_SND_KORG1212 is not set
832# CONFIG_SND_MIXART is not set
833# CONFIG_SND_NM256 is not set
834# CONFIG_SND_RME32 is not set
835# CONFIG_SND_RME96 is not set
836# CONFIG_SND_RME9652 is not set
837# CONFIG_SND_HDSP is not set
838# CONFIG_SND_HDSPM is not set
839# CONFIG_SND_TRIDENT is not set
840# CONFIG_SND_YMFPCI is not set
841# CONFIG_SND_AD1889 is not set
842# CONFIG_SND_CMIPCI is not set
843# CONFIG_SND_ENS1370 is not set
844# CONFIG_SND_ENS1371 is not set
845# CONFIG_SND_ES1938 is not set
846# CONFIG_SND_ES1968 is not set
847# CONFIG_SND_MAESTRO3 is not set
848# CONFIG_SND_FM801 is not set
849# CONFIG_SND_ICE1712 is not set
850# CONFIG_SND_ICE1724 is not set
851# CONFIG_SND_INTEL8X0 is not set
852# CONFIG_SND_INTEL8X0M is not set
853# CONFIG_SND_SONICVIBES is not set
854# CONFIG_SND_VIA82XX is not set
855# CONFIG_SND_VIA82XX_MODEM is not set
856# CONFIG_SND_VX222 is not set
857# CONFIG_SND_HDA_INTEL is not set
858
859#
860# ALSA MIPS devices
861#
862CONFIG_SND_AU1X00=m
863
864#
865# USB devices
866#
867# CONFIG_SND_USB_AUDIO is not set
868
869#
870# PCMCIA devices
871#
760 872
761# 873#
762# Open Sound System 874# Open Sound System
763# 875#
764CONFIG_SOUND_PRIME=y 876CONFIG_SOUND_PRIME=y
877CONFIG_OBSOLETE_OSS_DRIVER=y
765# CONFIG_SOUND_BT878 is not set 878# CONFIG_SOUND_BT878 is not set
766# CONFIG_SOUND_CMPCI is not set 879# CONFIG_SOUND_CMPCI is not set
767# CONFIG_SOUND_EMU10K1 is not set 880# CONFIG_SOUND_EMU10K1 is not set
@@ -774,7 +887,7 @@ CONFIG_SOUND_PRIME=y
774# CONFIG_SOUND_MAESTRO3 is not set 887# CONFIG_SOUND_MAESTRO3 is not set
775# CONFIG_SOUND_ICH is not set 888# CONFIG_SOUND_ICH is not set
776# CONFIG_SOUND_SONICVIBES is not set 889# CONFIG_SOUND_SONICVIBES is not set
777CONFIG_SOUND_AU1000=y 890# CONFIG_SOUND_AU1000 is not set
778# CONFIG_SOUND_TRIDENT is not set 891# CONFIG_SOUND_TRIDENT is not set
779# CONFIG_SOUND_MSNDCLAS is not set 892# CONFIG_SOUND_MSNDCLAS is not set
780# CONFIG_SOUND_MSNDPIN is not set 893# CONFIG_SOUND_MSNDPIN is not set
@@ -815,12 +928,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
815# USB Device Class drivers 928# USB Device Class drivers
816# 929#
817# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set 930# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
818# CONFIG_USB_BLUETOOTH_TTY is not set
819# CONFIG_USB_ACM is not set 931# CONFIG_USB_ACM is not set
820# CONFIG_USB_PRINTER is not set 932# CONFIG_USB_PRINTER is not set
821 933
822# 934#
823# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 935# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
936#
937
938#
939# may also be needed; see USB_STORAGE Help for more information
824# 940#
825# CONFIG_USB_STORAGE is not set 941# CONFIG_USB_STORAGE is not set
826 942
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 64248e2e92..ea5ab0ca57 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:39 2005 4# Thu Nov 24 01:06:07 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -179,11 +128,81 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 128CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 129CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 130# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 132CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 133# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
185 135
186# 136#
137# Code maturity level options
138#
139CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32
143
144#
145# General setup
146#
147CONFIG_LOCALVERSION=""
148CONFIG_LOCALVERSION_AUTO=y
149CONFIG_SWAP=y
150CONFIG_SYSVIPC=y
151# CONFIG_POSIX_MQUEUE is not set
152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set
155CONFIG_HOTPLUG=y
156CONFIG_KOBJECT_UEVENT=y
157# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE=""
159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_PRINTK=y
163CONFIG_BUG=y
164CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y
166CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0
175
176#
177# Loadable module support
178#
179CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y
186
187#
188# Block layer
189#
190# CONFIG_LBD is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_AS=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_DEFAULT_AS=y
200# CONFIG_DEFAULT_DEADLINE is not set
201# CONFIG_DEFAULT_CFQ is not set
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="anticipatory"
204
205#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 206# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 207#
189CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
@@ -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,8 +322,11 @@ 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
305 330
306# 331#
307# Network testing 332# Network testing
@@ -350,6 +375,7 @@ CONFIG_MTD_BLOCK=y
350# CONFIG_FTL is not set 375# CONFIG_FTL is not set
351# CONFIG_NFTL is not set 376# CONFIG_NFTL is not set
352# CONFIG_INFTL is not set 377# CONFIG_INFTL is not set
378# CONFIG_RFD_FTL is not set
353 379
354# 380#
355# RAM/ROM/Flash chip drivers 381# RAM/ROM/Flash chip drivers
@@ -413,6 +439,11 @@ CONFIG_MTD_NAND_AU1550=m
413# CONFIG_MTD_NAND_NANDSIM is not set 439# CONFIG_MTD_NAND_NANDSIM is not set
414 440
415# 441#
442# OneNAND Flash Device Drivers
443#
444# CONFIG_MTD_ONENAND is not set
445
446#
416# Parallel port support 447# Parallel port support
417# 448#
418# CONFIG_PARPORT is not set 449# CONFIG_PARPORT is not set
@@ -435,18 +466,9 @@ CONFIG_BLK_DEV_LOOP=y
435# CONFIG_BLK_DEV_SX8 is not set 466# CONFIG_BLK_DEV_SX8 is not set
436# CONFIG_BLK_DEV_RAM is not set 467# CONFIG_BLK_DEV_RAM is not set
437CONFIG_BLK_DEV_RAM_COUNT=16 468CONFIG_BLK_DEV_RAM_COUNT=16
438# CONFIG_LBD is not set
439CONFIG_CDROM_PKTCDVD=m 469CONFIG_CDROM_PKTCDVD=m
440CONFIG_CDROM_PKTCDVD_BUFFERS=8 470CONFIG_CDROM_PKTCDVD_BUFFERS=8
441# CONFIG_CDROM_PKTCDVD_WCACHE is not set 471# 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 472CONFIG_ATA_OVER_ETH=m
451 473
452# 474#
@@ -550,7 +572,6 @@ CONFIG_NETDEVICES=y
550# PHY device support 572# PHY device support
551# 573#
552CONFIG_PHYLIB=m 574CONFIG_PHYLIB=m
553CONFIG_PHYCONTROL=y
554 575
555# 576#
556# MII PHY device drivers 577# MII PHY device drivers
@@ -569,7 +590,9 @@ CONFIG_MII=m
569CONFIG_MIPS_AU1X00_ENET=y 590CONFIG_MIPS_AU1X00_ENET=y
570# CONFIG_HAPPYMEAL is not set 591# CONFIG_HAPPYMEAL is not set
571# CONFIG_SUNGEM is not set 592# CONFIG_SUNGEM is not set
593# CONFIG_CASSINI is not set
572# CONFIG_NET_VENDOR_3COM is not set 594# CONFIG_NET_VENDOR_3COM is not set
595# CONFIG_SMC91X is not set
573 596
574# 597#
575# Tulip family network device support 598# Tulip family network device support
@@ -639,6 +662,7 @@ CONFIG_PPP_ASYNC=m
639# CONFIG_PPP_SYNC_TTY is not set 662# CONFIG_PPP_SYNC_TTY is not set
640CONFIG_PPP_DEFLATE=m 663CONFIG_PPP_DEFLATE=m
641# CONFIG_PPP_BSDCOMP is not set 664# CONFIG_PPP_BSDCOMP is not set
665CONFIG_PPP_MPPE=m
642CONFIG_PPPOE=m 666CONFIG_PPPOE=m
643# CONFIG_SLIP is not set 667# CONFIG_SLIP is not set
644# CONFIG_SHAPER is not set 668# CONFIG_SHAPER is not set
@@ -704,13 +728,17 @@ CONFIG_SERIO_RAW=m
704# 728#
705# Serial drivers 729# Serial drivers
706# 730#
707# CONFIG_SERIAL_8250 is not set 731CONFIG_SERIAL_8250=y
732CONFIG_SERIAL_8250_CONSOLE=y
733# CONFIG_SERIAL_8250_CS is not set
734CONFIG_SERIAL_8250_NR_UARTS=4
735# CONFIG_SERIAL_8250_EXTENDED is not set
736CONFIG_SERIAL_8250_AU1X00=y
708 737
709# 738#
710# Non-8250 serial port support 739# Non-8250 serial port support
711# 740#
712CONFIG_SERIAL_AU1X00=y 741# CONFIG_SERIAL_AU1X00 is not set
713CONFIG_SERIAL_AU1X00_CONSOLE=y
714CONFIG_SERIAL_CORE=y 742CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 743CONFIG_SERIAL_CORE_CONSOLE=y
716# CONFIG_SERIAL_JSM is not set 744# CONFIG_SERIAL_JSM is not set
@@ -742,12 +770,15 @@ CONFIG_LEGACY_PTY_COUNT=256
742# PCMCIA character devices 770# PCMCIA character devices
743# 771#
744CONFIG_SYNCLINK_CS=m 772CONFIG_SYNCLINK_CS=m
773# CONFIG_CARDMAN_4000 is not set
774# CONFIG_CARDMAN_4040 is not set
745# CONFIG_RAW_DRIVER is not set 775# CONFIG_RAW_DRIVER is not set
746 776
747# 777#
748# TPM devices 778# TPM devices
749# 779#
750# CONFIG_TCG_TPM is not set 780# CONFIG_TCG_TPM is not set
781# CONFIG_TELCLOCK is not set
751 782
752# 783#
753# I2C support 784# I2C support
@@ -801,6 +832,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
801# CONFIG_USB is not set 832# CONFIG_USB is not set
802 833
803# 834#
835# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
836#
837
838#
804# USB Gadget Support 839# USB Gadget Support
805# 840#
806# CONFIG_USB_GADGET is not set 841# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index 326f3aa637..a81e2de694 100644
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:42 2005 4# Thu Nov 24 01:06:09 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -161,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y
161# CONFIG_MIPS_MT is not set 116# CONFIG_MIPS_MT is not set
162# CONFIG_CPU_ADVANCED is not set 117# CONFIG_CPU_ADVANCED is not set
163CONFIG_CPU_HAS_LLSC=y 118CONFIG_CPU_HAS_LLSC=y
164CONFIG_CPU_HAS_LLDSCD=y
165CONFIG_CPU_HAS_SYNC=y 119CONFIG_CPU_HAS_SYNC=y
166CONFIG_GENERIC_HARDIRQS=y 120CONFIG_GENERIC_HARDIRQS=y
167CONFIG_GENERIC_IRQ_PROBE=y 121CONFIG_GENERIC_IRQ_PROBE=y
@@ -173,11 +127,75 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 127CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 128CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
179 134
180# 135#
136# Code maturity level options
137#
138CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32
142
143#
144# General setup
145#
146CONFIG_LOCALVERSION=""
147CONFIG_LOCALVERSION_AUTO=y
148CONFIG_SWAP=y
149CONFIG_SYSVIPC=y
150# CONFIG_POSIX_MQUEUE is not set
151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE=""
158CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_PRINTK=y
162CONFIG_BUG=y
163CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y
165CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0
174
175#
176# Loadable module support
177#
178# CONFIG_MODULES is not set
179
180#
181# Block layer
182#
183# CONFIG_LBD is not set
184
185#
186# IO Schedulers
187#
188CONFIG_IOSCHED_NOOP=y
189CONFIG_IOSCHED_AS=y
190CONFIG_IOSCHED_DEADLINE=y
191CONFIG_IOSCHED_CFQ=y
192CONFIG_DEFAULT_AS=y
193# CONFIG_DEFAULT_DEADLINE is not set
194# CONFIG_DEFAULT_CFQ is not set
195# CONFIG_DEFAULT_NOOP is not set
196CONFIG_DEFAULT_IOSCHED="anticipatory"
197
198#
181# Bus options (PCI, PCMCIA, EISA, ISA, TC) 199# Bus options (PCI, PCMCIA, EISA, ISA, TC)
182# 200#
183CONFIG_HW_HAS_PCI=y 201CONFIG_HW_HAS_PCI=y
@@ -261,8 +279,11 @@ CONFIG_TCP_CONG_BIC=y
261# CONFIG_NET_DIVERT is not set 279# CONFIG_NET_DIVERT is not set
262# CONFIG_ECONET is not set 280# CONFIG_ECONET is not set
263# CONFIG_WAN_ROUTER is not set 281# CONFIG_WAN_ROUTER is not set
282
283#
284# QoS and/or fair queueing
285#
264# CONFIG_NET_SCHED is not set 286# CONFIG_NET_SCHED is not set
265# CONFIG_NET_CLS_ROUTE is not set
266 287
267# 288#
268# Network testing 289# Network testing
@@ -292,6 +313,7 @@ CONFIG_FW_LOADER=y
292# Connector - unified userspace <-> kernelspace linker 313# Connector - unified userspace <-> kernelspace linker
293# 314#
294CONFIG_CONNECTOR=y 315CONFIG_CONNECTOR=y
316CONFIG_PROC_EVENTS=y
295 317
296# 318#
297# Memory Technology Devices (MTD) 319# Memory Technology Devices (MTD)
@@ -321,18 +343,9 @@ CONFIG_CONNECTOR=y
321# CONFIG_BLK_DEV_SX8 is not set 343# CONFIG_BLK_DEV_SX8 is not set
322# CONFIG_BLK_DEV_RAM is not set 344# CONFIG_BLK_DEV_RAM is not set
323CONFIG_BLK_DEV_RAM_COUNT=16 345CONFIG_BLK_DEV_RAM_COUNT=16
324# CONFIG_LBD is not set
325CONFIG_CDROM_PKTCDVD=y 346CONFIG_CDROM_PKTCDVD=y
326CONFIG_CDROM_PKTCDVD_BUFFERS=8 347CONFIG_CDROM_PKTCDVD_BUFFERS=8
327# CONFIG_CDROM_PKTCDVD_WCACHE is not set 348# 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 349CONFIG_ATA_OVER_ETH=y
337 350
338# 351#
@@ -412,7 +425,6 @@ CONFIG_NETDEVICES=y
412# PHY device support 425# PHY device support
413# 426#
414CONFIG_PHYLIB=y 427CONFIG_PHYLIB=y
415CONFIG_PHYCONTROL=y
416 428
417# 429#
418# MII PHY device drivers 430# MII PHY device drivers
@@ -430,6 +442,7 @@ CONFIG_NET_ETHERNET=y
430# CONFIG_MII is not set 442# CONFIG_MII is not set
431# CONFIG_HAPPYMEAL is not set 443# CONFIG_HAPPYMEAL is not set
432# CONFIG_SUNGEM is not set 444# CONFIG_SUNGEM is not set
445# CONFIG_CASSINI is not set
433# CONFIG_NET_VENDOR_3COM is not set 446# CONFIG_NET_VENDOR_3COM is not set
434# CONFIG_NET_VENDOR_SMC is not set 447# CONFIG_NET_VENDOR_SMC is not set
435# CONFIG_NET_VENDOR_RACAL is not set 448# CONFIG_NET_VENDOR_RACAL is not set
@@ -443,7 +456,6 @@ CONFIG_NET_ETHERNET=y
443# CONFIG_HP100 is not set 456# CONFIG_HP100 is not set
444# CONFIG_NET_ISA is not set 457# CONFIG_NET_ISA is not set
445# CONFIG_NET_PCI is not set 458# CONFIG_NET_PCI is not set
446# CONFIG_NET_POCKET is not set
447 459
448# 460#
449# Ethernet (1000 Mbit) 461# Ethernet (1000 Mbit)
@@ -591,6 +603,7 @@ CONFIG_LEGACY_PTY_COUNT=256
591# TPM devices 603# TPM devices
592# 604#
593# CONFIG_TCG_TPM is not set 605# CONFIG_TCG_TPM is not set
606# CONFIG_TELCLOCK is not set
594 607
595# 608#
596# I2C support 609# I2C support
@@ -633,7 +646,6 @@ CONFIG_FB=y
633# CONFIG_FB_CFB_FILLRECT is not set 646# CONFIG_FB_CFB_FILLRECT is not set
634# CONFIG_FB_CFB_COPYAREA is not set 647# CONFIG_FB_CFB_COPYAREA is not set
635# CONFIG_FB_CFB_IMAGEBLIT is not set 648# CONFIG_FB_CFB_IMAGEBLIT is not set
636# CONFIG_FB_SOFT_CURSOR is not set
637# CONFIG_FB_MACMODES is not set 649# CONFIG_FB_MACMODES is not set
638# CONFIG_FB_MODE_HELPERS is not set 650# CONFIG_FB_MODE_HELPERS is not set
639# CONFIG_FB_TILEBLITTING is not set 651# CONFIG_FB_TILEBLITTING is not set
@@ -642,6 +654,7 @@ CONFIG_FB=y
642# CONFIG_FB_CYBER2000 is not set 654# CONFIG_FB_CYBER2000 is not set
643# CONFIG_FB_ASILIANT is not set 655# CONFIG_FB_ASILIANT is not set
644# CONFIG_FB_IMSTT is not set 656# CONFIG_FB_IMSTT is not set
657# CONFIG_FB_S1D13XXX is not set
645# CONFIG_FB_NVIDIA is not set 658# CONFIG_FB_NVIDIA is not set
646# CONFIG_FB_RIVA is not set 659# CONFIG_FB_RIVA is not set
647# CONFIG_FB_MATROX is not set 660# CONFIG_FB_MATROX is not set
@@ -658,7 +671,6 @@ CONFIG_FB=y
658# CONFIG_FB_SMIVGX is not set 671# CONFIG_FB_SMIVGX is not set
659# CONFIG_FB_CYBLA is not set 672# CONFIG_FB_CYBLA is not set
660# CONFIG_FB_TRIDENT is not set 673# CONFIG_FB_TRIDENT is not set
661# CONFIG_FB_S1D13XXX is not set
662# CONFIG_FB_VIRTUAL is not set 674# CONFIG_FB_VIRTUAL is not set
663 675
664# 676#
@@ -688,6 +700,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
688# CONFIG_USB is not set 700# CONFIG_USB is not set
689 701
690# 702#
703# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
704#
705
706#
691# USB Gadget Support 707# USB Gadget Support
692# 708#
693# CONFIG_USB_GADGET is not set 709# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index c2a01df3c8..f1c27c2fb0 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:45 2005 4# Thu Nov 24 01:06:11 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -161,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y
161# CONFIG_MIPS_MT is not set 116# CONFIG_MIPS_MT is not set
162# CONFIG_CPU_ADVANCED is not set 117# CONFIG_CPU_ADVANCED is not set
163CONFIG_CPU_HAS_LLSC=y 118CONFIG_CPU_HAS_LLSC=y
164CONFIG_CPU_HAS_LLDSCD=y
165CONFIG_CPU_HAS_SYNC=y 119CONFIG_CPU_HAS_SYNC=y
166CONFIG_GENERIC_HARDIRQS=y 120CONFIG_GENERIC_HARDIRQS=y
167CONFIG_GENERIC_IRQ_PROBE=y 121CONFIG_GENERIC_IRQ_PROBE=y
@@ -173,11 +127,75 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 127CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 128CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
179 134
180# 135#
136# Code maturity level options
137#
138CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32
142
143#
144# General setup
145#
146CONFIG_LOCALVERSION=""
147CONFIG_LOCALVERSION_AUTO=y
148CONFIG_SWAP=y
149CONFIG_SYSVIPC=y
150# CONFIG_POSIX_MQUEUE is not set
151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE=""
158CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_PRINTK=y
162CONFIG_BUG=y
163CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y
165CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0
174
175#
176# Loadable module support
177#
178# CONFIG_MODULES is not set
179
180#
181# Block layer
182#
183# CONFIG_LBD is not set
184
185#
186# IO Schedulers
187#
188CONFIG_IOSCHED_NOOP=y
189CONFIG_IOSCHED_AS=y
190CONFIG_IOSCHED_DEADLINE=y
191CONFIG_IOSCHED_CFQ=y
192CONFIG_DEFAULT_AS=y
193# CONFIG_DEFAULT_DEADLINE is not set
194# CONFIG_DEFAULT_CFQ is not set
195# CONFIG_DEFAULT_NOOP is not set
196CONFIG_DEFAULT_IOSCHED="anticipatory"
197
198#
181# Bus options (PCI, PCMCIA, EISA, ISA, TC) 199# Bus options (PCI, PCMCIA, EISA, ISA, TC)
182# 200#
183CONFIG_HW_HAS_PCI=y 201CONFIG_HW_HAS_PCI=y
@@ -260,8 +278,11 @@ CONFIG_TCP_CONG_BIC=y
260# CONFIG_NET_DIVERT is not set 278# CONFIG_NET_DIVERT is not set
261# CONFIG_ECONET is not set 279# CONFIG_ECONET is not set
262# CONFIG_WAN_ROUTER is not set 280# CONFIG_WAN_ROUTER is not set
281
282#
283# QoS and/or fair queueing
284#
263# CONFIG_NET_SCHED is not set 285# CONFIG_NET_SCHED is not set
264# CONFIG_NET_CLS_ROUTE is not set
265 286
266# 287#
267# Network testing 288# Network testing
@@ -291,6 +312,7 @@ CONFIG_FW_LOADER=y
291# Connector - unified userspace <-> kernelspace linker 312# Connector - unified userspace <-> kernelspace linker
292# 313#
293CONFIG_CONNECTOR=y 314CONFIG_CONNECTOR=y
315CONFIG_PROC_EVENTS=y
294 316
295# 317#
296# Memory Technology Devices (MTD) 318# Memory Technology Devices (MTD)
@@ -319,18 +341,9 @@ CONFIG_CONNECTOR=y
319# CONFIG_BLK_DEV_SX8 is not set 341# CONFIG_BLK_DEV_SX8 is not set
320# CONFIG_BLK_DEV_RAM is not set 342# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 343CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=y 344CONFIG_CDROM_PKTCDVD=y
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 345CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 346# 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 347CONFIG_ATA_OVER_ETH=y
335 348
336# 349#
@@ -382,7 +395,6 @@ CONFIG_NETDEVICES=y
382# PHY device support 395# PHY device support
383# 396#
384CONFIG_PHYLIB=y 397CONFIG_PHYLIB=y
385CONFIG_PHYCONTROL=y
386 398
387# 399#
388# MII PHY device drivers 400# MII PHY device drivers
@@ -400,6 +412,7 @@ CONFIG_NET_ETHERNET=y
400CONFIG_MII=y 412CONFIG_MII=y
401# CONFIG_HAPPYMEAL is not set 413# CONFIG_HAPPYMEAL is not set
402# CONFIG_SUNGEM is not set 414# CONFIG_SUNGEM is not set
415# CONFIG_CASSINI is not set
403# CONFIG_NET_VENDOR_3COM is not set 416# CONFIG_NET_VENDOR_3COM is not set
404 417
405# 418#
@@ -575,6 +588,7 @@ CONFIG_LEGACY_PTY_COUNT=256
575# TPM devices 588# TPM devices
576# 589#
577# CONFIG_TCG_TPM is not set 590# CONFIG_TCG_TPM is not set
591# CONFIG_TELCLOCK is not set
578 592
579# 593#
580# I2C support 594# I2C support
@@ -634,6 +648,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
634# CONFIG_USB is not set 648# CONFIG_USB is not set
635 649
636# 650#
651# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
652#
653
654#
637# USB Gadget Support 655# USB Gadget Support
638# 656#
639# CONFIG_USB_GADGET is not set 657# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 5bc885b72d..08a4de6ec4 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:48 2005 4# Thu Nov 24 01:06:13 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_ALL is not set
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56# CONFIG_MODVERSIONS is not set
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -178,11 +126,82 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 126CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 127CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 128# CONFIG_SPARSEMEM_STATIC is not set
129CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 130CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 131# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 132# CONFIG_PREEMPT is not set
184 133
185# 134#
135# Code maturity level options
136#
137CONFIG_EXPERIMENTAL=y
138CONFIG_CLEAN_COMPILE=y
139CONFIG_BROKEN_ON_SMP=y
140CONFIG_INIT_ENV_ARG_LIMIT=32
141
142#
143# General setup
144#
145CONFIG_LOCALVERSION=""
146CONFIG_LOCALVERSION_AUTO=y
147CONFIG_SWAP=y
148CONFIG_SYSVIPC=y
149# CONFIG_POSIX_MQUEUE is not set
150# CONFIG_BSD_PROCESS_ACCT is not set
151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set
153# CONFIG_HOTPLUG is not set
154CONFIG_KOBJECT_UEVENT=y
155# CONFIG_IKCONFIG is not set
156CONFIG_INITRAMFS_SOURCE=""
157CONFIG_EMBEDDED=y
158CONFIG_KALLSYMS=y
159# CONFIG_KALLSYMS_ALL is not set
160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_PRINTK=y
162CONFIG_BUG=y
163CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y
165CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0
172# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0
174
175#
176# Loadable module support
177#
178CONFIG_MODULES=y
179CONFIG_MODULE_UNLOAD=y
180# CONFIG_MODULE_FORCE_UNLOAD is not set
181CONFIG_OBSOLETE_MODPARM=y
182# CONFIG_MODVERSIONS is not set
183CONFIG_MODULE_SRCVERSION_ALL=y
184CONFIG_KMOD=y
185
186#
187# Block layer
188#
189# CONFIG_LBD is not set
190
191#
192# IO Schedulers
193#
194CONFIG_IOSCHED_NOOP=y
195CONFIG_IOSCHED_AS=y
196CONFIG_IOSCHED_DEADLINE=y
197CONFIG_IOSCHED_CFQ=y
198CONFIG_DEFAULT_AS=y
199# CONFIG_DEFAULT_DEADLINE is not set
200# CONFIG_DEFAULT_CFQ is not set
201# CONFIG_DEFAULT_NOOP is not set
202CONFIG_DEFAULT_IOSCHED="anticipatory"
203
204#
186# Bus options (PCI, PCMCIA, EISA, ISA, TC) 205# Bus options (PCI, PCMCIA, EISA, ISA, TC)
187# 206#
188CONFIG_TC=y 207CONFIG_TC=y
@@ -262,8 +281,11 @@ 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
267 289
268# 290#
269# Network testing 291# Network testing
@@ -318,16 +340,7 @@ CONFIG_BLK_DEV_LOOP=m
318# CONFIG_BLK_DEV_NBD is not set 340# CONFIG_BLK_DEV_NBD is not set
319# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
320CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
321# CONFIG_LBD is not set
322# CONFIG_CDROM_PKTCDVD is not set 343# 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 344# CONFIG_ATA_OVER_ETH is not set
332 345
333# 346#
@@ -365,12 +378,13 @@ CONFIG_SCSI_CONSTANTS=y
365# 378#
366CONFIG_SCSI_SPI_ATTRS=m 379CONFIG_SCSI_SPI_ATTRS=m
367# CONFIG_SCSI_FC_ATTRS is not set 380# CONFIG_SCSI_FC_ATTRS is not set
368# CONFIG_SCSI_ISCSI_ATTRS is not set 381CONFIG_SCSI_ISCSI_ATTRS=m
369CONFIG_SCSI_SAS_ATTRS=m 382CONFIG_SCSI_SAS_ATTRS=m
370 383
371# 384#
372# SCSI low-level drivers 385# SCSI low-level drivers
373# 386#
387CONFIG_ISCSI_TCP=m
374CONFIG_SCSI_DECNCR=y 388CONFIG_SCSI_DECNCR=y
375# CONFIG_SCSI_DECSII is not set 389# CONFIG_SCSI_DECSII is not set
376# CONFIG_SCSI_SATA is not set 390# CONFIG_SCSI_SATA is not set
@@ -407,7 +421,6 @@ CONFIG_NETDEVICES=y
407# PHY device support 421# PHY device support
408# 422#
409CONFIG_PHYLIB=m 423CONFIG_PHYLIB=m
410CONFIG_PHYCONTROL=y
411 424
412# 425#
413# MII PHY device drivers 426# MII PHY device drivers
@@ -491,10 +504,7 @@ CONFIG_ZS=y
491# 504#
492# Non-8250 serial port support 505# Non-8250 serial port support
493# 506#
494CONFIG_SERIAL_DZ=y 507# CONFIG_SERIAL_DZ is not set
495CONFIG_SERIAL_DZ_CONSOLE=y
496CONFIG_SERIAL_CORE=y
497CONFIG_SERIAL_CORE_CONSOLE=y
498CONFIG_UNIX98_PTYS=y 508CONFIG_UNIX98_PTYS=y
499CONFIG_LEGACY_PTYS=y 509CONFIG_LEGACY_PTYS=y
500CONFIG_LEGACY_PTY_COUNT=256 510CONFIG_LEGACY_PTY_COUNT=256
@@ -520,6 +530,8 @@ CONFIG_RTC=y
520# 530#
521# TPM devices 531# TPM devices
522# 532#
533# CONFIG_TCG_TPM is not set
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 c0d06ea556..c9070cef08 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:51 2005 4# Thu Nov 24 01:06:14 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -180,11 +129,81 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 129CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 130CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 131# CONFIG_SPARSEMEM_STATIC is not set
132CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 133CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 134# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 135# CONFIG_PREEMPT is not set
186 136
187# 137#
138# Code maturity level options
139#
140CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32
144
145#
146# General setup
147#
148CONFIG_LOCALVERSION=""
149CONFIG_LOCALVERSION_AUTO=y
150CONFIG_SWAP=y
151CONFIG_SYSVIPC=y
152# CONFIG_POSIX_MQUEUE is not set
153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set
156# CONFIG_HOTPLUG is not set
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184CONFIG_MODVERSIONS=y
185CONFIG_MODULE_SRCVERSION_ALL=y
186CONFIG_KMOD=y
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
188# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
189# 208#
190CONFIG_ISA=y 209CONFIG_ISA=y
@@ -262,8 +281,11 @@ 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
267 289
268# 290#
269# Network testing 291# Network testing
@@ -317,16 +339,7 @@ CONFIG_CONNECTOR=m
317# CONFIG_BLK_DEV_NBD is not set 339# CONFIG_BLK_DEV_NBD is not set
318# CONFIG_BLK_DEV_RAM is not set 340# CONFIG_BLK_DEV_RAM is not set
319CONFIG_BLK_DEV_RAM_COUNT=16 341CONFIG_BLK_DEV_RAM_COUNT=16
320# CONFIG_LBD is not set
321# CONFIG_CDROM_PKTCDVD is not set 342# 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 343# CONFIG_ATA_OVER_ETH is not set
331 344
332# 345#
@@ -403,7 +416,6 @@ CONFIG_NETDEVICES=y
403# PHY device support 416# PHY device support
404# 417#
405CONFIG_PHYLIB=m 418CONFIG_PHYLIB=m
406CONFIG_PHYCONTROL=y
407 419
408# 420#
409# MII PHY device drivers 421# MII PHY device drivers
@@ -427,7 +439,6 @@ CONFIG_NET_ETHERNET=y
427# CONFIG_HP100 is not set 439# CONFIG_HP100 is not set
428# CONFIG_NET_ISA is not set 440# CONFIG_NET_ISA is not set
429# CONFIG_NET_PCI is not set 441# CONFIG_NET_PCI is not set
430# CONFIG_NET_POCKET is not set
431 442
432# 443#
433# Ethernet (1000 Mbit) 444# Ethernet (1000 Mbit)
@@ -552,6 +563,7 @@ CONFIG_WATCHDOG=y
552# CONFIG_WDT is not set 563# CONFIG_WDT is not set
553# CONFIG_RTC is not set 564# CONFIG_RTC is not set
554# CONFIG_GEN_RTC is not set 565# CONFIG_GEN_RTC is not set
566# CONFIG_RTC_VR41XX is not set
555# CONFIG_DTLK is not set 567# CONFIG_DTLK is not set
556# CONFIG_R3964 is not set 568# CONFIG_R3964 is not set
557 569
@@ -564,6 +576,8 @@ CONFIG_GPIO_VR41XX=y
564# 576#
565# TPM devices 577# TPM devices
566# 578#
579# CONFIG_TCG_TPM is not set
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 f1309d84d2..aa24d85ea9 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:54 2005 4# Thu Nov 24 01:06:16 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_KMOD is not set
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -169,7 +118,6 @@ CONFIG_PAGE_SIZE_4KB=y
169# CONFIG_64BIT_PHYS_ADDR is not set 118# CONFIG_64BIT_PHYS_ADDR is not set
170# CONFIG_CPU_ADVANCED is not set 119# CONFIG_CPU_ADVANCED is not set
171CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
172CONFIG_CPU_HAS_LLDSCD=y
173CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
174CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
175CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
@@ -181,11 +129,81 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 129CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 130CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 131# CONFIG_SPARSEMEM_STATIC is not set
132CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 133CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 134# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 135# CONFIG_PREEMPT is not set
187 136
188# 137#
138# Code maturity level options
139#
140CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32
144
145#
146# General setup
147#
148CONFIG_LOCALVERSION=""
149CONFIG_LOCALVERSION_AUTO=y
150CONFIG_SWAP=y
151CONFIG_SYSVIPC=y
152# CONFIG_POSIX_MQUEUE is not set
153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184CONFIG_MODVERSIONS=y
185CONFIG_MODULE_SRCVERSION_ALL=y
186# CONFIG_KMOD is not set
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
189# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
190# 208#
191CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
@@ -267,8 +285,11 @@ 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
272 293
273# 294#
274# Network testing 295# Network testing
@@ -326,18 +347,9 @@ CONFIG_CONNECTOR=m
326# CONFIG_BLK_DEV_SX8 is not set 347# CONFIG_BLK_DEV_SX8 is not set
327# CONFIG_BLK_DEV_RAM is not set 348# CONFIG_BLK_DEV_RAM is not set
328CONFIG_BLK_DEV_RAM_COUNT=16 349CONFIG_BLK_DEV_RAM_COUNT=16
329# CONFIG_LBD is not set
330CONFIG_CDROM_PKTCDVD=m 350CONFIG_CDROM_PKTCDVD=m
331CONFIG_CDROM_PKTCDVD_BUFFERS=8 351CONFIG_CDROM_PKTCDVD_BUFFERS=8
332# CONFIG_CDROM_PKTCDVD_WCACHE is not set 352# 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 353CONFIG_ATA_OVER_ETH=m
342 354
343# 355#
@@ -389,7 +401,6 @@ CONFIG_NETDEVICES=y
389# PHY device support 401# PHY device support
390# 402#
391CONFIG_PHYLIB=m 403CONFIG_PHYLIB=m
392CONFIG_PHYCONTROL=y
393 404
394# 405#
395# MII PHY device drivers 406# MII PHY device drivers
@@ -407,6 +418,7 @@ CONFIG_NET_ETHERNET=y
407# CONFIG_MII is not set 418# CONFIG_MII is not set
408# CONFIG_HAPPYMEAL is not set 419# CONFIG_HAPPYMEAL is not set
409# CONFIG_SUNGEM is not set 420# CONFIG_SUNGEM is not set
421# CONFIG_CASSINI is not set
410# CONFIG_NET_VENDOR_3COM is not set 422# CONFIG_NET_VENDOR_3COM is not set
411 423
412# 424#
@@ -464,6 +476,7 @@ CONFIG_PPP_ASYNC=y
464# CONFIG_PPP_SYNC_TTY is not set 476# CONFIG_PPP_SYNC_TTY is not set
465# CONFIG_PPP_DEFLATE is not set 477# CONFIG_PPP_DEFLATE is not set
466# CONFIG_PPP_BSDCOMP is not set 478# CONFIG_PPP_BSDCOMP is not set
479CONFIG_PPP_MPPE=m
467# CONFIG_PPPOE is not set 480# CONFIG_PPPOE is not set
468# CONFIG_SLIP is not set 481# CONFIG_SLIP is not set
469# CONFIG_SHAPER is not set 482# CONFIG_SHAPER is not set
@@ -569,6 +582,7 @@ CONFIG_LEGACY_PTY_COUNT=256
569# TPM devices 582# TPM devices
570# 583#
571# CONFIG_TCG_TPM is not set 584# CONFIG_TCG_TPM is not set
585# CONFIG_TELCLOCK is not set
572 586
573# 587#
574# I2C support 588# I2C support
@@ -628,6 +642,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
628# CONFIG_USB is not set 642# CONFIG_USB is not set
629 643
630# 644#
645# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
646#
647
648#
631# USB Gadget Support 649# USB Gadget Support
632# 650#
633# CONFIG_USB_GADGET is not set 651# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig
index 8ac55b7acc..eeed0e5ad2 100644
--- a/arch/mips/configs/ev96100_defconfig
+++ b/arch/mips/configs/ev96100_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:57 2005 4# Thu Nov 24 01:06:18 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_KMOD is not set
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -172,7 +121,6 @@ CONFIG_CPU_HAS_PREFETCH=y
172# CONFIG_64BIT_PHYS_ADDR is not set 121# CONFIG_64BIT_PHYS_ADDR is not set
173# CONFIG_CPU_ADVANCED is not set 122# CONFIG_CPU_ADVANCED is not set
174CONFIG_CPU_HAS_LLSC=y 123CONFIG_CPU_HAS_LLSC=y
175CONFIG_CPU_HAS_LLDSCD=y
176CONFIG_CPU_HAS_SYNC=y 124CONFIG_CPU_HAS_SYNC=y
177CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
178CONFIG_GENERIC_IRQ_PROBE=y 126CONFIG_GENERIC_IRQ_PROBE=y
@@ -185,11 +133,81 @@ CONFIG_FLATMEM_MANUAL=y
185CONFIG_FLATMEM=y 133CONFIG_FLATMEM=y
186CONFIG_FLAT_NODE_MEM_MAP=y 134CONFIG_FLAT_NODE_MEM_MAP=y
187# CONFIG_SPARSEMEM_STATIC is not set 135# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4
188CONFIG_PREEMPT_NONE=y 137CONFIG_PREEMPT_NONE=y
189# CONFIG_PREEMPT_VOLUNTARY is not set 138# CONFIG_PREEMPT_VOLUNTARY is not set
190# CONFIG_PREEMPT is not set 139# CONFIG_PREEMPT is not set
191 140
192# 141#
142# Code maturity level options
143#
144CONFIG_EXPERIMENTAL=y
145CONFIG_CLEAN_COMPILE=y
146CONFIG_BROKEN_ON_SMP=y
147CONFIG_INIT_ENV_ARG_LIMIT=32
148
149#
150# General setup
151#
152CONFIG_LOCALVERSION=""
153CONFIG_LOCALVERSION_AUTO=y
154CONFIG_SWAP=y
155CONFIG_SYSVIPC=y
156# CONFIG_POSIX_MQUEUE is not set
157# CONFIG_BSD_PROCESS_ACCT is not set
158CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set
160# CONFIG_HOTPLUG is not set
161CONFIG_KOBJECT_UEVENT=y
162# CONFIG_IKCONFIG is not set
163CONFIG_INITRAMFS_SOURCE=""
164CONFIG_EMBEDDED=y
165CONFIG_KALLSYMS=y
166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_PRINTK=y
168CONFIG_BUG=y
169CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y
171CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0
180
181#
182# Loadable module support
183#
184CONFIG_MODULES=y
185CONFIG_MODULE_UNLOAD=y
186# CONFIG_MODULE_FORCE_UNLOAD is not set
187CONFIG_OBSOLETE_MODPARM=y
188CONFIG_MODVERSIONS=y
189CONFIG_MODULE_SRCVERSION_ALL=y
190# CONFIG_KMOD is not set
191
192#
193# Block layer
194#
195# CONFIG_LBD is not set
196
197#
198# IO Schedulers
199#
200CONFIG_IOSCHED_NOOP=y
201CONFIG_IOSCHED_AS=y
202CONFIG_IOSCHED_DEADLINE=y
203CONFIG_IOSCHED_CFQ=y
204CONFIG_DEFAULT_AS=y
205# CONFIG_DEFAULT_DEADLINE is not set
206# CONFIG_DEFAULT_CFQ is not set
207# CONFIG_DEFAULT_NOOP is not set
208CONFIG_DEFAULT_IOSCHED="anticipatory"
209
210#
193# Bus options (PCI, PCMCIA, EISA, ISA, TC) 211# Bus options (PCI, PCMCIA, EISA, ISA, TC)
194# 212#
195CONFIG_HW_HAS_PCI=y 213CONFIG_HW_HAS_PCI=y
@@ -269,8 +287,11 @@ CONFIG_TCP_CONG_BIC=y
269# CONFIG_NET_DIVERT is not set 287# CONFIG_NET_DIVERT is not set
270# CONFIG_ECONET is not set 288# CONFIG_ECONET is not set
271# CONFIG_WAN_ROUTER is not set 289# CONFIG_WAN_ROUTER is not set
290
291#
292# QoS and/or fair queueing
293#
272# CONFIG_NET_SCHED is not set 294# CONFIG_NET_SCHED is not set
273# CONFIG_NET_CLS_ROUTE is not set
274 295
275# 296#
276# Network testing 297# Network testing
@@ -323,18 +344,9 @@ CONFIG_CONNECTOR=m
323# CONFIG_BLK_DEV_NBD is not set 344# CONFIG_BLK_DEV_NBD is not set
324# CONFIG_BLK_DEV_RAM is not set 345# CONFIG_BLK_DEV_RAM is not set
325CONFIG_BLK_DEV_RAM_COUNT=16 346CONFIG_BLK_DEV_RAM_COUNT=16
326# CONFIG_LBD is not set
327CONFIG_CDROM_PKTCDVD=m 347CONFIG_CDROM_PKTCDVD=m
328CONFIG_CDROM_PKTCDVD_BUFFERS=8 348CONFIG_CDROM_PKTCDVD_BUFFERS=8
329# CONFIG_CDROM_PKTCDVD_WCACHE is not set 349# 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 350CONFIG_ATA_OVER_ETH=m
339 351
340# 352#
@@ -379,7 +391,6 @@ CONFIG_NETDEVICES=y
379# PHY device support 391# PHY device support
380# 392#
381CONFIG_PHYLIB=m 393CONFIG_PHYLIB=m
382CONFIG_PHYCONTROL=y
383 394
384# 395#
385# MII PHY device drivers 396# MII PHY device drivers
@@ -518,6 +529,8 @@ CONFIG_LEGACY_PTY_COUNT=256
518# 529#
519# TPM devices 530# TPM devices
520# 531#
532# CONFIG_TCG_TPM is not set
533# CONFIG_TELCLOCK is not set
521 534
522# 535#
523# I2C support 536# I2C support
@@ -576,6 +589,10 @@ CONFIG_DUMMY_CONSOLE=y
576# CONFIG_USB_ARCH_HAS_OHCI is not set 589# CONFIG_USB_ARCH_HAS_OHCI is not set
577 590
578# 591#
592# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
593#
594
595#
579# USB Gadget Support 596# USB Gadget Support
580# 597#
581# CONFIG_USB_GADGET is not set 598# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 3ae3838f28..e56351abf8 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:01 2005 4# Thu Nov 24 01:06:20 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -175,7 +123,6 @@ CONFIG_IP22_CPU_SCACHE=y
175# CONFIG_64BIT_PHYS_ADDR is not set 123# CONFIG_64BIT_PHYS_ADDR is not set
176# CONFIG_CPU_ADVANCED is not set 124# CONFIG_CPU_ADVANCED is not set
177CONFIG_CPU_HAS_LLSC=y 125CONFIG_CPU_HAS_LLSC=y
178CONFIG_CPU_HAS_LLDSCD=y
179CONFIG_CPU_HAS_SYNC=y 126CONFIG_CPU_HAS_SYNC=y
180CONFIG_GENERIC_HARDIRQS=y 127CONFIG_GENERIC_HARDIRQS=y
181CONFIG_GENERIC_IRQ_PROBE=y 128CONFIG_GENERIC_IRQ_PROBE=y
@@ -187,11 +134,82 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 134CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 135CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 136# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PREEMPT_NONE is not set 138# CONFIG_PREEMPT_NONE is not set
191CONFIG_PREEMPT_VOLUNTARY=y 139CONFIG_PREEMPT_VOLUNTARY=y
192# CONFIG_PREEMPT is not set 140# CONFIG_PREEMPT is not set
193 141
194# 142#
143# Code maturity level options
144#
145CONFIG_EXPERIMENTAL=y
146CONFIG_CLEAN_COMPILE=y
147CONFIG_BROKEN_ON_SMP=y
148CONFIG_INIT_ENV_ARG_LIMIT=32
149
150#
151# General setup
152#
153CONFIG_LOCALVERSION=""
154CONFIG_LOCALVERSION_AUTO=y
155CONFIG_SWAP=y
156CONFIG_SYSVIPC=y
157# CONFIG_POSIX_MQUEUE is not set
158# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set
161# CONFIG_HOTPLUG is not set
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y
165CONFIG_INITRAMFS_SOURCE=""
166CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set
169CONFIG_PRINTK=y
170CONFIG_BUG=y
171CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y
173CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0
182
183#
184# Loadable module support
185#
186CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y
188# CONFIG_MODULE_FORCE_UNLOAD is not set
189CONFIG_OBSOLETE_MODPARM=y
190CONFIG_MODVERSIONS=y
191CONFIG_MODULE_SRCVERSION_ALL=y
192CONFIG_KMOD=y
193
194#
195# Block layer
196#
197# CONFIG_LBD is not set
198
199#
200# IO Schedulers
201#
202CONFIG_IOSCHED_NOOP=y
203CONFIG_IOSCHED_AS=y
204CONFIG_IOSCHED_DEADLINE=y
205CONFIG_IOSCHED_CFQ=y
206CONFIG_DEFAULT_AS=y
207# CONFIG_DEFAULT_DEADLINE is not set
208# CONFIG_DEFAULT_CFQ is not set
209# CONFIG_DEFAULT_NOOP is not set
210CONFIG_DEFAULT_IOSCHED="anticipatory"
211
212#
195# Bus options (PCI, PCMCIA, EISA, ISA, TC) 213# Bus options (PCI, PCMCIA, EISA, ISA, TC)
196# 214#
197CONFIG_HW_HAS_EISA=y 215CONFIG_HW_HAS_EISA=y
@@ -292,6 +310,10 @@ CONFIG_INET6_TUNNEL=m
292CONFIG_IPV6_TUNNEL=m 310CONFIG_IPV6_TUNNEL=m
293CONFIG_NETFILTER=y 311CONFIG_NETFILTER=y
294# CONFIG_NETFILTER_DEBUG is not set 312# CONFIG_NETFILTER_DEBUG is not set
313
314#
315# Core Netfilter Configuration
316#
295CONFIG_NETFILTER_NETLINK=m 317CONFIG_NETFILTER_NETLINK=m
296CONFIG_NETFILTER_NETLINK_QUEUE=m 318CONFIG_NETFILTER_NETLINK_QUEUE=m
297CONFIG_NETFILTER_NETLINK_LOG=m 319CONFIG_NETFILTER_NETLINK_LOG=m
@@ -345,6 +367,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
345CONFIG_IP_NF_TARGET_LOG=m 367CONFIG_IP_NF_TARGET_LOG=m
346CONFIG_IP_NF_TARGET_ULOG=m 368CONFIG_IP_NF_TARGET_ULOG=m
347CONFIG_IP_NF_TARGET_TCPMSS=m 369CONFIG_IP_NF_TARGET_TCPMSS=m
370CONFIG_IP_NF_TARGET_NFQUEUE=m
348CONFIG_IP_NF_NAT=m 371CONFIG_IP_NF_NAT=m
349CONFIG_IP_NF_NAT_NEEDED=y 372CONFIG_IP_NF_NAT_NEEDED=y
350CONFIG_IP_NF_TARGET_MASQUERADE=m 373CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -393,6 +416,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
393CONFIG_IP6_NF_FILTER=m 416CONFIG_IP6_NF_FILTER=m
394CONFIG_IP6_NF_TARGET_LOG=m 417CONFIG_IP6_NF_TARGET_LOG=m
395CONFIG_IP6_NF_TARGET_REJECT=m 418CONFIG_IP6_NF_TARGET_REJECT=m
419CONFIG_IP6_NF_TARGET_NFQUEUE=m
396CONFIG_IP6_NF_MANGLE=m 420CONFIG_IP6_NF_MANGLE=m
397CONFIG_IP6_NF_TARGET_MARK=m 421CONFIG_IP6_NF_TARGET_MARK=m
398CONFIG_IP6_NF_TARGET_HL=m 422CONFIG_IP6_NF_TARGET_HL=m
@@ -424,10 +448,18 @@ CONFIG_SCTP_HMAC_MD5=y
424CONFIG_NET_DIVERT=y 448CONFIG_NET_DIVERT=y
425# CONFIG_ECONET is not set 449# CONFIG_ECONET is not set
426# CONFIG_WAN_ROUTER is not set 450# CONFIG_WAN_ROUTER is not set
451
452#
453# QoS and/or fair queueing
454#
427CONFIG_NET_SCHED=y 455CONFIG_NET_SCHED=y
428# CONFIG_NET_SCH_CLK_JIFFIES is not set 456# CONFIG_NET_SCH_CLK_JIFFIES is not set
429CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 457CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
430# CONFIG_NET_SCH_CLK_CPU is not set 458# CONFIG_NET_SCH_CLK_CPU is not set
459
460#
461# Queueing/Scheduling
462#
431CONFIG_NET_SCH_CBQ=m 463CONFIG_NET_SCH_CBQ=m
432CONFIG_NET_SCH_HTB=m 464CONFIG_NET_SCH_HTB=m
433CONFIG_NET_SCH_HFSC=m 465CONFIG_NET_SCH_HFSC=m
@@ -440,8 +472,10 @@ CONFIG_NET_SCH_GRED=m
440CONFIG_NET_SCH_DSMARK=m 472CONFIG_NET_SCH_DSMARK=m
441CONFIG_NET_SCH_NETEM=m 473CONFIG_NET_SCH_NETEM=m
442CONFIG_NET_SCH_INGRESS=m 474CONFIG_NET_SCH_INGRESS=m
443CONFIG_NET_QOS=y 475
444CONFIG_NET_ESTIMATOR=y 476#
477# Classification
478#
445CONFIG_NET_CLS=y 479CONFIG_NET_CLS=y
446CONFIG_NET_CLS_BASIC=m 480CONFIG_NET_CLS_BASIC=m
447CONFIG_NET_CLS_TCINDEX=m 481CONFIG_NET_CLS_TCINDEX=m
@@ -450,13 +484,14 @@ CONFIG_NET_CLS_ROUTE=y
450CONFIG_NET_CLS_FW=m 484CONFIG_NET_CLS_FW=m
451CONFIG_NET_CLS_U32=m 485CONFIG_NET_CLS_U32=m
452# CONFIG_CLS_U32_PERF is not set 486# CONFIG_CLS_U32_PERF is not set
453# CONFIG_NET_CLS_IND is not set
454# CONFIG_CLS_U32_MARK is not set 487# CONFIG_CLS_U32_MARK is not set
455CONFIG_NET_CLS_RSVP=m 488CONFIG_NET_CLS_RSVP=m
456CONFIG_NET_CLS_RSVP6=m 489CONFIG_NET_CLS_RSVP6=m
457# CONFIG_NET_EMATCH is not set 490# CONFIG_NET_EMATCH is not set
458# CONFIG_NET_CLS_ACT is not set 491# CONFIG_NET_CLS_ACT is not set
459CONFIG_NET_CLS_POLICE=y 492CONFIG_NET_CLS_POLICE=y
493# CONFIG_NET_CLS_IND is not set
494CONFIG_NET_ESTIMATOR=y
460 495
461# 496#
462# Network testing 497# Network testing
@@ -509,18 +544,9 @@ CONFIG_CONNECTOR=m
509# CONFIG_BLK_DEV_NBD is not set 544# CONFIG_BLK_DEV_NBD is not set
510# CONFIG_BLK_DEV_RAM is not set 545# CONFIG_BLK_DEV_RAM is not set
511CONFIG_BLK_DEV_RAM_COUNT=16 546CONFIG_BLK_DEV_RAM_COUNT=16
512# CONFIG_LBD is not set
513CONFIG_CDROM_PKTCDVD=m 547CONFIG_CDROM_PKTCDVD=m
514CONFIG_CDROM_PKTCDVD_BUFFERS=8 548CONFIG_CDROM_PKTCDVD_BUFFERS=8
515# CONFIG_CDROM_PKTCDVD_WCACHE is not set 549# 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 550CONFIG_ATA_OVER_ETH=m
525 551
526# 552#
@@ -564,6 +590,7 @@ CONFIG_SCSI_SAS_ATTRS=m
564# 590#
565# SCSI low-level drivers 591# SCSI low-level drivers
566# 592#
593CONFIG_ISCSI_TCP=m
567CONFIG_SGIWD93_SCSI=y 594CONFIG_SGIWD93_SCSI=y
568# CONFIG_SCSI_SATA is not set 595# CONFIG_SCSI_SATA is not set
569# CONFIG_SCSI_DEBUG is not set 596# CONFIG_SCSI_DEBUG is not set
@@ -599,7 +626,6 @@ CONFIG_TUN=m
599# PHY device support 626# PHY device support
600# 627#
601CONFIG_PHYLIB=m 628CONFIG_PHYLIB=m
602CONFIG_PHYCONTROL=y
603 629
604# 630#
605# MII PHY device drivers 631# MII PHY device drivers
@@ -752,6 +778,8 @@ CONFIG_MAX_RAW_DEVS=256
752# 778#
753# TPM devices 779# TPM devices
754# 780#
781# CONFIG_TCG_TPM is not set
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 d962f61d5b..e17d3adff0 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,65 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:04 2005 4# Thu Nov 24 01:06:21 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_LOCK_KERNEL=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23CONFIG_POSIX_MQUEUE=y
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_CPUSETS=y
32CONFIG_INITRAMFS_SOURCE=""
33CONFIG_EMBEDDED=y
34CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_EXTRA_PASS is not set
36CONFIG_PRINTK=y
37CONFIG_BUG=y
38CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y
40CONFIG_EPOLL=y
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SHMEM=y
43CONFIG_CC_ALIGN_FUNCTIONS=0
44CONFIG_CC_ALIGN_LABELS=0
45CONFIG_CC_ALIGN_LOOPS=0
46CONFIG_CC_ALIGN_JUMPS=0
47# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0
49
50#
51# Loadable module support
52#
53CONFIG_MODULES=y
54CONFIG_MODULE_UNLOAD=y
55# CONFIG_MODULE_FORCE_UNLOAD is not set
56CONFIG_OBSOLETE_MODPARM=y
57# CONFIG_MODVERSIONS is not set
58CONFIG_MODULE_SRCVERSION_ALL=y
59CONFIG_KMOD=y
60CONFIG_STOP_MACHINE=y
61
62#
63# Machine selection 9# Machine selection
64# 10#
65# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -173,7 +119,6 @@ CONFIG_PAGE_SIZE_4KB=y
173CONFIG_CPU_HAS_PREFETCH=y 119CONFIG_CPU_HAS_PREFETCH=y
174# CONFIG_MIPS_MT is not set 120# CONFIG_MIPS_MT is not set
175CONFIG_CPU_HAS_LLSC=y 121CONFIG_CPU_HAS_LLSC=y
176CONFIG_CPU_HAS_LLDSCD=y
177CONFIG_CPU_HAS_SYNC=y 122CONFIG_CPU_HAS_SYNC=y
178CONFIG_GENERIC_HARDIRQS=y 123CONFIG_GENERIC_HARDIRQS=y
179CONFIG_GENERIC_IRQ_PROBE=y 124CONFIG_GENERIC_IRQ_PROBE=y
@@ -186,6 +131,7 @@ CONFIG_DISCONTIGMEM=y
186CONFIG_FLAT_NODE_MEM_MAP=y 131CONFIG_FLAT_NODE_MEM_MAP=y
187CONFIG_NEED_MULTIPLE_NODES=y 132CONFIG_NEED_MULTIPLE_NODES=y
188# CONFIG_SPARSEMEM_STATIC is not set 133# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4
189CONFIG_SMP=y 135CONFIG_SMP=y
190CONFIG_NR_CPUS=64 136CONFIG_NR_CPUS=64
191CONFIG_PREEMPT_NONE=y 137CONFIG_PREEMPT_NONE=y
@@ -195,6 +141,77 @@ CONFIG_PREEMPT_BKL=y
195# CONFIG_MIPS_INSANE_LARGE is not set 141# CONFIG_MIPS_INSANE_LARGE is not set
196 142
197# 143#
144# Code maturity level options
145#
146CONFIG_EXPERIMENTAL=y
147CONFIG_CLEAN_COMPILE=y
148CONFIG_LOCK_KERNEL=y
149CONFIG_INIT_ENV_ARG_LIMIT=32
150
151#
152# General setup
153#
154CONFIG_LOCALVERSION=""
155CONFIG_LOCALVERSION_AUTO=y
156CONFIG_SWAP=y
157CONFIG_SYSVIPC=y
158CONFIG_POSIX_MQUEUE=y
159# CONFIG_BSD_PROCESS_ACCT is not set
160CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set
162CONFIG_HOTPLUG=y
163CONFIG_KOBJECT_UEVENT=y
164CONFIG_IKCONFIG=y
165CONFIG_IKCONFIG_PROC=y
166CONFIG_CPUSETS=y
167CONFIG_INITRAMFS_SOURCE=""
168CONFIG_EMBEDDED=y
169CONFIG_KALLSYMS=y
170# CONFIG_KALLSYMS_EXTRA_PASS is not set
171CONFIG_PRINTK=y
172CONFIG_BUG=y
173CONFIG_BASE_FULL=y
174CONFIG_FUTEX=y
175CONFIG_EPOLL=y
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
177CONFIG_SHMEM=y
178CONFIG_CC_ALIGN_FUNCTIONS=0
179CONFIG_CC_ALIGN_LABELS=0
180CONFIG_CC_ALIGN_LOOPS=0
181CONFIG_CC_ALIGN_JUMPS=0
182# CONFIG_TINY_SHMEM is not set
183CONFIG_BASE_SMALL=0
184
185#
186# Loadable module support
187#
188CONFIG_MODULES=y
189CONFIG_MODULE_UNLOAD=y
190# CONFIG_MODULE_FORCE_UNLOAD is not set
191CONFIG_OBSOLETE_MODPARM=y
192# CONFIG_MODVERSIONS is not set
193CONFIG_MODULE_SRCVERSION_ALL=y
194CONFIG_KMOD=y
195CONFIG_STOP_MACHINE=y
196
197#
198# Block layer
199#
200
201#
202# IO Schedulers
203#
204CONFIG_IOSCHED_NOOP=y
205CONFIG_IOSCHED_AS=y
206CONFIG_IOSCHED_DEADLINE=y
207CONFIG_IOSCHED_CFQ=y
208CONFIG_DEFAULT_AS=y
209# CONFIG_DEFAULT_DEADLINE is not set
210# CONFIG_DEFAULT_CFQ is not set
211# CONFIG_DEFAULT_NOOP is not set
212CONFIG_DEFAULT_IOSCHED="anticipatory"
213
214#
198# Bus options (PCI, PCMCIA, EISA, ISA, TC) 215# Bus options (PCI, PCMCIA, EISA, ISA, TC)
199# 216#
200CONFIG_HW_HAS_PCI=y 217CONFIG_HW_HAS_PCI=y
@@ -284,10 +301,18 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_NET_DIVERT is not set 301# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set 302# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 303# CONFIG_WAN_ROUTER is not set
304
305#
306# QoS and/or fair queueing
307#
287CONFIG_NET_SCHED=y 308CONFIG_NET_SCHED=y
288# CONFIG_NET_SCH_CLK_JIFFIES is not set 309# CONFIG_NET_SCH_CLK_JIFFIES is not set
289CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 310CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
290# CONFIG_NET_SCH_CLK_CPU is not set 311# CONFIG_NET_SCH_CLK_CPU is not set
312
313#
314# Queueing/Scheduling
315#
291CONFIG_NET_SCH_CBQ=m 316CONFIG_NET_SCH_CBQ=m
292CONFIG_NET_SCH_HTB=m 317CONFIG_NET_SCH_HTB=m
293CONFIG_NET_SCH_HFSC=m 318CONFIG_NET_SCH_HFSC=m
@@ -300,8 +325,10 @@ CONFIG_NET_SCH_GRED=m
300CONFIG_NET_SCH_DSMARK=m 325CONFIG_NET_SCH_DSMARK=m
301CONFIG_NET_SCH_NETEM=m 326CONFIG_NET_SCH_NETEM=m
302CONFIG_NET_SCH_INGRESS=m 327CONFIG_NET_SCH_INGRESS=m
303CONFIG_NET_QOS=y 328
304CONFIG_NET_ESTIMATOR=y 329#
330# Classification
331#
305CONFIG_NET_CLS=y 332CONFIG_NET_CLS=y
306CONFIG_NET_CLS_BASIC=m 333CONFIG_NET_CLS_BASIC=m
307CONFIG_NET_CLS_TCINDEX=m 334CONFIG_NET_CLS_TCINDEX=m
@@ -310,12 +337,13 @@ CONFIG_NET_CLS_ROUTE=y
310CONFIG_NET_CLS_FW=m 337CONFIG_NET_CLS_FW=m
311CONFIG_NET_CLS_U32=m 338CONFIG_NET_CLS_U32=m
312# CONFIG_CLS_U32_PERF is not set 339# CONFIG_CLS_U32_PERF is not set
313# CONFIG_NET_CLS_IND is not set
314CONFIG_NET_CLS_RSVP=m 340CONFIG_NET_CLS_RSVP=m
315CONFIG_NET_CLS_RSVP6=m 341CONFIG_NET_CLS_RSVP6=m
316# CONFIG_NET_EMATCH is not set 342# CONFIG_NET_EMATCH is not set
317# CONFIG_NET_CLS_ACT is not set 343# CONFIG_NET_CLS_ACT is not set
318CONFIG_NET_CLS_POLICE=y 344CONFIG_NET_CLS_POLICE=y
345# CONFIG_NET_CLS_IND is not set
346CONFIG_NET_ESTIMATOR=y
319 347
320# 348#
321# Network testing 349# Network testing
@@ -377,14 +405,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
377CONFIG_CDROM_PKTCDVD=m 405CONFIG_CDROM_PKTCDVD=m
378CONFIG_CDROM_PKTCDVD_BUFFERS=8 406CONFIG_CDROM_PKTCDVD_BUFFERS=8
379# CONFIG_CDROM_PKTCDVD_WCACHE is not set 407# 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 408CONFIG_ATA_OVER_ETH=m
389 409
390# 410#
@@ -428,6 +448,7 @@ CONFIG_SCSI_SAS_ATTRS=m
428# 448#
429# SCSI low-level drivers 449# SCSI low-level drivers
430# 450#
451CONFIG_ISCSI_TCP=m
431# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 452# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
432# CONFIG_SCSI_3W_9XXX is not set 453# CONFIG_SCSI_3W_9XXX is not set
433# CONFIG_SCSI_ACARD is not set 454# CONFIG_SCSI_ACARD is not set
@@ -437,6 +458,7 @@ CONFIG_SCSI_SAS_ATTRS=m
437# CONFIG_SCSI_AIC79XX is not set 458# CONFIG_SCSI_AIC79XX is not set
438# CONFIG_MEGARAID_NEWGEN is not set 459# CONFIG_MEGARAID_NEWGEN is not set
439# CONFIG_MEGARAID_LEGACY is not set 460# CONFIG_MEGARAID_LEGACY is not set
461# CONFIG_MEGARAID_SAS is not set
440# CONFIG_SCSI_SATA is not set 462# CONFIG_SCSI_SATA is not set
441# CONFIG_SCSI_DMX3191D is not set 463# CONFIG_SCSI_DMX3191D is not set
442# CONFIG_SCSI_FUTURE_DOMAIN is not set 464# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -447,7 +469,6 @@ CONFIG_SCSI_SAS_ATTRS=m
447# CONFIG_SCSI_IPR is not set 469# CONFIG_SCSI_IPR is not set
448# CONFIG_SCSI_QLOGIC_FC is not set 470# CONFIG_SCSI_QLOGIC_FC is not set
449CONFIG_SCSI_QLOGIC_1280=y 471CONFIG_SCSI_QLOGIC_1280=y
450CONFIG_SCSI_QLOGIC_1280_1040=y
451CONFIG_SCSI_QLA2XXX=y 472CONFIG_SCSI_QLA2XXX=y
452# CONFIG_SCSI_QLA21XX is not set 473# CONFIG_SCSI_QLA21XX is not set
453# CONFIG_SCSI_QLA22XX is not set 474# CONFIG_SCSI_QLA22XX is not set
@@ -487,6 +508,7 @@ CONFIG_DM_MULTIPATH_EMC=m
487# CONFIG_FUSION is not set 508# CONFIG_FUSION is not set
488# CONFIG_FUSION_SPI is not set 509# CONFIG_FUSION_SPI is not set
489# CONFIG_FUSION_FC is not set 510# CONFIG_FUSION_FC is not set
511# CONFIG_FUSION_SAS is not set
490 512
491# 513#
492# IEEE 1394 (FireWire) support 514# IEEE 1394 (FireWire) support
@@ -516,7 +538,6 @@ CONFIG_NETDEVICES=y
516# PHY device support 538# PHY device support
517# 539#
518CONFIG_PHYLIB=m 540CONFIG_PHYLIB=m
519CONFIG_PHYCONTROL=y
520 541
521# 542#
522# MII PHY device drivers 543# MII PHY device drivers
@@ -532,8 +553,12 @@ CONFIG_CICADA_PHY=m
532# 553#
533CONFIG_NET_ETHERNET=y 554CONFIG_NET_ETHERNET=y
534CONFIG_MII=y 555CONFIG_MII=y
556CONFIG_SGI_IOC3_ETH=y
557CONFIG_SGI_IOC3_ETH_HW_RX_CSUM=y
558CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y
535# CONFIG_HAPPYMEAL is not set 559# CONFIG_HAPPYMEAL is not set
536# CONFIG_SUNGEM is not set 560# CONFIG_SUNGEM is not set
561# CONFIG_CASSINI is not set
537# CONFIG_NET_VENDOR_3COM is not set 562# CONFIG_NET_VENDOR_3COM is not set
538 563
539# 564#
@@ -672,6 +697,7 @@ CONFIG_SGI_IP27_RTC=y
672# TPM devices 697# TPM devices
673# 698#
674# CONFIG_TCG_TPM is not set 699# CONFIG_TCG_TPM is not set
700# CONFIG_TELCLOCK is not set
675 701
676# 702#
677# I2C support 703# I2C support
@@ -725,6 +751,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
725# CONFIG_USB is not set 751# CONFIG_USB is not set
726 752
727# 753#
754# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
755#
756
757#
728# USB Gadget Support 758# USB Gadget Support
729# 759#
730# CONFIG_USB_GADGET is not set 760# CONFIG_USB_GADGET is not set
@@ -762,7 +792,7 @@ CONFIG_FS_MBCACHE=y
762# CONFIG_JFS_FS is not set 792# CONFIG_JFS_FS is not set
763CONFIG_FS_POSIX_ACL=y 793CONFIG_FS_POSIX_ACL=y
764CONFIG_XFS_FS=m 794CONFIG_XFS_FS=m
765CONFIG_XFS_QUOTA=m 795CONFIG_XFS_QUOTA=y
766CONFIG_XFS_SECURITY=y 796CONFIG_XFS_SECURITY=y
767CONFIG_XFS_POSIX_ACL=y 797CONFIG_XFS_POSIX_ACL=y
768# CONFIG_XFS_RT is not set 798# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index bf8fb95b21..967e7acd8e 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,57 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:07 2005 4# Thu Nov 24 01:06:24 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24CONFIG_BSD_PROCESS_ACCT=y
25# CONFIG_BSD_PROCESS_ACCT_V3 is not set
26CONFIG_SYSCTL=y
27# CONFIG_AUDIT is not set
28CONFIG_HOTPLUG=y
29CONFIG_KOBJECT_UEVENT=y
30# CONFIG_IKCONFIG is not set
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52# CONFIG_MODULES is not set
53
54#
55# Machine selection 9# Machine selection
56# 10#
57# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -167,7 +121,6 @@ CONFIG_R5000_CPU_SCACHE=y
167CONFIG_RM7000_CPU_SCACHE=y 121CONFIG_RM7000_CPU_SCACHE=y
168# CONFIG_MIPS_MT is not set 122# CONFIG_MIPS_MT is not set
169CONFIG_CPU_HAS_LLSC=y 123CONFIG_CPU_HAS_LLSC=y
170CONFIG_CPU_HAS_LLDSCD=y
171CONFIG_CPU_HAS_SYNC=y 124CONFIG_CPU_HAS_SYNC=y
172CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
173CONFIG_GENERIC_IRQ_PROBE=y 126CONFIG_GENERIC_IRQ_PROBE=y
@@ -179,11 +132,75 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 132CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 133CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_PREEMPT_NONE is not set 136# CONFIG_PREEMPT_NONE is not set
183CONFIG_PREEMPT_VOLUNTARY=y 137CONFIG_PREEMPT_VOLUNTARY=y
184# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
185 139
186# 140#
141# Code maturity level options
142#
143CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32
147
148#
149# General setup
150#
151CONFIG_LOCALVERSION=""
152CONFIG_LOCALVERSION_AUTO=y
153CONFIG_SWAP=y
154CONFIG_SYSVIPC=y
155# CONFIG_POSIX_MQUEUE is not set
156CONFIG_BSD_PROCESS_ACCT=y
157# CONFIG_BSD_PROCESS_ACCT_V3 is not set
158CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set
160CONFIG_HOTPLUG=y
161CONFIG_KOBJECT_UEVENT=y
162# CONFIG_IKCONFIG is not set
163CONFIG_INITRAMFS_SOURCE=""
164CONFIG_EMBEDDED=y
165CONFIG_KALLSYMS=y
166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_PRINTK=y
168CONFIG_BUG=y
169CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y
171CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0
180
181#
182# Loadable module support
183#
184# CONFIG_MODULES is not set
185
186#
187# Block layer
188#
189
190#
191# IO Schedulers
192#
193CONFIG_IOSCHED_NOOP=y
194CONFIG_IOSCHED_AS=y
195CONFIG_IOSCHED_DEADLINE=y
196CONFIG_IOSCHED_CFQ=y
197CONFIG_DEFAULT_AS=y
198# CONFIG_DEFAULT_DEADLINE is not set
199# CONFIG_DEFAULT_CFQ is not set
200# CONFIG_DEFAULT_NOOP is not set
201CONFIG_DEFAULT_IOSCHED="anticipatory"
202
203#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 204# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 205#
189CONFIG_HW_HAS_PCI=y 206CONFIG_HW_HAS_PCI=y
@@ -271,8 +288,11 @@ CONFIG_TCP_CONG_BIC=y
271# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
272# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
273# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
291
292#
293# QoS and/or fair queueing
294#
274# CONFIG_NET_SCHED is not set 295# CONFIG_NET_SCHED is not set
275# CONFIG_NET_CLS_ROUTE is not set
276 296
277# 297#
278# Network testing 298# Network testing
@@ -302,6 +322,7 @@ CONFIG_FW_LOADER=y
302# Connector - unified userspace <-> kernelspace linker 322# Connector - unified userspace <-> kernelspace linker
303# 323#
304CONFIG_CONNECTOR=y 324CONFIG_CONNECTOR=y
325CONFIG_PROC_EVENTS=y
305 326
306# 327#
307# Memory Technology Devices (MTD) 328# Memory Technology Devices (MTD)
@@ -334,14 +355,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
334CONFIG_CDROM_PKTCDVD=y 355CONFIG_CDROM_PKTCDVD=y
335CONFIG_CDROM_PKTCDVD_BUFFERS=8 356CONFIG_CDROM_PKTCDVD_BUFFERS=8
336# CONFIG_CDROM_PKTCDVD_WCACHE is not set 357# 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 358CONFIG_ATA_OVER_ETH=y
346 359
347# 360#
@@ -385,6 +398,7 @@ CONFIG_SCSI_SAS_ATTRS=y
385# 398#
386# SCSI low-level drivers 399# SCSI low-level drivers
387# 400#
401# CONFIG_ISCSI_TCP is not set
388# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 402# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
389# CONFIG_SCSI_3W_9XXX is not set 403# CONFIG_SCSI_3W_9XXX is not set
390# CONFIG_SCSI_ACARD is not set 404# CONFIG_SCSI_ACARD is not set
@@ -399,6 +413,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
399# CONFIG_SCSI_AIC79XX is not set 413# CONFIG_SCSI_AIC79XX is not set
400# CONFIG_MEGARAID_NEWGEN is not set 414# CONFIG_MEGARAID_NEWGEN is not set
401# CONFIG_MEGARAID_LEGACY is not set 415# CONFIG_MEGARAID_LEGACY is not set
416# CONFIG_MEGARAID_SAS is not set
402# CONFIG_SCSI_SATA is not set 417# CONFIG_SCSI_SATA is not set
403# CONFIG_SCSI_DMX3191D is not set 418# CONFIG_SCSI_DMX3191D is not set
404# CONFIG_SCSI_FUTURE_DOMAIN is not set 419# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -432,6 +447,7 @@ CONFIG_SCSI_QLA2XXX=y
432# CONFIG_FUSION is not set 447# CONFIG_FUSION is not set
433# CONFIG_FUSION_SPI is not set 448# CONFIG_FUSION_SPI is not set
434# CONFIG_FUSION_FC is not set 449# CONFIG_FUSION_FC is not set
450# CONFIG_FUSION_SAS is not set
435 451
436# 452#
437# IEEE 1394 (FireWire) support 453# IEEE 1394 (FireWire) support
@@ -461,7 +477,6 @@ CONFIG_NETDEVICES=y
461# PHY device support 477# PHY device support
462# 478#
463CONFIG_PHYLIB=y 479CONFIG_PHYLIB=y
464CONFIG_PHYCONTROL=y
465 480
466# 481#
467# MII PHY device drivers 482# MII PHY device drivers
@@ -480,6 +495,7 @@ CONFIG_NET_ETHERNET=y
480CONFIG_SGI_O2MACE_ETH=y 495CONFIG_SGI_O2MACE_ETH=y
481# CONFIG_HAPPYMEAL is not set 496# CONFIG_HAPPYMEAL is not set
482# CONFIG_SUNGEM is not set 497# CONFIG_SUNGEM is not set
498# CONFIG_CASSINI is not set
483# CONFIG_NET_VENDOR_3COM is not set 499# CONFIG_NET_VENDOR_3COM is not set
484 500
485# 501#
@@ -637,6 +653,7 @@ CONFIG_LEGACY_PTY_COUNT=256
637# TPM devices 653# TPM devices
638# 654#
639# CONFIG_TCG_TPM is not set 655# CONFIG_TCG_TPM is not set
656# CONFIG_TELCLOCK is not set
640 657
641# 658#
642# I2C support 659# I2C support
@@ -696,6 +713,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
696# CONFIG_USB is not set 713# CONFIG_USB is not set
697 714
698# 715#
716# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
717#
718
719#
699# USB Gadget Support 720# USB Gadget Support
700# 721#
701# CONFIG_USB_GADGET is not set 722# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig
index 0940771baf..b5fa9639db 100644
--- a/arch/mips/configs/it8172_defconfig
+++ b/arch/mips/configs/it8172_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:09 2005 4# Thu Nov 24 01:06:26 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24CONFIG_BSD_PROCESS_ACCT=y
25# CONFIG_BSD_PROCESS_ACCT_V3 is not set
26CONFIG_SYSCTL=y
27# CONFIG_AUDIT is not set
28# CONFIG_HOTPLUG is not set
29CONFIG_KOBJECT_UEVENT=y
30# CONFIG_IKCONFIG is not set
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -169,7 +117,6 @@ CONFIG_PAGE_SIZE_4KB=y
169# CONFIG_MIPS_MT is not set 117# CONFIG_MIPS_MT is not set
170# CONFIG_CPU_ADVANCED is not set 118# CONFIG_CPU_ADVANCED is not set
171CONFIG_CPU_HAS_LLSC=y 119CONFIG_CPU_HAS_LLSC=y
172CONFIG_CPU_HAS_LLDSCD=y
173CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
174CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
175CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
@@ -181,11 +128,82 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 128CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 129CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 130# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 132CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 133# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
187 135
188# 136#
137# Code maturity level options
138#
139CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32
143
144#
145# General setup
146#
147CONFIG_LOCALVERSION=""
148CONFIG_LOCALVERSION_AUTO=y
149CONFIG_SWAP=y
150CONFIG_SYSVIPC=y
151# CONFIG_POSIX_MQUEUE is not set
152CONFIG_BSD_PROCESS_ACCT=y
153# CONFIG_BSD_PROCESS_ACCT_V3 is not set
154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set
156# CONFIG_HOTPLUG is not set
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184CONFIG_MODVERSIONS=y
185CONFIG_MODULE_SRCVERSION_ALL=y
186CONFIG_KMOD=y
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
189# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
190# 208#
191CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
@@ -266,8 +284,11 @@ CONFIG_TCP_CONG_BIC=y
266# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
267# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
268# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
269# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
270# CONFIG_NET_CLS_ROUTE is not set
271 292
272# 293#
273# Network testing 294# Network testing
@@ -315,6 +336,7 @@ CONFIG_MTD_CHAR=y
315# CONFIG_FTL is not set 336# CONFIG_FTL is not set
316# CONFIG_NFTL is not set 337# CONFIG_NFTL is not set
317# CONFIG_INFTL is not set 338# CONFIG_INFTL is not set
339# CONFIG_RFD_FTL is not set
318 340
319# 341#
320# RAM/ROM/Flash chip drivers 342# RAM/ROM/Flash chip drivers
@@ -373,6 +395,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
373# CONFIG_MTD_NAND is not set 395# CONFIG_MTD_NAND is not set
374 396
375# 397#
398# OneNAND Flash Device Drivers
399#
400# CONFIG_MTD_ONENAND is not set
401
402#
376# Parallel port support 403# Parallel port support
377# 404#
378# CONFIG_PARPORT is not set 405# CONFIG_PARPORT is not set
@@ -390,18 +417,9 @@ CONFIG_BLK_DEV_LOOP=y
390# CONFIG_BLK_DEV_NBD is not set 417# CONFIG_BLK_DEV_NBD is not set
391# CONFIG_BLK_DEV_RAM is not set 418# CONFIG_BLK_DEV_RAM is not set
392CONFIG_BLK_DEV_RAM_COUNT=16 419CONFIG_BLK_DEV_RAM_COUNT=16
393# CONFIG_LBD is not set
394CONFIG_CDROM_PKTCDVD=m 420CONFIG_CDROM_PKTCDVD=m
395CONFIG_CDROM_PKTCDVD_BUFFERS=8 421CONFIG_CDROM_PKTCDVD_BUFFERS=8
396# CONFIG_CDROM_PKTCDVD_WCACHE is not set 422# 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 423CONFIG_ATA_OVER_ETH=m
406 424
407# 425#
@@ -467,7 +485,6 @@ CONFIG_NETDEVICES=y
467# PHY device support 485# PHY device support
468# 486#
469CONFIG_PHYLIB=m 487CONFIG_PHYLIB=m
470CONFIG_PHYCONTROL=y
471 488
472# 489#
473# MII PHY device drivers 490# MII PHY device drivers
@@ -609,6 +626,8 @@ CONFIG_LEGACY_PTY_COUNT=256
609# 626#
610# TPM devices 627# TPM devices
611# 628#
629# CONFIG_TCG_TPM is not set
630# CONFIG_TELCLOCK is not set
612 631
613# 632#
614# I2C support 633# I2C support
@@ -669,10 +688,10 @@ CONFIG_SOUND=y
669# Open Sound System 688# Open Sound System
670# 689#
671CONFIG_SOUND_PRIME=y 690CONFIG_SOUND_PRIME=y
691# CONFIG_OBSOLETE_OSS_DRIVER is not set
672CONFIG_SOUND_IT8172=y 692CONFIG_SOUND_IT8172=y
673# CONFIG_SOUND_MSNDCLAS is not set 693# CONFIG_SOUND_MSNDCLAS is not set
674# CONFIG_SOUND_MSNDPIN is not set 694# CONFIG_SOUND_MSNDPIN is not set
675# CONFIG_SOUND_AD1980 is not set
676 695
677# 696#
678# USB support 697# USB support
@@ -681,6 +700,10 @@ CONFIG_SOUND_IT8172=y
681# CONFIG_USB_ARCH_HAS_OHCI is not set 700# CONFIG_USB_ARCH_HAS_OHCI is not set
682 701
683# 702#
703# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
704#
705
706#
684# USB Gadget Support 707# USB Gadget Support
685# 708#
686# CONFIG_USB_GADGET is not set 709# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig
index 9ba61dfc49..71386938d4 100644
--- a/arch/mips/configs/ivr_defconfig
+++ b/arch/mips/configs/ivr_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:12 2005 4# Thu Nov 24 01:06:27 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24CONFIG_BSD_PROCESS_ACCT=y
25# CONFIG_BSD_PROCESS_ACCT_V3 is not set
26CONFIG_SYSCTL=y
27# CONFIG_AUDIT is not set
28CONFIG_HOTPLUG=y
29CONFIG_KOBJECT_UEVENT=y
30# CONFIG_IKCONFIG is not set
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -166,7 +114,6 @@ CONFIG_PAGE_SIZE_4KB=y
166# CONFIG_MIPS_MT is not set 114# CONFIG_MIPS_MT is not set
167# CONFIG_CPU_ADVANCED is not set 115# CONFIG_CPU_ADVANCED is not set
168CONFIG_CPU_HAS_LLSC=y 116CONFIG_CPU_HAS_LLSC=y
169CONFIG_CPU_HAS_LLDSCD=y
170CONFIG_CPU_HAS_SYNC=y 117CONFIG_CPU_HAS_SYNC=y
171CONFIG_GENERIC_HARDIRQS=y 118CONFIG_GENERIC_HARDIRQS=y
172CONFIG_GENERIC_IRQ_PROBE=y 119CONFIG_GENERIC_IRQ_PROBE=y
@@ -178,11 +125,82 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 125CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 126CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 127# CONFIG_SPARSEMEM_STATIC is not set
128CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 129CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 130# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 131# CONFIG_PREEMPT is not set
184 132
185# 133#
134# Code maturity level options
135#
136CONFIG_EXPERIMENTAL=y
137CONFIG_CLEAN_COMPILE=y
138CONFIG_BROKEN_ON_SMP=y
139CONFIG_INIT_ENV_ARG_LIMIT=32
140
141#
142# General setup
143#
144CONFIG_LOCALVERSION=""
145CONFIG_LOCALVERSION_AUTO=y
146CONFIG_SWAP=y
147CONFIG_SYSVIPC=y
148# CONFIG_POSIX_MQUEUE is not set
149CONFIG_BSD_PROCESS_ACCT=y
150# CONFIG_BSD_PROCESS_ACCT_V3 is not set
151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set
153CONFIG_HOTPLUG=y
154CONFIG_KOBJECT_UEVENT=y
155# CONFIG_IKCONFIG is not set
156CONFIG_INITRAMFS_SOURCE=""
157CONFIG_EMBEDDED=y
158CONFIG_KALLSYMS=y
159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160CONFIG_PRINTK=y
161CONFIG_BUG=y
162CONFIG_BASE_FULL=y
163CONFIG_FUTEX=y
164CONFIG_EPOLL=y
165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0
171# CONFIG_TINY_SHMEM is not set
172CONFIG_BASE_SMALL=0
173
174#
175# Loadable module support
176#
177CONFIG_MODULES=y
178CONFIG_MODULE_UNLOAD=y
179# CONFIG_MODULE_FORCE_UNLOAD is not set
180CONFIG_OBSOLETE_MODPARM=y
181CONFIG_MODVERSIONS=y
182CONFIG_MODULE_SRCVERSION_ALL=y
183CONFIG_KMOD=y
184
185#
186# Block layer
187#
188# CONFIG_LBD is not set
189
190#
191# IO Schedulers
192#
193CONFIG_IOSCHED_NOOP=y
194CONFIG_IOSCHED_AS=y
195CONFIG_IOSCHED_DEADLINE=y
196CONFIG_IOSCHED_CFQ=y
197CONFIG_DEFAULT_AS=y
198# CONFIG_DEFAULT_DEADLINE is not set
199# CONFIG_DEFAULT_CFQ is not set
200# CONFIG_DEFAULT_NOOP is not set
201CONFIG_DEFAULT_IOSCHED="anticipatory"
202
203#
186# Bus options (PCI, PCMCIA, EISA, ISA, TC) 204# Bus options (PCI, PCMCIA, EISA, ISA, TC)
187# 205#
188CONFIG_HW_HAS_PCI=y 206CONFIG_HW_HAS_PCI=y
@@ -265,8 +283,11 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 283# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 284# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 285# CONFIG_WAN_ROUTER is not set
286
287#
288# QoS and/or fair queueing
289#
268# CONFIG_NET_SCHED is not set 290# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set
270 291
271# 292#
272# Network testing 293# Network testing
@@ -324,18 +345,9 @@ CONFIG_CONNECTOR=m
324# CONFIG_BLK_DEV_SX8 is not set 345# CONFIG_BLK_DEV_SX8 is not set
325# CONFIG_BLK_DEV_RAM is not set 346# CONFIG_BLK_DEV_RAM is not set
326CONFIG_BLK_DEV_RAM_COUNT=16 347CONFIG_BLK_DEV_RAM_COUNT=16
327# CONFIG_LBD is not set
328CONFIG_CDROM_PKTCDVD=m 348CONFIG_CDROM_PKTCDVD=m
329CONFIG_CDROM_PKTCDVD_BUFFERS=8 349CONFIG_CDROM_PKTCDVD_BUFFERS=8
330# CONFIG_CDROM_PKTCDVD_WCACHE is not set 350# 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 351CONFIG_ATA_OVER_ETH=m
340 352
341# 353#
@@ -409,7 +421,6 @@ CONFIG_NETDEVICES=y
409# PHY device support 421# PHY device support
410# 422#
411CONFIG_PHYLIB=m 423CONFIG_PHYLIB=m
412CONFIG_PHYCONTROL=y
413 424
414# 425#
415# MII PHY device drivers 426# MII PHY device drivers
@@ -427,6 +438,7 @@ CONFIG_NET_ETHERNET=y
427# CONFIG_MII is not set 438# CONFIG_MII is not set
428# CONFIG_HAPPYMEAL is not set 439# CONFIG_HAPPYMEAL is not set
429# CONFIG_SUNGEM is not set 440# CONFIG_SUNGEM is not set
441# CONFIG_CASSINI is not set
430# CONFIG_NET_VENDOR_3COM is not set 442# CONFIG_NET_VENDOR_3COM is not set
431 443
432# 444#
@@ -539,7 +551,8 @@ CONFIG_VT_CONSOLE=y
539CONFIG_HW_CONSOLE=y 551CONFIG_HW_CONSOLE=y
540# CONFIG_SERIAL_NONSTANDARD is not set 552# CONFIG_SERIAL_NONSTANDARD is not set
541CONFIG_QTRONIX_KEYBOARD=y 553CONFIG_QTRONIX_KEYBOARD=y
542# CONFIG_IT8172_SCR0 is not set 554CONFIG_IT8172_SCR0=y
555CONFIG_IT8172_SCR1=y
543 556
544# 557#
545# Serial drivers 558# Serial drivers
@@ -583,6 +596,7 @@ CONFIG_RTC=y
583# TPM devices 596# TPM devices
584# 597#
585# CONFIG_TCG_TPM is not set 598# CONFIG_TCG_TPM is not set
599# CONFIG_TELCLOCK is not set
586 600
587# 601#
588# I2C support 602# I2C support
@@ -642,6 +656,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
642# CONFIG_USB is not set 656# CONFIG_USB is not set
643 657
644# 658#
659# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
660#
661
662#
645# USB Gadget Support 663# USB Gadget Support
646# 664#
647# CONFIG_USB_GADGET is not set 665# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 21b2b8042f..14fb468867 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -1,60 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:14 2005 4# Thu Nov 24 01:06:29 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11# CONFIG_EXPERIMENTAL is not set
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_BSD_PROCESS_ACCT is not set
24CONFIG_SYSCTL=y
25# CONFIG_AUDIT is not set
26CONFIG_HOTPLUG=y
27CONFIG_KOBJECT_UEVENT=y
28CONFIG_IKCONFIG=y
29CONFIG_IKCONFIG_PROC=y
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53CONFIG_OBSOLETE_MODPARM=y
54CONFIG_MODULE_SRCVERSION_ALL=y
55CONFIG_KMOD=y
56
57#
58# Machine selection 9# Machine selection
59# 10#
60# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -173,7 +124,6 @@ CONFIG_CPU_HAS_PREFETCH=y
173# CONFIG_64BIT_PHYS_ADDR is not set 124# CONFIG_64BIT_PHYS_ADDR is not set
174# CONFIG_CPU_ADVANCED is not set 125# CONFIG_CPU_ADVANCED is not set
175CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
176CONFIG_CPU_HAS_LLDSCD=y
177CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
178CONFIG_GENERIC_HARDIRQS=y 128CONFIG_GENERIC_HARDIRQS=y
179CONFIG_GENERIC_IRQ_PROBE=y 129CONFIG_GENERIC_IRQ_PROBE=y
@@ -184,12 +134,80 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_FLATMEM=y 134CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 135CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 136# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_SMP is not set 138# CONFIG_SMP is not set
188CONFIG_PREEMPT_NONE=y 139CONFIG_PREEMPT_NONE=y
189# CONFIG_PREEMPT_VOLUNTARY is not set 140# CONFIG_PREEMPT_VOLUNTARY is not set
190# CONFIG_PREEMPT is not set 141# CONFIG_PREEMPT is not set
191 142
192# 143#
144# Code maturity level options
145#
146# CONFIG_EXPERIMENTAL is not set
147CONFIG_CLEAN_COMPILE=y
148CONFIG_BROKEN_ON_SMP=y
149CONFIG_INIT_ENV_ARG_LIMIT=32
150
151#
152# General setup
153#
154CONFIG_LOCALVERSION=""
155CONFIG_LOCALVERSION_AUTO=y
156CONFIG_SWAP=y
157CONFIG_SYSVIPC=y
158# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set
161CONFIG_HOTPLUG=y
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y
165CONFIG_INITRAMFS_SOURCE=""
166CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set
169CONFIG_PRINTK=y
170CONFIG_BUG=y
171CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y
173CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0
182
183#
184# Loadable module support
185#
186CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y
188CONFIG_OBSOLETE_MODPARM=y
189CONFIG_MODULE_SRCVERSION_ALL=y
190CONFIG_KMOD=y
191
192#
193# Block layer
194#
195# CONFIG_LBD is not set
196
197#
198# IO Schedulers
199#
200CONFIG_IOSCHED_NOOP=y
201CONFIG_IOSCHED_AS=y
202CONFIG_IOSCHED_DEADLINE=y
203CONFIG_IOSCHED_CFQ=y
204CONFIG_DEFAULT_AS=y
205# CONFIG_DEFAULT_DEADLINE is not set
206# CONFIG_DEFAULT_CFQ is not set
207# CONFIG_DEFAULT_NOOP is not set
208CONFIG_DEFAULT_IOSCHED="anticipatory"
209
210#
193# Bus options (PCI, PCMCIA, EISA, ISA, TC) 211# Bus options (PCI, PCMCIA, EISA, ISA, TC)
194# 212#
195CONFIG_HW_HAS_PCI=y 213CONFIG_HW_HAS_PCI=y
@@ -259,8 +277,11 @@ CONFIG_IPV6_TUNNEL=m
259# CONFIG_LLC2 is not set 277# CONFIG_LLC2 is not set
260# CONFIG_IPX is not set 278# CONFIG_IPX is not set
261# CONFIG_ATALK is not set 279# CONFIG_ATALK is not set
280
281#
282# QoS and/or fair queueing
283#
262# CONFIG_NET_SCHED is not set 284# CONFIG_NET_SCHED is not set
263# CONFIG_NET_CLS_ROUTE is not set
264 285
265# 286#
266# Network testing 287# Network testing
@@ -317,18 +338,9 @@ CONFIG_CONNECTOR=m
317# CONFIG_BLK_DEV_SX8 is not set 338# CONFIG_BLK_DEV_SX8 is not set
318# CONFIG_BLK_DEV_RAM is not set 339# CONFIG_BLK_DEV_RAM is not set
319CONFIG_BLK_DEV_RAM_COUNT=16 340CONFIG_BLK_DEV_RAM_COUNT=16
320# CONFIG_LBD is not set
321CONFIG_CDROM_PKTCDVD=m 341CONFIG_CDROM_PKTCDVD=m
322CONFIG_CDROM_PKTCDVD_BUFFERS=8 342CONFIG_CDROM_PKTCDVD_BUFFERS=8
323# CONFIG_CDROM_PKTCDVD_WCACHE is not set 343# 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 344CONFIG_ATA_OVER_ETH=m
333 345
334# 346#
@@ -380,7 +392,6 @@ CONFIG_NETDEVICES=y
380# PHY device support 392# PHY device support
381# 393#
382CONFIG_PHYLIB=m 394CONFIG_PHYLIB=m
383CONFIG_PHYCONTROL=y
384 395
385# 396#
386# MII PHY device drivers 397# MII PHY device drivers
@@ -398,6 +409,7 @@ CONFIG_NET_ETHERNET=y
398CONFIG_MII=y 409CONFIG_MII=y
399# CONFIG_HAPPYMEAL is not set 410# CONFIG_HAPPYMEAL is not set
400# CONFIG_SUNGEM is not set 411# CONFIG_SUNGEM is not set
412# CONFIG_CASSINI is not set
401# CONFIG_NET_VENDOR_3COM is not set 413# CONFIG_NET_VENDOR_3COM is not set
402 414
403# 415#
@@ -592,6 +604,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
592# CONFIG_USB is not set 604# CONFIG_USB is not set
593 605
594# 606#
607# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
608#
609
610#
595# USB Gadget Support 611# USB Gadget Support
596# 612#
597# CONFIG_USB_GADGET is not set 613# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 6390a753e8..a8ded3d741 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:17 2005 4# Thu Nov 24 01:06:31 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -168,12 +123,76 @@ CONFIG_FLATMEM_MANUAL=y
168CONFIG_FLATMEM=y 123CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 124CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 125# CONFIG_SPARSEMEM_STATIC is not set
126CONFIG_SPLIT_PTLOCK_CPUS=4
171CONFIG_PREEMPT_NONE=y 127CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 128# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 129# CONFIG_PREEMPT is not set
174CONFIG_RTC_DS1742=y 130CONFIG_RTC_DS1742=y
175 131
176# 132#
133# Code maturity level options
134#
135CONFIG_EXPERIMENTAL=y
136CONFIG_CLEAN_COMPILE=y
137CONFIG_BROKEN_ON_SMP=y
138CONFIG_INIT_ENV_ARG_LIMIT=32
139
140#
141# General setup
142#
143CONFIG_LOCALVERSION=""
144CONFIG_LOCALVERSION_AUTO=y
145CONFIG_SWAP=y
146CONFIG_SYSVIPC=y
147# CONFIG_POSIX_MQUEUE is not set
148# CONFIG_BSD_PROCESS_ACCT is not set
149CONFIG_SYSCTL=y
150# CONFIG_AUDIT is not set
151CONFIG_HOTPLUG=y
152CONFIG_KOBJECT_UEVENT=y
153# CONFIG_IKCONFIG is not set
154CONFIG_INITRAMFS_SOURCE=""
155CONFIG_EMBEDDED=y
156CONFIG_KALLSYMS=y
157# CONFIG_KALLSYMS_EXTRA_PASS is not set
158CONFIG_PRINTK=y
159CONFIG_BUG=y
160CONFIG_BASE_FULL=y
161CONFIG_FUTEX=y
162CONFIG_EPOLL=y
163# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
164CONFIG_SHMEM=y
165CONFIG_CC_ALIGN_FUNCTIONS=0
166CONFIG_CC_ALIGN_LABELS=0
167CONFIG_CC_ALIGN_LOOPS=0
168CONFIG_CC_ALIGN_JUMPS=0
169# CONFIG_TINY_SHMEM is not set
170CONFIG_BASE_SMALL=0
171
172#
173# Loadable module support
174#
175# CONFIG_MODULES is not set
176
177#
178# Block layer
179#
180# CONFIG_LBD is not set
181
182#
183# IO Schedulers
184#
185CONFIG_IOSCHED_NOOP=y
186CONFIG_IOSCHED_AS=y
187CONFIG_IOSCHED_DEADLINE=y
188CONFIG_IOSCHED_CFQ=y
189CONFIG_DEFAULT_AS=y
190# CONFIG_DEFAULT_DEADLINE is not set
191# CONFIG_DEFAULT_CFQ is not set
192# CONFIG_DEFAULT_NOOP is not set
193CONFIG_DEFAULT_IOSCHED="anticipatory"
194
195#
177# Bus options (PCI, PCMCIA, EISA, ISA, TC) 196# Bus options (PCI, PCMCIA, EISA, ISA, TC)
178# 197#
179CONFIG_HW_HAS_PCI=y 198CONFIG_HW_HAS_PCI=y
@@ -256,8 +275,11 @@ 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
261 283
262# 284#
263# Network testing 285# Network testing
@@ -287,6 +309,7 @@ CONFIG_FW_LOADER=y
287# Connector - unified userspace <-> kernelspace linker 309# Connector - unified userspace <-> kernelspace linker
288# 310#
289CONFIG_CONNECTOR=y 311CONFIG_CONNECTOR=y
312CONFIG_PROC_EVENTS=y
290 313
291# 314#
292# Memory Technology Devices (MTD) 315# Memory Technology Devices (MTD)
@@ -315,18 +338,9 @@ CONFIG_CONNECTOR=y
315# CONFIG_BLK_DEV_SX8 is not set 338# CONFIG_BLK_DEV_SX8 is not set
316# CONFIG_BLK_DEV_RAM is not set 339# CONFIG_BLK_DEV_RAM is not set
317CONFIG_BLK_DEV_RAM_COUNT=16 340CONFIG_BLK_DEV_RAM_COUNT=16
318# CONFIG_LBD is not set
319CONFIG_CDROM_PKTCDVD=y 341CONFIG_CDROM_PKTCDVD=y
320CONFIG_CDROM_PKTCDVD_BUFFERS=8 342CONFIG_CDROM_PKTCDVD_BUFFERS=8
321# CONFIG_CDROM_PKTCDVD_WCACHE is not set 343# 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 344CONFIG_ATA_OVER_ETH=y
331 345
332# 346#
@@ -378,7 +392,6 @@ CONFIG_NETDEVICES=y
378# PHY device support 392# PHY device support
379# 393#
380CONFIG_PHYLIB=y 394CONFIG_PHYLIB=y
381CONFIG_PHYCONTROL=y
382 395
383# 396#
384# MII PHY device drivers 397# MII PHY device drivers
@@ -396,6 +409,7 @@ CONFIG_NET_ETHERNET=y
396# CONFIG_MII is not set 409# CONFIG_MII is not set
397# CONFIG_HAPPYMEAL is not set 410# CONFIG_HAPPYMEAL is not set
398# CONFIG_SUNGEM is not set 411# CONFIG_SUNGEM is not set
412# CONFIG_CASSINI is not set
399# CONFIG_NET_VENDOR_3COM is not set 413# CONFIG_NET_VENDOR_3COM is not set
400 414
401# 415#
@@ -561,6 +575,7 @@ CONFIG_LEGACY_PTY_COUNT=256
561# TPM devices 575# TPM devices
562# 576#
563# CONFIG_TCG_TPM is not set 577# CONFIG_TCG_TPM is not set
578# CONFIG_TELCLOCK is not set
564 579
565# 580#
566# I2C support 581# I2C support
@@ -603,7 +618,6 @@ CONFIG_FB=y
603# CONFIG_FB_CFB_FILLRECT is not set 618# CONFIG_FB_CFB_FILLRECT is not set
604# CONFIG_FB_CFB_COPYAREA is not set 619# CONFIG_FB_CFB_COPYAREA is not set
605# CONFIG_FB_CFB_IMAGEBLIT is not set 620# CONFIG_FB_CFB_IMAGEBLIT is not set
606# CONFIG_FB_SOFT_CURSOR is not set
607# CONFIG_FB_MACMODES is not set 621# CONFIG_FB_MACMODES is not set
608# CONFIG_FB_MODE_HELPERS is not set 622# CONFIG_FB_MODE_HELPERS is not set
609# CONFIG_FB_TILEBLITTING is not set 623# CONFIG_FB_TILEBLITTING is not set
@@ -612,6 +626,7 @@ CONFIG_FB=y
612# CONFIG_FB_CYBER2000 is not set 626# CONFIG_FB_CYBER2000 is not set
613# CONFIG_FB_ASILIANT is not set 627# CONFIG_FB_ASILIANT is not set
614# CONFIG_FB_IMSTT is not set 628# CONFIG_FB_IMSTT is not set
629# CONFIG_FB_S1D13XXX is not set
615# CONFIG_FB_NVIDIA is not set 630# CONFIG_FB_NVIDIA is not set
616# CONFIG_FB_RIVA is not set 631# CONFIG_FB_RIVA is not set
617# CONFIG_FB_MATROX is not set 632# CONFIG_FB_MATROX is not set
@@ -628,7 +643,6 @@ CONFIG_FB=y
628# CONFIG_FB_SMIVGX is not set 643# CONFIG_FB_SMIVGX is not set
629# CONFIG_FB_CYBLA is not set 644# CONFIG_FB_CYBLA is not set
630# CONFIG_FB_TRIDENT is not set 645# CONFIG_FB_TRIDENT is not set
631# CONFIG_FB_S1D13XXX is not set
632# CONFIG_FB_VIRTUAL is not set 646# CONFIG_FB_VIRTUAL is not set
633 647
634# 648#
@@ -657,6 +671,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
657# CONFIG_USB is not set 671# CONFIG_USB is not set
658 672
659# 673#
674# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
675#
676
677#
660# USB Gadget Support 678# USB Gadget Support
661# 679#
662# CONFIG_USB_GADGET is not set 680# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 03cd0ca6e6..6c5df76d48 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:19 2005 4# Thu Nov 24 01:06:33 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -172,7 +121,6 @@ CONFIG_R5000_CPU_SCACHE=y
172# CONFIG_64BIT_PHYS_ADDR is not set 121# CONFIG_64BIT_PHYS_ADDR is not set
173# CONFIG_CPU_ADVANCED is not set 122# CONFIG_CPU_ADVANCED is not set
174CONFIG_CPU_HAS_LLSC=y 123CONFIG_CPU_HAS_LLSC=y
175CONFIG_CPU_HAS_LLDSCD=y
176CONFIG_CPU_HAS_SYNC=y 124CONFIG_CPU_HAS_SYNC=y
177CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
178CONFIG_GENERIC_IRQ_PROBE=y 126CONFIG_GENERIC_IRQ_PROBE=y
@@ -184,11 +132,81 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 132CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 133CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y 136CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 137# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
190 139
191# 140#
141# Code maturity level options
142#
143CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32
147
148#
149# General setup
150#
151CONFIG_LOCALVERSION=""
152CONFIG_LOCALVERSION_AUTO=y
153CONFIG_SWAP=y
154CONFIG_SYSVIPC=y
155# CONFIG_POSIX_MQUEUE is not set
156# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set
159CONFIG_HOTPLUG=y
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE=""
163CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_EXTRA_PASS is not set
166CONFIG_PRINTK=y
167CONFIG_BUG=y
168CONFIG_BASE_FULL=y
169CONFIG_FUTEX=y
170CONFIG_EPOLL=y
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
172CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0
177# CONFIG_TINY_SHMEM is not set
178CONFIG_BASE_SMALL=0
179
180#
181# Loadable module support
182#
183CONFIG_MODULES=y
184CONFIG_MODULE_UNLOAD=y
185# CONFIG_MODULE_FORCE_UNLOAD is not set
186CONFIG_OBSOLETE_MODPARM=y
187CONFIG_MODVERSIONS=y
188CONFIG_MODULE_SRCVERSION_ALL=y
189CONFIG_KMOD=y
190
191#
192# Block layer
193#
194# CONFIG_LBD is not set
195
196#
197# IO Schedulers
198#
199CONFIG_IOSCHED_NOOP=y
200CONFIG_IOSCHED_AS=y
201CONFIG_IOSCHED_DEADLINE=y
202CONFIG_IOSCHED_CFQ=y
203CONFIG_DEFAULT_AS=y
204# CONFIG_DEFAULT_DEADLINE is not set
205# CONFIG_DEFAULT_CFQ is not set
206# CONFIG_DEFAULT_NOOP is not set
207CONFIG_DEFAULT_IOSCHED="anticipatory"
208
209#
192# Bus options (PCI, PCMCIA, EISA, ISA, TC) 210# Bus options (PCI, PCMCIA, EISA, ISA, TC)
193# 211#
194CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
@@ -267,8 +285,11 @@ 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
272 293
273# 294#
274# Network testing 295# Network testing
@@ -317,6 +338,7 @@ CONFIG_MTD_BLOCK=y
317# CONFIG_FTL is not set 338# CONFIG_FTL is not set
318# CONFIG_NFTL is not set 339# CONFIG_NFTL is not set
319# CONFIG_INFTL is not set 340# CONFIG_INFTL is not set
341# CONFIG_RFD_FTL is not set
320 342
321# 343#
322# RAM/ROM/Flash chip drivers 344# RAM/ROM/Flash chip drivers
@@ -375,6 +397,11 @@ CONFIG_MTD_LASAT=y
375# CONFIG_MTD_NAND is not set 397# CONFIG_MTD_NAND is not set
376 398
377# 399#
400# OneNAND Flash Device Drivers
401#
402# CONFIG_MTD_ONENAND is not set
403
404#
378# Parallel port support 405# Parallel port support
379# 406#
380# CONFIG_PARPORT is not set 407# CONFIG_PARPORT is not set
@@ -396,18 +423,9 @@ CONFIG_MTD_LASAT=y
396# CONFIG_BLK_DEV_SX8 is not set 423# CONFIG_BLK_DEV_SX8 is not set
397# CONFIG_BLK_DEV_RAM is not set 424# CONFIG_BLK_DEV_RAM is not set
398CONFIG_BLK_DEV_RAM_COUNT=16 425CONFIG_BLK_DEV_RAM_COUNT=16
399# CONFIG_LBD is not set
400CONFIG_CDROM_PKTCDVD=m 426CONFIG_CDROM_PKTCDVD=m
401CONFIG_CDROM_PKTCDVD_BUFFERS=8 427CONFIG_CDROM_PKTCDVD_BUFFERS=8
402# CONFIG_CDROM_PKTCDVD_WCACHE is not set 428# 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 429CONFIG_ATA_OVER_ETH=m
412 430
413# 431#
@@ -511,7 +529,6 @@ CONFIG_NETDEVICES=y
511# PHY device support 529# PHY device support
512# 530#
513CONFIG_PHYLIB=m 531CONFIG_PHYLIB=m
514CONFIG_PHYCONTROL=y
515 532
516# 533#
517# MII PHY device drivers 534# MII PHY device drivers
@@ -529,6 +546,7 @@ CONFIG_NET_ETHERNET=y
529# CONFIG_MII is not set 546# CONFIG_MII is not set
530# CONFIG_HAPPYMEAL is not set 547# CONFIG_HAPPYMEAL is not set
531# CONFIG_SUNGEM is not set 548# CONFIG_SUNGEM is not set
549# CONFIG_CASSINI is not set
532# CONFIG_NET_VENDOR_3COM is not set 550# CONFIG_NET_VENDOR_3COM is not set
533 551
534# 552#
@@ -684,6 +702,7 @@ CONFIG_LEGACY_PTY_COUNT=256
684# TPM devices 702# TPM devices
685# 703#
686# CONFIG_TCG_TPM is not set 704# CONFIG_TCG_TPM is not set
705# CONFIG_TELCLOCK is not set
687 706
688# 707#
689# I2C support 708# I2C support
@@ -743,6 +762,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
743# CONFIG_USB is not set 762# CONFIG_USB is not set
744 763
745# 764#
765# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
766#
767
768#
746# USB Gadget Support 769# USB Gadget Support
747# 770#
748# CONFIG_USB_GADGET is not set 771# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 2acdec959d..da0677a03c 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,62 +1,11 @@
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-rc5
4# Thu Oct 20 22:26:22 2005 4# Fri Dec 23 02:21:03 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -138,8 +87,8 @@ CONFIG_HAVE_STD_PC_SERIAL_PORT=y
138# 87#
139# CPU selection 88# CPU selection
140# 89#
141CONFIG_CPU_MIPS32_R1=y 90# CONFIG_CPU_MIPS32_R1 is not set
142# CONFIG_CPU_MIPS32_R2 is not set 91CONFIG_CPU_MIPS32_R2=y
143# CONFIG_CPU_MIPS64_R1 is not set 92# CONFIG_CPU_MIPS64_R1 is not set
144# CONFIG_CPU_MIPS64_R2 is not set 93# CONFIG_CPU_MIPS64_R2 is not set
145# CONFIG_CPU_R3000 is not set 94# CONFIG_CPU_R3000 is not set
@@ -163,7 +112,7 @@ CONFIG_SYS_HAS_CPU_MIPS64_R1=y
163CONFIG_SYS_HAS_CPU_NEVADA=y 112CONFIG_SYS_HAS_CPU_NEVADA=y
164CONFIG_SYS_HAS_CPU_RM7000=y 113CONFIG_SYS_HAS_CPU_RM7000=y
165CONFIG_CPU_MIPS32=y 114CONFIG_CPU_MIPS32=y
166CONFIG_CPU_MIPSR1=y 115CONFIG_CPU_MIPSR2=y
167CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 116CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
168CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y 117CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
169CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 118CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
@@ -197,11 +146,81 @@ CONFIG_FLATMEM_MANUAL=y
197CONFIG_FLATMEM=y 146CONFIG_FLATMEM=y
198CONFIG_FLAT_NODE_MEM_MAP=y 147CONFIG_FLAT_NODE_MEM_MAP=y
199# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
149CONFIG_SPLIT_PTLOCK_CPUS=4
200CONFIG_PREEMPT_NONE=y 150CONFIG_PREEMPT_NONE=y
201# CONFIG_PREEMPT_VOLUNTARY is not set 151# CONFIG_PREEMPT_VOLUNTARY is not set
202# CONFIG_PREEMPT is not set 152# CONFIG_PREEMPT is not set
203 153
204# 154#
155# Code maturity level options
156#
157CONFIG_EXPERIMENTAL=y
158CONFIG_CLEAN_COMPILE=y
159CONFIG_BROKEN_ON_SMP=y
160CONFIG_INIT_ENV_ARG_LIMIT=32
161
162#
163# General setup
164#
165CONFIG_LOCALVERSION=""
166CONFIG_LOCALVERSION_AUTO=y
167CONFIG_SWAP=y
168CONFIG_SYSVIPC=y
169# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y
172# CONFIG_AUDIT is not set
173CONFIG_HOTPLUG=y
174CONFIG_KOBJECT_UEVENT=y
175# CONFIG_IKCONFIG is not set
176CONFIG_INITRAMFS_SOURCE=""
177CONFIG_EMBEDDED=y
178CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set
180CONFIG_PRINTK=y
181CONFIG_BUG=y
182CONFIG_BASE_FULL=y
183CONFIG_FUTEX=y
184CONFIG_EPOLL=y
185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SHMEM=y
187CONFIG_CC_ALIGN_FUNCTIONS=0
188CONFIG_CC_ALIGN_LABELS=0
189CONFIG_CC_ALIGN_LOOPS=0
190CONFIG_CC_ALIGN_JUMPS=0
191# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0
193
194#
195# Loadable module support
196#
197CONFIG_MODULES=y
198CONFIG_MODULE_UNLOAD=y
199# CONFIG_MODULE_FORCE_UNLOAD is not set
200CONFIG_OBSOLETE_MODPARM=y
201CONFIG_MODVERSIONS=y
202CONFIG_MODULE_SRCVERSION_ALL=y
203CONFIG_KMOD=y
204
205#
206# Block layer
207#
208# CONFIG_LBD is not set
209
210#
211# IO Schedulers
212#
213CONFIG_IOSCHED_NOOP=y
214CONFIG_IOSCHED_AS=y
215CONFIG_IOSCHED_DEADLINE=y
216CONFIG_IOSCHED_CFQ=y
217CONFIG_DEFAULT_AS=y
218# CONFIG_DEFAULT_DEADLINE is not set
219# CONFIG_DEFAULT_CFQ is not set
220# CONFIG_DEFAULT_NOOP is not set
221CONFIG_DEFAULT_IOSCHED="anticipatory"
222
223#
205# Bus options (PCI, PCMCIA, EISA, ISA, TC) 224# Bus options (PCI, PCMCIA, EISA, ISA, TC)
206# 225#
207CONFIG_HW_HAS_PCI=y 226CONFIG_HW_HAS_PCI=y
@@ -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 fb9bdd9e31..ac39ab7fee 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:25 2005 4# Thu Nov 24 01:06:37 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_ALL is not set
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -184,11 +132,82 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 132CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 133CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y 136CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 137# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
190 139
191# 140#
141# Code maturity level options
142#
143CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32
147
148#
149# General setup
150#
151CONFIG_LOCALVERSION=""
152CONFIG_LOCALVERSION_AUTO=y
153CONFIG_SWAP=y
154CONFIG_SYSVIPC=y
155# CONFIG_POSIX_MQUEUE is not set
156# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set
159CONFIG_HOTPLUG=y
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE=""
163CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_ALL is not set
166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_PRINTK=y
168CONFIG_BUG=y
169CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y
171CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0
180
181#
182# Loadable module support
183#
184CONFIG_MODULES=y
185CONFIG_MODULE_UNLOAD=y
186# CONFIG_MODULE_FORCE_UNLOAD is not set
187CONFIG_OBSOLETE_MODPARM=y
188CONFIG_MODVERSIONS=y
189CONFIG_MODULE_SRCVERSION_ALL=y
190CONFIG_KMOD=y
191
192#
193# Block layer
194#
195# CONFIG_LBD is not set
196
197#
198# IO Schedulers
199#
200CONFIG_IOSCHED_NOOP=y
201CONFIG_IOSCHED_AS=y
202CONFIG_IOSCHED_DEADLINE=y
203CONFIG_IOSCHED_CFQ=y
204CONFIG_DEFAULT_AS=y
205# CONFIG_DEFAULT_DEADLINE is not set
206# CONFIG_DEFAULT_CFQ is not set
207# CONFIG_DEFAULT_NOOP is not set
208CONFIG_DEFAULT_IOSCHED="anticipatory"
209
210#
192# Bus options (PCI, PCMCIA, EISA, ISA, TC) 211# Bus options (PCI, PCMCIA, EISA, ISA, TC)
193# 212#
194CONFIG_MMU=y 213CONFIG_MMU=y
@@ -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,8 @@ CONFIG_LEGACY_PTY_COUNT=256
537# 558#
538# TPM devices 559# TPM devices
539# 560#
561# CONFIG_TCG_TPM is not set
562# CONFIG_TELCLOCK is not set
540 563
541# 564#
542# I2C support 565# I2C support
@@ -589,6 +612,10 @@ CONFIG_LEGACY_PTY_COUNT=256
589# CONFIG_USB_ARCH_HAS_OHCI is not set 612# CONFIG_USB_ARCH_HAS_OHCI is not set
590 613
591# 614#
615# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
616#
617
618#
592# USB Gadget Support 619# USB Gadget Support
593# 620#
594# CONFIG_USB_GADGET is not set 621# CONFIG_USB_GADGET is not set
@@ -721,6 +748,8 @@ CONFIG_LOG_BUF_SHIFT=14
721# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 748# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
722# CONFIG_DEBUG_KOBJECT is not set 749# CONFIG_DEBUG_KOBJECT is not set
723CONFIG_DEBUG_INFO=y 750CONFIG_DEBUG_INFO=y
751# CONFIG_DEBUG_VM is not set
752# CONFIG_RCU_TORTURE_TEST is not set
724CONFIG_CROSSCOMPILE=y 753CONFIG_CROSSCOMPILE=y
725CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" 754CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
726# CONFIG_DEBUG_STACK_USAGE is not set 755# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index e2c0821285..2b5ea37484 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:28 2005 4# Thu Nov 24 01:06:39 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -182,11 +131,81 @@ CONFIG_FLATMEM_MANUAL=y
182CONFIG_FLATMEM=y 131CONFIG_FLATMEM=y
183CONFIG_FLAT_NODE_MEM_MAP=y 132CONFIG_FLAT_NODE_MEM_MAP=y
184# CONFIG_SPARSEMEM_STATIC is not set 133# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_PREEMPT_NONE=y 135CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 136# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
188 138
189# 139#
140# Code maturity level options
141#
142CONFIG_EXPERIMENTAL=y
143CONFIG_CLEAN_COMPILE=y
144CONFIG_BROKEN_ON_SMP=y
145CONFIG_INIT_ENV_ARG_LIMIT=32
146
147#
148# General setup
149#
150CONFIG_LOCALVERSION=""
151CONFIG_LOCALVERSION_AUTO=y
152CONFIG_SWAP=y
153CONFIG_SYSVIPC=y
154# CONFIG_POSIX_MQUEUE is not set
155# CONFIG_BSD_PROCESS_ACCT is not set
156CONFIG_SYSCTL=y
157# CONFIG_AUDIT is not set
158CONFIG_HOTPLUG=y
159CONFIG_KOBJECT_UEVENT=y
160# CONFIG_IKCONFIG is not set
161CONFIG_INITRAMFS_SOURCE=""
162CONFIG_EMBEDDED=y
163CONFIG_KALLSYMS=y
164# CONFIG_KALLSYMS_EXTRA_PASS is not set
165CONFIG_PRINTK=y
166CONFIG_BUG=y
167CONFIG_BASE_FULL=y
168CONFIG_FUTEX=y
169CONFIG_EPOLL=y
170# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
171CONFIG_SHMEM=y
172CONFIG_CC_ALIGN_FUNCTIONS=0
173CONFIG_CC_ALIGN_LABELS=0
174CONFIG_CC_ALIGN_LOOPS=0
175CONFIG_CC_ALIGN_JUMPS=0
176# CONFIG_TINY_SHMEM is not set
177CONFIG_BASE_SMALL=0
178
179#
180# Loadable module support
181#
182CONFIG_MODULES=y
183CONFIG_MODULE_UNLOAD=y
184# CONFIG_MODULE_FORCE_UNLOAD is not set
185CONFIG_OBSOLETE_MODPARM=y
186CONFIG_MODVERSIONS=y
187CONFIG_MODULE_SRCVERSION_ALL=y
188CONFIG_KMOD=y
189
190#
191# Block layer
192#
193# CONFIG_LBD is not set
194
195#
196# IO Schedulers
197#
198CONFIG_IOSCHED_NOOP=y
199CONFIG_IOSCHED_AS=y
200CONFIG_IOSCHED_DEADLINE=y
201CONFIG_IOSCHED_CFQ=y
202CONFIG_DEFAULT_AS=y
203# CONFIG_DEFAULT_DEADLINE is not set
204# CONFIG_DEFAULT_CFQ is not set
205# CONFIG_DEFAULT_NOOP is not set
206CONFIG_DEFAULT_IOSCHED="anticipatory"
207
208#
190# Bus options (PCI, PCMCIA, EISA, ISA, TC) 209# Bus options (PCI, PCMCIA, EISA, ISA, TC)
191# 210#
192CONFIG_HW_HAS_PCI=y 211CONFIG_HW_HAS_PCI=y
@@ -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,8 +299,11 @@ 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
286 307
287# 308#
288# Network testing 309# Network testing
@@ -341,16 +362,7 @@ CONFIG_CONNECTOR=m
341# CONFIG_BLK_DEV_UB is not set 362# CONFIG_BLK_DEV_UB is not set
342# CONFIG_BLK_DEV_RAM is not set 363# CONFIG_BLK_DEV_RAM is not set
343CONFIG_BLK_DEV_RAM_COUNT=16 364CONFIG_BLK_DEV_RAM_COUNT=16
344# CONFIG_LBD is not set
345# CONFIG_CDROM_PKTCDVD is not set 365# 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 366CONFIG_ATA_OVER_ETH=m
355 367
356# 368#
@@ -612,6 +624,7 @@ CONFIG_LEGACY_PTY_COUNT=256
612# CONFIG_WATCHDOG is not set 624# CONFIG_WATCHDOG is not set
613# CONFIG_RTC is not set 625# CONFIG_RTC is not set
614# CONFIG_GEN_RTC is not set 626# CONFIG_GEN_RTC is not set
627# CONFIG_RTC_VR41XX is not set
615# CONFIG_DTLK is not set 628# CONFIG_DTLK is not set
616# CONFIG_R3964 is not set 629# CONFIG_R3964 is not set
617# CONFIG_APPLICOM is not set 630# CONFIG_APPLICOM is not set
@@ -625,6 +638,8 @@ CONFIG_LEGACY_PTY_COUNT=256
625# PCMCIA character devices 638# PCMCIA character devices
626# 639#
627# CONFIG_SYNCLINK_CS is not set 640# CONFIG_SYNCLINK_CS is not set
641# CONFIG_CARDMAN_4000 is not set
642# CONFIG_CARDMAN_4040 is not set
628CONFIG_GPIO_VR41XX=y 643CONFIG_GPIO_VR41XX=y
629# CONFIG_RAW_DRIVER is not set 644# CONFIG_RAW_DRIVER is not set
630 645
@@ -632,6 +647,7 @@ CONFIG_GPIO_VR41XX=y
632# TPM devices 647# TPM devices
633# 648#
634# CONFIG_TCG_TPM is not set 649# CONFIG_TCG_TPM is not set
650# CONFIG_TELCLOCK is not set
635 651
636# 652#
637# I2C support 653# I2C support
@@ -713,12 +729,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
713# 729#
714# USB Device Class drivers 730# USB Device Class drivers
715# 731#
716# CONFIG_USB_BLUETOOTH_TTY is not set
717# CONFIG_USB_ACM is not set 732# CONFIG_USB_ACM is not set
718# CONFIG_USB_PRINTER is not set 733# CONFIG_USB_PRINTER is not set
719 734
720# 735#
721# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 736# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
737#
738
739#
740# may also be needed; see USB_STORAGE Help for more information
722# 741#
723# CONFIG_USB_STORAGE is not set 742# CONFIG_USB_STORAGE is not set
724 743
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index f18d05c2ca..7ad8718c1b 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:30 2005 4# Thu Nov 24 01:06:41 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57# CONFIG_MODULE_SRCVERSION_ALL is not set
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -174,7 +122,6 @@ CONFIG_CPU_HAS_PREFETCH=y
174# CONFIG_64BIT_PHYS_ADDR is not set 122# CONFIG_64BIT_PHYS_ADDR is not set
175# CONFIG_CPU_ADVANCED is not set 123# CONFIG_CPU_ADVANCED is not set
176CONFIG_CPU_HAS_LLSC=y 124CONFIG_CPU_HAS_LLSC=y
177CONFIG_CPU_HAS_LLDSCD=y
178CONFIG_CPU_HAS_SYNC=y 125CONFIG_CPU_HAS_SYNC=y
179CONFIG_GENERIC_HARDIRQS=y 126CONFIG_GENERIC_HARDIRQS=y
180CONFIG_GENERIC_IRQ_PROBE=y 127CONFIG_GENERIC_IRQ_PROBE=y
@@ -187,12 +134,83 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 134CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 135CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 136# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_SMP is not set 138# CONFIG_SMP is not set
191CONFIG_PREEMPT_NONE=y 139CONFIG_PREEMPT_NONE=y
192# CONFIG_PREEMPT_VOLUNTARY is not set 140# CONFIG_PREEMPT_VOLUNTARY is not set
193# CONFIG_PREEMPT is not set 141# CONFIG_PREEMPT is not set
194 142
195# 143#
144# Code maturity level options
145#
146CONFIG_EXPERIMENTAL=y
147CONFIG_CLEAN_COMPILE=y
148CONFIG_BROKEN_ON_SMP=y
149CONFIG_INIT_ENV_ARG_LIMIT=32
150
151#
152# General setup
153#
154CONFIG_LOCALVERSION=""
155CONFIG_LOCALVERSION_AUTO=y
156CONFIG_SWAP=y
157CONFIG_SYSVIPC=y
158# CONFIG_POSIX_MQUEUE is not set
159# CONFIG_BSD_PROCESS_ACCT is not set
160CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set
162CONFIG_HOTPLUG=y
163CONFIG_KOBJECT_UEVENT=y
164CONFIG_IKCONFIG=y
165CONFIG_IKCONFIG_PROC=y
166CONFIG_INITRAMFS_SOURCE=""
167CONFIG_EMBEDDED=y
168CONFIG_KALLSYMS=y
169# CONFIG_KALLSYMS_EXTRA_PASS is not set
170CONFIG_PRINTK=y
171CONFIG_BUG=y
172CONFIG_BASE_FULL=y
173CONFIG_FUTEX=y
174CONFIG_EPOLL=y
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
176CONFIG_SHMEM=y
177CONFIG_CC_ALIGN_FUNCTIONS=0
178CONFIG_CC_ALIGN_LABELS=0
179CONFIG_CC_ALIGN_LOOPS=0
180CONFIG_CC_ALIGN_JUMPS=0
181# CONFIG_TINY_SHMEM is not set
182CONFIG_BASE_SMALL=0
183
184#
185# Loadable module support
186#
187CONFIG_MODULES=y
188CONFIG_MODULE_UNLOAD=y
189# CONFIG_MODULE_FORCE_UNLOAD is not set
190CONFIG_OBSOLETE_MODPARM=y
191CONFIG_MODVERSIONS=y
192# CONFIG_MODULE_SRCVERSION_ALL is not set
193CONFIG_KMOD=y
194
195#
196# Block layer
197#
198# CONFIG_LBD is not set
199
200#
201# IO Schedulers
202#
203CONFIG_IOSCHED_NOOP=y
204CONFIG_IOSCHED_AS=y
205CONFIG_IOSCHED_DEADLINE=y
206CONFIG_IOSCHED_CFQ=y
207CONFIG_DEFAULT_AS=y
208# CONFIG_DEFAULT_DEADLINE is not set
209# CONFIG_DEFAULT_CFQ is not set
210# CONFIG_DEFAULT_NOOP is not set
211CONFIG_DEFAULT_IOSCHED="anticipatory"
212
213#
196# Bus options (PCI, PCMCIA, EISA, ISA, TC) 214# Bus options (PCI, PCMCIA, EISA, ISA, TC)
197# 215#
198CONFIG_HW_HAS_PCI=y 216CONFIG_HW_HAS_PCI=y
@@ -265,15 +283,19 @@ CONFIG_IPV6=m
265# CONFIG_IPV6_TUNNEL is not set 283# CONFIG_IPV6_TUNNEL is not set
266CONFIG_NETFILTER=y 284CONFIG_NETFILTER=y
267# CONFIG_NETFILTER_DEBUG is not set 285# CONFIG_NETFILTER_DEBUG is not set
286
287#
288# Core Netfilter Configuration
289#
268CONFIG_NETFILTER_NETLINK=m 290CONFIG_NETFILTER_NETLINK=m
269CONFIG_NETFILTER_NETLINK_QUEUE=m 291CONFIG_NETFILTER_NETLINK_QUEUE=m
270CONFIG_NETFILTER_NETLINK_LOG=m 292CONFIG_NETFILTER_NETLINK_LOG=m
293# CONFIG_NF_CONNTRACK is not set
271 294
272# 295#
273# IP: Netfilter Configuration 296# IP: Netfilter Configuration
274# 297#
275# CONFIG_IP_NF_CONNTRACK is not set 298# CONFIG_IP_NF_CONNTRACK is not set
276CONFIG_IP_NF_PPTP=m
277# CONFIG_IP_NF_QUEUE is not set 299# CONFIG_IP_NF_QUEUE is not set
278# CONFIG_IP_NF_IPTABLES is not set 300# CONFIG_IP_NF_IPTABLES is not set
279# CONFIG_IP_NF_ARPTABLES is not set 301# CONFIG_IP_NF_ARPTABLES is not set
@@ -305,8 +327,11 @@ CONFIG_IP_NF_PPTP=m
305# CONFIG_NET_DIVERT is not set 327# CONFIG_NET_DIVERT is not set
306# CONFIG_ECONET is not set 328# CONFIG_ECONET is not set
307# CONFIG_WAN_ROUTER is not set 329# CONFIG_WAN_ROUTER is not set
330
331#
332# QoS and/or fair queueing
333#
308# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
309# CONFIG_NET_CLS_ROUTE is not set
310 335
311# 336#
312# Network testing 337# Network testing
@@ -365,16 +390,7 @@ CONFIG_BLK_DEV_LOOP=y
365# CONFIG_BLK_DEV_SX8 is not set 390# CONFIG_BLK_DEV_SX8 is not set
366# CONFIG_BLK_DEV_RAM is not set 391# CONFIG_BLK_DEV_RAM is not set
367CONFIG_BLK_DEV_RAM_COUNT=16 392CONFIG_BLK_DEV_RAM_COUNT=16
368# CONFIG_LBD is not set
369# CONFIG_CDROM_PKTCDVD is not set 393# 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 394CONFIG_ATA_OVER_ETH=m
379 395
380# 396#
@@ -411,12 +427,13 @@ CONFIG_SCSI_PROC_FS=y
411# 427#
412# CONFIG_SCSI_SPI_ATTRS is not set 428# CONFIG_SCSI_SPI_ATTRS is not set
413# CONFIG_SCSI_FC_ATTRS is not set 429# CONFIG_SCSI_FC_ATTRS is not set
414# CONFIG_SCSI_ISCSI_ATTRS is not set 430CONFIG_SCSI_ISCSI_ATTRS=m
415CONFIG_SCSI_SAS_ATTRS=m 431CONFIG_SCSI_SAS_ATTRS=m
416 432
417# 433#
418# SCSI low-level drivers 434# SCSI low-level drivers
419# 435#
436CONFIG_ISCSI_TCP=m
420# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 437# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
421# CONFIG_SCSI_3W_9XXX is not set 438# CONFIG_SCSI_3W_9XXX is not set
422# CONFIG_SCSI_ACARD is not set 439# CONFIG_SCSI_ACARD is not set
@@ -427,6 +444,7 @@ CONFIG_SCSI_SAS_ATTRS=m
427# CONFIG_SCSI_DPT_I2O is not set 444# CONFIG_SCSI_DPT_I2O is not set
428# CONFIG_MEGARAID_NEWGEN is not set 445# CONFIG_MEGARAID_NEWGEN is not set
429# CONFIG_MEGARAID_LEGACY is not set 446# CONFIG_MEGARAID_LEGACY is not set
447# CONFIG_MEGARAID_SAS is not set
430# CONFIG_SCSI_SATA is not set 448# CONFIG_SCSI_SATA is not set
431# CONFIG_SCSI_DMX3191D is not set 449# CONFIG_SCSI_DMX3191D is not set
432# CONFIG_SCSI_FUTURE_DOMAIN is not set 450# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -461,6 +479,7 @@ CONFIG_SCSI_QLA2XXX=m
461# CONFIG_FUSION is not set 479# CONFIG_FUSION is not set
462# CONFIG_FUSION_SPI is not set 480# CONFIG_FUSION_SPI is not set
463# CONFIG_FUSION_FC is not set 481# CONFIG_FUSION_FC is not set
482# CONFIG_FUSION_SAS is not set
464 483
465# 484#
466# IEEE 1394 (FireWire) support 485# IEEE 1394 (FireWire) support
@@ -490,7 +509,6 @@ CONFIG_TUN=m
490# PHY device support 509# PHY device support
491# 510#
492CONFIG_PHYLIB=m 511CONFIG_PHYLIB=m
493CONFIG_PHYCONTROL=y
494 512
495# 513#
496# MII PHY device drivers 514# MII PHY device drivers
@@ -508,6 +526,7 @@ CONFIG_NET_ETHERNET=y
508CONFIG_MII=y 526CONFIG_MII=y
509# CONFIG_HAPPYMEAL is not set 527# CONFIG_HAPPYMEAL is not set
510# CONFIG_SUNGEM is not set 528# CONFIG_SUNGEM is not set
529# CONFIG_CASSINI is not set
511# CONFIG_NET_VENDOR_3COM is not set 530# CONFIG_NET_VENDOR_3COM is not set
512 531
513# 532#
@@ -589,6 +608,7 @@ CONFIG_PPP_ASYNC=m
589CONFIG_PPP_SYNC_TTY=m 608CONFIG_PPP_SYNC_TTY=m
590CONFIG_PPP_DEFLATE=m 609CONFIG_PPP_DEFLATE=m
591# CONFIG_PPP_BSDCOMP is not set 610# CONFIG_PPP_BSDCOMP is not set
611CONFIG_PPP_MPPE=m
592CONFIG_PPPOE=m 612CONFIG_PPPOE=m
593# CONFIG_SLIP is not set 613# CONFIG_SLIP is not set
594# CONFIG_NET_FC is not set 614# CONFIG_NET_FC is not set
@@ -691,6 +711,7 @@ CONFIG_RTC=y
691# TPM devices 711# TPM devices
692# 712#
693# CONFIG_TCG_TPM is not set 713# CONFIG_TCG_TPM is not set
714# CONFIG_TELCLOCK is not set
694 715
695# 716#
696# I2C support 717# I2C support
@@ -733,7 +754,6 @@ CONFIG_FB=y
733# CONFIG_FB_CFB_FILLRECT is not set 754# CONFIG_FB_CFB_FILLRECT is not set
734# CONFIG_FB_CFB_COPYAREA is not set 755# CONFIG_FB_CFB_COPYAREA is not set
735# CONFIG_FB_CFB_IMAGEBLIT is not set 756# CONFIG_FB_CFB_IMAGEBLIT is not set
736# CONFIG_FB_SOFT_CURSOR is not set
737# CONFIG_FB_MACMODES is not set 757# CONFIG_FB_MACMODES is not set
738CONFIG_FB_MODE_HELPERS=y 758CONFIG_FB_MODE_HELPERS=y
739# CONFIG_FB_TILEBLITTING is not set 759# CONFIG_FB_TILEBLITTING is not set
@@ -742,6 +762,7 @@ CONFIG_FB_MODE_HELPERS=y
742# CONFIG_FB_CYBER2000 is not set 762# CONFIG_FB_CYBER2000 is not set
743# CONFIG_FB_ASILIANT is not set 763# CONFIG_FB_ASILIANT is not set
744# CONFIG_FB_IMSTT is not set 764# CONFIG_FB_IMSTT is not set
765# CONFIG_FB_S1D13XXX is not set
745# CONFIG_FB_NVIDIA is not set 766# CONFIG_FB_NVIDIA is not set
746# CONFIG_FB_RIVA is not set 767# CONFIG_FB_RIVA is not set
747# CONFIG_FB_MATROX is not set 768# CONFIG_FB_MATROX is not set
@@ -758,7 +779,6 @@ CONFIG_FB_MODE_HELPERS=y
758# CONFIG_FB_SMIVGX is not set 779# CONFIG_FB_SMIVGX is not set
759# CONFIG_FB_CYBLA is not set 780# CONFIG_FB_CYBLA is not set
760# CONFIG_FB_TRIDENT is not set 781# CONFIG_FB_TRIDENT is not set
761# CONFIG_FB_S1D13XXX is not set
762# CONFIG_FB_VIRTUAL is not set 782# CONFIG_FB_VIRTUAL is not set
763 783
764# 784#
@@ -767,6 +787,7 @@ CONFIG_FB_MODE_HELPERS=y
767# CONFIG_VGA_CONSOLE is not set 787# CONFIG_VGA_CONSOLE is not set
768CONFIG_DUMMY_CONSOLE=y 788CONFIG_DUMMY_CONSOLE=y
769CONFIG_FRAMEBUFFER_CONSOLE=y 789CONFIG_FRAMEBUFFER_CONSOLE=y
790# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
770# CONFIG_FONTS is not set 791# CONFIG_FONTS is not set
771CONFIG_FONT_8x8=y 792CONFIG_FONT_8x8=y
772CONFIG_FONT_8x16=y 793CONFIG_FONT_8x16=y
@@ -793,6 +814,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
793# CONFIG_USB is not set 814# CONFIG_USB is not set
794 815
795# 816#
817# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
818#
819
820#
796# USB Gadget Support 821# USB Gadget Support
797# 822#
798# CONFIG_USB_GADGET is not set 823# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index d3a5fee02b..e8d6bb3551 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:33 2005 4# Thu Nov 24 01:06:43 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -163,7 +118,6 @@ CONFIG_RM7000_CPU_SCACHE=y
163CONFIG_CPU_HAS_PREFETCH=y 118CONFIG_CPU_HAS_PREFETCH=y
164# CONFIG_MIPS_MT is not set 119# CONFIG_MIPS_MT is not set
165CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
166CONFIG_CPU_HAS_LLDSCD=y
167CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
168CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
169CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
@@ -176,11 +130,74 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 130CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 131CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 132# CONFIG_SPARSEMEM_STATIC is not set
133CONFIG_SPLIT_PTLOCK_CPUS=4
179CONFIG_PREEMPT_NONE=y 134CONFIG_PREEMPT_NONE=y
180# CONFIG_PREEMPT_VOLUNTARY is not set 135# CONFIG_PREEMPT_VOLUNTARY is not set
181# CONFIG_PREEMPT is not set 136# CONFIG_PREEMPT is not set
182 137
183# 138#
139# Code maturity level options
140#
141CONFIG_EXPERIMENTAL=y
142CONFIG_CLEAN_COMPILE=y
143CONFIG_BROKEN_ON_SMP=y
144CONFIG_INIT_ENV_ARG_LIMIT=32
145
146#
147# General setup
148#
149CONFIG_LOCALVERSION=""
150CONFIG_LOCALVERSION_AUTO=y
151CONFIG_SWAP=y
152CONFIG_SYSVIPC=y
153# CONFIG_POSIX_MQUEUE is not set
154# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y
156# CONFIG_AUDIT is not set
157CONFIG_HOTPLUG=y
158CONFIG_KOBJECT_UEVENT=y
159# CONFIG_IKCONFIG is not set
160CONFIG_INITRAMFS_SOURCE=""
161CONFIG_EMBEDDED=y
162CONFIG_KALLSYMS=y
163# CONFIG_KALLSYMS_EXTRA_PASS is not set
164CONFIG_PRINTK=y
165CONFIG_BUG=y
166CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y
168CONFIG_EPOLL=y
169# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
170CONFIG_SHMEM=y
171CONFIG_CC_ALIGN_FUNCTIONS=0
172CONFIG_CC_ALIGN_LABELS=0
173CONFIG_CC_ALIGN_LOOPS=0
174CONFIG_CC_ALIGN_JUMPS=0
175# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0
177
178#
179# Loadable module support
180#
181# CONFIG_MODULES is not set
182
183#
184# Block layer
185#
186
187#
188# IO Schedulers
189#
190CONFIG_IOSCHED_NOOP=y
191CONFIG_IOSCHED_AS=y
192CONFIG_IOSCHED_DEADLINE=y
193CONFIG_IOSCHED_CFQ=y
194CONFIG_DEFAULT_AS=y
195# CONFIG_DEFAULT_DEADLINE is not set
196# CONFIG_DEFAULT_CFQ is not set
197# CONFIG_DEFAULT_NOOP is not set
198CONFIG_DEFAULT_IOSCHED="anticipatory"
199
200#
184# Bus options (PCI, PCMCIA, EISA, ISA, TC) 201# Bus options (PCI, PCMCIA, EISA, ISA, TC)
185# 202#
186CONFIG_HW_HAS_PCI=y 203CONFIG_HW_HAS_PCI=y
@@ -267,8 +284,11 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
270# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set
272 292
273# 293#
274# Network testing 294# Network testing
@@ -298,6 +318,7 @@ CONFIG_FW_LOADER=y
298# Connector - unified userspace <-> kernelspace linker 318# Connector - unified userspace <-> kernelspace linker
299# 319#
300CONFIG_CONNECTOR=y 320CONFIG_CONNECTOR=y
321CONFIG_PROC_EVENTS=y
301 322
302# 323#
303# Memory Technology Devices (MTD) 324# Memory Technology Devices (MTD)
@@ -329,14 +350,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
329CONFIG_CDROM_PKTCDVD=y 350CONFIG_CDROM_PKTCDVD=y
330CONFIG_CDROM_PKTCDVD_BUFFERS=8 351CONFIG_CDROM_PKTCDVD_BUFFERS=8
331# CONFIG_CDROM_PKTCDVD_WCACHE is not set 352# 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 353CONFIG_ATA_OVER_ETH=y
341 354
342# 355#
@@ -388,7 +401,6 @@ CONFIG_NETDEVICES=y
388# PHY device support 401# PHY device support
389# 402#
390CONFIG_PHYLIB=y 403CONFIG_PHYLIB=y
391CONFIG_PHYCONTROL=y
392 404
393# 405#
394# MII PHY device drivers 406# MII PHY device drivers
@@ -406,6 +418,7 @@ CONFIG_NET_ETHERNET=y
406# CONFIG_MII is not set 418# CONFIG_MII is not set
407# CONFIG_HAPPYMEAL is not set 419# CONFIG_HAPPYMEAL is not set
408# CONFIG_SUNGEM is not set 420# CONFIG_SUNGEM is not set
421# CONFIG_CASSINI is not set
409# CONFIG_NET_VENDOR_3COM is not set 422# CONFIG_NET_VENDOR_3COM is not set
410 423
411# 424#
@@ -562,6 +575,7 @@ CONFIG_LEGACY_PTY_COUNT=256
562# TPM devices 575# TPM devices
563# 576#
564# CONFIG_TCG_TPM is not set 577# CONFIG_TCG_TPM is not set
578# CONFIG_TELCLOCK is not set
565 579
566# 580#
567# I2C support 581# I2C support
@@ -621,6 +635,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
621# CONFIG_USB is not set 635# CONFIG_USB is not set
622 636
623# 637#
638# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
639#
640
641#
624# USB Gadget Support 642# USB Gadget Support
625# 643#
626# CONFIG_USB_GADGET is not set 644# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 1edde12ebf..f3787b68bd 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:35 2005 4# Thu Nov 24 01:06:44 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -168,7 +123,6 @@ CONFIG_CPU_HAS_PREFETCH=y
168# CONFIG_64BIT_PHYS_ADDR is not set 123# CONFIG_64BIT_PHYS_ADDR is not set
169# CONFIG_CPU_ADVANCED is not set 124# CONFIG_CPU_ADVANCED is not set
170CONFIG_CPU_HAS_LLSC=y 125CONFIG_CPU_HAS_LLSC=y
171CONFIG_CPU_HAS_LLDSCD=y
172CONFIG_CPU_HAS_SYNC=y 126CONFIG_CPU_HAS_SYNC=y
173CONFIG_GENERIC_HARDIRQS=y 127CONFIG_GENERIC_HARDIRQS=y
174CONFIG_GENERIC_IRQ_PROBE=y 128CONFIG_GENERIC_IRQ_PROBE=y
@@ -181,11 +135,75 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 135CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 136CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 137# CONFIG_SPARSEMEM_STATIC is not set
138CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 139CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 140# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 141# CONFIG_PREEMPT is not set
187 142
188# 143#
144# Code maturity level options
145#
146CONFIG_EXPERIMENTAL=y
147CONFIG_CLEAN_COMPILE=y
148CONFIG_BROKEN_ON_SMP=y
149CONFIG_INIT_ENV_ARG_LIMIT=32
150
151#
152# General setup
153#
154CONFIG_LOCALVERSION=""
155CONFIG_LOCALVERSION_AUTO=y
156CONFIG_SWAP=y
157CONFIG_SYSVIPC=y
158# CONFIG_POSIX_MQUEUE is not set
159# CONFIG_BSD_PROCESS_ACCT is not set
160CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set
162# CONFIG_HOTPLUG is not set
163CONFIG_KOBJECT_UEVENT=y
164# CONFIG_IKCONFIG is not set
165CONFIG_INITRAMFS_SOURCE=""
166CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set
169CONFIG_PRINTK=y
170CONFIG_BUG=y
171CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y
173CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0
182
183#
184# Loadable module support
185#
186# CONFIG_MODULES is not set
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
189# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
190# 208#
191CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
@@ -265,8 +283,11 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 283# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 284# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 285# CONFIG_WAN_ROUTER is not set
286
287#
288# QoS and/or fair queueing
289#
268# CONFIG_NET_SCHED is not set 290# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set
270 291
271# 292#
272# Network testing 293# Network testing
@@ -296,6 +317,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
296# Connector - unified userspace <-> kernelspace linker 317# Connector - unified userspace <-> kernelspace linker
297# 318#
298CONFIG_CONNECTOR=y 319CONFIG_CONNECTOR=y
320CONFIG_PROC_EVENTS=y
299 321
300# 322#
301# Memory Technology Devices (MTD) 323# Memory Technology Devices (MTD)
@@ -319,18 +341,9 @@ CONFIG_CONNECTOR=y
319# CONFIG_BLK_DEV_NBD is not set 341# CONFIG_BLK_DEV_NBD is not set
320# CONFIG_BLK_DEV_RAM is not set 342# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 343CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=y 344CONFIG_CDROM_PKTCDVD=y
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 345CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 346# 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 347CONFIG_ATA_OVER_ETH=y
335 348
336# 349#
@@ -375,7 +388,6 @@ CONFIG_NETDEVICES=y
375# PHY device support 388# PHY device support
376# 389#
377CONFIG_PHYLIB=y 390CONFIG_PHYLIB=y
378CONFIG_PHYCONTROL=y
379 391
380# 392#
381# MII PHY device drivers 393# MII PHY device drivers
@@ -513,6 +525,8 @@ CONFIG_LEGACY_PTY_COUNT=256
513# 525#
514# TPM devices 526# TPM devices
515# 527#
528# CONFIG_TCG_TPM is not set
529# CONFIG_TELCLOCK is not set
516 530
517# 531#
518# I2C support 532# I2C support
@@ -571,6 +585,10 @@ CONFIG_DUMMY_CONSOLE=y
571# CONFIG_USB_ARCH_HAS_OHCI is not set 585# CONFIG_USB_ARCH_HAS_OHCI is not set
572 586
573# 587#
588# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
589#
590
591#
574# USB Gadget Support 592# USB Gadget Support
575# 593#
576# CONFIG_USB_GADGET is not set 594# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index e2d5188cdc..b6126ad4d0 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -1,56 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:38 2005 4# Thu Nov 24 01:06:46 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51# CONFIG_MODULES is not set
52
53#
54# Machine selection 9# Machine selection
55# 10#
56# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -166,7 +121,6 @@ CONFIG_RM7000_CPU_SCACHE=y
166CONFIG_CPU_HAS_PREFETCH=y 121CONFIG_CPU_HAS_PREFETCH=y
167# CONFIG_MIPS_MT is not set 122# CONFIG_MIPS_MT is not set
168CONFIG_CPU_HAS_LLSC=y 123CONFIG_CPU_HAS_LLSC=y
169CONFIG_CPU_HAS_LLDSCD=y
170CONFIG_CPU_HAS_SYNC=y 124CONFIG_CPU_HAS_SYNC=y
171CONFIG_GENERIC_HARDIRQS=y 125CONFIG_GENERIC_HARDIRQS=y
172CONFIG_GENERIC_IRQ_PROBE=y 126CONFIG_GENERIC_IRQ_PROBE=y
@@ -179,11 +133,74 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 133CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 134CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 135# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 137CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 138# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 139# CONFIG_PREEMPT is not set
185 140
186# 141#
142# Code maturity level options
143#
144CONFIG_EXPERIMENTAL=y
145CONFIG_CLEAN_COMPILE=y
146CONFIG_BROKEN_ON_SMP=y
147CONFIG_INIT_ENV_ARG_LIMIT=32
148
149#
150# General setup
151#
152CONFIG_LOCALVERSION=""
153CONFIG_LOCALVERSION_AUTO=y
154CONFIG_SWAP=y
155CONFIG_SYSVIPC=y
156# CONFIG_POSIX_MQUEUE is not set
157# CONFIG_BSD_PROCESS_ACCT is not set
158CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set
160CONFIG_HOTPLUG=y
161CONFIG_KOBJECT_UEVENT=y
162# CONFIG_IKCONFIG is not set
163CONFIG_INITRAMFS_SOURCE=""
164CONFIG_EMBEDDED=y
165CONFIG_KALLSYMS=y
166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_PRINTK=y
168CONFIG_BUG=y
169CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y
171CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0
180
181#
182# Loadable module support
183#
184# CONFIG_MODULES is not set
185
186#
187# Block layer
188#
189
190#
191# IO Schedulers
192#
193CONFIG_IOSCHED_NOOP=y
194CONFIG_IOSCHED_AS=y
195CONFIG_IOSCHED_DEADLINE=y
196CONFIG_IOSCHED_CFQ=y
197CONFIG_DEFAULT_AS=y
198# CONFIG_DEFAULT_DEADLINE is not set
199# CONFIG_DEFAULT_CFQ is not set
200# CONFIG_DEFAULT_NOOP is not set
201CONFIG_DEFAULT_IOSCHED="anticipatory"
202
203#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 204# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 205#
189CONFIG_HW_HAS_PCI=y 206CONFIG_HW_HAS_PCI=y
@@ -270,8 +287,11 @@ CONFIG_TCP_CONG_BIC=y
270# CONFIG_NET_DIVERT is not set 287# CONFIG_NET_DIVERT is not set
271# CONFIG_ECONET is not set 288# CONFIG_ECONET is not set
272# CONFIG_WAN_ROUTER is not set 289# CONFIG_WAN_ROUTER is not set
290
291#
292# QoS and/or fair queueing
293#
273# CONFIG_NET_SCHED is not set 294# CONFIG_NET_SCHED is not set
274# CONFIG_NET_CLS_ROUTE is not set
275 295
276# 296#
277# Network testing 297# Network testing
@@ -301,6 +321,7 @@ CONFIG_FW_LOADER=y
301# Connector - unified userspace <-> kernelspace linker 321# Connector - unified userspace <-> kernelspace linker
302# 322#
303CONFIG_CONNECTOR=y 323CONFIG_CONNECTOR=y
324CONFIG_PROC_EVENTS=y
304 325
305# 326#
306# Memory Technology Devices (MTD) 327# Memory Technology Devices (MTD)
@@ -332,14 +353,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
332CONFIG_CDROM_PKTCDVD=y 353CONFIG_CDROM_PKTCDVD=y
333CONFIG_CDROM_PKTCDVD_BUFFERS=8 354CONFIG_CDROM_PKTCDVD_BUFFERS=8
334# CONFIG_CDROM_PKTCDVD_WCACHE is not set 355# 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 356CONFIG_ATA_OVER_ETH=y
344 357
345# 358#
@@ -391,7 +404,6 @@ CONFIG_NETDEVICES=y
391# PHY device support 404# PHY device support
392# 405#
393CONFIG_PHYLIB=y 406CONFIG_PHYLIB=y
394CONFIG_PHYCONTROL=y
395 407
396# 408#
397# MII PHY device drivers 409# MII PHY device drivers
@@ -410,6 +422,7 @@ CONFIG_MII=y
410CONFIG_GALILEO_64240_ETH=y 422CONFIG_GALILEO_64240_ETH=y
411# CONFIG_HAPPYMEAL is not set 423# CONFIG_HAPPYMEAL is not set
412# CONFIG_SUNGEM is not set 424# CONFIG_SUNGEM is not set
425# CONFIG_CASSINI is not set
413# CONFIG_NET_VENDOR_3COM is not set 426# CONFIG_NET_VENDOR_3COM is not set
414 427
415# 428#
@@ -565,6 +578,7 @@ CONFIG_LEGACY_PTY_COUNT=256
565# TPM devices 578# TPM devices
566# 579#
567# CONFIG_TCG_TPM is not set 580# CONFIG_TCG_TPM is not set
581# CONFIG_TELCLOCK is not set
568 582
569# 583#
570# I2C support 584# I2C support
@@ -624,6 +638,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
624# CONFIG_USB is not set 638# CONFIG_USB is not set
625 639
626# 640#
641# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
642#
643
644#
627# USB Gadget Support 645# USB Gadget Support
628# 646#
629# CONFIG_USB_GADGET is not set 647# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 47247addee..883626afc4 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:41 2005 4# Thu Nov 24 01:06:48 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -180,11 +129,81 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 129CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 130CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 131# CONFIG_SPARSEMEM_STATIC is not set
132CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 133CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 134# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 135# CONFIG_PREEMPT is not set
186 136
187# 137#
138# Code maturity level options
139#
140CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32
144
145#
146# General setup
147#
148CONFIG_LOCALVERSION=""
149CONFIG_LOCALVERSION_AUTO=y
150CONFIG_SWAP=y
151CONFIG_SYSVIPC=y
152# CONFIG_POSIX_MQUEUE is not set
153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184CONFIG_MODVERSIONS=y
185CONFIG_MODULE_SRCVERSION_ALL=y
186CONFIG_KMOD=y
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
188# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
189# 208#
190CONFIG_HW_HAS_PCI=y 209CONFIG_HW_HAS_PCI=y
@@ -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,8 +317,11 @@ 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
300 325
301# 326#
302# Network testing 327# Network testing
@@ -345,6 +370,7 @@ CONFIG_MTD_BLOCK=y
345# CONFIG_FTL is not set 370# CONFIG_FTL is not set
346# CONFIG_NFTL is not set 371# CONFIG_NFTL is not set
347# CONFIG_INFTL is not set 372# CONFIG_INFTL is not set
373# CONFIG_RFD_FTL is not set
348 374
349# 375#
350# RAM/ROM/Flash chip drivers 376# RAM/ROM/Flash chip drivers
@@ -402,6 +428,11 @@ CONFIG_MTD_ALCHEMY=y
402# CONFIG_MTD_NAND is not set 428# CONFIG_MTD_NAND is not set
403 429
404# 430#
431# OneNAND Flash Device Drivers
432#
433# CONFIG_MTD_ONENAND is not set
434
435#
405# Parallel port support 436# Parallel port support
406# 437#
407# CONFIG_PARPORT is not set 438# CONFIG_PARPORT is not set
@@ -419,18 +450,9 @@ CONFIG_BLK_DEV_LOOP=y
419# CONFIG_BLK_DEV_NBD is not set 450# CONFIG_BLK_DEV_NBD is not set
420# CONFIG_BLK_DEV_RAM is not set 451# CONFIG_BLK_DEV_RAM is not set
421CONFIG_BLK_DEV_RAM_COUNT=16 452CONFIG_BLK_DEV_RAM_COUNT=16
422# CONFIG_LBD is not set
423CONFIG_CDROM_PKTCDVD=m 453CONFIG_CDROM_PKTCDVD=m
424CONFIG_CDROM_PKTCDVD_BUFFERS=8 454CONFIG_CDROM_PKTCDVD_BUFFERS=8
425# CONFIG_CDROM_PKTCDVD_WCACHE is not set 455# 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 456CONFIG_ATA_OVER_ETH=m
435 457
436# 458#
@@ -475,7 +497,6 @@ CONFIG_NETDEVICES=y
475# PHY device support 497# PHY device support
476# 498#
477CONFIG_PHYLIB=m 499CONFIG_PHYLIB=m
478CONFIG_PHYCONTROL=y
479 500
480# 501#
481# MII PHY device drivers 502# MII PHY device drivers
@@ -492,6 +513,7 @@ CONFIG_CICADA_PHY=m
492CONFIG_NET_ETHERNET=y 513CONFIG_NET_ETHERNET=y
493# CONFIG_MII is not set 514# CONFIG_MII is not set
494# CONFIG_MIPS_AU1X00_ENET is not set 515# CONFIG_MIPS_AU1X00_ENET is not set
516# CONFIG_SMC91X is not set
495 517
496# 518#
497# Ethernet (1000 Mbit) 519# Ethernet (1000 Mbit)
@@ -526,6 +548,7 @@ CONFIG_PPP_ASYNC=m
526# CONFIG_PPP_SYNC_TTY is not set 548# CONFIG_PPP_SYNC_TTY is not set
527CONFIG_PPP_DEFLATE=m 549CONFIG_PPP_DEFLATE=m
528# CONFIG_PPP_BSDCOMP is not set 550# CONFIG_PPP_BSDCOMP is not set
551CONFIG_PPP_MPPE=m
529CONFIG_PPPOE=m 552CONFIG_PPPOE=m
530# CONFIG_SLIP is not set 553# CONFIG_SLIP is not set
531# CONFIG_SHAPER is not set 554# CONFIG_SHAPER is not set
@@ -592,12 +615,19 @@ CONFIG_HW_CONSOLE=y
592# 615#
593# Serial drivers 616# Serial drivers
594# 617#
595# CONFIG_SERIAL_8250 is not set 618CONFIG_SERIAL_8250=y
619CONFIG_SERIAL_8250_CONSOLE=y
620# CONFIG_SERIAL_8250_CS is not set
621CONFIG_SERIAL_8250_NR_UARTS=4
622# CONFIG_SERIAL_8250_EXTENDED is not set
623CONFIG_SERIAL_8250_AU1X00=y
596 624
597# 625#
598# Non-8250 serial port support 626# Non-8250 serial port support
599# 627#
600# CONFIG_SERIAL_AU1X00 is not set 628# CONFIG_SERIAL_AU1X00 is not set
629CONFIG_SERIAL_CORE=y
630CONFIG_SERIAL_CORE_CONSOLE=y
601CONFIG_UNIX98_PTYS=y 631CONFIG_UNIX98_PTYS=y
602CONFIG_LEGACY_PTYS=y 632CONFIG_LEGACY_PTYS=y
603CONFIG_LEGACY_PTY_COUNT=256 633CONFIG_LEGACY_PTY_COUNT=256
@@ -624,11 +654,15 @@ CONFIG_LEGACY_PTY_COUNT=256
624# PCMCIA character devices 654# PCMCIA character devices
625# 655#
626CONFIG_SYNCLINK_CS=m 656CONFIG_SYNCLINK_CS=m
657# CONFIG_CARDMAN_4000 is not set
658# CONFIG_CARDMAN_4040 is not set
627# CONFIG_RAW_DRIVER is not set 659# CONFIG_RAW_DRIVER is not set
628 660
629# 661#
630# TPM devices 662# TPM devices
631# 663#
664# CONFIG_TCG_TPM is not set
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 f91a4eaae5..f8fbc77f92 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:44 2005 4# Thu Nov 24 01:06:50 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -179,11 +128,81 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 128CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 129CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 130# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 132CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 133# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
185 135
186# 136#
137# Code maturity level options
138#
139CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32
143
144#
145# General setup
146#
147CONFIG_LOCALVERSION=""
148CONFIG_LOCALVERSION_AUTO=y
149CONFIG_SWAP=y
150CONFIG_SYSVIPC=y
151# CONFIG_POSIX_MQUEUE is not set
152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set
155CONFIG_HOTPLUG=y
156CONFIG_KOBJECT_UEVENT=y
157# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE=""
159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_PRINTK=y
163CONFIG_BUG=y
164CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y
166CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0
175
176#
177# Loadable module support
178#
179CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y
186
187#
188# Block layer
189#
190# CONFIG_LBD is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_AS=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_DEFAULT_AS=y
200# CONFIG_DEFAULT_DEADLINE is not set
201# CONFIG_DEFAULT_CFQ is not set
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="anticipatory"
204
205#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 206# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 207#
189CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
@@ -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,8 +323,11 @@ 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
306 331
307# 332#
308# Network testing 333# Network testing
@@ -351,6 +376,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 376# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 377# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 378# CONFIG_INFTL is not set
379# CONFIG_RFD_FTL is not set
354 380
355# 381#
356# RAM/ROM/Flash chip drivers 382# RAM/ROM/Flash chip drivers
@@ -409,6 +435,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 435# CONFIG_MTD_NAND is not set
410 436
411# 437#
438# OneNAND Flash Device Drivers
439#
440# CONFIG_MTD_ONENAND is not set
441
442#
412# Parallel port support 443# Parallel port support
413# 444#
414# CONFIG_PARPORT is not set 445# CONFIG_PARPORT is not set
@@ -431,18 +462,9 @@ CONFIG_BLK_DEV_LOOP=y
431# CONFIG_BLK_DEV_SX8 is not set 462# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 463# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 464CONFIG_BLK_DEV_RAM_COUNT=16
434# CONFIG_LBD is not set
435CONFIG_CDROM_PKTCDVD=m 465CONFIG_CDROM_PKTCDVD=m
436CONFIG_CDROM_PKTCDVD_BUFFERS=8 466CONFIG_CDROM_PKTCDVD_BUFFERS=8
437# CONFIG_CDROM_PKTCDVD_WCACHE is not set 467# 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 468CONFIG_ATA_OVER_ETH=m
447 469
448# 470#
@@ -546,7 +568,6 @@ CONFIG_NETDEVICES=y
546# PHY device support 568# PHY device support
547# 569#
548CONFIG_PHYLIB=m 570CONFIG_PHYLIB=m
549CONFIG_PHYCONTROL=y
550 571
551# 572#
552# MII PHY device drivers 573# MII PHY device drivers
@@ -565,7 +586,9 @@ CONFIG_MII=m
565CONFIG_MIPS_AU1X00_ENET=y 586CONFIG_MIPS_AU1X00_ENET=y
566# CONFIG_HAPPYMEAL is not set 587# CONFIG_HAPPYMEAL is not set
567# CONFIG_SUNGEM is not set 588# CONFIG_SUNGEM is not set
589# CONFIG_CASSINI is not set
568# CONFIG_NET_VENDOR_3COM is not set 590# CONFIG_NET_VENDOR_3COM is not set
591# CONFIG_SMC91X is not set
569 592
570# 593#
571# Tulip family network device support 594# Tulip family network device support
@@ -635,6 +658,7 @@ CONFIG_PPP_ASYNC=m
635# CONFIG_PPP_SYNC_TTY is not set 658# CONFIG_PPP_SYNC_TTY is not set
636CONFIG_PPP_DEFLATE=m 659CONFIG_PPP_DEFLATE=m
637# CONFIG_PPP_BSDCOMP is not set 660# CONFIG_PPP_BSDCOMP is not set
661CONFIG_PPP_MPPE=m
638CONFIG_PPPOE=m 662CONFIG_PPPOE=m
639# CONFIG_SLIP is not set 663# CONFIG_SLIP is not set
640# CONFIG_SHAPER is not set 664# CONFIG_SHAPER is not set
@@ -700,13 +724,17 @@ CONFIG_SERIO_RAW=m
700# 724#
701# Serial drivers 725# Serial drivers
702# 726#
703# CONFIG_SERIAL_8250 is not set 727CONFIG_SERIAL_8250=y
728CONFIG_SERIAL_8250_CONSOLE=y
729# CONFIG_SERIAL_8250_CS is not set
730CONFIG_SERIAL_8250_NR_UARTS=4
731# CONFIG_SERIAL_8250_EXTENDED is not set
732CONFIG_SERIAL_8250_AU1X00=y
704 733
705# 734#
706# Non-8250 serial port support 735# Non-8250 serial port support
707# 736#
708CONFIG_SERIAL_AU1X00=y 737# CONFIG_SERIAL_AU1X00 is not set
709CONFIG_SERIAL_AU1X00_CONSOLE=y
710CONFIG_SERIAL_CORE=y 738CONFIG_SERIAL_CORE=y
711CONFIG_SERIAL_CORE_CONSOLE=y 739CONFIG_SERIAL_CORE_CONSOLE=y
712# CONFIG_SERIAL_JSM is not set 740# CONFIG_SERIAL_JSM is not set
@@ -738,12 +766,15 @@ CONFIG_LEGACY_PTY_COUNT=256
738# PCMCIA character devices 766# PCMCIA character devices
739# 767#
740CONFIG_SYNCLINK_CS=m 768CONFIG_SYNCLINK_CS=m
769# CONFIG_CARDMAN_4000 is not set
770# CONFIG_CARDMAN_4040 is not set
741# CONFIG_RAW_DRIVER is not set 771# CONFIG_RAW_DRIVER is not set
742 772
743# 773#
744# TPM devices 774# TPM devices
745# 775#
746# CONFIG_TCG_TPM is not set 776# CONFIG_TCG_TPM is not set
777# CONFIG_TELCLOCK is not set
747 778
748# 779#
749# I2C support 780# I2C support
@@ -797,6 +828,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
797# CONFIG_USB is not set 828# CONFIG_USB is not set
798 829
799# 830#
831# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
832#
833
834#
800# USB Gadget Support 835# USB Gadget Support
801# 836#
802# CONFIG_USB_GADGET is not set 837# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index bbad27cb40..3d694cd68d 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:47 2005 4# Thu Nov 24 01:06:52 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -179,11 +128,81 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 128CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 129CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 130# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 132CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 133# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
185 135
186# 136#
137# Code maturity level options
138#
139CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32
143
144#
145# General setup
146#
147CONFIG_LOCALVERSION=""
148CONFIG_LOCALVERSION_AUTO=y
149CONFIG_SWAP=y
150CONFIG_SYSVIPC=y
151# CONFIG_POSIX_MQUEUE is not set
152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set
155CONFIG_HOTPLUG=y
156CONFIG_KOBJECT_UEVENT=y
157# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE=""
159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_PRINTK=y
163CONFIG_BUG=y
164CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y
166CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0
175
176#
177# Loadable module support
178#
179CONFIG_MODULES=y
180CONFIG_MODULE_UNLOAD=y
181# CONFIG_MODULE_FORCE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183CONFIG_MODVERSIONS=y
184CONFIG_MODULE_SRCVERSION_ALL=y
185CONFIG_KMOD=y
186
187#
188# Block layer
189#
190# CONFIG_LBD is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_AS=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_DEFAULT_AS=y
200# CONFIG_DEFAULT_DEADLINE is not set
201# CONFIG_DEFAULT_CFQ is not set
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="anticipatory"
204
205#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 206# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 207#
189CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
@@ -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,8 +323,11 @@ 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
306 331
307# 332#
308# Network testing 333# Network testing
@@ -351,6 +376,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 376# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 377# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 378# CONFIG_INFTL is not set
379# CONFIG_RFD_FTL is not set
354 380
355# 381#
356# RAM/ROM/Flash chip drivers 382# RAM/ROM/Flash chip drivers
@@ -409,6 +435,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 435# CONFIG_MTD_NAND is not set
410 436
411# 437#
438# OneNAND Flash Device Drivers
439#
440# CONFIG_MTD_ONENAND is not set
441
442#
412# Parallel port support 443# Parallel port support
413# 444#
414# CONFIG_PARPORT is not set 445# CONFIG_PARPORT is not set
@@ -431,18 +462,9 @@ CONFIG_BLK_DEV_LOOP=y
431# CONFIG_BLK_DEV_SX8 is not set 462# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 463# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 464CONFIG_BLK_DEV_RAM_COUNT=16
434# CONFIG_LBD is not set
435CONFIG_CDROM_PKTCDVD=m 465CONFIG_CDROM_PKTCDVD=m
436CONFIG_CDROM_PKTCDVD_BUFFERS=8 466CONFIG_CDROM_PKTCDVD_BUFFERS=8
437# CONFIG_CDROM_PKTCDVD_WCACHE is not set 467# 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 468CONFIG_ATA_OVER_ETH=m
447 469
448# 470#
@@ -546,7 +568,6 @@ CONFIG_NETDEVICES=y
546# PHY device support 568# PHY device support
547# 569#
548CONFIG_PHYLIB=m 570CONFIG_PHYLIB=m
549CONFIG_PHYCONTROL=y
550 571
551# 572#
552# MII PHY device drivers 573# MII PHY device drivers
@@ -565,7 +586,9 @@ CONFIG_NET_ETHERNET=y
565CONFIG_MIPS_AU1X00_ENET=y 586CONFIG_MIPS_AU1X00_ENET=y
566# CONFIG_HAPPYMEAL is not set 587# CONFIG_HAPPYMEAL is not set
567# CONFIG_SUNGEM is not set 588# CONFIG_SUNGEM is not set
589# CONFIG_CASSINI is not set
568# CONFIG_NET_VENDOR_3COM is not set 590# CONFIG_NET_VENDOR_3COM is not set
591# CONFIG_SMC91X is not set
569 592
570# 593#
571# Tulip family network device support 594# Tulip family network device support
@@ -627,6 +650,7 @@ CONFIG_PPP_ASYNC=m
627# CONFIG_PPP_SYNC_TTY is not set 650# CONFIG_PPP_SYNC_TTY is not set
628CONFIG_PPP_DEFLATE=m 651CONFIG_PPP_DEFLATE=m
629# CONFIG_PPP_BSDCOMP is not set 652# CONFIG_PPP_BSDCOMP is not set
653CONFIG_PPP_MPPE=m
630CONFIG_PPPOE=m 654CONFIG_PPPOE=m
631# CONFIG_SLIP is not set 655# CONFIG_SLIP is not set
632# CONFIG_SHAPER is not set 656# CONFIG_SHAPER is not set
@@ -692,13 +716,17 @@ CONFIG_SERIO_RAW=m
692# 716#
693# Serial drivers 717# Serial drivers
694# 718#
695# CONFIG_SERIAL_8250 is not set 719CONFIG_SERIAL_8250=y
720CONFIG_SERIAL_8250_CONSOLE=y
721# CONFIG_SERIAL_8250_CS is not set
722CONFIG_SERIAL_8250_NR_UARTS=4
723# CONFIG_SERIAL_8250_EXTENDED is not set
724CONFIG_SERIAL_8250_AU1X00=y
696 725
697# 726#
698# Non-8250 serial port support 727# Non-8250 serial port support
699# 728#
700CONFIG_SERIAL_AU1X00=y 729# CONFIG_SERIAL_AU1X00 is not set
701CONFIG_SERIAL_AU1X00_CONSOLE=y
702CONFIG_SERIAL_CORE=y 730CONFIG_SERIAL_CORE=y
703CONFIG_SERIAL_CORE_CONSOLE=y 731CONFIG_SERIAL_CORE_CONSOLE=y
704# CONFIG_SERIAL_JSM is not set 732# CONFIG_SERIAL_JSM is not set
@@ -730,12 +758,15 @@ CONFIG_LEGACY_PTY_COUNT=256
730# PCMCIA character devices 758# PCMCIA character devices
731# 759#
732CONFIG_SYNCLINK_CS=m 760CONFIG_SYNCLINK_CS=m
761# CONFIG_CARDMAN_4000 is not set
762# CONFIG_CARDMAN_4040 is not set
733# CONFIG_RAW_DRIVER is not set 763# CONFIG_RAW_DRIVER is not set
734 764
735# 765#
736# TPM devices 766# TPM devices
737# 767#
738# CONFIG_TCG_TPM is not set 768# CONFIG_TCG_TPM is not set
769# CONFIG_TELCLOCK is not set
739 770
740# 771#
741# I2C support 772# I2C support
@@ -789,6 +820,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
789# CONFIG_USB is not set 820# CONFIG_USB is not set
790 821
791# 822#
823# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
824#
825
826#
792# USB Gadget Support 827# USB Gadget Support
793# 828#
794# CONFIG_USB_GADGET is not set 829# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 555837e4c0..fba624a792 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:50 2005 4# Thu Nov 24 01:06:54 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_ALL is not set
35# CONFIG_KALLSYMS_EXTRA_PASS is not set
36CONFIG_PRINTK=y
37CONFIG_BUG=y
38CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y
40CONFIG_EPOLL=y
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SHMEM=y
43CONFIG_CC_ALIGN_FUNCTIONS=0
44CONFIG_CC_ALIGN_LABELS=0
45CONFIG_CC_ALIGN_LOOPS=0
46CONFIG_CC_ALIGN_JUMPS=0
47# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0
49
50#
51# Loadable module support
52#
53CONFIG_MODULES=y
54# CONFIG_MODULE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56# CONFIG_MODVERSIONS is not set
57# CONFIG_MODULE_SRCVERSION_ALL is not set
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -179,11 +127,82 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 127CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 128CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 129# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 131CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 132# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 133# CONFIG_PREEMPT is not set
185 134
186# 135#
136# Code maturity level options
137#
138CONFIG_EXPERIMENTAL=y
139CONFIG_CLEAN_COMPILE=y
140CONFIG_BROKEN_ON_SMP=y
141CONFIG_INIT_ENV_ARG_LIMIT=32
142
143#
144# General setup
145#
146CONFIG_LOCALVERSION=""
147CONFIG_LOCALVERSION_AUTO=y
148CONFIG_SWAP=y
149CONFIG_SYSVIPC=y
150# CONFIG_POSIX_MQUEUE is not set
151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set
154# CONFIG_HOTPLUG is not set
155CONFIG_KOBJECT_UEVENT=y
156CONFIG_IKCONFIG=y
157CONFIG_IKCONFIG_PROC=y
158CONFIG_INITRAMFS_SOURCE=""
159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_ALL is not set
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181# CONFIG_MODULE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183# CONFIG_MODVERSIONS is not set
184# CONFIG_MODULE_SRCVERSION_ALL is not set
185CONFIG_KMOD=y
186
187#
188# Block layer
189#
190# CONFIG_LBD is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_AS=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_DEFAULT_AS=y
200# CONFIG_DEFAULT_DEADLINE is not set
201# CONFIG_DEFAULT_CFQ is not set
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="anticipatory"
204
205#
187# Bus options (PCI, PCMCIA, EISA, ISA, TC) 206# Bus options (PCI, PCMCIA, EISA, ISA, TC)
188# 207#
189CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
@@ -265,8 +284,11 @@ 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
270 292
271# 293#
272# Network testing 294# Network testing
@@ -325,16 +347,7 @@ CONFIG_BLK_DEV_RAM=y
325CONFIG_BLK_DEV_RAM_COUNT=16 347CONFIG_BLK_DEV_RAM_COUNT=16
326CONFIG_BLK_DEV_RAM_SIZE=8192 348CONFIG_BLK_DEV_RAM_SIZE=8192
327CONFIG_BLK_DEV_INITRD=y 349CONFIG_BLK_DEV_INITRD=y
328# CONFIG_LBD is not set
329# CONFIG_CDROM_PKTCDVD is not set 350# 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 351# CONFIG_ATA_OVER_ETH is not set
339 352
340# 353#
@@ -423,12 +436,13 @@ CONFIG_SCSI_CONSTANTS=y
423# 436#
424# CONFIG_SCSI_SPI_ATTRS is not set 437# CONFIG_SCSI_SPI_ATTRS is not set
425# CONFIG_SCSI_FC_ATTRS is not set 438# CONFIG_SCSI_FC_ATTRS is not set
426# CONFIG_SCSI_ISCSI_ATTRS is not set 439CONFIG_SCSI_ISCSI_ATTRS=m
427# CONFIG_SCSI_SAS_ATTRS is not set 440# CONFIG_SCSI_SAS_ATTRS is not set
428 441
429# 442#
430# SCSI low-level drivers 443# SCSI low-level drivers
431# 444#
445CONFIG_ISCSI_TCP=m
432# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 446# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
433# CONFIG_SCSI_3W_9XXX is not set 447# CONFIG_SCSI_3W_9XXX is not set
434# CONFIG_SCSI_ACARD is not set 448# CONFIG_SCSI_ACARD is not set
@@ -439,6 +453,7 @@ CONFIG_SCSI_CONSTANTS=y
439# CONFIG_SCSI_DPT_I2O is not set 453# CONFIG_SCSI_DPT_I2O is not set
440# CONFIG_MEGARAID_NEWGEN is not set 454# CONFIG_MEGARAID_NEWGEN is not set
441# CONFIG_MEGARAID_LEGACY is not set 455# CONFIG_MEGARAID_LEGACY is not set
456# CONFIG_MEGARAID_SAS is not set
442# CONFIG_SCSI_SATA is not set 457# CONFIG_SCSI_SATA is not set
443# CONFIG_SCSI_DMX3191D is not set 458# CONFIG_SCSI_DMX3191D is not set
444# CONFIG_SCSI_FUTURE_DOMAIN is not set 459# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -473,6 +488,7 @@ CONFIG_SCSI_QLA2XXX=y
473# CONFIG_FUSION is not set 488# CONFIG_FUSION is not set
474# CONFIG_FUSION_SPI is not set 489# CONFIG_FUSION_SPI is not set
475# CONFIG_FUSION_FC is not set 490# CONFIG_FUSION_FC is not set
491# CONFIG_FUSION_SAS is not set
476 492
477# 493#
478# IEEE 1394 (FireWire) support 494# IEEE 1394 (FireWire) support
@@ -510,6 +526,7 @@ CONFIG_NET_ETHERNET=y
510CONFIG_MII=y 526CONFIG_MII=y
511# CONFIG_HAPPYMEAL is not set 527# CONFIG_HAPPYMEAL is not set
512# CONFIG_SUNGEM is not set 528# CONFIG_SUNGEM is not set
529# CONFIG_CASSINI is not set
513# CONFIG_NET_VENDOR_3COM is not set 530# CONFIG_NET_VENDOR_3COM is not set
514 531
515# 532#
@@ -681,6 +698,7 @@ CONFIG_LEGACY_PTY_COUNT=256
681# TPM devices 698# TPM devices
682# 699#
683# CONFIG_TCG_TPM is not set 700# CONFIG_TCG_TPM is not set
701# CONFIG_TELCLOCK is not set
684 702
685# 703#
686# I2C support 704# I2C support
@@ -763,12 +781,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
763# 781#
764# USB Device Class drivers 782# USB Device Class drivers
765# 783#
766# CONFIG_USB_BLUETOOTH_TTY is not set
767# CONFIG_USB_ACM is not set 784# CONFIG_USB_ACM is not set
768# CONFIG_USB_PRINTER is not set 785# CONFIG_USB_PRINTER is not set
769 786
770# 787#
771# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 788# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
789#
790
791#
792# may also be needed; see USB_STORAGE Help for more information
772# 793#
773CONFIG_USB_STORAGE=y 794CONFIG_USB_STORAGE=y
774# CONFIG_USB_STORAGE_DEBUG is not set 795# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1039,6 +1060,8 @@ CONFIG_DEBUG_SLAB=y
1039# CONFIG_DEBUG_KOBJECT is not set 1060# CONFIG_DEBUG_KOBJECT is not set
1040# CONFIG_DEBUG_INFO is not set 1061# CONFIG_DEBUG_INFO is not set
1041# CONFIG_DEBUG_FS is not set 1062# CONFIG_DEBUG_FS is not set
1063# CONFIG_DEBUG_VM is not set
1064# CONFIG_RCU_TORTURE_TEST is not set
1042CONFIG_CROSSCOMPILE=y 1065CONFIG_CROSSCOMPILE=y
1043CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1066CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1044# CONFIG_DEBUG_STACK_USAGE is not set 1067# CONFIG_DEBUG_STACK_USAGE is not set
@@ -1055,7 +1078,31 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1055# 1078#
1056# Cryptographic options 1079# Cryptographic options
1057# 1080#
1058# CONFIG_CRYPTO is not set 1081CONFIG_CRYPTO=y
1082# CONFIG_CRYPTO_HMAC is not set
1083# CONFIG_CRYPTO_NULL is not set
1084# CONFIG_CRYPTO_MD4 is not set
1085CONFIG_CRYPTO_MD5=m
1086# CONFIG_CRYPTO_SHA1 is not set
1087# CONFIG_CRYPTO_SHA256 is not set
1088# CONFIG_CRYPTO_SHA512 is not set
1089# CONFIG_CRYPTO_WP512 is not set
1090# CONFIG_CRYPTO_TGR192 is not set
1091# CONFIG_CRYPTO_DES is not set
1092# CONFIG_CRYPTO_BLOWFISH is not set
1093# CONFIG_CRYPTO_TWOFISH is not set
1094# CONFIG_CRYPTO_SERPENT is not set
1095# CONFIG_CRYPTO_AES is not set
1096# CONFIG_CRYPTO_CAST5 is not set
1097# CONFIG_CRYPTO_CAST6 is not set
1098# CONFIG_CRYPTO_TEA is not set
1099# CONFIG_CRYPTO_ARC4 is not set
1100# CONFIG_CRYPTO_KHAZAD is not set
1101# CONFIG_CRYPTO_ANUBIS is not set
1102# CONFIG_CRYPTO_DEFLATE is not set
1103# CONFIG_CRYPTO_MICHAEL_MIC is not set
1104CONFIG_CRYPTO_CRC32C=m
1105# CONFIG_CRYPTO_TEST is not set
1059 1106
1060# 1107#
1061# Hardware crypto devices 1108# Hardware crypto devices
@@ -1067,4 +1114,4 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1067CONFIG_CRC_CCITT=m 1114CONFIG_CRC_CCITT=m
1068# CONFIG_CRC16 is not set 1115# CONFIG_CRC16 is not set
1069CONFIG_CRC32=y 1116CONFIG_CRC32=y
1070# CONFIG_LIBCRC32C is not set 1117CONFIG_LIBCRC32C=m
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 37bd8d5c86..4c650e7081 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:53 2005 4# Thu Nov 24 01:06:58 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53# CONFIG_MODULE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55# CONFIG_MODVERSIONS is not set
56# CONFIG_MODULE_SRCVERSION_ALL is not set
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -167,7 +116,6 @@ CONFIG_CPU_HAS_PREFETCH=y
167# CONFIG_64BIT_PHYS_ADDR is not set 116# CONFIG_64BIT_PHYS_ADDR is not set
168CONFIG_CPU_ADVANCED=y 117CONFIG_CPU_ADVANCED=y
169CONFIG_CPU_HAS_LLSC=y 118CONFIG_CPU_HAS_LLSC=y
170# CONFIG_CPU_HAS_LLDSCD is not set
171# CONFIG_CPU_HAS_WB is not set 119# CONFIG_CPU_HAS_WB is not set
172CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
173CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
@@ -180,11 +128,81 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 128CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 129CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 130# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 132CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 133# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 134# CONFIG_PREEMPT is not set
186 135
187# 136#
137# Code maturity level options
138#
139CONFIG_EXPERIMENTAL=y
140CONFIG_CLEAN_COMPILE=y
141CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32
143
144#
145# General setup
146#
147CONFIG_LOCALVERSION=""
148CONFIG_LOCALVERSION_AUTO=y
149CONFIG_SWAP=y
150CONFIG_SYSVIPC=y
151# CONFIG_POSIX_MQUEUE is not set
152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set
155# CONFIG_HOTPLUG is not set
156CONFIG_KOBJECT_UEVENT=y
157CONFIG_IKCONFIG=y
158CONFIG_IKCONFIG_PROC=y
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181# CONFIG_MODULE_UNLOAD is not set
182CONFIG_OBSOLETE_MODPARM=y
183# CONFIG_MODVERSIONS is not set
184# CONFIG_MODULE_SRCVERSION_ALL is not set
185CONFIG_KMOD=y
186
187#
188# Block layer
189#
190# CONFIG_LBD is not set
191
192#
193# IO Schedulers
194#
195CONFIG_IOSCHED_NOOP=y
196CONFIG_IOSCHED_AS=y
197CONFIG_IOSCHED_DEADLINE=y
198CONFIG_IOSCHED_CFQ=y
199CONFIG_DEFAULT_AS=y
200# CONFIG_DEFAULT_DEADLINE is not set
201# CONFIG_DEFAULT_CFQ is not set
202# CONFIG_DEFAULT_NOOP is not set
203CONFIG_DEFAULT_IOSCHED="anticipatory"
204
205#
188# Bus options (PCI, PCMCIA, EISA, ISA, TC) 206# Bus options (PCI, PCMCIA, EISA, ISA, TC)
189# 207#
190CONFIG_HW_HAS_PCI=y 208CONFIG_HW_HAS_PCI=y
@@ -255,13 +273,17 @@ CONFIG_IPV6=m
255# CONFIG_IPV6_TUNNEL is not set 273# CONFIG_IPV6_TUNNEL 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
@@ -293,8 +315,11 @@ 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
298 323
299# 324#
300# Network testing 325# Network testing
@@ -352,16 +377,7 @@ CONFIG_BLK_DEV_RAM=y
352CONFIG_BLK_DEV_RAM_COUNT=16 377CONFIG_BLK_DEV_RAM_COUNT=16
353CONFIG_BLK_DEV_RAM_SIZE=8192 378CONFIG_BLK_DEV_RAM_SIZE=8192
354CONFIG_BLK_DEV_INITRD=y 379CONFIG_BLK_DEV_INITRD=y
355# CONFIG_LBD is not set
356# CONFIG_CDROM_PKTCDVD is not set 380# 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 381# CONFIG_ATA_OVER_ETH is not set
366 382
367# 383#
@@ -451,12 +467,13 @@ CONFIG_BLK_DEV_SD=y
451# 467#
452CONFIG_SCSI_SPI_ATTRS=m 468CONFIG_SCSI_SPI_ATTRS=m
453# CONFIG_SCSI_FC_ATTRS is not set 469# CONFIG_SCSI_FC_ATTRS is not set
454# CONFIG_SCSI_ISCSI_ATTRS is not set 470CONFIG_SCSI_ISCSI_ATTRS=m
455# CONFIG_SCSI_SAS_ATTRS is not set 471# CONFIG_SCSI_SAS_ATTRS is not set
456 472
457# 473#
458# SCSI low-level drivers 474# SCSI low-level drivers
459# 475#
476CONFIG_ISCSI_TCP=m
460# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 477# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
461# CONFIG_SCSI_3W_9XXX is not set 478# CONFIG_SCSI_3W_9XXX is not set
462# CONFIG_SCSI_ACARD is not set 479# CONFIG_SCSI_ACARD is not set
@@ -472,6 +489,7 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
472# CONFIG_SCSI_DPT_I2O is not set 489# CONFIG_SCSI_DPT_I2O is not set
473# CONFIG_MEGARAID_NEWGEN is not set 490# CONFIG_MEGARAID_NEWGEN is not set
474# CONFIG_MEGARAID_LEGACY is not set 491# CONFIG_MEGARAID_LEGACY is not set
492# CONFIG_MEGARAID_SAS is not set
475# CONFIG_SCSI_SATA is not set 493# CONFIG_SCSI_SATA is not set
476# CONFIG_SCSI_DMX3191D is not set 494# CONFIG_SCSI_DMX3191D is not set
477# CONFIG_SCSI_FUTURE_DOMAIN is not set 495# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -506,6 +524,7 @@ CONFIG_SCSI_QLA2XXX=y
506# CONFIG_FUSION is not set 524# CONFIG_FUSION is not set
507# CONFIG_FUSION_SPI is not set 525# CONFIG_FUSION_SPI is not set
508# CONFIG_FUSION_FC is not set 526# CONFIG_FUSION_FC is not set
527# CONFIG_FUSION_SAS is not set
509 528
510# 529#
511# IEEE 1394 (FireWire) support 530# IEEE 1394 (FireWire) support
@@ -543,6 +562,7 @@ CONFIG_NET_ETHERNET=y
543CONFIG_MII=y 562CONFIG_MII=y
544# CONFIG_HAPPYMEAL is not set 563# CONFIG_HAPPYMEAL is not set
545# CONFIG_SUNGEM is not set 564# CONFIG_SUNGEM is not set
565# CONFIG_CASSINI is not set
546# CONFIG_NET_VENDOR_3COM is not set 566# CONFIG_NET_VENDOR_3COM is not set
547 567
548# 568#
@@ -622,6 +642,7 @@ CONFIG_PPP_ASYNC=m
622CONFIG_PPP_SYNC_TTY=m 642CONFIG_PPP_SYNC_TTY=m
623CONFIG_PPP_DEFLATE=m 643CONFIG_PPP_DEFLATE=m
624# CONFIG_PPP_BSDCOMP is not set 644# CONFIG_PPP_BSDCOMP is not set
645CONFIG_PPP_MPPE=m
625# CONFIG_PPPOE is not set 646# CONFIG_PPPOE is not set
626# CONFIG_SLIP is not set 647# CONFIG_SLIP is not set
627# CONFIG_NET_FC is not set 648# CONFIG_NET_FC is not set
@@ -746,6 +767,7 @@ CONFIG_LEGACY_PTY_COUNT=256
746# TPM devices 767# TPM devices
747# 768#
748# CONFIG_TCG_TPM is not set 769# CONFIG_TCG_TPM is not set
770# CONFIG_TELCLOCK is not set
749 771
750# 772#
751# I2C support 773# I2C support
@@ -796,6 +818,7 @@ CONFIG_I2C_ALGOBIT=m
796# CONFIG_SENSORS_PCF8591 is not set 818# CONFIG_SENSORS_PCF8591 is not set
797# CONFIG_SENSORS_RTC8564 is not set 819# CONFIG_SENSORS_RTC8564 is not set
798# CONFIG_SENSORS_MAX6875 is not set 820# CONFIG_SENSORS_MAX6875 is not set
821# CONFIG_RTC_X1205_I2C is not set
799# CONFIG_I2C_DEBUG_CORE is not set 822# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 823# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 824# CONFIG_I2C_DEBUG_BUS is not set
@@ -872,7 +895,6 @@ CONFIG_FB=y
872# CONFIG_FB_CFB_FILLRECT is not set 895# CONFIG_FB_CFB_FILLRECT is not set
873# CONFIG_FB_CFB_COPYAREA is not set 896# CONFIG_FB_CFB_COPYAREA is not set
874# CONFIG_FB_CFB_IMAGEBLIT is not set 897# CONFIG_FB_CFB_IMAGEBLIT is not set
875# CONFIG_FB_SOFT_CURSOR is not set
876# CONFIG_FB_MACMODES is not set 898# CONFIG_FB_MACMODES is not set
877# CONFIG_FB_MODE_HELPERS is not set 899# CONFIG_FB_MODE_HELPERS is not set
878# CONFIG_FB_TILEBLITTING is not set 900# CONFIG_FB_TILEBLITTING is not set
@@ -881,6 +903,7 @@ CONFIG_FB=y
881# CONFIG_FB_CYBER2000 is not set 903# CONFIG_FB_CYBER2000 is not set
882# CONFIG_FB_ASILIANT is not set 904# CONFIG_FB_ASILIANT is not set
883# CONFIG_FB_IMSTT is not set 905# CONFIG_FB_IMSTT is not set
906# CONFIG_FB_S1D13XXX is not set
884# CONFIG_FB_NVIDIA is not set 907# CONFIG_FB_NVIDIA is not set
885# CONFIG_FB_RIVA is not set 908# CONFIG_FB_RIVA is not set
886# CONFIG_FB_MATROX is not set 909# CONFIG_FB_MATROX is not set
@@ -897,7 +920,6 @@ CONFIG_FB=y
897# CONFIG_FB_SMIVGX is not set 920# CONFIG_FB_SMIVGX is not set
898# CONFIG_FB_CYBLA is not set 921# CONFIG_FB_CYBLA is not set
899# CONFIG_FB_TRIDENT is not set 922# CONFIG_FB_TRIDENT is not set
900# CONFIG_FB_S1D13XXX is not set
901# CONFIG_FB_VIRTUAL is not set 923# CONFIG_FB_VIRTUAL is not set
902 924
903# 925#
@@ -946,12 +968,15 @@ CONFIG_USB_DEVICEFS=y
946# 968#
947# USB Device Class drivers 969# USB Device Class drivers
948# 970#
949# CONFIG_USB_BLUETOOTH_TTY is not set
950# CONFIG_USB_ACM is not set 971# CONFIG_USB_ACM is not set
951# CONFIG_USB_PRINTER is not set 972# CONFIG_USB_PRINTER is not set
952 973
953# 974#
954# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 975# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
976#
977
978#
979# may also be needed; see USB_STORAGE Help for more information
955# 980#
956CONFIG_USB_STORAGE=y 981CONFIG_USB_STORAGE=y
957# CONFIG_USB_STORAGE_DEBUG is not set 982# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1235,7 +1260,31 @@ CONFIG_CMDLINE=""
1235# 1260#
1236# Cryptographic options 1261# Cryptographic options
1237# 1262#
1238# CONFIG_CRYPTO is not set 1263CONFIG_CRYPTO=y
1264# CONFIG_CRYPTO_HMAC is not set
1265# CONFIG_CRYPTO_NULL is not set
1266# CONFIG_CRYPTO_MD4 is not set
1267CONFIG_CRYPTO_MD5=m
1268CONFIG_CRYPTO_SHA1=m
1269# CONFIG_CRYPTO_SHA256 is not set
1270# CONFIG_CRYPTO_SHA512 is not set
1271# CONFIG_CRYPTO_WP512 is not set
1272# CONFIG_CRYPTO_TGR192 is not set
1273# CONFIG_CRYPTO_DES is not set
1274# CONFIG_CRYPTO_BLOWFISH is not set
1275# CONFIG_CRYPTO_TWOFISH is not set
1276# CONFIG_CRYPTO_SERPENT is not set
1277# CONFIG_CRYPTO_AES is not set
1278# CONFIG_CRYPTO_CAST5 is not set
1279# CONFIG_CRYPTO_CAST6 is not set
1280# CONFIG_CRYPTO_TEA is not set
1281CONFIG_CRYPTO_ARC4=m
1282# CONFIG_CRYPTO_KHAZAD is not set
1283# CONFIG_CRYPTO_ANUBIS is not set
1284# CONFIG_CRYPTO_DEFLATE is not set
1285# CONFIG_CRYPTO_MICHAEL_MIC is not set
1286CONFIG_CRYPTO_CRC32C=m
1287# CONFIG_CRYPTO_TEST is not set
1239 1288
1240# 1289#
1241# Hardware crypto devices 1290# Hardware crypto devices
@@ -1247,6 +1296,6 @@ CONFIG_CMDLINE=""
1247CONFIG_CRC_CCITT=m 1296CONFIG_CRC_CCITT=m
1248# CONFIG_CRC16 is not set 1297# CONFIG_CRC16 is not set
1249CONFIG_CRC32=y 1298CONFIG_CRC32=y
1250# CONFIG_LIBCRC32C is not set 1299CONFIG_LIBCRC32C=m
1251CONFIG_ZLIB_INFLATE=y 1300CONFIG_ZLIB_INFLATE=y
1252CONFIG_ZLIB_DEFLATE=m 1301CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 741a9a9713..dee4460616 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -1,55 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:56 2005 4# Thu Nov 24 01:07:00 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11# CONFIG_EXPERIMENTAL is not set
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21# CONFIG_SWAP is not set
22# CONFIG_SYSVIPC is not set
23# CONFIG_BSD_PROCESS_ACCT is not set
24# CONFIG_SYSCTL is not set
25# CONFIG_AUDIT is not set
26# CONFIG_HOTPLUG is not set
27CONFIG_KOBJECT_UEVENT=y
28# CONFIG_IKCONFIG is not set
29CONFIG_INITRAMFS_SOURCE=""
30CONFIG_EMBEDDED=y
31CONFIG_KALLSYMS=y
32# CONFIG_KALLSYMS_EXTRA_PASS is not set
33CONFIG_PRINTK=y
34# CONFIG_BUG is not set
35# CONFIG_BASE_FULL is not set
36# CONFIG_FUTEX is not set
37# CONFIG_EPOLL is not set
38# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
39# CONFIG_SHMEM is not set
40CONFIG_CC_ALIGN_FUNCTIONS=0
41CONFIG_CC_ALIGN_LABELS=0
42CONFIG_CC_ALIGN_LOOPS=0
43CONFIG_CC_ALIGN_JUMPS=0
44CONFIG_TINY_SHMEM=y
45CONFIG_BASE_SMALL=1
46
47#
48# Loadable module support
49#
50# CONFIG_MODULES is not set
51
52#
53# Machine selection 9# Machine selection
54# 10#
55# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -168,11 +124,74 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
168CONFIG_FLATMEM=y 124CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 125CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 126# CONFIG_SPARSEMEM_STATIC is not set
127CONFIG_SPLIT_PTLOCK_CPUS=4
171CONFIG_PREEMPT_NONE=y 128CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 129# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 130# CONFIG_PREEMPT is not set
174 131
175# 132#
133# Code maturity level options
134#
135# CONFIG_EXPERIMENTAL is not set
136CONFIG_CLEAN_COMPILE=y
137CONFIG_BROKEN_ON_SMP=y
138CONFIG_INIT_ENV_ARG_LIMIT=32
139
140#
141# General setup
142#
143CONFIG_LOCALVERSION=""
144CONFIG_LOCALVERSION_AUTO=y
145# CONFIG_SWAP is not set
146# CONFIG_SYSVIPC is not set
147# CONFIG_BSD_PROCESS_ACCT is not set
148# CONFIG_SYSCTL is not set
149# CONFIG_AUDIT is not set
150# CONFIG_HOTPLUG is not set
151CONFIG_KOBJECT_UEVENT=y
152# CONFIG_IKCONFIG is not set
153CONFIG_INITRAMFS_SOURCE=""
154CONFIG_EMBEDDED=y
155CONFIG_KALLSYMS=y
156# CONFIG_KALLSYMS_EXTRA_PASS is not set
157CONFIG_PRINTK=y
158# CONFIG_BUG is not set
159# CONFIG_BASE_FULL is not set
160# CONFIG_FUTEX is not set
161# CONFIG_EPOLL is not set
162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163# CONFIG_SHMEM is not set
164CONFIG_CC_ALIGN_FUNCTIONS=0
165CONFIG_CC_ALIGN_LABELS=0
166CONFIG_CC_ALIGN_LOOPS=0
167CONFIG_CC_ALIGN_JUMPS=0
168CONFIG_TINY_SHMEM=y
169CONFIG_BASE_SMALL=1
170
171#
172# Loadable module support
173#
174# CONFIG_MODULES is not set
175
176#
177# Block layer
178#
179# CONFIG_LBD is not set
180
181#
182# IO Schedulers
183#
184CONFIG_IOSCHED_NOOP=y
185# CONFIG_IOSCHED_AS is not set
186# CONFIG_IOSCHED_DEADLINE is not set
187# CONFIG_IOSCHED_CFQ is not set
188# CONFIG_DEFAULT_AS is not set
189# CONFIG_DEFAULT_DEADLINE is not set
190# CONFIG_DEFAULT_CFQ is not set
191CONFIG_DEFAULT_NOOP=y
192CONFIG_DEFAULT_IOSCHED="noop"
193
194#
176# Bus options (PCI, PCMCIA, EISA, ISA, TC) 195# Bus options (PCI, PCMCIA, EISA, ISA, TC)
177# 196#
178CONFIG_ISA=y 197CONFIG_ISA=y
@@ -234,8 +253,11 @@ 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
239 261
240# 262#
241# Network testing 263# Network testing
@@ -265,6 +287,7 @@ CONFIG_STANDALONE=y
265# Connector - unified userspace <-> kernelspace linker 287# Connector - unified userspace <-> kernelspace linker
266# 288#
267CONFIG_CONNECTOR=y 289CONFIG_CONNECTOR=y
290CONFIG_PROC_EVENTS=y
268 291
269# 292#
270# Memory Technology Devices (MTD) 293# Memory Technology Devices (MTD)
@@ -289,16 +312,7 @@ CONFIG_CONNECTOR=y
289# CONFIG_BLK_DEV_NBD is not set 312# CONFIG_BLK_DEV_NBD is not set
290# CONFIG_BLK_DEV_RAM is not set 313# CONFIG_BLK_DEV_RAM is not set
291CONFIG_BLK_DEV_RAM_COUNT=16 314CONFIG_BLK_DEV_RAM_COUNT=16
292# CONFIG_LBD is not set
293# CONFIG_CDROM_PKTCDVD is not set 315# 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 316# CONFIG_ATA_OVER_ETH is not set
303 317
304# 318#
@@ -353,7 +367,6 @@ CONFIG_NETDEVICES=y
353# PHY device support 367# PHY device support
354# 368#
355CONFIG_PHYLIB=y 369CONFIG_PHYLIB=y
356CONFIG_PHYCONTROL=y
357 370
358# 371#
359# MII PHY device drivers 372# MII PHY device drivers
@@ -385,7 +398,6 @@ CONFIG_NET_ISA=y
385# CONFIG_ETH16I is not set 398# CONFIG_ETH16I is not set
386CONFIG_NE2000=y 399CONFIG_NE2000=y
387# CONFIG_NET_PCI is not set 400# CONFIG_NET_PCI is not set
388# CONFIG_NET_POCKET is not set
389 401
390# 402#
391# Ethernet (1000 Mbit) 403# Ethernet (1000 Mbit)
@@ -558,6 +570,10 @@ CONFIG_DUMMY_CONSOLE=y
558# CONFIG_USB_ARCH_HAS_OHCI is not set 570# CONFIG_USB_ARCH_HAS_OHCI is not set
559 571
560# 572#
573# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
574#
575
576#
561# USB Gadget Support 577# USB Gadget Support
562# 578#
563# CONFIG_USB_GADGET is not set 579# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 897420d390..9aaa43024a 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:26:59 2005 4# Thu Nov 24 01:07:03 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28# CONFIG_KOBJECT_UEVENT is not set
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38# CONFIG_FUTEX is not set
39# CONFIG_EPOLL is not set
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53# CONFIG_MODULE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55# CONFIG_MODVERSIONS is not set
56# CONFIG_MODULE_SRCVERSION_ALL is not set
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -175,7 +124,6 @@ CONFIG_PAGE_SIZE_4KB=y
175# CONFIG_MIPS_MT is not set 124# CONFIG_MIPS_MT is not set
176CONFIG_CPU_ADVANCED=y 125CONFIG_CPU_ADVANCED=y
177CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
178CONFIG_CPU_HAS_LLDSCD=y
179CONFIG_CPU_HAS_WB=y 127CONFIG_CPU_HAS_WB=y
180CONFIG_CPU_HAS_SYNC=y 128CONFIG_CPU_HAS_SYNC=y
181CONFIG_GENERIC_HARDIRQS=y 129CONFIG_GENERIC_HARDIRQS=y
@@ -188,11 +136,81 @@ CONFIG_FLATMEM_MANUAL=y
188CONFIG_FLATMEM=y 136CONFIG_FLATMEM=y
189CONFIG_FLAT_NODE_MEM_MAP=y 137CONFIG_FLAT_NODE_MEM_MAP=y
190# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
139CONFIG_SPLIT_PTLOCK_CPUS=4
191CONFIG_PREEMPT_NONE=y 140CONFIG_PREEMPT_NONE=y
192# CONFIG_PREEMPT_VOLUNTARY is not set 141# CONFIG_PREEMPT_VOLUNTARY is not set
193# CONFIG_PREEMPT is not set 142# CONFIG_PREEMPT is not set
194 143
195# 144#
145# Code maturity level options
146#
147CONFIG_EXPERIMENTAL=y
148CONFIG_CLEAN_COMPILE=y
149CONFIG_BROKEN_ON_SMP=y
150CONFIG_INIT_ENV_ARG_LIMIT=32
151
152#
153# General setup
154#
155CONFIG_LOCALVERSION=""
156CONFIG_LOCALVERSION_AUTO=y
157CONFIG_SWAP=y
158CONFIG_SYSVIPC=y
159# CONFIG_POSIX_MQUEUE is not set
160# CONFIG_BSD_PROCESS_ACCT is not set
161CONFIG_SYSCTL=y
162# CONFIG_AUDIT is not set
163CONFIG_HOTPLUG=y
164# CONFIG_KOBJECT_UEVENT is not set
165CONFIG_IKCONFIG=y
166CONFIG_IKCONFIG_PROC=y
167CONFIG_INITRAMFS_SOURCE=""
168CONFIG_EMBEDDED=y
169CONFIG_KALLSYMS=y
170# CONFIG_KALLSYMS_EXTRA_PASS is not set
171CONFIG_PRINTK=y
172CONFIG_BUG=y
173CONFIG_BASE_FULL=y
174# CONFIG_FUTEX is not set
175# CONFIG_EPOLL is not set
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
177CONFIG_SHMEM=y
178CONFIG_CC_ALIGN_FUNCTIONS=0
179CONFIG_CC_ALIGN_LABELS=0
180CONFIG_CC_ALIGN_LOOPS=0
181CONFIG_CC_ALIGN_JUMPS=0
182# CONFIG_TINY_SHMEM is not set
183CONFIG_BASE_SMALL=0
184
185#
186# Loadable module support
187#
188CONFIG_MODULES=y
189# CONFIG_MODULE_UNLOAD is not set
190CONFIG_OBSOLETE_MODPARM=y
191# CONFIG_MODVERSIONS is not set
192# CONFIG_MODULE_SRCVERSION_ALL is not set
193CONFIG_KMOD=y
194
195#
196# Block layer
197#
198# CONFIG_LBD is not set
199
200#
201# IO Schedulers
202#
203CONFIG_IOSCHED_NOOP=y
204CONFIG_IOSCHED_AS=y
205CONFIG_IOSCHED_DEADLINE=y
206CONFIG_IOSCHED_CFQ=y
207CONFIG_DEFAULT_AS=y
208# CONFIG_DEFAULT_DEADLINE is not set
209# CONFIG_DEFAULT_CFQ is not set
210# CONFIG_DEFAULT_NOOP is not set
211CONFIG_DEFAULT_IOSCHED="anticipatory"
212
213#
196# Bus options (PCI, PCMCIA, EISA, ISA, TC) 214# Bus options (PCI, PCMCIA, EISA, ISA, TC)
197# 215#
198CONFIG_HW_HAS_PCI=y 216CONFIG_HW_HAS_PCI=y
@@ -265,15 +283,19 @@ CONFIG_IPV6=m
265# CONFIG_IPV6_TUNNEL is not set 283# CONFIG_IPV6_TUNNEL is not set
266CONFIG_NETFILTER=y 284CONFIG_NETFILTER=y
267# CONFIG_NETFILTER_DEBUG is not set 285# CONFIG_NETFILTER_DEBUG is not set
286
287#
288# Core Netfilter Configuration
289#
268CONFIG_NETFILTER_NETLINK=m 290CONFIG_NETFILTER_NETLINK=m
269CONFIG_NETFILTER_NETLINK_QUEUE=m 291CONFIG_NETFILTER_NETLINK_QUEUE=m
270CONFIG_NETFILTER_NETLINK_LOG=m 292CONFIG_NETFILTER_NETLINK_LOG=m
293# CONFIG_NF_CONNTRACK is not set
271 294
272# 295#
273# IP: Netfilter Configuration 296# IP: Netfilter Configuration
274# 297#
275# CONFIG_IP_NF_CONNTRACK is not set 298# CONFIG_IP_NF_CONNTRACK is not set
276CONFIG_IP_NF_PPTP=m
277# CONFIG_IP_NF_QUEUE is not set 299# CONFIG_IP_NF_QUEUE is not set
278# CONFIG_IP_NF_IPTABLES is not set 300# CONFIG_IP_NF_IPTABLES is not set
279# CONFIG_IP_NF_ARPTABLES is not set 301# CONFIG_IP_NF_ARPTABLES is not set
@@ -305,8 +327,11 @@ CONFIG_IP_NF_PPTP=m
305# CONFIG_NET_DIVERT is not set 327# CONFIG_NET_DIVERT is not set
306# CONFIG_ECONET is not set 328# CONFIG_ECONET is not set
307# CONFIG_WAN_ROUTER is not set 329# CONFIG_WAN_ROUTER is not set
330
331#
332# QoS and/or fair queueing
333#
308# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
309# CONFIG_NET_CLS_ROUTE is not set
310 335
311# 336#
312# Network testing 337# Network testing
@@ -355,6 +380,7 @@ CONFIG_MTD_BLOCK=y
355# CONFIG_FTL is not set 380# CONFIG_FTL is not set
356# CONFIG_NFTL is not set 381# CONFIG_NFTL is not set
357# CONFIG_INFTL is not set 382# CONFIG_INFTL is not set
383# CONFIG_RFD_FTL is not set
358 384
359# 385#
360# RAM/ROM/Flash chip drivers 386# RAM/ROM/Flash chip drivers
@@ -412,6 +438,11 @@ CONFIG_MTD_CFI_UTIL=y
412# CONFIG_MTD_NAND is not set 438# CONFIG_MTD_NAND is not set
413 439
414# 440#
441# OneNAND Flash Device Drivers
442#
443# CONFIG_MTD_ONENAND is not set
444
445#
415# Parallel port support 446# Parallel port support
416# 447#
417# CONFIG_PARPORT is not set 448# CONFIG_PARPORT is not set
@@ -438,16 +469,7 @@ CONFIG_BLK_DEV_RAM=y
438CONFIG_BLK_DEV_RAM_COUNT=16 469CONFIG_BLK_DEV_RAM_COUNT=16
439CONFIG_BLK_DEV_RAM_SIZE=8192 470CONFIG_BLK_DEV_RAM_SIZE=8192
440CONFIG_BLK_DEV_INITRD=y 471CONFIG_BLK_DEV_INITRD=y
441# CONFIG_LBD is not set
442# CONFIG_CDROM_PKTCDVD is not set 472# 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 473# CONFIG_ATA_OVER_ETH is not set
452 474
453# 475#
@@ -556,7 +578,6 @@ CONFIG_TUN=m
556# PHY device support 578# PHY device support
557# 579#
558CONFIG_PHYLIB=m 580CONFIG_PHYLIB=m
559CONFIG_PHYCONTROL=y
560 581
561# 582#
562# MII PHY device drivers 583# MII PHY device drivers
@@ -574,6 +595,7 @@ CONFIG_NET_ETHERNET=y
574# CONFIG_MII is not set 595# CONFIG_MII is not set
575# CONFIG_HAPPYMEAL is not set 596# CONFIG_HAPPYMEAL is not set
576# CONFIG_SUNGEM is not set 597# CONFIG_SUNGEM is not set
598# CONFIG_CASSINI is not set
577# CONFIG_NET_VENDOR_3COM is not set 599# CONFIG_NET_VENDOR_3COM is not set
578# CONFIG_NET_VENDOR_SMC is not set 600# CONFIG_NET_VENDOR_SMC is not set
579# CONFIG_NET_VENDOR_RACAL is not set 601# CONFIG_NET_VENDOR_RACAL is not set
@@ -619,7 +641,6 @@ CONFIG_NET_PCI=y
619# CONFIG_TLAN is not set 641# CONFIG_TLAN is not set
620# CONFIG_VIA_RHINE is not set 642# CONFIG_VIA_RHINE is not set
621# CONFIG_LAN_SAA9730 is not set 643# CONFIG_LAN_SAA9730 is not set
622# CONFIG_NET_POCKET is not set
623 644
624# 645#
625# Ethernet (1000 Mbit) 646# Ethernet (1000 Mbit)
@@ -668,7 +689,6 @@ CONFIG_NET_RADIO=y
668# CONFIG_IPW2100 is not set 689# CONFIG_IPW2100 is not set
669# CONFIG_IPW_DEBUG is not set 690# CONFIG_IPW_DEBUG is not set
670CONFIG_IPW2200=m 691CONFIG_IPW2200=m
671# CONFIG_AIRO is not set
672# CONFIG_HERMES is not set 692# CONFIG_HERMES is not set
673# CONFIG_ATMEL is not set 693# CONFIG_ATMEL is not set
674 694
@@ -692,6 +712,7 @@ CONFIG_PPP_ASYNC=m
692CONFIG_PPP_SYNC_TTY=m 712CONFIG_PPP_SYNC_TTY=m
693CONFIG_PPP_DEFLATE=m 713CONFIG_PPP_DEFLATE=m
694# CONFIG_PPP_BSDCOMP is not set 714# CONFIG_PPP_BSDCOMP is not set
715CONFIG_PPP_MPPE=m
695CONFIG_PPPOE=m 716CONFIG_PPPOE=m
696# CONFIG_SLIP is not set 717# CONFIG_SLIP is not set
697# CONFIG_SHAPER is not set 718# CONFIG_SHAPER is not set
@@ -804,6 +825,7 @@ CONFIG_LEGACY_PTY_COUNT=256
804# TPM devices 825# TPM devices
805# 826#
806# CONFIG_TCG_TPM is not set 827# CONFIG_TCG_TPM is not set
828# CONFIG_TELCLOCK is not set
807 829
808# 830#
809# I2C support 831# I2C support
@@ -847,7 +869,6 @@ CONFIG_FB=y
847CONFIG_FB_CFB_FILLRECT=y 869CONFIG_FB_CFB_FILLRECT=y
848CONFIG_FB_CFB_COPYAREA=y 870CONFIG_FB_CFB_COPYAREA=y
849CONFIG_FB_CFB_IMAGEBLIT=y 871CONFIG_FB_CFB_IMAGEBLIT=y
850CONFIG_FB_SOFT_CURSOR=y
851# CONFIG_FB_MACMODES is not set 872# CONFIG_FB_MACMODES is not set
852# CONFIG_FB_MODE_HELPERS is not set 873# CONFIG_FB_MODE_HELPERS is not set
853# CONFIG_FB_TILEBLITTING is not set 874# CONFIG_FB_TILEBLITTING is not set
@@ -856,6 +877,7 @@ CONFIG_FB_SOFT_CURSOR=y
856# CONFIG_FB_CYBER2000 is not set 877# CONFIG_FB_CYBER2000 is not set
857# CONFIG_FB_ASILIANT is not set 878# CONFIG_FB_ASILIANT is not set
858# CONFIG_FB_IMSTT is not set 879# CONFIG_FB_IMSTT is not set
880# CONFIG_FB_S1D13XXX is not set
859# CONFIG_FB_NVIDIA is not set 881# CONFIG_FB_NVIDIA is not set
860# CONFIG_FB_RIVA is not set 882# CONFIG_FB_RIVA is not set
861# CONFIG_FB_MATROX is not set 883# CONFIG_FB_MATROX is not set
@@ -876,7 +898,6 @@ CONFIG_FB_ATY_CT=y
876# CONFIG_FB_SMIVGX is not set 898# CONFIG_FB_SMIVGX is not set
877# CONFIG_FB_CYBLA is not set 899# CONFIG_FB_CYBLA is not set
878# CONFIG_FB_TRIDENT is not set 900# CONFIG_FB_TRIDENT is not set
879# CONFIG_FB_S1D13XXX is not set
880# CONFIG_FB_VIRTUAL is not set 901# CONFIG_FB_VIRTUAL is not set
881 902
882# 903#
@@ -926,12 +947,15 @@ CONFIG_USB=y
926# 947#
927# USB Device Class drivers 948# USB Device Class drivers
928# 949#
929# CONFIG_USB_BLUETOOTH_TTY is not set
930# CONFIG_USB_ACM is not set 950# CONFIG_USB_ACM is not set
931# CONFIG_USB_PRINTER is not set 951# CONFIG_USB_PRINTER is not set
932 952
933# 953#
934# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 954# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
955#
956
957#
958# may also be needed; see USB_STORAGE Help for more information
935# 959#
936# CONFIG_USB_STORAGE is not set 960# CONFIG_USB_STORAGE is not set
937 961
@@ -1106,6 +1130,7 @@ CONFIG_RELAYFS_FS=m
1106CONFIG_JFFS2_FS=y 1130CONFIG_JFFS2_FS=y
1107CONFIG_JFFS2_FS_DEBUG=0 1131CONFIG_JFFS2_FS_DEBUG=0
1108CONFIG_JFFS2_FS_WRITEBUFFER=y 1132CONFIG_JFFS2_FS_WRITEBUFFER=y
1133# CONFIG_JFFS2_SUMMARY is not set
1109# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 1134# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1110CONFIG_JFFS2_ZLIB=y 1135CONFIG_JFFS2_ZLIB=y
1111CONFIG_JFFS2_RTIME=y 1136CONFIG_JFFS2_RTIME=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 988a05824f..abf6109593 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -1,64 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:03 2005 4# Thu Nov 24 01:07:06 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23CONFIG_POSIX_MQUEUE=y
24CONFIG_BSD_PROCESS_ACCT=y
25# CONFIG_BSD_PROCESS_ACCT_V3 is not set
26CONFIG_SYSCTL=y
27# CONFIG_AUDIT is not set
28CONFIG_HOTPLUG=y
29CONFIG_KOBJECT_UEVENT=y
30CONFIG_IKCONFIG=y
31CONFIG_IKCONFIG_PROC=y
32CONFIG_INITRAMFS_SOURCE=""
33CONFIG_EMBEDDED=y
34CONFIG_KALLSYMS=y
35# CONFIG_KALLSYMS_EXTRA_PASS is not set
36CONFIG_PRINTK=y
37CONFIG_BUG=y
38CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y
40CONFIG_EPOLL=y
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SHMEM=y
43CONFIG_CC_ALIGN_FUNCTIONS=0
44CONFIG_CC_ALIGN_LABELS=0
45CONFIG_CC_ALIGN_LOOPS=0
46CONFIG_CC_ALIGN_JUMPS=0
47# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0
49
50#
51# Loadable module support
52#
53CONFIG_MODULES=y
54CONFIG_MODULE_UNLOAD=y
55# CONFIG_MODULE_FORCE_UNLOAD is not set
56CONFIG_OBSOLETE_MODPARM=y
57CONFIG_MODVERSIONS=y
58# CONFIG_MODULE_SRCVERSION_ALL is not set
59CONFIG_KMOD=y
60
61#
62# Machine selection 9# Machine selection
63# 10#
64# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -177,7 +124,6 @@ CONFIG_PAGE_SIZE_4KB=y
177# CONFIG_64BIT_PHYS_ADDR is not set 124# CONFIG_64BIT_PHYS_ADDR is not set
178# CONFIG_CPU_ADVANCED is not set 125# CONFIG_CPU_ADVANCED is not set
179CONFIG_CPU_HAS_LLSC=y 126CONFIG_CPU_HAS_LLSC=y
180CONFIG_CPU_HAS_LLDSCD=y
181CONFIG_CPU_HAS_SYNC=y 127CONFIG_CPU_HAS_SYNC=y
182CONFIG_GENERIC_HARDIRQS=y 128CONFIG_GENERIC_HARDIRQS=y
183CONFIG_GENERIC_IRQ_PROBE=y 129CONFIG_GENERIC_IRQ_PROBE=y
@@ -190,11 +136,83 @@ CONFIG_FLATMEM_MANUAL=y
190CONFIG_FLATMEM=y 136CONFIG_FLATMEM=y
191CONFIG_FLAT_NODE_MEM_MAP=y 137CONFIG_FLAT_NODE_MEM_MAP=y
192# CONFIG_SPARSEMEM_STATIC is not set 138# CONFIG_SPARSEMEM_STATIC is not set
139CONFIG_SPLIT_PTLOCK_CPUS=4
193# CONFIG_PREEMPT_NONE is not set 140# CONFIG_PREEMPT_NONE is not set
194CONFIG_PREEMPT_VOLUNTARY=y 141CONFIG_PREEMPT_VOLUNTARY=y
195# CONFIG_PREEMPT is not set 142# CONFIG_PREEMPT is not set
196 143
197# 144#
145# Code maturity level options
146#
147CONFIG_EXPERIMENTAL=y
148CONFIG_CLEAN_COMPILE=y
149CONFIG_BROKEN_ON_SMP=y
150CONFIG_INIT_ENV_ARG_LIMIT=32
151
152#
153# General setup
154#
155CONFIG_LOCALVERSION=""
156CONFIG_LOCALVERSION_AUTO=y
157CONFIG_SWAP=y
158CONFIG_SYSVIPC=y
159CONFIG_POSIX_MQUEUE=y
160CONFIG_BSD_PROCESS_ACCT=y
161# CONFIG_BSD_PROCESS_ACCT_V3 is not set
162CONFIG_SYSCTL=y
163# CONFIG_AUDIT is not set
164CONFIG_HOTPLUG=y
165CONFIG_KOBJECT_UEVENT=y
166CONFIG_IKCONFIG=y
167CONFIG_IKCONFIG_PROC=y
168CONFIG_INITRAMFS_SOURCE=""
169CONFIG_EMBEDDED=y
170CONFIG_KALLSYMS=y
171# CONFIG_KALLSYMS_EXTRA_PASS is not set
172CONFIG_PRINTK=y
173CONFIG_BUG=y
174CONFIG_BASE_FULL=y
175CONFIG_FUTEX=y
176CONFIG_EPOLL=y
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
178CONFIG_SHMEM=y
179CONFIG_CC_ALIGN_FUNCTIONS=0
180CONFIG_CC_ALIGN_LABELS=0
181CONFIG_CC_ALIGN_LOOPS=0
182CONFIG_CC_ALIGN_JUMPS=0
183# CONFIG_TINY_SHMEM is not set
184CONFIG_BASE_SMALL=0
185
186#
187# Loadable module support
188#
189CONFIG_MODULES=y
190CONFIG_MODULE_UNLOAD=y
191# CONFIG_MODULE_FORCE_UNLOAD is not set
192CONFIG_OBSOLETE_MODPARM=y
193CONFIG_MODVERSIONS=y
194# CONFIG_MODULE_SRCVERSION_ALL is not set
195CONFIG_KMOD=y
196
197#
198# Block layer
199#
200# CONFIG_LBD is not set
201
202#
203# IO Schedulers
204#
205CONFIG_IOSCHED_NOOP=y
206CONFIG_IOSCHED_AS=y
207CONFIG_IOSCHED_DEADLINE=y
208CONFIG_IOSCHED_CFQ=y
209CONFIG_DEFAULT_AS=y
210# CONFIG_DEFAULT_DEADLINE is not set
211# CONFIG_DEFAULT_CFQ is not set
212# CONFIG_DEFAULT_NOOP is not set
213CONFIG_DEFAULT_IOSCHED="anticipatory"
214
215#
198# Bus options (PCI, PCMCIA, EISA, ISA, TC) 216# Bus options (PCI, PCMCIA, EISA, ISA, TC)
199# 217#
200CONFIG_HW_HAS_EISA=y 218CONFIG_HW_HAS_EISA=y
@@ -272,6 +290,10 @@ CONFIG_IPV6_TUNNEL=m
272CONFIG_NETFILTER=y 290CONFIG_NETFILTER=y
273# CONFIG_NETFILTER_DEBUG is not set 291# CONFIG_NETFILTER_DEBUG is not set
274CONFIG_BRIDGE_NETFILTER=y 292CONFIG_BRIDGE_NETFILTER=y
293
294#
295# Core Netfilter Configuration
296#
275CONFIG_NETFILTER_NETLINK=m 297CONFIG_NETFILTER_NETLINK=m
276CONFIG_NETFILTER_NETLINK_QUEUE=m 298CONFIG_NETFILTER_NETLINK_QUEUE=m
277CONFIG_NETFILTER_NETLINK_LOG=m 299CONFIG_NETFILTER_NETLINK_LOG=m
@@ -325,6 +347,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
325CONFIG_IP_NF_TARGET_LOG=m 347CONFIG_IP_NF_TARGET_LOG=m
326CONFIG_IP_NF_TARGET_ULOG=m 348CONFIG_IP_NF_TARGET_ULOG=m
327CONFIG_IP_NF_TARGET_TCPMSS=m 349CONFIG_IP_NF_TARGET_TCPMSS=m
350CONFIG_IP_NF_TARGET_NFQUEUE=m
328CONFIG_IP_NF_NAT=m 351CONFIG_IP_NF_NAT=m
329CONFIG_IP_NF_NAT_NEEDED=y 352CONFIG_IP_NF_NAT_NEEDED=y
330CONFIG_IP_NF_TARGET_MASQUERADE=m 353CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -374,6 +397,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
374CONFIG_IP6_NF_FILTER=m 397CONFIG_IP6_NF_FILTER=m
375CONFIG_IP6_NF_TARGET_LOG=m 398CONFIG_IP6_NF_TARGET_LOG=m
376CONFIG_IP6_NF_TARGET_REJECT=m 399CONFIG_IP6_NF_TARGET_REJECT=m
400CONFIG_IP6_NF_TARGET_NFQUEUE=m
377CONFIG_IP6_NF_MANGLE=m 401CONFIG_IP6_NF_MANGLE=m
378CONFIG_IP6_NF_TARGET_MARK=m 402CONFIG_IP6_NF_TARGET_MARK=m
379CONFIG_IP6_NF_TARGET_HL=m 403CONFIG_IP6_NF_TARGET_HL=m
@@ -430,10 +454,18 @@ CONFIG_DECNET=m
430# CONFIG_NET_DIVERT is not set 454# CONFIG_NET_DIVERT is not set
431# CONFIG_ECONET is not set 455# CONFIG_ECONET is not set
432# CONFIG_WAN_ROUTER is not set 456# CONFIG_WAN_ROUTER is not set
457
458#
459# QoS and/or fair queueing
460#
433CONFIG_NET_SCHED=y 461CONFIG_NET_SCHED=y
434CONFIG_NET_SCH_CLK_JIFFIES=y 462CONFIG_NET_SCH_CLK_JIFFIES=y
435# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 463# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
436# CONFIG_NET_SCH_CLK_CPU is not set 464# CONFIG_NET_SCH_CLK_CPU is not set
465
466#
467# Queueing/Scheduling
468#
437CONFIG_NET_SCH_CBQ=m 469CONFIG_NET_SCH_CBQ=m
438CONFIG_NET_SCH_HTB=m 470CONFIG_NET_SCH_HTB=m
439CONFIG_NET_SCH_HFSC=m 471CONFIG_NET_SCH_HFSC=m
@@ -446,8 +478,10 @@ CONFIG_NET_SCH_GRED=m
446CONFIG_NET_SCH_DSMARK=m 478CONFIG_NET_SCH_DSMARK=m
447CONFIG_NET_SCH_NETEM=m 479CONFIG_NET_SCH_NETEM=m
448CONFIG_NET_SCH_INGRESS=m 480CONFIG_NET_SCH_INGRESS=m
449CONFIG_NET_QOS=y 481
450CONFIG_NET_ESTIMATOR=y 482#
483# Classification
484#
451CONFIG_NET_CLS=y 485CONFIG_NET_CLS=y
452CONFIG_NET_CLS_BASIC=m 486CONFIG_NET_CLS_BASIC=m
453CONFIG_NET_CLS_TCINDEX=m 487CONFIG_NET_CLS_TCINDEX=m
@@ -456,13 +490,14 @@ CONFIG_NET_CLS_ROUTE=y
456CONFIG_NET_CLS_FW=m 490CONFIG_NET_CLS_FW=m
457CONFIG_NET_CLS_U32=m 491CONFIG_NET_CLS_U32=m
458# CONFIG_CLS_U32_PERF is not set 492# CONFIG_CLS_U32_PERF is not set
459# CONFIG_NET_CLS_IND is not set
460# CONFIG_CLS_U32_MARK is not set 493# CONFIG_CLS_U32_MARK is not set
461CONFIG_NET_CLS_RSVP=m 494CONFIG_NET_CLS_RSVP=m
462CONFIG_NET_CLS_RSVP6=m 495CONFIG_NET_CLS_RSVP6=m
463# CONFIG_NET_EMATCH is not set 496# CONFIG_NET_EMATCH is not set
464# CONFIG_NET_CLS_ACT is not set 497# CONFIG_NET_CLS_ACT is not set
465CONFIG_NET_CLS_POLICE=y 498CONFIG_NET_CLS_POLICE=y
499# CONFIG_NET_CLS_IND is not set
500CONFIG_NET_ESTIMATOR=y
466 501
467# 502#
468# Network testing 503# Network testing
@@ -583,18 +618,9 @@ CONFIG_BLK_DEV_UB=m
583CONFIG_BLK_DEV_RAM=m 618CONFIG_BLK_DEV_RAM=m
584CONFIG_BLK_DEV_RAM_COUNT=16 619CONFIG_BLK_DEV_RAM_COUNT=16
585CONFIG_BLK_DEV_RAM_SIZE=4096 620CONFIG_BLK_DEV_RAM_SIZE=4096
586# CONFIG_LBD is not set
587CONFIG_CDROM_PKTCDVD=m 621CONFIG_CDROM_PKTCDVD=m
588CONFIG_CDROM_PKTCDVD_BUFFERS=8 622CONFIG_CDROM_PKTCDVD_BUFFERS=8
589# CONFIG_CDROM_PKTCDVD_WCACHE is not set 623# 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 624CONFIG_ATA_OVER_ETH=m
599 625
600# 626#
@@ -638,6 +664,7 @@ CONFIG_SCSI_SAS_ATTRS=m
638# 664#
639# SCSI low-level drivers 665# SCSI low-level drivers
640# 666#
667CONFIG_ISCSI_TCP=m
641# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 668# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
642# CONFIG_SCSI_3W_9XXX is not set 669# CONFIG_SCSI_3W_9XXX is not set
643# CONFIG_SCSI_ACARD is not set 670# CONFIG_SCSI_ACARD is not set
@@ -651,6 +678,7 @@ CONFIG_SCSI_SAS_ATTRS=m
651CONFIG_MEGARAID_NEWGEN=y 678CONFIG_MEGARAID_NEWGEN=y
652CONFIG_MEGARAID_MM=m 679CONFIG_MEGARAID_MM=m
653CONFIG_MEGARAID_MAILBOX=m 680CONFIG_MEGARAID_MAILBOX=m
681# CONFIG_MEGARAID_SAS is not set
654# CONFIG_SCSI_SATA is not set 682# CONFIG_SCSI_SATA is not set
655# CONFIG_SCSI_DMX3191D is not set 683# CONFIG_SCSI_DMX3191D is not set
656# CONFIG_SCSI_DTC3280 is not set 684# CONFIG_SCSI_DTC3280 is not set
@@ -723,6 +751,7 @@ CONFIG_DM_MULTIPATH_EMC=m
723# CONFIG_FUSION is not set 751# CONFIG_FUSION is not set
724# CONFIG_FUSION_SPI is not set 752# CONFIG_FUSION_SPI is not set
725# CONFIG_FUSION_FC is not set 753# CONFIG_FUSION_FC is not set
754# CONFIG_FUSION_SAS is not set
726 755
727# 756#
728# IEEE 1394 (FireWire) support 757# IEEE 1394 (FireWire) support
@@ -752,7 +781,6 @@ CONFIG_TUN=m
752# PHY device support 781# PHY device support
753# 782#
754CONFIG_PHYLIB=m 783CONFIG_PHYLIB=m
755CONFIG_PHYCONTROL=y
756 784
757# 785#
758# MII PHY device drivers 786# MII PHY device drivers
@@ -770,6 +798,7 @@ CONFIG_NET_ETHERNET=y
770CONFIG_MII=y 798CONFIG_MII=y
771# CONFIG_HAPPYMEAL is not set 799# CONFIG_HAPPYMEAL is not set
772# CONFIG_SUNGEM is not set 800# CONFIG_SUNGEM is not set
801# CONFIG_CASSINI is not set
773# CONFIG_NET_VENDOR_3COM is not set 802# CONFIG_NET_VENDOR_3COM is not set
774# CONFIG_NET_VENDOR_SMC is not set 803# CONFIG_NET_VENDOR_SMC is not set
775# CONFIG_NET_VENDOR_RACAL is not set 804# CONFIG_NET_VENDOR_RACAL is not set
@@ -984,6 +1013,7 @@ CONFIG_RTC=m
984# TPM devices 1013# TPM devices
985# 1014#
986# CONFIG_TCG_TPM is not set 1015# CONFIG_TCG_TPM is not set
1016# CONFIG_TELCLOCK is not set
987 1017
988# 1018#
989# I2C support 1019# I2C support
@@ -1074,12 +1104,15 @@ CONFIG_USB_UHCI_HCD=m
1074# 1104#
1075# USB Device Class drivers 1105# USB Device Class drivers
1076# 1106#
1077CONFIG_USB_BLUETOOTH_TTY=m
1078CONFIG_USB_ACM=m 1107CONFIG_USB_ACM=m
1079CONFIG_USB_PRINTER=m 1108CONFIG_USB_PRINTER=m
1080 1109
1081# 1110#
1082# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 1111# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1112#
1113
1114#
1115# may also be needed; see USB_STORAGE Help for more information
1083# 1116#
1084CONFIG_USB_STORAGE=m 1117CONFIG_USB_STORAGE=m
1085# CONFIG_USB_STORAGE_DEBUG is not set 1118# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1165,6 +1198,7 @@ CONFIG_USB_USS720=m
1165CONFIG_USB_SERIAL=m 1198CONFIG_USB_SERIAL=m
1166CONFIG_USB_SERIAL_GENERIC=y 1199CONFIG_USB_SERIAL_GENERIC=y
1167CONFIG_USB_SERIAL_AIRPRIME=m 1200CONFIG_USB_SERIAL_AIRPRIME=m
1201CONFIG_USB_SERIAL_ANYDATA=m
1168CONFIG_USB_SERIAL_BELKIN=m 1202CONFIG_USB_SERIAL_BELKIN=m
1169CONFIG_USB_SERIAL_WHITEHEAT=m 1203CONFIG_USB_SERIAL_WHITEHEAT=m
1170CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m 1204CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -1271,7 +1305,7 @@ CONFIG_REISERFS_FS_SECURITY=y
1271CONFIG_FS_POSIX_ACL=y 1305CONFIG_FS_POSIX_ACL=y
1272CONFIG_XFS_FS=m 1306CONFIG_XFS_FS=m
1273CONFIG_XFS_EXPORT=y 1307CONFIG_XFS_EXPORT=y
1274CONFIG_XFS_QUOTA=m 1308CONFIG_XFS_QUOTA=y
1275CONFIG_XFS_SECURITY=y 1309CONFIG_XFS_SECURITY=y
1276# CONFIG_XFS_POSIX_ACL is not set 1310# CONFIG_XFS_POSIX_ACL is not set
1277# CONFIG_XFS_RT is not set 1311# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 4365d9c8c4..52048c9060 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -1,64 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:05 2005 4# Thu Nov 24 01:07:09 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_LOCK_KERNEL=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_CPUSETS=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59CONFIG_STOP_MACHINE=y
60
61#
62# Machine selection 9# Machine selection
63# 10#
64# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -126,8 +73,8 @@ CONFIG_CPU_SB1_PASS_1=y
126# CONFIG_CPU_SB1_PASS_3 is not set 73# CONFIG_CPU_SB1_PASS_3 is not set
127CONFIG_SIBYTE_HAS_LDT=y 74CONFIG_SIBYTE_HAS_LDT=y
128# CONFIG_SIMULATION is not set 75# CONFIG_SIMULATION is not set
129# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set 76# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
130# CONFIG_CONFIG_SB1_CERR_STALL is not set 77# CONFIG_SB1_CERR_STALL is not set
131CONFIG_SIBYTE_CFE=y 78CONFIG_SIBYTE_CFE=y
132# CONFIG_SIBYTE_CFE_CONSOLE is not set 79# CONFIG_SIBYTE_CFE_CONSOLE is not set
133# CONFIG_SIBYTE_BUS_WATCHER is not set 80# CONFIG_SIBYTE_BUS_WATCHER is not set
@@ -186,7 +133,6 @@ CONFIG_CPU_HAS_PREFETCH=y
186# CONFIG_MIPS_MT is not set 133# CONFIG_MIPS_MT is not set
187CONFIG_SB1_PASS_1_WORKAROUNDS=y 134CONFIG_SB1_PASS_1_WORKAROUNDS=y
188CONFIG_CPU_HAS_LLSC=y 135CONFIG_CPU_HAS_LLSC=y
189CONFIG_CPU_HAS_LLDSCD=y
190CONFIG_CPU_HAS_SYNC=y 136CONFIG_CPU_HAS_SYNC=y
191CONFIG_GENERIC_HARDIRQS=y 137CONFIG_GENERIC_HARDIRQS=y
192CONFIG_GENERIC_IRQ_PROBE=y 138CONFIG_GENERIC_IRQ_PROBE=y
@@ -200,6 +146,7 @@ CONFIG_FLATMEM_MANUAL=y
200CONFIG_FLATMEM=y 146CONFIG_FLATMEM=y
201CONFIG_FLAT_NODE_MEM_MAP=y 147CONFIG_FLAT_NODE_MEM_MAP=y
202# CONFIG_SPARSEMEM_STATIC is not set 148# CONFIG_SPARSEMEM_STATIC is not set
149CONFIG_SPLIT_PTLOCK_CPUS=4
203CONFIG_SMP=y 150CONFIG_SMP=y
204CONFIG_NR_CPUS=2 151CONFIG_NR_CPUS=2
205CONFIG_PREEMPT_NONE=y 152CONFIG_PREEMPT_NONE=y
@@ -208,6 +155,76 @@ CONFIG_PREEMPT_NONE=y
208CONFIG_PREEMPT_BKL=y 155CONFIG_PREEMPT_BKL=y
209 156
210# 157#
158# Code maturity level options
159#
160CONFIG_EXPERIMENTAL=y
161CONFIG_CLEAN_COMPILE=y
162CONFIG_LOCK_KERNEL=y
163CONFIG_INIT_ENV_ARG_LIMIT=32
164
165#
166# General setup
167#
168CONFIG_LOCALVERSION=""
169CONFIG_LOCALVERSION_AUTO=y
170CONFIG_SWAP=y
171CONFIG_SYSVIPC=y
172# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y
175# CONFIG_AUDIT is not set
176CONFIG_HOTPLUG=y
177CONFIG_KOBJECT_UEVENT=y
178# CONFIG_IKCONFIG is not set
179CONFIG_CPUSETS=y
180CONFIG_INITRAMFS_SOURCE=""
181CONFIG_EMBEDDED=y
182CONFIG_KALLSYMS=y
183# CONFIG_KALLSYMS_EXTRA_PASS is not set
184CONFIG_PRINTK=y
185CONFIG_BUG=y
186CONFIG_BASE_FULL=y
187CONFIG_FUTEX=y
188CONFIG_EPOLL=y
189# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
190CONFIG_SHMEM=y
191CONFIG_CC_ALIGN_FUNCTIONS=0
192CONFIG_CC_ALIGN_LABELS=0
193CONFIG_CC_ALIGN_LOOPS=0
194CONFIG_CC_ALIGN_JUMPS=0
195# CONFIG_TINY_SHMEM is not set
196CONFIG_BASE_SMALL=0
197
198#
199# Loadable module support
200#
201CONFIG_MODULES=y
202CONFIG_MODULE_UNLOAD=y
203# CONFIG_MODULE_FORCE_UNLOAD is not set
204CONFIG_OBSOLETE_MODPARM=y
205CONFIG_MODVERSIONS=y
206CONFIG_MODULE_SRCVERSION_ALL=y
207CONFIG_KMOD=y
208CONFIG_STOP_MACHINE=y
209
210#
211# Block layer
212#
213
214#
215# IO Schedulers
216#
217CONFIG_IOSCHED_NOOP=y
218CONFIG_IOSCHED_AS=y
219CONFIG_IOSCHED_DEADLINE=y
220CONFIG_IOSCHED_CFQ=y
221CONFIG_DEFAULT_AS=y
222# CONFIG_DEFAULT_DEADLINE is not set
223# CONFIG_DEFAULT_CFQ is not set
224# CONFIG_DEFAULT_NOOP is not set
225CONFIG_DEFAULT_IOSCHED="anticipatory"
226
227#
211# Bus options (PCI, PCMCIA, EISA, ISA, TC) 228# Bus options (PCI, PCMCIA, EISA, ISA, TC)
212# 229#
213CONFIG_HW_HAS_PCI=y 230CONFIG_HW_HAS_PCI=y
@@ -295,8 +312,11 @@ CONFIG_TCP_CONG_BIC=y
295# CONFIG_NET_DIVERT is not set 312# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 313# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 314# CONFIG_WAN_ROUTER is not set
315
316#
317# QoS and/or fair queueing
318#
298# CONFIG_NET_SCHED is not set 319# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set
300 320
301# 321#
302# Network testing 322# Network testing
@@ -359,14 +379,6 @@ CONFIG_BLK_DEV_INITRD=y
359CONFIG_CDROM_PKTCDVD=m 379CONFIG_CDROM_PKTCDVD=m
360CONFIG_CDROM_PKTCDVD_BUFFERS=8 380CONFIG_CDROM_PKTCDVD_BUFFERS=8
361# CONFIG_CDROM_PKTCDVD_WCACHE is not set 381# 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 382CONFIG_ATA_OVER_ETH=m
371 383
372# 384#
@@ -441,7 +453,6 @@ CONFIG_NETDEVICES=y
441# PHY device support 453# PHY device support
442# 454#
443CONFIG_PHYLIB=m 455CONFIG_PHYLIB=m
444CONFIG_PHYCONTROL=y
445 456
446# 457#
447# MII PHY device drivers 458# MII PHY device drivers
@@ -459,6 +470,7 @@ CONFIG_NET_ETHERNET=y
459CONFIG_MII=y 470CONFIG_MII=y
460# CONFIG_HAPPYMEAL is not set 471# CONFIG_HAPPYMEAL is not set
461# CONFIG_SUNGEM is not set 472# CONFIG_SUNGEM is not set
473# CONFIG_CASSINI is not set
462# CONFIG_NET_VENDOR_3COM is not set 474# CONFIG_NET_VENDOR_3COM is not set
463 475
464# 476#
@@ -599,6 +611,7 @@ CONFIG_LEGACY_PTY_COUNT=256
599# TPM devices 611# TPM devices
600# 612#
601# CONFIG_TCG_TPM is not set 613# CONFIG_TCG_TPM is not set
614# CONFIG_TELCLOCK is not set
602 615
603# 616#
604# I2C support 617# I2C support
@@ -652,6 +665,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
652# CONFIG_USB is not set 665# CONFIG_USB is not set
653 666
654# 667#
668# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
669#
670
671#
655# USB Gadget Support 672# USB Gadget Support
656# 673#
657# CONFIG_USB_GADGET is not set 674# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index d835f6db1f..41dd708249 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -1,53 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:07 2005 4# Thu Nov 24 01:07:10 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21# CONFIG_SWAP is not set
22CONFIG_SYSVIPC=y
23# CONFIG_BSD_PROCESS_ACCT is not set
24CONFIG_SYSCTL=y
25# CONFIG_HOTPLUG is not set
26# CONFIG_IKCONFIG is not set
27CONFIG_INITRAMFS_SOURCE=""
28CONFIG_EMBEDDED=y
29CONFIG_KALLSYMS=y
30# CONFIG_KALLSYMS_EXTRA_PASS is not set
31CONFIG_PRINTK=y
32CONFIG_BUG=y
33CONFIG_BASE_FULL=y
34CONFIG_FUTEX=y
35CONFIG_EPOLL=y
36# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
37CONFIG_SHMEM=y
38CONFIG_CC_ALIGN_FUNCTIONS=0
39CONFIG_CC_ALIGN_LABELS=0
40CONFIG_CC_ALIGN_LOOPS=0
41CONFIG_CC_ALIGN_JUMPS=0
42# CONFIG_TINY_SHMEM is not set
43CONFIG_BASE_SMALL=0
44
45#
46# Loadable module support
47#
48# CONFIG_MODULES is not set
49
50#
51# Machine selection 9# Machine selection
52# 10#
53# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -173,11 +131,72 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 131CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 132CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 133# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 135CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 136# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
179 138
180# 139#
140# Code maturity level options
141#
142CONFIG_EXPERIMENTAL=y
143CONFIG_CLEAN_COMPILE=y
144CONFIG_BROKEN_ON_SMP=y
145CONFIG_INIT_ENV_ARG_LIMIT=32
146
147#
148# General setup
149#
150CONFIG_LOCALVERSION=""
151CONFIG_LOCALVERSION_AUTO=y
152# CONFIG_SWAP is not set
153CONFIG_SYSVIPC=y
154# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y
156# CONFIG_HOTPLUG is not set
157# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE=""
159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_PRINTK=y
163CONFIG_BUG=y
164CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y
166CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0
173# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0
175
176#
177# Loadable module support
178#
179# CONFIG_MODULES is not set
180
181#
182# Block layer
183#
184# CONFIG_LBD is not set
185
186#
187# IO Schedulers
188#
189CONFIG_IOSCHED_NOOP=y
190CONFIG_IOSCHED_AS=y
191CONFIG_IOSCHED_DEADLINE=y
192CONFIG_IOSCHED_CFQ=y
193CONFIG_DEFAULT_AS=y
194# CONFIG_DEFAULT_DEADLINE is not set
195# CONFIG_DEFAULT_CFQ is not set
196# CONFIG_DEFAULT_NOOP is not set
197CONFIG_DEFAULT_IOSCHED="anticipatory"
198
199#
181# Bus options (PCI, PCMCIA, EISA, ISA, TC) 200# Bus options (PCI, PCMCIA, EISA, ISA, TC)
182# 201#
183CONFIG_MMU=y 202CONFIG_MMU=y
@@ -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,8 @@ CONFIG_LEGACY_PTY_COUNT=256
353# 363#
354# TPM devices 364# TPM devices
355# 365#
366# CONFIG_TCG_TPM is not set
367# CONFIG_TELCLOCK is not set
356 368
357# 369#
358# I2C support 370# I2C support
@@ -404,6 +416,10 @@ CONFIG_LEGACY_PTY_COUNT=256
404# CONFIG_USB_ARCH_HAS_OHCI is not set 416# CONFIG_USB_ARCH_HAS_OHCI is not set
405 417
406# 418#
419# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
420#
421
422#
407# USB Gadget Support 423# USB Gadget Support
408# 424#
409# CONFIG_USB_GADGET is not set 425# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index bf60a17de2..83969466ec 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:10 2005 4# Thu Nov 24 01:07:12 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -183,11 +132,81 @@ CONFIG_FLATMEM_MANUAL=y
183CONFIG_FLATMEM=y 132CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y 133CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_PREEMPT_NONE=y 136CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 137# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
189 139
190# 140#
141# Code maturity level options
142#
143CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32
147
148#
149# General setup
150#
151CONFIG_LOCALVERSION=""
152CONFIG_LOCALVERSION_AUTO=y
153CONFIG_SWAP=y
154CONFIG_SYSVIPC=y
155# CONFIG_POSIX_MQUEUE is not set
156# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set
159# CONFIG_HOTPLUG is not set
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE=""
163CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_EXTRA_PASS is not set
166CONFIG_PRINTK=y
167CONFIG_BUG=y
168CONFIG_BASE_FULL=y
169CONFIG_FUTEX=y
170CONFIG_EPOLL=y
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
172CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0
177# CONFIG_TINY_SHMEM is not set
178CONFIG_BASE_SMALL=0
179
180#
181# Loadable module support
182#
183CONFIG_MODULES=y
184CONFIG_MODULE_UNLOAD=y
185# CONFIG_MODULE_FORCE_UNLOAD is not set
186CONFIG_OBSOLETE_MODPARM=y
187CONFIG_MODVERSIONS=y
188CONFIG_MODULE_SRCVERSION_ALL=y
189CONFIG_KMOD=y
190
191#
192# Block layer
193#
194# CONFIG_LBD is not set
195
196#
197# IO Schedulers
198#
199CONFIG_IOSCHED_NOOP=y
200CONFIG_IOSCHED_AS=y
201CONFIG_IOSCHED_DEADLINE=y
202CONFIG_IOSCHED_CFQ=y
203CONFIG_DEFAULT_AS=y
204# CONFIG_DEFAULT_DEADLINE is not set
205# CONFIG_DEFAULT_CFQ is not set
206# CONFIG_DEFAULT_NOOP is not set
207CONFIG_DEFAULT_IOSCHED="anticipatory"
208
209#
191# Bus options (PCI, PCMCIA, EISA, ISA, TC) 210# Bus options (PCI, PCMCIA, EISA, ISA, TC)
192# 211#
193CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
@@ -277,8 +296,11 @@ 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
282 304
283# 305#
284# Network testing 306# Network testing
@@ -339,16 +361,7 @@ CONFIG_BLK_DEV_NBD=m
339CONFIG_BLK_DEV_RAM=m 361CONFIG_BLK_DEV_RAM=m
340CONFIG_BLK_DEV_RAM_COUNT=16 362CONFIG_BLK_DEV_RAM_COUNT=16
341CONFIG_BLK_DEV_RAM_SIZE=4096 363CONFIG_BLK_DEV_RAM_SIZE=4096
342# CONFIG_LBD is not set
343# CONFIG_CDROM_PKTCDVD is not set 364# 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 365CONFIG_ATA_OVER_ETH=m
353 366
354# 367#
@@ -385,12 +398,13 @@ CONFIG_SCSI_MULTI_LUN=y
385# 398#
386# CONFIG_SCSI_SPI_ATTRS is not set 399# CONFIG_SCSI_SPI_ATTRS is not set
387# CONFIG_SCSI_FC_ATTRS is not set 400# CONFIG_SCSI_FC_ATTRS is not set
388# CONFIG_SCSI_ISCSI_ATTRS is not set 401CONFIG_SCSI_ISCSI_ATTRS=m
389# CONFIG_SCSI_SAS_ATTRS is not set 402# CONFIG_SCSI_SAS_ATTRS is not set
390 403
391# 404#
392# SCSI low-level drivers 405# SCSI low-level drivers
393# 406#
407CONFIG_ISCSI_TCP=m
394# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 408# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
395# CONFIG_SCSI_3W_9XXX is not set 409# CONFIG_SCSI_3W_9XXX is not set
396# CONFIG_SCSI_ACARD is not set 410# CONFIG_SCSI_ACARD is not set
@@ -401,6 +415,7 @@ CONFIG_SCSI_MULTI_LUN=y
401# CONFIG_SCSI_DPT_I2O is not set 415# CONFIG_SCSI_DPT_I2O is not set
402# CONFIG_MEGARAID_NEWGEN is not set 416# CONFIG_MEGARAID_NEWGEN is not set
403# CONFIG_MEGARAID_LEGACY is not set 417# CONFIG_MEGARAID_LEGACY is not set
418# CONFIG_MEGARAID_SAS is not set
404# CONFIG_SCSI_SATA is not set 419# CONFIG_SCSI_SATA is not set
405# CONFIG_SCSI_DMX3191D is not set 420# CONFIG_SCSI_DMX3191D is not set
406# CONFIG_SCSI_FUTURE_DOMAIN is not set 421# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -435,6 +450,7 @@ CONFIG_SCSI_QLA2XXX=y
435# CONFIG_FUSION is not set 450# CONFIG_FUSION is not set
436# CONFIG_FUSION_SPI is not set 451# CONFIG_FUSION_SPI is not set
437# CONFIG_FUSION_FC is not set 452# CONFIG_FUSION_FC is not set
453# CONFIG_FUSION_SAS is not set
438 454
439# 455#
440# IEEE 1394 (FireWire) support 456# IEEE 1394 (FireWire) support
@@ -464,7 +480,6 @@ CONFIG_NETDEVICES=y
464# PHY device support 480# PHY device support
465# 481#
466CONFIG_PHYLIB=m 482CONFIG_PHYLIB=m
467CONFIG_PHYCONTROL=y
468 483
469# 484#
470# MII PHY device drivers 485# MII PHY device drivers
@@ -482,6 +497,7 @@ CONFIG_NET_ETHERNET=y
482CONFIG_MII=y 497CONFIG_MII=y
483# CONFIG_HAPPYMEAL is not set 498# CONFIG_HAPPYMEAL is not set
484# CONFIG_SUNGEM is not set 499# CONFIG_SUNGEM is not set
500# CONFIG_CASSINI is not set
485# CONFIG_NET_VENDOR_3COM is not set 501# CONFIG_NET_VENDOR_3COM is not set
486 502
487# 503#
@@ -634,6 +650,7 @@ CONFIG_LEGACY_PTY_COUNT=256
634# CONFIG_WATCHDOG is not set 650# CONFIG_WATCHDOG is not set
635# CONFIG_RTC is not set 651# CONFIG_RTC is not set
636# CONFIG_GEN_RTC is not set 652# CONFIG_GEN_RTC is not set
653# CONFIG_RTC_VR41XX is not set
637# CONFIG_DTLK is not set 654# CONFIG_DTLK is not set
638# CONFIG_R3964 is not set 655# CONFIG_R3964 is not set
639# CONFIG_APPLICOM is not set 656# CONFIG_APPLICOM is not set
@@ -650,6 +667,7 @@ CONFIG_GPIO_VR41XX=y
650# TPM devices 667# TPM devices
651# 668#
652# CONFIG_TCG_TPM is not set 669# CONFIG_TCG_TPM is not set
670# CONFIG_TELCLOCK is not set
653 671
654# 672#
655# I2C support 673# I2C support
@@ -733,12 +751,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
733# 751#
734# USB Device Class drivers 752# USB Device Class drivers
735# 753#
736# CONFIG_USB_BLUETOOTH_TTY is not set
737# CONFIG_USB_ACM is not set 754# CONFIG_USB_ACM is not set
738# CONFIG_USB_PRINTER is not set 755# CONFIG_USB_PRINTER is not set
739 756
740# 757#
741# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 758# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
759#
760
761#
762# may also be needed; see USB_STORAGE Help for more information
742# 763#
743CONFIG_USB_STORAGE=m 764CONFIG_USB_STORAGE=m
744# CONFIG_USB_STORAGE_DEBUG is not set 765# CONFIG_USB_STORAGE_DEBUG is not set
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index ac8b64e87b..ce7b9ed444 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:13 2005 4# Thu Nov 24 01:07:15 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -183,11 +132,81 @@ CONFIG_FLATMEM_MANUAL=y
183CONFIG_FLATMEM=y 132CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y 133CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set 134# CONFIG_SPARSEMEM_STATIC is not set
135CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_PREEMPT_NONE=y 136CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 137# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
189 139
190# 140#
141# Code maturity level options
142#
143CONFIG_EXPERIMENTAL=y
144CONFIG_CLEAN_COMPILE=y
145CONFIG_BROKEN_ON_SMP=y
146CONFIG_INIT_ENV_ARG_LIMIT=32
147
148#
149# General setup
150#
151CONFIG_LOCALVERSION=""
152CONFIG_LOCALVERSION_AUTO=y
153CONFIG_SWAP=y
154CONFIG_SYSVIPC=y
155# CONFIG_POSIX_MQUEUE is not set
156# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set
159CONFIG_HOTPLUG=y
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE=""
163CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_EXTRA_PASS is not set
166CONFIG_PRINTK=y
167CONFIG_BUG=y
168CONFIG_BASE_FULL=y
169CONFIG_FUTEX=y
170CONFIG_EPOLL=y
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
172CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0
177# CONFIG_TINY_SHMEM is not set
178CONFIG_BASE_SMALL=0
179
180#
181# Loadable module support
182#
183CONFIG_MODULES=y
184CONFIG_MODULE_UNLOAD=y
185# CONFIG_MODULE_FORCE_UNLOAD is not set
186CONFIG_OBSOLETE_MODPARM=y
187CONFIG_MODVERSIONS=y
188CONFIG_MODULE_SRCVERSION_ALL=y
189CONFIG_KMOD=y
190
191#
192# Block layer
193#
194# CONFIG_LBD is not set
195
196#
197# IO Schedulers
198#
199CONFIG_IOSCHED_NOOP=y
200CONFIG_IOSCHED_AS=y
201CONFIG_IOSCHED_DEADLINE=y
202CONFIG_IOSCHED_CFQ=y
203CONFIG_DEFAULT_AS=y
204# CONFIG_DEFAULT_DEADLINE is not set
205# CONFIG_DEFAULT_CFQ is not set
206# CONFIG_DEFAULT_NOOP is not set
207CONFIG_DEFAULT_IOSCHED="anticipatory"
208
209#
191# Bus options (PCI, PCMCIA, EISA, ISA, TC) 210# Bus options (PCI, PCMCIA, EISA, ISA, TC)
192# 211#
193CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
@@ -278,8 +297,11 @@ 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
283 305
284# 306#
285# Network testing 307# Network testing
@@ -341,18 +363,9 @@ CONFIG_BLK_DEV_RAM=y
341CONFIG_BLK_DEV_RAM_COUNT=16 363CONFIG_BLK_DEV_RAM_COUNT=16
342CONFIG_BLK_DEV_RAM_SIZE=4096 364CONFIG_BLK_DEV_RAM_SIZE=4096
343# CONFIG_BLK_DEV_INITRD is not set 365# CONFIG_BLK_DEV_INITRD is not set
344# CONFIG_LBD is not set
345CONFIG_CDROM_PKTCDVD=m 366CONFIG_CDROM_PKTCDVD=m
346CONFIG_CDROM_PKTCDVD_BUFFERS=8 367CONFIG_CDROM_PKTCDVD_BUFFERS=8
347# CONFIG_CDROM_PKTCDVD_WCACHE is not set 368# 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 369CONFIG_ATA_OVER_ETH=m
357 370
358# 371#
@@ -404,7 +417,6 @@ CONFIG_DUMMY=m
404# PHY device support 417# PHY device support
405# 418#
406CONFIG_PHYLIB=m 419CONFIG_PHYLIB=m
407CONFIG_PHYCONTROL=y
408 420
409# 421#
410# MII PHY device drivers 422# MII PHY device drivers
@@ -422,6 +434,7 @@ CONFIG_NET_ETHERNET=y
422CONFIG_MII=y 434CONFIG_MII=y
423# CONFIG_HAPPYMEAL is not set 435# CONFIG_HAPPYMEAL is not set
424# CONFIG_SUNGEM is not set 436# CONFIG_SUNGEM is not set
437# CONFIG_CASSINI is not set
425# CONFIG_NET_VENDOR_3COM is not set 438# CONFIG_NET_VENDOR_3COM is not set
426 439
427# 440#
@@ -504,6 +517,7 @@ CONFIG_PPP_ASYNC=m
504CONFIG_PPP_SYNC_TTY=m 517CONFIG_PPP_SYNC_TTY=m
505CONFIG_PPP_DEFLATE=m 518CONFIG_PPP_DEFLATE=m
506CONFIG_PPP_BSDCOMP=m 519CONFIG_PPP_BSDCOMP=m
520CONFIG_PPP_MPPE=m
507CONFIG_PPPOE=m 521CONFIG_PPPOE=m
508CONFIG_SLIP=m 522CONFIG_SLIP=m
509CONFIG_SLIP_COMPRESSED=y 523CONFIG_SLIP_COMPRESSED=y
@@ -589,6 +603,7 @@ CONFIG_LEGACY_PTY_COUNT=256
589# CONFIG_WATCHDOG is not set 603# CONFIG_WATCHDOG is not set
590# CONFIG_RTC is not set 604# CONFIG_RTC is not set
591# CONFIG_GEN_RTC is not set 605# CONFIG_GEN_RTC is not set
606# CONFIG_RTC_VR41XX is not set
592# CONFIG_DTLK is not set 607# CONFIG_DTLK is not set
593# CONFIG_R3964 is not set 608# CONFIG_R3964 is not set
594# CONFIG_APPLICOM is not set 609# CONFIG_APPLICOM is not set
@@ -605,6 +620,7 @@ CONFIG_GPIO_VR41XX=y
605# TPM devices 620# TPM devices
606# 621#
607# CONFIG_TCG_TPM is not set 622# CONFIG_TCG_TPM is not set
623# CONFIG_TELCLOCK is not set
608 624
609# 625#
610# I2C support 626# I2C support
@@ -688,12 +704,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
688# 704#
689# USB Device Class drivers 705# USB Device Class drivers
690# 706#
691# CONFIG_USB_BLUETOOTH_TTY is not set
692# CONFIG_USB_ACM is not set 707# CONFIG_USB_ACM is not set
693# CONFIG_USB_PRINTER is not set 708# CONFIG_USB_PRINTER is not set
694 709
695# 710#
696# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 711# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
712#
713
714#
715# may also be needed; see USB_STORAGE Help for more information
697# 716#
698# CONFIG_USB_STORAGE is not set 717# CONFIG_USB_STORAGE is not set
699 718
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index ab13621ef3..02b2551023 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,62 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:16 2005 4# Thu Nov 24 01:07:17 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27CONFIG_HOTPLUG=y
28CONFIG_KOBJECT_UEVENT=y
29# CONFIG_IKCONFIG is not set
30CONFIG_INITRAMFS_SOURCE=""
31CONFIG_EMBEDDED=y
32CONFIG_KALLSYMS=y
33# CONFIG_KALLSYMS_EXTRA_PASS is not set
34CONFIG_PRINTK=y
35CONFIG_BUG=y
36CONFIG_BASE_FULL=y
37CONFIG_FUTEX=y
38CONFIG_EPOLL=y
39# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
40CONFIG_SHMEM=y
41CONFIG_CC_ALIGN_FUNCTIONS=0
42CONFIG_CC_ALIGN_LABELS=0
43CONFIG_CC_ALIGN_LOOPS=0
44CONFIG_CC_ALIGN_JUMPS=0
45# CONFIG_TINY_SHMEM is not set
46CONFIG_BASE_SMALL=0
47
48#
49# Loadable module support
50#
51CONFIG_MODULES=y
52CONFIG_MODULE_UNLOAD=y
53# CONFIG_MODULE_FORCE_UNLOAD is not set
54CONFIG_OBSOLETE_MODPARM=y
55CONFIG_MODVERSIONS=y
56CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y
58
59#
60# Machine selection 9# Machine selection
61# 10#
62# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -180,11 +129,81 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 129CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 130CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 131# CONFIG_SPARSEMEM_STATIC is not set
132CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 133CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 134# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 135# CONFIG_PREEMPT is not set
186 136
187# 137#
138# Code maturity level options
139#
140CONFIG_EXPERIMENTAL=y
141CONFIG_CLEAN_COMPILE=y
142CONFIG_BROKEN_ON_SMP=y
143CONFIG_INIT_ENV_ARG_LIMIT=32
144
145#
146# General setup
147#
148CONFIG_LOCALVERSION=""
149CONFIG_LOCALVERSION_AUTO=y
150CONFIG_SWAP=y
151CONFIG_SYSVIPC=y
152# CONFIG_POSIX_MQUEUE is not set
153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE=""
160CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_PRINTK=y
164CONFIG_BUG=y
165CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y
167CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0
174# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0
176
177#
178# Loadable module support
179#
180CONFIG_MODULES=y
181CONFIG_MODULE_UNLOAD=y
182# CONFIG_MODULE_FORCE_UNLOAD is not set
183CONFIG_OBSOLETE_MODPARM=y
184CONFIG_MODVERSIONS=y
185CONFIG_MODULE_SRCVERSION_ALL=y
186CONFIG_KMOD=y
187
188#
189# Block layer
190#
191# CONFIG_LBD is not set
192
193#
194# IO Schedulers
195#
196CONFIG_IOSCHED_NOOP=y
197CONFIG_IOSCHED_AS=y
198CONFIG_IOSCHED_DEADLINE=y
199CONFIG_IOSCHED_CFQ=y
200CONFIG_DEFAULT_AS=y
201# CONFIG_DEFAULT_DEADLINE is not set
202# CONFIG_DEFAULT_CFQ is not set
203# CONFIG_DEFAULT_NOOP is not set
204CONFIG_DEFAULT_IOSCHED="anticipatory"
205
206#
188# Bus options (PCI, PCMCIA, EISA, ISA, TC) 207# Bus options (PCI, PCMCIA, EISA, ISA, TC)
189# 208#
190CONFIG_ISA=y 209CONFIG_ISA=y
@@ -273,8 +292,11 @@ 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
278 300
279# 301#
280# Network testing 302# Network testing
@@ -328,16 +350,7 @@ CONFIG_CONNECTOR=m
328# CONFIG_BLK_DEV_NBD is not set 350# CONFIG_BLK_DEV_NBD is not set
329# CONFIG_BLK_DEV_RAM is not set 351# CONFIG_BLK_DEV_RAM is not set
330CONFIG_BLK_DEV_RAM_COUNT=16 352CONFIG_BLK_DEV_RAM_COUNT=16
331# CONFIG_LBD is not set
332# CONFIG_CDROM_PKTCDVD is not set 353# 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 354CONFIG_ATA_OVER_ETH=m
342 355
343# 356#
@@ -415,7 +428,6 @@ CONFIG_NETDEVICES=y
415# PHY device support 428# PHY device support
416# 429#
417CONFIG_PHYLIB=m 430CONFIG_PHYLIB=m
418CONFIG_PHYCONTROL=y
419 431
420# 432#
421# MII PHY device drivers 433# MII PHY device drivers
@@ -439,7 +451,6 @@ CONFIG_MII=m
439# CONFIG_HP100 is not set 451# CONFIG_HP100 is not set
440# CONFIG_NET_ISA is not set 452# CONFIG_NET_ISA is not set
441# CONFIG_NET_PCI is not set 453# CONFIG_NET_PCI is not set
442# CONFIG_NET_POCKET is not set
443 454
444# 455#
445# Ethernet (1000 Mbit) 456# Ethernet (1000 Mbit)
@@ -577,6 +588,7 @@ CONFIG_WATCHDOG=y
577# CONFIG_WDT is not set 588# CONFIG_WDT is not set
578# CONFIG_RTC is not set 589# CONFIG_RTC is not set
579# CONFIG_GEN_RTC is not set 590# CONFIG_GEN_RTC is not set
591# CONFIG_RTC_VR41XX is not set
580# CONFIG_DTLK is not set 592# CONFIG_DTLK is not set
581# CONFIG_R3964 is not set 593# CONFIG_R3964 is not set
582 594
@@ -588,12 +600,16 @@ CONFIG_WATCHDOG=y
588# PCMCIA character devices 600# PCMCIA character devices
589# 601#
590# CONFIG_SYNCLINK_CS is not set 602# CONFIG_SYNCLINK_CS is not set
603# CONFIG_CARDMAN_4000 is not set
604# CONFIG_CARDMAN_4040 is not set
591# CONFIG_GPIO_VR41XX is not set 605# CONFIG_GPIO_VR41XX is not set
592# CONFIG_RAW_DRIVER is not set 606# CONFIG_RAW_DRIVER is not set
593 607
594# 608#
595# TPM devices 609# TPM devices
596# 610#
611# CONFIG_TCG_TPM is not set
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 5b0b7f30e2..468c2e443d 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:27:18 2005 4# Thu Nov 24 01:07:19 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11# CONFIG_EXPERIMENTAL is not set
12CONFIG_CLEAN_COMPILE=y
13CONFIG_LOCK_KERNEL=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_BSD_PROCESS_ACCT is not set
24CONFIG_SYSCTL=y
25# CONFIG_AUDIT is not set
26CONFIG_HOTPLUG=y
27CONFIG_KOBJECT_UEVENT=y
28CONFIG_IKCONFIG=y
29CONFIG_IKCONFIG_PROC=y
30# CONFIG_CPUSETS is not set
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_ALL is not set
35# CONFIG_KALLSYMS_EXTRA_PASS is not set
36CONFIG_PRINTK=y
37CONFIG_BUG=y
38CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y
40CONFIG_EPOLL=y
41# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
42CONFIG_SHMEM=y
43CONFIG_CC_ALIGN_FUNCTIONS=0
44CONFIG_CC_ALIGN_LABELS=0
45CONFIG_CC_ALIGN_LOOPS=0
46CONFIG_CC_ALIGN_JUMPS=0
47# CONFIG_TINY_SHMEM is not set
48CONFIG_BASE_SMALL=0
49
50#
51# Loadable module support
52#
53CONFIG_MODULES=y
54CONFIG_MODULE_UNLOAD=y
55CONFIG_OBSOLETE_MODPARM=y
56# CONFIG_MODULE_SRCVERSION_ALL is not set
57CONFIG_KMOD=y
58CONFIG_STOP_MACHINE=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -170,7 +118,6 @@ CONFIG_CPU_HAS_PREFETCH=y
170# CONFIG_64BIT_PHYS_ADDR is not set 118# CONFIG_64BIT_PHYS_ADDR is not set
171# CONFIG_CPU_ADVANCED is not set 119# CONFIG_CPU_ADVANCED is not set
172CONFIG_CPU_HAS_LLSC=y 120CONFIG_CPU_HAS_LLSC=y
173CONFIG_CPU_HAS_LLDSCD=y
174CONFIG_CPU_HAS_SYNC=y 121CONFIG_CPU_HAS_SYNC=y
175CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
176CONFIG_GENERIC_IRQ_PROBE=y 123CONFIG_GENERIC_IRQ_PROBE=y
@@ -181,6 +128,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_FLATMEM=y 128CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 129CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 130# CONFIG_SPARSEMEM_STATIC is not set
131CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_SMP=y 132CONFIG_SMP=y
185CONFIG_NR_CPUS=2 133CONFIG_NR_CPUS=2
186CONFIG_PREEMPT_NONE=y 134CONFIG_PREEMPT_NONE=y
@@ -189,6 +137,76 @@ CONFIG_PREEMPT_NONE=y
189CONFIG_PREEMPT_BKL=y 137CONFIG_PREEMPT_BKL=y
190 138
191# 139#
140# Code maturity level options
141#
142# CONFIG_EXPERIMENTAL is not set
143CONFIG_CLEAN_COMPILE=y
144CONFIG_LOCK_KERNEL=y
145CONFIG_INIT_ENV_ARG_LIMIT=32
146
147#
148# General setup
149#
150CONFIG_LOCALVERSION=""
151CONFIG_LOCALVERSION_AUTO=y
152CONFIG_SWAP=y
153CONFIG_SYSVIPC=y
154# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y
156# CONFIG_AUDIT is not set
157CONFIG_HOTPLUG=y
158CONFIG_KOBJECT_UEVENT=y
159CONFIG_IKCONFIG=y
160CONFIG_IKCONFIG_PROC=y
161# CONFIG_CPUSETS is not set
162CONFIG_INITRAMFS_SOURCE=""
163CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_ALL is not set
166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_PRINTK=y
168CONFIG_BUG=y
169CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y
171CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0
178# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0
180
181#
182# Loadable module support
183#
184CONFIG_MODULES=y
185CONFIG_MODULE_UNLOAD=y
186CONFIG_OBSOLETE_MODPARM=y
187# CONFIG_MODULE_SRCVERSION_ALL is not set
188CONFIG_KMOD=y
189CONFIG_STOP_MACHINE=y
190
191#
192# Block layer
193#
194# CONFIG_LBD is not set
195
196#
197# IO Schedulers
198#
199CONFIG_IOSCHED_NOOP=y
200CONFIG_IOSCHED_AS=y
201CONFIG_IOSCHED_DEADLINE=y
202CONFIG_IOSCHED_CFQ=y
203CONFIG_DEFAULT_AS=y
204# CONFIG_DEFAULT_DEADLINE is not set
205# CONFIG_DEFAULT_CFQ is not set
206# CONFIG_DEFAULT_NOOP is not set
207CONFIG_DEFAULT_IOSCHED="anticipatory"
208
209#
192# Bus options (PCI, PCMCIA, EISA, ISA, TC) 210# Bus options (PCI, PCMCIA, EISA, ISA, TC)
193# 211#
194CONFIG_HW_HAS_PCI=y 212CONFIG_HW_HAS_PCI=y
@@ -260,8 +278,11 @@ CONFIG_IPV6_TUNNEL=m
260# CONFIG_LLC2 is not set 278# CONFIG_LLC2 is not set
261# CONFIG_IPX is not set 279# CONFIG_IPX is not set
262# CONFIG_ATALK is not set 280# CONFIG_ATALK is not set
281
282#
283# QoS and/or fair queueing
284#
263# CONFIG_NET_SCHED is not set 285# CONFIG_NET_SCHED is not set
264# CONFIG_NET_CLS_ROUTE is not set
265 286
266# 287#
267# Network testing 288# Network testing
@@ -319,18 +340,9 @@ CONFIG_CONNECTOR=m
319# CONFIG_BLK_DEV_SX8 is not set 340# CONFIG_BLK_DEV_SX8 is not set
320# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=m 343CONFIG_CDROM_PKTCDVD=m
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 344CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 345# 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 346CONFIG_ATA_OVER_ETH=m
335 347
336# 348#
@@ -382,7 +394,6 @@ CONFIG_NETDEVICES=y
382# PHY device support 394# PHY device support
383# 395#
384CONFIG_PHYLIB=m 396CONFIG_PHYLIB=m
385CONFIG_PHYCONTROL=y
386 397
387# 398#
388# MII PHY device drivers 399# MII PHY device drivers
@@ -400,6 +411,7 @@ CONFIG_NET_ETHERNET=y
400CONFIG_MII=y 411CONFIG_MII=y
401# CONFIG_HAPPYMEAL is not set 412# CONFIG_HAPPYMEAL is not set
402# CONFIG_SUNGEM is not set 413# CONFIG_SUNGEM is not set
414# CONFIG_CASSINI is not set
403# CONFIG_NET_VENDOR_3COM is not set 415# CONFIG_NET_VENDOR_3COM is not set
404 416
405# 417#
@@ -576,6 +588,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
576# CONFIG_USB is not set 588# CONFIG_USB is not set
577 589
578# 590#
591# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
592#
593
594#
579# USB Gadget Support 595# USB Gadget Support
580# 596#
581# CONFIG_USB_GADGET is not set 597# CONFIG_USB_GADGET is not set
@@ -690,6 +706,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
690# CONFIG_DEBUG_HIGHMEM is not set 706# CONFIG_DEBUG_HIGHMEM is not set
691# CONFIG_DEBUG_INFO is not set 707# CONFIG_DEBUG_INFO is not set
692# CONFIG_DEBUG_FS is not set 708# CONFIG_DEBUG_FS is not set
709# CONFIG_DEBUG_VM is not set
710# CONFIG_RCU_TORTURE_TEST is not set
693CONFIG_CROSSCOMPILE=y 711CONFIG_CROSSCOMPILE=y
694CONFIG_CMDLINE="" 712CONFIG_CMDLINE=""
695# CONFIG_DEBUG_STACK_USAGE is not set 713# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/ddb5xxx/ddb5477/lcd44780.c b/arch/mips/ddb5xxx/ddb5477/lcd44780.c
index 35c6c22610..9510b9ae64 100644
--- a/arch/mips/ddb5xxx/ddb5477/lcd44780.c
+++ b/arch/mips/ddb5xxx/ddb5477/lcd44780.c
@@ -55,7 +55,7 @@ void lcd44780_data(unsigned char c)
55 55
56void lcd44780_puts(const char* s) 56void lcd44780_puts(const char* s)
57{ 57{
58 int i,j; 58 int j;
59 int pos = 0; 59 int pos = 0;
60 60
61 lcd44780_command(LCD44780_CLEAR); 61 lcd44780_command(LCD44780_CLEAR);
@@ -76,8 +76,12 @@ void lcd44780_puts(const char* s)
76 } 76 }
77 } 77 }
78#ifdef LCD44780_PUTS_PAUSE 78#ifdef LCD44780_PUTS_PAUSE
79 for(i = 1; i < 2000; i++) 79 {
80 lcd44780_wait(); 80 int i;
81
82 for(i = 1; i < 2000; i++)
83 lcd44780_wait();
84 }
81#endif 85#endif
82} 86}
83 87
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 4b585e642c..4f125e9e8e 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,63 +1,11 @@
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-rc2
4# Thu Oct 20 22:25:09 2005 4# Thu Nov 24 01:05:49 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Code maturity level options
10#
11CONFIG_EXPERIMENTAL=y
12CONFIG_CLEAN_COMPILE=y
13CONFIG_BROKEN_ON_SMP=y
14CONFIG_INIT_ENV_ARG_LIMIT=32
15
16#
17# General setup
18#
19CONFIG_LOCALVERSION=""
20CONFIG_LOCALVERSION_AUTO=y
21CONFIG_SWAP=y
22CONFIG_SYSVIPC=y
23# CONFIG_POSIX_MQUEUE is not set
24# CONFIG_BSD_PROCESS_ACCT is not set
25CONFIG_SYSCTL=y
26# CONFIG_AUDIT is not set
27# CONFIG_HOTPLUG is not set
28CONFIG_KOBJECT_UEVENT=y
29CONFIG_IKCONFIG=y
30CONFIG_IKCONFIG_PROC=y
31CONFIG_INITRAMFS_SOURCE=""
32CONFIG_EMBEDDED=y
33CONFIG_KALLSYMS=y
34# CONFIG_KALLSYMS_EXTRA_PASS is not set
35CONFIG_PRINTK=y
36CONFIG_BUG=y
37CONFIG_BASE_FULL=y
38CONFIG_FUTEX=y
39CONFIG_EPOLL=y
40# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
41CONFIG_SHMEM=y
42CONFIG_CC_ALIGN_FUNCTIONS=0
43CONFIG_CC_ALIGN_LABELS=0
44CONFIG_CC_ALIGN_LOOPS=0
45CONFIG_CC_ALIGN_JUMPS=0
46# CONFIG_TINY_SHMEM is not set
47CONFIG_BASE_SMALL=0
48
49#
50# Loadable module support
51#
52CONFIG_MODULES=y
53CONFIG_MODULE_UNLOAD=y
54# CONFIG_MODULE_FORCE_UNLOAD is not set
55CONFIG_OBSOLETE_MODPARM=y
56CONFIG_MODVERSIONS=y
57CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y
59
60#
61# Machine selection 9# Machine selection
62# 10#
63# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MIPS_MTX1 is not set
@@ -175,7 +123,6 @@ CONFIG_IP22_CPU_SCACHE=y
175# CONFIG_64BIT_PHYS_ADDR is not set 123# CONFIG_64BIT_PHYS_ADDR is not set
176# CONFIG_CPU_ADVANCED is not set 124# CONFIG_CPU_ADVANCED is not set
177CONFIG_CPU_HAS_LLSC=y 125CONFIG_CPU_HAS_LLSC=y
178CONFIG_CPU_HAS_LLDSCD=y
179CONFIG_CPU_HAS_SYNC=y 126CONFIG_CPU_HAS_SYNC=y
180CONFIG_GENERIC_HARDIRQS=y 127CONFIG_GENERIC_HARDIRQS=y
181CONFIG_GENERIC_IRQ_PROBE=y 128CONFIG_GENERIC_IRQ_PROBE=y
@@ -187,11 +134,82 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 134CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 135CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 136# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PREEMPT_NONE is not set 138# CONFIG_PREEMPT_NONE is not set
191CONFIG_PREEMPT_VOLUNTARY=y 139CONFIG_PREEMPT_VOLUNTARY=y
192# CONFIG_PREEMPT is not set 140# CONFIG_PREEMPT is not set
193 141
194# 142#
143# Code maturity level options
144#
145CONFIG_EXPERIMENTAL=y
146CONFIG_CLEAN_COMPILE=y
147CONFIG_BROKEN_ON_SMP=y
148CONFIG_INIT_ENV_ARG_LIMIT=32
149
150#
151# General setup
152#
153CONFIG_LOCALVERSION=""
154CONFIG_LOCALVERSION_AUTO=y
155CONFIG_SWAP=y
156CONFIG_SYSVIPC=y
157# CONFIG_POSIX_MQUEUE is not set
158# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set
161# CONFIG_HOTPLUG is not set
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y
165CONFIG_INITRAMFS_SOURCE=""
166CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set
169CONFIG_PRINTK=y
170CONFIG_BUG=y
171CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y
173CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0
180# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0
182
183#
184# Loadable module support
185#
186CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y
188# CONFIG_MODULE_FORCE_UNLOAD is not set
189CONFIG_OBSOLETE_MODPARM=y
190CONFIG_MODVERSIONS=y
191CONFIG_MODULE_SRCVERSION_ALL=y
192CONFIG_KMOD=y
193
194#
195# Block layer
196#
197# CONFIG_LBD is not set
198
199#
200# IO Schedulers
201#
202CONFIG_IOSCHED_NOOP=y
203CONFIG_IOSCHED_AS=y
204CONFIG_IOSCHED_DEADLINE=y
205CONFIG_IOSCHED_CFQ=y
206CONFIG_DEFAULT_AS=y
207# CONFIG_DEFAULT_DEADLINE is not set
208# CONFIG_DEFAULT_CFQ is not set
209# CONFIG_DEFAULT_NOOP is not set
210CONFIG_DEFAULT_IOSCHED="anticipatory"
211
212#
195# Bus options (PCI, PCMCIA, EISA, ISA, TC) 213# Bus options (PCI, PCMCIA, EISA, ISA, TC)
196# 214#
197CONFIG_HW_HAS_EISA=y 215CONFIG_HW_HAS_EISA=y
@@ -292,6 +310,10 @@ CONFIG_INET6_TUNNEL=m
292CONFIG_IPV6_TUNNEL=m 310CONFIG_IPV6_TUNNEL=m
293CONFIG_NETFILTER=y 311CONFIG_NETFILTER=y
294# CONFIG_NETFILTER_DEBUG is not set 312# CONFIG_NETFILTER_DEBUG is not set
313
314#
315# Core Netfilter Configuration
316#
295CONFIG_NETFILTER_NETLINK=m 317CONFIG_NETFILTER_NETLINK=m
296CONFIG_NETFILTER_NETLINK_QUEUE=m 318CONFIG_NETFILTER_NETLINK_QUEUE=m
297CONFIG_NETFILTER_NETLINK_LOG=m 319CONFIG_NETFILTER_NETLINK_LOG=m
@@ -345,6 +367,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
345CONFIG_IP_NF_TARGET_LOG=m 367CONFIG_IP_NF_TARGET_LOG=m
346CONFIG_IP_NF_TARGET_ULOG=m 368CONFIG_IP_NF_TARGET_ULOG=m
347CONFIG_IP_NF_TARGET_TCPMSS=m 369CONFIG_IP_NF_TARGET_TCPMSS=m
370CONFIG_IP_NF_TARGET_NFQUEUE=m
348CONFIG_IP_NF_NAT=m 371CONFIG_IP_NF_NAT=m
349CONFIG_IP_NF_NAT_NEEDED=y 372CONFIG_IP_NF_NAT_NEEDED=y
350CONFIG_IP_NF_TARGET_MASQUERADE=m 373CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -393,6 +416,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
393CONFIG_IP6_NF_FILTER=m 416CONFIG_IP6_NF_FILTER=m
394CONFIG_IP6_NF_TARGET_LOG=m 417CONFIG_IP6_NF_TARGET_LOG=m
395CONFIG_IP6_NF_TARGET_REJECT=m 418CONFIG_IP6_NF_TARGET_REJECT=m
419CONFIG_IP6_NF_TARGET_NFQUEUE=m
396CONFIG_IP6_NF_MANGLE=m 420CONFIG_IP6_NF_MANGLE=m
397CONFIG_IP6_NF_TARGET_MARK=m 421CONFIG_IP6_NF_TARGET_MARK=m
398CONFIG_IP6_NF_TARGET_HL=m 422CONFIG_IP6_NF_TARGET_HL=m
@@ -424,10 +448,18 @@ CONFIG_SCTP_HMAC_MD5=y
424CONFIG_NET_DIVERT=y 448CONFIG_NET_DIVERT=y
425# CONFIG_ECONET is not set 449# CONFIG_ECONET is not set
426# CONFIG_WAN_ROUTER is not set 450# CONFIG_WAN_ROUTER is not set
451
452#
453# QoS and/or fair queueing
454#
427CONFIG_NET_SCHED=y 455CONFIG_NET_SCHED=y
428# CONFIG_NET_SCH_CLK_JIFFIES is not set 456# CONFIG_NET_SCH_CLK_JIFFIES is not set
429CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 457CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
430# CONFIG_NET_SCH_CLK_CPU is not set 458# CONFIG_NET_SCH_CLK_CPU is not set
459
460#
461# Queueing/Scheduling
462#
431CONFIG_NET_SCH_CBQ=m 463CONFIG_NET_SCH_CBQ=m
432CONFIG_NET_SCH_HTB=m 464CONFIG_NET_SCH_HTB=m
433CONFIG_NET_SCH_HFSC=m 465CONFIG_NET_SCH_HFSC=m
@@ -440,8 +472,10 @@ CONFIG_NET_SCH_GRED=m
440CONFIG_NET_SCH_DSMARK=m 472CONFIG_NET_SCH_DSMARK=m
441CONFIG_NET_SCH_NETEM=m 473CONFIG_NET_SCH_NETEM=m
442CONFIG_NET_SCH_INGRESS=m 474CONFIG_NET_SCH_INGRESS=m
443CONFIG_NET_QOS=y 475
444CONFIG_NET_ESTIMATOR=y 476#
477# Classification
478#
445CONFIG_NET_CLS=y 479CONFIG_NET_CLS=y
446CONFIG_NET_CLS_BASIC=m 480CONFIG_NET_CLS_BASIC=m
447CONFIG_NET_CLS_TCINDEX=m 481CONFIG_NET_CLS_TCINDEX=m
@@ -450,13 +484,14 @@ CONFIG_NET_CLS_ROUTE=y
450CONFIG_NET_CLS_FW=m 484CONFIG_NET_CLS_FW=m
451CONFIG_NET_CLS_U32=m 485CONFIG_NET_CLS_U32=m
452# CONFIG_CLS_U32_PERF is not set 486# CONFIG_CLS_U32_PERF is not set
453# CONFIG_NET_CLS_IND is not set
454# CONFIG_CLS_U32_MARK is not set 487# CONFIG_CLS_U32_MARK is not set
455CONFIG_NET_CLS_RSVP=m 488CONFIG_NET_CLS_RSVP=m
456CONFIG_NET_CLS_RSVP6=m 489CONFIG_NET_CLS_RSVP6=m
457# CONFIG_NET_EMATCH is not set 490# CONFIG_NET_EMATCH is not set
458# CONFIG_NET_CLS_ACT is not set 491# CONFIG_NET_CLS_ACT is not set
459CONFIG_NET_CLS_POLICE=y 492CONFIG_NET_CLS_POLICE=y
493# CONFIG_NET_CLS_IND is not set
494CONFIG_NET_ESTIMATOR=y
460 495
461# 496#
462# Network testing 497# Network testing
@@ -509,18 +544,9 @@ CONFIG_CONNECTOR=m
509# CONFIG_BLK_DEV_NBD is not set 544# CONFIG_BLK_DEV_NBD is not set
510# CONFIG_BLK_DEV_RAM is not set 545# CONFIG_BLK_DEV_RAM is not set
511CONFIG_BLK_DEV_RAM_COUNT=16 546CONFIG_BLK_DEV_RAM_COUNT=16
512# CONFIG_LBD is not set
513CONFIG_CDROM_PKTCDVD=m 547CONFIG_CDROM_PKTCDVD=m
514CONFIG_CDROM_PKTCDVD_BUFFERS=8 548CONFIG_CDROM_PKTCDVD_BUFFERS=8
515# CONFIG_CDROM_PKTCDVD_WCACHE is not set 549# 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 550CONFIG_ATA_OVER_ETH=m
525 551
526# 552#
@@ -564,6 +590,7 @@ CONFIG_SCSI_SAS_ATTRS=m
564# 590#
565# SCSI low-level drivers 591# SCSI low-level drivers
566# 592#
593CONFIG_ISCSI_TCP=m
567CONFIG_SGIWD93_SCSI=y 594CONFIG_SGIWD93_SCSI=y
568# CONFIG_SCSI_SATA is not set 595# CONFIG_SCSI_SATA is not set
569# CONFIG_SCSI_DEBUG is not set 596# CONFIG_SCSI_DEBUG is not set
@@ -599,7 +626,6 @@ CONFIG_TUN=m
599# PHY device support 626# PHY device support
600# 627#
601CONFIG_PHYLIB=m 628CONFIG_PHYLIB=m
602CONFIG_PHYCONTROL=y
603 629
604# 630#
605# MII PHY device drivers 631# MII PHY device drivers
@@ -752,6 +778,8 @@ CONFIG_MAX_RAW_DEVS=256
752# 778#
753# TPM devices 779# TPM devices
754# 780#
781# CONFIG_TCG_TPM is not set
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/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
index 8b407d7dc4..9a8bff153d 100644
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ b/arch/mips/jmr3927/common/rtc_ds1742.c
@@ -41,11 +41,11 @@
41#include <linux/types.h> 41#include <linux/types.h>
42#include <linux/time.h> 42#include <linux/time.h>
43#include <linux/rtc.h> 43#include <linux/rtc.h>
44#include <linux/ds1742rtc.h>
44 45
45#include <asm/time.h> 46#include <asm/time.h>
46#include <asm/addrspace.h> 47#include <asm/addrspace.h>
47 48
48#include <asm/jmr3927/ds1742rtc.h>
49#include <asm/debug.h> 49#include <asm/debug.h>
50 50
51#define EPOCH 2000 51#define EPOCH 2000
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 7cbe14483f..2810727f1d 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -113,7 +113,8 @@ static void jmr3927_irq_ack(unsigned int irq)
113 113
114static void jmr3927_irq_end(unsigned int irq) 114static void jmr3927_irq_end(unsigned int irq)
115{ 115{
116 jmr3927_irq_enable(irq); 116 if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
117 jmr3927_irq_enable(irq);
117} 118}
118 119
119static void jmr3927_irq_disable(unsigned int irq_nr) 120static void jmr3927_irq_disable(unsigned int irq_nr)
@@ -121,7 +122,7 @@ static void jmr3927_irq_disable(unsigned int irq_nr)
121 struct tb_irq_space* sp; 122 struct tb_irq_space* sp;
122 unsigned long flags; 123 unsigned long flags;
123 124
124 spinlock_irqsave(&jmr3927_irq_lock, flags); 125 spin_lock_irqsave(&jmr3927_irq_lock, flags);
125 for (sp = tb_irq_spaces; sp; sp = sp->next) { 126 for (sp = tb_irq_spaces; sp; sp = sp->next) {
126 if (sp->start_irqno <= irq_nr && 127 if (sp->start_irqno <= irq_nr &&
127 irq_nr < sp->start_irqno + sp->nr_irqs) { 128 irq_nr < sp->start_irqno + sp->nr_irqs) {
@@ -131,7 +132,7 @@ static void jmr3927_irq_disable(unsigned int irq_nr)
131 break; 132 break;
132 } 133 }
133 } 134 }
134 spinlock_irqrestore(&jmr3927_irq_lock, flags); 135 spin_unlock_irqrestore(&jmr3927_irq_lock, flags);
135} 136}
136 137
137static void jmr3927_irq_enable(unsigned int irq_nr) 138static void jmr3927_irq_enable(unsigned int irq_nr)
@@ -139,7 +140,7 @@ static void jmr3927_irq_enable(unsigned int irq_nr)
139 struct tb_irq_space* sp; 140 struct tb_irq_space* sp;
140 unsigned long flags; 141 unsigned long flags;
141 142
142 spinlock_irqsave(&jmr3927_irq_lock, flags); 143 spin_lock_irqsave(&jmr3927_irq_lock, flags);
143 for (sp = tb_irq_spaces; sp; sp = sp->next) { 144 for (sp = tb_irq_spaces; sp; sp = sp->next) {
144 if (sp->start_irqno <= irq_nr && 145 if (sp->start_irqno <= irq_nr &&
145 irq_nr < sp->start_irqno + sp->nr_irqs) { 146 irq_nr < sp->start_irqno + sp->nr_irqs) {
@@ -149,7 +150,7 @@ static void jmr3927_irq_enable(unsigned int irq_nr)
149 break; 150 break;
150 } 151 }
151 } 152 }
152 spinlock_irqrestore(&jmr3927_irq_lock, flags); 153 spin_unlock_irqrestore(&jmr3927_irq_lock, flags);
153} 154}
154 155
155/* 156/*
@@ -205,7 +206,10 @@ static void mask_irq_irc(int irq_nr, int space_id)
205 /* update IRCSR */ 206 /* update IRCSR */
206 tx3927_ircptr->imr = 0; 207 tx3927_ircptr->imr = 0;
207 tx3927_ircptr->imr = irc_elevel; 208 tx3927_ircptr->imr = irc_elevel;
209 /* flush write buffer */
210 (void)tx3927_ircptr->ssr;
208} 211}
212
209static void unmask_irq_irc(int irq_nr, int space_id) 213static void unmask_irq_irc(int irq_nr, int space_id)
210{ 214{
211 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2]; 215 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
@@ -276,7 +280,7 @@ void jmr3927_irc_irqdispatch(struct pt_regs *regs)
276 do_IRQ(irq + JMR3927_IRQ_IRC, regs); 280 do_IRQ(irq + JMR3927_IRQ_IRC, regs);
277} 281}
278 282
279static void jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs) 283static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
280{ 284{
281 unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR); 285 unsigned char istat = jmr3927_ioc_reg_in(JMR3927_IOC_INTS2_ADDR);
282 int i; 286 int i;
@@ -287,13 +291,14 @@ static void jmr3927_ioc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
287 do_IRQ(irq, regs); 291 do_IRQ(irq, regs);
288 } 292 }
289 } 293 }
294 return IRQ_HANDLED;
290} 295}
291 296
292static struct irqaction ioc_action = { 297static struct irqaction ioc_action = {
293 jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL, 298 jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL,
294}; 299};
295 300
296static void jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs) 301static irqreturn_t jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs)
297{ 302{
298 unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR); 303 unsigned char istat = jmr3927_isac_reg_in(JMR3927_ISAC_INTS2_ADDR);
299 int i; 304 int i;
@@ -304,6 +309,7 @@ static void jmr3927_isac_interrupt(int irq, void *dev_id, struct pt_regs *regs)
304 do_IRQ(irq, regs); 309 do_IRQ(irq, regs);
305 } 310 }
306 } 311 }
312 return IRQ_HANDLED;
307} 313}
308 314
309static struct irqaction isac_action = { 315static struct irqaction isac_action = {
@@ -311,19 +317,23 @@ static struct irqaction isac_action = {
311}; 317};
312 318
313 319
314static void jmr3927_isaerr_interrupt(int irq, void * dev_id, struct pt_regs * regs) 320static irqreturn_t jmr3927_isaerr_interrupt(int irq, void * dev_id, struct pt_regs * regs)
315{ 321{
316 printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq); 322 printk(KERN_WARNING "ISA error interrupt (irq 0x%x).\n", irq);
323
324 return IRQ_HANDLED;
317} 325}
318static struct irqaction isaerr_action = { 326static struct irqaction isaerr_action = {
319 jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL, 327 jmr3927_isaerr_interrupt, 0, CPU_MASK_NONE, "ISA error", NULL, NULL,
320}; 328};
321 329
322static void jmr3927_pcierr_interrupt(int irq, void * dev_id, struct pt_regs * regs) 330static irqreturn_t jmr3927_pcierr_interrupt(int irq, void * dev_id, struct pt_regs * regs)
323{ 331{
324 printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq); 332 printk(KERN_WARNING "PCI error interrupt (irq 0x%x).\n", irq);
325 printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n", 333 printk(KERN_WARNING "pcistat:%02x, lbstat:%04lx\n",
326 tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat); 334 tx3927_pcicptr->pcistat, tx3927_pcicptr->lbstat);
335
336 return IRQ_HANDLED;
327} 337}
328static struct irqaction pcierr_action = { 338static struct irqaction pcierr_action = {
329 jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL, 339 jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL,
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index 3e2fbdc660..4763957df8 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -60,6 +60,8 @@
60#include <asm/mipsregs.h> 60#include <asm/mipsregs.h>
61#include <asm/traps.h> 61#include <asm/traps.h>
62 62
63extern void puts(unsigned char *cp);
64
63/* Tick Timer divider */ 65/* Tick Timer divider */
64#define JMR3927_TIMER_CCD 0 /* 1/2 */ 66#define JMR3927_TIMER_CCD 0 /* 1/2 */
65#define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD)) 67#define JMR3927_TIMER_CLK (JMR3927_IMCLK / (2 << JMR3927_TIMER_CCD))
@@ -357,7 +359,7 @@ static void __init jmr3927_board_init(void)
357 jmr3927_io_dipsw()); 359 jmr3927_io_dipsw());
358} 360}
359 361
360void __init plat_setup(void) 362void __init tx3927_setup(void)
361{ 363{
362 int i; 364 int i;
363 365
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 72f2126ad1..f36c4f20ee 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -50,7 +50,7 @@ obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o
50obj-$(CONFIG_32BIT) += scall32-o32.o 50obj-$(CONFIG_32BIT) += scall32-o32.o
51obj-$(CONFIG_64BIT) += scall64-64.o 51obj-$(CONFIG_64BIT) += scall64-64.o
52obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o 52obj-$(CONFIG_BINFMT_IRIX) += binfmt_irix.o
53obj-$(CONFIG_MIPS32_COMPAT) += ioctl32.o linux32.o signal32.o 53obj-$(CONFIG_MIPS32_COMPAT) += linux32.o signal32.o
54obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o 54obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o
55obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o ptrace32.o 55obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o ptrace32.o
56 56
@@ -60,6 +60,5 @@ obj-$(CONFIG_PROC_FS) += proc.o
60obj-$(CONFIG_64BIT) += cpu-bugs64.o 60obj-$(CONFIG_64BIT) += cpu-bugs64.o
61 61
62CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi) 62CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(CFLAGS) -Wa,-mdaddi -c -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-DHAVE_AS_SET_DADDI"; fi)
63CFLAGS_ioctl32.o += -Ifs/
64 63
65EXTRA_AFLAGS := $(CFLAGS) 64EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index a263fb7a39..fac48ad27b 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -417,7 +417,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
417 case PRID_IMP_R10000: 417 case PRID_IMP_R10000:
418 c->cputype = CPU_R10000; 418 c->cputype = CPU_R10000;
419 c->isa_level = MIPS_CPU_ISA_IV; 419 c->isa_level = MIPS_CPU_ISA_IV;
420 c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | 420 c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
421 MIPS_CPU_FPU | MIPS_CPU_32FPR | 421 MIPS_CPU_FPU | MIPS_CPU_32FPR |
422 MIPS_CPU_COUNTER | MIPS_CPU_WATCH | 422 MIPS_CPU_COUNTER | MIPS_CPU_WATCH |
423 MIPS_CPU_LLSC; 423 MIPS_CPU_LLSC;
@@ -426,7 +426,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
426 case PRID_IMP_R12000: 426 case PRID_IMP_R12000:
427 c->cputype = CPU_R12000; 427 c->cputype = CPU_R12000;
428 c->isa_level = MIPS_CPU_ISA_IV; 428 c->isa_level = MIPS_CPU_ISA_IV;
429 c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX | 429 c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
430 MIPS_CPU_FPU | MIPS_CPU_32FPR | 430 MIPS_CPU_FPU | MIPS_CPU_32FPR |
431 MIPS_CPU_COUNTER | MIPS_CPU_WATCH | 431 MIPS_CPU_COUNTER | MIPS_CPU_WATCH |
432 MIPS_CPU_LLSC; 432 MIPS_CPU_LLSC;
@@ -435,6 +435,9 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
435 } 435 }
436} 436}
437 437
438static char unknown_isa[] __initdata = KERN_ERR \
439 "Unsupported ISA type, c0.config0: %d.";
440
438static inline unsigned int decode_config0(struct cpuinfo_mips *c) 441static inline unsigned int decode_config0(struct cpuinfo_mips *c)
439{ 442{
440 unsigned int config0; 443 unsigned int config0;
@@ -447,16 +450,37 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c)
447 isa = (config0 & MIPS_CONF_AT) >> 13; 450 isa = (config0 & MIPS_CONF_AT) >> 13;
448 switch (isa) { 451 switch (isa) {
449 case 0: 452 case 0:
450 c->isa_level = MIPS_CPU_ISA_M32; 453 switch ((config0 >> 10) & 7) {
454 case 0:
455 c->isa_level = MIPS_CPU_ISA_M32R1;
456 break;
457 case 1:
458 c->isa_level = MIPS_CPU_ISA_M32R2;
459 break;
460 default:
461 goto unknown;
462 }
451 break; 463 break;
452 case 2: 464 case 2:
453 c->isa_level = MIPS_CPU_ISA_M64; 465 switch ((config0 >> 10) & 7) {
466 case 0:
467 c->isa_level = MIPS_CPU_ISA_M64R1;
468 break;
469 case 1:
470 c->isa_level = MIPS_CPU_ISA_M64R2;
471 break;
472 default:
473 goto unknown;
474 }
454 break; 475 break;
455 default: 476 default:
456 panic("Unsupported ISA type, cp0.config0.at: %d.", isa); 477 goto unknown;
457 } 478 }
458 479
459 return config0 & MIPS_CONF_M; 480 return config0 & MIPS_CONF_M;
481
482unknown:
483 panic(unknown_isa, config0);
460} 484}
461 485
462static inline unsigned int decode_config1(struct cpuinfo_mips *c) 486static inline unsigned int decode_config1(struct cpuinfo_mips *c)
@@ -568,7 +592,6 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c)
568 break; 592 break;
569 case PRID_IMP_34K: 593 case PRID_IMP_34K:
570 c->cputype = CPU_34K; 594 c->cputype = CPU_34K;
571 c->isa_level = MIPS_CPU_ISA_M32;
572 break; 595 break;
573 } 596 }
574} 597}
@@ -647,7 +670,7 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c)
647 switch (c->processor_id & 0xff00) { 670 switch (c->processor_id & 0xff00) {
648 case PRID_IMP_PR4450: 671 case PRID_IMP_PR4450:
649 c->cputype = CPU_PR4450; 672 c->cputype = CPU_PR4450;
650 c->isa_level = MIPS_CPU_ISA_M32; 673 c->isa_level = MIPS_CPU_ISA_M32R1;
651 break; 674 break;
652 default: 675 default:
653 panic("Unknown Philips Core!"); /* REVISIT: die? */ 676 panic("Unknown Philips Core!"); /* REVISIT: die? */
@@ -690,8 +713,10 @@ __init void cpu_probe(void)
690 if (c->options & MIPS_CPU_FPU) { 713 if (c->options & MIPS_CPU_FPU) {
691 c->fpu_id = cpu_get_fpu_id(); 714 c->fpu_id = cpu_get_fpu_id();
692 715
693 if (c->isa_level == MIPS_CPU_ISA_M32 || 716 if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
694 c->isa_level == MIPS_CPU_ISA_M64) { 717 c->isa_level == MIPS_CPU_ISA_M32R2 ||
718 c->isa_level == MIPS_CPU_ISA_M64R1 ||
719 c->isa_level == MIPS_CPU_ISA_M64R2) {
695 if (c->fpu_id & MIPS_FPIR_3D) 720 if (c->fpu_id & MIPS_FPIR_3D)
696 c->ases |= MIPS_ASE_MIPS3D; 721 c->ases |= MIPS_ASE_MIPS3D;
697 } 722 }
diff --git a/arch/mips/kernel/ioctl32.c b/arch/mips/kernel/ioctl32.c
deleted file mode 100644
index 9ea1fc7488..0000000000
--- a/arch/mips/kernel/ioctl32.c
+++ /dev/null
@@ -1,50 +0,0 @@
1/*
2 * ioctl32.c: Conversion between 32bit and 64bit native ioctls.
3 *
4 * Copyright (C) 2000 Silicon Graphics, Inc.
5 * Written by Ulf Carlsson (ulfc@engr.sgi.com)
6 * Copyright (C) 2000, 2004 Ralf Baechle
7 * Copyright (C) 2002, 2003 Maciej W. Rozycki
8 */
9#define INCLUDES
10#include "compat_ioctl.c"
11
12#include <linux/config.h>
13#include <linux/types.h>
14#include <linux/compat.h>
15#include <linux/ioctl32.h>
16#include <linux/syscalls.h>
17
18#ifdef CONFIG_SIBYTE_TBPROF
19#include <asm/sibyte/trace_prof.h>
20#endif
21
22#define A(__x) ((unsigned long)(__x))
23
24long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
25
26#define CODE
27#include "compat_ioctl.c"
28
29#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL((cmd),sys_ioctl)
30#define HANDLE_IOCTL(cmd,handler) { (cmd), (ioctl_trans_handler_t)(handler), NULL },
31#define IOCTL_TABLE_START \
32 struct ioctl_trans ioctl_start[] = {
33#define IOCTL_TABLE_END \
34 };
35
36IOCTL_TABLE_START
37
38#include <linux/compat_ioctl.h>
39#define DECLARES
40#include "compat_ioctl.c"
41
42/*HANDLE_IOCTL(RTC_IRQP_READ, w_long)
43COMPATIBLE_IOCTL(RTC_IRQP_SET)
44HANDLE_IOCTL(RTC_EPOCH_READ, w_long)
45COMPATIBLE_IOCTL(RTC_EPOCH_SET)
46*/
47
48IOCTL_TABLE_END
49
50int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index dd118c60bc..08273a2a50 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -279,8 +279,6 @@ irix_sigreturn(struct pt_regs *regs)
279 /* 279 /*
280 * Don't let your children do this ... 280 * Don't let your children do this ...
281 */ 281 */
282 if (current_thread_info()->flags & TIF_SYSCALL_TRACE)
283 do_syscall_trace(regs, 1);
284 __asm__ __volatile__( 282 __asm__ __volatile__(
285 "move\t$29,%0\n\t" 283 "move\t$29,%0\n\t"
286 "j\tsyscall_exit" 284 "j\tsyscall_exit"
@@ -783,8 +781,6 @@ asmlinkage void irix_setcontext(struct pt_regs *regs)
783 /* 781 /*
784 * Don't let your children do this ... 782 * Don't let your children do this ...
785 */ 783 */
786 if (current_thread_info()->flags & TIF_SYSCALL_TRACE)
787 do_syscall_trace(regs, 1);
788 __asm__ __volatile__( 784 __asm__ __volatile__(
789 "move\t$29,%0\n\t" 785 "move\t$29,%0\n\t"
790 "j\tsyscall_exit" 786 "j\tsyscall_exit"
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 330cf84d21..60353f5acc 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -420,7 +420,7 @@ asmlinkage ssize_t sys32_pread(unsigned int fd, char * buf,
420 goto out; 420 goto out;
421 pos = merge_64(a4, a5); 421 pos = merge_64(a4, a5);
422 ret = rw_verify_area(READ, file, &pos, count); 422 ret = rw_verify_area(READ, file, &pos, count);
423 if (ret) 423 if (ret < 0)
424 goto out; 424 goto out;
425 ret = -EINVAL; 425 ret = -EINVAL;
426 if (!file->f_op || !(read = file->f_op->read)) 426 if (!file->f_op || !(read = file->f_op->read))
@@ -455,7 +455,7 @@ asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char * buf,
455 goto out; 455 goto out;
456 pos = merge_64(a4, a5); 456 pos = merge_64(a4, a5);
457 ret = rw_verify_area(WRITE, file, &pos, count); 457 ret = rw_verify_area(WRITE, file, &pos, count);
458 if (ret) 458 if (ret < 0)
459 goto out; 459 goto out;
460 ret = -EINVAL; 460 ret = -EINVAL;
461 if (!file->f_op || !(write = file->f_op->write)) 461 if (!file->f_op || !(write = file->f_op->write))
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index dd725779d9..fa98f10d01 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -140,12 +140,12 @@ void flush_thread(void)
140int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, 140int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
141 unsigned long unused, struct task_struct *p, struct pt_regs *regs) 141 unsigned long unused, struct task_struct *p, struct pt_regs *regs)
142{ 142{
143 struct thread_info *ti = p->thread_info; 143 struct thread_info *ti = task_thread_info(p);
144 struct pt_regs *childregs; 144 struct pt_regs *childregs;
145 long childksp; 145 long childksp;
146 p->set_child_tid = p->clear_child_tid = NULL; 146 p->set_child_tid = p->clear_child_tid = NULL;
147 147
148 childksp = (unsigned long)ti + THREAD_SIZE - 32; 148 childksp = (unsigned long)task_stack_page(p) + THREAD_SIZE - 32;
149 149
150 preempt_disable(); 150 preempt_disable();
151 151
@@ -205,7 +205,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *r)
205 return 1; 205 return 1;
206} 206}
207 207
208void dump_regs(elf_greg_t *gp, struct pt_regs *regs) 208void elf_dump_regs(elf_greg_t *gp, struct pt_regs *regs)
209{ 209{
210 int i; 210 int i;
211 211
@@ -229,9 +229,7 @@ void dump_regs(elf_greg_t *gp, struct pt_regs *regs)
229 229
230int dump_task_regs (struct task_struct *tsk, elf_gregset_t *regs) 230int dump_task_regs (struct task_struct *tsk, elf_gregset_t *regs)
231{ 231{
232 struct thread_info *ti = tsk->thread_info; 232 elf_dump_regs(*regs, task_pt_regs(tsk));
233 long ksp = (unsigned long)ti + THREAD_SIZE - 32;
234 dump_regs(&(*regs)[0], (struct pt_regs *) ksp - 1);
235 return 1; 233 return 1;
236} 234}
237 235
@@ -409,7 +407,7 @@ unsigned long get_wchan(struct task_struct *p)
409 if (!p || p == current || p->state == TASK_RUNNING) 407 if (!p || p == current || p->state == TASK_RUNNING)
410 return 0; 408 return 0;
411 409
412 stack_page = (unsigned long)p->thread_info; 410 stack_page = (unsigned long)task_stack_page(p);
413 if (!stack_page || !mips_frame_info_initialized) 411 if (!stack_page || !mips_frame_info_initialized)
414 return 0; 412 return 0;
415 413
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 510da5fda5..f838b36cc7 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -64,8 +64,7 @@ int ptrace_getregs (struct task_struct *child, __s64 __user *data)
64 if (!access_ok(VERIFY_WRITE, data, 38 * 8)) 64 if (!access_ok(VERIFY_WRITE, data, 38 * 8))
65 return -EIO; 65 return -EIO;
66 66
67 regs = (struct pt_regs *) ((unsigned long) child->thread_info + 67 regs = task_pt_regs(child);
68 THREAD_SIZE - 32 - sizeof(struct pt_regs));
69 68
70 for (i = 0; i < 32; i++) 69 for (i = 0; i < 32; i++)
71 __put_user (regs->regs[i], data + i); 70 __put_user (regs->regs[i], data + i);
@@ -92,8 +91,7 @@ int ptrace_setregs (struct task_struct *child, __s64 __user *data)
92 if (!access_ok(VERIFY_READ, data, 38 * 8)) 91 if (!access_ok(VERIFY_READ, data, 38 * 8))
93 return -EIO; 92 return -EIO;
94 93
95 regs = (struct pt_regs *) ((unsigned long) child->thread_info + 94 regs = task_pt_regs(child);
96 THREAD_SIZE - 32 - sizeof(struct pt_regs));
97 95
98 for (i = 0; i < 32; i++) 96 for (i = 0; i < 32; i++)
99 __get_user (regs->regs[i], data + i); 97 __get_user (regs->regs[i], data + i);
@@ -198,8 +196,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
198 struct pt_regs *regs; 196 struct pt_regs *regs;
199 unsigned long tmp = 0; 197 unsigned long tmp = 0;
200 198
201 regs = (struct pt_regs *) ((unsigned long) child->thread_info + 199 regs = task_pt_regs(child);
202 THREAD_SIZE - 32 - sizeof(struct pt_regs));
203 ret = 0; /* Default return value. */ 200 ret = 0; /* Default return value. */
204 201
205 switch (addr) { 202 switch (addr) {
@@ -280,12 +277,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
280 ret = -EIO; 277 ret = -EIO;
281 goto out; 278 goto out;
282 } 279 }
283 if (child->thread.dsp.used_dsp) { 280 dregs = __get_dsp_regs(child);
284 dregs = __get_dsp_regs(child); 281 tmp = (unsigned long) (dregs[addr - DSP_BASE]);
285 tmp = (unsigned long) (dregs[addr - DSP_BASE]);
286 } else {
287 tmp = -1; /* DSP registers yet used */
288 }
289 break; 282 break;
290 } 283 }
291 case DSP_CONTROL: 284 case DSP_CONTROL:
@@ -318,8 +311,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
318 case PTRACE_POKEUSR: { 311 case PTRACE_POKEUSR: {
319 struct pt_regs *regs; 312 struct pt_regs *regs;
320 ret = 0; 313 ret = 0;
321 regs = (struct pt_regs *) ((unsigned long) child->thread_info + 314 regs = task_pt_regs(child);
322 THREAD_SIZE - 32 - sizeof(struct pt_regs));
323 315
324 switch (addr) { 316 switch (addr) {
325 case 0 ... 31: 317 case 0 ... 31:
@@ -446,7 +438,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
446 break; 438 break;
447 439
448 case PTRACE_GET_THREAD_AREA: 440 case PTRACE_GET_THREAD_AREA:
449 ret = put_user(child->thread_info->tp_value, 441 ret = put_user(task_thread_info(child)->tp_value,
450 (unsigned long __user *) data); 442 (unsigned long __user *) data);
451 break; 443 break;
452 444
diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index 9a9b049721..0c82b25d8c 100644
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -57,30 +57,16 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
57 (unsigned long) data); 57 (unsigned long) data);
58#endif 58#endif
59 lock_kernel(); 59 lock_kernel();
60 ret = -EPERM;
61 if (request == PTRACE_TRACEME) { 60 if (request == PTRACE_TRACEME) {
62 /* are we already being traced? */ 61 ret = ptrace_traceme();
63 if (current->ptrace & PT_PTRACED)
64 goto out;
65 if ((ret = security_ptrace(current->parent, current)))
66 goto out;
67 /* set the ptrace bit in the process flags. */
68 current->ptrace |= PT_PTRACED;
69 ret = 0;
70 goto out; 62 goto out;
71 } 63 }
72 ret = -ESRCH;
73 read_lock(&tasklist_lock);
74 child = find_task_by_pid(pid);
75 if (child)
76 get_task_struct(child);
77 read_unlock(&tasklist_lock);
78 if (!child)
79 goto out;
80 64
81 ret = -EPERM; 65 child = ptrace_get_task_struct(pid);
82 if (pid == 1) /* you may not mess with init */ 66 if (IS_ERR(child)) {
83 goto out_tsk; 67 ret = PTR_ERR(child);
68 goto out;
69 }
84 70
85 if (request == PTRACE_ATTACH) { 71 if (request == PTRACE_ATTACH) {
86 ret = ptrace_attach(child); 72 ret = ptrace_attach(child);
@@ -140,8 +126,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
140 struct pt_regs *regs; 126 struct pt_regs *regs;
141 unsigned int tmp; 127 unsigned int tmp;
142 128
143 regs = (struct pt_regs *) ((unsigned long) child->thread_info + 129 regs = task_pt_regs(child);
144 THREAD_SIZE - 32 - sizeof(struct pt_regs));
145 ret = 0; /* Default return value. */ 130 ret = 0; /* Default return value. */
146 131
147 switch (addr) { 132 switch (addr) {
@@ -215,12 +200,8 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
215 ret = -EIO; 200 ret = -EIO;
216 goto out_tsk; 201 goto out_tsk;
217 } 202 }
218 if (child->thread.dsp.used_dsp) { 203 dspreg_t *dregs = __get_dsp_regs(child);
219 dspreg_t *dregs = __get_dsp_regs(child); 204 tmp = (unsigned long) (dregs[addr - DSP_BASE]);
220 tmp = (unsigned long) (dregs[addr - DSP_BASE]);
221 } else {
222 tmp = -1; /* DSP registers yet used */
223 }
224 break; 205 break;
225 case DSP_CONTROL: 206 case DSP_CONTROL:
226 if (!cpu_has_dsp) { 207 if (!cpu_has_dsp) {
@@ -277,8 +258,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
277 case PTRACE_POKEUSR: { 258 case PTRACE_POKEUSR: {
278 struct pt_regs *regs; 259 struct pt_regs *regs;
279 ret = 0; 260 ret = 0;
280 regs = (struct pt_regs *) ((unsigned long) child->thread_info + 261 regs = task_pt_regs(child);
281 THREAD_SIZE - 32 - sizeof(struct pt_regs));
282 262
283 switch (addr) { 263 switch (addr) {
284 case 0 ... 31: 264 case 0 ... 31:
@@ -395,7 +375,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
395 break; 375 break;
396 376
397 case PTRACE_GET_THREAD_AREA: 377 case PTRACE_GET_THREAD_AREA:
398 ret = put_user(child->thread_info->tp_value, 378 ret = put_user(task_thread_info(child)->tp_value,
399 (unsigned int __user *) (unsigned long) data); 379 (unsigned int __user *) (unsigned long) data);
400 break; 380 break;
401 381
@@ -409,7 +389,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
409 break; 389 break;
410 390
411 case PTRACE_GET_THREAD_AREA_3264: 391 case PTRACE_GET_THREAD_AREA_3264:
412 ret = put_user(child->thread_info->tp_value, 392 ret = put_user(task_thread_info(child)->tp_value,
413 (unsigned long __user *) (unsigned long) data); 393 (unsigned long __user *) (unsigned long) data);
414 break; 394 break;
415 395
diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
index ae2ba67b7e..5e37df3111 100644
--- a/arch/mips/kernel/reset.c
+++ b/arch/mips/kernel/reset.c
@@ -12,6 +12,9 @@
12#include <linux/reboot.h> 12#include <linux/reboot.h>
13#include <asm/reboot.h> 13#include <asm/reboot.h>
14 14
15void (*pm_power_off)(void);
16EXPORT_SYMBOL(pm_power_off);
17
15/* 18/*
16 * Urgs ... Too many MIPS machines to handle this in a generic way. 19 * Urgs ... Too many MIPS machines to handle this in a generic way.
17 * So handle all using function pointers to machine specific 20 * So handle all using function pointers to machine specific
@@ -33,6 +36,9 @@ void machine_halt(void)
33 36
34void machine_power_off(void) 37void machine_power_off(void)
35{ 38{
39 if (pm_power_off)
40 pm_power_off();
41
36 _machine_power_off(); 42 _machine_power_off();
37} 43}
38 44
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 4dd8e8b4fb..a42e0e8caa 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -94,11 +94,13 @@ syscall_trace_entry:
94 li a1, 0 94 li a1, 0
95 jal do_syscall_trace 95 jal do_syscall_trace
96 96
97 move t0, s0
98 RESTORE_STATIC
97 lw a0, PT_R4(sp) # Restore argument registers 99 lw a0, PT_R4(sp) # Restore argument registers
98 lw a1, PT_R5(sp) 100 lw a1, PT_R5(sp)
99 lw a2, PT_R6(sp) 101 lw a2, PT_R6(sp)
100 lw a3, PT_R7(sp) 102 lw a3, PT_R7(sp)
101 jalr s0 103 jalr t0
102 104
103 li t0, -EMAXERRNO - 1 # error? 105 li t0, -EMAXERRNO - 1 # error?
104 sltu t0, t0, v0 106 sltu t0, t0, v0
@@ -241,19 +243,7 @@ illegal_syscall:
241 sw zero, PT_R7(sp) # success 243 sw zero, PT_R7(sp) # success
242 sw v0, PT_R2(sp) # result 244 sw v0, PT_R2(sp) # result
243 245
244 /* Success, so skip usual error handling garbage. */ 246 j o32_syscall_exit # continue like a normal syscall
245 lw a2, TI_FLAGS($28) # syscall tracing enabled?
246 li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
247 and t0, a2, t0
248 bnez t0, 1f
249
250 j o32_syscall_exit
251
2521: SAVE_STATIC
253 move a0, sp
254 li a1, 1
255 jal do_syscall_trace
256 j syscall_exit
257 247
258no_mem: li v0, -ENOMEM 248no_mem: li v0, -ENOMEM
259 jr ra 249 jr ra
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 9085838d6c..47bfbd4167 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -93,13 +93,15 @@ syscall_trace_entry:
93 li a1, 0 93 li a1, 0
94 jal do_syscall_trace 94 jal do_syscall_trace
95 95
96 move t0, s0
97 RESTORE_STATIC
96 ld a0, PT_R4(sp) # Restore argument registers 98 ld a0, PT_R4(sp) # Restore argument registers
97 ld a1, PT_R5(sp) 99 ld a1, PT_R5(sp)
98 ld a2, PT_R6(sp) 100 ld a2, PT_R6(sp)
99 ld a3, PT_R7(sp) 101 ld a3, PT_R7(sp)
100 ld a4, PT_R8(sp) 102 ld a4, PT_R8(sp)
101 ld a5, PT_R9(sp) 103 ld a5, PT_R9(sp)
102 jalr s0 104 jalr t0
103 105
104 li t0, -EMAXERRNO - 1 # error? 106 li t0, -EMAXERRNO - 1 # error?
105 sltu t0, t0, v0 107 sltu t0, t0, v0
@@ -174,19 +176,7 @@ illegal_syscall:
174 sd zero, PT_R7(sp) # success 176 sd zero, PT_R7(sp) # success
175 sd v0, PT_R2(sp) # result 177 sd v0, PT_R2(sp) # result
176 178
177 /* Success, so skip usual error handling garbage. */ 179 j n64_syscall_exit # continue like a normal syscall
178 li t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
179 LONG_L a2, TI_FLAGS($28) # syscall tracing enabled?
180 and t0, a2, t0
181 bnez t0, 1f
182
183 j n64_syscall_exit
184
1851: SAVE_STATIC
186 move a0, sp
187 li a1, 1
188 jal do_syscall_trace
189 j syscall_exit
190 180
191no_mem: li v0, -ENOMEM 181no_mem: li v0, -ENOMEM
192 jr ra 182 jr ra
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 7e66eb823b..b465ced175 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -90,13 +90,15 @@ n32_syscall_trace_entry:
90 li a1, 0 90 li a1, 0
91 jal do_syscall_trace 91 jal do_syscall_trace
92 92
93 move t0, s0
94 RESTORE_STATIC
93 ld a0, PT_R4(sp) # Restore argument registers 95 ld a0, PT_R4(sp) # Restore argument registers
94 ld a1, PT_R5(sp) 96 ld a1, PT_R5(sp)
95 ld a2, PT_R6(sp) 97 ld a2, PT_R6(sp)
96 ld a3, PT_R7(sp) 98 ld a3, PT_R7(sp)
97 ld a4, PT_R8(sp) 99 ld a4, PT_R8(sp)
98 ld a5, PT_R9(sp) 100 ld a5, PT_R9(sp)
99 jalr s0 101 jalr t0
100 102
101 li t0, -EMAXERRNO - 1 # error? 103 li t0, -EMAXERRNO - 1 # error?
102 sltu t0, t0, v0 104 sltu t0, t0, v0
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 5a16401e44..3d338ca7ee 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -124,6 +124,8 @@ trace_a_syscall:
124 li a1, 0 124 li a1, 0
125 jal do_syscall_trace 125 jal do_syscall_trace
126 126
127 move t0, s0
128 RESTORE_STATIC
127 ld a0, PT_R4(sp) # Restore argument registers 129 ld a0, PT_R4(sp) # Restore argument registers
128 ld a1, PT_R5(sp) 130 ld a1, PT_R5(sp)
129 ld a2, PT_R6(sp) 131 ld a2, PT_R6(sp)
@@ -132,7 +134,7 @@ trace_a_syscall:
132 ld a5, PT_R9(sp) 134 ld a5, PT_R9(sp)
133 ld a6, PT_R10(sp) 135 ld a6, PT_R10(sp)
134 ld a7, PT_R11(sp) # For indirect syscalls 136 ld a7, PT_R11(sp) # For indirect syscalls
135 jalr s0 137 jalr t0
136 138
137 li t0, -EMAXERRNO - 1 # error? 139 li t0, -EMAXERRNO - 1 # error?
138 sltu t0, t0, v0 140 sltu t0, t0, v0
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 05e09eedab..7d1800fe70 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -220,8 +220,6 @@ _sys_sigreturn(nabi_no_regargs struct pt_regs regs)
220 /* 220 /*
221 * Don't let your children do this ... 221 * Don't let your children do this ...
222 */ 222 */
223 if (current_thread_info()->flags & TIF_SYSCALL_TRACE)
224 do_syscall_trace(&regs, 1);
225 __asm__ __volatile__( 223 __asm__ __volatile__(
226 "move\t$29, %0\n\t" 224 "move\t$29, %0\n\t"
227 "j\tsyscall_exit" 225 "j\tsyscall_exit"
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index e315d3f6aa..98b185bbc9 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -497,8 +497,6 @@ _sys32_sigreturn(nabi_no_regargs struct pt_regs regs)
497 /* 497 /*
498 * Don't let your children do this ... 498 * Don't let your children do this ...
499 */ 499 */
500 if (current_thread_info()->flags & TIF_SYSCALL_TRACE)
501 do_syscall_trace(&regs, 1);
502 __asm__ __volatile__( 500 __asm__ __volatile__(
503 "move\t$29, %0\n\t" 501 "move\t$29, %0\n\t"
504 "j\tsyscall_exit" 502 "j\tsyscall_exit"
@@ -590,7 +588,7 @@ static inline int setup_sigcontext32(struct pt_regs *regs,
590 err |= __put_user(regs->hi, &sc->sc_mdhi); 588 err |= __put_user(regs->hi, &sc->sc_mdhi);
591 err |= __put_user(regs->lo, &sc->sc_mdlo); 589 err |= __put_user(regs->lo, &sc->sc_mdlo);
592 if (cpu_has_dsp) { 590 if (cpu_has_dsp) {
593 err |= __put_user(rddsp(DSP_MASK), &sc->sc_hi1); 591 err |= __put_user(rddsp(DSP_MASK), &sc->sc_dsp);
594 err |= __put_user(mfhi1(), &sc->sc_hi1); 592 err |= __put_user(mfhi1(), &sc->sc_hi1);
595 err |= __put_user(mflo1(), &sc->sc_lo1); 593 err |= __put_user(mflo1(), &sc->sc_lo1);
596 err |= __put_user(mfhi2(), &sc->sc_hi2); 594 err |= __put_user(mfhi2(), &sc->sc_hi2);
diff --git a/arch/mips/kernel/smp_mt.c b/arch/mips/kernel/smp_mt.c
index d429544ba4..794a1c3de2 100644
--- a/arch/mips/kernel/smp_mt.c
+++ b/arch/mips/kernel/smp_mt.c
@@ -287,6 +287,7 @@ void prom_prepare_cpus(unsigned int max_cpus)
287 */ 287 */
288void prom_boot_secondary(int cpu, struct task_struct *idle) 288void prom_boot_secondary(int cpu, struct task_struct *idle)
289{ 289{
290 struct thread_info *gp = task_thread_info(idle);
290 dvpe(); 291 dvpe();
291 set_c0_mvpcontrol(MVPCONTROL_VPC); 292 set_c0_mvpcontrol(MVPCONTROL_VPC);
292 293
@@ -307,11 +308,9 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
307 write_tc_gpr_sp( __KSTK_TOS(idle)); 308 write_tc_gpr_sp( __KSTK_TOS(idle));
308 309
309 /* global pointer */ 310 /* global pointer */
310 write_tc_gpr_gp((unsigned long)idle->thread_info); 311 write_tc_gpr_gp((unsigned long)gp);
311 312
312 flush_icache_range((unsigned long)idle->thread_info, 313 flush_icache_range((unsigned long)gp, (unsigned long)(gp + 1));
313 (unsigned long)idle->thread_info +
314 sizeof(struct thread_info));
315 314
316 /* finally out of configuration and into chaos */ 315 /* finally out of configuration and into chaos */
317 clear_c0_mvpcontrol(MVPCONTROL_VPC); 316 clear_c0_mvpcontrol(MVPCONTROL_VPC);
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index ee98eeb65e..332358430f 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -9,6 +9,7 @@
9 */ 9 */
10#include <linux/config.h> 10#include <linux/config.h>
11#include <linux/a.out.h> 11#include <linux/a.out.h>
12#include <linux/capability.h>
12#include <linux/errno.h> 13#include <linux/errno.h>
13#include <linux/linkage.h> 14#include <linux/linkage.h>
14#include <linux/mm.h> 15#include <linux/mm.h>
@@ -262,7 +263,7 @@ asmlinkage int sys_olduname(struct oldold_utsname * name)
262 263
263void sys_set_thread_area(unsigned long addr) 264void sys_set_thread_area(unsigned long addr)
264{ 265{
265 struct thread_info *ti = current->thread_info; 266 struct thread_info *ti = task_thread_info(current);
266 267
267 ti->tp_value = addr; 268 ti->tp_value = addr;
268 269
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 52924f8ce2..0fc3730a29 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -8,6 +8,7 @@
8#include <linux/kernel.h> 8#include <linux/kernel.h>
9#include <linux/sched.h> 9#include <linux/sched.h>
10#include <linux/binfmts.h> 10#include <linux/binfmts.h>
11#include <linux/capability.h>
11#include <linux/highuid.h> 12#include <linux/highuid.h>
12#include <linux/pagemap.h> 13#include <linux/pagemap.h>
13#include <linux/mm.h> 14#include <linux/mm.h>
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 787ed541d4..7050b4ffff 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -507,14 +507,38 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
507 return IRQ_HANDLED; 507 return IRQ_HANDLED;
508} 508}
509 509
510int null_perf_irq(struct pt_regs *regs)
511{
512 return 0;
513}
514
515int (*perf_irq)(struct pt_regs *regs) = null_perf_irq;
516
517EXPORT_SYMBOL(null_perf_irq);
518EXPORT_SYMBOL(perf_irq);
519
510asmlinkage void ll_timer_interrupt(int irq, struct pt_regs *regs) 520asmlinkage void ll_timer_interrupt(int irq, struct pt_regs *regs)
511{ 521{
522 int r2 = cpu_has_mips_r2;
523
512 irq_enter(); 524 irq_enter();
513 kstat_this_cpu.irqs[irq]++; 525 kstat_this_cpu.irqs[irq]++;
514 526
527 /*
528 * Suckage alert:
529 * Before R2 of the architecture there was no way to see if a
530 * performance counter interrupt was pending, so we have to run the
531 * performance counter interrupt handler anyway.
532 */
533 if (!r2 || (read_c0_cause() & (1 << 26)))
534 if (perf_irq(regs))
535 goto out;
536
515 /* we keep interrupt disabled all the time */ 537 /* we keep interrupt disabled all the time */
516 timer_interrupt(irq, NULL, regs); 538 if (!r2 || (read_c0_cause() & (1 << 30)))
539 timer_interrupt(irq, NULL, regs);
517 540
541out:
518 irq_exit(); 542 irq_exit();
519} 543}
520 544
@@ -628,9 +652,9 @@ void __init time_init(void)
628 mips_hpt_init = c0_hpt_init; 652 mips_hpt_init = c0_hpt_init;
629 } 653 }
630 654
631 if ((current_cpu_data.isa_level == MIPS_CPU_ISA_M32) || 655 if (cpu_has_mips32r1 || cpu_has_mips32r2 ||
632 (current_cpu_data.isa_level == MIPS_CPU_ISA_I) || 656 (current_cpu_data.isa_level == MIPS_CPU_ISA_I) ||
633 (current_cpu_data.isa_level == MIPS_CPU_ISA_II)) 657 (current_cpu_data.isa_level == MIPS_CPU_ISA_II))
634 /* 658 /*
635 * We need to calibrate the counter but we don't have 659 * We need to calibrate the counter but we don't have
636 * 64-bit division. 660 * 64-bit division.
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 6f3ff96906..59a187956d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -519,7 +519,7 @@ static inline int simulate_llsc(struct pt_regs *regs)
519 */ 519 */
520static inline int simulate_rdhwr(struct pt_regs *regs) 520static inline int simulate_rdhwr(struct pt_regs *regs)
521{ 521{
522 struct thread_info *ti = current->thread_info; 522 struct thread_info *ti = task_thread_info(current);
523 unsigned int opcode; 523 unsigned int opcode;
524 524
525 if (unlikely(get_insn_opcode(regs, &opcode))) 525 if (unlikely(get_insn_opcode(regs, &opcode)))
@@ -534,13 +534,14 @@ static inline int simulate_rdhwr(struct pt_regs *regs)
534 switch (rd) { 534 switch (rd) {
535 case 29: 535 case 29:
536 regs->regs[rt] = ti->tp_value; 536 regs->regs[rt] = ti->tp_value;
537 break; 537 return 0;
538 default: 538 default:
539 return -EFAULT; 539 return -EFAULT;
540 } 540 }
541 } 541 }
542 542
543 return 0; 543 /* Not ours. */
544 return -EFAULT;
544} 545}
545 546
546asmlinkage void do_ov(struct pt_regs *regs) 547asmlinkage void do_ov(struct pt_regs *regs)
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 06be405be3..ae83b755cf 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -99,9 +99,9 @@ struct vpe {
99 99
100 /* elfloader stuff */ 100 /* elfloader stuff */
101 void *load_addr; 101 void *load_addr;
102 u32 len; 102 unsigned long len;
103 char *pbuffer; 103 char *pbuffer;
104 u32 plen; 104 unsigned long plen;
105 105
106 unsigned long __start; 106 unsigned long __start;
107 107
@@ -253,11 +253,11 @@ void dump_mtregs(void)
253} 253}
254 254
255/* Find some VPE program space */ 255/* Find some VPE program space */
256static void *alloc_progmem(u32 len) 256static void *alloc_progmem(unsigned long len)
257{ 257{
258#ifdef CONFIG_MIPS_VPE_LOADER_TOM 258#ifdef CONFIG_MIPS_VPE_LOADER_TOM
259 /* this means you must tell linux to use less memory than you physically have */ 259 /* this means you must tell linux to use less memory than you physically have */
260 return (void *)((max_pfn * PAGE_SIZE) + KSEG0); 260 return pfn_to_kaddr(max_pfn);
261#else 261#else
262 // simple grab some mem for now 262 // simple grab some mem for now
263 return kmalloc(len, GFP_KERNEL); 263 return kmalloc(len, GFP_KERNEL);
@@ -1171,7 +1171,8 @@ static int __init vpe_module_init(void)
1171 return -ENODEV; 1171 return -ENODEV;
1172 } 1172 }
1173 1173
1174 if ((major = register_chrdev(0, module_name, &vpe_fops) < 0)) { 1174 major = register_chrdev(0, module_name, &vpe_fops);
1175 if (major < 0) {
1175 printk("VPE loader: unable to register character device\n"); 1176 printk("VPE loader: unable to register character device\n");
1176 return major; 1177 return major;
1177 } 1178 }
diff --git a/arch/mips/lib/iomap.c b/arch/mips/lib/iomap.c
index b5d5fa8337..7e2ced715c 100644
--- a/arch/mips/lib/iomap.c
+++ b/arch/mips/lib/iomap.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * This code is based on lib/iomap.c, by Linus Torvalds. 4 * This code is based on lib/iomap.c, by Linus Torvalds.
5 * 5 *
6 * Copyright (C) 2004-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/math-emu/dp_fint.c b/arch/mips/math-emu/dp_fint.c
index 0065deaee2..a1962eb460 100644
--- a/arch/mips/math-emu/dp_fint.c
+++ b/arch/mips/math-emu/dp_fint.c
@@ -33,8 +33,6 @@ ieee754dp ieee754dp_fint(int x)
33 33
34 CLEARCX; 34 CLEARCX;
35 35
36 xc = ( 0 ? xc : xc );
37
38 if (x == 0) 36 if (x == 0)
39 return ieee754dp_zero(0); 37 return ieee754dp_zero(0);
40 if (x == 1 || x == -1) 38 if (x == 1 || x == -1)
diff --git a/arch/mips/math-emu/dp_flong.c b/arch/mips/math-emu/dp_flong.c
index cb105b1dd8..eae90a866a 100644
--- a/arch/mips/math-emu/dp_flong.c
+++ b/arch/mips/math-emu/dp_flong.c
@@ -33,8 +33,6 @@ ieee754dp ieee754dp_flong(s64 x)
33 33
34 CLEARCX; 34 CLEARCX;
35 35
36 xc = ( 0 ? xc : xc );
37
38 if (x == 0) 36 if (x == 0)
39 return ieee754dp_zero(0); 37 return ieee754dp_zero(0);
40 if (x == 1 || x == -1) 38 if (x == 1 || x == -1)
diff --git a/arch/mips/math-emu/sp_fint.c b/arch/mips/math-emu/sp_fint.c
index 42d9ed4b9a..7aac13afb0 100644
--- a/arch/mips/math-emu/sp_fint.c
+++ b/arch/mips/math-emu/sp_fint.c
@@ -33,8 +33,6 @@ ieee754sp ieee754sp_fint(int x)
33 33
34 CLEARCX; 34 CLEARCX;
35 35
36 xc = ( 0 ? xc : xc );
37
38 if (x == 0) 36 if (x == 0)
39 return ieee754sp_zero(0); 37 return ieee754sp_zero(0);
40 if (x == 1 || x == -1) 38 if (x == 1 || x == -1)
diff --git a/arch/mips/math-emu/sp_flong.c b/arch/mips/math-emu/sp_flong.c
index 1e26795cce..3d6c1d11c1 100644
--- a/arch/mips/math-emu/sp_flong.c
+++ b/arch/mips/math-emu/sp_flong.c
@@ -33,8 +33,6 @@ ieee754sp ieee754sp_flong(s64 x)
33 33
34 CLEARCX; 34 CLEARCX;
35 35
36 xc = ( 0 ? xc : xc );
37
38 if (x == 0) 36 if (x == 0)
39 return ieee754sp_zero(0); 37 return ieee754sp_zero(0);
40 if (x == 1 || x == -1) 38 if (x == 1 || x == -1)
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index 72a12d931c..93f3bf2c2b 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -75,20 +75,31 @@ static void mips_timer_dispatch (struct pt_regs *regs)
75 do_IRQ (mips_cpu_timer_irq, regs); 75 do_IRQ (mips_cpu_timer_irq, regs);
76} 76}
77 77
78extern int null_perf_irq(struct pt_regs *regs);
79
80extern int (*perf_irq)(struct pt_regs *regs);
81
78irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) 82irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
79{ 83{
80#ifdef CONFIG_SMP 84 int r2 = cpu_has_mips_r2;
81 int cpu = smp_processor_id(); 85 int cpu = smp_processor_id();
82 86
83 if (cpu == 0) { 87 if (cpu == 0) {
84 /* 88 /*
85 * CPU 0 handles the global timer interrupt job and process accounting 89 * CPU 0 handles the global timer interrupt job and process
86 * resets count/compare registers to trigger next timer int. 90 * accounting resets count/compare registers to trigger next
91 * timer int.
87 */ 92 */
88 (void) timer_interrupt(irq, dev_id, regs); 93 if (!r2 || (read_c0_cause() & (1 << 26)))
94 if (perf_irq(regs))
95 goto out;
96
97 /* we keep interrupt disabled all the time */
98 if (!r2 || (read_c0_cause() & (1 << 30)))
99 timer_interrupt(irq, NULL, regs);
100
89 scroll_display_message(); 101 scroll_display_message();
90 } 102 } else {
91 else {
92 /* Everyone else needs to reset the timer int here as 103 /* Everyone else needs to reset the timer int here as
93 ll_local_timer_interrupt doesn't */ 104 ll_local_timer_interrupt doesn't */
94 /* 105 /*
@@ -103,16 +114,8 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
103 local_timer_interrupt (irq, dev_id, regs); 114 local_timer_interrupt (irq, dev_id, regs);
104 } 115 }
105 116
117out:
106 return IRQ_HANDLED; 118 return IRQ_HANDLED;
107#else
108 irqreturn_t r;
109
110 r = timer_interrupt(irq, dev_id, regs);
111
112 scroll_display_message();
113
114 return r;
115#endif
116} 119}
117 120
118/* 121/*
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c
index e1dd7e0097..90fda0d991 100644
--- a/arch/mips/mips-boards/sead/sead_int.c
+++ b/arch/mips/mips-boards/sead/sead_int.c
@@ -30,19 +30,9 @@
30 30
31extern asmlinkage void mipsIRQ(void); 31extern asmlinkage void mipsIRQ(void);
32 32
33asmlinkage void sead_hw0_irqdispatch(struct pt_regs *regs)
34{
35 do_IRQ(SEADINT_UART0, regs);
36}
37
38asmlinkage void sead_hw1_irqdispatch(struct pt_regs *regs)
39{
40 do_IRQ(SEADINT_UART1, regs);
41}
42
43void __init arch_init_irq(void) 33void __init arch_init_irq(void)
44{ 34{
45 mips_cpu_irq_init(0); 35 mips_cpu_irq_init(MIPSCPU_INT_BASE);
46 36
47 /* Now safe to set the exception vector. */ 37 /* Now safe to set the exception vector. */
48 set_except_vector(0, mipsIRQ); 38 set_except_vector(0, mipsIRQ);
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index de90bec550..f966bc161d 100644
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -45,7 +45,7 @@ const char *get_system_type(void)
45 return "MIPS SEAD"; 45 return "MIPS SEAD";
46} 46}
47 47
48static void __init sead_setup(void) 48void __init plat_setup(void)
49{ 49{
50 ioport_resource.end = 0x7fffffff; 50 ioport_resource.end = 0x7fffffff;
51 51
@@ -69,7 +69,7 @@ static void __init serial_init(void)
69#else 69#else
70 s.iobase = SEAD_UART0_REGS_BASE+3; 70 s.iobase = SEAD_UART0_REGS_BASE+3;
71#endif 71#endif
72 s.irq = SEADINT_UART0; 72 s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
73 s.uartclk = SEAD_BASE_BAUD * 16; 73 s.uartclk = SEAD_BASE_BAUD * 16;
74 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; 74 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
75 s.iotype = 0; 75 s.iotype = 0;
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 38223b44d9..422b55fab0 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1183,8 +1183,8 @@ static void __init setup_scache(void)
1183 if (!sc_present) 1183 if (!sc_present)
1184 return; 1184 return;
1185 1185
1186 if ((c->isa_level == MIPS_CPU_ISA_M32 || 1186 if ((c->isa_level == MIPS_CPU_ISA_M32R1 ||
1187 c->isa_level == MIPS_CPU_ISA_M64) && 1187 c->isa_level == MIPS_CPU_ISA_M64R1) &&
1188 !(c->scache.flags & MIPS_CACHE_NOT_PRESENT)) 1188 !(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
1189 panic("Dunno how to handle MIPS32 / MIPS64 second level cache"); 1189 panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
1190 1190
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index f75ab748e8..4ee91c9a55 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -67,8 +67,8 @@ unsigned long setup_zero_pages(void)
67 67
68 page = virt_to_page(empty_zero_page); 68 page = virt_to_page(empty_zero_page);
69 while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { 69 while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
70 set_bit(PG_reserved, &page->flags); 70 SetPageReserved(page);
71 set_page_count(page, 0); 71 set_page_count(page, 1);
72 page++; 72 page++;
73 } 73 }
74 74
diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c
index d0b5c9dd0e..e5eceed1be 100644
--- a/arch/mips/momentum/ocelot_g/gt-irq.c
+++ b/arch/mips/momentum/ocelot_g/gt-irq.c
@@ -178,7 +178,7 @@ void gt64240_time_init(void)
178 timer.name = "timer"; 178 timer.name = "timer";
179 timer.dev_id = NULL; 179 timer.dev_id = NULL;
180 timer.next = NULL; 180 timer.next = NULL;
181 timer.mask = 0; 181 timer.mask = CPU_MASK_NONE;
182 irq_desc[6].action = &timer; 182 irq_desc[6].action = &timer;
183 183
184 enable_irq(6); 184 enable_irq(6);
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index dd2cc42f1b..53f9889b30 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -75,7 +75,10 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
75 int res; 75 int res;
76 76
77 switch (current_cpu_data.cputype) { 77 switch (current_cpu_data.cputype) {
78 case CPU_5KC:
79 case CPU_20KC:
78 case CPU_24K: 80 case CPU_24K:
81 case CPU_25KF:
79 lmodel = &op_model_mipsxx; 82 lmodel = &op_model_mipsxx;
80 break; 83 break;
81 84
diff --git a/arch/mips/oprofile/op_impl.h b/arch/mips/oprofile/op_impl.h
index f012155704..5cfce7d87a 100644
--- a/arch/mips/oprofile/op_impl.h
+++ b/arch/mips/oprofile/op_impl.h
@@ -12,8 +12,8 @@
12 12
13struct pt_regs; 13struct pt_regs;
14 14
15extern void null_perf_irq(struct pt_regs *regs); 15extern int null_perf_irq(struct pt_regs *regs);
16extern void (*perf_irq)(struct pt_regs *regs); 16extern int (*perf_irq)(struct pt_regs *regs);
17 17
18/* Per-counter configuration as set via oprofilefs. */ 18/* Per-counter configuration as set via oprofilefs. */
19struct op_counter_config { 19struct op_counter_config {
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index d36b64dfcb..1d1eee407f 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -114,11 +114,12 @@ static void mipsxx_cpu_stop(void *args)
114 } 114 }
115} 115}
116 116
117static void mipsxx_perfcount_handler(struct pt_regs *regs) 117static int mipsxx_perfcount_handler(struct pt_regs *regs)
118{ 118{
119 unsigned int counters = op_model_mipsxx.num_counters; 119 unsigned int counters = op_model_mipsxx.num_counters;
120 unsigned int control; 120 unsigned int control;
121 unsigned int counter; 121 unsigned int counter;
122 int handled = 0;
122 123
123 switch (counters) { 124 switch (counters) {
124#define HANDLE_COUNTER(n) \ 125#define HANDLE_COUNTER(n) \
@@ -129,12 +130,15 @@ static void mipsxx_perfcount_handler(struct pt_regs *regs)
129 (counter & M_COUNTER_OVERFLOW)) { \ 130 (counter & M_COUNTER_OVERFLOW)) { \
130 oprofile_add_sample(regs, n); \ 131 oprofile_add_sample(regs, n); \
131 write_c0_perfcntr ## n(reg.counter[n]); \ 132 write_c0_perfcntr ## n(reg.counter[n]); \
133 handled = 1; \
132 } 134 }
133 HANDLE_COUNTER(3) 135 HANDLE_COUNTER(3)
134 HANDLE_COUNTER(2) 136 HANDLE_COUNTER(2)
135 HANDLE_COUNTER(1) 137 HANDLE_COUNTER(1)
136 HANDLE_COUNTER(0) 138 HANDLE_COUNTER(0)
137 } 139 }
140
141 return handled;
138} 142}
139 143
140#define M_CONFIG1_PC (1 << 4) 144#define M_CONFIG1_PC (1 << 4)
@@ -176,17 +180,31 @@ static int __init mipsxx_init(void)
176 int counters; 180 int counters;
177 181
178 counters = n_counters(); 182 counters = n_counters();
179 if (counters == 0) 183 if (counters == 0) {
184 printk(KERN_ERR "Oprofile: CPU has no performance counters\n");
180 return -ENODEV; 185 return -ENODEV;
186 }
181 187
182 reset_counters(counters); 188 reset_counters(counters);
183 189
184 op_model_mipsxx.num_counters = counters; 190 op_model_mipsxx.num_counters = counters;
185 switch (current_cpu_data.cputype) { 191 switch (current_cpu_data.cputype) {
192 case CPU_20KC:
193 op_model_mipsxx.cpu_type = "mips/20K";
194 break;
195
186 case CPU_24K: 196 case CPU_24K:
187 op_model_mipsxx.cpu_type = "mips/24K"; 197 op_model_mipsxx.cpu_type = "mips/24K";
188 break; 198 break;
189 199
200 case CPU_25KF:
201 op_model_mipsxx.cpu_type = "mips/25K";
202 break;
203
204 case CPU_5KC:
205 op_model_mipsxx.cpu_type = "mips/5K";
206 break;
207
190 default: 208 default:
191 printk(KERN_ERR "Profiling unsupported for this CPU\n"); 209 printk(KERN_ERR "Profiling unsupported for this CPU\n");
192 210
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 7b74683040..741e67c919 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_MIPS_GT96100) += ops-gt96100.o
15obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o 15obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o
16obj-$(CONFIG_MIPS_MSC) += ops-msc.o 16obj-$(CONFIG_MIPS_MSC) += ops-msc.o
17obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o 17obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o
18obj-$(CONFIG_MIPS_TX3927) += ops-jmr3927.o 18obj-$(CONFIG_MIPS_TX3927) += ops-tx3927.o
19obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o 19obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o
20obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o 20obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o
21 21
diff --git a/arch/mips/pci/fixup-capcella.c b/arch/mips/pci/fixup-capcella.c
index f2fc82c1c7..1e53075193 100644
--- a/arch/mips/pci/fixup-capcella.c
+++ b/arch/mips/pci/fixup-capcella.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fixup-cappcela.c, The ZAO Networks Capcella specific PCI fixups. 2 * fixup-cappcela.c, The ZAO Networks Capcella specific PCI fixups.
3 * 3 *
4 * Copyright (C) 2002,2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2002,2004 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c
index 4975846da7..b67ddaa471 100644
--- a/arch/mips/pci/fixup-mpc30x.c
+++ b/arch/mips/pci/fixup-mpc30x.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fixup-mpc30x.c, The Victor MP-C303/304 specific PCI fixups. 2 * fixup-mpc30x.c, The Victor MP-C303/304 specific PCI fixups.
3 * 3 *
4 * Copyright (C) 2002,2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2002,2004 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pci/fixup-tb0219.c b/arch/mips/pci/fixup-tb0219.c
index bc55b06e19..734f2b71e1 100644
--- a/arch/mips/pci/fixup-tb0219.c
+++ b/arch/mips/pci/fixup-tb0219.c
@@ -2,7 +2,7 @@
2 * fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups. 2 * fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups.
3 * 3 *
4 * Copyright (C) 2003 Megasolution Inc. <matsu@megasolution.jp> 4 * Copyright (C) 2003 Megasolution Inc. <matsu@megasolution.jp>
5 * Copyright (C) 2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 5 * Copyright (C) 2004 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pci/fixup-tb0226.c b/arch/mips/pci/fixup-tb0226.c
index b5d42b12de..c9e7cb4361 100644
--- a/arch/mips/pci/fixup-tb0226.c
+++ b/arch/mips/pci/fixup-tb0226.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fixup-tb0226.c, The TANBAC TB0226 specific PCI fixups. 2 * fixup-tb0226.c, The TANBAC TB0226 specific PCI fixups.
3 * 3 *
4 * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2002-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pci/fixup-tb0287.c b/arch/mips/pci/fixup-tb0287.c
index 8436d7f1fd..fbe6bcb281 100644
--- a/arch/mips/pci/fixup-tb0287.c
+++ b/arch/mips/pci/fixup-tb0287.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * fixup-tb0287.c, The TANBAC TB0287 specific PCI fixups. 2 * fixup-tb0287.c, The TANBAC TB0287 specific PCI fixups.
3 * 3 *
4 * Copyright (C) 2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index 0e0daadc30..42530a0b84 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -72,13 +72,9 @@ static inline int check_abort(void)
72static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn, 72static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
73 int where, int size, u32 * val) 73 int where, int size, u32 * val)
74{ 74{
75 int ret, busno; 75 int ret;
76 76
77 /* check if the bus is top-level */ 77 ret = mkaddr(bus->number, devfn, where);
78 if (bus->parent != NULL)
79 busno = bus->number;
80
81 ret = mkaddr(busno, devfn, where);
82 if (ret) 78 if (ret)
83 return ret; 79 return ret;
84 80
@@ -102,15 +98,9 @@ static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
102static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn, 98static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
103 int where, int size, u32 val) 99 int where, int size, u32 val)
104{ 100{
105 int ret, busno; 101 int ret;
106
107 /* check if the bus is top-level */
108 if (bus->parent != NULL)
109 bus = bus->number;
110 else
111 bus = 0;
112 102
113 ret = mkaddr(busno, devfn, where); 103 ret = mkaddr(bus->number, devfn, where);
114 if (ret) 104 if (ret)
115 return ret; 105 return ret;
116 106
@@ -120,7 +110,7 @@ static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
120 break; 110 break;
121 111
122 case 2: 112 case 2:
123 *(volatile u16 *) (unsigned longulong) & tx3927_pcicptr->icd | (where & 2)) = 113 *(volatile u16 *) ((unsigned long) & tx3927_pcicptr->icd | (where & 2)) =
124 cpu_to_le16(val); 114 cpu_to_le16(val);
125 break; 115 break;
126 116
@@ -137,8 +127,8 @@ static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
137} 127}
138 128
139struct pci_ops jmr3927_pci_ops = { 129struct pci_ops jmr3927_pci_ops = {
140 jmr3927_pcibios_read_config, 130 jmr3927_pci_read_config,
141 jmr3927_pcibios_write_config, 131 jmr3927_pci_write_config,
142}; 132};
143 133
144 134
@@ -159,15 +149,14 @@ unsigned long tc_readl(volatile __u32 * addr)
159{ 149{
160 unsigned long val; 150 unsigned long val;
161 151
162 addr = PHYSADDR(addr); 152 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
163 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 153 (unsigned long) CPHYSADDR(addr);
164 (unsigned long) addr; 154 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
165 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe =
166 (PCI_IPCIBE_ICMD_MEMREAD << PCI_IPCIBE_ICMD_SHIFT) | 155 (PCI_IPCIBE_ICMD_MEMREAD << PCI_IPCIBE_ICMD_SHIFT) |
167 PCI_IPCIBE_IBE_LONG; 156 PCI_IPCIBE_IBE_LONG;
168 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 157 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
169 val = 158 val =
170 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 159 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
171 ipcidata); 160 ipcidata);
172 /* clear by setting */ 161 /* clear by setting */
173 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC; 162 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
@@ -176,12 +165,11 @@ unsigned long tc_readl(volatile __u32 * addr)
176 165
177void tc_writel(unsigned long data, volatile __u32 * addr) 166void tc_writel(unsigned long data, volatile __u32 * addr)
178{ 167{
179 addr = PHYSADDR(addr); 168 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata =
180 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata =
181 cpu_to_le32(data); 169 cpu_to_le32(data);
182 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 170 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
183 (unsigned long) addr; 171 (unsigned long) CPHYSADDR(addr);
184 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 172 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
185 (PCI_IPCIBE_ICMD_MEMWRITE << PCI_IPCIBE_ICMD_SHIFT) | 173 (PCI_IPCIBE_ICMD_MEMWRITE << PCI_IPCIBE_ICMD_SHIFT) |
186 PCI_IPCIBE_IBE_LONG; 174 PCI_IPCIBE_IBE_LONG;
187 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 175 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
@@ -198,21 +186,15 @@ unsigned char tx_ioinb(unsigned char *addr)
198 186
199 ioaddr = (unsigned long) addr; 187 ioaddr = (unsigned long) addr;
200 offset = ioaddr & 0x3; 188 offset = ioaddr & 0x3;
201 if (offset == 0) 189 byte = 0xf & ~(8 >> offset);
202 byte = 0x7; 190
203 else if (offset == 1) 191 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
204 byte = 0xb;
205 else if (offset == 2)
206 byte = 0xd;
207 else if (offset == 3)
208 byte = 0xe;
209 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
210 (unsigned long) ioaddr; 192 (unsigned long) ioaddr;
211 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 193 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
212 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte; 194 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte;
213 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 195 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
214 val = 196 val =
215 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 197 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
216 ipcidata); 198 ipcidata);
217 val = val & 0xff; 199 val = val & 0xff;
218 /* clear by setting */ 200 /* clear by setting */
@@ -229,18 +211,12 @@ void tx_iooutb(unsigned long data, unsigned char *addr)
229 data = data | (data << 8) | (data << 16) | (data << 24); 211 data = data | (data << 8) | (data << 16) | (data << 24);
230 ioaddr = (unsigned long) addr; 212 ioaddr = (unsigned long) addr;
231 offset = ioaddr & 0x3; 213 offset = ioaddr & 0x3;
232 if (offset == 0) 214 byte = 0xf & ~(8 >> offset);
233 byte = 0x7; 215
234 else if (offset == 1) 216 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata = data;
235 byte = 0xb; 217 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
236 else if (offset == 2)
237 byte = 0xd;
238 else if (offset == 3)
239 byte = 0xe;
240 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata = data;
241 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
242 (unsigned long) ioaddr; 218 (unsigned long) ioaddr;
243 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 219 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
244 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte; 220 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte;
245 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 221 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
246 /* clear by setting */ 222 /* clear by setting */
@@ -255,18 +231,16 @@ unsigned short tx_ioinw(unsigned short *addr)
255 int byte; 231 int byte;
256 232
257 ioaddr = (unsigned long) addr; 233 ioaddr = (unsigned long) addr;
258 offset = ioaddr & 0x3; 234 offset = ioaddr & 0x2;
259 if (offset == 0) 235 byte = 3 << offset;
260 byte = 0x3; 236
261 else if (offset == 2) 237 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
262 byte = 0xc;
263 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
264 (unsigned long) ioaddr; 238 (unsigned long) ioaddr;
265 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 239 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
266 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte; 240 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte;
267 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 241 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
268 val = 242 val =
269 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 243 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
270 ipcidata); 244 ipcidata);
271 val = val & 0xffff; 245 val = val & 0xffff;
272 /* clear by setting */ 246 /* clear by setting */
@@ -283,15 +257,13 @@ void tx_iooutw(unsigned long data, unsigned short *addr)
283 257
284 data = data | (data << 16); 258 data = data | (data << 16);
285 ioaddr = (unsigned long) addr; 259 ioaddr = (unsigned long) addr;
286 offset = ioaddr & 0x3; 260 offset = ioaddr & 0x2;
287 if (offset == 0) 261 byte = 3 << offset;
288 byte = 0x3; 262
289 else if (offset == 2) 263 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata = data;
290 byte = 0xc; 264 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
291 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata = data;
292 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
293 (unsigned long) ioaddr; 265 (unsigned long) ioaddr;
294 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 266 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
295 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte; 267 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte;
296 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 268 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
297 /* clear by setting */ 269 /* clear by setting */
@@ -304,14 +276,14 @@ unsigned long tx_ioinl(unsigned int *addr)
304 __u32 ioaddr; 276 __u32 ioaddr;
305 277
306 ioaddr = (unsigned long) addr; 278 ioaddr = (unsigned long) addr;
307 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 279 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
308 (unsigned long) ioaddr; 280 (unsigned long) ioaddr;
309 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 281 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
310 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | 282 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) |
311 PCI_IPCIBE_IBE_LONG; 283 PCI_IPCIBE_IBE_LONG;
312 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 284 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
313 val = 285 val =
314 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 286 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
315 ipcidata); 287 ipcidata);
316 /* clear by setting */ 288 /* clear by setting */
317 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC; 289 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
@@ -323,11 +295,11 @@ void tx_iooutl(unsigned long data, unsigned int *addr)
323 __u32 ioaddr; 295 __u32 ioaddr;
324 296
325 ioaddr = (unsigned long) addr; 297 ioaddr = (unsigned long) addr;
326 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata = 298 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata =
327 cpu_to_le32(data); 299 cpu_to_le32(data);
328 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 300 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
329 (unsigned long) ioaddr; 301 (unsigned long) ioaddr;
330 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 302 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
331 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | 303 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) |
332 PCI_IPCIBE_IBE_LONG; 304 PCI_IPCIBE_IBE_LONG;
333 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 305 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
diff --git a/arch/mips/pci/ops-vr41xx.c b/arch/mips/pci/ops-vr41xx.c
index 430429b22a..900c6b3257 100644
--- a/arch/mips/pci/ops-vr41xx.c
+++ b/arch/mips/pci/ops-vr41xx.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2003 MontaVista Software Inc. 4 * Copyright (C) 2001-2003 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
6 * Copyright (C) 2004-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c
index 95a028769e..f02ef6e36b 100644
--- a/arch/mips/pci/pci-jmr3927.c
+++ b/arch/mips/pci/pci-jmr3927.c
@@ -54,5 +54,5 @@ struct pci_controller jmr3927_controller = {
54 .pci_ops = &jmr3927_pci_ops, 54 .pci_ops = &jmr3927_pci_ops,
55 .io_resource = &pci_io_resource, 55 .io_resource = &pci_io_resource,
56 .mem_resource = &pci_mem_resource, 56 .mem_resource = &pci_mem_resource,
57 .mem_offset = JMR3927_PCIMEM; 57 .mem_offset = JMR3927_PCIMEM
58}; 58};
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c
index 91df4da7dd..9885fa4036 100644
--- a/arch/mips/pci/pci-vr41xx.c
+++ b/arch/mips/pci/pci-vr41xx.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2003 MontaVista Software Inc. 4 * Copyright (C) 2001-2003 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
6 * Copyright (C) 2004-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) 7 * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org)
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
diff --git a/arch/mips/pci/pci-vr41xx.h b/arch/mips/pci/pci-vr41xx.h
index e087ec5564..8a35e32b83 100644
--- a/arch/mips/pci/pci-vr41xx.h
+++ b/arch/mips/pci/pci-vr41xx.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2002 MontaVista Software Inc. 4 * Copyright (C) 2002 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
6 * Copyright (C) 2004-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2004-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 0527170d6a..f17f575f58 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -93,8 +93,8 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
93 */ 93 */
94void prom_boot_secondary(int cpu, struct task_struct *idle) 94void prom_boot_secondary(int cpu, struct task_struct *idle)
95{ 95{
96 unsigned long gp = (unsigned long) idle->thread_info; 96 unsigned long gp = (unsigned long) task_thread_info(idle);
97 unsigned long sp = gp + THREAD_SIZE - 32; 97 unsigned long sp = __KSTK_TOP(idle);
98 98
99 secondary_sp = sp; 99 secondary_sp = sp;
100 secondary_gp = gp; 100 secondary_gp = gp;
diff --git a/arch/mips/qemu/q-firmware.c b/arch/mips/qemu/q-firmware.c
index 5980f02b2d..fb2a8673a6 100644
--- a/arch/mips/qemu/q-firmware.c
+++ b/arch/mips/qemu/q-firmware.c
@@ -1,7 +1,18 @@
1#include <linux/init.h> 1#include <linux/init.h>
2#include <linux/string.h>
3#include <asm/addrspace.h>
2#include <asm/bootinfo.h> 4#include <asm/bootinfo.h>
3 5
4void __init prom_init(void) 6void __init prom_init(void)
5{ 7{
6 add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM); 8 int *cmdline;
9
10 cmdline = (int *) (CKSEG0 + (0x10 << 20) - 260);
11 if (*cmdline == 0x12345678) {
12 if (*(char *)(cmdline + 1))
13 strcpy (arcs_cmdline, (char *)(cmdline + 1));
14 add_memory_region(0x0<<20, cmdline[-1], BOOT_MEM_RAM);
15 } else {
16 add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM);
17 }
7} 18}
diff --git a/arch/mips/sgi-ip27/ip27-berr.c b/arch/mips/sgi-ip27/ip27-berr.c
index 07631a9767..ce907eda22 100644
--- a/arch/mips/sgi-ip27/ip27-berr.c
+++ b/arch/mips/sgi-ip27/ip27-berr.c
@@ -11,6 +11,7 @@
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/module.h> 12#include <linux/module.h>
13#include <linux/signal.h> /* for SIGBUS */ 13#include <linux/signal.h> /* for SIGBUS */
14#include <linux/sched.h> /* schow_regs(), force_sig() */
14 15
15#include <asm/module.h> 16#include <asm/module.h>
16#include <asm/sn/addrs.h> 17#include <asm/sn/addrs.h>
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 3a8291b7d2..dbef3f6b56 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -168,8 +168,8 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
168 */ 168 */
169void __init prom_boot_secondary(int cpu, struct task_struct *idle) 169void __init prom_boot_secondary(int cpu, struct task_struct *idle)
170{ 170{
171 unsigned long gp = (unsigned long) idle->thread_info; 171 unsigned long gp = (unsigned long)task_thread_info(idle);
172 unsigned long sp = gp + THREAD_SIZE - 32; 172 unsigned long sp = __KSTK_TOS(idle);
173 173
174 LAUNCH_SLAVE(cputonasid(cpu),cputoslice(cpu), 174 LAUNCH_SLAVE(cputonasid(cpu),cputoslice(cpu),
175 (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap), 175 (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap),
diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c
index eb3a16a04f..41b5eca114 100644
--- a/arch/mips/sgi-ip32/crime.c
+++ b/arch/mips/sgi-ip32/crime.c
@@ -10,6 +10,7 @@
10#include <linux/init.h> 10#include <linux/init.h>
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/interrupt.h> 12#include <linux/interrupt.h>
13#include <linux/module.h>
13#include <asm/bootinfo.h> 14#include <asm/bootinfo.h>
14#include <asm/io.h> 15#include <asm/io.h>
15#include <asm/mipsregs.h> 16#include <asm/mipsregs.h>
@@ -18,8 +19,10 @@
18#include <asm/ip32/crime.h> 19#include <asm/ip32/crime.h>
19#include <asm/ip32/mace.h> 20#include <asm/ip32/mace.h>
20 21
21struct sgi_crime *crime; 22struct sgi_crime __iomem *crime;
22struct sgi_mace *mace; 23struct sgi_mace __iomem *mace;
24
25EXPORT_SYMBOL_GPL(mace);
23 26
24void __init crime_init(void) 27void __init crime_init(void)
25{ 28{
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c
index e8485124b8..4477af3d80 100644
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
@@ -60,7 +60,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
60 60
61 retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap, 61 retval = cfe_cpu_start(cpu_logical_map(cpu), &smp_bootstrap,
62 __KSTK_TOS(idle), 62 __KSTK_TOS(idle),
63 (unsigned long)idle->thread_info, 0); 63 (unsigned long)task_thread_info(idle), 0);
64 if (retval != 0) 64 if (retval != 0)
65 printk("cfe_start_cpu(%i) returned %i\n" , cpu, retval); 65 printk("cfe_start_cpu(%i) returned %i\n" , cpu, retval);
66} 66}
diff --git a/arch/mips/vr41xx/casio-e55/setup.c b/arch/mips/vr41xx/casio-e55/setup.c
index d29201acc4..814900915c 100644
--- a/arch/mips/vr41xx/casio-e55/setup.c
+++ b/arch/mips/vr41xx/casio-e55/setup.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * setup.c, Setup for the CASIO CASSIOPEIA E-11/15/55/65. 2 * setup.c, Setup for the CASIO CASSIOPEIA E-11/15/55/65.
3 * 3 *
4 * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2002-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/vr41xx/common/bcu.c b/arch/mips/vr41xx/common/bcu.c
index cdfa4273a1..de0c1b35f1 100644
--- a/arch/mips/vr41xx/common/bcu.c
+++ b/arch/mips/vr41xx/common/bcu.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2002 MontaVista Software Inc. 4 * Copyright (C) 2002 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com>
6 * Copyright (C) 2003-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
25 * - New creation, NEC VR4122 and VR4131 are supported. 25 * - New creation, NEC VR4122 and VR4131 are supported.
26 * - Added support for NEC VR4111 and VR4121. 26 * - Added support for NEC VR4111 and VR4121.
27 * 27 *
28 * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 28 * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
29 * - Added support for NEC VR4133. 29 * - Added support for NEC VR4133.
30 */ 30 */
31#include <linux/kernel.h> 31#include <linux/kernel.h>
diff --git a/arch/mips/vr41xx/common/cmu.c b/arch/mips/vr41xx/common/cmu.c
index d758e43296..657c5133c9 100644
--- a/arch/mips/vr41xx/common/cmu.c
+++ b/arch/mips/vr41xx/common/cmu.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2002 MontaVista Software Inc. 4 * Copyright (C) 2001-2002 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
6 * Copuright (C) 2003-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copuright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
25 * - New creation, NEC VR4122 and VR4131 are supported. 25 * - New creation, NEC VR4122 and VR4131 are supported.
26 * - Added support for NEC VR4111 and VR4121. 26 * - Added support for NEC VR4111 and VR4121.
27 * 27 *
28 * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 28 * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
29 * - Added support for NEC VR4133. 29 * - Added support for NEC VR4133.
30 */ 30 */
31#include <linux/init.h> 31#include <linux/init.h>
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index 0b73c5ab3c..07ae19cf0c 100644
--- a/arch/mips/vr41xx/common/icu.c
+++ b/arch/mips/vr41xx/common/icu.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2002 MontaVista Software Inc. 4 * Copyright (C) 2001-2002 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
6 * Copyright (C) 2003-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
25 * - New creation, NEC VR4122 and VR4131 are supported. 25 * - New creation, NEC VR4122 and VR4131 are supported.
26 * - Added support for NEC VR4111 and VR4121. 26 * - Added support for NEC VR4111 and VR4121.
27 * 27 *
28 * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 28 * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
29 * - Coped with INTASSIGN of NEC VR4133. 29 * - Coped with INTASSIGN of NEC VR4133.
30 */ 30 */
31#include <linux/errno.h> 31#include <linux/errno.h>
diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index 578f6496ff..707bd0933e 100644
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * init.c, Common initialization routines for NEC VR4100 series. 2 * init.c, Common initialization routines for NEC VR4100 series.
3 * 3 *
4 * Copyright (C) 2003-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/vr41xx/common/int-handler.S b/arch/mips/vr41xx/common/int-handler.S
index 272c13aee4..2b6043f16d 100644
--- a/arch/mips/vr41xx/common/int-handler.S
+++ b/arch/mips/vr41xx/common/int-handler.S
@@ -35,7 +35,7 @@
35 * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com> 35 * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
36 * - New creation, NEC VR4100 series are supported. 36 * - New creation, NEC VR4100 series are supported.
37 * 37 *
38 * Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 38 * Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
39 * - Coped with INTASSIGN of NEC VR4133. 39 * - Coped with INTASSIGN of NEC VR4133.
40 */ 40 */
41#include <asm/asm.h> 41#include <asm/asm.h>
diff --git a/arch/mips/vr41xx/common/irq.c b/arch/mips/vr41xx/common/irq.c
index 43b214d394..61aa264275 100644
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Interrupt handing routines for NEC VR4100 series. 2 * Interrupt handing routines for NEC VR4100 series.
3 * 3 *
4 * Copyright (C) 2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/vr41xx/common/pmu.c b/arch/mips/vr41xx/common/pmu.c
index 53166f3598..02bf4f7d06 100644
--- a/arch/mips/vr41xx/common/pmu.c
+++ b/arch/mips/vr41xx/common/pmu.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * pmu.c, Power Management Unit routines for NEC VR4100 series. 2 * pmu.c, Power Management Unit routines for NEC VR4100 series.
3 * 3 *
4 * Copyright (C) 2003-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/vr41xx/common/type.c b/arch/mips/vr41xx/common/type.c
index bcb5f71b50..e0c1ac5e98 100644
--- a/arch/mips/vr41xx/common/type.c
+++ b/arch/mips/vr41xx/common/type.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * type.c, System type for NEC VR4100 series. 2 * type.c, System type for NEC VR4100 series.
3 * 3 *
4 * Copyright (C) 2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c
index 462a9af30e..3e31f8193d 100644
--- a/arch/mips/vr41xx/common/vrc4173.c
+++ b/arch/mips/vr41xx/common/vrc4173.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2003 MontaVista Software Inc. 4 * Copyright (C) 2001-2003 MontaVista Software Inc.
5 * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com> 5 * Author: Yoichi Yuasa <yyuasa@mvista.com, or source@mvista.com>
6 * Copyright (C) 2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 6 * Copyright (C) 2004 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
7 * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org) 7 * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org)
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
@@ -561,7 +561,7 @@ static int __devinit vrc4173_init(void)
561{ 561{
562 int err; 562 int err;
563 563
564 err = pci_module_init(&vrc4173_driver); 564 err = pci_register_driver(&vrc4173_driver);
565 if (err < 0) 565 if (err < 0)
566 return err; 566 return err;
567 567
diff --git a/arch/mips/vr41xx/ibm-workpad/setup.c b/arch/mips/vr41xx/ibm-workpad/setup.c
index e4b34ad6ea..50fe8af4c5 100644
--- a/arch/mips/vr41xx/ibm-workpad/setup.c
+++ b/arch/mips/vr41xx/ibm-workpad/setup.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * setup.c, Setup for the IBM WorkPad z50. 2 * setup.c, Setup for the IBM WorkPad z50.
3 * 3 *
4 * Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp> 4 * Copyright (C) 2002-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-24 12:13:57 -0400