aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2006-04-02 00:08:05 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2006-04-02 00:08:05 -0500
commit95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch)
tree65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/mips
parent642fde17dceceb56c7ba2762733ac688666ae657 (diff)
parent683aa4012f53b2ada0f430487e05d37b0d94e90a (diff)
Manual merge with Linus.
Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig14
-rw-r--r--arch/mips/Makefile236
-rw-r--r--arch/mips/arc/memory.c2
-rw-r--r--arch/mips/arc/misc.c19
-rw-r--r--arch/mips/au1000/common/cputable.c2
-rw-r--r--arch/mips/au1000/common/dbdma.c4
-rw-r--r--arch/mips/au1000/common/dma.c2
-rw-r--r--arch/mips/au1000/common/platform.c8
-rw-r--r--arch/mips/au1000/common/reset.c10
-rw-r--r--arch/mips/au1000/common/setup.c4
-rw-r--r--arch/mips/au1000/common/time.c2
-rw-r--r--arch/mips/cobalt/Kconfig7
-rw-r--r--arch/mips/cobalt/Makefile2
-rw-r--r--arch/mips/cobalt/console.c43
-rw-r--r--arch/mips/cobalt/setup.c13
-rw-r--r--arch/mips/configs/atlas_defconfig101
-rw-r--r--arch/mips/configs/bigsur_defconfig37
-rw-r--r--arch/mips/configs/capcella_defconfig54
-rw-r--r--arch/mips/configs/cobalt_defconfig78
-rw-r--r--arch/mips/configs/db1000_defconfig52
-rw-r--r--arch/mips/configs/db1100_defconfig52
-rw-r--r--arch/mips/configs/db1200_defconfig51
-rw-r--r--arch/mips/configs/db1500_defconfig99
-rw-r--r--arch/mips/configs/db1550_defconfig56
-rw-r--r--arch/mips/configs/ddb5476_defconfig35
-rw-r--r--arch/mips/configs/ddb5477_defconfig34
-rw-r--r--arch/mips/configs/decstation_defconfig33
-rw-r--r--arch/mips/configs/e55_defconfig50
-rw-r--r--arch/mips/configs/ev64120_defconfig34
-rw-r--r--arch/mips/configs/ev96100_defconfig30
-rw-r--r--arch/mips/configs/ip22_defconfig80
-rw-r--r--arch/mips/configs/ip27_defconfig42
-rw-r--r--arch/mips/configs/ip32_defconfig46
-rw-r--r--arch/mips/configs/it8172_defconfig32
-rw-r--r--arch/mips/configs/ivr_defconfig34
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig26
-rw-r--r--arch/mips/configs/jmr3927_defconfig35
-rw-r--r--arch/mips/configs/lasat200_defconfig35
-rw-r--r--arch/mips/configs/malta_defconfig95
-rw-r--r--arch/mips/configs/mipssim_defconfig31
-rw-r--r--arch/mips/configs/mpc30x_defconfig53
-rw-r--r--arch/mips/configs/ocelot_3_defconfig64
-rw-r--r--arch/mips/configs/ocelot_c_defconfig35
-rw-r--r--arch/mips/configs/ocelot_defconfig30
-rw-r--r--arch/mips/configs/ocelot_g_defconfig35
-rw-r--r--arch/mips/configs/pb1100_defconfig52
-rw-r--r--arch/mips/configs/pb1500_defconfig56
-rw-r--r--arch/mips/configs/pb1550_defconfig56
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig48
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig68
-rw-r--r--arch/mips/configs/qemu_defconfig16
-rw-r--r--arch/mips/configs/rbhma4500_defconfig58
-rw-r--r--arch/mips/configs/rm200_defconfig103
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig37
-rw-r--r--arch/mips/configs/sead_defconfig22
-rw-r--r--arch/mips/configs/tb0226_defconfig68
-rw-r--r--arch/mips/configs/tb0229_defconfig56
-rw-r--r--arch/mips/configs/tb0287_defconfig1105
-rw-r--r--arch/mips/configs/workpad_defconfig50
-rw-r--r--arch/mips/configs/yosemite_defconfig29
-rw-r--r--arch/mips/ddb5xxx/common/rtc_ds1386.c4
-rw-r--r--arch/mips/dec/prom/memory.c4
-rw-r--r--arch/mips/dec/time.c51
-rw-r--r--arch/mips/defconfig80
-rw-r--r--arch/mips/ite-boards/generic/time.c4
-rw-r--r--arch/mips/ite-boards/ivr/init.c3
-rw-r--r--arch/mips/ite-boards/qed-4n-s01b/init.c3
-rw-r--r--arch/mips/jazz/int-handler.S12
-rw-r--r--arch/mips/jmr3927/common/rtc_ds1742.c4
-rw-r--r--arch/mips/kernel/cpu-probe.c6
-rw-r--r--arch/mips/kernel/gdb-low.S2
-rw-r--r--arch/mips/kernel/irixsig.c4
-rw-r--r--arch/mips/kernel/irq.c10
-rw-r--r--arch/mips/kernel/linux32.c252
-rw-r--r--arch/mips/kernel/proc.c1
-rw-r--r--arch/mips/kernel/process.c17
-rw-r--r--arch/mips/kernel/scall64-n32.S2
-rw-r--r--arch/mips/kernel/scall64-o32.S2
-rw-r--r--arch/mips/kernel/setup.c20
-rw-r--r--arch/mips/kernel/signal-common.h10
-rw-r--r--arch/mips/kernel/signal.c6
-rw-r--r--arch/mips/kernel/signal32.c46
-rw-r--r--arch/mips/kernel/signal_n32.c5
-rw-r--r--arch/mips/kernel/smp.c4
-rw-r--r--arch/mips/kernel/syscall.c7
-rw-r--r--arch/mips/kernel/sysirix.c22
-rw-r--r--arch/mips/kernel/time.c28
-rw-r--r--arch/mips/kernel/traps.c2
-rw-r--r--arch/mips/lasat/image/romscript.normal5
-rw-r--r--arch/mips/lasat/setup.c7
-rw-r--r--arch/mips/lasat/sysctl.c63
-rw-r--r--arch/mips/mips-boards/atlas/atlas_setup.c2
-rw-r--r--arch/mips/mips-boards/generic/memory.c9
-rw-r--r--arch/mips/mips-boards/generic/mipsIRQ.S2
-rw-r--r--arch/mips/mips-boards/malta/malta_setup.c2
-rw-r--r--arch/mips/mips-boards/sim/sim_IRQ.c2
-rw-r--r--arch/mips/mips-boards/sim/sim_irq.S2
-rw-r--r--arch/mips/mips-boards/sim/sim_mem.c9
-rw-r--r--arch/mips/mips-boards/sim/sim_smp.c2
-rw-r--r--arch/mips/mm/Makefile2
-rw-r--r--arch/mips/mm/c-r3k.c18
-rw-r--r--arch/mips/mm/c-r4k.c14
-rw-r--r--arch/mips/mm/c-tx39.c1
-rw-r--r--arch/mips/mm/dma-ip32.c6
-rw-r--r--arch/mips/mm/init.c15
-rw-r--r--arch/mips/mm/pg-r4k.c10
-rw-r--r--arch/mips/mm/sc-rm7k.c25
-rw-r--r--arch/mips/mm/tlb-andes.c259
-rw-r--r--arch/mips/mm/tlb-r4k.c5
-rw-r--r--arch/mips/mm/tlbex.c13
-rw-r--r--arch/mips/momentum/jaguar_atx/reset.c2
-rw-r--r--arch/mips/momentum/jaguar_atx/setup.c6
-rw-r--r--arch/mips/momentum/ocelot_3/reset.c2
-rw-r--r--arch/mips/momentum/ocelot_3/setup.c38
-rw-r--r--arch/mips/momentum/ocelot_c/reset.c2
-rw-r--r--arch/mips/momentum/ocelot_c/setup.c4
-rw-r--r--arch/mips/pci/fixup-vr4133.c2
-rw-r--r--arch/mips/pci/ops-ddb5477.c4
-rw-r--r--arch/mips/pci/ops-tx4938.c16
-rw-r--r--arch/mips/pci/pci-bcm1480.c2
-rw-r--r--arch/mips/pci/pci-bcm1480ht.c2
-rw-r--r--arch/mips/pci/pci-ip27.c12
-rw-r--r--arch/mips/philips/pnx8550/common/int.c2
-rw-r--r--arch/mips/pmc-sierra/yosemite/setup.c4
-rw-r--r--arch/mips/qemu/Makefile2
-rw-r--r--arch/mips/qemu/q-smp.c48
-rw-r--r--arch/mips/sgi-ip22/ip22-reset.c2
-rw-r--r--arch/mips/sgi-ip22/ip22-time.c4
-rw-r--r--arch/mips/sgi-ip27/ip27-irq.c5
-rw-r--r--arch/mips/sgi-ip27/ip27-memory.c9
-rw-r--r--arch/mips/sgi-ip32/ip32-reset.c2
-rw-r--r--arch/mips/sgi-ip32/ip32-setup.c6
-rw-r--r--arch/mips/sibyte/sb1250/time.c77
-rw-r--r--arch/mips/sibyte/swarm/setup.c15
-rw-r--r--arch/mips/sni/setup.c4
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c4
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c4
-rw-r--r--arch/mips/tx4938/common/rtc_rx5c348.c16
-rw-r--r--arch/mips/tx4938/toshiba_rbtx4938/setup.c2
-rw-r--r--arch/mips/vr41xx/common/bcu.c6
140 files changed, 2157 insertions, 2892 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 6d4333776d28..e15709ce8866 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -604,7 +604,7 @@ config SGI_IP32
604 If you want this kernel to run on SGI O2 workstation, say Y here. 604 If you want this kernel to run on SGI O2 workstation, say Y here.
605 605
606config SIBYTE_BIGSUR 606config SIBYTE_BIGSUR
607 bool "Support for Sibyte BigSur" 607 bool "Support for Sibyte BCM91480B-BigSur"
608 select BOOT_ELF32 608 select BOOT_ELF32
609 select DMA_COHERENT 609 select DMA_COHERENT
610 select PCI_DOMAINS 610 select PCI_DOMAINS
@@ -793,6 +793,7 @@ source "arch/mips/tx4927/Kconfig"
793source "arch/mips/tx4938/Kconfig" 793source "arch/mips/tx4938/Kconfig"
794source "arch/mips/vr41xx/Kconfig" 794source "arch/mips/vr41xx/Kconfig"
795source "arch/mips/philips/pnx8550/common/Kconfig" 795source "arch/mips/philips/pnx8550/common/Kconfig"
796source "arch/mips/cobalt/Kconfig"
796 797
797endmenu 798endmenu
798 799
@@ -803,6 +804,14 @@ config RWSEM_GENERIC_SPINLOCK
803config RWSEM_XCHGADD_ALGORITHM 804config RWSEM_XCHGADD_ALGORITHM
804 bool 805 bool
805 806
807config GENERIC_FIND_NEXT_BIT
808 bool
809 default y
810
811config GENERIC_HWEIGHT
812 bool
813 default y
814
806config GENERIC_CALIBRATE_DELAY 815config GENERIC_CALIBRATE_DELAY
807 bool 816 bool
808 default y 817 default y
@@ -1162,6 +1171,7 @@ config CPU_R4X00
1162config CPU_TX49XX 1171config CPU_TX49XX
1163 bool "R49XX" 1172 bool "R49XX"
1164 depends on SYS_HAS_CPU_TX49XX 1173 depends on SYS_HAS_CPU_TX49XX
1174 select CPU_HAS_PREFETCH
1165 select CPU_SUPPORTS_32BIT_KERNEL 1175 select CPU_SUPPORTS_32BIT_KERNEL
1166 select CPU_SUPPORTS_64BIT_KERNEL 1176 select CPU_SUPPORTS_64BIT_KERNEL
1167 1177
@@ -1584,7 +1594,7 @@ source "mm/Kconfig"
1584 1594
1585config SMP 1595config SMP
1586 bool "Multi-Processing support" 1596 bool "Multi-Processing support"
1587 depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP 1597 depends on CPU_RM9000 || ((SIBYTE_BCM1x80 || SIBYTE_BCM1x55 || SIBYTE_SB1250 || QEMU) && !SIBYTE_STANDALONE) || SGI_IP27 || MIPS_MT_SMP
1588 ---help--- 1598 ---help---
1589 This enables support for systems with more than one CPU. If you have 1599 This enables support for systems with more than one CPU. If you have
1590 a system with only one CPU, like most personal computers, say N. If 1600 a system with only one CPU, like most personal computers, say N. If
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index fe9da16f3a40..9a69e0f0ab76 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -12,10 +12,6 @@
12# for "archclean" cleaning up for this architecture. 12# for "archclean" cleaning up for this architecture.
13# 13#
14 14
15as-option = $(shell if $(CC) $(CFLAGS) $(1) -Wa,-Z -c -o /dev/null \
16 -xassembler /dev/null > /dev/null 2>&1; then echo "$(1)"; \
17 else echo "$(2)"; fi ;)
18
19cflags-y := 15cflags-y :=
20 16
21# 17#
@@ -38,12 +34,10 @@ else
38endif 34endif
39 35
40ifdef CONFIG_32BIT 36ifdef CONFIG_32BIT
41gcc-abi = 32
42tool-prefix = $(32bit-tool-prefix) 37tool-prefix = $(32bit-tool-prefix)
43UTS_MACHINE := mips 38UTS_MACHINE := mips
44endif 39endif
45ifdef CONFIG_64BIT 40ifdef CONFIG_64BIT
46gcc-abi = 64
47tool-prefix = $(64bit-tool-prefix) 41tool-prefix = $(64bit-tool-prefix)
48UTS_MACHINE := mips64 42UTS_MACHINE := mips64
49endif 43endif
@@ -52,37 +46,27 @@ ifdef CONFIG_CROSSCOMPILE
52CROSS_COMPILE := $(tool-prefix) 46CROSS_COMPILE := $(tool-prefix)
53endif 47endif
54 48
55CHECKFLAGS-y += -D__linux__ -D__mips__ \ 49ifdef CONFIG_32BIT
56 -D_MIPS_SZINT=32 \ 50ld-emul = $(32bit-emul)
57 -D_ABIO32=1 \ 51vmlinux-32 = vmlinux
58 -D_ABIN32=2 \ 52vmlinux-64 = vmlinux.64
59 -D_ABI64=3 53
60CHECKFLAGS-$(CONFIG_32BIT) += -D_MIPS_SIM=_ABIO32 \ 54cflags-y += -mabi=32
61 -D_MIPS_SZLONG=32 \ 55endif
62 -D_MIPS_SZPTR=32 \
63 -D__PTRDIFF_TYPE__=int
64CHECKFLAGS-$(CONFIG_64BIT) += -m64 -D_MIPS_SIM=_ABI64 \
65 -D_MIPS_SZLONG=64 \
66 -D_MIPS_SZPTR=64 \
67 -D__PTRDIFF_TYPE__="long int"
68CHECKFLAGS-$(CONFIG_CPU_BIG_ENDIAN) += -D__MIPSEB__
69CHECKFLAGS-$(CONFIG_CPU_LITTLE_ENDIAN) += -D__MIPSEL__
70
71CHECKFLAGS = $(CHECKFLAGS-y)
72 56
73ifdef CONFIG_BUILD_ELF64 57ifdef CONFIG_64BIT
74gas-abi = 64
75ld-emul = $(64bit-emul) 58ld-emul = $(64bit-emul)
76vmlinux-32 = vmlinux.32 59vmlinux-32 = vmlinux.32
77vmlinux-64 = vmlinux 60vmlinux-64 = vmlinux
78else
79gas-abi = 32
80ld-emul = $(32bit-emul)
81vmlinux-32 = vmlinux
82vmlinux-64 = vmlinux.64
83 61
84cflags-$(CONFIG_64BIT) += $(call cc-option,-mno-explicit-relocs) 62cflags-y += -mabi=64
63ifdef CONFIG_BUILD_ELF64
64cflags-y += $(call cc-option,-mno-explicit-relocs)
65else
66cflags-y += $(call cc-option,-msym32)
85endif 67endif
68endif
69
86 70
87# 71#
88# GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel 72# GCC uses -G 0 -mabicalls -fpic as default. We don't want PIC in the kernel
@@ -105,161 +89,44 @@ MODFLAGS += -mlong-calls
105# carefully avoid to add it redundantly because gcc 3.3/3.4 complains 89# carefully avoid to add it redundantly because gcc 3.3/3.4 complains
106# when fed the toolchain default! 90# when fed the toolchain default!
107# 91#
108cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB) 92cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB -D__MIPSEB__)
109cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL) 93cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL -D__MIPSEL__)
110 94
111cflags-$(CONFIG_SB1XXX_CORELIS) += -mno-sched-prolog -fno-omit-frame-pointer 95cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \
112 96 -fno-omit-frame-pointer
113#
114# Use: $(call set_gccflags,<cpu0>,<isa0>,<cpu1>,<isa1>,<isa2>)
115#
116# <cpu0>,<isa0> -- preferred CPU and ISA designations (may require
117# recent tools)
118# <cpu1>,<isa1> -- fallback CPU and ISA designations (have to work
119# with up to the oldest supported tools)
120# <isa2> -- an ISA designation used as an ABI selector for
121# gcc versions that do not support "-mabi=32"
122# (depending on the CPU type, either "mips1" or
123# "mips2")
124#
125set_gccflags = $(shell \
126while :; do \
127 cpu=$(1); isa=-$(2); \
128 for gcc_opt in -march= -mcpu=; do \
129 $(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \
130 -xc /dev/null > /dev/null 2>&1 && \
131 break 2; \
132 done; \
133 cpu=$(3); isa=-$(4); \
134 for gcc_opt in -march= -mcpu=; do \
135 $(CC) $$gcc_opt$$cpu $$isa -S -o /dev/null \
136 -xc /dev/null > /dev/null 2>&1 && \
137 break 2; \
138 done; \
139 break; \
140done; \
141gcc_abi=-mabi=$(gcc-abi); gcc_cpu=$$cpu; \
142if $(CC) $$gcc_abi -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then \
143 gcc_isa=$$isa; \
144else \
145 gcc_abi=; gcc_isa=-$(5); \
146fi; \
147gas_abi=-Wa,-$(gcc-abi); gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
148while :; do \
149 for gas_opt in -Wa,-march= -Wa,-mcpu=; do \
150 $(CC) $$gas_abi $$gas_opt$$cpu $$gas_isa -Wa,-Z -c \
151 -o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \
152 break 2; \
153 done; \
154 gas_abi=; gas_opt=; gas_cpu=; gas_isa=; \
155 break; \
156done; \
157if test "$(gcc-abi)" != "$(gas-abi)"; then \
158 gas_abi="-Wa,-$(gas-abi) -Wa,-mgp$(gcc-abi)"; \
159fi; \
160if test "$$gcc_opt" = -march= && test -n "$$gcc_abi"; then \
161 $(CC) $$gcc_abi $$gcc_opt$$gcc_cpu -S -o /dev/null \
162 -xc /dev/null > /dev/null 2>&1 && \
163 gcc_isa=; \
164fi; \
165echo $$gcc_abi $$gcc_opt$$gcc_cpu $$gcc_isa $$gas_abi $$gas_opt$$gas_cpu $$gas_isa)
166 97
167# 98#
168# CPU-dependent compiler/assembler options for optimization. 99# CPU-dependent compiler/assembler options for optimization.
169# 100#
170cflags-$(CONFIG_CPU_R3000) += \ 101cflags-$(CONFIG_CPU_R3000) += -march=r3000
171 $(call set_gccflags,r3000,mips1,r3000,mips1,mips1) 102cflags-$(CONFIG_CPU_TX39XX) += -march=r3900
172CHECKFLAGS-$(CONFIG_CPU_R3000) += -D_MIPS_ISA=_MIPS_ISA_MIPS1 103cflags-$(CONFIG_CPU_R6000) += -march=r6000 -Wa,--trap
173 104cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap
174cflags-$(CONFIG_CPU_TX39XX) += \ 105cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap
175 $(call set_gccflags,r3900,mips1,r3000,mips1,mips1) 106cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap
176CHECKFLAGS-$(CONFIG_CPU_TX39XX) += -D_MIPS_ISA=_MIPS_ISA_MIPS1 107cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap
177 108cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips2 -mtune=r4600) \
178cflags-$(CONFIG_CPU_R6000) += \ 109 -Wa,-mips32 -Wa,--trap
179 $(call set_gccflags,r6000,mips2,r6000,mips2,mips2) \ 110cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips2 -mtune=r4600) \
180 -Wa,--trap 111 -Wa,-mips32r2 -Wa,--trap
181CHECKFLAGS-$(CONFIG_CPU_R6000) += -D_MIPS_ISA=_MIPS_ISA_MIPS2 112cflags-$(CONFIG_CPU_MIPS64_R1) += $(call cc-option,-march=mips64,-mips2 -mtune=r4600) \
182 113 -Wa,-mips64 -Wa,--trap
183cflags-$(CONFIG_CPU_R4300) += \ 114cflags-$(CONFIG_CPU_MIPS64_R2) += $(call cc-option,-march=mips64r2,-mips2 -mtune=r4600 ) \
184 $(call set_gccflags,r4300,mips3,r4300,mips3,mips2) \ 115 -Wa,-mips64r2 -Wa,--trap
116cflags-$(CONFIG_CPU_R5000) += -march=r5000 -Wa,--trap
117cflags-$(CONFIG_CPU_R5432) += $(call cc-options,-march=r5400,-march=r5000) \
185 -Wa,--trap 118 -Wa,--trap
186CHECKFLAGS-$(CONFIG_CPU_R4300) += -D_MIPS_ISA=_MIPS_ISA_MIPS3 119cflags-$(CONFIG_CPU_NEVADA) += $(call cc-options,-march=rm5200,-march=r5000) \
187
188cflags-$(CONFIG_CPU_VR41XX) += \
189 $(call set_gccflags,r4100,mips3,r4600,mips3,mips2) \
190 -Wa,--trap 120 -Wa,--trap
191CHECKFLAGS-$(CONFIG_CPU_VR41XX) += -D_MIPS_ISA=_MIPS_ISA_MIPS3 121cflags-$(CONFIG_CPU_RM7000) += $(call cc-option,-march=rm7000,-march=r5000) \
192
193cflags-$(CONFIG_CPU_R4X00) += \
194 $(call set_gccflags,r4600,mips3,r4600,mips3,mips2) \
195 -Wa,--trap 122 -Wa,--trap
196CHECKFLAGS-$(CONFIG_CPU_R4X00) += -D_MIPS_ISA=_MIPS_ISA_MIPS3 123cflags-$(CONFIG_CPU_RM9000) += $(call cc-option,-march=rm9000,-march=r5000) \
197
198cflags-$(CONFIG_CPU_TX49XX) += \
199 $(call set_gccflags,r4600,mips3,r4600,mips3,mips2) \
200 -Wa,--trap 124 -Wa,--trap
201CHECKFLAGS-$(CONFIG_CPU_TX49XX) += -D_MIPS_ISA=_MIPS_ISA_MIPS3 125cflags-$(CONFIG_CPU_SB1) += $(call cc-option,-march=sb1,-march=r5000) \
202
203cflags-$(CONFIG_CPU_MIPS32_R1) += \
204 $(call set_gccflags,mips32,mips32,r4600,mips3,mips2) \
205 -Wa,--trap 126 -Wa,--trap
206CHECKFLAGS-$(CONFIG_CPU_MIPS32_R1) += -D_MIPS_ISA=_MIPS_ISA_MIPS32 127cflags-$(CONFIG_CPU_R8000) += -march=r8000 -Wa,--trap
207 128cflags-$(CONFIG_CPU_R10000) += $(call cc-option,-march=r10000,-march=r8000) \
208cflags-$(CONFIG_CPU_MIPS32_R2) += \
209 $(call set_gccflags,mips32r2,mips32r2,r4600,mips3,mips2) \
210 -Wa,--trap
211CHECKFLAGS-$(CONFIG_CPU_MIPS32_R2) += -D_MIPS_ISA=_MIPS_ISA_MIPS32
212
213cflags-$(CONFIG_CPU_MIPS64_R1) += \
214 $(call set_gccflags,mips64,mips64,r4600,mips3,mips2) \
215 -Wa,--trap 129 -Wa,--trap
216CHECKFLAGS-$(CONFIG_CPU_MIPS64_R1) += -D_MIPS_ISA=_MIPS_ISA_MIPS64
217
218cflags-$(CONFIG_CPU_MIPS64_R2) += \
219 $(call set_gccflags,mips64r2,mips64r2,r4600,mips3,mips2) \
220 -Wa,--trap
221CHECKFLAGS-$(CONFIG_CPU_MIPS64_R2) += -D_MIPS_ISA=_MIPS_ISA_MIPS64
222
223cflags-$(CONFIG_CPU_R5000) += \
224 $(call set_gccflags,r5000,mips4,r5000,mips4,mips2) \
225 -Wa,--trap
226CHECKFLAGS-$(CONFIG_CPU_R5000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
227
228cflags-$(CONFIG_CPU_R5432) += \
229 $(call set_gccflags,r5400,mips4,r5000,mips4,mips2) \
230 -Wa,--trap
231CHECKFLAGS-$(CONFIG_CPU_R5432) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
232
233cflags-$(CONFIG_CPU_NEVADA) += \
234 $(call set_gccflags,rm5200,mips4,r5000,mips4,mips2) \
235 -Wa,--trap
236CHECKFLAGS-$(CONFIG_CPU_NEVADA) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
237
238cflags-$(CONFIG_CPU_RM7000) += \
239 $(call set_gccflags,rm7000,mips4,r5000,mips4,mips2) \
240 -Wa,--trap
241CHECKFLAGS-$(CONFIG_CPU_RM7000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
242
243cflags-$(CONFIG_CPU_RM9000) += \
244 $(call set_gccflags,rm9000,mips4,r5000,mips4,mips2) \
245 -Wa,--trap
246CHECKFLAGS-$(CONFIG_CPU_RM9000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
247
248
249cflags-$(CONFIG_CPU_SB1) += \
250 $(call set_gccflags,sb1,mips64,r5000,mips4,mips2) \
251 -Wa,--trap
252CHECKFLAGS-$(CONFIG_CPU_SB1) += -D_MIPS_ISA=_MIPS_ISA_MIPS64
253
254cflags-$(CONFIG_CPU_R8000) += \
255 $(call set_gccflags,r8000,mips4,r8000,mips4,mips2) \
256 -Wa,--trap
257CHECKFLAGS-$(CONFIG_CPU_R8000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
258
259cflags-$(CONFIG_CPU_R10000) += \
260 $(call set_gccflags,r10000,mips4,r8000,mips4,mips2) \
261 -Wa,--trap
262CHECKFLAGS-$(CONFIG_CPU_R10000) += -D_MIPS_ISA=_MIPS_ISA_MIPS4
263 130
264ifdef CONFIG_CPU_SB1 131ifdef CONFIG_CPU_SB1
265ifdef CONFIG_SB1_PASS_1_WORKAROUNDS 132ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
@@ -629,7 +496,6 @@ endif
629ifdef CONFIG_SGI_IP27 496ifdef CONFIG_SGI_IP27
630core-$(CONFIG_SGI_IP27) += arch/mips/sgi-ip27/ 497core-$(CONFIG_SGI_IP27) += arch/mips/sgi-ip27/
631cflags-$(CONFIG_SGI_IP27) += -Iinclude/asm-mips/mach-ip27 498cflags-$(CONFIG_SGI_IP27) += -Iinclude/asm-mips/mach-ip27
632ifdef CONFIG_BUILD_ELF64
633ifdef CONFIG_MAPPED_KERNEL 499ifdef CONFIG_MAPPED_KERNEL
634load-$(CONFIG_SGI_IP27) += 0xc00000004001c000 500load-$(CONFIG_SGI_IP27) += 0xc00000004001c000
635OBJCOPYFLAGS := --change-addresses=0x3fffffff80000000 501OBJCOPYFLAGS := --change-addresses=0x3fffffff80000000
@@ -638,16 +504,6 @@ else
638load-$(CONFIG_SGI_IP27) += 0xa80000000001c000 504load-$(CONFIG_SGI_IP27) += 0xa80000000001c000
639OBJCOPYFLAGS := --change-addresses=0x57ffffff80000000 505OBJCOPYFLAGS := --change-addresses=0x57ffffff80000000
640endif 506endif
641else
642ifdef CONFIG_MAPPED_KERNEL
643load-$(CONFIG_SGI_IP27) += 0xffffffffc001c000
644OBJCOPYFLAGS := --change-addresses=0xc000000080000000
645dataoffset-$(CONFIG_SGI_IP27) += 0x01000000
646else
647load-$(CONFIG_SGI_IP27) += 0xffffffff8001c000
648OBJCOPYFLAGS := --change-addresses=0xa800000080000000
649endif
650endif
651endif 507endif
652 508
653# 509#
@@ -756,6 +612,12 @@ CFLAGS += $(cflags-y)
756 612
757LDFLAGS += -m $(ld-emul) 613LDFLAGS += -m $(ld-emul)
758 614
615ifdef CONFIG_MIPS
616CHECKFLAGS += $(shell $(CC) $(CFLAGS) -dM -E -xc /dev/null | \
617 egrep -vw '__GNUC_(MAJOR|MINOR|PATCHLEVEL)__' | \
618 sed -e 's/^\#define /-D/' -e 's/ /="/' -e 's/$$/"/')
619endif
620
759OBJCOPYFLAGS += --remove-section=.reginfo 621OBJCOPYFLAGS += --remove-section=.reginfo
760 622
761# 623#
diff --git a/arch/mips/arc/memory.c b/arch/mips/arc/memory.c
index 958d2eb78862..8a9ef58cc399 100644
--- a/arch/mips/arc/memory.c
+++ b/arch/mips/arc/memory.c
@@ -158,7 +158,7 @@ unsigned long __init prom_free_prom_memory(void)
158 while (addr < boot_mem_map.map[i].addr 158 while (addr < boot_mem_map.map[i].addr
159 + boot_mem_map.map[i].size) { 159 + boot_mem_map.map[i].size) {
160 ClearPageReserved(virt_to_page(__va(addr))); 160 ClearPageReserved(virt_to_page(__va(addr)));
161 set_page_count(virt_to_page(__va(addr)), 1); 161 init_page_count(virt_to_page(__va(addr)));
162 free_page((unsigned long)__va(addr)); 162 free_page((unsigned long)__va(addr));
163 addr += PAGE_SIZE; 163 addr += PAGE_SIZE;
164 freed += PAGE_SIZE; 164 freed += PAGE_SIZE;
diff --git a/arch/mips/arc/misc.c b/arch/mips/arc/misc.c
index 84867de22028..b2e10b9e9452 100644
--- a/arch/mips/arc/misc.c
+++ b/arch/mips/arc/misc.c
@@ -9,7 +9,6 @@
9 * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) 9 * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
10 * Copyright (C) 1999 Silicon Graphics, Inc. 10 * Copyright (C) 1999 Silicon Graphics, Inc.
11 */ 11 */
12#include <linux/config.h>
13#include <linux/init.h> 12#include <linux/init.h>
14#include <linux/kernel.h> 13#include <linux/kernel.h>
15 14
@@ -20,17 +19,11 @@
20#include <asm/bootinfo.h> 19#include <asm/bootinfo.h>
21#include <asm/system.h> 20#include <asm/system.h>
22 21
23extern void *sgiwd93_host;
24extern void reset_wd33c93(void *instance);
25
26VOID 22VOID
27ArcHalt(VOID) 23ArcHalt(VOID)
28{ 24{
29 bc_disable(); 25 bc_disable();
30 local_irq_disable(); 26 local_irq_disable();
31#ifdef CONFIG_SCSI_SGIWD93
32 reset_wd33c93(sgiwd93_host);
33#endif
34 ARC_CALL0(halt); 27 ARC_CALL0(halt);
35never: goto never; 28never: goto never;
36} 29}
@@ -40,9 +33,6 @@ ArcPowerDown(VOID)
40{ 33{
41 bc_disable(); 34 bc_disable();
42 local_irq_disable(); 35 local_irq_disable();
43#ifdef CONFIG_SCSI_SGIWD93
44 reset_wd33c93(sgiwd93_host);
45#endif
46 ARC_CALL0(pdown); 36 ARC_CALL0(pdown);
47never: goto never; 37never: goto never;
48} 38}
@@ -53,9 +43,6 @@ ArcRestart(VOID)
53{ 43{
54 bc_disable(); 44 bc_disable();
55 local_irq_disable(); 45 local_irq_disable();
56#ifdef CONFIG_SCSI_SGIWD93
57 reset_wd33c93(sgiwd93_host);
58#endif
59 ARC_CALL0(restart); 46 ARC_CALL0(restart);
60never: goto never; 47never: goto never;
61} 48}
@@ -65,9 +52,6 @@ ArcReboot(VOID)
65{ 52{
66 bc_disable(); 53 bc_disable();
67 local_irq_disable(); 54 local_irq_disable();
68#ifdef CONFIG_SCSI_SGIWD93
69 reset_wd33c93(sgiwd93_host);
70#endif
71 ARC_CALL0(reboot); 55 ARC_CALL0(reboot);
72never: goto never; 56never: goto never;
73} 57}
@@ -77,9 +61,6 @@ ArcEnterInteractiveMode(VOID)
77{ 61{
78 bc_disable(); 62 bc_disable();
79 local_irq_disable(); 63 local_irq_disable();
80#ifdef CONFIG_SCSI_SGIWD93
81 reset_wd33c93(sgiwd93_host);
82#endif
83 ARC_CALL0(imode); 64 ARC_CALL0(imode);
84never: goto never; 65never: goto never;
85} 66}
diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/au1000/common/cputable.c
index 4dbde82c8215..d8df5fdb045f 100644
--- a/arch/mips/au1000/common/cputable.c
+++ b/arch/mips/au1000/common/cputable.c
@@ -38,7 +38,7 @@ struct cpu_spec cpu_specs[] = {
38 { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 }, 38 { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 },
39 { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, 39 { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 },
40 { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 }, 40 { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 },
41 { 0xffffffff, 0x04030201, "Au1200 AC", 0, 1 }, 41 { 0xffffffff, 0x04030201, "Au1200 AC", 1, 0 },
42 { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 }, 42 { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 },
43}; 43};
44 44
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index d00e8247d6c2..6ee090bd86c9 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -214,7 +214,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
214 if ( NULL != p ) 214 if ( NULL != p )
215 { 215 {
216 memcpy(p, dev, sizeof(dbdev_tab_t)); 216 memcpy(p, dev, sizeof(dbdev_tab_t));
217 p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id); 217 p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id);
218 ret = p->dev_id; 218 ret = p->dev_id;
219 new_id++; 219 new_id++;
220#if 0 220#if 0
@@ -260,7 +260,7 @@ au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
260 spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags); 260 spin_lock_irqsave(&au1xxx_dbdma_spin_lock, flags);
261 if (!(stp->dev_flags & DEV_FLAGS_INUSE) || 261 if (!(stp->dev_flags & DEV_FLAGS_INUSE) ||
262 (stp->dev_flags & DEV_FLAGS_ANYUSE)) { 262 (stp->dev_flags & DEV_FLAGS_ANYUSE)) {
263 /* Got source */ 263 /* Got source */
264 stp->dev_flags |= DEV_FLAGS_INUSE; 264 stp->dev_flags |= DEV_FLAGS_INUSE;
265 if (!(dtp->dev_flags & DEV_FLAGS_INUSE) || 265 if (!(dtp->dev_flags & DEV_FLAGS_INUSE) ||
266 (dtp->dev_flags & DEV_FLAGS_ANYUSE)) { 266 (dtp->dev_flags & DEV_FLAGS_ANYUSE)) {
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c
index 1905c6b104f2..1d82f2277517 100644
--- a/arch/mips/au1000/common/dma.c
+++ b/arch/mips/au1000/common/dma.c
@@ -174,7 +174,7 @@ int request_au1000_dma(int dev_id, const char *dev_str,
174 return -EINVAL; 174 return -EINVAL;
175#else 175#else
176 if (dev_id < 0 || dev_id >= DMA_NUM_DEV) 176 if (dev_id < 0 || dev_id >= DMA_NUM_DEV)
177 return -EINVAL; 177 return -EINVAL;
178#endif 178#endif
179 179
180 for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) { 180 for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) {
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c
index 48d3f54f88f8..32702e5fbf67 100644
--- a/arch/mips/au1000/common/platform.c
+++ b/arch/mips/au1000/common/platform.c
@@ -20,7 +20,7 @@
20static struct resource au1xxx_usb_ohci_resources[] = { 20static struct resource au1xxx_usb_ohci_resources[] = {
21 [0] = { 21 [0] = {
22 .start = USB_OHCI_BASE, 22 .start = USB_OHCI_BASE,
23 .end = USB_OHCI_BASE + USB_OHCI_LEN, 23 .end = USB_OHCI_BASE + USB_OHCI_LEN - 1,
24 .flags = IORESOURCE_MEM, 24 .flags = IORESOURCE_MEM,
25 }, 25 },
26 [1] = { 26 [1] = {
@@ -264,7 +264,7 @@ static struct resource smc91x_resources[] = {
264 264
265static struct platform_device smc91x_device = { 265static struct platform_device smc91x_device = {
266 .name = "smc91x", 266 .name = "smc91x",
267 .id = -1, 267 .id = -1,
268 .num_resources = ARRAY_SIZE(smc91x_resources), 268 .num_resources = ARRAY_SIZE(smc91x_resources),
269 .resource = smc91x_resources, 269 .resource = smc91x_resources,
270}; 270};
@@ -278,9 +278,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
278 &au1100_lcd_device, 278 &au1100_lcd_device,
279#endif 279#endif
280#ifdef CONFIG_SOC_AU1200 280#ifdef CONFIG_SOC_AU1200
281#if 0 /* fixme */
282 &au1xxx_usb_ehci_device, 281 &au1xxx_usb_ehci_device,
283#endif
284 &au1xxx_usb_gdt_device, 282 &au1xxx_usb_gdt_device,
285 &au1xxx_usb_otg_device, 283 &au1xxx_usb_otg_device,
286 &au1200_lcd_device, 284 &au1200_lcd_device,
@@ -288,7 +286,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
288 &au1xxx_mmc_device, 286 &au1xxx_mmc_device,
289#endif 287#endif
290#ifdef CONFIG_MIPS_DB1200 288#ifdef CONFIG_MIPS_DB1200
291 &smc91x_device, 289 &smc91x_device,
292#endif 290#endif
293}; 291};
294 292
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c
index 4ffccedf5967..c93af224c1b3 100644
--- a/arch/mips/au1000/common/reset.c
+++ b/arch/mips/au1000/common/reset.c
@@ -164,17 +164,20 @@ void au1000_restart(char *command)
164 164
165void au1000_halt(void) 165void au1000_halt(void)
166{ 166{
167#if defined(CONFIG_MIPS_PB1550) 167#if defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550)
168 /* power off system */ 168 /* power off system */
169 printk("\n** Powering off Pb1550\n"); 169 printk("\n** Powering off...\n");
170 au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C); 170 au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
171 au_sync(); 171 au_sync();
172 while(1); /* should not get here */ 172 while(1); /* should not get here */
173#endif 173#else
174 printk(KERN_NOTICE "\n** You can safely turn off the power\n"); 174 printk(KERN_NOTICE "\n** You can safely turn off the power\n");
175#ifdef CONFIG_MIPS_MIRAGE 175#ifdef CONFIG_MIPS_MIRAGE
176 au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT); 176 au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
177#endif 177#endif
178#ifdef CONFIG_MIPS_DB1200
179 au_writew(au_readw(0xB980001C) | (1<<14), 0xB980001C);
180#endif
178#ifdef CONFIG_PM 181#ifdef CONFIG_PM
179 au_sleep(); 182 au_sleep();
180 183
@@ -187,6 +190,7 @@ void au1000_halt(void)
187 "wait\n\t" 190 "wait\n\t"
188 ".set\tmips0"); 191 ".set\tmips0");
189#endif 192#endif
193#endif /* defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550) */
190} 194}
191 195
192void au1000_power_off(void) 196void au1000_power_off(void)
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index eb155c071aa6..307e98c29ddc 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -90,11 +90,11 @@ void __init plat_setup(void)
90 else { 90 else {
91 /* Clear to obtain best system bus performance */ 91 /* Clear to obtain best system bus performance */
92 clear_c0_config(1<<19); /* Clear Config[OD] */ 92 clear_c0_config(1<<19); /* Clear Config[OD] */
93 } 93 }
94 94
95 argptr = prom_getcmdline(); 95 argptr = prom_getcmdline();
96 96
97#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE) 97#ifdef CONFIG_SERIAL_8250_CONSOLE
98 if ((argptr = strstr(argptr, "console=")) == NULL) { 98 if ((argptr = strstr(argptr, "console=")) == NULL) {
99 argptr = prom_getcmdline(); 99 argptr = prom_getcmdline();
100 strcat(argptr, " console=ttyS0,115200"); 100 strcat(argptr, " console=ttyS0,115200");
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index 883d3f3d8c53..f85f1524b366 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -359,7 +359,7 @@ static unsigned long do_fast_cp0_gettimeoffset(void)
359 : "hi", "lo", GCC_REG_ACCUM); 359 : "hi", "lo", GCC_REG_ACCUM);
360 360
361 /* 361 /*
362 * Due to possible jiffies inconsistencies, we need to check 362 * Due to possible jiffies inconsistencies, we need to check
363 * the result so that we'll get a timer that is monotonic. 363 * the result so that we'll get a timer that is monotonic.
364 */ 364 */
365 if (res >= USECS_PER_JIFFY) 365 if (res >= USECS_PER_JIFFY)
diff --git a/arch/mips/cobalt/Kconfig b/arch/mips/cobalt/Kconfig
new file mode 100644
index 000000000000..7c42b088d16c
--- /dev/null
+++ b/arch/mips/cobalt/Kconfig
@@ -0,0 +1,7 @@
1config EARLY_PRINTK
2 bool "Early console support"
3 depends on MIPS_COBALT
4 help
5 Provide early console support by direct access to the
6 on board UART. The UART must have been previously
7 initialised by the boot loader.
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index 3b6b7579d1de..720e757b2b64 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -4,4 +4,6 @@
4 4
5obj-y := irq.o int-handler.o reset.o setup.o 5obj-y := irq.o int-handler.o reset.o setup.o
6 6
7obj-$(CONFIG_EARLY_PRINTK) += console.o
8
7EXTRA_AFLAGS := $(CFLAGS) 9EXTRA_AFLAGS := $(CFLAGS)
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
new file mode 100644
index 000000000000..45c2d27c7564
--- /dev/null
+++ b/arch/mips/cobalt/console.c
@@ -0,0 +1,43 @@
1/*
2 * (C) P. Horton 2006
3 */
4
5#include <linux/config.h>
6#include <linux/init.h>
7#include <linux/kernel.h>
8#include <linux/console.h>
9#include <linux/serial_reg.h>
10#include <asm/addrspace.h>
11#include <asm/mach-cobalt/cobalt.h>
12
13static void putchar(int c)
14{
15 if(c == '\n')
16 putchar('\r');
17
18 while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
19 ;
20
21 COBALT_UART[UART_TX] = c;
22}
23
24static void cons_write(struct console *c, const char *s, unsigned n)
25{
26 while(n-- && *s)
27 putchar(*s++);
28}
29
30static struct console cons_info =
31{
32 .name = "uart",
33 .write = cons_write,
34 .flags = CON_PRINTBUFFER | CON_BOOT,
35 .index = -1,
36};
37
38void __init cobalt_early_console(void)
39{
40 register_console(&cons_info);
41
42 printk("Cobalt: early console registered\n");
43}
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index b9713a723053..4f9ea1210023 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -31,6 +31,7 @@
31extern void cobalt_machine_restart(char *command); 31extern void cobalt_machine_restart(char *command);
32extern void cobalt_machine_halt(void); 32extern void cobalt_machine_halt(void);
33extern void cobalt_machine_power_off(void); 33extern void cobalt_machine_power_off(void);
34extern void cobalt_early_console(void);
34 35
35int cobalt_board_id; 36int cobalt_board_id;
36 37
@@ -109,14 +110,6 @@ void __init plat_setup(void)
109 /* I/O port resource must include UART and LCD/buttons */ 110 /* I/O port resource must include UART and LCD/buttons */
110 ioport_resource.end = 0x0fffffff; 111 ioport_resource.end = 0x0fffffff;
111 112
112 /*
113 * This is a prom style console. We just poke at the
114 * UART to make it talk.
115 * Only use this console if you really screw up and can't
116 * get to the stage of setting up a real serial console.
117 */
118 /*ns16550_setup_console();*/
119
120 /* request I/O space for devices used on all i[345]86 PCs */ 113 /* request I/O space for devices used on all i[345]86 PCs */
121 for (i = 0; i < COBALT_IO_RESOURCES; i++) 114 for (i = 0; i < COBALT_IO_RESOURCES; i++)
122 request_resource(&ioport_resource, cobalt_io_resources + i); 115 request_resource(&ioport_resource, cobalt_io_resources + i);
@@ -136,6 +129,10 @@ void __init plat_setup(void)
136#ifdef CONFIG_SERIAL_8250 129#ifdef CONFIG_SERIAL_8250
137 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) { 130 if (cobalt_board_id > COBALT_BRD_ID_RAQ1) {
138 131
132#ifdef CONFIG_EARLY_PRINTK
133 cobalt_early_console();
134#endif
135
139 uart.line = 0; 136 uart.line = 0;
140 uart.type = PORT_UNKNOWN; 137 uart.type = PORT_UNKNOWN;
141 uart.uartclk = 18432000; 138 uart.uartclk = 18432000;
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 89c21572a59c..9e1ae953e966 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:05:52 2005 4# Fri Jan 27 15:39:52 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -164,26 +164,28 @@ CONFIG_SYSVIPC=y
164# CONFIG_BSD_PROCESS_ACCT is not set 164# CONFIG_BSD_PROCESS_ACCT is not set
165CONFIG_SYSCTL=y 165CONFIG_SYSCTL=y
166# CONFIG_AUDIT is not set 166# CONFIG_AUDIT is not set
167CONFIG_HOTPLUG=y
168CONFIG_KOBJECT_UEVENT=y
169# CONFIG_IKCONFIG is not set 167# CONFIG_IKCONFIG is not set
170CONFIG_INITRAMFS_SOURCE="" 168CONFIG_INITRAMFS_SOURCE=""
169# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
171CONFIG_EMBEDDED=y 170CONFIG_EMBEDDED=y
172CONFIG_KALLSYMS=y 171CONFIG_KALLSYMS=y
173# CONFIG_KALLSYMS_EXTRA_PASS is not set 172# CONFIG_KALLSYMS_EXTRA_PASS is not set
173CONFIG_HOTPLUG=y
174CONFIG_PRINTK=y 174CONFIG_PRINTK=y
175CONFIG_BUG=y 175CONFIG_BUG=y
176CONFIG_ELF_CORE=y
176CONFIG_BASE_FULL=y 177CONFIG_BASE_FULL=y
177CONFIG_FUTEX=y 178CONFIG_FUTEX=y
178CONFIG_EPOLL=y 179CONFIG_EPOLL=y
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
180CONFIG_SHMEM=y 180CONFIG_SHMEM=y
181CONFIG_CC_ALIGN_FUNCTIONS=0 181CONFIG_CC_ALIGN_FUNCTIONS=0
182CONFIG_CC_ALIGN_LABELS=0 182CONFIG_CC_ALIGN_LABELS=0
183CONFIG_CC_ALIGN_LOOPS=0 183CONFIG_CC_ALIGN_LOOPS=0
184CONFIG_CC_ALIGN_JUMPS=0 184CONFIG_CC_ALIGN_JUMPS=0
185CONFIG_SLAB=y
185# CONFIG_TINY_SHMEM is not set 186# CONFIG_TINY_SHMEM is not set
186CONFIG_BASE_SMALL=0 187CONFIG_BASE_SMALL=0
188# CONFIG_SLOB is not set
187 189
188# 190#
189# Loadable module support 191# Loadable module support
@@ -335,6 +337,29 @@ CONFIG_BRIDGE_NETFILTER=y
335CONFIG_NETFILTER_NETLINK=m 337CONFIG_NETFILTER_NETLINK=m
336CONFIG_NETFILTER_NETLINK_QUEUE=m 338CONFIG_NETFILTER_NETLINK_QUEUE=m
337CONFIG_NETFILTER_NETLINK_LOG=m 339CONFIG_NETFILTER_NETLINK_LOG=m
340CONFIG_NETFILTER_XTABLES=m
341CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
342CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
343CONFIG_NETFILTER_XT_TARGET_MARK=m
344CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
345CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
346CONFIG_NETFILTER_XT_MATCH_COMMENT=m
347CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
348CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
349CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
350CONFIG_NETFILTER_XT_MATCH_DCCP=m
351CONFIG_NETFILTER_XT_MATCH_HELPER=m
352CONFIG_NETFILTER_XT_MATCH_LENGTH=m
353CONFIG_NETFILTER_XT_MATCH_LIMIT=m
354CONFIG_NETFILTER_XT_MATCH_MAC=m
355CONFIG_NETFILTER_XT_MATCH_MARK=m
356CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
357CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
358CONFIG_NETFILTER_XT_MATCH_REALM=m
359CONFIG_NETFILTER_XT_MATCH_SCTP=m
360CONFIG_NETFILTER_XT_MATCH_STATE=m
361CONFIG_NETFILTER_XT_MATCH_STRING=m
362CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
338 363
339# 364#
340# IP: Netfilter Configuration 365# IP: Netfilter Configuration
@@ -353,47 +378,30 @@ CONFIG_IP_NF_AMANDA=m
353CONFIG_IP_NF_PPTP=m 378CONFIG_IP_NF_PPTP=m
354CONFIG_IP_NF_QUEUE=m 379CONFIG_IP_NF_QUEUE=m
355CONFIG_IP_NF_IPTABLES=m 380CONFIG_IP_NF_IPTABLES=m
356CONFIG_IP_NF_MATCH_LIMIT=m
357CONFIG_IP_NF_MATCH_IPRANGE=m 381CONFIG_IP_NF_MATCH_IPRANGE=m
358CONFIG_IP_NF_MATCH_MAC=m
359CONFIG_IP_NF_MATCH_PKTTYPE=m
360CONFIG_IP_NF_MATCH_MARK=m
361CONFIG_IP_NF_MATCH_MULTIPORT=m 382CONFIG_IP_NF_MATCH_MULTIPORT=m
362CONFIG_IP_NF_MATCH_TOS=m 383CONFIG_IP_NF_MATCH_TOS=m
363CONFIG_IP_NF_MATCH_RECENT=m 384CONFIG_IP_NF_MATCH_RECENT=m
364CONFIG_IP_NF_MATCH_ECN=m 385CONFIG_IP_NF_MATCH_ECN=m
365CONFIG_IP_NF_MATCH_DSCP=m 386CONFIG_IP_NF_MATCH_DSCP=m
366CONFIG_IP_NF_MATCH_AH_ESP=m 387CONFIG_IP_NF_MATCH_AH_ESP=m
367CONFIG_IP_NF_MATCH_LENGTH=m
368CONFIG_IP_NF_MATCH_TTL=m 388CONFIG_IP_NF_MATCH_TTL=m
369CONFIG_IP_NF_MATCH_TCPMSS=m
370CONFIG_IP_NF_MATCH_HELPER=m
371CONFIG_IP_NF_MATCH_STATE=m
372CONFIG_IP_NF_MATCH_CONNTRACK=m
373CONFIG_IP_NF_MATCH_OWNER=m 389CONFIG_IP_NF_MATCH_OWNER=m
374CONFIG_IP_NF_MATCH_PHYSDEV=m
375CONFIG_IP_NF_MATCH_ADDRTYPE=m 390CONFIG_IP_NF_MATCH_ADDRTYPE=m
376CONFIG_IP_NF_MATCH_REALM=m
377CONFIG_IP_NF_MATCH_SCTP=m
378CONFIG_IP_NF_MATCH_DCCP=m
379CONFIG_IP_NF_MATCH_COMMENT=m
380CONFIG_IP_NF_MATCH_CONNMARK=m
381CONFIG_IP_NF_MATCH_CONNBYTES=m
382CONFIG_IP_NF_MATCH_HASHLIMIT=m 391CONFIG_IP_NF_MATCH_HASHLIMIT=m
383CONFIG_IP_NF_MATCH_STRING=m 392CONFIG_IP_NF_MATCH_POLICY=m
384CONFIG_IP_NF_FILTER=m 393CONFIG_IP_NF_FILTER=m
385CONFIG_IP_NF_TARGET_REJECT=m 394CONFIG_IP_NF_TARGET_REJECT=m
386CONFIG_IP_NF_TARGET_LOG=m 395CONFIG_IP_NF_TARGET_LOG=m
387CONFIG_IP_NF_TARGET_ULOG=m 396CONFIG_IP_NF_TARGET_ULOG=m
388CONFIG_IP_NF_TARGET_TCPMSS=m 397CONFIG_IP_NF_TARGET_TCPMSS=m
389CONFIG_IP_NF_TARGET_NFQUEUE=m
390CONFIG_IP_NF_NAT=m 398CONFIG_IP_NF_NAT=m
391CONFIG_IP_NF_NAT_NEEDED=y 399CONFIG_IP_NF_NAT_NEEDED=y
392CONFIG_IP_NF_TARGET_MASQUERADE=m 400CONFIG_IP_NF_TARGET_MASQUERADE=m
393CONFIG_IP_NF_TARGET_REDIRECT=m 401CONFIG_IP_NF_TARGET_REDIRECT=m
394CONFIG_IP_NF_TARGET_NETMAP=m 402CONFIG_IP_NF_TARGET_NETMAP=m
395CONFIG_IP_NF_TARGET_SAME=m 403CONFIG_IP_NF_TARGET_SAME=m
396CONFIG_IP_NF_NAT_SNMP_BASIC=m 404# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
397CONFIG_IP_NF_NAT_IRC=m 405CONFIG_IP_NF_NAT_IRC=m
398CONFIG_IP_NF_NAT_FTP=m 406CONFIG_IP_NF_NAT_FTP=m
399CONFIG_IP_NF_NAT_TFTP=m 407CONFIG_IP_NF_NAT_TFTP=m
@@ -403,13 +411,9 @@ CONFIG_IP_NF_MANGLE=m
403CONFIG_IP_NF_TARGET_TOS=m 411CONFIG_IP_NF_TARGET_TOS=m
404CONFIG_IP_NF_TARGET_ECN=m 412CONFIG_IP_NF_TARGET_ECN=m
405CONFIG_IP_NF_TARGET_DSCP=m 413CONFIG_IP_NF_TARGET_DSCP=m
406CONFIG_IP_NF_TARGET_MARK=m
407CONFIG_IP_NF_TARGET_CLASSIFY=m
408CONFIG_IP_NF_TARGET_TTL=m 414CONFIG_IP_NF_TARGET_TTL=m
409CONFIG_IP_NF_TARGET_CONNMARK=m 415# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
410CONFIG_IP_NF_TARGET_CLUSTERIP=m
411CONFIG_IP_NF_RAW=m 416CONFIG_IP_NF_RAW=m
412CONFIG_IP_NF_TARGET_NOTRACK=m
413CONFIG_IP_NF_ARPTABLES=m 417CONFIG_IP_NF_ARPTABLES=m
414CONFIG_IP_NF_ARPFILTER=m 418CONFIG_IP_NF_ARPFILTER=m
415CONFIG_IP_NF_ARP_MANGLE=m 419CONFIG_IP_NF_ARP_MANGLE=m
@@ -419,26 +423,20 @@ CONFIG_IP_NF_ARP_MANGLE=m
419# 423#
420CONFIG_IP6_NF_QUEUE=m 424CONFIG_IP6_NF_QUEUE=m
421CONFIG_IP6_NF_IPTABLES=m 425CONFIG_IP6_NF_IPTABLES=m
422CONFIG_IP6_NF_MATCH_LIMIT=m
423CONFIG_IP6_NF_MATCH_MAC=m
424CONFIG_IP6_NF_MATCH_RT=m 426CONFIG_IP6_NF_MATCH_RT=m
425CONFIG_IP6_NF_MATCH_OPTS=m 427CONFIG_IP6_NF_MATCH_OPTS=m
426CONFIG_IP6_NF_MATCH_FRAG=m 428CONFIG_IP6_NF_MATCH_FRAG=m
427CONFIG_IP6_NF_MATCH_HL=m 429CONFIG_IP6_NF_MATCH_HL=m
428CONFIG_IP6_NF_MATCH_MULTIPORT=m 430CONFIG_IP6_NF_MATCH_MULTIPORT=m
429CONFIG_IP6_NF_MATCH_OWNER=m 431CONFIG_IP6_NF_MATCH_OWNER=m
430CONFIG_IP6_NF_MATCH_MARK=m
431CONFIG_IP6_NF_MATCH_IPV6HEADER=m 432CONFIG_IP6_NF_MATCH_IPV6HEADER=m
432CONFIG_IP6_NF_MATCH_AHESP=m 433CONFIG_IP6_NF_MATCH_AHESP=m
433CONFIG_IP6_NF_MATCH_LENGTH=m
434CONFIG_IP6_NF_MATCH_EUI64=m 434CONFIG_IP6_NF_MATCH_EUI64=m
435CONFIG_IP6_NF_MATCH_PHYSDEV=m 435CONFIG_IP6_NF_MATCH_POLICY=m
436CONFIG_IP6_NF_FILTER=m 436CONFIG_IP6_NF_FILTER=m
437CONFIG_IP6_NF_TARGET_LOG=m 437CONFIG_IP6_NF_TARGET_LOG=m
438CONFIG_IP6_NF_TARGET_REJECT=m 438CONFIG_IP6_NF_TARGET_REJECT=m
439CONFIG_IP6_NF_TARGET_NFQUEUE=m
440CONFIG_IP6_NF_MANGLE=m 439CONFIG_IP6_NF_MANGLE=m
441CONFIG_IP6_NF_TARGET_MARK=m
442CONFIG_IP6_NF_TARGET_HL=m 440CONFIG_IP6_NF_TARGET_HL=m
443CONFIG_IP6_NF_RAW=m 441CONFIG_IP6_NF_RAW=m
444 442
@@ -494,6 +492,11 @@ CONFIG_IPDDP_ENCAP=y
494CONFIG_IPDDP_DECAP=y 492CONFIG_IPDDP_DECAP=y
495# CONFIG_X25 is not set 493# CONFIG_X25 is not set
496# CONFIG_LAPB is not set 494# CONFIG_LAPB is not set
495
496#
497# TIPC Configuration (EXPERIMENTAL)
498#
499# CONFIG_TIPC is not set
497CONFIG_NET_DIVERT=y 500CONFIG_NET_DIVERT=y
498# CONFIG_ECONET is not set 501# CONFIG_ECONET is not set
499# CONFIG_WAN_ROUTER is not set 502# CONFIG_WAN_ROUTER is not set
@@ -553,7 +556,6 @@ CONFIG_IEEE80211=m
553# CONFIG_IEEE80211_DEBUG is not set 556# CONFIG_IEEE80211_DEBUG is not set
554CONFIG_IEEE80211_CRYPT_WEP=m 557CONFIG_IEEE80211_CRYPT_WEP=m
555CONFIG_IEEE80211_CRYPT_CCMP=m 558CONFIG_IEEE80211_CRYPT_CCMP=m
556CONFIG_IEEE80211_CRYPT_TKIP=m
557 559
558# 560#
559# Device Drivers 561# Device Drivers
@@ -663,7 +665,7 @@ CONFIG_SCSI_LOGGING=y
663# SCSI Transport Attributes 665# SCSI Transport Attributes
664# 666#
665CONFIG_SCSI_SPI_ATTRS=y 667CONFIG_SCSI_SPI_ATTRS=y
666CONFIG_SCSI_FC_ATTRS=m 668CONFIG_SCSI_FC_ATTRS=y
667CONFIG_SCSI_ISCSI_ATTRS=m 669CONFIG_SCSI_ISCSI_ATTRS=m
668CONFIG_SCSI_SAS_ATTRS=m 670CONFIG_SCSI_SAS_ATTRS=m
669 671
@@ -696,13 +698,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
696# CONFIG_SCSI_IPR is not set 698# CONFIG_SCSI_IPR is not set
697# CONFIG_SCSI_QLOGIC_FC is not set 699# CONFIG_SCSI_QLOGIC_FC is not set
698# CONFIG_SCSI_QLOGIC_1280 is not set 700# CONFIG_SCSI_QLOGIC_1280 is not set
699CONFIG_SCSI_QLA2XXX=y 701# CONFIG_SCSI_QLA_FC is not set
700# CONFIG_SCSI_QLA21XX is not set
701# CONFIG_SCSI_QLA22XX is not set
702# CONFIG_SCSI_QLA2300 is not set
703# CONFIG_SCSI_QLA2322 is not set
704# CONFIG_SCSI_QLA6312 is not set
705# CONFIG_SCSI_QLA24XX is not set
706# CONFIG_SCSI_LPFC is not set 702# CONFIG_SCSI_LPFC is not set
707# CONFIG_SCSI_DC395x is not set 703# CONFIG_SCSI_DC395x is not set
708# CONFIG_SCSI_DC390T is not set 704# CONFIG_SCSI_DC390T is not set
@@ -785,6 +781,7 @@ CONFIG_MII=y
785# CONFIG_SUNGEM is not set 781# CONFIG_SUNGEM is not set
786# CONFIG_CASSINI is not set 782# CONFIG_CASSINI is not set
787# CONFIG_NET_VENDOR_3COM is not set 783# CONFIG_NET_VENDOR_3COM is not set
784# CONFIG_DM9000 is not set
788 785
789# 786#
790# Tulip family network device support 787# Tulip family network device support
@@ -824,6 +821,7 @@ CONFIG_LAN_SAA9730=y
824# CONFIG_R8169 is not set 821# CONFIG_R8169 is not set
825# CONFIG_SIS190 is not set 822# CONFIG_SIS190 is not set
826# CONFIG_SKGE is not set 823# CONFIG_SKGE is not set
824# CONFIG_SKY2 is not set
827# CONFIG_SK98LIN is not set 825# CONFIG_SK98LIN is not set
828# CONFIG_VIA_VELOCITY is not set 826# CONFIG_VIA_VELOCITY is not set
829# CONFIG_TIGON3 is not set 827# CONFIG_TIGON3 is not set
@@ -845,8 +843,6 @@ CONFIG_LAN_SAA9730=y
845# Wireless LAN (non-hamradio) 843# Wireless LAN (non-hamradio)
846# 844#
847# CONFIG_NET_RADIO is not set 845# CONFIG_NET_RADIO is not set
848# CONFIG_IPW_DEBUG is not set
849CONFIG_IPW2200=m
850 846
851# 847#
852# Wan interfaces 848# Wan interfaces
@@ -926,6 +922,7 @@ CONFIG_HW_CONSOLE=y
926CONFIG_SERIAL_8250=y 922CONFIG_SERIAL_8250=y
927CONFIG_SERIAL_8250_CONSOLE=y 923CONFIG_SERIAL_8250_CONSOLE=y
928CONFIG_SERIAL_8250_NR_UARTS=4 924CONFIG_SERIAL_8250_NR_UARTS=4
925CONFIG_SERIAL_8250_RUNTIME_UARTS=4
929# CONFIG_SERIAL_8250_EXTENDED is not set 926# CONFIG_SERIAL_8250_EXTENDED is not set
930 927
931# 928#
@@ -933,7 +930,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
933# 930#
934CONFIG_SERIAL_CORE=y 931CONFIG_SERIAL_CORE=y
935CONFIG_SERIAL_CORE_CONSOLE=y 932CONFIG_SERIAL_CORE_CONSOLE=y
936# CONFIG_SERIAL_JSM is not set
937CONFIG_UNIX98_PTYS=y 933CONFIG_UNIX98_PTYS=y
938CONFIG_LEGACY_PTYS=y 934CONFIG_LEGACY_PTYS=y
939CONFIG_LEGACY_PTY_COUNT=256 935CONFIG_LEGACY_PTY_COUNT=256
@@ -971,6 +967,12 @@ CONFIG_LEGACY_PTY_COUNT=256
971# CONFIG_I2C is not set 967# CONFIG_I2C is not set
972 968
973# 969#
970# SPI support
971#
972# CONFIG_SPI is not set
973# CONFIG_SPI_MASTER is not set
974
975#
974# Dallas's 1-wire bus 976# Dallas's 1-wire bus
975# 977#
976# CONFIG_W1 is not set 978# CONFIG_W1 is not set
@@ -1076,6 +1078,7 @@ CONFIG_XFS_QUOTA=y
1076CONFIG_XFS_SECURITY=y 1078CONFIG_XFS_SECURITY=y
1077CONFIG_XFS_POSIX_ACL=y 1079CONFIG_XFS_POSIX_ACL=y
1078# CONFIG_XFS_RT is not set 1080# CONFIG_XFS_RT is not set
1081# CONFIG_OCFS2_FS is not set
1079CONFIG_MINIX_FS=m 1082CONFIG_MINIX_FS=m
1080CONFIG_ROMFS_FS=m 1083CONFIG_ROMFS_FS=m
1081CONFIG_INOTIFY=y 1084CONFIG_INOTIFY=y
@@ -1118,6 +1121,7 @@ CONFIG_SYSFS=y
1118# CONFIG_HUGETLB_PAGE is not set 1121# CONFIG_HUGETLB_PAGE is not set
1119CONFIG_RAMFS=y 1122CONFIG_RAMFS=y
1120CONFIG_RELAYFS_FS=m 1123CONFIG_RELAYFS_FS=m
1124# CONFIG_CONFIGFS_FS is not set
1121 1125
1122# 1126#
1123# Miscellaneous filesystems 1127# Miscellaneous filesystems
@@ -1225,6 +1229,7 @@ CONFIG_NLS_UTF8=m
1225# Kernel hacking 1229# Kernel hacking
1226# 1230#
1227# CONFIG_PRINTK_TIME is not set 1231# CONFIG_PRINTK_TIME is not set
1232# CONFIG_MAGIC_SYSRQ is not set
1228# CONFIG_DEBUG_KERNEL is not set 1233# CONFIG_DEBUG_KERNEL is not set
1229CONFIG_LOG_BUF_SHIFT=14 1234CONFIG_LOG_BUF_SHIFT=14
1230CONFIG_CROSSCOMPILE=y 1235CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 6fd353779813..32984100a75e 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:05:54 2005 4# Fri Jan 27 15:39:53 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -169,29 +169,31 @@ CONFIG_SYSVIPC=y
169# CONFIG_BSD_PROCESS_ACCT is not set 169# CONFIG_BSD_PROCESS_ACCT is not set
170CONFIG_SYSCTL=y 170CONFIG_SYSCTL=y
171# CONFIG_AUDIT is not set 171# CONFIG_AUDIT is not set
172# CONFIG_HOTPLUG is not set
173CONFIG_KOBJECT_UEVENT=y
174CONFIG_IKCONFIG=y 172CONFIG_IKCONFIG=y
175CONFIG_IKCONFIG_PROC=y 173CONFIG_IKCONFIG_PROC=y
176# CONFIG_CPUSETS is not set 174# CONFIG_CPUSETS is not set
177CONFIG_INITRAMFS_SOURCE="" 175CONFIG_INITRAMFS_SOURCE=""
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
178CONFIG_EMBEDDED=y 177CONFIG_EMBEDDED=y
179CONFIG_KALLSYMS=y 178CONFIG_KALLSYMS=y
180# CONFIG_KALLSYMS_ALL is not set 179# CONFIG_KALLSYMS_ALL is not set
181# CONFIG_KALLSYMS_EXTRA_PASS is not set 180# CONFIG_KALLSYMS_EXTRA_PASS is not set
181# CONFIG_HOTPLUG is not set
182CONFIG_PRINTK=y 182CONFIG_PRINTK=y
183CONFIG_BUG=y 183CONFIG_BUG=y
184CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 185CONFIG_BASE_FULL=y
185CONFIG_FUTEX=y 186CONFIG_FUTEX=y
186CONFIG_EPOLL=y 187CONFIG_EPOLL=y
187# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
188CONFIG_SHMEM=y 188CONFIG_SHMEM=y
189CONFIG_CC_ALIGN_FUNCTIONS=0 189CONFIG_CC_ALIGN_FUNCTIONS=0
190CONFIG_CC_ALIGN_LABELS=0 190CONFIG_CC_ALIGN_LABELS=0
191CONFIG_CC_ALIGN_LOOPS=0 191CONFIG_CC_ALIGN_LOOPS=0
192CONFIG_CC_ALIGN_JUMPS=0 192CONFIG_CC_ALIGN_JUMPS=0
193CONFIG_SLAB=y
193# CONFIG_TINY_SHMEM is not set 194# CONFIG_TINY_SHMEM is not set
194CONFIG_BASE_SMALL=0 195CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set
195 197
196# 198#
197# Loadable module support 199# Loadable module support
@@ -247,7 +249,6 @@ CONFIG_MMU=y
247# 249#
248CONFIG_BINFMT_ELF=y 250CONFIG_BINFMT_ELF=y
249# CONFIG_BINFMT_MISC is not set 251# CONFIG_BINFMT_MISC is not set
250CONFIG_BUILD_ELF64=y
251CONFIG_MIPS32_COMPAT=y 252CONFIG_MIPS32_COMPAT=y
252CONFIG_COMPAT=y 253CONFIG_COMPAT=y
253CONFIG_MIPS32_O32=y 254CONFIG_MIPS32_O32=y
@@ -309,6 +310,11 @@ CONFIG_TCP_CONG_BIC=y
309# CONFIG_ATALK is not set 310# CONFIG_ATALK is not set
310# CONFIG_X25 is not set 311# CONFIG_X25 is not set
311# CONFIG_LAPB is not set 312# CONFIG_LAPB is not set
313
314#
315# TIPC Configuration (EXPERIMENTAL)
316#
317# CONFIG_TIPC is not set
312# CONFIG_NET_DIVERT is not set 318# CONFIG_NET_DIVERT is not set
313# CONFIG_ECONET is not set 319# CONFIG_ECONET is not set
314# CONFIG_WAN_ROUTER is not set 320# CONFIG_WAN_ROUTER is not set
@@ -457,6 +463,7 @@ CONFIG_MII=y
457# CONFIG_SUNGEM is not set 463# CONFIG_SUNGEM is not set
458# CONFIG_CASSINI is not set 464# CONFIG_CASSINI is not set
459# CONFIG_NET_VENDOR_3COM is not set 465# CONFIG_NET_VENDOR_3COM is not set
466# CONFIG_DM9000 is not set
460 467
461# 468#
462# Tulip family network device support 469# Tulip family network device support
@@ -478,6 +485,7 @@ CONFIG_MII=y
478CONFIG_NET_SB1250_MAC=y 485CONFIG_NET_SB1250_MAC=y
479# CONFIG_SIS190 is not set 486# CONFIG_SIS190 is not set
480# CONFIG_SKGE is not set 487# CONFIG_SKGE is not set
488# CONFIG_SKY2 is not set
481# CONFIG_SK98LIN is not set 489# CONFIG_SK98LIN is not set
482# CONFIG_TIGON3 is not set 490# CONFIG_TIGON3 is not set
483# CONFIG_BNX2 is not set 491# CONFIG_BNX2 is not set
@@ -543,12 +551,15 @@ CONFIG_SERIO_RAW=m
543# 551#
544# CONFIG_VT is not set 552# CONFIG_VT is not set
545CONFIG_SERIAL_NONSTANDARD=y 553CONFIG_SERIAL_NONSTANDARD=y
554# CONFIG_COMPUTONE is not set
546# CONFIG_ROCKETPORT is not set 555# CONFIG_ROCKETPORT is not set
547# CONFIG_CYCLADES is not set 556# CONFIG_CYCLADES is not set
548# CONFIG_DIGIEPCA is not set 557# CONFIG_DIGIEPCA is not set
558# CONFIG_MOXA_INTELLIO is not set
549# CONFIG_MOXA_SMARTIO is not set 559# CONFIG_MOXA_SMARTIO is not set
550# CONFIG_ISI is not set 560# CONFIG_ISI is not set
551# CONFIG_SYNCLINKMP is not set 561# CONFIG_SYNCLINKMP is not set
562# CONFIG_SYNCLINK_GT is not set
552# CONFIG_N_HDLC is not set 563# CONFIG_N_HDLC is not set
553# CONFIG_SPECIALIX is not set 564# CONFIG_SPECIALIX is not set
554# CONFIG_SX is not set 565# CONFIG_SX is not set
@@ -564,7 +575,6 @@ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
564# 575#
565# Non-8250 serial port support 576# Non-8250 serial port support
566# 577#
567# CONFIG_SERIAL_JSM is not set
568CONFIG_UNIX98_PTYS=y 578CONFIG_UNIX98_PTYS=y
569CONFIG_LEGACY_PTYS=y 579CONFIG_LEGACY_PTYS=y
570CONFIG_LEGACY_PTY_COUNT=256 580CONFIG_LEGACY_PTY_COUNT=256
@@ -655,6 +665,12 @@ CONFIG_I2C_DEBUG_BUS=y
655CONFIG_I2C_DEBUG_CHIP=y 665CONFIG_I2C_DEBUG_CHIP=y
656 666
657# 667#
668# SPI support
669#
670# CONFIG_SPI is not set
671# CONFIG_SPI_MASTER is not set
672
673#
658# Dallas's 1-wire bus 674# Dallas's 1-wire bus
659# 675#
660# CONFIG_W1 is not set 676# CONFIG_W1 is not set
@@ -732,12 +748,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
732CONFIG_EXT2_FS_SECURITY=y 748CONFIG_EXT2_FS_SECURITY=y
733# CONFIG_EXT2_FS_XIP is not set 749# CONFIG_EXT2_FS_XIP is not set
734# CONFIG_EXT3_FS is not set 750# CONFIG_EXT3_FS is not set
735# CONFIG_JBD is not set
736CONFIG_FS_MBCACHE=y 751CONFIG_FS_MBCACHE=y
737# CONFIG_REISERFS_FS is not set 752# CONFIG_REISERFS_FS is not set
738# CONFIG_JFS_FS is not set 753# CONFIG_JFS_FS is not set
739CONFIG_FS_POSIX_ACL=y 754CONFIG_FS_POSIX_ACL=y
740# CONFIG_XFS_FS is not set 755# CONFIG_XFS_FS is not set
756# CONFIG_OCFS2_FS is not set
741# CONFIG_MINIX_FS is not set 757# CONFIG_MINIX_FS is not set
742# CONFIG_ROMFS_FS is not set 758# CONFIG_ROMFS_FS is not set
743CONFIG_INOTIFY=y 759CONFIG_INOTIFY=y
@@ -770,6 +786,7 @@ CONFIG_SYSFS=y
770# CONFIG_HUGETLB_PAGE is not set 786# CONFIG_HUGETLB_PAGE is not set
771CONFIG_RAMFS=y 787CONFIG_RAMFS=y
772# CONFIG_RELAYFS_FS is not set 788# CONFIG_RELAYFS_FS is not set
789# CONFIG_CONFIGFS_FS is not set
773 790
774# 791#
775# Miscellaneous filesystems 792# Miscellaneous filesystems
@@ -831,18 +848,20 @@ CONFIG_MSDOS_PARTITION=y
831# Kernel hacking 848# Kernel hacking
832# 849#
833CONFIG_PRINTK_TIME=y 850CONFIG_PRINTK_TIME=y
834CONFIG_DEBUG_KERNEL=y
835CONFIG_MAGIC_SYSRQ=y 851CONFIG_MAGIC_SYSRQ=y
852CONFIG_DEBUG_KERNEL=y
836CONFIG_LOG_BUF_SHIFT=16 853CONFIG_LOG_BUF_SHIFT=16
837CONFIG_DETECT_SOFTLOCKUP=y 854CONFIG_DETECT_SOFTLOCKUP=y
838# CONFIG_SCHEDSTATS is not set 855# CONFIG_SCHEDSTATS is not set
839# CONFIG_DEBUG_SLAB is not set 856# CONFIG_DEBUG_SLAB is not set
857CONFIG_DEBUG_MUTEXES=y
840# CONFIG_DEBUG_SPINLOCK is not set 858# CONFIG_DEBUG_SPINLOCK is not set
841# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 859# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
842# CONFIG_DEBUG_KOBJECT is not set 860# CONFIG_DEBUG_KOBJECT is not set
843# CONFIG_DEBUG_INFO is not set 861# CONFIG_DEBUG_INFO is not set
844# CONFIG_DEBUG_FS is not set 862# CONFIG_DEBUG_FS is not set
845# CONFIG_DEBUG_VM is not set 863# CONFIG_DEBUG_VM is not set
864CONFIG_FORCED_INLINING=y
846# CONFIG_RCU_TORTURE_TEST is not set 865# CONFIG_RCU_TORTURE_TEST is not set
847CONFIG_CROSSCOMPILE=y 866CONFIG_CROSSCOMPILE=y
848CONFIG_CMDLINE="" 867CONFIG_CMDLINE=""
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 5261e29ccf37..6c2961affbd6 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:05:55 2005 4# Fri Jan 27 15:39:54 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,9 +63,9 @@ CONFIG_MACH_VR41XX=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_NEC_CMBVR4133 is not set
67# CONFIG_CASIO_E55 is not set 66# CONFIG_CASIO_E55 is not set
68# CONFIG_IBM_WORKPAD is not set 67# CONFIG_IBM_WORKPAD is not set
68# CONFIG_NEC_CMBVR4133 is not set
69# CONFIG_TANBAC_TB022X is not set 69# CONFIG_TANBAC_TB022X is not set
70# CONFIG_VICTOR_MPC30X is not set 70# CONFIG_VICTOR_MPC30X is not set
71CONFIG_ZAO_CAPCELLA=y 71CONFIG_ZAO_CAPCELLA=y
@@ -90,7 +90,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
90# CONFIG_CPU_MIPS64_R2 is not set 90# CONFIG_CPU_MIPS64_R2 is not set
91# CONFIG_CPU_R3000 is not set 91# CONFIG_CPU_R3000 is not set
92# CONFIG_CPU_TX39XX is not set 92# CONFIG_CPU_TX39XX is not set
93CONFIG_CPU_VR41XX=y 93# CONFIG_CPU_VR41XX is not set
94# CONFIG_CPU_R4300 is not set 94# CONFIG_CPU_R4300 is not set
95# CONFIG_CPU_R4X00 is not set 95# CONFIG_CPU_R4X00 is not set
96# CONFIG_CPU_TX49XX is not set 96# CONFIG_CPU_TX49XX is not set
@@ -103,23 +103,18 @@ CONFIG_CPU_VR41XX=y
103# CONFIG_CPU_RM7000 is not set 103# CONFIG_CPU_RM7000 is not set
104# CONFIG_CPU_RM9000 is not set 104# CONFIG_CPU_RM9000 is not set
105# CONFIG_CPU_SB1 is not set 105# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_VR41XX=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 106
112# 107#
113# Kernel type 108# Kernel type
114# 109#
115CONFIG_32BIT=y 110# CONFIG_32BIT is not set
116# CONFIG_64BIT is not set 111# CONFIG_64BIT is not set
117CONFIG_PAGE_SIZE_4KB=y 112CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_8KB is not set 113# CONFIG_PAGE_SIZE_8KB is not set
119# CONFIG_PAGE_SIZE_16KB is not set 114# CONFIG_PAGE_SIZE_16KB is not set
120# CONFIG_PAGE_SIZE_64KB is not set 115# CONFIG_PAGE_SIZE_64KB is not set
121# CONFIG_MIPS_MT is not set 116# CONFIG_MIPS_MT is not set
122# CONFIG_CPU_ADVANCED is not set 117CONFIG_CPU_HAS_LLSC=y
123CONFIG_CPU_HAS_SYNC=y 118CONFIG_CPU_HAS_SYNC=y
124CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
125CONFIG_GENERIC_IRQ_PROBE=y 120CONFIG_GENERIC_IRQ_PROBE=y
@@ -155,26 +150,28 @@ CONFIG_SYSVIPC=y
155# CONFIG_BSD_PROCESS_ACCT is not set 150# CONFIG_BSD_PROCESS_ACCT is not set
156CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
157# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
158CONFIG_HOTPLUG=y
159CONFIG_KOBJECT_UEVENT=y
160# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
161CONFIG_INITRAMFS_SOURCE="" 154CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
162CONFIG_EMBEDDED=y 156CONFIG_EMBEDDED=y
163CONFIG_KALLSYMS=y 157CONFIG_KALLSYMS=y
164# CONFIG_KALLSYMS_EXTRA_PASS is not set 158# CONFIG_KALLSYMS_EXTRA_PASS is not set
159CONFIG_HOTPLUG=y
165CONFIG_PRINTK=y 160CONFIG_PRINTK=y
166CONFIG_BUG=y 161CONFIG_BUG=y
162CONFIG_ELF_CORE=y
167CONFIG_BASE_FULL=y 163CONFIG_BASE_FULL=y
168CONFIG_FUTEX=y 164CONFIG_FUTEX=y
169CONFIG_EPOLL=y 165CONFIG_EPOLL=y
170# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
171CONFIG_SHMEM=y 166CONFIG_SHMEM=y
172CONFIG_CC_ALIGN_FUNCTIONS=0 167CONFIG_CC_ALIGN_FUNCTIONS=0
173CONFIG_CC_ALIGN_LABELS=0 168CONFIG_CC_ALIGN_LABELS=0
174CONFIG_CC_ALIGN_LOOPS=0 169CONFIG_CC_ALIGN_LOOPS=0
175CONFIG_CC_ALIGN_JUMPS=0 170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y
176# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
177CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
174# CONFIG_SLOB is not set
178 175
179# 176#
180# Loadable module support 177# Loadable module support
@@ -190,7 +187,6 @@ CONFIG_KMOD=y
190# 187#
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set
194 190
195# 191#
196# IO Schedulers 192# IO Schedulers
@@ -228,7 +224,6 @@ CONFIG_MMU=y
228# 224#
229CONFIG_BINFMT_ELF=y 225CONFIG_BINFMT_ELF=y
230# CONFIG_BINFMT_MISC is not set 226# CONFIG_BINFMT_MISC is not set
231CONFIG_TRAD_SIGNALS=y
232 227
233# 228#
234# Networking 229# Networking
@@ -286,6 +281,11 @@ CONFIG_TCP_CONG_BIC=y
286# CONFIG_ATALK is not set 281# CONFIG_ATALK is not set
287# CONFIG_X25 is not set 282# CONFIG_X25 is not set
288# CONFIG_LAPB is not set 283# CONFIG_LAPB is not set
284
285#
286# TIPC Configuration (EXPERIMENTAL)
287#
288# CONFIG_TIPC is not set
289# CONFIG_NET_DIVERT is not set 289# CONFIG_NET_DIVERT is not set
290# CONFIG_ECONET is not set 290# CONFIG_ECONET is not set
291# CONFIG_WAN_ROUTER is not set 291# CONFIG_WAN_ROUTER is not set
@@ -306,7 +306,6 @@ CONFIG_IEEE80211=m
306# CONFIG_IEEE80211_DEBUG is not set 306# CONFIG_IEEE80211_DEBUG is not set
307CONFIG_IEEE80211_CRYPT_WEP=m 307CONFIG_IEEE80211_CRYPT_WEP=m
308CONFIG_IEEE80211_CRYPT_CCMP=m 308CONFIG_IEEE80211_CRYPT_CCMP=m
309CONFIG_IEEE80211_CRYPT_TKIP=m
310 309
311# 310#
312# Device Drivers 311# Device Drivers
@@ -444,6 +443,7 @@ CONFIG_MII=y
444# CONFIG_SUNGEM is not set 443# CONFIG_SUNGEM is not set
445# CONFIG_CASSINI is not set 444# CONFIG_CASSINI is not set
446# CONFIG_NET_VENDOR_3COM is not set 445# CONFIG_NET_VENDOR_3COM is not set
446# CONFIG_DM9000 is not set
447 447
448# 448#
449# Tulip family network device support 449# Tulip family network device support
@@ -487,6 +487,7 @@ CONFIG_8139TOO_PIO=y
487# CONFIG_R8169 is not set 487# CONFIG_R8169 is not set
488# CONFIG_SIS190 is not set 488# CONFIG_SIS190 is not set
489# CONFIG_SKGE is not set 489# CONFIG_SKGE is not set
490# CONFIG_SKY2 is not set
490# CONFIG_SK98LIN is not set 491# CONFIG_SK98LIN is not set
491# CONFIG_VIA_VELOCITY is not set 492# CONFIG_VIA_VELOCITY is not set
492# CONFIG_TIGON3 is not set 493# CONFIG_TIGON3 is not set
@@ -508,8 +509,6 @@ CONFIG_8139TOO_PIO=y
508# Wireless LAN (non-hamradio) 509# Wireless LAN (non-hamradio)
509# 510#
510# CONFIG_NET_RADIO is not set 511# CONFIG_NET_RADIO is not set
511# CONFIG_IPW_DEBUG is not set
512CONFIG_IPW2200=m
513 512
514# 513#
515# Wan interfaces 514# Wan interfaces
@@ -579,11 +578,6 @@ CONFIG_HW_CONSOLE=y
579# 578#
580# Non-8250 serial port support 579# Non-8250 serial port support
581# 580#
582CONFIG_SERIAL_CORE=y
583CONFIG_SERIAL_CORE_CONSOLE=y
584CONFIG_SERIAL_VR41XX=y
585CONFIG_SERIAL_VR41XX_CONSOLE=y
586# CONFIG_SERIAL_JSM is not set
587CONFIG_UNIX98_PTYS=y 581CONFIG_UNIX98_PTYS=y
588CONFIG_LEGACY_PTYS=y 582CONFIG_LEGACY_PTYS=y
589CONFIG_LEGACY_PTY_COUNT=256 583CONFIG_LEGACY_PTY_COUNT=256
@@ -599,7 +593,6 @@ CONFIG_LEGACY_PTY_COUNT=256
599# CONFIG_WATCHDOG is not set 593# CONFIG_WATCHDOG is not set
600# CONFIG_RTC is not set 594# CONFIG_RTC is not set
601# CONFIG_GEN_RTC is not set 595# CONFIG_GEN_RTC is not set
602# CONFIG_RTC_VR41XX is not set
603# CONFIG_DTLK is not set 596# CONFIG_DTLK is not set
604# CONFIG_R3964 is not set 597# CONFIG_R3964 is not set
605# CONFIG_APPLICOM is not set 598# CONFIG_APPLICOM is not set
@@ -608,7 +601,6 @@ CONFIG_LEGACY_PTY_COUNT=256
608# Ftape, the floppy tape device driver 601# Ftape, the floppy tape device driver
609# 602#
610# CONFIG_DRM is not set 603# CONFIG_DRM is not set
611CONFIG_GPIO_VR41XX=y
612# CONFIG_RAW_DRIVER is not set 604# CONFIG_RAW_DRIVER is not set
613 605
614# 606#
@@ -623,6 +615,12 @@ CONFIG_GPIO_VR41XX=y
623# CONFIG_I2C is not set 615# CONFIG_I2C is not set
624 616
625# 617#
618# SPI support
619#
620# CONFIG_SPI is not set
621# CONFIG_SPI_MASTER is not set
622
623#
626# Dallas's 1-wire bus 624# Dallas's 1-wire bus
627# 625#
628# CONFIG_W1 is not set 626# CONFIG_W1 is not set
@@ -704,11 +702,11 @@ CONFIG_EXT2_FS=y
704# CONFIG_EXT2_FS_XATTR is not set 702# CONFIG_EXT2_FS_XATTR is not set
705# CONFIG_EXT2_FS_XIP is not set 703# CONFIG_EXT2_FS_XIP is not set
706# CONFIG_EXT3_FS is not set 704# CONFIG_EXT3_FS is not set
707# CONFIG_JBD is not set
708# CONFIG_REISERFS_FS is not set 705# CONFIG_REISERFS_FS is not set
709# CONFIG_JFS_FS is not set 706# CONFIG_JFS_FS is not set
710# CONFIG_FS_POSIX_ACL is not set 707# CONFIG_FS_POSIX_ACL is not set
711# CONFIG_XFS_FS is not set 708# CONFIG_XFS_FS is not set
709# CONFIG_OCFS2_FS is not set
712# CONFIG_MINIX_FS is not set 710# CONFIG_MINIX_FS is not set
713# CONFIG_ROMFS_FS is not set 711# CONFIG_ROMFS_FS is not set
714CONFIG_INOTIFY=y 712CONFIG_INOTIFY=y
@@ -741,6 +739,7 @@ CONFIG_SYSFS=y
741# CONFIG_HUGETLB_PAGE is not set 739# CONFIG_HUGETLB_PAGE is not set
742CONFIG_RAMFS=y 740CONFIG_RAMFS=y
743CONFIG_RELAYFS_FS=m 741CONFIG_RELAYFS_FS=m
742# CONFIG_CONFIGFS_FS is not set
744 743
745# 744#
746# Miscellaneous filesystems 745# Miscellaneous filesystems
@@ -803,6 +802,7 @@ CONFIG_MSDOS_PARTITION=y
803# Kernel hacking 802# Kernel hacking
804# 803#
805# CONFIG_PRINTK_TIME is not set 804# CONFIG_PRINTK_TIME is not set
805# CONFIG_MAGIC_SYSRQ is not set
806# CONFIG_DEBUG_KERNEL is not set 806# CONFIG_DEBUG_KERNEL is not set
807CONFIG_LOG_BUF_SHIFT=14 807CONFIG_LOG_BUF_SHIFT=14
808CONFIG_CROSSCOMPILE=y 808CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 1d3ee18ea8bb..8336b21d3db2 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:05:57 2005 4# Fri Jan 27 15:39:55 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -150,26 +150,28 @@ CONFIG_SYSVIPC=y
150# CONFIG_BSD_PROCESS_ACCT is not set 150# CONFIG_BSD_PROCESS_ACCT is not set
151CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
153CONFIG_HOTPLUG=y
154CONFIG_KOBJECT_UEVENT=y
155# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
156CONFIG_INITRAMFS_SOURCE="" 154CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 156CONFIG_EMBEDDED=y
158CONFIG_KALLSYMS=y 157CONFIG_KALLSYMS=y
159# CONFIG_KALLSYMS_EXTRA_PASS is not set 158# CONFIG_KALLSYMS_EXTRA_PASS is not set
159CONFIG_HOTPLUG=y
160CONFIG_PRINTK=y 160CONFIG_PRINTK=y
161CONFIG_BUG=y 161CONFIG_BUG=y
162CONFIG_ELF_CORE=y
162CONFIG_BASE_FULL=y 163CONFIG_BASE_FULL=y
163CONFIG_FUTEX=y 164CONFIG_FUTEX=y
164CONFIG_EPOLL=y 165CONFIG_EPOLL=y
165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_SHMEM=y 166CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0 167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0 168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0 169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0 170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y
171# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
172CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
174# CONFIG_SLOB is not set
173 175
174# 176#
175# Loadable module support 177# Loadable module support
@@ -271,6 +273,11 @@ CONFIG_TCP_CONG_BIC=y
271# CONFIG_ATALK is not set 273# CONFIG_ATALK is not set
272# CONFIG_X25 is not set 274# CONFIG_X25 is not set
273# CONFIG_LAPB is not set 275# CONFIG_LAPB is not set
276
277#
278# TIPC Configuration (EXPERIMENTAL)
279#
280# CONFIG_TIPC is not set
274# CONFIG_NET_DIVERT is not set 281# CONFIG_NET_DIVERT is not set
275# CONFIG_ECONET is not set 282# CONFIG_ECONET is not set
276# CONFIG_WAN_ROUTER is not set 283# CONFIG_WAN_ROUTER is not set
@@ -291,7 +298,6 @@ CONFIG_IEEE80211=y
291# CONFIG_IEEE80211_DEBUG is not set 298# CONFIG_IEEE80211_DEBUG is not set
292CONFIG_IEEE80211_CRYPT_WEP=y 299CONFIG_IEEE80211_CRYPT_WEP=y
293CONFIG_IEEE80211_CRYPT_CCMP=y 300CONFIG_IEEE80211_CRYPT_CCMP=y
294CONFIG_IEEE80211_CRYPT_TKIP=y
295 301
296# 302#
297# Device Drivers 303# Device Drivers
@@ -364,9 +370,38 @@ CONFIG_BLK_DEV_IDEDISK=y
364# IDE chipset support/bugfixes 370# IDE chipset support/bugfixes
365# 371#
366CONFIG_IDE_GENERIC=y 372CONFIG_IDE_GENERIC=y
367# CONFIG_BLK_DEV_IDEPCI is not set 373CONFIG_BLK_DEV_IDEPCI=y
374# CONFIG_IDEPCI_SHARE_IRQ is not set
375# CONFIG_BLK_DEV_OFFBOARD is not set
376# CONFIG_BLK_DEV_GENERIC is not set
377# CONFIG_BLK_DEV_OPTI621 is not set
378CONFIG_BLK_DEV_IDEDMA_PCI=y
379# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
380# CONFIG_IDEDMA_PCI_AUTO is not set
381# CONFIG_BLK_DEV_AEC62XX is not set
382# CONFIG_BLK_DEV_ALI15X3 is not set
383# CONFIG_BLK_DEV_AMD74XX is not set
384# CONFIG_BLK_DEV_CMD64X is not set
385# CONFIG_BLK_DEV_TRIFLEX is not set
386# CONFIG_BLK_DEV_CY82C693 is not set
387# CONFIG_BLK_DEV_CS5520 is not set
388# CONFIG_BLK_DEV_CS5530 is not set
389# CONFIG_BLK_DEV_HPT34X is not set
390# CONFIG_BLK_DEV_HPT366 is not set
391# CONFIG_BLK_DEV_SC1200 is not set
392# CONFIG_BLK_DEV_PIIX is not set
393# CONFIG_BLK_DEV_IT821X is not set
394# CONFIG_BLK_DEV_NS87415 is not set
395# CONFIG_BLK_DEV_PDC202XX_OLD is not set
396# CONFIG_BLK_DEV_PDC202XX_NEW is not set
397# CONFIG_BLK_DEV_SVWKS is not set
398# CONFIG_BLK_DEV_SIIMAGE is not set
399# CONFIG_BLK_DEV_SLC90E66 is not set
400# CONFIG_BLK_DEV_TRM290 is not set
401CONFIG_BLK_DEV_VIA82CXXX=y
368# CONFIG_IDE_ARM is not set 402# CONFIG_IDE_ARM is not set
369# CONFIG_BLK_DEV_IDEDMA is not set 403CONFIG_BLK_DEV_IDEDMA=y
404# CONFIG_IDEDMA_IVB is not set
370# CONFIG_IDEDMA_AUTO is not set 405# CONFIG_IDEDMA_AUTO is not set
371# CONFIG_BLK_DEV_HD is not set 406# CONFIG_BLK_DEV_HD is not set
372 407
@@ -433,11 +468,21 @@ CONFIG_NET_ETHERNET=y
433# CONFIG_SUNGEM is not set 468# CONFIG_SUNGEM is not set
434# CONFIG_CASSINI is not set 469# CONFIG_CASSINI is not set
435# CONFIG_NET_VENDOR_3COM is not set 470# CONFIG_NET_VENDOR_3COM is not set
471# CONFIG_DM9000 is not set
436 472
437# 473#
438# Tulip family network device support 474# Tulip family network device support
439# 475#
440# CONFIG_NET_TULIP is not set 476CONFIG_NET_TULIP=y
477CONFIG_DE2104X=y
478CONFIG_TULIP=y
479# CONFIG_TULIP_MWI is not set
480# CONFIG_TULIP_MMIO is not set
481# CONFIG_TULIP_NAPI is not set
482# CONFIG_DE4X5 is not set
483# CONFIG_WINBOND_840 is not set
484# CONFIG_DM9102 is not set
485# CONFIG_ULI526X is not set
441# CONFIG_HP100 is not set 486# CONFIG_HP100 is not set
442# CONFIG_NET_PCI is not set 487# CONFIG_NET_PCI is not set
443 488
@@ -453,6 +498,7 @@ CONFIG_NET_ETHERNET=y
453# CONFIG_R8169 is not set 498# CONFIG_R8169 is not set
454# CONFIG_SIS190 is not set 499# CONFIG_SIS190 is not set
455# CONFIG_SKGE is not set 500# CONFIG_SKGE is not set
501# CONFIG_SKY2 is not set
456# CONFIG_SK98LIN is not set 502# CONFIG_SK98LIN is not set
457# CONFIG_TIGON3 is not set 503# CONFIG_TIGON3 is not set
458# CONFIG_BNX2 is not set 504# CONFIG_BNX2 is not set
@@ -473,8 +519,6 @@ CONFIG_NET_ETHERNET=y
473# Wireless LAN (non-hamradio) 519# Wireless LAN (non-hamradio)
474# 520#
475# CONFIG_NET_RADIO is not set 521# CONFIG_NET_RADIO is not set
476# CONFIG_IPW_DEBUG is not set
477CONFIG_IPW2200=y
478 522
479# 523#
480# Wan interfaces 524# Wan interfaces
@@ -550,6 +594,7 @@ CONFIG_HW_CONSOLE=y
550CONFIG_SERIAL_8250=y 594CONFIG_SERIAL_8250=y
551CONFIG_SERIAL_8250_CONSOLE=y 595CONFIG_SERIAL_8250_CONSOLE=y
552CONFIG_SERIAL_8250_NR_UARTS=4 596CONFIG_SERIAL_8250_NR_UARTS=4
597CONFIG_SERIAL_8250_RUNTIME_UARTS=4
553# CONFIG_SERIAL_8250_EXTENDED is not set 598# CONFIG_SERIAL_8250_EXTENDED is not set
554 599
555# 600#
@@ -557,7 +602,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
557# 602#
558CONFIG_SERIAL_CORE=y 603CONFIG_SERIAL_CORE=y
559CONFIG_SERIAL_CORE_CONSOLE=y 604CONFIG_SERIAL_CORE_CONSOLE=y
560# CONFIG_SERIAL_JSM is not set
561CONFIG_UNIX98_PTYS=y 605CONFIG_UNIX98_PTYS=y
562CONFIG_LEGACY_PTYS=y 606CONFIG_LEGACY_PTYS=y
563CONFIG_LEGACY_PTY_COUNT=256 607CONFIG_LEGACY_PTY_COUNT=256
@@ -595,6 +639,12 @@ CONFIG_COBALT_LCD=y
595# CONFIG_I2C is not set 639# CONFIG_I2C is not set
596 640
597# 641#
642# SPI support
643#
644# CONFIG_SPI is not set
645# CONFIG_SPI_MASTER is not set
646
647#
598# Dallas's 1-wire bus 648# Dallas's 1-wire bus
599# 649#
600# CONFIG_W1 is not set 650# CONFIG_W1 is not set
@@ -678,12 +728,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
678CONFIG_EXT2_FS_SECURITY=y 728CONFIG_EXT2_FS_SECURITY=y
679# CONFIG_EXT2_FS_XIP is not set 729# CONFIG_EXT2_FS_XIP is not set
680# CONFIG_EXT3_FS is not set 730# CONFIG_EXT3_FS is not set
681# CONFIG_JBD is not set
682CONFIG_FS_MBCACHE=y 731CONFIG_FS_MBCACHE=y
683# CONFIG_REISERFS_FS is not set 732# CONFIG_REISERFS_FS is not set
684# CONFIG_JFS_FS is not set 733# CONFIG_JFS_FS is not set
685CONFIG_FS_POSIX_ACL=y 734CONFIG_FS_POSIX_ACL=y
686# CONFIG_XFS_FS is not set 735# CONFIG_XFS_FS is not set
736# CONFIG_OCFS2_FS is not set
687# CONFIG_MINIX_FS is not set 737# CONFIG_MINIX_FS is not set
688# CONFIG_ROMFS_FS is not set 738# CONFIG_ROMFS_FS is not set
689CONFIG_INOTIFY=y 739CONFIG_INOTIFY=y
@@ -716,6 +766,7 @@ CONFIG_SYSFS=y
716# CONFIG_HUGETLB_PAGE is not set 766# CONFIG_HUGETLB_PAGE is not set
717CONFIG_RAMFS=y 767CONFIG_RAMFS=y
718CONFIG_RELAYFS_FS=y 768CONFIG_RELAYFS_FS=y
769# CONFIG_CONFIGFS_FS is not set
719 770
720# 771#
721# Miscellaneous filesystems 772# Miscellaneous filesystems
@@ -774,6 +825,7 @@ CONFIG_MSDOS_PARTITION=y
774# Kernel hacking 825# Kernel hacking
775# 826#
776# CONFIG_PRINTK_TIME is not set 827# CONFIG_PRINTK_TIME is not set
828# CONFIG_MAGIC_SYSRQ is not set
777# CONFIG_DEBUG_KERNEL is not set 829# CONFIG_DEBUG_KERNEL is not set
778CONFIG_LOG_BUF_SHIFT=14 830CONFIG_LOG_BUF_SHIFT=14
779CONFIG_CROSSCOMPILE=y 831CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 18ac7926c058..7f071403c8e3 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:05:59 2005 4# Fri Jan 27 15:39:56 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -151,26 +151,29 @@ CONFIG_SYSVIPC=y
151# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y 158CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set 159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160CONFIG_HOTPLUG=y
161CONFIG_PRINTK=y 161CONFIG_PRINTK=y
162CONFIG_BUG=y 162CONFIG_BUG=y
163CONFIG_ELF_CORE=y
163CONFIG_BASE_FULL=y 164CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 165CONFIG_FUTEX=y
165CONFIG_EPOLL=y 166CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y 167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0 168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0 169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0 170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0 171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
175# CONFIG_SLOB is not set
176CONFIG_OBSOLETE_INTERMODULE=y
174 177
175# 178#
176# Loadable module support 179# Loadable module support
@@ -285,6 +288,21 @@ CONFIG_NETFILTER_NETLINK=m
285CONFIG_NETFILTER_NETLINK_QUEUE=m 288CONFIG_NETFILTER_NETLINK_QUEUE=m
286CONFIG_NETFILTER_NETLINK_LOG=m 289CONFIG_NETFILTER_NETLINK_LOG=m
287# CONFIG_NF_CONNTRACK is not set 290# CONFIG_NF_CONNTRACK is not set
291CONFIG_NETFILTER_XTABLES=m
292CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
293CONFIG_NETFILTER_XT_TARGET_MARK=m
294CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
295CONFIG_NETFILTER_XT_MATCH_COMMENT=m
296CONFIG_NETFILTER_XT_MATCH_DCCP=m
297CONFIG_NETFILTER_XT_MATCH_LENGTH=m
298CONFIG_NETFILTER_XT_MATCH_LIMIT=m
299CONFIG_NETFILTER_XT_MATCH_MAC=m
300CONFIG_NETFILTER_XT_MATCH_MARK=m
301CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
302CONFIG_NETFILTER_XT_MATCH_REALM=m
303CONFIG_NETFILTER_XT_MATCH_SCTP=m
304CONFIG_NETFILTER_XT_MATCH_STRING=m
305CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
288 306
289# 307#
290# IP: Netfilter Configuration 308# IP: Netfilter Configuration
@@ -312,6 +330,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
312# CONFIG_ATALK is not set 330# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 331# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 332# CONFIG_LAPB is not set
333
334#
335# TIPC Configuration (EXPERIMENTAL)
336#
337# CONFIG_TIPC is not set
315# CONFIG_NET_DIVERT is not set 338# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
@@ -320,6 +343,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
320# QoS and/or fair queueing 343# QoS and/or fair queueing
321# 344#
322# CONFIG_NET_SCHED is not set 345# CONFIG_NET_SCHED is not set
346CONFIG_NET_CLS_ROUTE=y
323 347
324# 348#
325# Network testing 349# Network testing
@@ -332,7 +356,6 @@ CONFIG_IEEE80211=m
332# CONFIG_IEEE80211_DEBUG is not set 356# CONFIG_IEEE80211_DEBUG is not set
333CONFIG_IEEE80211_CRYPT_WEP=m 357CONFIG_IEEE80211_CRYPT_WEP=m
334CONFIG_IEEE80211_CRYPT_CCMP=m 358CONFIG_IEEE80211_CRYPT_CCMP=m
335CONFIG_IEEE80211_CRYPT_TKIP=m
336 359
337# 360#
338# Device Drivers 361# Device Drivers
@@ -395,6 +418,7 @@ CONFIG_MTD_CFI_UTIL=y
395# CONFIG_MTD_RAM is not set 418# CONFIG_MTD_RAM is not set
396# CONFIG_MTD_ROM is not set 419# CONFIG_MTD_ROM is not set
397# CONFIG_MTD_ABSENT is not set 420# CONFIG_MTD_ABSENT is not set
421# CONFIG_MTD_OBSOLETE_CHIPS is not set
398 422
399# 423#
400# Mapping drivers for chip access 424# Mapping drivers for chip access
@@ -512,6 +536,7 @@ CONFIG_NET_ETHERNET=y
512CONFIG_MII=m 536CONFIG_MII=m
513CONFIG_MIPS_AU1X00_ENET=y 537CONFIG_MIPS_AU1X00_ENET=y
514# CONFIG_SMC91X is not set 538# CONFIG_SMC91X is not set
539# CONFIG_DM9000 is not set
515 540
516# 541#
517# Ethernet (1000 Mbit) 542# Ethernet (1000 Mbit)
@@ -625,13 +650,13 @@ CONFIG_SERIAL_8250=y
625CONFIG_SERIAL_8250_CONSOLE=y 650CONFIG_SERIAL_8250_CONSOLE=y
626CONFIG_SERIAL_8250_CS=m 651CONFIG_SERIAL_8250_CS=m
627CONFIG_SERIAL_8250_NR_UARTS=4 652CONFIG_SERIAL_8250_NR_UARTS=4
653CONFIG_SERIAL_8250_RUNTIME_UARTS=4
628# CONFIG_SERIAL_8250_EXTENDED is not set 654# CONFIG_SERIAL_8250_EXTENDED is not set
629CONFIG_SERIAL_8250_AU1X00=y 655CONFIG_SERIAL_8250_AU1X00=y
630 656
631# 657#
632# Non-8250 serial port support 658# Non-8250 serial port support
633# 659#
634# CONFIG_SERIAL_AU1X00 is not set
635CONFIG_SERIAL_CORE=y 660CONFIG_SERIAL_CORE=y
636CONFIG_SERIAL_CORE_CONSOLE=y 661CONFIG_SERIAL_CORE_CONSOLE=y
637CONFIG_UNIX98_PTYS=y 662CONFIG_UNIX98_PTYS=y
@@ -676,6 +701,12 @@ CONFIG_SYNCLINK_CS=m
676# CONFIG_I2C is not set 701# CONFIG_I2C is not set
677 702
678# 703#
704# SPI support
705#
706# CONFIG_SPI is not set
707# CONFIG_SPI_MASTER is not set
708
709#
679# Dallas's 1-wire bus 710# Dallas's 1-wire bus
680# 711#
681# CONFIG_W1 is not set 712# CONFIG_W1 is not set
@@ -773,6 +804,7 @@ CONFIG_REISERFS_FS_SECURITY=y
773# CONFIG_JFS_FS is not set 804# CONFIG_JFS_FS is not set
774CONFIG_FS_POSIX_ACL=y 805CONFIG_FS_POSIX_ACL=y
775# CONFIG_XFS_FS is not set 806# CONFIG_XFS_FS is not set
807# CONFIG_OCFS2_FS is not set
776# CONFIG_MINIX_FS is not set 808# CONFIG_MINIX_FS is not set
777# CONFIG_ROMFS_FS is not set 809# CONFIG_ROMFS_FS is not set
778CONFIG_INOTIFY=y 810CONFIG_INOTIFY=y
@@ -805,6 +837,7 @@ CONFIG_TMPFS=y
805# CONFIG_HUGETLB_PAGE is not set 837# CONFIG_HUGETLB_PAGE is not set
806CONFIG_RAMFS=y 838CONFIG_RAMFS=y
807CONFIG_RELAYFS_FS=m 839CONFIG_RELAYFS_FS=m
840# CONFIG_CONFIGFS_FS is not set
808 841
809# 842#
810# Miscellaneous filesystems 843# Miscellaneous filesystems
@@ -909,6 +942,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
909# Kernel hacking 942# Kernel hacking
910# 943#
911# CONFIG_PRINTK_TIME is not set 944# CONFIG_PRINTK_TIME is not set
945# CONFIG_MAGIC_SYSRQ is not set
912# CONFIG_DEBUG_KERNEL is not set 946# CONFIG_DEBUG_KERNEL is not set
913CONFIG_LOG_BUF_SHIFT=14 947CONFIG_LOG_BUF_SHIFT=14
914CONFIG_CROSSCOMPILE=y 948CONFIG_CROSSCOMPILE=y
@@ -963,3 +997,7 @@ CONFIG_CRC32=y
963CONFIG_LIBCRC32C=m 997CONFIG_LIBCRC32C=m
964CONFIG_ZLIB_INFLATE=m 998CONFIG_ZLIB_INFLATE=m
965CONFIG_ZLIB_DEFLATE=m 999CONFIG_ZLIB_DEFLATE=m
1000CONFIG_TEXTSEARCH=y
1001CONFIG_TEXTSEARCH_KMP=m
1002CONFIG_TEXTSEARCH_BM=m
1003CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index 4f55f7414c9c..98590cac1ec5 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:00 2005 4# Fri Jan 27 15:39:57 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -151,26 +151,29 @@ CONFIG_SYSVIPC=y
151# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y 158CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set 159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160CONFIG_HOTPLUG=y
161CONFIG_PRINTK=y 161CONFIG_PRINTK=y
162CONFIG_BUG=y 162CONFIG_BUG=y
163CONFIG_ELF_CORE=y
163CONFIG_BASE_FULL=y 164CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 165CONFIG_FUTEX=y
165CONFIG_EPOLL=y 166CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y 167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0 168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0 169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0 170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0 171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
175# CONFIG_SLOB is not set
176CONFIG_OBSOLETE_INTERMODULE=y
174 177
175# 178#
176# Loadable module support 179# Loadable module support
@@ -274,6 +277,21 @@ CONFIG_NETFILTER_NETLINK=m
274CONFIG_NETFILTER_NETLINK_QUEUE=m 277CONFIG_NETFILTER_NETLINK_QUEUE=m
275CONFIG_NETFILTER_NETLINK_LOG=m 278CONFIG_NETFILTER_NETLINK_LOG=m
276# CONFIG_NF_CONNTRACK is not set 279# CONFIG_NF_CONNTRACK is not set
280CONFIG_NETFILTER_XTABLES=m
281CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
282CONFIG_NETFILTER_XT_TARGET_MARK=m
283CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
284CONFIG_NETFILTER_XT_MATCH_COMMENT=m
285CONFIG_NETFILTER_XT_MATCH_DCCP=m
286CONFIG_NETFILTER_XT_MATCH_LENGTH=m
287CONFIG_NETFILTER_XT_MATCH_LIMIT=m
288CONFIG_NETFILTER_XT_MATCH_MAC=m
289CONFIG_NETFILTER_XT_MATCH_MARK=m
290CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
291CONFIG_NETFILTER_XT_MATCH_REALM=m
292CONFIG_NETFILTER_XT_MATCH_SCTP=m
293CONFIG_NETFILTER_XT_MATCH_STRING=m
294CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
277 295
278# 296#
279# IP: Netfilter Configuration 297# IP: Netfilter Configuration
@@ -301,6 +319,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
301# CONFIG_ATALK is not set 319# CONFIG_ATALK is not set
302# CONFIG_X25 is not set 320# CONFIG_X25 is not set
303# CONFIG_LAPB is not set 321# CONFIG_LAPB is not set
322
323#
324# TIPC Configuration (EXPERIMENTAL)
325#
326# CONFIG_TIPC is not set
304# CONFIG_NET_DIVERT is not set 327# CONFIG_NET_DIVERT is not set
305# CONFIG_ECONET is not set 328# CONFIG_ECONET is not set
306# CONFIG_WAN_ROUTER is not set 329# CONFIG_WAN_ROUTER is not set
@@ -309,6 +332,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
309# QoS and/or fair queueing 332# QoS and/or fair queueing
310# 333#
311# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
335CONFIG_NET_CLS_ROUTE=y
312 336
313# 337#
314# Network testing 338# Network testing
@@ -321,7 +345,6 @@ CONFIG_IEEE80211=m
321# CONFIG_IEEE80211_DEBUG is not set 345# CONFIG_IEEE80211_DEBUG is not set
322CONFIG_IEEE80211_CRYPT_WEP=m 346CONFIG_IEEE80211_CRYPT_WEP=m
323CONFIG_IEEE80211_CRYPT_CCMP=m 347CONFIG_IEEE80211_CRYPT_CCMP=m
324CONFIG_IEEE80211_CRYPT_TKIP=m
325 348
326# 349#
327# Device Drivers 350# Device Drivers
@@ -384,6 +407,7 @@ CONFIG_MTD_CFI_UTIL=y
384# CONFIG_MTD_RAM is not set 407# CONFIG_MTD_RAM is not set
385# CONFIG_MTD_ROM is not set 408# CONFIG_MTD_ROM is not set
386# CONFIG_MTD_ABSENT is not set 409# CONFIG_MTD_ABSENT is not set
410# CONFIG_MTD_OBSOLETE_CHIPS is not set
387 411
388# 412#
389# Mapping drivers for chip access 413# Mapping drivers for chip access
@@ -501,6 +525,7 @@ CONFIG_NET_ETHERNET=y
501CONFIG_MII=m 525CONFIG_MII=m
502CONFIG_MIPS_AU1X00_ENET=y 526CONFIG_MIPS_AU1X00_ENET=y
503# CONFIG_SMC91X is not set 527# CONFIG_SMC91X is not set
528# CONFIG_DM9000 is not set
504 529
505# 530#
506# Ethernet (1000 Mbit) 531# Ethernet (1000 Mbit)
@@ -600,13 +625,13 @@ CONFIG_HW_CONSOLE=y
600CONFIG_SERIAL_8250=y 625CONFIG_SERIAL_8250=y
601CONFIG_SERIAL_8250_CONSOLE=y 626CONFIG_SERIAL_8250_CONSOLE=y
602CONFIG_SERIAL_8250_NR_UARTS=4 627CONFIG_SERIAL_8250_NR_UARTS=4
628CONFIG_SERIAL_8250_RUNTIME_UARTS=4
603# CONFIG_SERIAL_8250_EXTENDED is not set 629# CONFIG_SERIAL_8250_EXTENDED is not set
604CONFIG_SERIAL_8250_AU1X00=y 630CONFIG_SERIAL_8250_AU1X00=y
605 631
606# 632#
607# Non-8250 serial port support 633# Non-8250 serial port support
608# 634#
609# CONFIG_SERIAL_AU1X00 is not set
610CONFIG_SERIAL_CORE=y 635CONFIG_SERIAL_CORE=y
611CONFIG_SERIAL_CORE_CONSOLE=y 636CONFIG_SERIAL_CORE_CONSOLE=y
612CONFIG_UNIX98_PTYS=y 637CONFIG_UNIX98_PTYS=y
@@ -644,6 +669,12 @@ CONFIG_LEGACY_PTY_COUNT=256
644# CONFIG_I2C is not set 669# CONFIG_I2C is not set
645 670
646# 671#
672# SPI support
673#
674# CONFIG_SPI is not set
675# CONFIG_SPI_MASTER is not set
676
677#
647# Dallas's 1-wire bus 678# Dallas's 1-wire bus
648# 679#
649# CONFIG_W1 is not set 680# CONFIG_W1 is not set
@@ -772,6 +803,7 @@ CONFIG_REISERFS_FS_SECURITY=y
772# CONFIG_JFS_FS is not set 803# CONFIG_JFS_FS is not set
773CONFIG_FS_POSIX_ACL=y 804CONFIG_FS_POSIX_ACL=y
774# CONFIG_XFS_FS is not set 805# CONFIG_XFS_FS is not set
806# CONFIG_OCFS2_FS is not set
775# CONFIG_MINIX_FS is not set 807# CONFIG_MINIX_FS is not set
776# CONFIG_ROMFS_FS is not set 808# CONFIG_ROMFS_FS is not set
777CONFIG_INOTIFY=y 809CONFIG_INOTIFY=y
@@ -804,6 +836,7 @@ CONFIG_TMPFS=y
804# CONFIG_HUGETLB_PAGE is not set 836# CONFIG_HUGETLB_PAGE is not set
805CONFIG_RAMFS=y 837CONFIG_RAMFS=y
806CONFIG_RELAYFS_FS=m 838CONFIG_RELAYFS_FS=m
839# CONFIG_CONFIGFS_FS is not set
807 840
808# 841#
809# Miscellaneous filesystems 842# Miscellaneous filesystems
@@ -908,6 +941,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
908# Kernel hacking 941# Kernel hacking
909# 942#
910# CONFIG_PRINTK_TIME is not set 943# CONFIG_PRINTK_TIME is not set
944# CONFIG_MAGIC_SYSRQ is not set
911# CONFIG_DEBUG_KERNEL is not set 945# CONFIG_DEBUG_KERNEL is not set
912CONFIG_LOG_BUF_SHIFT=14 946CONFIG_LOG_BUF_SHIFT=14
913CONFIG_CROSSCOMPILE=y 947CONFIG_CROSSCOMPILE=y
@@ -962,3 +996,7 @@ CONFIG_CRC32=y
962CONFIG_LIBCRC32C=m 996CONFIG_LIBCRC32C=m
963CONFIG_ZLIB_INFLATE=m 997CONFIG_ZLIB_INFLATE=m
964CONFIG_ZLIB_DEFLATE=m 998CONFIG_ZLIB_DEFLATE=m
999CONFIG_TEXTSEARCH=y
1000CONFIG_TEXTSEARCH_KMP=m
1001CONFIG_TEXTSEARCH_BM=m
1002CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 0e5de7d05f23..92888472dca0 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:03 2005 4# Fri Jan 27 15:39:58 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -151,27 +151,30 @@ CONFIG_SYSVIPC=y
151# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156CONFIG_IKCONFIG=y 154CONFIG_IKCONFIG=y
157CONFIG_IKCONFIG_PROC=y 155CONFIG_IKCONFIG_PROC=y
158CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set 160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_HOTPLUG=y
162CONFIG_PRINTK=y 162CONFIG_PRINTK=y
163CONFIG_BUG=y 163CONFIG_BUG=y
164CONFIG_ELF_CORE=y
164CONFIG_BASE_FULL=y 165CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y 168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0 169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0 170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0 171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0 172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
176# CONFIG_SLOB is not set
177CONFIG_OBSOLETE_INTERMODULE=y
175 178
176# 179#
177# Loadable module support 180# Loadable module support
@@ -279,6 +282,21 @@ CONFIG_NETFILTER=y
279# 282#
280# CONFIG_NETFILTER_NETLINK is not set 283# CONFIG_NETFILTER_NETLINK is not set
281# CONFIG_NF_CONNTRACK is not set 284# CONFIG_NF_CONNTRACK is not set
285CONFIG_NETFILTER_XTABLES=m
286CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
287CONFIG_NETFILTER_XT_TARGET_MARK=m
288CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
289CONFIG_NETFILTER_XT_MATCH_COMMENT=m
290CONFIG_NETFILTER_XT_MATCH_DCCP=m
291CONFIG_NETFILTER_XT_MATCH_LENGTH=m
292CONFIG_NETFILTER_XT_MATCH_LIMIT=m
293CONFIG_NETFILTER_XT_MATCH_MAC=m
294CONFIG_NETFILTER_XT_MATCH_MARK=m
295CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
296CONFIG_NETFILTER_XT_MATCH_REALM=m
297CONFIG_NETFILTER_XT_MATCH_SCTP=m
298CONFIG_NETFILTER_XT_MATCH_STRING=m
299CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
282 300
283# 301#
284# IP: Netfilter Configuration 302# IP: Netfilter Configuration
@@ -306,6 +324,11 @@ CONFIG_NETFILTER=y
306# CONFIG_ATALK is not set 324# CONFIG_ATALK is not set
307# CONFIG_X25 is not set 325# CONFIG_X25 is not set
308# CONFIG_LAPB is not set 326# CONFIG_LAPB is not set
327
328#
329# TIPC Configuration (EXPERIMENTAL)
330#
331# CONFIG_TIPC is not set
309# CONFIG_NET_DIVERT is not set 332# CONFIG_NET_DIVERT is not set
310# CONFIG_ECONET is not set 333# CONFIG_ECONET is not set
311# CONFIG_WAN_ROUTER is not set 334# CONFIG_WAN_ROUTER is not set
@@ -314,6 +337,7 @@ CONFIG_NETFILTER=y
314# QoS and/or fair queueing 337# QoS and/or fair queueing
315# 338#
316# CONFIG_NET_SCHED is not set 339# CONFIG_NET_SCHED is not set
340CONFIG_NET_CLS_ROUTE=y
317 341
318# 342#
319# Network testing 343# Network testing
@@ -385,6 +409,7 @@ CONFIG_MTD_CFI_UTIL=y
385# CONFIG_MTD_RAM is not set 409# CONFIG_MTD_RAM is not set
386# CONFIG_MTD_ROM is not set 410# CONFIG_MTD_ROM is not set
387# CONFIG_MTD_ABSENT is not set 411# CONFIG_MTD_ABSENT is not set
412# CONFIG_MTD_OBSOLETE_CHIPS is not set
388 413
389# 414#
390# Mapping drivers for chip access 415# Mapping drivers for chip access
@@ -568,6 +593,7 @@ CONFIG_NET_ETHERNET=y
568CONFIG_MII=m 593CONFIG_MII=m
569# CONFIG_MIPS_AU1X00_ENET is not set 594# CONFIG_MIPS_AU1X00_ENET is not set
570# CONFIG_SMC91X is not set 595# CONFIG_SMC91X is not set
596# CONFIG_DM9000 is not set
571 597
572# 598#
573# Ethernet (1000 Mbit) 599# Ethernet (1000 Mbit)
@@ -665,13 +691,13 @@ CONFIG_SERIAL_8250=y
665CONFIG_SERIAL_8250_CONSOLE=y 691CONFIG_SERIAL_8250_CONSOLE=y
666# CONFIG_SERIAL_8250_CS is not set 692# CONFIG_SERIAL_8250_CS is not set
667CONFIG_SERIAL_8250_NR_UARTS=4 693CONFIG_SERIAL_8250_NR_UARTS=4
694CONFIG_SERIAL_8250_RUNTIME_UARTS=4
668# CONFIG_SERIAL_8250_EXTENDED is not set 695# CONFIG_SERIAL_8250_EXTENDED is not set
669CONFIG_SERIAL_8250_AU1X00=y 696CONFIG_SERIAL_8250_AU1X00=y
670 697
671# 698#
672# Non-8250 serial port support 699# Non-8250 serial port support
673# 700#
674# CONFIG_SERIAL_AU1X00 is not set
675CONFIG_SERIAL_CORE=y 701CONFIG_SERIAL_CORE=y
676CONFIG_SERIAL_CORE_CONSOLE=y 702CONFIG_SERIAL_CORE_CONSOLE=y
677CONFIG_UNIX98_PTYS=y 703CONFIG_UNIX98_PTYS=y
@@ -716,6 +742,12 @@ CONFIG_LEGACY_PTY_COUNT=256
716# CONFIG_I2C is not set 742# CONFIG_I2C is not set
717 743
718# 744#
745# SPI support
746#
747# CONFIG_SPI is not set
748# CONFIG_SPI_MASTER is not set
749
750#
719# Dallas's 1-wire bus 751# Dallas's 1-wire bus
720# 752#
721# CONFIG_W1 is not set 753# CONFIG_W1 is not set
@@ -842,6 +874,7 @@ CONFIG_JFS_FS=y
842# CONFIG_JFS_STATISTICS is not set 874# CONFIG_JFS_STATISTICS is not set
843CONFIG_FS_POSIX_ACL=y 875CONFIG_FS_POSIX_ACL=y
844# CONFIG_XFS_FS is not set 876# CONFIG_XFS_FS is not set
877# CONFIG_OCFS2_FS is not set
845# CONFIG_MINIX_FS is not set 878# CONFIG_MINIX_FS is not set
846# CONFIG_ROMFS_FS is not set 879# CONFIG_ROMFS_FS is not set
847CONFIG_INOTIFY=y 880CONFIG_INOTIFY=y
@@ -881,6 +914,7 @@ CONFIG_TMPFS=y
881# CONFIG_HUGETLB_PAGE is not set 914# CONFIG_HUGETLB_PAGE is not set
882CONFIG_RAMFS=y 915CONFIG_RAMFS=y
883# CONFIG_RELAYFS_FS is not set 916# CONFIG_RELAYFS_FS is not set
917# CONFIG_CONFIGFS_FS is not set
884 918
885# 919#
886# Miscellaneous filesystems 920# Miscellaneous filesystems
@@ -990,6 +1024,7 @@ CONFIG_NLS_UTF8=m
990# Kernel hacking 1024# Kernel hacking
991# 1025#
992# CONFIG_PRINTK_TIME is not set 1026# CONFIG_PRINTK_TIME is not set
1027# CONFIG_MAGIC_SYSRQ is not set
993# CONFIG_DEBUG_KERNEL is not set 1028# CONFIG_DEBUG_KERNEL is not set
994CONFIG_LOG_BUF_SHIFT=14 1029CONFIG_LOG_BUF_SHIFT=14
995CONFIG_CROSSCOMPILE=y 1030CONFIG_CROSSCOMPILE=y
@@ -1020,3 +1055,7 @@ CONFIG_CRC32=y
1020CONFIG_LIBCRC32C=y 1055CONFIG_LIBCRC32C=y
1021CONFIG_ZLIB_INFLATE=y 1056CONFIG_ZLIB_INFLATE=y
1022CONFIG_ZLIB_DEFLATE=y 1057CONFIG_ZLIB_DEFLATE=y
1058CONFIG_TEXTSEARCH=y
1059CONFIG_TEXTSEARCH_KMP=m
1060CONFIG_TEXTSEARCH_BM=m
1061CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 86e7be8412f3..5a415b1d4af0 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:05 2005 4# Fri Jan 27 15:39:59 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -153,26 +153,29 @@ CONFIG_SYSVIPC=y
153# CONFIG_BSD_PROCESS_ACCT is not set 153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 160CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_HOTPLUG=y
163CONFIG_PRINTK=y 163CONFIG_PRINTK=y
164CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 167CONFIG_FUTEX=y
167CONFIG_EPOLL=y 168CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
178CONFIG_OBSOLETE_INTERMODULE=y
176 179
177# 180#
178# Loadable module support 181# Loadable module support
@@ -293,6 +296,21 @@ CONFIG_NETFILTER_NETLINK=m
293CONFIG_NETFILTER_NETLINK_QUEUE=m 296CONFIG_NETFILTER_NETLINK_QUEUE=m
294CONFIG_NETFILTER_NETLINK_LOG=m 297CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set 298# CONFIG_NF_CONNTRACK is not set
299CONFIG_NETFILTER_XTABLES=m
300CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
301CONFIG_NETFILTER_XT_TARGET_MARK=m
302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
303CONFIG_NETFILTER_XT_MATCH_COMMENT=m
304CONFIG_NETFILTER_XT_MATCH_DCCP=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m
306CONFIG_NETFILTER_XT_MATCH_LIMIT=m
307CONFIG_NETFILTER_XT_MATCH_MAC=m
308CONFIG_NETFILTER_XT_MATCH_MARK=m
309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
310CONFIG_NETFILTER_XT_MATCH_REALM=m
311CONFIG_NETFILTER_XT_MATCH_SCTP=m
312CONFIG_NETFILTER_XT_MATCH_STRING=m
313CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
296 314
297# 315#
298# IP: Netfilter Configuration 316# IP: Netfilter Configuration
@@ -320,6 +338,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
321# CONFIG_X25 is not set 339# CONFIG_X25 is not set
322# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
341
342#
343# TIPC Configuration (EXPERIMENTAL)
344#
345# CONFIG_TIPC is not set
323# CONFIG_NET_DIVERT is not set 346# CONFIG_NET_DIVERT is not set
324# CONFIG_ECONET is not set 347# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 348# CONFIG_WAN_ROUTER is not set
@@ -328,6 +351,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
328# QoS and/or fair queueing 351# QoS and/or fair queueing
329# 352#
330# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354CONFIG_NET_CLS_ROUTE=y
331 355
332# 356#
333# Network testing 357# Network testing
@@ -340,7 +364,6 @@ CONFIG_IEEE80211=m
340# CONFIG_IEEE80211_DEBUG is not set 364# CONFIG_IEEE80211_DEBUG is not set
341CONFIG_IEEE80211_CRYPT_WEP=m 365CONFIG_IEEE80211_CRYPT_WEP=m
342CONFIG_IEEE80211_CRYPT_CCMP=m 366CONFIG_IEEE80211_CRYPT_CCMP=m
343CONFIG_IEEE80211_CRYPT_TKIP=m
344 367
345# 368#
346# Device Drivers 369# Device Drivers
@@ -403,6 +426,7 @@ CONFIG_MTD_CFI_UTIL=y
403# CONFIG_MTD_RAM is not set 426# CONFIG_MTD_RAM is not set
404# CONFIG_MTD_ROM is not set 427# CONFIG_MTD_ROM is not set
405# CONFIG_MTD_ABSENT is not set 428# CONFIG_MTD_ABSENT is not set
429# CONFIG_MTD_OBSOLETE_CHIPS is not set
406 430
407# 431#
408# Mapping drivers for chip access 432# Mapping drivers for chip access
@@ -561,6 +585,7 @@ CONFIG_MIPS_AU1X00_ENET=y
561# CONFIG_CASSINI is not set 585# CONFIG_CASSINI is not set
562# CONFIG_NET_VENDOR_3COM is not set 586# CONFIG_NET_VENDOR_3COM is not set
563# CONFIG_SMC91X is not set 587# CONFIG_SMC91X is not set
588# CONFIG_DM9000 is not set
564 589
565# 590#
566# Tulip family network device support 591# Tulip family network device support
@@ -581,6 +606,7 @@ CONFIG_MIPS_AU1X00_ENET=y
581# CONFIG_R8169 is not set 606# CONFIG_R8169 is not set
582# CONFIG_SIS190 is not set 607# CONFIG_SIS190 is not set
583# CONFIG_SKGE is not set 608# CONFIG_SKGE is not set
609# CONFIG_SKY2 is not set
584# CONFIG_SK98LIN is not set 610# CONFIG_SK98LIN is not set
585# CONFIG_TIGON3 is not set 611# CONFIG_TIGON3 is not set
586# CONFIG_BNX2 is not set 612# CONFIG_BNX2 is not set
@@ -601,8 +627,6 @@ CONFIG_MIPS_AU1X00_ENET=y
601# Wireless LAN (non-hamradio) 627# Wireless LAN (non-hamradio)
602# 628#
603# CONFIG_NET_RADIO is not set 629# CONFIG_NET_RADIO is not set
604# CONFIG_IPW_DEBUG is not set
605CONFIG_IPW2200=m
606 630
607# 631#
608# PCMCIA network device support 632# PCMCIA network device support
@@ -692,16 +716,15 @@ CONFIG_SERIAL_8250=y
692CONFIG_SERIAL_8250_CONSOLE=y 716CONFIG_SERIAL_8250_CONSOLE=y
693# CONFIG_SERIAL_8250_CS is not set 717# CONFIG_SERIAL_8250_CS is not set
694CONFIG_SERIAL_8250_NR_UARTS=4 718CONFIG_SERIAL_8250_NR_UARTS=4
719CONFIG_SERIAL_8250_RUNTIME_UARTS=4
695# CONFIG_SERIAL_8250_EXTENDED is not set 720# CONFIG_SERIAL_8250_EXTENDED is not set
696CONFIG_SERIAL_8250_AU1X00=y 721CONFIG_SERIAL_8250_AU1X00=y
697 722
698# 723#
699# Non-8250 serial port support 724# Non-8250 serial port support
700# 725#
701# CONFIG_SERIAL_AU1X00 is not set
702CONFIG_SERIAL_CORE=y 726CONFIG_SERIAL_CORE=y
703CONFIG_SERIAL_CORE_CONSOLE=y 727CONFIG_SERIAL_CORE_CONSOLE=y
704# CONFIG_SERIAL_JSM is not set
705CONFIG_UNIX98_PTYS=y 728CONFIG_UNIX98_PTYS=y
706CONFIG_LEGACY_PTYS=y 729CONFIG_LEGACY_PTYS=y
707CONFIG_LEGACY_PTY_COUNT=256 730CONFIG_LEGACY_PTY_COUNT=256
@@ -746,6 +769,12 @@ CONFIG_SYNCLINK_CS=m
746# CONFIG_I2C is not set 769# CONFIG_I2C is not set
747 770
748# 771#
772# SPI support
773#
774# CONFIG_SPI is not set
775# CONFIG_SPI_MASTER is not set
776
777#
749# Dallas's 1-wire bus 778# Dallas's 1-wire bus
750# 779#
751# CONFIG_W1 is not set 780# CONFIG_W1 is not set
@@ -788,8 +817,6 @@ CONFIG_SOUND=y
788# Advanced Linux Sound Architecture 817# Advanced Linux Sound Architecture
789# 818#
790CONFIG_SND=m 819CONFIG_SND=m
791CONFIG_SND_AC97_CODEC=m
792CONFIG_SND_AC97_BUS=m
793CONFIG_SND_TIMER=m 820CONFIG_SND_TIMER=m
794CONFIG_SND_PCM=m 821CONFIG_SND_PCM=m
795CONFIG_SND_RAWMIDI=m 822CONFIG_SND_RAWMIDI=m
@@ -799,13 +826,16 @@ CONFIG_SND_OSSEMUL=y
799CONFIG_SND_MIXER_OSS=m 826CONFIG_SND_MIXER_OSS=m
800CONFIG_SND_PCM_OSS=m 827CONFIG_SND_PCM_OSS=m
801CONFIG_SND_SEQUENCER_OSS=y 828CONFIG_SND_SEQUENCER_OSS=y
829# CONFIG_SND_DYNAMIC_MINORS is not set
830CONFIG_SND_SUPPORT_OLD_API=y
802# CONFIG_SND_VERBOSE_PRINTK is not set 831# CONFIG_SND_VERBOSE_PRINTK is not set
803# CONFIG_SND_DEBUG is not set 832# CONFIG_SND_DEBUG is not set
804CONFIG_SND_GENERIC_DRIVER=y
805 833
806# 834#
807# Generic devices 835# Generic devices
808# 836#
837CONFIG_SND_AC97_CODEC=m
838CONFIG_SND_AC97_BUS=m
809# CONFIG_SND_DUMMY is not set 839# CONFIG_SND_DUMMY is not set
810CONFIG_SND_VIRMIDI=m 840CONFIG_SND_VIRMIDI=m
811CONFIG_SND_MTPAV=m 841CONFIG_SND_MTPAV=m
@@ -815,6 +845,7 @@ CONFIG_SND_MTPAV=m
815# 845#
816# PCI devices 846# PCI devices
817# 847#
848# CONFIG_SND_AD1889 is not set
818# CONFIG_SND_ALI5451 is not set 849# CONFIG_SND_ALI5451 is not set
819# CONFIG_SND_ATIIXP is not set 850# CONFIG_SND_ATIIXP is not set
820# CONFIG_SND_ATIIXP_MODEM is not set 851# CONFIG_SND_ATIIXP_MODEM is not set
@@ -823,38 +854,38 @@ CONFIG_SND_MTPAV=m
823# CONFIG_SND_AU8830 is not set 854# CONFIG_SND_AU8830 is not set
824# CONFIG_SND_AZT3328 is not set 855# CONFIG_SND_AZT3328 is not set
825# CONFIG_SND_BT87X is not set 856# CONFIG_SND_BT87X is not set
826# CONFIG_SND_CS46XX is not set 857# CONFIG_SND_CA0106 is not set
858# CONFIG_SND_CMIPCI is not set
827# CONFIG_SND_CS4281 is not set 859# CONFIG_SND_CS4281 is not set
860# CONFIG_SND_CS46XX is not set
828# CONFIG_SND_EMU10K1 is not set 861# CONFIG_SND_EMU10K1 is not set
829# CONFIG_SND_EMU10K1X is not set 862# 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 863# CONFIG_SND_ENS1370 is not set
844# CONFIG_SND_ENS1371 is not set 864# CONFIG_SND_ENS1371 is not set
845# CONFIG_SND_ES1938 is not set 865# CONFIG_SND_ES1938 is not set
846# CONFIG_SND_ES1968 is not set 866# CONFIG_SND_ES1968 is not set
847# CONFIG_SND_MAESTRO3 is not set
848# CONFIG_SND_FM801 is not set 867# CONFIG_SND_FM801 is not set
868# CONFIG_SND_HDA_INTEL is not set
869# CONFIG_SND_HDSP is not set
870# CONFIG_SND_HDSPM is not set
849# CONFIG_SND_ICE1712 is not set 871# CONFIG_SND_ICE1712 is not set
850# CONFIG_SND_ICE1724 is not set 872# CONFIG_SND_ICE1724 is not set
851# CONFIG_SND_INTEL8X0 is not set 873# CONFIG_SND_INTEL8X0 is not set
852# CONFIG_SND_INTEL8X0M is not set 874# CONFIG_SND_INTEL8X0M is not set
875# CONFIG_SND_KORG1212 is not set
876# CONFIG_SND_MAESTRO3 is not set
877# CONFIG_SND_MIXART is not set
878# CONFIG_SND_NM256 is not set
879# CONFIG_SND_PCXHR is not set
880# CONFIG_SND_RME32 is not set
881# CONFIG_SND_RME96 is not set
882# CONFIG_SND_RME9652 is not set
853# CONFIG_SND_SONICVIBES is not set 883# CONFIG_SND_SONICVIBES is not set
884# CONFIG_SND_TRIDENT is not set
854# CONFIG_SND_VIA82XX is not set 885# CONFIG_SND_VIA82XX is not set
855# CONFIG_SND_VIA82XX_MODEM is not set 886# CONFIG_SND_VIA82XX_MODEM is not set
856# CONFIG_SND_VX222 is not set 887# CONFIG_SND_VX222 is not set
857# CONFIG_SND_HDA_INTEL is not set 888# CONFIG_SND_YMFPCI is not set
858 889
859# 890#
860# ALSA MIPS devices 891# ALSA MIPS devices
@@ -939,12 +970,14 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
939# may also be needed; see USB_STORAGE Help for more information 970# may also be needed; see USB_STORAGE Help for more information
940# 971#
941# CONFIG_USB_STORAGE is not set 972# CONFIG_USB_STORAGE is not set
973# CONFIG_USB_LIBUSUAL is not set
942 974
943# 975#
944# USB Input Devices 976# USB Input Devices
945# 977#
946CONFIG_USB_HID=y 978CONFIG_USB_HID=y
947CONFIG_USB_HIDINPUT=y 979CONFIG_USB_HIDINPUT=y
980# CONFIG_USB_HIDINPUT_POWERBOOK is not set
948# CONFIG_HID_FF is not set 981# CONFIG_HID_FF is not set
949# CONFIG_USB_HIDDEV is not set 982# CONFIG_USB_HIDDEV is not set
950# CONFIG_USB_AIPTEK is not set 983# CONFIG_USB_AIPTEK is not set
@@ -958,6 +991,7 @@ CONFIG_USB_HIDINPUT=y
958CONFIG_USB_YEALINK=m 991CONFIG_USB_YEALINK=m
959# CONFIG_USB_XPAD is not set 992# CONFIG_USB_XPAD is not set
960# CONFIG_USB_ATI_REMOTE is not set 993# CONFIG_USB_ATI_REMOTE is not set
994# CONFIG_USB_ATI_REMOTE2 is not set
961# CONFIG_USB_KEYSPAN_REMOTE is not set 995# CONFIG_USB_KEYSPAN_REMOTE is not set
962# CONFIG_USB_APPLETOUCH is not set 996# CONFIG_USB_APPLETOUCH is not set
963 997
@@ -1057,6 +1091,7 @@ CONFIG_REISERFS_FS_SECURITY=y
1057# CONFIG_JFS_FS is not set 1091# CONFIG_JFS_FS is not set
1058CONFIG_FS_POSIX_ACL=y 1092CONFIG_FS_POSIX_ACL=y
1059# CONFIG_XFS_FS is not set 1093# CONFIG_XFS_FS is not set
1094# CONFIG_OCFS2_FS is not set
1060# CONFIG_MINIX_FS is not set 1095# CONFIG_MINIX_FS is not set
1061# CONFIG_ROMFS_FS is not set 1096# CONFIG_ROMFS_FS is not set
1062CONFIG_INOTIFY=y 1097CONFIG_INOTIFY=y
@@ -1089,6 +1124,7 @@ CONFIG_TMPFS=y
1089# CONFIG_HUGETLB_PAGE is not set 1124# CONFIG_HUGETLB_PAGE is not set
1090CONFIG_RAMFS=y 1125CONFIG_RAMFS=y
1091CONFIG_RELAYFS_FS=m 1126CONFIG_RELAYFS_FS=m
1127# CONFIG_CONFIGFS_FS is not set
1092 1128
1093# 1129#
1094# Miscellaneous filesystems 1130# Miscellaneous filesystems
@@ -1193,6 +1229,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1193# Kernel hacking 1229# Kernel hacking
1194# 1230#
1195# CONFIG_PRINTK_TIME is not set 1231# CONFIG_PRINTK_TIME is not set
1232# CONFIG_MAGIC_SYSRQ is not set
1196# CONFIG_DEBUG_KERNEL is not set 1233# CONFIG_DEBUG_KERNEL is not set
1197CONFIG_LOG_BUF_SHIFT=14 1234CONFIG_LOG_BUF_SHIFT=14
1198CONFIG_CROSSCOMPILE=y 1235CONFIG_CROSSCOMPILE=y
@@ -1247,3 +1284,7 @@ CONFIG_CRC32=y
1247CONFIG_LIBCRC32C=m 1284CONFIG_LIBCRC32C=m
1248CONFIG_ZLIB_INFLATE=m 1285CONFIG_ZLIB_INFLATE=m
1249CONFIG_ZLIB_DEFLATE=m 1286CONFIG_ZLIB_DEFLATE=m
1287CONFIG_TEXTSEARCH=y
1288CONFIG_TEXTSEARCH_KMP=m
1289CONFIG_TEXTSEARCH_BM=m
1290CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index ea5ab0ca5774..8dc1f18badfe 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:07 2005 4# Fri Jan 27 15:40:00 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -152,26 +152,29 @@ CONFIG_SYSVIPC=y
152# CONFIG_BSD_PROCESS_ACCT is not set 152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
155CONFIG_HOTPLUG=y
156CONFIG_KOBJECT_UEVENT=y
157# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set 160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_HOTPLUG=y
162CONFIG_PRINTK=y 162CONFIG_PRINTK=y
163CONFIG_BUG=y 163CONFIG_BUG=y
164CONFIG_ELF_CORE=y
164CONFIG_BASE_FULL=y 165CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y 168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0 169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0 170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0 171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0 172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
176# CONFIG_SLOB is not set
177CONFIG_OBSOLETE_INTERMODULE=y
175 178
176# 179#
177# Loadable module support 180# Loadable module support
@@ -292,6 +295,21 @@ CONFIG_NETFILTER_NETLINK=m
292CONFIG_NETFILTER_NETLINK_QUEUE=m 295CONFIG_NETFILTER_NETLINK_QUEUE=m
293CONFIG_NETFILTER_NETLINK_LOG=m 296CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set 297# CONFIG_NF_CONNTRACK is not set
298CONFIG_NETFILTER_XTABLES=m
299CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
300CONFIG_NETFILTER_XT_TARGET_MARK=m
301CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
302CONFIG_NETFILTER_XT_MATCH_COMMENT=m
303CONFIG_NETFILTER_XT_MATCH_DCCP=m
304CONFIG_NETFILTER_XT_MATCH_LENGTH=m
305CONFIG_NETFILTER_XT_MATCH_LIMIT=m
306CONFIG_NETFILTER_XT_MATCH_MAC=m
307CONFIG_NETFILTER_XT_MATCH_MARK=m
308CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
309CONFIG_NETFILTER_XT_MATCH_REALM=m
310CONFIG_NETFILTER_XT_MATCH_SCTP=m
311CONFIG_NETFILTER_XT_MATCH_STRING=m
312CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
295 313
296# 314#
297# IP: Netfilter Configuration 315# IP: Netfilter Configuration
@@ -319,6 +337,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
319# CONFIG_ATALK is not set 337# CONFIG_ATALK is not set
320# CONFIG_X25 is not set 338# CONFIG_X25 is not set
321# CONFIG_LAPB is not set 339# CONFIG_LAPB is not set
340
341#
342# TIPC Configuration (EXPERIMENTAL)
343#
344# CONFIG_TIPC is not set
322# CONFIG_NET_DIVERT is not set 345# CONFIG_NET_DIVERT is not set
323# CONFIG_ECONET is not set 346# CONFIG_ECONET is not set
324# CONFIG_WAN_ROUTER is not set 347# CONFIG_WAN_ROUTER is not set
@@ -327,6 +350,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
327# QoS and/or fair queueing 350# QoS and/or fair queueing
328# 351#
329# CONFIG_NET_SCHED is not set 352# CONFIG_NET_SCHED is not set
353CONFIG_NET_CLS_ROUTE=y
330 354
331# 355#
332# Network testing 356# Network testing
@@ -339,7 +363,6 @@ CONFIG_IEEE80211=m
339# CONFIG_IEEE80211_DEBUG is not set 363# CONFIG_IEEE80211_DEBUG is not set
340CONFIG_IEEE80211_CRYPT_WEP=m 364CONFIG_IEEE80211_CRYPT_WEP=m
341CONFIG_IEEE80211_CRYPT_CCMP=m 365CONFIG_IEEE80211_CRYPT_CCMP=m
342CONFIG_IEEE80211_CRYPT_TKIP=m
343 366
344# 367#
345# Device Drivers 368# Device Drivers
@@ -402,6 +425,7 @@ CONFIG_MTD_CFI_UTIL=y
402# CONFIG_MTD_RAM is not set 425# CONFIG_MTD_RAM is not set
403# CONFIG_MTD_ROM is not set 426# CONFIG_MTD_ROM is not set
404# CONFIG_MTD_ABSENT is not set 427# CONFIG_MTD_ABSENT is not set
428# CONFIG_MTD_OBSOLETE_CHIPS is not set
405 429
406# 430#
407# Mapping drivers for chip access 431# Mapping drivers for chip access
@@ -593,6 +617,7 @@ CONFIG_MIPS_AU1X00_ENET=y
593# CONFIG_CASSINI is not set 617# CONFIG_CASSINI is not set
594# CONFIG_NET_VENDOR_3COM is not set 618# CONFIG_NET_VENDOR_3COM is not set
595# CONFIG_SMC91X is not set 619# CONFIG_SMC91X is not set
620# CONFIG_DM9000 is not set
596 621
597# 622#
598# Tulip family network device support 623# Tulip family network device support
@@ -613,6 +638,7 @@ CONFIG_MIPS_AU1X00_ENET=y
613# CONFIG_R8169 is not set 638# CONFIG_R8169 is not set
614# CONFIG_SIS190 is not set 639# CONFIG_SIS190 is not set
615# CONFIG_SKGE is not set 640# CONFIG_SKGE is not set
641# CONFIG_SKY2 is not set
616# CONFIG_SK98LIN is not set 642# CONFIG_SK98LIN is not set
617# CONFIG_TIGON3 is not set 643# CONFIG_TIGON3 is not set
618# CONFIG_BNX2 is not set 644# CONFIG_BNX2 is not set
@@ -633,8 +659,6 @@ CONFIG_MIPS_AU1X00_ENET=y
633# Wireless LAN (non-hamradio) 659# Wireless LAN (non-hamradio)
634# 660#
635# CONFIG_NET_RADIO is not set 661# CONFIG_NET_RADIO is not set
636# CONFIG_IPW_DEBUG is not set
637CONFIG_IPW2200=m
638 662
639# 663#
640# PCMCIA network device support 664# PCMCIA network device support
@@ -732,16 +756,15 @@ CONFIG_SERIAL_8250=y
732CONFIG_SERIAL_8250_CONSOLE=y 756CONFIG_SERIAL_8250_CONSOLE=y
733# CONFIG_SERIAL_8250_CS is not set 757# CONFIG_SERIAL_8250_CS is not set
734CONFIG_SERIAL_8250_NR_UARTS=4 758CONFIG_SERIAL_8250_NR_UARTS=4
759CONFIG_SERIAL_8250_RUNTIME_UARTS=4
735# CONFIG_SERIAL_8250_EXTENDED is not set 760# CONFIG_SERIAL_8250_EXTENDED is not set
736CONFIG_SERIAL_8250_AU1X00=y 761CONFIG_SERIAL_8250_AU1X00=y
737 762
738# 763#
739# Non-8250 serial port support 764# Non-8250 serial port support
740# 765#
741# CONFIG_SERIAL_AU1X00 is not set
742CONFIG_SERIAL_CORE=y 766CONFIG_SERIAL_CORE=y
743CONFIG_SERIAL_CORE_CONSOLE=y 767CONFIG_SERIAL_CORE_CONSOLE=y
744# CONFIG_SERIAL_JSM is not set
745CONFIG_UNIX98_PTYS=y 768CONFIG_UNIX98_PTYS=y
746CONFIG_LEGACY_PTYS=y 769CONFIG_LEGACY_PTYS=y
747CONFIG_LEGACY_PTY_COUNT=256 770CONFIG_LEGACY_PTY_COUNT=256
@@ -786,6 +809,12 @@ CONFIG_SYNCLINK_CS=m
786# CONFIG_I2C is not set 809# CONFIG_I2C is not set
787 810
788# 811#
812# SPI support
813#
814# CONFIG_SPI is not set
815# CONFIG_SPI_MASTER is not set
816
817#
789# Dallas's 1-wire bus 818# Dallas's 1-wire bus
790# 819#
791# CONFIG_W1 is not set 820# CONFIG_W1 is not set
@@ -878,6 +907,7 @@ CONFIG_REISERFS_FS_SECURITY=y
878# CONFIG_JFS_FS is not set 907# CONFIG_JFS_FS is not set
879CONFIG_FS_POSIX_ACL=y 908CONFIG_FS_POSIX_ACL=y
880# CONFIG_XFS_FS is not set 909# CONFIG_XFS_FS is not set
910# CONFIG_OCFS2_FS is not set
881# CONFIG_MINIX_FS is not set 911# CONFIG_MINIX_FS is not set
882# CONFIG_ROMFS_FS is not set 912# CONFIG_ROMFS_FS is not set
883CONFIG_INOTIFY=y 913CONFIG_INOTIFY=y
@@ -910,6 +940,7 @@ CONFIG_TMPFS=y
910# CONFIG_HUGETLB_PAGE is not set 940# CONFIG_HUGETLB_PAGE is not set
911CONFIG_RAMFS=y 941CONFIG_RAMFS=y
912CONFIG_RELAYFS_FS=m 942CONFIG_RELAYFS_FS=m
943# CONFIG_CONFIGFS_FS is not set
913 944
914# 945#
915# Miscellaneous filesystems 946# Miscellaneous filesystems
@@ -1014,6 +1045,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1014# Kernel hacking 1045# Kernel hacking
1015# 1046#
1016# CONFIG_PRINTK_TIME is not set 1047# CONFIG_PRINTK_TIME is not set
1048# CONFIG_MAGIC_SYSRQ is not set
1017# CONFIG_DEBUG_KERNEL is not set 1049# CONFIG_DEBUG_KERNEL is not set
1018CONFIG_LOG_BUF_SHIFT=14 1050CONFIG_LOG_BUF_SHIFT=14
1019CONFIG_CROSSCOMPILE=y 1051CONFIG_CROSSCOMPILE=y
@@ -1068,3 +1100,7 @@ CONFIG_CRC32=y
1068CONFIG_LIBCRC32C=m 1100CONFIG_LIBCRC32C=m
1069CONFIG_ZLIB_INFLATE=m 1101CONFIG_ZLIB_INFLATE=m
1070CONFIG_ZLIB_DEFLATE=m 1102CONFIG_ZLIB_DEFLATE=m
1103CONFIG_TEXTSEARCH=y
1104CONFIG_TEXTSEARCH_KMP=m
1105CONFIG_TEXTSEARCH_BM=m
1106CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index a81e2de6947f..8fae63e47e5e 100644
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:09 2005 4# Fri Jan 27 15:40:02 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -151,26 +151,28 @@ CONFIG_SYSVIPC=y
151# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y 158CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set 159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160CONFIG_HOTPLUG=y
161CONFIG_PRINTK=y 161CONFIG_PRINTK=y
162CONFIG_BUG=y 162CONFIG_BUG=y
163CONFIG_ELF_CORE=y
163CONFIG_BASE_FULL=y 164CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 165CONFIG_FUTEX=y
165CONFIG_EPOLL=y 166CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y 167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0 168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0 169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0 170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0 171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
175# CONFIG_SLOB is not set
174 176
175# 177#
176# Loadable module support 178# Loadable module support
@@ -276,6 +278,11 @@ CONFIG_TCP_CONG_BIC=y
276# CONFIG_ATALK is not set 278# CONFIG_ATALK is not set
277# CONFIG_X25 is not set 279# CONFIG_X25 is not set
278# CONFIG_LAPB is not set 280# CONFIG_LAPB is not set
281
282#
283# TIPC Configuration (EXPERIMENTAL)
284#
285# CONFIG_TIPC is not set
279# CONFIG_NET_DIVERT is not set 286# CONFIG_NET_DIVERT is not set
280# CONFIG_ECONET is not set 287# CONFIG_ECONET is not set
281# CONFIG_WAN_ROUTER is not set 288# CONFIG_WAN_ROUTER is not set
@@ -296,7 +303,6 @@ CONFIG_IEEE80211=y
296# CONFIG_IEEE80211_DEBUG is not set 303# CONFIG_IEEE80211_DEBUG is not set
297CONFIG_IEEE80211_CRYPT_WEP=y 304CONFIG_IEEE80211_CRYPT_WEP=y
298CONFIG_IEEE80211_CRYPT_CCMP=y 305CONFIG_IEEE80211_CRYPT_CCMP=y
299CONFIG_IEEE80211_CRYPT_TKIP=y
300 306
301# 307#
302# Device Drivers 308# Device Drivers
@@ -445,6 +451,7 @@ CONFIG_NET_ETHERNET=y
445# CONFIG_CASSINI is not set 451# CONFIG_CASSINI is not set
446# CONFIG_NET_VENDOR_3COM is not set 452# CONFIG_NET_VENDOR_3COM is not set
447# CONFIG_NET_VENDOR_SMC is not set 453# CONFIG_NET_VENDOR_SMC is not set
454# CONFIG_DM9000 is not set
448# CONFIG_NET_VENDOR_RACAL is not set 455# CONFIG_NET_VENDOR_RACAL is not set
449 456
450# 457#
@@ -469,6 +476,7 @@ CONFIG_NET_ETHERNET=y
469# CONFIG_R8169 is not set 476# CONFIG_R8169 is not set
470# CONFIG_SIS190 is not set 477# CONFIG_SIS190 is not set
471# CONFIG_SKGE is not set 478# CONFIG_SKGE is not set
479# CONFIG_SKY2 is not set
472# CONFIG_SK98LIN is not set 480# CONFIG_SK98LIN is not set
473# CONFIG_TIGON3 is not set 481# CONFIG_TIGON3 is not set
474# CONFIG_BNX2 is not set 482# CONFIG_BNX2 is not set
@@ -489,8 +497,6 @@ CONFIG_NET_ETHERNET=y
489# Wireless LAN (non-hamradio) 497# Wireless LAN (non-hamradio)
490# 498#
491# CONFIG_NET_RADIO is not set 499# CONFIG_NET_RADIO is not set
492# CONFIG_IPW_DEBUG is not set
493CONFIG_IPW2200=y
494 500
495# 501#
496# Wan interfaces 502# Wan interfaces
@@ -566,6 +572,7 @@ CONFIG_HW_CONSOLE=y
566CONFIG_SERIAL_8250=y 572CONFIG_SERIAL_8250=y
567CONFIG_SERIAL_8250_CONSOLE=y 573CONFIG_SERIAL_8250_CONSOLE=y
568CONFIG_SERIAL_8250_NR_UARTS=4 574CONFIG_SERIAL_8250_NR_UARTS=4
575CONFIG_SERIAL_8250_RUNTIME_UARTS=4
569# CONFIG_SERIAL_8250_EXTENDED is not set 576# CONFIG_SERIAL_8250_EXTENDED is not set
570 577
571# 578#
@@ -573,7 +580,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
573# 580#
574CONFIG_SERIAL_CORE=y 581CONFIG_SERIAL_CORE=y
575CONFIG_SERIAL_CORE_CONSOLE=y 582CONFIG_SERIAL_CORE_CONSOLE=y
576# CONFIG_SERIAL_JSM is not set
577CONFIG_UNIX98_PTYS=y 583CONFIG_UNIX98_PTYS=y
578CONFIG_LEGACY_PTYS=y 584CONFIG_LEGACY_PTYS=y
579CONFIG_LEGACY_PTY_COUNT=256 585CONFIG_LEGACY_PTY_COUNT=256
@@ -611,6 +617,12 @@ CONFIG_LEGACY_PTY_COUNT=256
611# CONFIG_I2C is not set 617# CONFIG_I2C is not set
612 618
613# 619#
620# SPI support
621#
622# CONFIG_SPI is not set
623# CONFIG_SPI_MASTER is not set
624
625#
614# Dallas's 1-wire bus 626# Dallas's 1-wire bus
615# 627#
616# CONFIG_W1 is not set 628# CONFIG_W1 is not set
@@ -669,7 +681,6 @@ CONFIG_FB=y
669# CONFIG_FB_3DFX is not set 681# CONFIG_FB_3DFX is not set
670# CONFIG_FB_VOODOO1 is not set 682# CONFIG_FB_VOODOO1 is not set
671# CONFIG_FB_SMIVGX is not set 683# CONFIG_FB_SMIVGX is not set
672# CONFIG_FB_CYBLA is not set
673# CONFIG_FB_TRIDENT is not set 684# CONFIG_FB_TRIDENT is not set
674# CONFIG_FB_VIRTUAL is not set 685# CONFIG_FB_VIRTUAL is not set
675 686
@@ -729,11 +740,11 @@ CONFIG_EXT2_FS=y
729# CONFIG_EXT2_FS_XATTR is not set 740# CONFIG_EXT2_FS_XATTR is not set
730# CONFIG_EXT2_FS_XIP is not set 741# CONFIG_EXT2_FS_XIP is not set
731# CONFIG_EXT3_FS is not set 742# CONFIG_EXT3_FS is not set
732# CONFIG_JBD is not set
733# CONFIG_REISERFS_FS is not set 743# CONFIG_REISERFS_FS is not set
734# CONFIG_JFS_FS is not set 744# CONFIG_JFS_FS is not set
735# CONFIG_FS_POSIX_ACL is not set 745# CONFIG_FS_POSIX_ACL is not set
736# CONFIG_XFS_FS is not set 746# CONFIG_XFS_FS is not set
747# CONFIG_OCFS2_FS is not set
737# CONFIG_MINIX_FS is not set 748# CONFIG_MINIX_FS is not set
738# CONFIG_ROMFS_FS is not set 749# CONFIG_ROMFS_FS is not set
739CONFIG_INOTIFY=y 750CONFIG_INOTIFY=y
@@ -766,6 +777,7 @@ CONFIG_SYSFS=y
766# CONFIG_HUGETLB_PAGE is not set 777# CONFIG_HUGETLB_PAGE is not set
767CONFIG_RAMFS=y 778CONFIG_RAMFS=y
768CONFIG_RELAYFS_FS=y 779CONFIG_RELAYFS_FS=y
780# CONFIG_CONFIGFS_FS is not set
769 781
770# 782#
771# Miscellaneous filesystems 783# Miscellaneous filesystems
@@ -825,6 +837,7 @@ CONFIG_MSDOS_PARTITION=y
825# Kernel hacking 837# Kernel hacking
826# 838#
827# CONFIG_PRINTK_TIME is not set 839# CONFIG_PRINTK_TIME is not set
840# CONFIG_MAGIC_SYSRQ is not set
828# CONFIG_DEBUG_KERNEL is not set 841# CONFIG_DEBUG_KERNEL is not set
829CONFIG_LOG_BUF_SHIFT=14 842CONFIG_LOG_BUF_SHIFT=14
830CONFIG_CROSSCOMPILE=y 843CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index f1c27c2fb033..a0fcd44e7709 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:11 2005 4# Fri Jan 27 15:40:02 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -151,26 +151,28 @@ CONFIG_SYSVIPC=y
151# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154CONFIG_HOTPLUG=y
155CONFIG_KOBJECT_UEVENT=y
156# CONFIG_IKCONFIG is not set 154# CONFIG_IKCONFIG is not set
157CONFIG_INITRAMFS_SOURCE="" 155CONFIG_INITRAMFS_SOURCE=""
156# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
158CONFIG_EMBEDDED=y 157CONFIG_EMBEDDED=y
159CONFIG_KALLSYMS=y 158CONFIG_KALLSYMS=y
160# CONFIG_KALLSYMS_EXTRA_PASS is not set 159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160CONFIG_HOTPLUG=y
161CONFIG_PRINTK=y 161CONFIG_PRINTK=y
162CONFIG_BUG=y 162CONFIG_BUG=y
163CONFIG_ELF_CORE=y
163CONFIG_BASE_FULL=y 164CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 165CONFIG_FUTEX=y
165CONFIG_EPOLL=y 166CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y 167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0 168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0 169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0 170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0 171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
175# CONFIG_SLOB is not set
174 176
175# 177#
176# Loadable module support 178# Loadable module support
@@ -275,6 +277,11 @@ CONFIG_TCP_CONG_BIC=y
275# CONFIG_ATALK is not set 277# CONFIG_ATALK is not set
276# CONFIG_X25 is not set 278# CONFIG_X25 is not set
277# CONFIG_LAPB is not set 279# CONFIG_LAPB is not set
280
281#
282# TIPC Configuration (EXPERIMENTAL)
283#
284# CONFIG_TIPC is not set
278# CONFIG_NET_DIVERT is not set 285# CONFIG_NET_DIVERT is not set
279# CONFIG_ECONET is not set 286# CONFIG_ECONET is not set
280# CONFIG_WAN_ROUTER is not set 287# CONFIG_WAN_ROUTER is not set
@@ -295,7 +302,6 @@ CONFIG_IEEE80211=y
295# CONFIG_IEEE80211_DEBUG is not set 302# CONFIG_IEEE80211_DEBUG is not set
296CONFIG_IEEE80211_CRYPT_WEP=y 303CONFIG_IEEE80211_CRYPT_WEP=y
297CONFIG_IEEE80211_CRYPT_CCMP=y 304CONFIG_IEEE80211_CRYPT_CCMP=y
298CONFIG_IEEE80211_CRYPT_TKIP=y
299 305
300# 306#
301# Device Drivers 307# Device Drivers
@@ -414,6 +420,7 @@ CONFIG_MII=y
414# CONFIG_SUNGEM is not set 420# CONFIG_SUNGEM is not set
415# CONFIG_CASSINI is not set 421# CONFIG_CASSINI is not set
416# CONFIG_NET_VENDOR_3COM is not set 422# CONFIG_NET_VENDOR_3COM is not set
423# CONFIG_DM9000 is not set
417 424
418# 425#
419# Tulip family network device support 426# Tulip family network device support
@@ -453,6 +460,7 @@ CONFIG_PCNET32=y
453# CONFIG_R8169 is not set 460# CONFIG_R8169 is not set
454# CONFIG_SIS190 is not set 461# CONFIG_SIS190 is not set
455# CONFIG_SKGE is not set 462# CONFIG_SKGE is not set
463# CONFIG_SKY2 is not set
456# CONFIG_SK98LIN is not set 464# CONFIG_SK98LIN is not set
457# CONFIG_VIA_VELOCITY is not set 465# CONFIG_VIA_VELOCITY is not set
458# CONFIG_TIGON3 is not set 466# CONFIG_TIGON3 is not set
@@ -474,8 +482,6 @@ CONFIG_PCNET32=y
474# Wireless LAN (non-hamradio) 482# Wireless LAN (non-hamradio)
475# 483#
476# CONFIG_NET_RADIO is not set 484# CONFIG_NET_RADIO is not set
477# CONFIG_IPW_DEBUG is not set
478CONFIG_IPW2200=y
479 485
480# 486#
481# Wan interfaces 487# Wan interfaces
@@ -551,6 +557,7 @@ CONFIG_HW_CONSOLE=y
551CONFIG_SERIAL_8250=y 557CONFIG_SERIAL_8250=y
552CONFIG_SERIAL_8250_CONSOLE=y 558CONFIG_SERIAL_8250_CONSOLE=y
553CONFIG_SERIAL_8250_NR_UARTS=4 559CONFIG_SERIAL_8250_NR_UARTS=4
560CONFIG_SERIAL_8250_RUNTIME_UARTS=4
554# CONFIG_SERIAL_8250_EXTENDED is not set 561# CONFIG_SERIAL_8250_EXTENDED is not set
555 562
556# 563#
@@ -558,7 +565,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
558# 565#
559CONFIG_SERIAL_CORE=y 566CONFIG_SERIAL_CORE=y
560CONFIG_SERIAL_CORE_CONSOLE=y 567CONFIG_SERIAL_CORE_CONSOLE=y
561# CONFIG_SERIAL_JSM is not set
562CONFIG_UNIX98_PTYS=y 568CONFIG_UNIX98_PTYS=y
563CONFIG_LEGACY_PTYS=y 569CONFIG_LEGACY_PTYS=y
564CONFIG_LEGACY_PTY_COUNT=256 570CONFIG_LEGACY_PTY_COUNT=256
@@ -596,6 +602,12 @@ CONFIG_LEGACY_PTY_COUNT=256
596# CONFIG_I2C is not set 602# CONFIG_I2C is not set
597 603
598# 604#
605# SPI support
606#
607# CONFIG_SPI is not set
608# CONFIG_SPI_MASTER is not set
609
610#
599# Dallas's 1-wire bus 611# Dallas's 1-wire bus
600# 612#
601# CONFIG_W1 is not set 613# CONFIG_W1 is not set
@@ -677,11 +689,11 @@ CONFIG_EXT2_FS=y
677# CONFIG_EXT2_FS_XATTR is not set 689# CONFIG_EXT2_FS_XATTR is not set
678# CONFIG_EXT2_FS_XIP is not set 690# CONFIG_EXT2_FS_XIP is not set
679# CONFIG_EXT3_FS is not set 691# CONFIG_EXT3_FS is not set
680# CONFIG_JBD is not set
681# CONFIG_REISERFS_FS is not set 692# CONFIG_REISERFS_FS is not set
682# CONFIG_JFS_FS is not set 693# CONFIG_JFS_FS is not set
683# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
684# CONFIG_XFS_FS is not set 695# CONFIG_XFS_FS is not set
696# CONFIG_OCFS2_FS is not set
685# CONFIG_MINIX_FS is not set 697# CONFIG_MINIX_FS is not set
686# CONFIG_ROMFS_FS is not set 698# CONFIG_ROMFS_FS is not set
687CONFIG_INOTIFY=y 699CONFIG_INOTIFY=y
@@ -714,6 +726,7 @@ CONFIG_SYSFS=y
714# CONFIG_HUGETLB_PAGE is not set 726# CONFIG_HUGETLB_PAGE is not set
715CONFIG_RAMFS=y 727CONFIG_RAMFS=y
716CONFIG_RELAYFS_FS=y 728CONFIG_RELAYFS_FS=y
729# CONFIG_CONFIGFS_FS is not set
717 730
718# 731#
719# Miscellaneous filesystems 732# Miscellaneous filesystems
@@ -776,6 +789,7 @@ CONFIG_MSDOS_PARTITION=y
776# Kernel hacking 789# Kernel hacking
777# 790#
778# CONFIG_PRINTK_TIME is not set 791# CONFIG_PRINTK_TIME is not set
792# CONFIG_MAGIC_SYSRQ is not set
779# CONFIG_DEBUG_KERNEL is not set 793# CONFIG_DEBUG_KERNEL is not set
780CONFIG_LOG_BUF_SHIFT=14 794CONFIG_LOG_BUF_SHIFT=14
781CONFIG_CROSSCOMPILE=y 795CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 08a4de6ec4a6..5a181eadd437 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:13 2005 4# Fri Jan 27 15:40:03 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -150,27 +150,29 @@ CONFIG_SYSVIPC=y
150# CONFIG_BSD_PROCESS_ACCT is not set 150# CONFIG_BSD_PROCESS_ACCT is not set
151CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
153# CONFIG_HOTPLUG is not set
154CONFIG_KOBJECT_UEVENT=y
155# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
156CONFIG_INITRAMFS_SOURCE="" 154CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 156CONFIG_EMBEDDED=y
158CONFIG_KALLSYMS=y 157CONFIG_KALLSYMS=y
159# CONFIG_KALLSYMS_ALL is not set 158# CONFIG_KALLSYMS_ALL is not set
160# CONFIG_KALLSYMS_EXTRA_PASS is not set 159# CONFIG_KALLSYMS_EXTRA_PASS is not set
160# CONFIG_HOTPLUG is not set
161CONFIG_PRINTK=y 161CONFIG_PRINTK=y
162CONFIG_BUG=y 162CONFIG_BUG=y
163CONFIG_ELF_CORE=y
163CONFIG_BASE_FULL=y 164CONFIG_BASE_FULL=y
164CONFIG_FUTEX=y 165CONFIG_FUTEX=y
165CONFIG_EPOLL=y 166CONFIG_EPOLL=y
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_SHMEM=y 167CONFIG_SHMEM=y
168CONFIG_CC_ALIGN_FUNCTIONS=0 168CONFIG_CC_ALIGN_FUNCTIONS=0
169CONFIG_CC_ALIGN_LABELS=0 169CONFIG_CC_ALIGN_LABELS=0
170CONFIG_CC_ALIGN_LOOPS=0 170CONFIG_CC_ALIGN_LOOPS=0
171CONFIG_CC_ALIGN_JUMPS=0 171CONFIG_CC_ALIGN_JUMPS=0
172CONFIG_SLAB=y
172# CONFIG_TINY_SHMEM is not set 173# CONFIG_TINY_SHMEM is not set
173CONFIG_BASE_SMALL=0 174CONFIG_BASE_SMALL=0
175# CONFIG_SLOB is not set
174 176
175# 177#
176# Loadable module support 178# Loadable module support
@@ -278,6 +280,11 @@ CONFIG_TCP_CONG_BIC=y
278# CONFIG_ATALK is not set 280# CONFIG_ATALK is not set
279# CONFIG_X25 is not set 281# CONFIG_X25 is not set
280# CONFIG_LAPB is not set 282# CONFIG_LAPB is not set
283
284#
285# TIPC Configuration (EXPERIMENTAL)
286#
287# CONFIG_TIPC is not set
281# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
@@ -298,7 +305,6 @@ CONFIG_IEEE80211=m
298# CONFIG_IEEE80211_DEBUG is not set 305# CONFIG_IEEE80211_DEBUG is not set
299CONFIG_IEEE80211_CRYPT_WEP=m 306CONFIG_IEEE80211_CRYPT_WEP=m
300CONFIG_IEEE80211_CRYPT_CCMP=m 307CONFIG_IEEE80211_CRYPT_CCMP=m
301CONFIG_IEEE80211_CRYPT_TKIP=m
302 308
303# 309#
304# Device Drivers 310# Device Drivers
@@ -436,6 +442,7 @@ CONFIG_CICADA_PHY=m
436# 442#
437CONFIG_NET_ETHERNET=y 443CONFIG_NET_ETHERNET=y
438# CONFIG_MII is not set 444# CONFIG_MII is not set
445# CONFIG_DM9000 is not set
439CONFIG_DECLANCE=y 446CONFIG_DECLANCE=y
440 447
441# 448#
@@ -539,6 +546,12 @@ CONFIG_RTC=y
539# CONFIG_I2C is not set 546# CONFIG_I2C is not set
540 547
541# 548#
549# SPI support
550#
551# CONFIG_SPI is not set
552# CONFIG_SPI_MASTER is not set
553
554#
542# Dallas's 1-wire bus 555# Dallas's 1-wire bus
543# 556#
544# CONFIG_W1 is not set 557# CONFIG_W1 is not set
@@ -636,12 +649,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
636CONFIG_EXT2_FS_SECURITY=y 649CONFIG_EXT2_FS_SECURITY=y
637# CONFIG_EXT2_FS_XIP is not set 650# CONFIG_EXT2_FS_XIP is not set
638# CONFIG_EXT3_FS is not set 651# CONFIG_EXT3_FS is not set
639# CONFIG_JBD is not set
640CONFIG_FS_MBCACHE=y 652CONFIG_FS_MBCACHE=y
641# CONFIG_REISERFS_FS is not set 653# CONFIG_REISERFS_FS is not set
642# CONFIG_JFS_FS is not set 654# CONFIG_JFS_FS is not set
643CONFIG_FS_POSIX_ACL=y 655CONFIG_FS_POSIX_ACL=y
644# CONFIG_XFS_FS is not set 656# CONFIG_XFS_FS is not set
657# CONFIG_OCFS2_FS is not set
645# CONFIG_MINIX_FS is not set 658# CONFIG_MINIX_FS is not set
646# CONFIG_ROMFS_FS is not set 659# CONFIG_ROMFS_FS is not set
647CONFIG_INOTIFY=y 660CONFIG_INOTIFY=y
@@ -674,6 +687,7 @@ CONFIG_TMPFS=y
674# CONFIG_HUGETLB_PAGE is not set 687# CONFIG_HUGETLB_PAGE is not set
675CONFIG_RAMFS=y 688CONFIG_RAMFS=y
676CONFIG_RELAYFS_FS=m 689CONFIG_RELAYFS_FS=m
690# CONFIG_CONFIGFS_FS is not set
677 691
678# 692#
679# Miscellaneous filesystems 693# Miscellaneous filesystems
@@ -734,6 +748,7 @@ CONFIG_MSDOS_PARTITION=y
734# CONFIG_SGI_PARTITION is not set 748# CONFIG_SGI_PARTITION is not set
735CONFIG_ULTRIX_PARTITION=y 749CONFIG_ULTRIX_PARTITION=y
736# CONFIG_SUN_PARTITION is not set 750# CONFIG_SUN_PARTITION is not set
751# CONFIG_KARMA_PARTITION is not set
737# CONFIG_EFI_PARTITION is not set 752# CONFIG_EFI_PARTITION is not set
738 753
739# 754#
@@ -750,18 +765,20 @@ CONFIG_ULTRIX_PARTITION=y
750# Kernel hacking 765# Kernel hacking
751# 766#
752# CONFIG_PRINTK_TIME is not set 767# CONFIG_PRINTK_TIME is not set
753CONFIG_DEBUG_KERNEL=y
754CONFIG_MAGIC_SYSRQ=y 768CONFIG_MAGIC_SYSRQ=y
769CONFIG_DEBUG_KERNEL=y
755CONFIG_LOG_BUF_SHIFT=14 770CONFIG_LOG_BUF_SHIFT=14
756CONFIG_DETECT_SOFTLOCKUP=y 771CONFIG_DETECT_SOFTLOCKUP=y
757# CONFIG_SCHEDSTATS is not set 772# CONFIG_SCHEDSTATS is not set
758# CONFIG_DEBUG_SLAB is not set 773# CONFIG_DEBUG_SLAB is not set
774CONFIG_DEBUG_MUTEXES=y
759# CONFIG_DEBUG_SPINLOCK is not set 775# CONFIG_DEBUG_SPINLOCK is not set
760# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 776# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
761# CONFIG_DEBUG_KOBJECT is not set 777# CONFIG_DEBUG_KOBJECT is not set
762# CONFIG_DEBUG_INFO is not set 778# CONFIG_DEBUG_INFO is not set
763# CONFIG_DEBUG_FS is not set 779# CONFIG_DEBUG_FS is not set
764# CONFIG_DEBUG_VM is not set 780# CONFIG_DEBUG_VM is not set
781CONFIG_FORCED_INLINING=y
765# CONFIG_RCU_TORTURE_TEST is not set 782# CONFIG_RCU_TORTURE_TEST is not set
766CONFIG_CROSSCOMPILE=y 783CONFIG_CROSSCOMPILE=y
767CONFIG_CMDLINE="" 784CONFIG_CMDLINE=""
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index c9070cef08b1..8fbfc06a6a2a 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:14 2005 4# Fri Jan 27 15:40:04 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,9 +63,9 @@ CONFIG_MACH_VR41XX=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_NEC_CMBVR4133 is not set
67CONFIG_CASIO_E55=y 66CONFIG_CASIO_E55=y
68# CONFIG_IBM_WORKPAD is not set 67# CONFIG_IBM_WORKPAD is not set
68# CONFIG_NEC_CMBVR4133 is not set
69# CONFIG_TANBAC_TB022X is not set 69# CONFIG_TANBAC_TB022X is not set
70# CONFIG_VICTOR_MPC30X is not set 70# CONFIG_VICTOR_MPC30X is not set
71# CONFIG_ZAO_CAPCELLA is not set 71# CONFIG_ZAO_CAPCELLA is not set
@@ -88,7 +88,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
88# CONFIG_CPU_MIPS64_R2 is not set 88# CONFIG_CPU_MIPS64_R2 is not set
89# CONFIG_CPU_R3000 is not set 89# CONFIG_CPU_R3000 is not set
90# CONFIG_CPU_TX39XX is not set 90# CONFIG_CPU_TX39XX is not set
91CONFIG_CPU_VR41XX=y 91# CONFIG_CPU_VR41XX is not set
92# CONFIG_CPU_R4300 is not set 92# CONFIG_CPU_R4300 is not set
93# CONFIG_CPU_R4X00 is not set 93# CONFIG_CPU_R4X00 is not set
94# CONFIG_CPU_TX49XX is not set 94# CONFIG_CPU_TX49XX is not set
@@ -101,23 +101,18 @@ CONFIG_CPU_VR41XX=y
101# CONFIG_CPU_RM7000 is not set 101# CONFIG_CPU_RM7000 is not set
102# CONFIG_CPU_RM9000 is not set 102# CONFIG_CPU_RM9000 is not set
103# CONFIG_CPU_SB1 is not set 103# CONFIG_CPU_SB1 is not set
104CONFIG_SYS_HAS_CPU_VR41XX=y
105CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
106CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
108CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
109 104
110# 105#
111# Kernel type 106# Kernel type
112# 107#
113CONFIG_32BIT=y 108# CONFIG_32BIT is not set
114# CONFIG_64BIT is not set 109# CONFIG_64BIT is not set
115CONFIG_PAGE_SIZE_4KB=y 110CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_8KB is not set 111# CONFIG_PAGE_SIZE_8KB is not set
117# CONFIG_PAGE_SIZE_16KB is not set 112# CONFIG_PAGE_SIZE_16KB is not set
118# CONFIG_PAGE_SIZE_64KB is not set 113# CONFIG_PAGE_SIZE_64KB is not set
119# CONFIG_MIPS_MT is not set 114# CONFIG_MIPS_MT is not set
120# CONFIG_CPU_ADVANCED is not set 115CONFIG_CPU_HAS_LLSC=y
121CONFIG_CPU_HAS_SYNC=y 116CONFIG_CPU_HAS_SYNC=y
122CONFIG_GENERIC_HARDIRQS=y 117CONFIG_GENERIC_HARDIRQS=y
123CONFIG_GENERIC_IRQ_PROBE=y 118CONFIG_GENERIC_IRQ_PROBE=y
@@ -153,26 +148,28 @@ CONFIG_SYSVIPC=y
153# CONFIG_BSD_PROCESS_ACCT is not set 148# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y 149CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 150# CONFIG_AUDIT is not set
156# CONFIG_HOTPLUG is not set
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set 151# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE="" 152CONFIG_INITRAMFS_SOURCE=""
153# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 154CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 155CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 156# CONFIG_KALLSYMS_EXTRA_PASS is not set
157# CONFIG_HOTPLUG is not set
163CONFIG_PRINTK=y 158CONFIG_PRINTK=y
164CONFIG_BUG=y 159CONFIG_BUG=y
160CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 161CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 162CONFIG_FUTEX=y
167CONFIG_EPOLL=y 163CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 164CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 165CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 166CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 167CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 168CONFIG_CC_ALIGN_JUMPS=0
169CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
172# CONFIG_SLOB is not set
176 173
177# 174#
178# Loadable module support 175# Loadable module support
@@ -188,7 +185,6 @@ CONFIG_KMOD=y
188# 185#
189# Block layer 186# Block layer
190# 187#
191# CONFIG_LBD is not set
192 188
193# 189#
194# IO Schedulers 190# IO Schedulers
@@ -223,7 +219,6 @@ CONFIG_MMU=y
223# 219#
224CONFIG_BINFMT_ELF=y 220CONFIG_BINFMT_ELF=y
225# CONFIG_BINFMT_MISC is not set 221# CONFIG_BINFMT_MISC is not set
226CONFIG_TRAD_SIGNALS=y
227 222
228# 223#
229# Networking 224# Networking
@@ -278,6 +273,11 @@ CONFIG_TCP_CONG_BIC=y
278# CONFIG_ATALK is not set 273# CONFIG_ATALK is not set
279# CONFIG_X25 is not set 274# CONFIG_X25 is not set
280# CONFIG_LAPB is not set 275# CONFIG_LAPB is not set
276
277#
278# TIPC Configuration (EXPERIMENTAL)
279#
280# CONFIG_TIPC is not set
281# CONFIG_NET_DIVERT is not set 281# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 282# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 283# CONFIG_WAN_ROUTER is not set
@@ -298,7 +298,6 @@ CONFIG_IEEE80211=m
298# CONFIG_IEEE80211_DEBUG is not set 298# CONFIG_IEEE80211_DEBUG is not set
299CONFIG_IEEE80211_CRYPT_WEP=m 299CONFIG_IEEE80211_CRYPT_WEP=m
300CONFIG_IEEE80211_CRYPT_CCMP=m 300CONFIG_IEEE80211_CRYPT_CCMP=m
301CONFIG_IEEE80211_CRYPT_TKIP=m
302 301
303# 302#
304# Device Drivers 303# Device Drivers
@@ -433,6 +432,7 @@ CONFIG_NET_ETHERNET=y
433# CONFIG_MII is not set 432# CONFIG_MII is not set
434# CONFIG_NET_VENDOR_3COM is not set 433# CONFIG_NET_VENDOR_3COM is not set
435# CONFIG_NET_VENDOR_SMC is not set 434# CONFIG_NET_VENDOR_SMC is not set
435# CONFIG_DM9000 is not set
436# CONFIG_NET_VENDOR_RACAL is not set 436# CONFIG_NET_VENDOR_RACAL is not set
437# CONFIG_AT1700 is not set 437# CONFIG_AT1700 is not set
438# CONFIG_DEPCA is not set 438# CONFIG_DEPCA is not set
@@ -531,10 +531,6 @@ CONFIG_HW_CONSOLE=y
531# 531#
532# Non-8250 serial port support 532# Non-8250 serial port support
533# 533#
534CONFIG_SERIAL_CORE=y
535CONFIG_SERIAL_CORE_CONSOLE=y
536CONFIG_SERIAL_VR41XX=y
537CONFIG_SERIAL_VR41XX_CONSOLE=y
538CONFIG_UNIX98_PTYS=y 534CONFIG_UNIX98_PTYS=y
539CONFIG_LEGACY_PTYS=y 535CONFIG_LEGACY_PTYS=y
540CONFIG_LEGACY_PTY_COUNT=256 536CONFIG_LEGACY_PTY_COUNT=256
@@ -563,14 +559,12 @@ CONFIG_WATCHDOG=y
563# CONFIG_WDT is not set 559# CONFIG_WDT is not set
564# CONFIG_RTC is not set 560# CONFIG_RTC is not set
565# CONFIG_GEN_RTC is not set 561# CONFIG_GEN_RTC is not set
566# CONFIG_RTC_VR41XX is not set
567# CONFIG_DTLK is not set 562# CONFIG_DTLK is not set
568# CONFIG_R3964 is not set 563# CONFIG_R3964 is not set
569 564
570# 565#
571# Ftape, the floppy tape device driver 566# Ftape, the floppy tape device driver
572# 567#
573CONFIG_GPIO_VR41XX=y
574# CONFIG_RAW_DRIVER is not set 568# CONFIG_RAW_DRIVER is not set
575 569
576# 570#
@@ -585,6 +579,12 @@ CONFIG_GPIO_VR41XX=y
585# CONFIG_I2C is not set 579# CONFIG_I2C is not set
586 580
587# 581#
582# SPI support
583#
584# CONFIG_SPI is not set
585# CONFIG_SPI_MASTER is not set
586
587#
588# Dallas's 1-wire bus 588# Dallas's 1-wire bus
589# 589#
590# CONFIG_W1 is not set 590# CONFIG_W1 is not set
@@ -665,11 +665,11 @@ CONFIG_EXT2_FS=y
665# CONFIG_EXT2_FS_XATTR is not set 665# CONFIG_EXT2_FS_XATTR is not set
666# CONFIG_EXT2_FS_XIP is not set 666# CONFIG_EXT2_FS_XIP is not set
667# CONFIG_EXT3_FS is not set 667# CONFIG_EXT3_FS is not set
668# CONFIG_JBD is not set
669# CONFIG_REISERFS_FS is not set 668# CONFIG_REISERFS_FS is not set
670# CONFIG_JFS_FS is not set 669# CONFIG_JFS_FS is not set
671# CONFIG_FS_POSIX_ACL is not set 670# CONFIG_FS_POSIX_ACL is not set
672# CONFIG_XFS_FS is not set 671# CONFIG_XFS_FS is not set
672# CONFIG_OCFS2_FS is not set
673# CONFIG_MINIX_FS is not set 673# CONFIG_MINIX_FS is not set
674# CONFIG_ROMFS_FS is not set 674# CONFIG_ROMFS_FS is not set
675CONFIG_INOTIFY=y 675CONFIG_INOTIFY=y
@@ -702,6 +702,7 @@ CONFIG_SYSFS=y
702# CONFIG_HUGETLB_PAGE is not set 702# CONFIG_HUGETLB_PAGE is not set
703CONFIG_RAMFS=y 703CONFIG_RAMFS=y
704CONFIG_RELAYFS_FS=m 704CONFIG_RELAYFS_FS=m
705# CONFIG_CONFIGFS_FS is not set
705 706
706# 707#
707# Miscellaneous filesystems 708# Miscellaneous filesystems
@@ -763,6 +764,7 @@ CONFIG_MSDOS_PARTITION=y
763# Kernel hacking 764# Kernel hacking
764# 765#
765# CONFIG_PRINTK_TIME is not set 766# CONFIG_PRINTK_TIME is not set
767# CONFIG_MAGIC_SYSRQ is not set
766# CONFIG_DEBUG_KERNEL is not set 768# CONFIG_DEBUG_KERNEL is not set
767CONFIG_LOG_BUF_SHIFT=14 769CONFIG_LOG_BUF_SHIFT=14
768CONFIG_CROSSCOMPILE=y 770CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index aa24d85ea94d..f2d43be69007 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:16 2005 4# Fri Jan 27 15:40:05 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -153,26 +153,28 @@ CONFIG_SYSVIPC=y
153# CONFIG_BSD_PROCESS_ACCT is not set 153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 160CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_HOTPLUG=y
163CONFIG_PRINTK=y 163CONFIG_PRINTK=y
164CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 167CONFIG_FUTEX=y
167CONFIG_EPOLL=y 168CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
176 178
177# 179#
178# Loadable module support 180# Loadable module support
@@ -282,6 +284,11 @@ CONFIG_TCP_CONG_BIC=y
282# CONFIG_ATALK is not set 284# CONFIG_ATALK is not set
283# CONFIG_X25 is not set 285# CONFIG_X25 is not set
284# CONFIG_LAPB is not set 286# CONFIG_LAPB is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
285# CONFIG_NET_DIVERT is not set 292# CONFIG_NET_DIVERT is not set
286# CONFIG_ECONET is not set 293# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 294# CONFIG_WAN_ROUTER is not set
@@ -302,7 +309,6 @@ CONFIG_IEEE80211=m
302# CONFIG_IEEE80211_DEBUG is not set 309# CONFIG_IEEE80211_DEBUG is not set
303CONFIG_IEEE80211_CRYPT_WEP=m 310CONFIG_IEEE80211_CRYPT_WEP=m
304CONFIG_IEEE80211_CRYPT_CCMP=m 311CONFIG_IEEE80211_CRYPT_CCMP=m
305CONFIG_IEEE80211_CRYPT_TKIP=m
306 312
307# 313#
308# Device Drivers 314# Device Drivers
@@ -420,6 +426,7 @@ CONFIG_NET_ETHERNET=y
420# CONFIG_SUNGEM is not set 426# CONFIG_SUNGEM is not set
421# CONFIG_CASSINI is not set 427# CONFIG_CASSINI is not set
422# CONFIG_NET_VENDOR_3COM is not set 428# CONFIG_NET_VENDOR_3COM is not set
429# CONFIG_DM9000 is not set
423 430
424# 431#
425# Tulip family network device support 432# Tulip family network device support
@@ -440,6 +447,7 @@ CONFIG_NET_ETHERNET=y
440# CONFIG_R8169 is not set 447# CONFIG_R8169 is not set
441# CONFIG_SIS190 is not set 448# CONFIG_SIS190 is not set
442# CONFIG_SKGE is not set 449# CONFIG_SKGE is not set
450# CONFIG_SKY2 is not set
443# CONFIG_SK98LIN is not set 451# CONFIG_SK98LIN is not set
444# CONFIG_TIGON3 is not set 452# CONFIG_TIGON3 is not set
445# CONFIG_BNX2 is not set 453# CONFIG_BNX2 is not set
@@ -460,8 +468,6 @@ CONFIG_NET_ETHERNET=y
460# Wireless LAN (non-hamradio) 468# Wireless LAN (non-hamradio)
461# 469#
462# CONFIG_NET_RADIO is not set 470# CONFIG_NET_RADIO is not set
463# CONFIG_IPW_DEBUG is not set
464CONFIG_IPW2200=m
465 471
466# 472#
467# Wan interfaces 473# Wan interfaces
@@ -545,6 +551,7 @@ CONFIG_HW_CONSOLE=y
545CONFIG_SERIAL_8250=y 551CONFIG_SERIAL_8250=y
546CONFIG_SERIAL_8250_CONSOLE=y 552CONFIG_SERIAL_8250_CONSOLE=y
547CONFIG_SERIAL_8250_NR_UARTS=4 553CONFIG_SERIAL_8250_NR_UARTS=4
554CONFIG_SERIAL_8250_RUNTIME_UARTS=4
548# CONFIG_SERIAL_8250_EXTENDED is not set 555# CONFIG_SERIAL_8250_EXTENDED is not set
549 556
550# 557#
@@ -552,7 +559,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
552# 559#
553CONFIG_SERIAL_CORE=y 560CONFIG_SERIAL_CORE=y
554CONFIG_SERIAL_CORE_CONSOLE=y 561CONFIG_SERIAL_CORE_CONSOLE=y
555# CONFIG_SERIAL_JSM is not set
556CONFIG_UNIX98_PTYS=y 562CONFIG_UNIX98_PTYS=y
557CONFIG_LEGACY_PTYS=y 563CONFIG_LEGACY_PTYS=y
558CONFIG_LEGACY_PTY_COUNT=256 564CONFIG_LEGACY_PTY_COUNT=256
@@ -590,6 +596,12 @@ CONFIG_LEGACY_PTY_COUNT=256
590# CONFIG_I2C is not set 596# CONFIG_I2C is not set
591 597
592# 598#
599# SPI support
600#
601# CONFIG_SPI is not set
602# CONFIG_SPI_MASTER is not set
603
604#
593# Dallas's 1-wire bus 605# Dallas's 1-wire bus
594# 606#
595# CONFIG_W1 is not set 607# CONFIG_W1 is not set
@@ -671,11 +683,11 @@ CONFIG_EXT2_FS=y
671# CONFIG_EXT2_FS_XATTR is not set 683# CONFIG_EXT2_FS_XATTR is not set
672# CONFIG_EXT2_FS_XIP is not set 684# CONFIG_EXT2_FS_XIP is not set
673# CONFIG_EXT3_FS is not set 685# CONFIG_EXT3_FS is not set
674# CONFIG_JBD is not set
675# CONFIG_REISERFS_FS is not set 686# CONFIG_REISERFS_FS is not set
676# CONFIG_JFS_FS is not set 687# CONFIG_JFS_FS is not set
677# CONFIG_FS_POSIX_ACL is not set 688# CONFIG_FS_POSIX_ACL is not set
678# CONFIG_XFS_FS is not set 689# CONFIG_XFS_FS is not set
690# CONFIG_OCFS2_FS is not set
679# CONFIG_MINIX_FS is not set 691# CONFIG_MINIX_FS is not set
680# CONFIG_ROMFS_FS is not set 692# CONFIG_ROMFS_FS is not set
681CONFIG_INOTIFY=y 693CONFIG_INOTIFY=y
@@ -708,6 +720,7 @@ CONFIG_SYSFS=y
708# CONFIG_HUGETLB_PAGE is not set 720# CONFIG_HUGETLB_PAGE is not set
709CONFIG_RAMFS=y 721CONFIG_RAMFS=y
710CONFIG_RELAYFS_FS=m 722CONFIG_RELAYFS_FS=m
723# CONFIG_CONFIGFS_FS is not set
711 724
712# 725#
713# Miscellaneous filesystems 726# Miscellaneous filesystems
@@ -767,6 +780,7 @@ CONFIG_MSDOS_PARTITION=y
767# Kernel hacking 780# Kernel hacking
768# 781#
769# CONFIG_PRINTK_TIME is not set 782# CONFIG_PRINTK_TIME is not set
783# CONFIG_MAGIC_SYSRQ is not set
770# CONFIG_DEBUG_KERNEL is not set 784# CONFIG_DEBUG_KERNEL is not set
771CONFIG_LOG_BUF_SHIFT=14 785CONFIG_LOG_BUF_SHIFT=14
772CONFIG_CROSSCOMPILE=y 786CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig
index eeed0e5ad260..ac5841c4b698 100644
--- a/arch/mips/configs/ev96100_defconfig
+++ b/arch/mips/configs/ev96100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:18 2005 4# Fri Jan 27 15:40:06 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -157,26 +157,28 @@ CONFIG_SYSVIPC=y
157# CONFIG_BSD_PROCESS_ACCT is not set 157# CONFIG_BSD_PROCESS_ACCT is not set
158CONFIG_SYSCTL=y 158CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set 159# CONFIG_AUDIT is not set
160# CONFIG_HOTPLUG is not set
161CONFIG_KOBJECT_UEVENT=y
162# CONFIG_IKCONFIG is not set 160# CONFIG_IKCONFIG is not set
163CONFIG_INITRAMFS_SOURCE="" 161CONFIG_INITRAMFS_SOURCE=""
162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
164CONFIG_EMBEDDED=y 163CONFIG_EMBEDDED=y
165CONFIG_KALLSYMS=y 164CONFIG_KALLSYMS=y
166# CONFIG_KALLSYMS_EXTRA_PASS is not set 165# CONFIG_KALLSYMS_EXTRA_PASS is not set
166# CONFIG_HOTPLUG is not set
167CONFIG_PRINTK=y 167CONFIG_PRINTK=y
168CONFIG_BUG=y 168CONFIG_BUG=y
169CONFIG_ELF_CORE=y
169CONFIG_BASE_FULL=y 170CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 171CONFIG_FUTEX=y
171CONFIG_EPOLL=y 172CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y 173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0 174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0 175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0 176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0 177CONFIG_CC_ALIGN_JUMPS=0
178CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 179# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 180CONFIG_BASE_SMALL=0
181# CONFIG_SLOB is not set
180 182
181# 183#
182# Loadable module support 184# Loadable module support
@@ -284,6 +286,11 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_ATALK is not set 286# CONFIG_ATALK is not set
285# CONFIG_X25 is not set 287# CONFIG_X25 is not set
286# CONFIG_LAPB is not set 288# CONFIG_LAPB is not set
289
290#
291# TIPC Configuration (EXPERIMENTAL)
292#
293# CONFIG_TIPC is not set
287# CONFIG_NET_DIVERT is not set 294# CONFIG_NET_DIVERT is not set
288# CONFIG_ECONET is not set 295# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 296# CONFIG_WAN_ROUTER is not set
@@ -304,7 +311,6 @@ CONFIG_IEEE80211=m
304# CONFIG_IEEE80211_DEBUG is not set 311# CONFIG_IEEE80211_DEBUG is not set
305CONFIG_IEEE80211_CRYPT_WEP=m 312CONFIG_IEEE80211_CRYPT_WEP=m
306CONFIG_IEEE80211_CRYPT_CCMP=m 313CONFIG_IEEE80211_CRYPT_CCMP=m
307CONFIG_IEEE80211_CRYPT_TKIP=m
308 314
309# 315#
310# Device Drivers 316# Device Drivers
@@ -407,6 +413,7 @@ CONFIG_CICADA_PHY=m
407CONFIG_NET_ETHERNET=y 413CONFIG_NET_ETHERNET=y
408# CONFIG_MII is not set 414# CONFIG_MII is not set
409CONFIG_MIPS_GT96100ETH=y 415CONFIG_MIPS_GT96100ETH=y
416# CONFIG_DM9000 is not set
410 417
411# 418#
412# Ethernet (1000 Mbit) 419# Ethernet (1000 Mbit)
@@ -496,6 +503,7 @@ CONFIG_HW_CONSOLE=y
496CONFIG_SERIAL_8250=y 503CONFIG_SERIAL_8250=y
497CONFIG_SERIAL_8250_CONSOLE=y 504CONFIG_SERIAL_8250_CONSOLE=y
498CONFIG_SERIAL_8250_NR_UARTS=4 505CONFIG_SERIAL_8250_NR_UARTS=4
506CONFIG_SERIAL_8250_RUNTIME_UARTS=4
499# CONFIG_SERIAL_8250_EXTENDED is not set 507# CONFIG_SERIAL_8250_EXTENDED is not set
500 508
501# 509#
@@ -538,6 +546,12 @@ CONFIG_LEGACY_PTY_COUNT=256
538# CONFIG_I2C is not set 546# CONFIG_I2C is not set
539 547
540# 548#
549# SPI support
550#
551# CONFIG_SPI is not set
552# CONFIG_SPI_MASTER is not set
553
554#
541# Dallas's 1-wire bus 555# Dallas's 1-wire bus
542# 556#
543# CONFIG_W1 is not set 557# CONFIG_W1 is not set
@@ -617,11 +631,11 @@ CONFIG_EXT2_FS=y
617# CONFIG_EXT2_FS_XATTR is not set 631# CONFIG_EXT2_FS_XATTR is not set
618# CONFIG_EXT2_FS_XIP is not set 632# CONFIG_EXT2_FS_XIP is not set
619# CONFIG_EXT3_FS is not set 633# CONFIG_EXT3_FS is not set
620# CONFIG_JBD is not set
621# CONFIG_REISERFS_FS is not set 634# CONFIG_REISERFS_FS is not set
622# CONFIG_JFS_FS is not set 635# CONFIG_JFS_FS is not set
623# CONFIG_FS_POSIX_ACL is not set 636# CONFIG_FS_POSIX_ACL is not set
624# CONFIG_XFS_FS is not set 637# CONFIG_XFS_FS is not set
638# CONFIG_OCFS2_FS is not set
625# CONFIG_MINIX_FS is not set 639# CONFIG_MINIX_FS is not set
626# CONFIG_ROMFS_FS is not set 640# CONFIG_ROMFS_FS is not set
627CONFIG_INOTIFY=y 641CONFIG_INOTIFY=y
@@ -654,6 +668,7 @@ CONFIG_SYSFS=y
654# CONFIG_HUGETLB_PAGE is not set 668# CONFIG_HUGETLB_PAGE is not set
655CONFIG_RAMFS=y 669CONFIG_RAMFS=y
656CONFIG_RELAYFS_FS=m 670CONFIG_RELAYFS_FS=m
671# CONFIG_CONFIGFS_FS is not set
657 672
658# 673#
659# Miscellaneous filesystems 674# Miscellaneous filesystems
@@ -713,6 +728,7 @@ CONFIG_MSDOS_PARTITION=y
713# Kernel hacking 728# Kernel hacking
714# 729#
715# CONFIG_PRINTK_TIME is not set 730# CONFIG_PRINTK_TIME is not set
731# CONFIG_MAGIC_SYSRQ is not set
716# CONFIG_DEBUG_KERNEL is not set 732# CONFIG_DEBUG_KERNEL is not set
717CONFIG_LOG_BUF_SHIFT=14 733CONFIG_LOG_BUF_SHIFT=14
718CONFIG_CROSSCOMPILE=y 734CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index e56351abf87a..42d5cd7927cb 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:20 2005 4# Fri Jan 27 15:39:51 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -158,27 +158,29 @@ CONFIG_SYSVIPC=y
158# CONFIG_BSD_PROCESS_ACCT is not set 158# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y 159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161# CONFIG_HOTPLUG is not set
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y 161CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y 162CONFIG_IKCONFIG_PROC=y
165CONFIG_INITRAMFS_SOURCE="" 163CONFIG_INITRAMFS_SOURCE=""
164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_EMBEDDED=y 165CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y 166CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set 167# CONFIG_KALLSYMS_EXTRA_PASS is not set
168# CONFIG_HOTPLUG is not set
169CONFIG_PRINTK=y 169CONFIG_PRINTK=y
170CONFIG_BUG=y 170CONFIG_BUG=y
171CONFIG_ELF_CORE=y
171CONFIG_BASE_FULL=y 172CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y 173CONFIG_FUTEX=y
173CONFIG_EPOLL=y 174CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y 175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0 176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0 177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0 178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0 179CONFIG_CC_ALIGN_JUMPS=0
180CONFIG_SLAB=y
180# CONFIG_TINY_SHMEM is not set 181# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0 182CONFIG_BASE_SMALL=0
183# CONFIG_SLOB is not set
182 184
183# 185#
184# Loadable module support 186# Loadable module support
@@ -317,6 +319,28 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 319CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 320CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 321CONFIG_NETFILTER_NETLINK_LOG=m
322CONFIG_NETFILTER_XTABLES=m
323CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
324CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
325CONFIG_NETFILTER_XT_TARGET_MARK=m
326CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
327CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
328CONFIG_NETFILTER_XT_MATCH_COMMENT=m
329CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
330CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
331CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
332CONFIG_NETFILTER_XT_MATCH_DCCP=m
333CONFIG_NETFILTER_XT_MATCH_HELPER=m
334CONFIG_NETFILTER_XT_MATCH_LENGTH=m
335CONFIG_NETFILTER_XT_MATCH_LIMIT=m
336CONFIG_NETFILTER_XT_MATCH_MAC=m
337CONFIG_NETFILTER_XT_MATCH_MARK=m
338CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
339CONFIG_NETFILTER_XT_MATCH_REALM=m
340CONFIG_NETFILTER_XT_MATCH_SCTP=m
341CONFIG_NETFILTER_XT_MATCH_STATE=m
342CONFIG_NETFILTER_XT_MATCH_STRING=m
343CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
320 344
321# 345#
322# IP: Netfilter Configuration 346# IP: Netfilter Configuration
@@ -335,39 +359,23 @@ CONFIG_IP_NF_AMANDA=m
335CONFIG_IP_NF_PPTP=m 359CONFIG_IP_NF_PPTP=m
336CONFIG_IP_NF_QUEUE=m 360CONFIG_IP_NF_QUEUE=m
337CONFIG_IP_NF_IPTABLES=m 361CONFIG_IP_NF_IPTABLES=m
338CONFIG_IP_NF_MATCH_LIMIT=m
339CONFIG_IP_NF_MATCH_IPRANGE=m 362CONFIG_IP_NF_MATCH_IPRANGE=m
340CONFIG_IP_NF_MATCH_MAC=m
341CONFIG_IP_NF_MATCH_PKTTYPE=m
342CONFIG_IP_NF_MATCH_MARK=m
343CONFIG_IP_NF_MATCH_MULTIPORT=m 363CONFIG_IP_NF_MATCH_MULTIPORT=m
344CONFIG_IP_NF_MATCH_TOS=m 364CONFIG_IP_NF_MATCH_TOS=m
345CONFIG_IP_NF_MATCH_RECENT=m 365CONFIG_IP_NF_MATCH_RECENT=m
346CONFIG_IP_NF_MATCH_ECN=m 366CONFIG_IP_NF_MATCH_ECN=m
347CONFIG_IP_NF_MATCH_DSCP=m 367CONFIG_IP_NF_MATCH_DSCP=m
348CONFIG_IP_NF_MATCH_AH_ESP=m 368CONFIG_IP_NF_MATCH_AH_ESP=m
349CONFIG_IP_NF_MATCH_LENGTH=m
350CONFIG_IP_NF_MATCH_TTL=m 369CONFIG_IP_NF_MATCH_TTL=m
351CONFIG_IP_NF_MATCH_TCPMSS=m
352CONFIG_IP_NF_MATCH_HELPER=m
353CONFIG_IP_NF_MATCH_STATE=m
354CONFIG_IP_NF_MATCH_CONNTRACK=m
355CONFIG_IP_NF_MATCH_OWNER=m 370CONFIG_IP_NF_MATCH_OWNER=m
356CONFIG_IP_NF_MATCH_ADDRTYPE=m 371CONFIG_IP_NF_MATCH_ADDRTYPE=m
357CONFIG_IP_NF_MATCH_REALM=m
358CONFIG_IP_NF_MATCH_SCTP=m
359CONFIG_IP_NF_MATCH_DCCP=m
360CONFIG_IP_NF_MATCH_COMMENT=m
361CONFIG_IP_NF_MATCH_CONNMARK=m
362CONFIG_IP_NF_MATCH_CONNBYTES=m
363CONFIG_IP_NF_MATCH_HASHLIMIT=m 372CONFIG_IP_NF_MATCH_HASHLIMIT=m
364CONFIG_IP_NF_MATCH_STRING=m 373CONFIG_IP_NF_MATCH_POLICY=m
365CONFIG_IP_NF_FILTER=m 374CONFIG_IP_NF_FILTER=m
366CONFIG_IP_NF_TARGET_REJECT=m 375CONFIG_IP_NF_TARGET_REJECT=m
367CONFIG_IP_NF_TARGET_LOG=m 376CONFIG_IP_NF_TARGET_LOG=m
368CONFIG_IP_NF_TARGET_ULOG=m 377CONFIG_IP_NF_TARGET_ULOG=m
369CONFIG_IP_NF_TARGET_TCPMSS=m 378CONFIG_IP_NF_TARGET_TCPMSS=m
370CONFIG_IP_NF_TARGET_NFQUEUE=m
371CONFIG_IP_NF_NAT=m 379CONFIG_IP_NF_NAT=m
372CONFIG_IP_NF_NAT_NEEDED=y 380CONFIG_IP_NF_NAT_NEEDED=y
373CONFIG_IP_NF_TARGET_MASQUERADE=m 381CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -384,13 +392,9 @@ CONFIG_IP_NF_MANGLE=m
384CONFIG_IP_NF_TARGET_TOS=m 392CONFIG_IP_NF_TARGET_TOS=m
385CONFIG_IP_NF_TARGET_ECN=m 393CONFIG_IP_NF_TARGET_ECN=m
386CONFIG_IP_NF_TARGET_DSCP=m 394CONFIG_IP_NF_TARGET_DSCP=m
387CONFIG_IP_NF_TARGET_MARK=m
388CONFIG_IP_NF_TARGET_CLASSIFY=m
389CONFIG_IP_NF_TARGET_TTL=m 395CONFIG_IP_NF_TARGET_TTL=m
390CONFIG_IP_NF_TARGET_CONNMARK=m
391CONFIG_IP_NF_TARGET_CLUSTERIP=m 396CONFIG_IP_NF_TARGET_CLUSTERIP=m
392CONFIG_IP_NF_RAW=m 397CONFIG_IP_NF_RAW=m
393CONFIG_IP_NF_TARGET_NOTRACK=m
394CONFIG_IP_NF_ARPTABLES=m 398CONFIG_IP_NF_ARPTABLES=m
395CONFIG_IP_NF_ARPFILTER=m 399CONFIG_IP_NF_ARPFILTER=m
396CONFIG_IP_NF_ARP_MANGLE=m 400CONFIG_IP_NF_ARP_MANGLE=m
@@ -400,25 +404,20 @@ CONFIG_IP_NF_ARP_MANGLE=m
400# 404#
401CONFIG_IP6_NF_QUEUE=m 405CONFIG_IP6_NF_QUEUE=m
402CONFIG_IP6_NF_IPTABLES=m 406CONFIG_IP6_NF_IPTABLES=m
403CONFIG_IP6_NF_MATCH_LIMIT=m
404CONFIG_IP6_NF_MATCH_MAC=m
405CONFIG_IP6_NF_MATCH_RT=m 407CONFIG_IP6_NF_MATCH_RT=m
406CONFIG_IP6_NF_MATCH_OPTS=m 408CONFIG_IP6_NF_MATCH_OPTS=m
407CONFIG_IP6_NF_MATCH_FRAG=m 409CONFIG_IP6_NF_MATCH_FRAG=m
408CONFIG_IP6_NF_MATCH_HL=m 410CONFIG_IP6_NF_MATCH_HL=m
409CONFIG_IP6_NF_MATCH_MULTIPORT=m 411CONFIG_IP6_NF_MATCH_MULTIPORT=m
410CONFIG_IP6_NF_MATCH_OWNER=m 412CONFIG_IP6_NF_MATCH_OWNER=m
411CONFIG_IP6_NF_MATCH_MARK=m
412CONFIG_IP6_NF_MATCH_IPV6HEADER=m 413CONFIG_IP6_NF_MATCH_IPV6HEADER=m
413CONFIG_IP6_NF_MATCH_AHESP=m 414CONFIG_IP6_NF_MATCH_AHESP=m
414CONFIG_IP6_NF_MATCH_LENGTH=m
415CONFIG_IP6_NF_MATCH_EUI64=m 415CONFIG_IP6_NF_MATCH_EUI64=m
416CONFIG_IP6_NF_MATCH_POLICY=m
416CONFIG_IP6_NF_FILTER=m 417CONFIG_IP6_NF_FILTER=m
417CONFIG_IP6_NF_TARGET_LOG=m 418CONFIG_IP6_NF_TARGET_LOG=m
418CONFIG_IP6_NF_TARGET_REJECT=m 419CONFIG_IP6_NF_TARGET_REJECT=m
419CONFIG_IP6_NF_TARGET_NFQUEUE=m
420CONFIG_IP6_NF_MANGLE=m 420CONFIG_IP6_NF_MANGLE=m
421CONFIG_IP6_NF_TARGET_MARK=m
422CONFIG_IP6_NF_TARGET_HL=m 421CONFIG_IP6_NF_TARGET_HL=m
423CONFIG_IP6_NF_RAW=m 422CONFIG_IP6_NF_RAW=m
424 423
@@ -445,6 +444,11 @@ CONFIG_SCTP_HMAC_MD5=y
445# CONFIG_ATALK is not set 444# CONFIG_ATALK is not set
446# CONFIG_X25 is not set 445# CONFIG_X25 is not set
447# CONFIG_LAPB is not set 446# CONFIG_LAPB is not set
447
448#
449# TIPC Configuration (EXPERIMENTAL)
450#
451# CONFIG_TIPC is not set
448CONFIG_NET_DIVERT=y 452CONFIG_NET_DIVERT=y
449# CONFIG_ECONET is not set 453# CONFIG_ECONET is not set
450# CONFIG_WAN_ROUTER is not set 454# CONFIG_WAN_ROUTER is not set
@@ -504,7 +508,6 @@ CONFIG_IEEE80211=m
504# CONFIG_IEEE80211_DEBUG is not set 508# CONFIG_IEEE80211_DEBUG is not set
505CONFIG_IEEE80211_CRYPT_WEP=m 509CONFIG_IEEE80211_CRYPT_WEP=m
506CONFIG_IEEE80211_CRYPT_CCMP=m 510CONFIG_IEEE80211_CRYPT_CCMP=m
507CONFIG_IEEE80211_CRYPT_TKIP=m
508 511
509# 512#
510# Device Drivers 513# Device Drivers
@@ -641,6 +644,7 @@ CONFIG_CICADA_PHY=m
641# 644#
642CONFIG_NET_ETHERNET=y 645CONFIG_NET_ETHERNET=y
643# CONFIG_MII is not set 646# CONFIG_MII is not set
647# CONFIG_DM9000 is not set
644CONFIG_SGISEEQ=y 648CONFIG_SGISEEQ=y
645 649
646# 650#
@@ -787,6 +791,12 @@ CONFIG_MAX_RAW_DEVS=256
787# CONFIG_I2C is not set 791# CONFIG_I2C is not set
788 792
789# 793#
794# SPI support
795#
796# CONFIG_SPI is not set
797# CONFIG_SPI_MASTER is not set
798
799#
790# Dallas's 1-wire bus 800# Dallas's 1-wire bus
791# 801#
792# CONFIG_W1 is not set 802# CONFIG_W1 is not set
@@ -892,6 +902,7 @@ CONFIG_XFS_QUOTA=y
892CONFIG_XFS_SECURITY=y 902CONFIG_XFS_SECURITY=y
893# CONFIG_XFS_POSIX_ACL is not set 903# CONFIG_XFS_POSIX_ACL is not set
894# CONFIG_XFS_RT is not set 904# CONFIG_XFS_RT is not set
905# CONFIG_OCFS2_FS is not set
895CONFIG_MINIX_FS=m 906CONFIG_MINIX_FS=m
896# CONFIG_ROMFS_FS is not set 907# CONFIG_ROMFS_FS is not set
897CONFIG_INOTIFY=y 908CONFIG_INOTIFY=y
@@ -934,6 +945,7 @@ CONFIG_SYSFS=y
934# CONFIG_HUGETLB_PAGE is not set 945# CONFIG_HUGETLB_PAGE is not set
935CONFIG_RAMFS=y 946CONFIG_RAMFS=y
936CONFIG_RELAYFS_FS=m 947CONFIG_RELAYFS_FS=m
948# CONFIG_CONFIGFS_FS is not set
937 949
938# 950#
939# Miscellaneous filesystems 951# Miscellaneous filesystems
@@ -1007,6 +1019,7 @@ CONFIG_MSDOS_PARTITION=y
1007CONFIG_SGI_PARTITION=y 1019CONFIG_SGI_PARTITION=y
1008# CONFIG_ULTRIX_PARTITION is not set 1020# CONFIG_ULTRIX_PARTITION is not set
1009# CONFIG_SUN_PARTITION is not set 1021# CONFIG_SUN_PARTITION is not set
1022# CONFIG_KARMA_PARTITION is not set
1010# CONFIG_EFI_PARTITION is not set 1023# CONFIG_EFI_PARTITION is not set
1011 1024
1012# 1025#
@@ -1062,6 +1075,7 @@ CONFIG_NLS_UTF8=m
1062# Kernel hacking 1075# Kernel hacking
1063# 1076#
1064# CONFIG_PRINTK_TIME is not set 1077# CONFIG_PRINTK_TIME is not set
1078# CONFIG_MAGIC_SYSRQ is not set
1065# CONFIG_DEBUG_KERNEL is not set 1079# CONFIG_DEBUG_KERNEL is not set
1066CONFIG_LOG_BUF_SHIFT=14 1080CONFIG_LOG_BUF_SHIFT=14
1067CONFIG_CROSSCOMPILE=y 1081CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 58c22cd344d3..8c40590737e1 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -132,6 +132,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
132CONFIG_NEED_MULTIPLE_NODES=y 132CONFIG_NEED_MULTIPLE_NODES=y
133# CONFIG_SPARSEMEM_STATIC is not set 133# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4 134CONFIG_SPLIT_PTLOCK_CPUS=4
135CONFIG_MIGRATION=y
135CONFIG_SMP=y 136CONFIG_SMP=y
136CONFIG_NR_CPUS=64 137CONFIG_NR_CPUS=64
137CONFIG_PREEMPT_NONE=y 138CONFIG_PREEMPT_NONE=y
@@ -158,28 +159,30 @@ CONFIG_POSIX_MQUEUE=y
158# CONFIG_BSD_PROCESS_ACCT is not set 159# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y 160CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 161# CONFIG_AUDIT is not set
161CONFIG_HOTPLUG=y
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y 162CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y 163CONFIG_IKCONFIG_PROC=y
165CONFIG_CPUSETS=y 164CONFIG_CPUSETS=y
166CONFIG_INITRAMFS_SOURCE="" 165CONFIG_INITRAMFS_SOURCE=""
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_EMBEDDED=y 167CONFIG_EMBEDDED=y
168CONFIG_KALLSYMS=y 168CONFIG_KALLSYMS=y
169# CONFIG_KALLSYMS_EXTRA_PASS is not set 169# CONFIG_KALLSYMS_EXTRA_PASS is not set
170CONFIG_HOTPLUG=y
170CONFIG_PRINTK=y 171CONFIG_PRINTK=y
171CONFIG_BUG=y 172CONFIG_BUG=y
173CONFIG_ELF_CORE=y
172CONFIG_BASE_FULL=y 174CONFIG_BASE_FULL=y
173CONFIG_FUTEX=y 175CONFIG_FUTEX=y
174CONFIG_EPOLL=y 176CONFIG_EPOLL=y
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
176CONFIG_SHMEM=y 177CONFIG_SHMEM=y
177CONFIG_CC_ALIGN_FUNCTIONS=0 178CONFIG_CC_ALIGN_FUNCTIONS=0
178CONFIG_CC_ALIGN_LABELS=0 179CONFIG_CC_ALIGN_LABELS=0
179CONFIG_CC_ALIGN_LOOPS=0 180CONFIG_CC_ALIGN_LOOPS=0
180CONFIG_CC_ALIGN_JUMPS=0 181CONFIG_CC_ALIGN_JUMPS=0
182CONFIG_SLAB=y
181# CONFIG_TINY_SHMEM is not set 183# CONFIG_TINY_SHMEM is not set
182CONFIG_BASE_SMALL=0 184CONFIG_BASE_SMALL=0
185# CONFIG_SLOB is not set
183 186
184# 187#
185# Loadable module support 188# Loadable module support
@@ -234,7 +237,6 @@ CONFIG_MMU=y
234# 237#
235CONFIG_BINFMT_ELF=y 238CONFIG_BINFMT_ELF=y
236# CONFIG_BINFMT_MISC is not set 239# CONFIG_BINFMT_MISC is not set
237CONFIG_BUILD_ELF64=y
238CONFIG_MIPS32_COMPAT=y 240CONFIG_MIPS32_COMPAT=y
239CONFIG_COMPAT=y 241CONFIG_COMPAT=y
240CONFIG_MIPS32_O32=y 242CONFIG_MIPS32_O32=y
@@ -290,6 +292,10 @@ CONFIG_TCP_CONG_BIC=y
290# 292#
291# CONFIG_IP_SCTP is not set 293# CONFIG_IP_SCTP is not set
292 294
295#
296# TIPC Configuration (EXPERIMENTAL)
297#
298# CONFIG_TIPC is not set
293# CONFIG_ATM is not set 299# CONFIG_ATM is not set
294# CONFIG_BRIDGE is not set 300# CONFIG_BRIDGE is not set
295# CONFIG_VLAN_8021Q is not set 301# CONFIG_VLAN_8021Q is not set
@@ -357,7 +363,6 @@ CONFIG_IEEE80211=m
357# CONFIG_IEEE80211_DEBUG is not set 363# CONFIG_IEEE80211_DEBUG is not set
358CONFIG_IEEE80211_CRYPT_WEP=m 364CONFIG_IEEE80211_CRYPT_WEP=m
359CONFIG_IEEE80211_CRYPT_CCMP=m 365CONFIG_IEEE80211_CRYPT_CCMP=m
360CONFIG_IEEE80211_CRYPT_TKIP=m
361 366
362# 367#
363# Device Drivers 368# Device Drivers
@@ -368,7 +373,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
368# 373#
369CONFIG_STANDALONE=y 374CONFIG_STANDALONE=y
370CONFIG_PREVENT_FIRMWARE_BUILD=y 375CONFIG_PREVENT_FIRMWARE_BUILD=y
371CONFIG_FW_LOADER=m 376CONFIG_FW_LOADER=y
372 377
373# 378#
374# Connector - unified userspace <-> kernelspace linker 379# Connector - unified userspace <-> kernelspace linker
@@ -442,7 +447,7 @@ CONFIG_SCSI_LOGGING=y
442# SCSI Transport Attributes 447# SCSI Transport Attributes
443# 448#
444CONFIG_SCSI_SPI_ATTRS=y 449CONFIG_SCSI_SPI_ATTRS=y
445# CONFIG_SCSI_FC_ATTRS is not set 450CONFIG_SCSI_FC_ATTRS=y
446CONFIG_SCSI_ISCSI_ATTRS=m 451CONFIG_SCSI_ISCSI_ATTRS=m
447CONFIG_SCSI_SAS_ATTRS=m 452CONFIG_SCSI_SAS_ATTRS=m
448 453
@@ -470,13 +475,7 @@ CONFIG_SCSI_SAS_ATTRS=m
470# CONFIG_SCSI_IPR is not set 475# CONFIG_SCSI_IPR is not set
471# CONFIG_SCSI_QLOGIC_FC is not set 476# CONFIG_SCSI_QLOGIC_FC is not set
472CONFIG_SCSI_QLOGIC_1280=y 477CONFIG_SCSI_QLOGIC_1280=y
473CONFIG_SCSI_QLA2XXX=y 478# CONFIG_SCSI_QLA_FC is not set
474# CONFIG_SCSI_QLA21XX is not set
475# CONFIG_SCSI_QLA22XX is not set
476# CONFIG_SCSI_QLA2300 is not set
477# CONFIG_SCSI_QLA2322 is not set
478# CONFIG_SCSI_QLA6312 is not set
479# CONFIG_SCSI_QLA24XX is not set
480# CONFIG_SCSI_LPFC is not set 479# CONFIG_SCSI_LPFC is not set
481# CONFIG_SCSI_DC395x is not set 480# CONFIG_SCSI_DC395x is not set
482# CONFIG_SCSI_DC390T is not set 481# CONFIG_SCSI_DC390T is not set
@@ -561,6 +560,7 @@ CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y
561# CONFIG_SUNGEM is not set 560# CONFIG_SUNGEM is not set
562# CONFIG_CASSINI is not set 561# CONFIG_CASSINI is not set
563# CONFIG_NET_VENDOR_3COM is not set 562# CONFIG_NET_VENDOR_3COM is not set
563# CONFIG_DM9000 is not set
564 564
565# 565#
566# Tulip family network device support 566# Tulip family network device support
@@ -581,6 +581,7 @@ CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y
581# CONFIG_R8169 is not set 581# CONFIG_R8169 is not set
582# CONFIG_SIS190 is not set 582# CONFIG_SIS190 is not set
583# CONFIG_SKGE is not set 583# CONFIG_SKGE is not set
584# CONFIG_SKY2 is not set
584# CONFIG_SK98LIN is not set 585# CONFIG_SK98LIN is not set
585# CONFIG_TIGON3 is not set 586# CONFIG_TIGON3 is not set
586# CONFIG_BNX2 is not set 587# CONFIG_BNX2 is not set
@@ -601,8 +602,6 @@ CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y
601# Wireless LAN (non-hamradio) 602# Wireless LAN (non-hamradio)
602# 603#
603# CONFIG_NET_RADIO is not set 604# CONFIG_NET_RADIO is not set
604# CONFIG_IPW_DEBUG is not set
605CONFIG_IPW2200=m
606 605
607# 606#
608# Wan interfaces 607# Wan interfaces
@@ -656,6 +655,7 @@ CONFIG_SERIO_RAW=m
656CONFIG_SERIAL_8250=y 655CONFIG_SERIAL_8250=y
657CONFIG_SERIAL_8250_CONSOLE=y 656CONFIG_SERIAL_8250_CONSOLE=y
658CONFIG_SERIAL_8250_NR_UARTS=4 657CONFIG_SERIAL_8250_NR_UARTS=4
658CONFIG_SERIAL_8250_RUNTIME_UARTS=4
659CONFIG_SERIAL_8250_EXTENDED=y 659CONFIG_SERIAL_8250_EXTENDED=y
660CONFIG_SERIAL_8250_MANY_PORTS=y 660CONFIG_SERIAL_8250_MANY_PORTS=y
661CONFIG_SERIAL_8250_SHARE_IRQ=y 661CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -706,6 +706,12 @@ CONFIG_SGI_IP27_RTC=y
706# CONFIG_I2C is not set 706# CONFIG_I2C is not set
707 707
708# 708#
709# SPI support
710#
711# CONFIG_SPI is not set
712# CONFIG_SPI_MASTER is not set
713
714#
709# Dallas's 1-wire bus 715# Dallas's 1-wire bus
710# 716#
711# CONFIG_W1 is not set 717# CONFIG_W1 is not set
@@ -801,6 +807,7 @@ CONFIG_XFS_QUOTA=y
801CONFIG_XFS_SECURITY=y 807CONFIG_XFS_SECURITY=y
802CONFIG_XFS_POSIX_ACL=y 808CONFIG_XFS_POSIX_ACL=y
803# CONFIG_XFS_RT is not set 809# CONFIG_XFS_RT is not set
810# CONFIG_OCFS2_FS is not set
804# CONFIG_MINIX_FS is not set 811# CONFIG_MINIX_FS is not set
805# CONFIG_ROMFS_FS is not set 812# CONFIG_ROMFS_FS is not set
806CONFIG_INOTIFY=y 813CONFIG_INOTIFY=y
@@ -834,6 +841,7 @@ CONFIG_SYSFS=y
834# CONFIG_HUGETLB_PAGE is not set 841# CONFIG_HUGETLB_PAGE is not set
835CONFIG_RAMFS=y 842CONFIG_RAMFS=y
836CONFIG_RELAYFS_FS=m 843CONFIG_RELAYFS_FS=m
844# CONFIG_CONFIGFS_FS is not set
837 845
838# 846#
839# Miscellaneous filesystems 847# Miscellaneous filesystems
@@ -894,6 +902,7 @@ CONFIG_MSDOS_PARTITION=y
894CONFIG_SGI_PARTITION=y 902CONFIG_SGI_PARTITION=y
895# CONFIG_ULTRIX_PARTITION is not set 903# CONFIG_ULTRIX_PARTITION is not set
896# CONFIG_SUN_PARTITION is not set 904# CONFIG_SUN_PARTITION is not set
905# CONFIG_KARMA_PARTITION is not set
897# CONFIG_EFI_PARTITION is not set 906# CONFIG_EFI_PARTITION is not set
898 907
899# 908#
@@ -910,6 +919,7 @@ CONFIG_SGI_PARTITION=y
910# Kernel hacking 919# Kernel hacking
911# 920#
912# CONFIG_PRINTK_TIME is not set 921# CONFIG_PRINTK_TIME is not set
922# CONFIG_MAGIC_SYSRQ is not set
913# CONFIG_DEBUG_KERNEL is not set 923# CONFIG_DEBUG_KERNEL is not set
914CONFIG_LOG_BUF_SHIFT=15 924CONFIG_LOG_BUF_SHIFT=15
915CONFIG_CROSSCOMPILE=y 925CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index a34db6e82b27..7fdcaf51face 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:24 2005 4# Fri Jan 27 15:40:09 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -158,26 +158,28 @@ CONFIG_BSD_PROCESS_ACCT=y
158# CONFIG_BSD_PROCESS_ACCT_V3 is not set 158# CONFIG_BSD_PROCESS_ACCT_V3 is not set
159CONFIG_SYSCTL=y 159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161CONFIG_HOTPLUG=y
162CONFIG_KOBJECT_UEVENT=y
163# CONFIG_IKCONFIG is not set 161# CONFIG_IKCONFIG is not set
164CONFIG_INITRAMFS_SOURCE="" 162CONFIG_INITRAMFS_SOURCE=""
163# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
165CONFIG_EMBEDDED=y 164CONFIG_EMBEDDED=y
166CONFIG_KALLSYMS=y 165CONFIG_KALLSYMS=y
167# CONFIG_KALLSYMS_EXTRA_PASS is not set 166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_HOTPLUG=y
168CONFIG_PRINTK=y 168CONFIG_PRINTK=y
169CONFIG_BUG=y 169CONFIG_BUG=y
170CONFIG_ELF_CORE=y
170CONFIG_BASE_FULL=y 171CONFIG_BASE_FULL=y
171CONFIG_FUTEX=y 172CONFIG_FUTEX=y
172CONFIG_EPOLL=y 173CONFIG_EPOLL=y
173# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
174CONFIG_SHMEM=y 174CONFIG_SHMEM=y
175CONFIG_CC_ALIGN_FUNCTIONS=0 175CONFIG_CC_ALIGN_FUNCTIONS=0
176CONFIG_CC_ALIGN_LABELS=0 176CONFIG_CC_ALIGN_LABELS=0
177CONFIG_CC_ALIGN_LOOPS=0 177CONFIG_CC_ALIGN_LOOPS=0
178CONFIG_CC_ALIGN_JUMPS=0 178CONFIG_CC_ALIGN_JUMPS=0
179CONFIG_SLAB=y
179# CONFIG_TINY_SHMEM is not set 180# CONFIG_TINY_SHMEM is not set
180CONFIG_BASE_SMALL=0 181CONFIG_BASE_SMALL=0
182# CONFIG_SLOB is not set
181 183
182# 184#
183# Loadable module support 185# Loadable module support
@@ -224,7 +226,6 @@ CONFIG_MMU=y
224# 226#
225CONFIG_BINFMT_ELF=y 227CONFIG_BINFMT_ELF=y
226CONFIG_BINFMT_MISC=y 228CONFIG_BINFMT_MISC=y
227# CONFIG_BUILD_ELF64 is not set
228CONFIG_MIPS32_COMPAT=y 229CONFIG_MIPS32_COMPAT=y
229CONFIG_COMPAT=y 230CONFIG_COMPAT=y
230CONFIG_MIPS32_O32=y 231CONFIG_MIPS32_O32=y
@@ -286,6 +287,11 @@ CONFIG_TCP_CONG_BIC=y
286# CONFIG_ATALK is not set 287# CONFIG_ATALK is not set
287# CONFIG_X25 is not set 288# CONFIG_X25 is not set
288# CONFIG_LAPB is not set 289# CONFIG_LAPB is not set
290
291#
292# TIPC Configuration (EXPERIMENTAL)
293#
294# CONFIG_TIPC is not set
289# CONFIG_NET_DIVERT is not set 295# CONFIG_NET_DIVERT is not set
290# CONFIG_ECONET is not set 296# CONFIG_ECONET is not set
291# CONFIG_WAN_ROUTER is not set 297# CONFIG_WAN_ROUTER is not set
@@ -306,7 +312,6 @@ CONFIG_IEEE80211=y
306# CONFIG_IEEE80211_DEBUG is not set 312# CONFIG_IEEE80211_DEBUG is not set
307CONFIG_IEEE80211_CRYPT_WEP=y 313CONFIG_IEEE80211_CRYPT_WEP=y
308CONFIG_IEEE80211_CRYPT_CCMP=y 314CONFIG_IEEE80211_CRYPT_CCMP=y
309CONFIG_IEEE80211_CRYPT_TKIP=y
310 315
311# 316#
312# Device Drivers 317# Device Drivers
@@ -392,7 +397,7 @@ CONFIG_SCSI_LOGGING=y
392# SCSI Transport Attributes 397# SCSI Transport Attributes
393# 398#
394CONFIG_SCSI_SPI_ATTRS=y 399CONFIG_SCSI_SPI_ATTRS=y
395# CONFIG_SCSI_FC_ATTRS is not set 400CONFIG_SCSI_FC_ATTRS=y
396# CONFIG_SCSI_ISCSI_ATTRS is not set 401# CONFIG_SCSI_ISCSI_ATTRS is not set
397CONFIG_SCSI_SAS_ATTRS=y 402CONFIG_SCSI_SAS_ATTRS=y
398 403
@@ -425,13 +430,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
425# CONFIG_SCSI_IPR is not set 430# CONFIG_SCSI_IPR is not set
426# CONFIG_SCSI_QLOGIC_FC is not set 431# CONFIG_SCSI_QLOGIC_FC is not set
427# CONFIG_SCSI_QLOGIC_1280 is not set 432# CONFIG_SCSI_QLOGIC_1280 is not set
428CONFIG_SCSI_QLA2XXX=y 433# CONFIG_SCSI_QLA_FC is not set
429# CONFIG_SCSI_QLA21XX is not set
430# CONFIG_SCSI_QLA22XX is not set
431# CONFIG_SCSI_QLA2300 is not set
432# CONFIG_SCSI_QLA2322 is not set
433# CONFIG_SCSI_QLA6312 is not set
434# CONFIG_SCSI_QLA24XX is not set
435# CONFIG_SCSI_LPFC is not set 434# CONFIG_SCSI_LPFC is not set
436# CONFIG_SCSI_DC395x is not set 435# CONFIG_SCSI_DC395x is not set
437# CONFIG_SCSI_DC390T is not set 436# CONFIG_SCSI_DC390T is not set
@@ -498,6 +497,7 @@ CONFIG_SGI_O2MACE_ETH=y
498# CONFIG_SUNGEM is not set 497# CONFIG_SUNGEM is not set
499# CONFIG_CASSINI is not set 498# CONFIG_CASSINI is not set
500# CONFIG_NET_VENDOR_3COM is not set 499# CONFIG_NET_VENDOR_3COM is not set
500# CONFIG_DM9000 is not set
501 501
502# 502#
503# Tulip family network device support 503# Tulip family network device support
@@ -518,6 +518,7 @@ CONFIG_SGI_O2MACE_ETH=y
518# CONFIG_R8169 is not set 518# CONFIG_R8169 is not set
519# CONFIG_SIS190 is not set 519# CONFIG_SIS190 is not set
520# CONFIG_SKGE is not set 520# CONFIG_SKGE is not set
521# CONFIG_SKY2 is not set
521# CONFIG_SK98LIN is not set 522# CONFIG_SK98LIN is not set
522# CONFIG_TIGON3 is not set 523# CONFIG_TIGON3 is not set
523# CONFIG_BNX2 is not set 524# CONFIG_BNX2 is not set
@@ -538,8 +539,6 @@ CONFIG_SGI_O2MACE_ETH=y
538# Wireless LAN (non-hamradio) 539# Wireless LAN (non-hamradio)
539# 540#
540# CONFIG_NET_RADIO is not set 541# CONFIG_NET_RADIO is not set
541# CONFIG_IPW_DEBUG is not set
542CONFIG_IPW2200=y
543 542
544# 543#
545# Wan interfaces 544# Wan interfaces
@@ -617,6 +616,7 @@ CONFIG_HW_CONSOLE=y
617CONFIG_SERIAL_8250=y 616CONFIG_SERIAL_8250=y
618CONFIG_SERIAL_8250_CONSOLE=y 617CONFIG_SERIAL_8250_CONSOLE=y
619CONFIG_SERIAL_8250_NR_UARTS=4 618CONFIG_SERIAL_8250_NR_UARTS=4
619CONFIG_SERIAL_8250_RUNTIME_UARTS=4
620# CONFIG_SERIAL_8250_EXTENDED is not set 620# CONFIG_SERIAL_8250_EXTENDED is not set
621 621
622# 622#
@@ -624,7 +624,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
624# 624#
625CONFIG_SERIAL_CORE=y 625CONFIG_SERIAL_CORE=y
626CONFIG_SERIAL_CORE_CONSOLE=y 626CONFIG_SERIAL_CORE_CONSOLE=y
627# CONFIG_SERIAL_JSM is not set
628CONFIG_UNIX98_PTYS=y 627CONFIG_UNIX98_PTYS=y
629CONFIG_LEGACY_PTYS=y 628CONFIG_LEGACY_PTYS=y
630CONFIG_LEGACY_PTY_COUNT=256 629CONFIG_LEGACY_PTY_COUNT=256
@@ -662,6 +661,12 @@ CONFIG_LEGACY_PTY_COUNT=256
662# CONFIG_I2C is not set 661# CONFIG_I2C is not set
663 662
664# 663#
664# SPI support
665#
666# CONFIG_SPI is not set
667# CONFIG_SPI_MASTER is not set
668
669#
665# Dallas's 1-wire bus 670# Dallas's 1-wire bus
666# 671#
667# CONFIG_W1 is not set 672# CONFIG_W1 is not set
@@ -743,11 +748,11 @@ CONFIG_EXT2_FS=y
743# CONFIG_EXT2_FS_XATTR is not set 748# CONFIG_EXT2_FS_XATTR is not set
744# CONFIG_EXT2_FS_XIP is not set 749# CONFIG_EXT2_FS_XIP is not set
745# CONFIG_EXT3_FS is not set 750# CONFIG_EXT3_FS is not set
746# CONFIG_JBD is not set
747# CONFIG_REISERFS_FS is not set 751# CONFIG_REISERFS_FS is not set
748# CONFIG_JFS_FS is not set 752# CONFIG_JFS_FS is not set
749# CONFIG_FS_POSIX_ACL is not set 753# CONFIG_FS_POSIX_ACL is not set
750# CONFIG_XFS_FS is not set 754# CONFIG_XFS_FS is not set
755# CONFIG_OCFS2_FS is not set
751# CONFIG_MINIX_FS is not set 756# CONFIG_MINIX_FS is not set
752# CONFIG_ROMFS_FS is not set 757# CONFIG_ROMFS_FS is not set
753CONFIG_INOTIFY=y 758CONFIG_INOTIFY=y
@@ -780,6 +785,7 @@ CONFIG_TMPFS=y
780# CONFIG_HUGETLB_PAGE is not set 785# CONFIG_HUGETLB_PAGE is not set
781CONFIG_RAMFS=y 786CONFIG_RAMFS=y
782CONFIG_RELAYFS_FS=y 787CONFIG_RELAYFS_FS=y
788# CONFIG_CONFIGFS_FS is not set
783 789
784# 790#
785# Miscellaneous filesystems 791# Miscellaneous filesystems
@@ -835,6 +841,7 @@ CONFIG_PARTITION_ADVANCED=y
835CONFIG_SGI_PARTITION=y 841CONFIG_SGI_PARTITION=y
836# CONFIG_ULTRIX_PARTITION is not set 842# CONFIG_ULTRIX_PARTITION is not set
837# CONFIG_SUN_PARTITION is not set 843# CONFIG_SUN_PARTITION is not set
844# CONFIG_KARMA_PARTITION is not set
838# CONFIG_EFI_PARTITION is not set 845# CONFIG_EFI_PARTITION is not set
839 846
840# 847#
@@ -851,6 +858,7 @@ CONFIG_SGI_PARTITION=y
851# Kernel hacking 858# Kernel hacking
852# 859#
853# CONFIG_PRINTK_TIME is not set 860# CONFIG_PRINTK_TIME is not set
861# CONFIG_MAGIC_SYSRQ is not set
854# CONFIG_DEBUG_KERNEL is not set 862# CONFIG_DEBUG_KERNEL is not set
855CONFIG_LOG_BUF_SHIFT=14 863CONFIG_LOG_BUF_SHIFT=14
856CONFIG_CROSSCOMPILE=y 864CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig
index b5fa9639db6f..c716996d9eca 100644
--- a/arch/mips/configs/it8172_defconfig
+++ b/arch/mips/configs/it8172_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:26 2005 4# Fri Jan 27 15:40:10 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -153,26 +153,29 @@ CONFIG_BSD_PROCESS_ACCT=y
153# CONFIG_BSD_PROCESS_ACCT_V3 is not set 153# CONFIG_BSD_PROCESS_ACCT_V3 is not set
154CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
156# CONFIG_HOTPLUG is not set
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 160CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162# CONFIG_HOTPLUG is not set
163CONFIG_PRINTK=y 163CONFIG_PRINTK=y
164CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 167CONFIG_FUTEX=y
167CONFIG_EPOLL=y 168CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
178CONFIG_OBSOLETE_INTERMODULE=y
176 179
177# 180#
178# Loadable module support 181# Loadable module support
@@ -281,6 +284,11 @@ CONFIG_TCP_CONG_BIC=y
281# CONFIG_ATALK is not set 284# CONFIG_ATALK is not set
282# CONFIG_X25 is not set 285# CONFIG_X25 is not set
283# CONFIG_LAPB is not set 286# CONFIG_LAPB is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
284# CONFIG_NET_DIVERT is not set 292# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set 293# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 294# CONFIG_WAN_ROUTER is not set
@@ -301,7 +309,6 @@ CONFIG_IEEE80211=m
301# CONFIG_IEEE80211_DEBUG is not set 309# CONFIG_IEEE80211_DEBUG is not set
302CONFIG_IEEE80211_CRYPT_WEP=m 310CONFIG_IEEE80211_CRYPT_WEP=m
303CONFIG_IEEE80211_CRYPT_CCMP=m 311CONFIG_IEEE80211_CRYPT_CCMP=m
304CONFIG_IEEE80211_CRYPT_TKIP=m
305 312
306# 313#
307# Device Drivers 314# Device Drivers
@@ -362,6 +369,7 @@ CONFIG_MTD_CFI_UTIL=y
362# CONFIG_MTD_RAM is not set 369# CONFIG_MTD_RAM is not set
363# CONFIG_MTD_ROM is not set 370# CONFIG_MTD_ROM is not set
364# CONFIG_MTD_ABSENT is not set 371# CONFIG_MTD_ABSENT is not set
372# CONFIG_MTD_OBSOLETE_CHIPS is not set
365 373
366# 374#
367# Mapping drivers for chip access 375# Mapping drivers for chip access
@@ -500,6 +508,7 @@ CONFIG_CICADA_PHY=m
500# 508#
501CONFIG_NET_ETHERNET=y 509CONFIG_NET_ETHERNET=y
502# CONFIG_MII is not set 510# CONFIG_MII is not set
511# CONFIG_DM9000 is not set
503 512
504# 513#
505# Ethernet (1000 Mbit) 514# Ethernet (1000 Mbit)
@@ -593,6 +602,7 @@ CONFIG_HW_CONSOLE=y
593CONFIG_SERIAL_8250=y 602CONFIG_SERIAL_8250=y
594CONFIG_SERIAL_8250_CONSOLE=y 603CONFIG_SERIAL_8250_CONSOLE=y
595CONFIG_SERIAL_8250_NR_UARTS=4 604CONFIG_SERIAL_8250_NR_UARTS=4
605CONFIG_SERIAL_8250_RUNTIME_UARTS=4
596# CONFIG_SERIAL_8250_EXTENDED is not set 606# CONFIG_SERIAL_8250_EXTENDED is not set
597 607
598# 608#
@@ -635,6 +645,12 @@ CONFIG_LEGACY_PTY_COUNT=256
635# CONFIG_I2C is not set 645# CONFIG_I2C is not set
636 646
637# 647#
648# SPI support
649#
650# CONFIG_SPI is not set
651# CONFIG_SPI_MASTER is not set
652
653#
638# Dallas's 1-wire bus 654# Dallas's 1-wire bus
639# 655#
640# CONFIG_W1 is not set 656# CONFIG_W1 is not set
@@ -728,11 +744,11 @@ CONFIG_EXT2_FS=y
728# CONFIG_EXT2_FS_XATTR is not set 744# CONFIG_EXT2_FS_XATTR is not set
729# CONFIG_EXT2_FS_XIP is not set 745# CONFIG_EXT2_FS_XIP is not set
730# CONFIG_EXT3_FS is not set 746# CONFIG_EXT3_FS is not set
731# CONFIG_JBD is not set
732# CONFIG_REISERFS_FS is not set 747# CONFIG_REISERFS_FS is not set
733# CONFIG_JFS_FS is not set 748# CONFIG_JFS_FS is not set
734# CONFIG_FS_POSIX_ACL is not set 749# CONFIG_FS_POSIX_ACL is not set
735# CONFIG_XFS_FS is not set 750# CONFIG_XFS_FS is not set
751# CONFIG_OCFS2_FS is not set
736# CONFIG_MINIX_FS is not set 752# CONFIG_MINIX_FS is not set
737# CONFIG_ROMFS_FS is not set 753# CONFIG_ROMFS_FS is not set
738CONFIG_INOTIFY=y 754CONFIG_INOTIFY=y
@@ -765,6 +781,7 @@ CONFIG_SYSFS=y
765# CONFIG_HUGETLB_PAGE is not set 781# CONFIG_HUGETLB_PAGE is not set
766CONFIG_RAMFS=y 782CONFIG_RAMFS=y
767CONFIG_RELAYFS_FS=m 783CONFIG_RELAYFS_FS=m
784# CONFIG_CONFIGFS_FS is not set
768 785
769# 786#
770# Miscellaneous filesystems 787# Miscellaneous filesystems
@@ -826,6 +843,7 @@ CONFIG_MSDOS_PARTITION=y
826# Kernel hacking 843# Kernel hacking
827# 844#
828# CONFIG_PRINTK_TIME is not set 845# CONFIG_PRINTK_TIME is not set
846# CONFIG_MAGIC_SYSRQ is not set
829# CONFIG_DEBUG_KERNEL is not set 847# CONFIG_DEBUG_KERNEL is not set
830CONFIG_LOG_BUF_SHIFT=14 848CONFIG_LOG_BUF_SHIFT=14
831CONFIG_CROSSCOMPILE=y 849CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig
index 71386938d47f..a8376d125e11 100644
--- a/arch/mips/configs/ivr_defconfig
+++ b/arch/mips/configs/ivr_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:27 2005 4# Fri Jan 27 15:40:11 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -150,26 +150,28 @@ CONFIG_BSD_PROCESS_ACCT=y
150# CONFIG_BSD_PROCESS_ACCT_V3 is not set 150# CONFIG_BSD_PROCESS_ACCT_V3 is not set
151CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
152# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
153CONFIG_HOTPLUG=y
154CONFIG_KOBJECT_UEVENT=y
155# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
156CONFIG_INITRAMFS_SOURCE="" 154CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
157CONFIG_EMBEDDED=y 156CONFIG_EMBEDDED=y
158CONFIG_KALLSYMS=y 157CONFIG_KALLSYMS=y
159# CONFIG_KALLSYMS_EXTRA_PASS is not set 158# CONFIG_KALLSYMS_EXTRA_PASS is not set
159CONFIG_HOTPLUG=y
160CONFIG_PRINTK=y 160CONFIG_PRINTK=y
161CONFIG_BUG=y 161CONFIG_BUG=y
162CONFIG_ELF_CORE=y
162CONFIG_BASE_FULL=y 163CONFIG_BASE_FULL=y
163CONFIG_FUTEX=y 164CONFIG_FUTEX=y
164CONFIG_EPOLL=y 165CONFIG_EPOLL=y
165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_SHMEM=y 166CONFIG_SHMEM=y
167CONFIG_CC_ALIGN_FUNCTIONS=0 167CONFIG_CC_ALIGN_FUNCTIONS=0
168CONFIG_CC_ALIGN_LABELS=0 168CONFIG_CC_ALIGN_LABELS=0
169CONFIG_CC_ALIGN_LOOPS=0 169CONFIG_CC_ALIGN_LOOPS=0
170CONFIG_CC_ALIGN_JUMPS=0 170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y
171# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
172CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
174# CONFIG_SLOB is not set
173 175
174# 176#
175# Loadable module support 177# Loadable module support
@@ -280,6 +282,11 @@ CONFIG_TCP_CONG_BIC=y
280# CONFIG_ATALK is not set 282# CONFIG_ATALK is not set
281# CONFIG_X25 is not set 283# CONFIG_X25 is not set
282# CONFIG_LAPB is not set 284# CONFIG_LAPB is not set
285
286#
287# TIPC Configuration (EXPERIMENTAL)
288#
289# CONFIG_TIPC is not set
283# CONFIG_NET_DIVERT is not set 290# CONFIG_NET_DIVERT is not set
284# CONFIG_ECONET is not set 291# CONFIG_ECONET is not set
285# CONFIG_WAN_ROUTER is not set 292# CONFIG_WAN_ROUTER is not set
@@ -300,7 +307,6 @@ CONFIG_IEEE80211=m
300# CONFIG_IEEE80211_DEBUG is not set 307# CONFIG_IEEE80211_DEBUG is not set
301CONFIG_IEEE80211_CRYPT_WEP=m 308CONFIG_IEEE80211_CRYPT_WEP=m
302CONFIG_IEEE80211_CRYPT_CCMP=m 309CONFIG_IEEE80211_CRYPT_CCMP=m
303CONFIG_IEEE80211_CRYPT_TKIP=m
304 310
305# 311#
306# Device Drivers 312# Device Drivers
@@ -440,6 +446,7 @@ CONFIG_NET_ETHERNET=y
440# CONFIG_SUNGEM is not set 446# CONFIG_SUNGEM is not set
441# CONFIG_CASSINI is not set 447# CONFIG_CASSINI is not set
442# CONFIG_NET_VENDOR_3COM is not set 448# CONFIG_NET_VENDOR_3COM is not set
449# CONFIG_DM9000 is not set
443 450
444# 451#
445# Tulip family network device support 452# Tulip family network device support
@@ -460,6 +467,7 @@ CONFIG_NET_ETHERNET=y
460# CONFIG_R8169 is not set 467# CONFIG_R8169 is not set
461# CONFIG_SIS190 is not set 468# CONFIG_SIS190 is not set
462# CONFIG_SKGE is not set 469# CONFIG_SKGE is not set
470# CONFIG_SKY2 is not set
463# CONFIG_SK98LIN is not set 471# CONFIG_SK98LIN is not set
464# CONFIG_TIGON3 is not set 472# CONFIG_TIGON3 is not set
465# CONFIG_BNX2 is not set 473# CONFIG_BNX2 is not set
@@ -480,8 +488,6 @@ CONFIG_NET_ETHERNET=y
480# Wireless LAN (non-hamradio) 488# Wireless LAN (non-hamradio)
481# 489#
482# CONFIG_NET_RADIO is not set 490# CONFIG_NET_RADIO is not set
483# CONFIG_IPW_DEBUG is not set
484CONFIG_IPW2200=m
485 491
486# 492#
487# Wan interfaces 493# Wan interfaces
@@ -560,6 +566,7 @@ CONFIG_IT8172_SCR1=y
560CONFIG_SERIAL_8250=y 566CONFIG_SERIAL_8250=y
561CONFIG_SERIAL_8250_CONSOLE=y 567CONFIG_SERIAL_8250_CONSOLE=y
562CONFIG_SERIAL_8250_NR_UARTS=4 568CONFIG_SERIAL_8250_NR_UARTS=4
569CONFIG_SERIAL_8250_RUNTIME_UARTS=4
563# CONFIG_SERIAL_8250_EXTENDED is not set 570# CONFIG_SERIAL_8250_EXTENDED is not set
564 571
565# 572#
@@ -567,7 +574,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
567# 574#
568CONFIG_SERIAL_CORE=y 575CONFIG_SERIAL_CORE=y
569CONFIG_SERIAL_CORE_CONSOLE=y 576CONFIG_SERIAL_CORE_CONSOLE=y
570# CONFIG_SERIAL_JSM is not set
571CONFIG_UNIX98_PTYS=y 577CONFIG_UNIX98_PTYS=y
572CONFIG_LEGACY_PTYS=y 578CONFIG_LEGACY_PTYS=y
573CONFIG_LEGACY_PTY_COUNT=256 579CONFIG_LEGACY_PTY_COUNT=256
@@ -604,6 +610,12 @@ CONFIG_RTC=y
604# CONFIG_I2C is not set 610# CONFIG_I2C is not set
605 611
606# 612#
613# SPI support
614#
615# CONFIG_SPI is not set
616# CONFIG_SPI_MASTER is not set
617
618#
607# Dallas's 1-wire bus 619# Dallas's 1-wire bus
608# 620#
609# CONFIG_W1 is not set 621# CONFIG_W1 is not set
@@ -685,11 +697,11 @@ CONFIG_EXT2_FS=y
685# CONFIG_EXT2_FS_XATTR is not set 697# CONFIG_EXT2_FS_XATTR is not set
686# CONFIG_EXT2_FS_XIP is not set 698# CONFIG_EXT2_FS_XIP is not set
687# CONFIG_EXT3_FS is not set 699# CONFIG_EXT3_FS is not set
688# CONFIG_JBD is not set
689# CONFIG_REISERFS_FS is not set 700# CONFIG_REISERFS_FS is not set
690# CONFIG_JFS_FS is not set 701# CONFIG_JFS_FS is not set
691# CONFIG_FS_POSIX_ACL is not set 702# CONFIG_FS_POSIX_ACL is not set
692# CONFIG_XFS_FS is not set 703# CONFIG_XFS_FS is not set
704# CONFIG_OCFS2_FS is not set
693# CONFIG_MINIX_FS is not set 705# CONFIG_MINIX_FS is not set
694# CONFIG_ROMFS_FS is not set 706# CONFIG_ROMFS_FS is not set
695CONFIG_INOTIFY=y 707CONFIG_INOTIFY=y
@@ -722,6 +734,7 @@ CONFIG_SYSFS=y
722# CONFIG_HUGETLB_PAGE is not set 734# CONFIG_HUGETLB_PAGE is not set
723CONFIG_RAMFS=y 735CONFIG_RAMFS=y
724CONFIG_RELAYFS_FS=m 736CONFIG_RELAYFS_FS=m
737# CONFIG_CONFIGFS_FS is not set
725 738
726# 739#
727# Miscellaneous filesystems 740# Miscellaneous filesystems
@@ -781,6 +794,7 @@ CONFIG_MSDOS_PARTITION=y
781# Kernel hacking 794# Kernel hacking
782# 795#
783# CONFIG_PRINTK_TIME is not set 796# CONFIG_PRINTK_TIME is not set
797# CONFIG_MAGIC_SYSRQ is not set
784# CONFIG_DEBUG_KERNEL is not set 798# CONFIG_DEBUG_KERNEL is not set
785CONFIG_LOG_BUF_SHIFT=14 799CONFIG_LOG_BUF_SHIFT=14
786CONFIG_CROSSCOMPILE=y 800CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 14fb46886708..316015379dbc 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:29 2005 4# Fri Jan 27 15:40:12 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -158,27 +158,28 @@ CONFIG_SYSVIPC=y
158# CONFIG_BSD_PROCESS_ACCT is not set 158# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y 159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161CONFIG_HOTPLUG=y
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y 161CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y 162CONFIG_IKCONFIG_PROC=y
165CONFIG_INITRAMFS_SOURCE="" 163CONFIG_INITRAMFS_SOURCE=""
166CONFIG_EMBEDDED=y 164CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y 165CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set 166# CONFIG_KALLSYMS_EXTRA_PASS is not set
167CONFIG_HOTPLUG=y
169CONFIG_PRINTK=y 168CONFIG_PRINTK=y
170CONFIG_BUG=y 169CONFIG_BUG=y
170CONFIG_ELF_CORE=y
171CONFIG_BASE_FULL=y 171CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y 172CONFIG_FUTEX=y
173CONFIG_EPOLL=y 173CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y 174CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0 175CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0 176CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0 177CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0 178CONFIG_CC_ALIGN_JUMPS=0
179CONFIG_SLAB=y
180# CONFIG_TINY_SHMEM is not set 180# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0 181CONFIG_BASE_SMALL=0
182# CONFIG_SLOB is not set
182 183
183# 184#
184# Loadable module support 185# Loadable module support
@@ -186,6 +187,7 @@ CONFIG_BASE_SMALL=0
186CONFIG_MODULES=y 187CONFIG_MODULES=y
187CONFIG_MODULE_UNLOAD=y 188CONFIG_MODULE_UNLOAD=y
188CONFIG_OBSOLETE_MODPARM=y 189CONFIG_OBSOLETE_MODPARM=y
190# CONFIG_MODVERSIONS is not set
189CONFIG_MODULE_SRCVERSION_ALL=y 191CONFIG_MODULE_SRCVERSION_ALL=y
190CONFIG_KMOD=y 192CONFIG_KMOD=y
191 193
@@ -294,7 +296,6 @@ CONFIG_IEEE80211=m
294# CONFIG_IEEE80211_DEBUG is not set 296# CONFIG_IEEE80211_DEBUG is not set
295CONFIG_IEEE80211_CRYPT_WEP=m 297CONFIG_IEEE80211_CRYPT_WEP=m
296CONFIG_IEEE80211_CRYPT_CCMP=m 298CONFIG_IEEE80211_CRYPT_CCMP=m
297CONFIG_IEEE80211_CRYPT_TKIP=m
298 299
299# 300#
300# Device Drivers 301# Device Drivers
@@ -411,6 +412,7 @@ CONFIG_MII=y
411# CONFIG_SUNGEM is not set 412# CONFIG_SUNGEM is not set
412# CONFIG_CASSINI is not set 413# CONFIG_CASSINI is not set
413# CONFIG_NET_VENDOR_3COM is not set 414# CONFIG_NET_VENDOR_3COM is not set
415# CONFIG_DM9000 is not set
414 416
415# 417#
416# Tulip family network device support 418# Tulip family network device support
@@ -469,8 +471,6 @@ CONFIG_MV643XX_ETH_2=y
469# Wireless LAN (non-hamradio) 471# Wireless LAN (non-hamradio)
470# 472#
471# CONFIG_NET_RADIO is not set 473# CONFIG_NET_RADIO is not set
472# CONFIG_IPW_DEBUG is not set
473CONFIG_IPW2200=m
474 474
475# 475#
476# Wan interfaces 476# Wan interfaces
@@ -515,6 +515,7 @@ CONFIG_IPW2200=m
515CONFIG_SERIAL_8250=y 515CONFIG_SERIAL_8250=y
516CONFIG_SERIAL_8250_CONSOLE=y 516CONFIG_SERIAL_8250_CONSOLE=y
517CONFIG_SERIAL_8250_NR_UARTS=4 517CONFIG_SERIAL_8250_NR_UARTS=4
518CONFIG_SERIAL_8250_RUNTIME_UARTS=4
518# CONFIG_SERIAL_8250_EXTENDED is not set 519# CONFIG_SERIAL_8250_EXTENDED is not set
519 520
520# 521#
@@ -522,7 +523,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
522# 523#
523CONFIG_SERIAL_CORE=y 524CONFIG_SERIAL_CORE=y
524CONFIG_SERIAL_CORE_CONSOLE=y 525CONFIG_SERIAL_CORE_CONSOLE=y
525# CONFIG_SERIAL_JSM is not set
526CONFIG_UNIX98_PTYS=y 526CONFIG_UNIX98_PTYS=y
527CONFIG_LEGACY_PTYS=y 527CONFIG_LEGACY_PTYS=y
528CONFIG_LEGACY_PTY_COUNT=256 528CONFIG_LEGACY_PTY_COUNT=256
@@ -558,6 +558,12 @@ CONFIG_LEGACY_PTY_COUNT=256
558# CONFIG_I2C is not set 558# CONFIG_I2C is not set
559 559
560# 560#
561# SPI support
562#
563# CONFIG_SPI is not set
564# CONFIG_SPI_MASTER is not set
565
566#
561# Dallas's 1-wire bus 567# Dallas's 1-wire bus
562# 568#
563# CONFIG_W1 is not set 569# CONFIG_W1 is not set
@@ -631,7 +637,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
631# 637#
632# CONFIG_EXT2_FS is not set 638# CONFIG_EXT2_FS is not set
633# CONFIG_EXT3_FS is not set 639# CONFIG_EXT3_FS is not set
634# CONFIG_JBD is not set
635# CONFIG_REISERFS_FS is not set 640# CONFIG_REISERFS_FS is not set
636# CONFIG_JFS_FS is not set 641# CONFIG_JFS_FS is not set
637# CONFIG_FS_POSIX_ACL is not set 642# CONFIG_FS_POSIX_ACL is not set
@@ -710,6 +715,7 @@ CONFIG_MSDOS_PARTITION=y
710# Kernel hacking 715# Kernel hacking
711# 716#
712# CONFIG_PRINTK_TIME is not set 717# CONFIG_PRINTK_TIME is not set
718# CONFIG_MAGIC_SYSRQ is not set
713# CONFIG_DEBUG_KERNEL is not set 719# CONFIG_DEBUG_KERNEL is not set
714CONFIG_LOG_BUF_SHIFT=14 720CONFIG_LOG_BUF_SHIFT=14
715CONFIG_CROSSCOMPILE=y 721CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index a8ded3d74152..53fbef1ac25d 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:31 2005 4# Fri Jan 27 15:40:13 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -148,26 +148,28 @@ CONFIG_SYSVIPC=y
148# CONFIG_BSD_PROCESS_ACCT is not set 148# CONFIG_BSD_PROCESS_ACCT is not set
149CONFIG_SYSCTL=y 149CONFIG_SYSCTL=y
150# CONFIG_AUDIT is not set 150# CONFIG_AUDIT is not set
151CONFIG_HOTPLUG=y
152CONFIG_KOBJECT_UEVENT=y
153# CONFIG_IKCONFIG is not set 151# CONFIG_IKCONFIG is not set
154CONFIG_INITRAMFS_SOURCE="" 152CONFIG_INITRAMFS_SOURCE=""
153# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
155CONFIG_EMBEDDED=y 154CONFIG_EMBEDDED=y
156CONFIG_KALLSYMS=y 155CONFIG_KALLSYMS=y
157# CONFIG_KALLSYMS_EXTRA_PASS is not set 156# CONFIG_KALLSYMS_EXTRA_PASS is not set
157CONFIG_HOTPLUG=y
158CONFIG_PRINTK=y 158CONFIG_PRINTK=y
159CONFIG_BUG=y 159CONFIG_BUG=y
160CONFIG_ELF_CORE=y
160CONFIG_BASE_FULL=y 161CONFIG_BASE_FULL=y
161CONFIG_FUTEX=y 162CONFIG_FUTEX=y
162CONFIG_EPOLL=y 163CONFIG_EPOLL=y
163# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
164CONFIG_SHMEM=y 164CONFIG_SHMEM=y
165CONFIG_CC_ALIGN_FUNCTIONS=0 165CONFIG_CC_ALIGN_FUNCTIONS=0
166CONFIG_CC_ALIGN_LABELS=0 166CONFIG_CC_ALIGN_LABELS=0
167CONFIG_CC_ALIGN_LOOPS=0 167CONFIG_CC_ALIGN_LOOPS=0
168CONFIG_CC_ALIGN_JUMPS=0 168CONFIG_CC_ALIGN_JUMPS=0
169CONFIG_SLAB=y
169# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
170CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
172# CONFIG_SLOB is not set
171 173
172# 174#
173# Loadable module support 175# Loadable module support
@@ -272,6 +274,11 @@ CONFIG_TCP_CONG_BIC=y
272# CONFIG_ATALK is not set 274# CONFIG_ATALK is not set
273# CONFIG_X25 is not set 275# CONFIG_X25 is not set
274# CONFIG_LAPB is not set 276# CONFIG_LAPB is not set
277
278#
279# TIPC Configuration (EXPERIMENTAL)
280#
281# CONFIG_TIPC is not set
275# CONFIG_NET_DIVERT is not set 282# CONFIG_NET_DIVERT is not set
276# CONFIG_ECONET is not set 283# CONFIG_ECONET is not set
277# CONFIG_WAN_ROUTER is not set 284# CONFIG_WAN_ROUTER is not set
@@ -292,7 +299,6 @@ CONFIG_IEEE80211=y
292# CONFIG_IEEE80211_DEBUG is not set 299# CONFIG_IEEE80211_DEBUG is not set
293CONFIG_IEEE80211_CRYPT_WEP=y 300CONFIG_IEEE80211_CRYPT_WEP=y
294CONFIG_IEEE80211_CRYPT_CCMP=y 301CONFIG_IEEE80211_CRYPT_CCMP=y
295CONFIG_IEEE80211_CRYPT_TKIP=y
296 302
297# 303#
298# Device Drivers 304# Device Drivers
@@ -411,6 +417,7 @@ CONFIG_NET_ETHERNET=y
411# CONFIG_SUNGEM is not set 417# CONFIG_SUNGEM is not set
412# CONFIG_CASSINI is not set 418# CONFIG_CASSINI is not set
413# CONFIG_NET_VENDOR_3COM is not set 419# CONFIG_NET_VENDOR_3COM is not set
420# CONFIG_DM9000 is not set
414 421
415# 422#
416# Tulip family network device support 423# Tulip family network device support
@@ -431,6 +438,7 @@ CONFIG_NET_ETHERNET=y
431# CONFIG_R8169 is not set 438# CONFIG_R8169 is not set
432# CONFIG_SIS190 is not set 439# CONFIG_SIS190 is not set
433# CONFIG_SKGE is not set 440# CONFIG_SKGE is not set
441# CONFIG_SKY2 is not set
434# CONFIG_SK98LIN is not set 442# CONFIG_SK98LIN is not set
435# CONFIG_TIGON3 is not set 443# CONFIG_TIGON3 is not set
436# CONFIG_BNX2 is not set 444# CONFIG_BNX2 is not set
@@ -451,8 +459,6 @@ CONFIG_NET_ETHERNET=y
451# Wireless LAN (non-hamradio) 459# Wireless LAN (non-hamradio)
452# 460#
453# CONFIG_NET_RADIO is not set 461# CONFIG_NET_RADIO is not set
454# CONFIG_IPW_DEBUG is not set
455CONFIG_IPW2200=y
456 462
457# 463#
458# Wan interfaces 464# Wan interfaces
@@ -529,6 +535,7 @@ CONFIG_SERIAL_NONSTANDARD=y
529# CONFIG_MOXA_SMARTIO is not set 535# CONFIG_MOXA_SMARTIO is not set
530# CONFIG_ISI is not set 536# CONFIG_ISI is not set
531# CONFIG_SYNCLINKMP is not set 537# CONFIG_SYNCLINKMP is not set
538# CONFIG_SYNCLINK_GT is not set
532# CONFIG_N_HDLC is not set 539# CONFIG_N_HDLC is not set
533# CONFIG_RISCOM8 is not set 540# CONFIG_RISCOM8 is not set
534# CONFIG_SPECIALIX is not set 541# CONFIG_SPECIALIX is not set
@@ -545,7 +552,6 @@ CONFIG_SERIAL_NONSTANDARD=y
545# Non-8250 serial port support 552# Non-8250 serial port support
546# 553#
547CONFIG_HAS_TXX9_SERIAL=y 554CONFIG_HAS_TXX9_SERIAL=y
548# CONFIG_SERIAL_JSM is not set
549# CONFIG_UNIX98_PTYS is not set 555# CONFIG_UNIX98_PTYS is not set
550CONFIG_LEGACY_PTYS=y 556CONFIG_LEGACY_PTYS=y
551CONFIG_LEGACY_PTY_COUNT=256 557CONFIG_LEGACY_PTY_COUNT=256
@@ -583,6 +589,12 @@ CONFIG_LEGACY_PTY_COUNT=256
583# CONFIG_I2C is not set 589# CONFIG_I2C is not set
584 590
585# 591#
592# SPI support
593#
594# CONFIG_SPI is not set
595# CONFIG_SPI_MASTER is not set
596
597#
586# Dallas's 1-wire bus 598# Dallas's 1-wire bus
587# 599#
588# CONFIG_W1 is not set 600# CONFIG_W1 is not set
@@ -641,7 +653,6 @@ CONFIG_FB=y
641# CONFIG_FB_3DFX is not set 653# CONFIG_FB_3DFX is not set
642# CONFIG_FB_VOODOO1 is not set 654# CONFIG_FB_VOODOO1 is not set
643# CONFIG_FB_SMIVGX is not set 655# CONFIG_FB_SMIVGX is not set
644# CONFIG_FB_CYBLA is not set
645# CONFIG_FB_TRIDENT is not set 656# CONFIG_FB_TRIDENT is not set
646# CONFIG_FB_VIRTUAL is not set 657# CONFIG_FB_VIRTUAL is not set
647 658
@@ -698,11 +709,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y
698# 709#
699# CONFIG_EXT2_FS is not set 710# CONFIG_EXT2_FS is not set
700# CONFIG_EXT3_FS is not set 711# CONFIG_EXT3_FS is not set
701# CONFIG_JBD is not set
702# CONFIG_REISERFS_FS is not set 712# CONFIG_REISERFS_FS is not set
703# CONFIG_JFS_FS is not set 713# CONFIG_JFS_FS is not set
704# CONFIG_FS_POSIX_ACL is not set 714# CONFIG_FS_POSIX_ACL is not set
705# CONFIG_XFS_FS is not set 715# CONFIG_XFS_FS is not set
716# CONFIG_OCFS2_FS is not set
706# CONFIG_MINIX_FS is not set 717# CONFIG_MINIX_FS is not set
707# CONFIG_ROMFS_FS is not set 718# CONFIG_ROMFS_FS is not set
708CONFIG_INOTIFY=y 719CONFIG_INOTIFY=y
@@ -735,6 +746,7 @@ CONFIG_SYSFS=y
735# CONFIG_HUGETLB_PAGE is not set 746# CONFIG_HUGETLB_PAGE is not set
736CONFIG_RAMFS=y 747CONFIG_RAMFS=y
737CONFIG_RELAYFS_FS=y 748CONFIG_RELAYFS_FS=y
749# CONFIG_CONFIGFS_FS is not set
738 750
739# 751#
740# Miscellaneous filesystems 752# Miscellaneous filesystems
@@ -794,6 +806,7 @@ CONFIG_MSDOS_PARTITION=y
794# Kernel hacking 806# Kernel hacking
795# 807#
796# CONFIG_PRINTK_TIME is not set 808# CONFIG_PRINTK_TIME is not set
809# CONFIG_MAGIC_SYSRQ is not set
797# CONFIG_DEBUG_KERNEL is not set 810# CONFIG_DEBUG_KERNEL is not set
798CONFIG_LOG_BUF_SHIFT=14 811CONFIG_LOG_BUF_SHIFT=14
799CONFIG_CROSSCOMPILE=y 812CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 6c5df76d48d9..ef0fa9fc79d6 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:33 2005 4# Fri Jan 27 15:40:14 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -156,26 +156,29 @@ CONFIG_SYSVIPC=y
156# CONFIG_BSD_PROCESS_ACCT is not set 156# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y 157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 158# CONFIG_AUDIT is not set
159CONFIG_HOTPLUG=y
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set 159# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE="" 160CONFIG_INITRAMFS_SOURCE=""
161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163CONFIG_EMBEDDED=y 162CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y 163CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_EXTRA_PASS is not set 164# CONFIG_KALLSYMS_EXTRA_PASS is not set
165CONFIG_HOTPLUG=y
166CONFIG_PRINTK=y 166CONFIG_PRINTK=y
167CONFIG_BUG=y 167CONFIG_BUG=y
168CONFIG_ELF_CORE=y
168CONFIG_BASE_FULL=y 169CONFIG_BASE_FULL=y
169CONFIG_FUTEX=y 170CONFIG_FUTEX=y
170CONFIG_EPOLL=y 171CONFIG_EPOLL=y
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
172CONFIG_SHMEM=y 172CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0 173CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0 174CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0 175CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0 176CONFIG_CC_ALIGN_JUMPS=0
177CONFIG_SLAB=y
177# CONFIG_TINY_SHMEM is not set 178# CONFIG_TINY_SHMEM is not set
178CONFIG_BASE_SMALL=0 179CONFIG_BASE_SMALL=0
180# CONFIG_SLOB is not set
181CONFIG_OBSOLETE_INTERMODULE=y
179 182
180# 183#
181# Loadable module support 184# Loadable module support
@@ -282,6 +285,11 @@ CONFIG_TCP_CONG_BIC=y
282# CONFIG_ATALK is not set 285# CONFIG_ATALK is not set
283# CONFIG_X25 is not set 286# CONFIG_X25 is not set
284# CONFIG_LAPB is not set 287# CONFIG_LAPB is not set
288
289#
290# TIPC Configuration (EXPERIMENTAL)
291#
292# CONFIG_TIPC is not set
285# CONFIG_NET_DIVERT is not set 293# CONFIG_NET_DIVERT is not set
286# CONFIG_ECONET is not set 294# CONFIG_ECONET is not set
287# CONFIG_WAN_ROUTER is not set 295# CONFIG_WAN_ROUTER is not set
@@ -302,7 +310,6 @@ CONFIG_IEEE80211=m
302# CONFIG_IEEE80211_DEBUG is not set 310# CONFIG_IEEE80211_DEBUG is not set
303CONFIG_IEEE80211_CRYPT_WEP=m 311CONFIG_IEEE80211_CRYPT_WEP=m
304CONFIG_IEEE80211_CRYPT_CCMP=m 312CONFIG_IEEE80211_CRYPT_CCMP=m
305CONFIG_IEEE80211_CRYPT_TKIP=m
306 313
307# 314#
308# Device Drivers 315# Device Drivers
@@ -365,6 +372,7 @@ CONFIG_MTD_CFI_UTIL=y
365# CONFIG_MTD_RAM is not set 372# CONFIG_MTD_RAM is not set
366# CONFIG_MTD_ROM is not set 373# CONFIG_MTD_ROM is not set
367# CONFIG_MTD_ABSENT is not set 374# CONFIG_MTD_ABSENT is not set
375# CONFIG_MTD_OBSOLETE_CHIPS is not set
368 376
369# 377#
370# Mapping drivers for chip access 378# Mapping drivers for chip access
@@ -548,6 +556,7 @@ CONFIG_NET_ETHERNET=y
548# CONFIG_SUNGEM is not set 556# CONFIG_SUNGEM is not set
549# CONFIG_CASSINI is not set 557# CONFIG_CASSINI is not set
550# CONFIG_NET_VENDOR_3COM is not set 558# CONFIG_NET_VENDOR_3COM is not set
559# CONFIG_DM9000 is not set
551 560
552# 561#
553# Tulip family network device support 562# Tulip family network device support
@@ -568,6 +577,7 @@ CONFIG_NET_ETHERNET=y
568# CONFIG_R8169 is not set 577# CONFIG_R8169 is not set
569# CONFIG_SIS190 is not set 578# CONFIG_SIS190 is not set
570# CONFIG_SKGE is not set 579# CONFIG_SKGE is not set
580# CONFIG_SKY2 is not set
571# CONFIG_SK98LIN is not set 581# CONFIG_SK98LIN is not set
572# CONFIG_TIGON3 is not set 582# CONFIG_TIGON3 is not set
573# CONFIG_BNX2 is not set 583# CONFIG_BNX2 is not set
@@ -588,8 +598,6 @@ CONFIG_NET_ETHERNET=y
588# Wireless LAN (non-hamradio) 598# Wireless LAN (non-hamradio)
589# 599#
590# CONFIG_NET_RADIO is not set 600# CONFIG_NET_RADIO is not set
591# CONFIG_IPW_DEBUG is not set
592CONFIG_IPW2200=m
593 601
594# 602#
595# Wan interfaces 603# Wan interfaces
@@ -665,6 +673,7 @@ CONFIG_HW_CONSOLE=y
665CONFIG_SERIAL_8250=y 673CONFIG_SERIAL_8250=y
666CONFIG_SERIAL_8250_CONSOLE=y 674CONFIG_SERIAL_8250_CONSOLE=y
667CONFIG_SERIAL_8250_NR_UARTS=4 675CONFIG_SERIAL_8250_NR_UARTS=4
676CONFIG_SERIAL_8250_RUNTIME_UARTS=4
668# CONFIG_SERIAL_8250_EXTENDED is not set 677# CONFIG_SERIAL_8250_EXTENDED is not set
669 678
670# 679#
@@ -672,7 +681,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
672# 681#
673CONFIG_SERIAL_CORE=y 682CONFIG_SERIAL_CORE=y
674CONFIG_SERIAL_CORE_CONSOLE=y 683CONFIG_SERIAL_CORE_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set
676CONFIG_UNIX98_PTYS=y 684CONFIG_UNIX98_PTYS=y
677CONFIG_LEGACY_PTYS=y 685CONFIG_LEGACY_PTYS=y
678CONFIG_LEGACY_PTY_COUNT=256 686CONFIG_LEGACY_PTY_COUNT=256
@@ -710,6 +718,12 @@ CONFIG_LEGACY_PTY_COUNT=256
710# CONFIG_I2C is not set 718# CONFIG_I2C is not set
711 719
712# 720#
721# SPI support
722#
723# CONFIG_SPI is not set
724# CONFIG_SPI_MASTER is not set
725
726#
713# Dallas's 1-wire bus 727# Dallas's 1-wire bus
714# 728#
715# CONFIG_W1 is not set 729# CONFIG_W1 is not set
@@ -801,6 +815,7 @@ CONFIG_FS_MBCACHE=y
801# CONFIG_JFS_FS is not set 815# CONFIG_JFS_FS is not set
802# CONFIG_FS_POSIX_ACL is not set 816# CONFIG_FS_POSIX_ACL is not set
803# CONFIG_XFS_FS is not set 817# CONFIG_XFS_FS is not set
818# CONFIG_OCFS2_FS is not set
804# CONFIG_MINIX_FS is not set 819# CONFIG_MINIX_FS is not set
805# CONFIG_ROMFS_FS is not set 820# CONFIG_ROMFS_FS is not set
806CONFIG_INOTIFY=y 821CONFIG_INOTIFY=y
@@ -833,6 +848,7 @@ CONFIG_SYSFS=y
833# CONFIG_HUGETLB_PAGE is not set 848# CONFIG_HUGETLB_PAGE is not set
834CONFIG_RAMFS=y 849CONFIG_RAMFS=y
835CONFIG_RELAYFS_FS=m 850CONFIG_RELAYFS_FS=m
851# CONFIG_CONFIGFS_FS is not set
836 852
837# 853#
838# Miscellaneous filesystems 854# Miscellaneous filesystems
@@ -895,6 +911,7 @@ CONFIG_MSDOS_PARTITION=y
895# Kernel hacking 911# Kernel hacking
896# 912#
897# CONFIG_PRINTK_TIME is not set 913# CONFIG_PRINTK_TIME is not set
914# CONFIG_MAGIC_SYSRQ is not set
898# CONFIG_DEBUG_KERNEL is not set 915# CONFIG_DEBUG_KERNEL is not set
899CONFIG_LOG_BUF_SHIFT=14 916CONFIG_LOG_BUF_SHIFT=14
900CONFIG_CROSSCOMPILE=y 917CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index da0677a03c1d..367d279efdd9 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc5 3# Linux kernel version: 2.6.16-rc1
4# Fri Dec 23 02:21:03 2005 4# Fri Jan 27 15:40:15 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -170,26 +170,28 @@ CONFIG_SYSVIPC=y
170# CONFIG_BSD_PROCESS_ACCT is not set 170# CONFIG_BSD_PROCESS_ACCT is not set
171CONFIG_SYSCTL=y 171CONFIG_SYSCTL=y
172# CONFIG_AUDIT is not set 172# CONFIG_AUDIT is not set
173CONFIG_HOTPLUG=y
174CONFIG_KOBJECT_UEVENT=y
175# CONFIG_IKCONFIG is not set 173# CONFIG_IKCONFIG is not set
176CONFIG_INITRAMFS_SOURCE="" 174CONFIG_INITRAMFS_SOURCE=""
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
177CONFIG_EMBEDDED=y 176CONFIG_EMBEDDED=y
178CONFIG_KALLSYMS=y 177CONFIG_KALLSYMS=y
179# CONFIG_KALLSYMS_EXTRA_PASS is not set 178# CONFIG_KALLSYMS_EXTRA_PASS is not set
179CONFIG_HOTPLUG=y
180CONFIG_PRINTK=y 180CONFIG_PRINTK=y
181CONFIG_BUG=y 181CONFIG_BUG=y
182CONFIG_ELF_CORE=y
182CONFIG_BASE_FULL=y 183CONFIG_BASE_FULL=y
183CONFIG_FUTEX=y 184CONFIG_FUTEX=y
184CONFIG_EPOLL=y 185CONFIG_EPOLL=y
185# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
186CONFIG_SHMEM=y 186CONFIG_SHMEM=y
187CONFIG_CC_ALIGN_FUNCTIONS=0 187CONFIG_CC_ALIGN_FUNCTIONS=0
188CONFIG_CC_ALIGN_LABELS=0 188CONFIG_CC_ALIGN_LABELS=0
189CONFIG_CC_ALIGN_LOOPS=0 189CONFIG_CC_ALIGN_LOOPS=0
190CONFIG_CC_ALIGN_JUMPS=0 190CONFIG_CC_ALIGN_JUMPS=0
191CONFIG_SLAB=y
191# CONFIG_TINY_SHMEM is not set 192# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 193CONFIG_BASE_SMALL=0
194# CONFIG_SLOB is not set
193 195
194# 196#
195# Loadable module support 197# Loadable module support
@@ -341,6 +343,29 @@ CONFIG_BRIDGE_NETFILTER=y
341CONFIG_NETFILTER_NETLINK=m 343CONFIG_NETFILTER_NETLINK=m
342CONFIG_NETFILTER_NETLINK_QUEUE=m 344CONFIG_NETFILTER_NETLINK_QUEUE=m
343CONFIG_NETFILTER_NETLINK_LOG=m 345CONFIG_NETFILTER_NETLINK_LOG=m
346CONFIG_NETFILTER_XTABLES=m
347CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
348CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
349CONFIG_NETFILTER_XT_TARGET_MARK=m
350CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
351CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
352CONFIG_NETFILTER_XT_MATCH_COMMENT=m
353CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
354CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
355CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
356CONFIG_NETFILTER_XT_MATCH_DCCP=m
357CONFIG_NETFILTER_XT_MATCH_HELPER=m
358CONFIG_NETFILTER_XT_MATCH_LENGTH=m
359CONFIG_NETFILTER_XT_MATCH_LIMIT=m
360CONFIG_NETFILTER_XT_MATCH_MAC=m
361CONFIG_NETFILTER_XT_MATCH_MARK=m
362# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
363CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
364CONFIG_NETFILTER_XT_MATCH_REALM=m
365CONFIG_NETFILTER_XT_MATCH_SCTP=m
366CONFIG_NETFILTER_XT_MATCH_STATE=m
367CONFIG_NETFILTER_XT_MATCH_STRING=m
368CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
344 369
345# 370#
346# IP: Netfilter Configuration 371# IP: Netfilter Configuration
@@ -359,40 +384,23 @@ CONFIG_IP_NF_AMANDA=m
359CONFIG_IP_NF_PPTP=m 384CONFIG_IP_NF_PPTP=m
360CONFIG_IP_NF_QUEUE=m 385CONFIG_IP_NF_QUEUE=m
361CONFIG_IP_NF_IPTABLES=m 386CONFIG_IP_NF_IPTABLES=m
362CONFIG_IP_NF_MATCH_LIMIT=m
363CONFIG_IP_NF_MATCH_IPRANGE=m 387CONFIG_IP_NF_MATCH_IPRANGE=m
364CONFIG_IP_NF_MATCH_MAC=m
365CONFIG_IP_NF_MATCH_PKTTYPE=m
366CONFIG_IP_NF_MATCH_MARK=m
367CONFIG_IP_NF_MATCH_MULTIPORT=m 388CONFIG_IP_NF_MATCH_MULTIPORT=m
368CONFIG_IP_NF_MATCH_TOS=m 389CONFIG_IP_NF_MATCH_TOS=m
369CONFIG_IP_NF_MATCH_RECENT=m 390CONFIG_IP_NF_MATCH_RECENT=m
370CONFIG_IP_NF_MATCH_ECN=m 391CONFIG_IP_NF_MATCH_ECN=m
371CONFIG_IP_NF_MATCH_DSCP=m 392CONFIG_IP_NF_MATCH_DSCP=m
372CONFIG_IP_NF_MATCH_AH_ESP=m 393CONFIG_IP_NF_MATCH_AH_ESP=m
373CONFIG_IP_NF_MATCH_LENGTH=m
374CONFIG_IP_NF_MATCH_TTL=m 394CONFIG_IP_NF_MATCH_TTL=m
375CONFIG_IP_NF_MATCH_TCPMSS=m
376CONFIG_IP_NF_MATCH_HELPER=m
377CONFIG_IP_NF_MATCH_STATE=m
378CONFIG_IP_NF_MATCH_CONNTRACK=m
379CONFIG_IP_NF_MATCH_OWNER=m 395CONFIG_IP_NF_MATCH_OWNER=m
380CONFIG_IP_NF_MATCH_PHYSDEV=m
381CONFIG_IP_NF_MATCH_ADDRTYPE=m 396CONFIG_IP_NF_MATCH_ADDRTYPE=m
382CONFIG_IP_NF_MATCH_REALM=m
383CONFIG_IP_NF_MATCH_SCTP=m
384CONFIG_IP_NF_MATCH_DCCP=m
385CONFIG_IP_NF_MATCH_COMMENT=m
386CONFIG_IP_NF_MATCH_CONNMARK=m
387CONFIG_IP_NF_MATCH_CONNBYTES=m
388CONFIG_IP_NF_MATCH_HASHLIMIT=m 397CONFIG_IP_NF_MATCH_HASHLIMIT=m
389CONFIG_IP_NF_MATCH_STRING=m 398CONFIG_IP_NF_MATCH_POLICY=m
390CONFIG_IP_NF_FILTER=m 399CONFIG_IP_NF_FILTER=m
391CONFIG_IP_NF_TARGET_REJECT=m 400CONFIG_IP_NF_TARGET_REJECT=m
392CONFIG_IP_NF_TARGET_LOG=m 401CONFIG_IP_NF_TARGET_LOG=m
393CONFIG_IP_NF_TARGET_ULOG=m 402CONFIG_IP_NF_TARGET_ULOG=m
394CONFIG_IP_NF_TARGET_TCPMSS=m 403CONFIG_IP_NF_TARGET_TCPMSS=m
395CONFIG_IP_NF_TARGET_NFQUEUE=m
396CONFIG_IP_NF_NAT=m 404CONFIG_IP_NF_NAT=m
397CONFIG_IP_NF_NAT_NEEDED=y 405CONFIG_IP_NF_NAT_NEEDED=y
398CONFIG_IP_NF_TARGET_MASQUERADE=m 406CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -409,13 +417,9 @@ CONFIG_IP_NF_MANGLE=m
409CONFIG_IP_NF_TARGET_TOS=m 417CONFIG_IP_NF_TARGET_TOS=m
410CONFIG_IP_NF_TARGET_ECN=m 418CONFIG_IP_NF_TARGET_ECN=m
411CONFIG_IP_NF_TARGET_DSCP=m 419CONFIG_IP_NF_TARGET_DSCP=m
412CONFIG_IP_NF_TARGET_MARK=m
413CONFIG_IP_NF_TARGET_CLASSIFY=m
414CONFIG_IP_NF_TARGET_TTL=m 420CONFIG_IP_NF_TARGET_TTL=m
415CONFIG_IP_NF_TARGET_CONNMARK=m
416CONFIG_IP_NF_TARGET_CLUSTERIP=m 421CONFIG_IP_NF_TARGET_CLUSTERIP=m
417CONFIG_IP_NF_RAW=m 422CONFIG_IP_NF_RAW=m
418CONFIG_IP_NF_TARGET_NOTRACK=m
419CONFIG_IP_NF_ARPTABLES=m 423CONFIG_IP_NF_ARPTABLES=m
420CONFIG_IP_NF_ARPFILTER=m 424CONFIG_IP_NF_ARPFILTER=m
421CONFIG_IP_NF_ARP_MANGLE=m 425CONFIG_IP_NF_ARP_MANGLE=m
@@ -425,26 +429,20 @@ CONFIG_IP_NF_ARP_MANGLE=m
425# 429#
426CONFIG_IP6_NF_QUEUE=m 430CONFIG_IP6_NF_QUEUE=m
427CONFIG_IP6_NF_IPTABLES=m 431CONFIG_IP6_NF_IPTABLES=m
428CONFIG_IP6_NF_MATCH_LIMIT=m
429CONFIG_IP6_NF_MATCH_MAC=m
430CONFIG_IP6_NF_MATCH_RT=m 432CONFIG_IP6_NF_MATCH_RT=m
431CONFIG_IP6_NF_MATCH_OPTS=m 433CONFIG_IP6_NF_MATCH_OPTS=m
432CONFIG_IP6_NF_MATCH_FRAG=m 434CONFIG_IP6_NF_MATCH_FRAG=m
433CONFIG_IP6_NF_MATCH_HL=m 435CONFIG_IP6_NF_MATCH_HL=m
434CONFIG_IP6_NF_MATCH_MULTIPORT=m 436CONFIG_IP6_NF_MATCH_MULTIPORT=m
435CONFIG_IP6_NF_MATCH_OWNER=m 437CONFIG_IP6_NF_MATCH_OWNER=m
436CONFIG_IP6_NF_MATCH_MARK=m
437CONFIG_IP6_NF_MATCH_IPV6HEADER=m 438CONFIG_IP6_NF_MATCH_IPV6HEADER=m
438CONFIG_IP6_NF_MATCH_AHESP=m 439CONFIG_IP6_NF_MATCH_AHESP=m
439CONFIG_IP6_NF_MATCH_LENGTH=m
440CONFIG_IP6_NF_MATCH_EUI64=m 440CONFIG_IP6_NF_MATCH_EUI64=m
441CONFIG_IP6_NF_MATCH_PHYSDEV=m 441CONFIG_IP6_NF_MATCH_POLICY=m
442CONFIG_IP6_NF_FILTER=m 442CONFIG_IP6_NF_FILTER=m
443CONFIG_IP6_NF_TARGET_LOG=m 443CONFIG_IP6_NF_TARGET_LOG=m
444CONFIG_IP6_NF_TARGET_REJECT=m 444CONFIG_IP6_NF_TARGET_REJECT=m
445CONFIG_IP6_NF_TARGET_NFQUEUE=m
446CONFIG_IP6_NF_MANGLE=m 445CONFIG_IP6_NF_MANGLE=m
447CONFIG_IP6_NF_TARGET_MARK=m
448CONFIG_IP6_NF_TARGET_HL=m 446CONFIG_IP6_NF_TARGET_HL=m
449CONFIG_IP6_NF_RAW=m 447CONFIG_IP6_NF_RAW=m
450 448
@@ -500,6 +498,11 @@ CONFIG_IPDDP_ENCAP=y
500CONFIG_IPDDP_DECAP=y 498CONFIG_IPDDP_DECAP=y
501# CONFIG_X25 is not set 499# CONFIG_X25 is not set
502# CONFIG_LAPB is not set 500# CONFIG_LAPB is not set
501
502#
503# TIPC Configuration (EXPERIMENTAL)
504#
505# CONFIG_TIPC is not set
503CONFIG_NET_DIVERT=y 506CONFIG_NET_DIVERT=y
504# CONFIG_ECONET is not set 507# CONFIG_ECONET is not set
505# CONFIG_WAN_ROUTER is not set 508# CONFIG_WAN_ROUTER is not set
@@ -559,7 +562,6 @@ CONFIG_IEEE80211=m
559# CONFIG_IEEE80211_DEBUG is not set 562# CONFIG_IEEE80211_DEBUG is not set
560CONFIG_IEEE80211_CRYPT_WEP=m 563CONFIG_IEEE80211_CRYPT_WEP=m
561CONFIG_IEEE80211_CRYPT_CCMP=m 564CONFIG_IEEE80211_CRYPT_CCMP=m
562CONFIG_IEEE80211_CRYPT_TKIP=m
563 565
564# 566#
565# Device Drivers 567# Device Drivers
@@ -734,13 +736,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
734# CONFIG_SCSI_IPR is not set 736# CONFIG_SCSI_IPR is not set
735# CONFIG_SCSI_QLOGIC_FC is not set 737# CONFIG_SCSI_QLOGIC_FC is not set
736# CONFIG_SCSI_QLOGIC_1280 is not set 738# CONFIG_SCSI_QLOGIC_1280 is not set
737CONFIG_SCSI_QLA2XXX=m 739# CONFIG_SCSI_QLA_FC is not set
738# CONFIG_SCSI_QLA21XX is not set
739# CONFIG_SCSI_QLA22XX is not set
740# CONFIG_SCSI_QLA2300 is not set
741# CONFIG_SCSI_QLA2322 is not set
742# CONFIG_SCSI_QLA6312 is not set
743# CONFIG_SCSI_QLA24XX is not set
744# CONFIG_SCSI_LPFC is not set 740# CONFIG_SCSI_LPFC is not set
745# CONFIG_SCSI_DC395x is not set 741# CONFIG_SCSI_DC395x is not set
746# CONFIG_SCSI_DC390T is not set 742# CONFIG_SCSI_DC390T is not set
@@ -823,6 +819,7 @@ CONFIG_MII=y
823# CONFIG_SUNGEM is not set 819# CONFIG_SUNGEM is not set
824# CONFIG_CASSINI is not set 820# CONFIG_CASSINI is not set
825# CONFIG_NET_VENDOR_3COM is not set 821# CONFIG_NET_VENDOR_3COM is not set
822# CONFIG_DM9000 is not set
826 823
827# 824#
828# Tulip family network device support 825# Tulip family network device support
@@ -862,6 +859,7 @@ CONFIG_PCNET32=y
862# CONFIG_R8169 is not set 859# CONFIG_R8169 is not set
863# CONFIG_SIS190 is not set 860# CONFIG_SIS190 is not set
864# CONFIG_SKGE is not set 861# CONFIG_SKGE is not set
862# CONFIG_SKY2 is not set
865# CONFIG_SK98LIN is not set 863# CONFIG_SK98LIN is not set
866# CONFIG_VIA_VELOCITY is not set 864# CONFIG_VIA_VELOCITY is not set
867# CONFIG_TIGON3 is not set 865# CONFIG_TIGON3 is not set
@@ -883,8 +881,6 @@ CONFIG_PCNET32=y
883# Wireless LAN (non-hamradio) 881# Wireless LAN (non-hamradio)
884# 882#
885# CONFIG_NET_RADIO is not set 883# CONFIG_NET_RADIO is not set
886# CONFIG_IPW_DEBUG is not set
887CONFIG_IPW2200=m
888 884
889# 885#
890# Wan interfaces 886# Wan interfaces
@@ -961,6 +957,7 @@ CONFIG_HW_CONSOLE=y
961CONFIG_SERIAL_8250=y 957CONFIG_SERIAL_8250=y
962CONFIG_SERIAL_8250_CONSOLE=y 958CONFIG_SERIAL_8250_CONSOLE=y
963CONFIG_SERIAL_8250_NR_UARTS=4 959CONFIG_SERIAL_8250_NR_UARTS=4
960CONFIG_SERIAL_8250_RUNTIME_UARTS=4
964# CONFIG_SERIAL_8250_EXTENDED is not set 961# CONFIG_SERIAL_8250_EXTENDED is not set
965 962
966# 963#
@@ -968,7 +965,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
968# 965#
969CONFIG_SERIAL_CORE=y 966CONFIG_SERIAL_CORE=y
970CONFIG_SERIAL_CORE_CONSOLE=y 967CONFIG_SERIAL_CORE_CONSOLE=y
971# CONFIG_SERIAL_JSM is not set
972CONFIG_UNIX98_PTYS=y 968CONFIG_UNIX98_PTYS=y
973CONFIG_LEGACY_PTYS=y 969CONFIG_LEGACY_PTYS=y
974CONFIG_LEGACY_PTY_COUNT=256 970CONFIG_LEGACY_PTY_COUNT=256
@@ -1005,6 +1001,12 @@ CONFIG_RTC=y
1005# CONFIG_I2C is not set 1001# CONFIG_I2C is not set
1006 1002
1007# 1003#
1004# SPI support
1005#
1006# CONFIG_SPI is not set
1007# CONFIG_SPI_MASTER is not set
1008
1009#
1008# Dallas's 1-wire bus 1010# Dallas's 1-wire bus
1009# 1011#
1010# CONFIG_W1 is not set 1012# CONFIG_W1 is not set
@@ -1110,6 +1112,7 @@ CONFIG_XFS_QUOTA=y
1110CONFIG_XFS_SECURITY=y 1112CONFIG_XFS_SECURITY=y
1111CONFIG_XFS_POSIX_ACL=y 1113CONFIG_XFS_POSIX_ACL=y
1112# CONFIG_XFS_RT is not set 1114# CONFIG_XFS_RT is not set
1115# CONFIG_OCFS2_FS is not set
1113CONFIG_MINIX_FS=m 1116CONFIG_MINIX_FS=m
1114CONFIG_ROMFS_FS=m 1117CONFIG_ROMFS_FS=m
1115CONFIG_INOTIFY=y 1118CONFIG_INOTIFY=y
@@ -1152,6 +1155,7 @@ CONFIG_SYSFS=y
1152# CONFIG_HUGETLB_PAGE is not set 1155# CONFIG_HUGETLB_PAGE is not set
1153CONFIG_RAMFS=y 1156CONFIG_RAMFS=y
1154CONFIG_RELAYFS_FS=m 1157CONFIG_RELAYFS_FS=m
1158# CONFIG_CONFIGFS_FS is not set
1155 1159
1156# 1160#
1157# Miscellaneous filesystems 1161# Miscellaneous filesystems
@@ -1259,6 +1263,7 @@ CONFIG_NLS_UTF8=m
1259# Kernel hacking 1263# Kernel hacking
1260# 1264#
1261# CONFIG_PRINTK_TIME is not set 1265# CONFIG_PRINTK_TIME is not set
1266# CONFIG_MAGIC_SYSRQ is not set
1262# CONFIG_DEBUG_KERNEL is not set 1267# CONFIG_DEBUG_KERNEL is not set
1263CONFIG_LOG_BUF_SHIFT=14 1268CONFIG_LOG_BUF_SHIFT=14
1264CONFIG_CROSSCOMPILE=y 1269CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index ac39ab7feeb7..fe78961762b8 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:37 2005 4# Fri Jan 27 15:40:16 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -156,27 +156,29 @@ CONFIG_SYSVIPC=y
156# CONFIG_BSD_PROCESS_ACCT is not set 156# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y 157CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 158# CONFIG_AUDIT is not set
159CONFIG_HOTPLUG=y
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set 159# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE="" 160CONFIG_INITRAMFS_SOURCE=""
161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163CONFIG_EMBEDDED=y 162CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y 163CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_ALL is not set 164# CONFIG_KALLSYMS_ALL is not set
166# CONFIG_KALLSYMS_EXTRA_PASS is not set 165# CONFIG_KALLSYMS_EXTRA_PASS is not set
166CONFIG_HOTPLUG=y
167CONFIG_PRINTK=y 167CONFIG_PRINTK=y
168CONFIG_BUG=y 168CONFIG_BUG=y
169CONFIG_ELF_CORE=y
169CONFIG_BASE_FULL=y 170CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 171CONFIG_FUTEX=y
171CONFIG_EPOLL=y 172CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y 173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0 174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0 175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0 176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0 177CONFIG_CC_ALIGN_JUMPS=0
178CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 179# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 180CONFIG_BASE_SMALL=0
181# CONFIG_SLOB is not set
180 182
181# 183#
182# Loadable module support 184# Loadable module support
@@ -297,6 +299,11 @@ CONFIG_SCTP_HMAC_MD5=y
297# CONFIG_ATALK is not set 299# CONFIG_ATALK is not set
298# CONFIG_X25 is not set 300# CONFIG_X25 is not set
299# CONFIG_LAPB is not set 301# CONFIG_LAPB is not set
302
303#
304# TIPC Configuration (EXPERIMENTAL)
305#
306# CONFIG_TIPC is not set
300CONFIG_NET_DIVERT=y 307CONFIG_NET_DIVERT=y
301# CONFIG_ECONET is not set 308# CONFIG_ECONET is not set
302# CONFIG_WAN_ROUTER is not set 309# CONFIG_WAN_ROUTER is not set
@@ -525,6 +532,7 @@ CONFIG_SERIO_SERPORT=y
525CONFIG_SERIAL_8250=y 532CONFIG_SERIAL_8250=y
526CONFIG_SERIAL_8250_CONSOLE=y 533CONFIG_SERIAL_8250_CONSOLE=y
527CONFIG_SERIAL_8250_NR_UARTS=1 534CONFIG_SERIAL_8250_NR_UARTS=1
535CONFIG_SERIAL_8250_RUNTIME_UARTS=4
528# CONFIG_SERIAL_8250_EXTENDED is not set 536# CONFIG_SERIAL_8250_EXTENDED is not set
529 537
530# 538#
@@ -567,6 +575,12 @@ CONFIG_LEGACY_PTY_COUNT=256
567# CONFIG_I2C is not set 575# CONFIG_I2C is not set
568 576
569# 577#
578# SPI support
579#
580# CONFIG_SPI is not set
581# CONFIG_SPI_MASTER is not set
582
583#
570# Dallas's 1-wire bus 584# Dallas's 1-wire bus
571# 585#
572# CONFIG_W1 is not set 586# CONFIG_W1 is not set
@@ -640,11 +654,11 @@ CONFIG_EXT2_FS=y
640# CONFIG_EXT2_FS_XATTR is not set 654# CONFIG_EXT2_FS_XATTR is not set
641# CONFIG_EXT2_FS_XIP is not set 655# CONFIG_EXT2_FS_XIP is not set
642# CONFIG_EXT3_FS is not set 656# CONFIG_EXT3_FS is not set
643# CONFIG_JBD is not set
644# CONFIG_REISERFS_FS is not set 657# CONFIG_REISERFS_FS is not set
645# CONFIG_JFS_FS is not set 658# CONFIG_JFS_FS is not set
646# CONFIG_FS_POSIX_ACL is not set 659# CONFIG_FS_POSIX_ACL is not set
647# CONFIG_XFS_FS is not set 660# CONFIG_XFS_FS is not set
661# CONFIG_OCFS2_FS is not set
648# CONFIG_MINIX_FS is not set 662# CONFIG_MINIX_FS is not set
649CONFIG_ROMFS_FS=y 663CONFIG_ROMFS_FS=y
650# CONFIG_INOTIFY is not set 664# CONFIG_INOTIFY is not set
@@ -677,6 +691,7 @@ CONFIG_PROC_FS=y
677# CONFIG_HUGETLB_PAGE is not set 691# CONFIG_HUGETLB_PAGE is not set
678CONFIG_RAMFS=y 692CONFIG_RAMFS=y
679# CONFIG_RELAYFS_FS is not set 693# CONFIG_RELAYFS_FS is not set
694# CONFIG_CONFIGFS_FS is not set
680 695
681# 696#
682# Miscellaneous filesystems 697# Miscellaneous filesystems
@@ -738,17 +753,19 @@ CONFIG_MSDOS_PARTITION=y
738# Kernel hacking 753# Kernel hacking
739# 754#
740# CONFIG_PRINTK_TIME is not set 755# CONFIG_PRINTK_TIME is not set
741CONFIG_DEBUG_KERNEL=y
742# CONFIG_MAGIC_SYSRQ is not set 756# CONFIG_MAGIC_SYSRQ is not set
757CONFIG_DEBUG_KERNEL=y
743CONFIG_LOG_BUF_SHIFT=14 758CONFIG_LOG_BUF_SHIFT=14
744# CONFIG_DETECT_SOFTLOCKUP is not set 759# CONFIG_DETECT_SOFTLOCKUP is not set
745# CONFIG_SCHEDSTATS is not set 760# CONFIG_SCHEDSTATS is not set
746# CONFIG_DEBUG_SLAB is not set 761# CONFIG_DEBUG_SLAB is not set
762CONFIG_DEBUG_MUTEXES=y
747# CONFIG_DEBUG_SPINLOCK is not set 763# CONFIG_DEBUG_SPINLOCK is not set
748# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 764# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
749# CONFIG_DEBUG_KOBJECT is not set 765# CONFIG_DEBUG_KOBJECT is not set
750CONFIG_DEBUG_INFO=y 766CONFIG_DEBUG_INFO=y
751# CONFIG_DEBUG_VM is not set 767# CONFIG_DEBUG_VM is not set
768CONFIG_FORCED_INLINING=y
752# CONFIG_RCU_TORTURE_TEST is not set 769# CONFIG_RCU_TORTURE_TEST is not set
753CONFIG_CROSSCOMPILE=y 770CONFIG_CROSSCOMPILE=y
754CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" 771CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index 2b5ea37484e4..e4620e7f0a5e 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:39 2005 4# Fri Jan 27 15:40:17 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,9 +63,9 @@ CONFIG_MACH_VR41XX=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_NEC_CMBVR4133 is not set
67# CONFIG_CASIO_E55 is not set 66# CONFIG_CASIO_E55 is not set
68# CONFIG_IBM_WORKPAD is not set 67# CONFIG_IBM_WORKPAD is not set
68# CONFIG_NEC_CMBVR4133 is not set
69# CONFIG_TANBAC_TB022X is not set 69# CONFIG_TANBAC_TB022X is not set
70CONFIG_VICTOR_MPC30X=y 70CONFIG_VICTOR_MPC30X=y
71# CONFIG_ZAO_CAPCELLA is not set 71# CONFIG_ZAO_CAPCELLA is not set
@@ -90,7 +90,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
90# CONFIG_CPU_MIPS64_R2 is not set 90# CONFIG_CPU_MIPS64_R2 is not set
91# CONFIG_CPU_R3000 is not set 91# CONFIG_CPU_R3000 is not set
92# CONFIG_CPU_TX39XX is not set 92# CONFIG_CPU_TX39XX is not set
93CONFIG_CPU_VR41XX=y 93# CONFIG_CPU_VR41XX is not set
94# CONFIG_CPU_R4300 is not set 94# CONFIG_CPU_R4300 is not set
95# CONFIG_CPU_R4X00 is not set 95# CONFIG_CPU_R4X00 is not set
96# CONFIG_CPU_TX49XX is not set 96# CONFIG_CPU_TX49XX is not set
@@ -103,23 +103,18 @@ CONFIG_CPU_VR41XX=y
103# CONFIG_CPU_RM7000 is not set 103# CONFIG_CPU_RM7000 is not set
104# CONFIG_CPU_RM9000 is not set 104# CONFIG_CPU_RM9000 is not set
105# CONFIG_CPU_SB1 is not set 105# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_VR41XX=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 106
112# 107#
113# Kernel type 108# Kernel type
114# 109#
115CONFIG_32BIT=y 110# CONFIG_32BIT is not set
116# CONFIG_64BIT is not set 111# CONFIG_64BIT is not set
117CONFIG_PAGE_SIZE_4KB=y 112CONFIG_PAGE_SIZE_4KB=y
118# CONFIG_PAGE_SIZE_8KB is not set 113# CONFIG_PAGE_SIZE_8KB is not set
119# CONFIG_PAGE_SIZE_16KB is not set 114# CONFIG_PAGE_SIZE_16KB is not set
120# CONFIG_PAGE_SIZE_64KB is not set 115# CONFIG_PAGE_SIZE_64KB is not set
121# CONFIG_MIPS_MT is not set 116# CONFIG_MIPS_MT is not set
122# CONFIG_CPU_ADVANCED is not set 117CONFIG_CPU_HAS_LLSC=y
123CONFIG_CPU_HAS_SYNC=y 118CONFIG_CPU_HAS_SYNC=y
124CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
125CONFIG_GENERIC_IRQ_PROBE=y 120CONFIG_GENERIC_IRQ_PROBE=y
@@ -155,26 +150,28 @@ CONFIG_SYSVIPC=y
155# CONFIG_BSD_PROCESS_ACCT is not set 150# CONFIG_BSD_PROCESS_ACCT is not set
156CONFIG_SYSCTL=y 151CONFIG_SYSCTL=y
157# CONFIG_AUDIT is not set 152# CONFIG_AUDIT is not set
158CONFIG_HOTPLUG=y
159CONFIG_KOBJECT_UEVENT=y
160# CONFIG_IKCONFIG is not set 153# CONFIG_IKCONFIG is not set
161CONFIG_INITRAMFS_SOURCE="" 154CONFIG_INITRAMFS_SOURCE=""
155# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
162CONFIG_EMBEDDED=y 156CONFIG_EMBEDDED=y
163CONFIG_KALLSYMS=y 157CONFIG_KALLSYMS=y
164# CONFIG_KALLSYMS_EXTRA_PASS is not set 158# CONFIG_KALLSYMS_EXTRA_PASS is not set
159CONFIG_HOTPLUG=y
165CONFIG_PRINTK=y 160CONFIG_PRINTK=y
166CONFIG_BUG=y 161CONFIG_BUG=y
162CONFIG_ELF_CORE=y
167CONFIG_BASE_FULL=y 163CONFIG_BASE_FULL=y
168CONFIG_FUTEX=y 164CONFIG_FUTEX=y
169CONFIG_EPOLL=y 165CONFIG_EPOLL=y
170# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
171CONFIG_SHMEM=y 166CONFIG_SHMEM=y
172CONFIG_CC_ALIGN_FUNCTIONS=0 167CONFIG_CC_ALIGN_FUNCTIONS=0
173CONFIG_CC_ALIGN_LABELS=0 168CONFIG_CC_ALIGN_LABELS=0
174CONFIG_CC_ALIGN_LOOPS=0 169CONFIG_CC_ALIGN_LOOPS=0
175CONFIG_CC_ALIGN_JUMPS=0 170CONFIG_CC_ALIGN_JUMPS=0
171CONFIG_SLAB=y
176# CONFIG_TINY_SHMEM is not set 172# CONFIG_TINY_SHMEM is not set
177CONFIG_BASE_SMALL=0 173CONFIG_BASE_SMALL=0
174# CONFIG_SLOB is not set
178 175
179# 176#
180# Loadable module support 177# Loadable module support
@@ -190,7 +187,6 @@ CONFIG_KMOD=y
190# 187#
191# Block layer 188# Block layer
192# 189#
193# CONFIG_LBD is not set
194 190
195# 191#
196# IO Schedulers 192# IO Schedulers
@@ -229,7 +225,6 @@ CONFIG_PCMCIA_IOCTL=y
229# CONFIG_YENTA is not set 225# CONFIG_YENTA is not set
230# CONFIG_PD6729 is not set 226# CONFIG_PD6729 is not set
231# CONFIG_I82092 is not set 227# CONFIG_I82092 is not set
232CONFIG_PCMCIA_VRC4173=y
233 228
234# 229#
235# PCI Hotplug Support 230# PCI Hotplug Support
@@ -241,7 +236,6 @@ CONFIG_PCMCIA_VRC4173=y
241# 236#
242CONFIG_BINFMT_ELF=y 237CONFIG_BINFMT_ELF=y
243# CONFIG_BINFMT_MISC is not set 238# CONFIG_BINFMT_MISC is not set
244CONFIG_TRAD_SIGNALS=y
245 239
246# 240#
247# Networking 241# Networking
@@ -296,6 +290,11 @@ CONFIG_TCP_CONG_BIC=y
296# CONFIG_ATALK is not set 290# CONFIG_ATALK is not set
297# CONFIG_X25 is not set 291# CONFIG_X25 is not set
298# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
293
294#
295# TIPC Configuration (EXPERIMENTAL)
296#
297# CONFIG_TIPC is not set
299# CONFIG_NET_DIVERT is not set 298# CONFIG_NET_DIVERT is not set
300# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
301# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
@@ -455,6 +454,7 @@ CONFIG_MII=m
455# CONFIG_R8169 is not set 454# CONFIG_R8169 is not set
456# CONFIG_SIS190 is not set 455# CONFIG_SIS190 is not set
457# CONFIG_SKGE is not set 456# CONFIG_SKGE is not set
457# CONFIG_SKY2 is not set
458# CONFIG_SK98LIN is not set 458# CONFIG_SK98LIN is not set
459# CONFIG_TIGON3 is not set 459# CONFIG_TIGON3 is not set
460# CONFIG_BNX2 is not set 460# CONFIG_BNX2 is not set
@@ -604,11 +604,6 @@ CONFIG_HW_CONSOLE=y
604# 604#
605# Non-8250 serial port support 605# Non-8250 serial port support
606# 606#
607CONFIG_SERIAL_CORE=y
608CONFIG_SERIAL_CORE_CONSOLE=y
609CONFIG_SERIAL_VR41XX=y
610CONFIG_SERIAL_VR41XX_CONSOLE=y
611# CONFIG_SERIAL_JSM is not set
612CONFIG_UNIX98_PTYS=y 607CONFIG_UNIX98_PTYS=y
613CONFIG_LEGACY_PTYS=y 608CONFIG_LEGACY_PTYS=y
614CONFIG_LEGACY_PTY_COUNT=256 609CONFIG_LEGACY_PTY_COUNT=256
@@ -624,7 +619,6 @@ CONFIG_LEGACY_PTY_COUNT=256
624# CONFIG_WATCHDOG is not set 619# CONFIG_WATCHDOG is not set
625# CONFIG_RTC is not set 620# CONFIG_RTC is not set
626# CONFIG_GEN_RTC is not set 621# CONFIG_GEN_RTC is not set
627# CONFIG_RTC_VR41XX is not set
628# CONFIG_DTLK is not set 622# CONFIG_DTLK is not set
629# CONFIG_R3964 is not set 623# CONFIG_R3964 is not set
630# CONFIG_APPLICOM is not set 624# CONFIG_APPLICOM is not set
@@ -640,7 +634,6 @@ CONFIG_LEGACY_PTY_COUNT=256
640# CONFIG_SYNCLINK_CS is not set 634# CONFIG_SYNCLINK_CS is not set
641# CONFIG_CARDMAN_4000 is not set 635# CONFIG_CARDMAN_4000 is not set
642# CONFIG_CARDMAN_4040 is not set 636# CONFIG_CARDMAN_4040 is not set
643CONFIG_GPIO_VR41XX=y
644# CONFIG_RAW_DRIVER is not set 637# CONFIG_RAW_DRIVER is not set
645 638
646# 639#
@@ -655,6 +648,12 @@ CONFIG_GPIO_VR41XX=y
655# CONFIG_I2C is not set 648# CONFIG_I2C is not set
656 649
657# 650#
651# SPI support
652#
653# CONFIG_SPI is not set
654# CONFIG_SPI_MASTER is not set
655
656#
658# Dallas's 1-wire bus 657# Dallas's 1-wire bus
659# 658#
660# CONFIG_W1 is not set 659# CONFIG_W1 is not set
@@ -740,6 +739,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
740# may also be needed; see USB_STORAGE Help for more information 739# may also be needed; see USB_STORAGE Help for more information
741# 740#
742# CONFIG_USB_STORAGE is not set 741# CONFIG_USB_STORAGE is not set
742# CONFIG_USB_LIBUSUAL is not set
743 743
744# 744#
745# USB Input Devices 745# USB Input Devices
@@ -762,6 +762,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
762# CONFIG_USB_YEALINK is not set 762# CONFIG_USB_YEALINK is not set
763# CONFIG_USB_XPAD is not set 763# CONFIG_USB_XPAD is not set
764# CONFIG_USB_ATI_REMOTE is not set 764# CONFIG_USB_ATI_REMOTE is not set
765# CONFIG_USB_ATI_REMOTE2 is not set
765# CONFIG_USB_KEYSPAN_REMOTE is not set 766# CONFIG_USB_KEYSPAN_REMOTE is not set
766# CONFIG_USB_APPLETOUCH is not set 767# CONFIG_USB_APPLETOUCH is not set
767 768
@@ -846,11 +847,11 @@ CONFIG_EXT2_FS=y
846# CONFIG_EXT2_FS_XATTR is not set 847# CONFIG_EXT2_FS_XATTR is not set
847# CONFIG_EXT2_FS_XIP is not set 848# CONFIG_EXT2_FS_XIP is not set
848# CONFIG_EXT3_FS is not set 849# CONFIG_EXT3_FS is not set
849# CONFIG_JBD is not set
850# CONFIG_REISERFS_FS is not set 850# CONFIG_REISERFS_FS is not set
851# CONFIG_JFS_FS is not set 851# CONFIG_JFS_FS is not set
852# CONFIG_FS_POSIX_ACL is not set 852# CONFIG_FS_POSIX_ACL is not set
853# CONFIG_XFS_FS is not set 853# CONFIG_XFS_FS is not set
854# CONFIG_OCFS2_FS is not set
854# CONFIG_MINIX_FS is not set 855# CONFIG_MINIX_FS is not set
855# CONFIG_ROMFS_FS is not set 856# CONFIG_ROMFS_FS is not set
856CONFIG_INOTIFY=y 857CONFIG_INOTIFY=y
@@ -883,6 +884,7 @@ CONFIG_SYSFS=y
883# CONFIG_HUGETLB_PAGE is not set 884# CONFIG_HUGETLB_PAGE is not set
884CONFIG_RAMFS=y 885CONFIG_RAMFS=y
885CONFIG_RELAYFS_FS=m 886CONFIG_RELAYFS_FS=m
887# CONFIG_CONFIGFS_FS is not set
886 888
887# 889#
888# Miscellaneous filesystems 890# Miscellaneous filesystems
@@ -941,6 +943,7 @@ CONFIG_MSDOS_PARTITION=y
941# Kernel hacking 943# Kernel hacking
942# 944#
943# CONFIG_PRINTK_TIME is not set 945# CONFIG_PRINTK_TIME is not set
946# CONFIG_MAGIC_SYSRQ is not set
944# CONFIG_DEBUG_KERNEL is not set 947# CONFIG_DEBUG_KERNEL is not set
945CONFIG_LOG_BUF_SHIFT=14 948CONFIG_LOG_BUF_SHIFT=14
946CONFIG_CROSSCOMPILE=y 949CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index 7ad8718c1b69..925d8adef88d 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:41 2005 4# Fri Jan 27 15:40:18 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -159,27 +159,29 @@ CONFIG_SYSVIPC=y
159# CONFIG_BSD_PROCESS_ACCT is not set 159# CONFIG_BSD_PROCESS_ACCT is not set
160CONFIG_SYSCTL=y 160CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set 161# CONFIG_AUDIT is not set
162CONFIG_HOTPLUG=y
163CONFIG_KOBJECT_UEVENT=y
164CONFIG_IKCONFIG=y 162CONFIG_IKCONFIG=y
165CONFIG_IKCONFIG_PROC=y 163CONFIG_IKCONFIG_PROC=y
166CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
167CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
168CONFIG_KALLSYMS=y 167CONFIG_KALLSYMS=y
169# CONFIG_KALLSYMS_EXTRA_PASS is not set 168# CONFIG_KALLSYMS_EXTRA_PASS is not set
169CONFIG_HOTPLUG=y
170CONFIG_PRINTK=y 170CONFIG_PRINTK=y
171CONFIG_BUG=y 171CONFIG_BUG=y
172CONFIG_ELF_CORE=y
172CONFIG_BASE_FULL=y 173CONFIG_BASE_FULL=y
173CONFIG_FUTEX=y 174CONFIG_FUTEX=y
174CONFIG_EPOLL=y 175CONFIG_EPOLL=y
175# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
176CONFIG_SHMEM=y 176CONFIG_SHMEM=y
177CONFIG_CC_ALIGN_FUNCTIONS=0 177CONFIG_CC_ALIGN_FUNCTIONS=0
178CONFIG_CC_ALIGN_LABELS=0 178CONFIG_CC_ALIGN_LABELS=0
179CONFIG_CC_ALIGN_LOOPS=0 179CONFIG_CC_ALIGN_LOOPS=0
180CONFIG_CC_ALIGN_JUMPS=0 180CONFIG_CC_ALIGN_JUMPS=0
181CONFIG_SLAB=y
181# CONFIG_TINY_SHMEM is not set 182# CONFIG_TINY_SHMEM is not set
182CONFIG_BASE_SMALL=0 183CONFIG_BASE_SMALL=0
184# CONFIG_SLOB is not set
183 185
184# 186#
185# Loadable module support 187# Loadable module support
@@ -291,6 +293,21 @@ CONFIG_NETFILTER_NETLINK=m
291CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
292CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
293# CONFIG_NF_CONNTRACK is not set 295# CONFIG_NF_CONNTRACK is not set
296CONFIG_NETFILTER_XTABLES=m
297CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
298CONFIG_NETFILTER_XT_TARGET_MARK=m
299CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
300CONFIG_NETFILTER_XT_MATCH_COMMENT=m
301CONFIG_NETFILTER_XT_MATCH_DCCP=m
302CONFIG_NETFILTER_XT_MATCH_LENGTH=m
303CONFIG_NETFILTER_XT_MATCH_LIMIT=m
304CONFIG_NETFILTER_XT_MATCH_MAC=m
305CONFIG_NETFILTER_XT_MATCH_MARK=m
306CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
307CONFIG_NETFILTER_XT_MATCH_REALM=m
308CONFIG_NETFILTER_XT_MATCH_SCTP=m
309CONFIG_NETFILTER_XT_MATCH_STRING=m
310CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
294 311
295# 312#
296# IP: Netfilter Configuration 313# IP: Netfilter Configuration
@@ -324,6 +341,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
324# CONFIG_ATALK is not set 341# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 342# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 343# CONFIG_LAPB is not set
344
345#
346# TIPC Configuration (EXPERIMENTAL)
347#
348# CONFIG_TIPC is not set
327# CONFIG_NET_DIVERT is not set 349# CONFIG_NET_DIVERT is not set
328# CONFIG_ECONET is not set 350# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 351# CONFIG_WAN_ROUTER is not set
@@ -332,6 +354,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
332# QoS and/or fair queueing 354# QoS and/or fair queueing
333# 355#
334# CONFIG_NET_SCHED is not set 356# CONFIG_NET_SCHED is not set
357CONFIG_NET_CLS_ROUTE=y
335 358
336# 359#
337# Network testing 360# Network testing
@@ -344,7 +367,6 @@ CONFIG_IEEE80211=m
344# CONFIG_IEEE80211_DEBUG is not set 367# CONFIG_IEEE80211_DEBUG is not set
345CONFIG_IEEE80211_CRYPT_WEP=m 368CONFIG_IEEE80211_CRYPT_WEP=m
346CONFIG_IEEE80211_CRYPT_CCMP=m 369CONFIG_IEEE80211_CRYPT_CCMP=m
347CONFIG_IEEE80211_CRYPT_TKIP=m
348 370
349# 371#
350# Device Drivers 372# Device Drivers
@@ -426,7 +448,7 @@ CONFIG_SCSI_PROC_FS=y
426# SCSI Transport Attributes 448# SCSI Transport Attributes
427# 449#
428# CONFIG_SCSI_SPI_ATTRS is not set 450# CONFIG_SCSI_SPI_ATTRS is not set
429# CONFIG_SCSI_FC_ATTRS is not set 451CONFIG_SCSI_FC_ATTRS=m
430CONFIG_SCSI_ISCSI_ATTRS=m 452CONFIG_SCSI_ISCSI_ATTRS=m
431CONFIG_SCSI_SAS_ATTRS=m 453CONFIG_SCSI_SAS_ATTRS=m
432 454
@@ -455,13 +477,7 @@ CONFIG_ISCSI_TCP=m
455# CONFIG_SCSI_IPR is not set 477# CONFIG_SCSI_IPR is not set
456# CONFIG_SCSI_QLOGIC_FC is not set 478# CONFIG_SCSI_QLOGIC_FC is not set
457# CONFIG_SCSI_QLOGIC_1280 is not set 479# CONFIG_SCSI_QLOGIC_1280 is not set
458CONFIG_SCSI_QLA2XXX=m 480# CONFIG_SCSI_QLA_FC is not set
459# CONFIG_SCSI_QLA21XX is not set
460# CONFIG_SCSI_QLA22XX is not set
461# CONFIG_SCSI_QLA2300 is not set
462# CONFIG_SCSI_QLA2322 is not set
463# CONFIG_SCSI_QLA6312 is not set
464# CONFIG_SCSI_QLA24XX is not set
465# CONFIG_SCSI_LPFC is not set 481# CONFIG_SCSI_LPFC is not set
466# CONFIG_SCSI_DC395x is not set 482# CONFIG_SCSI_DC395x is not set
467# CONFIG_SCSI_DC390T is not set 483# CONFIG_SCSI_DC390T is not set
@@ -528,6 +544,7 @@ CONFIG_MII=y
528# CONFIG_SUNGEM is not set 544# CONFIG_SUNGEM is not set
529# CONFIG_CASSINI is not set 545# CONFIG_CASSINI is not set
530# CONFIG_NET_VENDOR_3COM is not set 546# CONFIG_NET_VENDOR_3COM is not set
547# CONFIG_DM9000 is not set
531 548
532# 549#
533# Tulip family network device support 550# Tulip family network device support
@@ -567,6 +584,7 @@ CONFIG_E100=y
567# CONFIG_R8169 is not set 584# CONFIG_R8169 is not set
568# CONFIG_SIS190 is not set 585# CONFIG_SIS190 is not set
569# CONFIG_SKGE is not set 586# CONFIG_SKGE is not set
587# CONFIG_SKY2 is not set
570# CONFIG_SK98LIN is not set 588# CONFIG_SK98LIN is not set
571# CONFIG_VIA_VELOCITY is not set 589# CONFIG_VIA_VELOCITY is not set
572# CONFIG_TIGON3 is not set 590# CONFIG_TIGON3 is not set
@@ -592,8 +610,6 @@ CONFIG_MV643XX_ETH_2=y
592# Wireless LAN (non-hamradio) 610# Wireless LAN (non-hamradio)
593# 611#
594# CONFIG_NET_RADIO is not set 612# CONFIG_NET_RADIO is not set
595# CONFIG_IPW_DEBUG is not set
596CONFIG_IPW2200=m
597 613
598# 614#
599# Wan interfaces 615# Wan interfaces
@@ -675,6 +691,7 @@ CONFIG_HW_CONSOLE=y
675CONFIG_SERIAL_8250=y 691CONFIG_SERIAL_8250=y
676CONFIG_SERIAL_8250_CONSOLE=y 692CONFIG_SERIAL_8250_CONSOLE=y
677CONFIG_SERIAL_8250_NR_UARTS=4 693CONFIG_SERIAL_8250_NR_UARTS=4
694CONFIG_SERIAL_8250_RUNTIME_UARTS=4
678# CONFIG_SERIAL_8250_EXTENDED is not set 695# CONFIG_SERIAL_8250_EXTENDED is not set
679 696
680# 697#
@@ -682,7 +699,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
682# 699#
683CONFIG_SERIAL_CORE=y 700CONFIG_SERIAL_CORE=y
684CONFIG_SERIAL_CORE_CONSOLE=y 701CONFIG_SERIAL_CORE_CONSOLE=y
685# CONFIG_SERIAL_JSM is not set
686CONFIG_UNIX98_PTYS=y 702CONFIG_UNIX98_PTYS=y
687CONFIG_LEGACY_PTYS=y 703CONFIG_LEGACY_PTYS=y
688CONFIG_LEGACY_PTY_COUNT=256 704CONFIG_LEGACY_PTY_COUNT=256
@@ -719,6 +735,12 @@ CONFIG_RTC=y
719# CONFIG_I2C is not set 735# CONFIG_I2C is not set
720 736
721# 737#
738# SPI support
739#
740# CONFIG_SPI is not set
741# CONFIG_SPI_MASTER is not set
742
743#
722# Dallas's 1-wire bus 744# Dallas's 1-wire bus
723# 745#
724# CONFIG_W1 is not set 746# CONFIG_W1 is not set
@@ -777,7 +799,6 @@ CONFIG_FB_MODE_HELPERS=y
777# CONFIG_FB_3DFX is not set 799# CONFIG_FB_3DFX is not set
778# CONFIG_FB_VOODOO1 is not set 800# CONFIG_FB_VOODOO1 is not set
779# CONFIG_FB_SMIVGX is not set 801# CONFIG_FB_SMIVGX is not set
780# CONFIG_FB_CYBLA is not set
781# CONFIG_FB_TRIDENT is not set 802# CONFIG_FB_TRIDENT is not set
782# CONFIG_FB_VIRTUAL is not set 803# CONFIG_FB_VIRTUAL is not set
783 804
@@ -861,6 +882,7 @@ CONFIG_XFS_EXPORT=y
861# CONFIG_XFS_SECURITY is not set 882# CONFIG_XFS_SECURITY is not set
862# CONFIG_XFS_POSIX_ACL is not set 883# CONFIG_XFS_POSIX_ACL is not set
863# CONFIG_XFS_RT is not set 884# CONFIG_XFS_RT is not set
885# CONFIG_OCFS2_FS is not set
864# CONFIG_MINIX_FS is not set 886# CONFIG_MINIX_FS is not set
865# CONFIG_ROMFS_FS is not set 887# CONFIG_ROMFS_FS is not set
866CONFIG_INOTIFY=y 888CONFIG_INOTIFY=y
@@ -893,6 +915,7 @@ CONFIG_TMPFS=y
893# CONFIG_HUGETLB_PAGE is not set 915# CONFIG_HUGETLB_PAGE is not set
894CONFIG_RAMFS=y 916CONFIG_RAMFS=y
895CONFIG_RELAYFS_FS=m 917CONFIG_RELAYFS_FS=m
918# CONFIG_CONFIGFS_FS is not set
896 919
897# 920#
898# Miscellaneous filesystems 921# Miscellaneous filesystems
@@ -999,6 +1022,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
999# Kernel hacking 1022# Kernel hacking
1000# 1023#
1001# CONFIG_PRINTK_TIME is not set 1024# CONFIG_PRINTK_TIME is not set
1025# CONFIG_MAGIC_SYSRQ is not set
1002# CONFIG_DEBUG_KERNEL is not set 1026# CONFIG_DEBUG_KERNEL is not set
1003CONFIG_LOG_BUF_SHIFT=14 1027CONFIG_LOG_BUF_SHIFT=14
1004CONFIG_CROSSCOMPILE=y 1028CONFIG_CROSSCOMPILE=y
@@ -1052,3 +1076,7 @@ CONFIG_CRC32=y
1052CONFIG_LIBCRC32C=m 1076CONFIG_LIBCRC32C=m
1053CONFIG_ZLIB_INFLATE=y 1077CONFIG_ZLIB_INFLATE=y
1054CONFIG_ZLIB_DEFLATE=m 1078CONFIG_ZLIB_DEFLATE=m
1079CONFIG_TEXTSEARCH=y
1080CONFIG_TEXTSEARCH_KMP=m
1081CONFIG_TEXTSEARCH_BM=m
1082CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index e8d6bb3551a2..ee1cf9b9eb9a 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:43 2005 4# Fri Jan 27 15:40:19 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -154,26 +154,28 @@ CONFIG_SYSVIPC=y
154# CONFIG_BSD_PROCESS_ACCT is not set 154# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
156# CONFIG_AUDIT is not set 156# CONFIG_AUDIT is not set
157CONFIG_HOTPLUG=y
158CONFIG_KOBJECT_UEVENT=y
159# CONFIG_IKCONFIG is not set 157# CONFIG_IKCONFIG is not set
160CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
159# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
161CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
162CONFIG_KALLSYMS=y 161CONFIG_KALLSYMS=y
163# CONFIG_KALLSYMS_EXTRA_PASS is not set 162# CONFIG_KALLSYMS_EXTRA_PASS is not set
163CONFIG_HOTPLUG=y
164CONFIG_PRINTK=y 164CONFIG_PRINTK=y
165CONFIG_BUG=y 165CONFIG_BUG=y
166CONFIG_ELF_CORE=y
166CONFIG_BASE_FULL=y 167CONFIG_BASE_FULL=y
167CONFIG_FUTEX=y 168CONFIG_FUTEX=y
168CONFIG_EPOLL=y 169CONFIG_EPOLL=y
169# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
170CONFIG_SHMEM=y 170CONFIG_SHMEM=y
171CONFIG_CC_ALIGN_FUNCTIONS=0 171CONFIG_CC_ALIGN_FUNCTIONS=0
172CONFIG_CC_ALIGN_LABELS=0 172CONFIG_CC_ALIGN_LABELS=0
173CONFIG_CC_ALIGN_LOOPS=0 173CONFIG_CC_ALIGN_LOOPS=0
174CONFIG_CC_ALIGN_JUMPS=0 174CONFIG_CC_ALIGN_JUMPS=0
175CONFIG_SLAB=y
175# CONFIG_TINY_SHMEM is not set 176# CONFIG_TINY_SHMEM is not set
176CONFIG_BASE_SMALL=0 177CONFIG_BASE_SMALL=0
178# CONFIG_SLOB is not set
177 179
178# 180#
179# Loadable module support 181# Loadable module support
@@ -220,7 +222,6 @@ CONFIG_MMU=y
220# 222#
221CONFIG_BINFMT_ELF=y 223CONFIG_BINFMT_ELF=y
222# CONFIG_BINFMT_MISC is not set 224# CONFIG_BINFMT_MISC is not set
223# CONFIG_BUILD_ELF64 is not set
224CONFIG_MIPS32_COMPAT=y 225CONFIG_MIPS32_COMPAT=y
225CONFIG_COMPAT=y 226CONFIG_COMPAT=y
226CONFIG_MIPS32_O32=y 227CONFIG_MIPS32_O32=y
@@ -281,6 +282,11 @@ CONFIG_TCP_CONG_BIC=y
281# CONFIG_ATALK is not set 282# CONFIG_ATALK is not set
282# CONFIG_X25 is not set 283# CONFIG_X25 is not set
283# CONFIG_LAPB is not set 284# CONFIG_LAPB is not set
285
286#
287# TIPC Configuration (EXPERIMENTAL)
288#
289# CONFIG_TIPC is not set
284# CONFIG_NET_DIVERT is not set 290# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set 291# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 292# CONFIG_WAN_ROUTER is not set
@@ -301,7 +307,6 @@ CONFIG_IEEE80211=y
301# CONFIG_IEEE80211_DEBUG is not set 307# CONFIG_IEEE80211_DEBUG is not set
302CONFIG_IEEE80211_CRYPT_WEP=y 308CONFIG_IEEE80211_CRYPT_WEP=y
303CONFIG_IEEE80211_CRYPT_CCMP=y 309CONFIG_IEEE80211_CRYPT_CCMP=y
304CONFIG_IEEE80211_CRYPT_TKIP=y
305 310
306# 311#
307# Device Drivers 312# Device Drivers
@@ -420,6 +425,7 @@ CONFIG_NET_ETHERNET=y
420# CONFIG_SUNGEM is not set 425# CONFIG_SUNGEM is not set
421# CONFIG_CASSINI is not set 426# CONFIG_CASSINI is not set
422# CONFIG_NET_VENDOR_3COM is not set 427# CONFIG_NET_VENDOR_3COM is not set
428# CONFIG_DM9000 is not set
423 429
424# 430#
425# Tulip family network device support 431# Tulip family network device support
@@ -440,6 +446,7 @@ CONFIG_NET_ETHERNET=y
440# CONFIG_R8169 is not set 446# CONFIG_R8169 is not set
441# CONFIG_SIS190 is not set 447# CONFIG_SIS190 is not set
442# CONFIG_SKGE is not set 448# CONFIG_SKGE is not set
449# CONFIG_SKY2 is not set
443# CONFIG_SK98LIN is not set 450# CONFIG_SK98LIN is not set
444# CONFIG_TIGON3 is not set 451# CONFIG_TIGON3 is not set
445# CONFIG_BNX2 is not set 452# CONFIG_BNX2 is not set
@@ -461,8 +468,6 @@ CONFIG_NET_ETHERNET=y
461# Wireless LAN (non-hamradio) 468# Wireless LAN (non-hamradio)
462# 469#
463# CONFIG_NET_RADIO is not set 470# CONFIG_NET_RADIO is not set
464# CONFIG_IPW_DEBUG is not set
465CONFIG_IPW2200=y
466 471
467# 472#
468# Wan interfaces 473# Wan interfaces
@@ -538,6 +543,7 @@ CONFIG_HW_CONSOLE=y
538CONFIG_SERIAL_8250=y 543CONFIG_SERIAL_8250=y
539CONFIG_SERIAL_8250_CONSOLE=y 544CONFIG_SERIAL_8250_CONSOLE=y
540CONFIG_SERIAL_8250_NR_UARTS=4 545CONFIG_SERIAL_8250_NR_UARTS=4
546CONFIG_SERIAL_8250_RUNTIME_UARTS=4
541# CONFIG_SERIAL_8250_EXTENDED is not set 547# CONFIG_SERIAL_8250_EXTENDED is not set
542 548
543# 549#
@@ -545,7 +551,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
545# 551#
546CONFIG_SERIAL_CORE=y 552CONFIG_SERIAL_CORE=y
547CONFIG_SERIAL_CORE_CONSOLE=y 553CONFIG_SERIAL_CORE_CONSOLE=y
548# CONFIG_SERIAL_JSM is not set
549CONFIG_UNIX98_PTYS=y 554CONFIG_UNIX98_PTYS=y
550CONFIG_LEGACY_PTYS=y 555CONFIG_LEGACY_PTYS=y
551CONFIG_LEGACY_PTY_COUNT=256 556CONFIG_LEGACY_PTY_COUNT=256
@@ -583,6 +588,12 @@ CONFIG_LEGACY_PTY_COUNT=256
583# CONFIG_I2C is not set 588# CONFIG_I2C is not set
584 589
585# 590#
591# SPI support
592#
593# CONFIG_SPI is not set
594# CONFIG_SPI_MASTER is not set
595
596#
586# Dallas's 1-wire bus 597# Dallas's 1-wire bus
587# 598#
588# CONFIG_W1 is not set 599# CONFIG_W1 is not set
@@ -664,11 +675,11 @@ CONFIG_EXT2_FS=y
664# CONFIG_EXT2_FS_XATTR is not set 675# CONFIG_EXT2_FS_XATTR is not set
665# CONFIG_EXT2_FS_XIP is not set 676# CONFIG_EXT2_FS_XIP is not set
666# CONFIG_EXT3_FS is not set 677# CONFIG_EXT3_FS is not set
667# CONFIG_JBD is not set
668# CONFIG_REISERFS_FS is not set 678# CONFIG_REISERFS_FS is not set
669# CONFIG_JFS_FS is not set 679# CONFIG_JFS_FS is not set
670# CONFIG_FS_POSIX_ACL is not set 680# CONFIG_FS_POSIX_ACL is not set
671# CONFIG_XFS_FS is not set 681# CONFIG_XFS_FS is not set
682# CONFIG_OCFS2_FS is not set
672# CONFIG_MINIX_FS is not set 683# CONFIG_MINIX_FS is not set
673# CONFIG_ROMFS_FS is not set 684# CONFIG_ROMFS_FS is not set
674CONFIG_INOTIFY=y 685CONFIG_INOTIFY=y
@@ -701,6 +712,7 @@ CONFIG_SYSFS=y
701# CONFIG_HUGETLB_PAGE is not set 712# CONFIG_HUGETLB_PAGE is not set
702CONFIG_RAMFS=y 713CONFIG_RAMFS=y
703CONFIG_RELAYFS_FS=y 714CONFIG_RELAYFS_FS=y
715# CONFIG_CONFIGFS_FS is not set
704 716
705# 717#
706# Miscellaneous filesystems 718# Miscellaneous filesystems
@@ -763,6 +775,7 @@ CONFIG_MSDOS_PARTITION=y
763# Kernel hacking 775# Kernel hacking
764# 776#
765# CONFIG_PRINTK_TIME is not set 777# CONFIG_PRINTK_TIME is not set
778# CONFIG_MAGIC_SYSRQ is not set
766# CONFIG_DEBUG_KERNEL is not set 779# CONFIG_DEBUG_KERNEL is not set
767CONFIG_LOG_BUF_SHIFT=14 780CONFIG_LOG_BUF_SHIFT=14
768CONFIG_CROSSCOMPILE=y 781CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index f3787b68bdd1..d80ff278f2af 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:44 2005 4# Fri Jan 27 15:40:20 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -159,26 +159,28 @@ CONFIG_SYSVIPC=y
159# CONFIG_BSD_PROCESS_ACCT is not set 159# CONFIG_BSD_PROCESS_ACCT is not set
160CONFIG_SYSCTL=y 160CONFIG_SYSCTL=y
161# CONFIG_AUDIT is not set 161# CONFIG_AUDIT is not set
162# CONFIG_HOTPLUG is not set
163CONFIG_KOBJECT_UEVENT=y
164# CONFIG_IKCONFIG is not set 162# CONFIG_IKCONFIG is not set
165CONFIG_INITRAMFS_SOURCE="" 163CONFIG_INITRAMFS_SOURCE=""
164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_EMBEDDED=y 165CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y 166CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set 167# CONFIG_KALLSYMS_EXTRA_PASS is not set
168# CONFIG_HOTPLUG is not set
169CONFIG_PRINTK=y 169CONFIG_PRINTK=y
170CONFIG_BUG=y 170CONFIG_BUG=y
171CONFIG_ELF_CORE=y
171CONFIG_BASE_FULL=y 172CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y 173CONFIG_FUTEX=y
173CONFIG_EPOLL=y 174CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y 175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0 176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0 177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0 178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0 179CONFIG_CC_ALIGN_JUMPS=0
180CONFIG_SLAB=y
180# CONFIG_TINY_SHMEM is not set 181# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0 182CONFIG_BASE_SMALL=0
183# CONFIG_SLOB is not set
182 184
183# 185#
184# Loadable module support 186# Loadable module support
@@ -280,6 +282,11 @@ CONFIG_TCP_CONG_BIC=y
280# CONFIG_ATALK is not set 282# CONFIG_ATALK is not set
281# CONFIG_X25 is not set 283# CONFIG_X25 is not set
282# CONFIG_LAPB is not set 284# CONFIG_LAPB is not set
285
286#
287# TIPC Configuration (EXPERIMENTAL)
288#
289# CONFIG_TIPC is not set
283# CONFIG_NET_DIVERT is not set 290# CONFIG_NET_DIVERT is not set
284# CONFIG_ECONET is not set 291# CONFIG_ECONET is not set
285# CONFIG_WAN_ROUTER is not set 292# CONFIG_WAN_ROUTER is not set
@@ -300,7 +307,6 @@ CONFIG_IEEE80211=y
300# CONFIG_IEEE80211_DEBUG is not set 307# CONFIG_IEEE80211_DEBUG is not set
301CONFIG_IEEE80211_CRYPT_WEP=y 308CONFIG_IEEE80211_CRYPT_WEP=y
302CONFIG_IEEE80211_CRYPT_CCMP=y 309CONFIG_IEEE80211_CRYPT_CCMP=y
303CONFIG_IEEE80211_CRYPT_TKIP=y
304 310
305# 311#
306# Device Drivers 312# Device Drivers
@@ -403,6 +409,7 @@ CONFIG_CICADA_PHY=y
403# 409#
404CONFIG_NET_ETHERNET=y 410CONFIG_NET_ETHERNET=y
405# CONFIG_MII is not set 411# CONFIG_MII is not set
412# CONFIG_DM9000 is not set
406 413
407# 414#
408# Ethernet (1000 Mbit) 415# Ethernet (1000 Mbit)
@@ -492,6 +499,7 @@ CONFIG_HW_CONSOLE=y
492CONFIG_SERIAL_8250=y 499CONFIG_SERIAL_8250=y
493CONFIG_SERIAL_8250_CONSOLE=y 500CONFIG_SERIAL_8250_CONSOLE=y
494CONFIG_SERIAL_8250_NR_UARTS=4 501CONFIG_SERIAL_8250_NR_UARTS=4
502CONFIG_SERIAL_8250_RUNTIME_UARTS=4
495# CONFIG_SERIAL_8250_EXTENDED is not set 503# CONFIG_SERIAL_8250_EXTENDED is not set
496 504
497# 505#
@@ -534,6 +542,12 @@ CONFIG_LEGACY_PTY_COUNT=256
534# CONFIG_I2C is not set 542# CONFIG_I2C is not set
535 543
536# 544#
545# SPI support
546#
547# CONFIG_SPI is not set
548# CONFIG_SPI_MASTER is not set
549
550#
537# Dallas's 1-wire bus 551# Dallas's 1-wire bus
538# 552#
539# CONFIG_W1 is not set 553# CONFIG_W1 is not set
@@ -613,11 +627,11 @@ CONFIG_EXT2_FS=y
613# CONFIG_EXT2_FS_XATTR is not set 627# CONFIG_EXT2_FS_XATTR is not set
614# CONFIG_EXT2_FS_XIP is not set 628# CONFIG_EXT2_FS_XIP is not set
615# CONFIG_EXT3_FS is not set 629# CONFIG_EXT3_FS is not set
616# CONFIG_JBD is not set
617# CONFIG_REISERFS_FS is not set 630# CONFIG_REISERFS_FS is not set
618# CONFIG_JFS_FS is not set 631# CONFIG_JFS_FS is not set
619# CONFIG_FS_POSIX_ACL is not set 632# CONFIG_FS_POSIX_ACL is not set
620# CONFIG_XFS_FS is not set 633# CONFIG_XFS_FS is not set
634# CONFIG_OCFS2_FS is not set
621# CONFIG_MINIX_FS is not set 635# CONFIG_MINIX_FS is not set
622# CONFIG_ROMFS_FS is not set 636# CONFIG_ROMFS_FS is not set
623CONFIG_INOTIFY=y 637CONFIG_INOTIFY=y
@@ -650,6 +664,7 @@ CONFIG_SYSFS=y
650# CONFIG_HUGETLB_PAGE is not set 664# CONFIG_HUGETLB_PAGE is not set
651CONFIG_RAMFS=y 665CONFIG_RAMFS=y
652CONFIG_RELAYFS_FS=y 666CONFIG_RELAYFS_FS=y
667# CONFIG_CONFIGFS_FS is not set
653 668
654# 669#
655# Miscellaneous filesystems 670# Miscellaneous filesystems
@@ -712,6 +727,7 @@ CONFIG_MSDOS_PARTITION=y
712# Kernel hacking 727# Kernel hacking
713# 728#
714# CONFIG_PRINTK_TIME is not set 729# CONFIG_PRINTK_TIME is not set
730# CONFIG_MAGIC_SYSRQ is not set
715# CONFIG_DEBUG_KERNEL is not set 731# CONFIG_DEBUG_KERNEL is not set
716CONFIG_LOG_BUF_SHIFT=14 732CONFIG_LOG_BUF_SHIFT=14
717CONFIG_CROSSCOMPILE=y 733CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index b6126ad4d06d..c0f508d180c4 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:46 2005 4# Fri Jan 27 15:40:21 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -157,26 +157,28 @@ CONFIG_SYSVIPC=y
157# CONFIG_BSD_PROCESS_ACCT is not set 157# CONFIG_BSD_PROCESS_ACCT is not set
158CONFIG_SYSCTL=y 158CONFIG_SYSCTL=y
159# CONFIG_AUDIT is not set 159# CONFIG_AUDIT is not set
160CONFIG_HOTPLUG=y
161CONFIG_KOBJECT_UEVENT=y
162# CONFIG_IKCONFIG is not set 160# CONFIG_IKCONFIG is not set
163CONFIG_INITRAMFS_SOURCE="" 161CONFIG_INITRAMFS_SOURCE=""
162# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
164CONFIG_EMBEDDED=y 163CONFIG_EMBEDDED=y
165CONFIG_KALLSYMS=y 164CONFIG_KALLSYMS=y
166# CONFIG_KALLSYMS_EXTRA_PASS is not set 165# CONFIG_KALLSYMS_EXTRA_PASS is not set
166CONFIG_HOTPLUG=y
167CONFIG_PRINTK=y 167CONFIG_PRINTK=y
168CONFIG_BUG=y 168CONFIG_BUG=y
169CONFIG_ELF_CORE=y
169CONFIG_BASE_FULL=y 170CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 171CONFIG_FUTEX=y
171CONFIG_EPOLL=y 172CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y 173CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0 174CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0 175CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0 176CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0 177CONFIG_CC_ALIGN_JUMPS=0
178CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 179# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 180CONFIG_BASE_SMALL=0
181# CONFIG_SLOB is not set
180 182
181# 183#
182# Loadable module support 184# Loadable module support
@@ -223,7 +225,6 @@ CONFIG_MMU=y
223# 225#
224CONFIG_BINFMT_ELF=y 226CONFIG_BINFMT_ELF=y
225# CONFIG_BINFMT_MISC is not set 227# CONFIG_BINFMT_MISC is not set
226# CONFIG_BUILD_ELF64 is not set
227CONFIG_MIPS32_COMPAT=y 228CONFIG_MIPS32_COMPAT=y
228CONFIG_COMPAT=y 229CONFIG_COMPAT=y
229CONFIG_MIPS32_O32=y 230CONFIG_MIPS32_O32=y
@@ -284,6 +285,11 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_ATALK is not set 285# CONFIG_ATALK is not set
285# CONFIG_X25 is not set 286# CONFIG_X25 is not set
286# CONFIG_LAPB is not set 287# CONFIG_LAPB is not set
288
289#
290# TIPC Configuration (EXPERIMENTAL)
291#
292# CONFIG_TIPC is not set
287# CONFIG_NET_DIVERT is not set 293# CONFIG_NET_DIVERT is not set
288# CONFIG_ECONET is not set 294# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 295# CONFIG_WAN_ROUTER is not set
@@ -304,7 +310,6 @@ CONFIG_IEEE80211=y
304# CONFIG_IEEE80211_DEBUG is not set 310# CONFIG_IEEE80211_DEBUG is not set
305CONFIG_IEEE80211_CRYPT_WEP=y 311CONFIG_IEEE80211_CRYPT_WEP=y
306CONFIG_IEEE80211_CRYPT_CCMP=y 312CONFIG_IEEE80211_CRYPT_CCMP=y
307CONFIG_IEEE80211_CRYPT_TKIP=y
308 313
309# 314#
310# Device Drivers 315# Device Drivers
@@ -424,6 +429,7 @@ CONFIG_GALILEO_64240_ETH=y
424# CONFIG_SUNGEM is not set 429# CONFIG_SUNGEM is not set
425# CONFIG_CASSINI is not set 430# CONFIG_CASSINI is not set
426# CONFIG_NET_VENDOR_3COM is not set 431# CONFIG_NET_VENDOR_3COM is not set
432# CONFIG_DM9000 is not set
427 433
428# 434#
429# Tulip family network device support 435# Tulip family network device support
@@ -444,6 +450,7 @@ CONFIG_GALILEO_64240_ETH=y
444# CONFIG_R8169 is not set 450# CONFIG_R8169 is not set
445# CONFIG_SIS190 is not set 451# CONFIG_SIS190 is not set
446# CONFIG_SKGE is not set 452# CONFIG_SKGE is not set
453# CONFIG_SKY2 is not set
447# CONFIG_SK98LIN is not set 454# CONFIG_SK98LIN is not set
448# CONFIG_TIGON3 is not set 455# CONFIG_TIGON3 is not set
449# CONFIG_BNX2 is not set 456# CONFIG_BNX2 is not set
@@ -464,8 +471,6 @@ CONFIG_GALILEO_64240_ETH=y
464# Wireless LAN (non-hamradio) 471# Wireless LAN (non-hamradio)
465# 472#
466# CONFIG_NET_RADIO is not set 473# CONFIG_NET_RADIO is not set
467# CONFIG_IPW_DEBUG is not set
468CONFIG_IPW2200=y
469 474
470# 475#
471# Wan interfaces 476# Wan interfaces
@@ -541,6 +546,7 @@ CONFIG_HW_CONSOLE=y
541CONFIG_SERIAL_8250=y 546CONFIG_SERIAL_8250=y
542CONFIG_SERIAL_8250_CONSOLE=y 547CONFIG_SERIAL_8250_CONSOLE=y
543CONFIG_SERIAL_8250_NR_UARTS=4 548CONFIG_SERIAL_8250_NR_UARTS=4
549CONFIG_SERIAL_8250_RUNTIME_UARTS=4
544# CONFIG_SERIAL_8250_EXTENDED is not set 550# CONFIG_SERIAL_8250_EXTENDED is not set
545 551
546# 552#
@@ -548,7 +554,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
548# 554#
549CONFIG_SERIAL_CORE=y 555CONFIG_SERIAL_CORE=y
550CONFIG_SERIAL_CORE_CONSOLE=y 556CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_JSM is not set
552CONFIG_UNIX98_PTYS=y 557CONFIG_UNIX98_PTYS=y
553CONFIG_LEGACY_PTYS=y 558CONFIG_LEGACY_PTYS=y
554CONFIG_LEGACY_PTY_COUNT=256 559CONFIG_LEGACY_PTY_COUNT=256
@@ -586,6 +591,12 @@ CONFIG_LEGACY_PTY_COUNT=256
586# CONFIG_I2C is not set 591# CONFIG_I2C is not set
587 592
588# 593#
594# SPI support
595#
596# CONFIG_SPI is not set
597# CONFIG_SPI_MASTER is not set
598
599#
589# Dallas's 1-wire bus 600# Dallas's 1-wire bus
590# 601#
591# CONFIG_W1 is not set 602# CONFIG_W1 is not set
@@ -667,11 +678,11 @@ CONFIG_EXT2_FS=y
667# CONFIG_EXT2_FS_XATTR is not set 678# CONFIG_EXT2_FS_XATTR is not set
668# CONFIG_EXT2_FS_XIP is not set 679# CONFIG_EXT2_FS_XIP is not set
669# CONFIG_EXT3_FS is not set 680# CONFIG_EXT3_FS is not set
670# CONFIG_JBD is not set
671# CONFIG_REISERFS_FS is not set 681# CONFIG_REISERFS_FS is not set
672# CONFIG_JFS_FS is not set 682# CONFIG_JFS_FS is not set
673# CONFIG_FS_POSIX_ACL is not set 683# CONFIG_FS_POSIX_ACL is not set
674# CONFIG_XFS_FS is not set 684# CONFIG_XFS_FS is not set
685# CONFIG_OCFS2_FS is not set
675# CONFIG_MINIX_FS is not set 686# CONFIG_MINIX_FS is not set
676# CONFIG_ROMFS_FS is not set 687# CONFIG_ROMFS_FS is not set
677CONFIG_INOTIFY=y 688CONFIG_INOTIFY=y
@@ -704,6 +715,7 @@ CONFIG_SYSFS=y
704# CONFIG_HUGETLB_PAGE is not set 715# CONFIG_HUGETLB_PAGE is not set
705CONFIG_RAMFS=y 716CONFIG_RAMFS=y
706CONFIG_RELAYFS_FS=y 717CONFIG_RELAYFS_FS=y
718# CONFIG_CONFIGFS_FS is not set
707 719
708# 720#
709# Miscellaneous filesystems 721# Miscellaneous filesystems
@@ -766,6 +778,7 @@ CONFIG_MSDOS_PARTITION=y
766# Kernel hacking 778# Kernel hacking
767# 779#
768# CONFIG_PRINTK_TIME is not set 780# CONFIG_PRINTK_TIME is not set
781# CONFIG_MAGIC_SYSRQ is not set
769# CONFIG_DEBUG_KERNEL is not set 782# CONFIG_DEBUG_KERNEL is not set
770CONFIG_LOG_BUF_SHIFT=14 783CONFIG_LOG_BUF_SHIFT=14
771CONFIG_CROSSCOMPILE=y 784CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 883626afc47d..194b3c772bb7 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:48 2005 4# Fri Jan 27 15:40:22 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -153,26 +153,29 @@ CONFIG_SYSVIPC=y
153# CONFIG_BSD_PROCESS_ACCT is not set 153# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y 154CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 155# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 160CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_HOTPLUG=y
163CONFIG_PRINTK=y 163CONFIG_PRINTK=y
164CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 167CONFIG_FUTEX=y
167CONFIG_EPOLL=y 168CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
178CONFIG_OBSOLETE_INTERMODULE=y
176 179
177# 180#
178# Loadable module support 181# Loadable module support
@@ -287,6 +290,21 @@ CONFIG_NETFILTER_NETLINK=m
287CONFIG_NETFILTER_NETLINK_QUEUE=m 290CONFIG_NETFILTER_NETLINK_QUEUE=m
288CONFIG_NETFILTER_NETLINK_LOG=m 291CONFIG_NETFILTER_NETLINK_LOG=m
289# CONFIG_NF_CONNTRACK is not set 292# CONFIG_NF_CONNTRACK is not set
293CONFIG_NETFILTER_XTABLES=m
294CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
295CONFIG_NETFILTER_XT_TARGET_MARK=m
296CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
297CONFIG_NETFILTER_XT_MATCH_COMMENT=m
298CONFIG_NETFILTER_XT_MATCH_DCCP=m
299CONFIG_NETFILTER_XT_MATCH_LENGTH=m
300CONFIG_NETFILTER_XT_MATCH_LIMIT=m
301CONFIG_NETFILTER_XT_MATCH_MAC=m
302CONFIG_NETFILTER_XT_MATCH_MARK=m
303CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
304CONFIG_NETFILTER_XT_MATCH_REALM=m
305CONFIG_NETFILTER_XT_MATCH_SCTP=m
306CONFIG_NETFILTER_XT_MATCH_STRING=m
307CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
290 308
291# 309#
292# IP: Netfilter Configuration 310# IP: Netfilter Configuration
@@ -314,6 +332,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
314# CONFIG_ATALK is not set 332# CONFIG_ATALK is not set
315# CONFIG_X25 is not set 333# CONFIG_X25 is not set
316# CONFIG_LAPB is not set 334# CONFIG_LAPB is not set
335
336#
337# TIPC Configuration (EXPERIMENTAL)
338#
339# CONFIG_TIPC is not set
317# CONFIG_NET_DIVERT is not set 340# CONFIG_NET_DIVERT is not set
318# CONFIG_ECONET is not set 341# CONFIG_ECONET is not set
319# CONFIG_WAN_ROUTER is not set 342# CONFIG_WAN_ROUTER is not set
@@ -322,6 +345,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
322# QoS and/or fair queueing 345# QoS and/or fair queueing
323# 346#
324# CONFIG_NET_SCHED is not set 347# CONFIG_NET_SCHED is not set
348CONFIG_NET_CLS_ROUTE=y
325 349
326# 350#
327# Network testing 351# Network testing
@@ -334,7 +358,6 @@ CONFIG_IEEE80211=m
334# CONFIG_IEEE80211_DEBUG is not set 358# CONFIG_IEEE80211_DEBUG is not set
335CONFIG_IEEE80211_CRYPT_WEP=m 359CONFIG_IEEE80211_CRYPT_WEP=m
336CONFIG_IEEE80211_CRYPT_CCMP=m 360CONFIG_IEEE80211_CRYPT_CCMP=m
337CONFIG_IEEE80211_CRYPT_TKIP=m
338 361
339# 362#
340# Device Drivers 363# Device Drivers
@@ -397,6 +420,7 @@ CONFIG_MTD_CFI_UTIL=y
397# CONFIG_MTD_RAM is not set 420# CONFIG_MTD_RAM is not set
398# CONFIG_MTD_ROM is not set 421# CONFIG_MTD_ROM is not set
399# CONFIG_MTD_ABSENT is not set 422# CONFIG_MTD_ABSENT is not set
423# CONFIG_MTD_OBSOLETE_CHIPS is not set
400 424
401# 425#
402# Mapping drivers for chip access 426# Mapping drivers for chip access
@@ -514,6 +538,7 @@ CONFIG_NET_ETHERNET=y
514# CONFIG_MII is not set 538# CONFIG_MII is not set
515# CONFIG_MIPS_AU1X00_ENET is not set 539# CONFIG_MIPS_AU1X00_ENET is not set
516# CONFIG_SMC91X is not set 540# CONFIG_SMC91X is not set
541# CONFIG_DM9000 is not set
517 542
518# 543#
519# Ethernet (1000 Mbit) 544# Ethernet (1000 Mbit)
@@ -619,13 +644,13 @@ CONFIG_SERIAL_8250=y
619CONFIG_SERIAL_8250_CONSOLE=y 644CONFIG_SERIAL_8250_CONSOLE=y
620# CONFIG_SERIAL_8250_CS is not set 645# CONFIG_SERIAL_8250_CS is not set
621CONFIG_SERIAL_8250_NR_UARTS=4 646CONFIG_SERIAL_8250_NR_UARTS=4
647CONFIG_SERIAL_8250_RUNTIME_UARTS=4
622# CONFIG_SERIAL_8250_EXTENDED is not set 648# CONFIG_SERIAL_8250_EXTENDED is not set
623CONFIG_SERIAL_8250_AU1X00=y 649CONFIG_SERIAL_8250_AU1X00=y
624 650
625# 651#
626# Non-8250 serial port support 652# Non-8250 serial port support
627# 653#
628# CONFIG_SERIAL_AU1X00 is not set
629CONFIG_SERIAL_CORE=y 654CONFIG_SERIAL_CORE=y
630CONFIG_SERIAL_CORE_CONSOLE=y 655CONFIG_SERIAL_CORE_CONSOLE=y
631CONFIG_UNIX98_PTYS=y 656CONFIG_UNIX98_PTYS=y
@@ -670,6 +695,12 @@ CONFIG_SYNCLINK_CS=m
670# CONFIG_I2C is not set 695# CONFIG_I2C is not set
671 696
672# 697#
698# SPI support
699#
700# CONFIG_SPI is not set
701# CONFIG_SPI_MASTER is not set
702
703#
673# Dallas's 1-wire bus 704# Dallas's 1-wire bus
674# 705#
675# CONFIG_W1 is not set 706# CONFIG_W1 is not set
@@ -767,6 +798,7 @@ CONFIG_REISERFS_FS_SECURITY=y
767# CONFIG_JFS_FS is not set 798# CONFIG_JFS_FS is not set
768CONFIG_FS_POSIX_ACL=y 799CONFIG_FS_POSIX_ACL=y
769# CONFIG_XFS_FS is not set 800# CONFIG_XFS_FS is not set
801# CONFIG_OCFS2_FS is not set
770# CONFIG_MINIX_FS is not set 802# CONFIG_MINIX_FS is not set
771# CONFIG_ROMFS_FS is not set 803# CONFIG_ROMFS_FS is not set
772CONFIG_INOTIFY=y 804CONFIG_INOTIFY=y
@@ -799,6 +831,7 @@ CONFIG_TMPFS=y
799# CONFIG_HUGETLB_PAGE is not set 831# CONFIG_HUGETLB_PAGE is not set
800CONFIG_RAMFS=y 832CONFIG_RAMFS=y
801CONFIG_RELAYFS_FS=m 833CONFIG_RELAYFS_FS=m
834# CONFIG_CONFIGFS_FS is not set
802 835
803# 836#
804# Miscellaneous filesystems 837# Miscellaneous filesystems
@@ -903,6 +936,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
903# Kernel hacking 936# Kernel hacking
904# 937#
905# CONFIG_PRINTK_TIME is not set 938# CONFIG_PRINTK_TIME is not set
939# CONFIG_MAGIC_SYSRQ is not set
906# CONFIG_DEBUG_KERNEL is not set 940# CONFIG_DEBUG_KERNEL is not set
907CONFIG_LOG_BUF_SHIFT=14 941CONFIG_LOG_BUF_SHIFT=14
908CONFIG_CROSSCOMPILE=y 942CONFIG_CROSSCOMPILE=y
@@ -957,3 +991,7 @@ CONFIG_CRC32=y
957CONFIG_LIBCRC32C=m 991CONFIG_LIBCRC32C=m
958CONFIG_ZLIB_INFLATE=m 992CONFIG_ZLIB_INFLATE=m
959CONFIG_ZLIB_DEFLATE=m 993CONFIG_ZLIB_DEFLATE=m
994CONFIG_TEXTSEARCH=y
995CONFIG_TEXTSEARCH_KMP=m
996CONFIG_TEXTSEARCH_BM=m
997CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index f8fbc77f924e..8985725e6a98 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:50 2005 4# Fri Jan 27 15:40:24 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -152,26 +152,29 @@ CONFIG_SYSVIPC=y
152# CONFIG_BSD_PROCESS_ACCT is not set 152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
155CONFIG_HOTPLUG=y
156CONFIG_KOBJECT_UEVENT=y
157# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set 160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_HOTPLUG=y
162CONFIG_PRINTK=y 162CONFIG_PRINTK=y
163CONFIG_BUG=y 163CONFIG_BUG=y
164CONFIG_ELF_CORE=y
164CONFIG_BASE_FULL=y 165CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y 168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0 169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0 170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0 171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0 172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
176# CONFIG_SLOB is not set
177CONFIG_OBSOLETE_INTERMODULE=y
175 178
176# 179#
177# Loadable module support 180# Loadable module support
@@ -293,6 +296,21 @@ CONFIG_NETFILTER_NETLINK=m
293CONFIG_NETFILTER_NETLINK_QUEUE=m 296CONFIG_NETFILTER_NETLINK_QUEUE=m
294CONFIG_NETFILTER_NETLINK_LOG=m 297CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set 298# CONFIG_NF_CONNTRACK is not set
299CONFIG_NETFILTER_XTABLES=m
300CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
301CONFIG_NETFILTER_XT_TARGET_MARK=m
302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
303CONFIG_NETFILTER_XT_MATCH_COMMENT=m
304CONFIG_NETFILTER_XT_MATCH_DCCP=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m
306CONFIG_NETFILTER_XT_MATCH_LIMIT=m
307CONFIG_NETFILTER_XT_MATCH_MAC=m
308CONFIG_NETFILTER_XT_MATCH_MARK=m
309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
310CONFIG_NETFILTER_XT_MATCH_REALM=m
311CONFIG_NETFILTER_XT_MATCH_SCTP=m
312CONFIG_NETFILTER_XT_MATCH_STRING=m
313CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
296 314
297# 315#
298# IP: Netfilter Configuration 316# IP: Netfilter Configuration
@@ -320,6 +338,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
321# CONFIG_X25 is not set 339# CONFIG_X25 is not set
322# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
341
342#
343# TIPC Configuration (EXPERIMENTAL)
344#
345# CONFIG_TIPC is not set
323# CONFIG_NET_DIVERT is not set 346# CONFIG_NET_DIVERT is not set
324# CONFIG_ECONET is not set 347# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 348# CONFIG_WAN_ROUTER is not set
@@ -328,6 +351,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
328# QoS and/or fair queueing 351# QoS and/or fair queueing
329# 352#
330# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354CONFIG_NET_CLS_ROUTE=y
331 355
332# 356#
333# Network testing 357# Network testing
@@ -340,7 +364,6 @@ CONFIG_IEEE80211=m
340# CONFIG_IEEE80211_DEBUG is not set 364# CONFIG_IEEE80211_DEBUG is not set
341CONFIG_IEEE80211_CRYPT_WEP=m 365CONFIG_IEEE80211_CRYPT_WEP=m
342CONFIG_IEEE80211_CRYPT_CCMP=m 366CONFIG_IEEE80211_CRYPT_CCMP=m
343CONFIG_IEEE80211_CRYPT_TKIP=m
344 367
345# 368#
346# Device Drivers 369# Device Drivers
@@ -403,6 +426,7 @@ CONFIG_MTD_CFI_UTIL=y
403# CONFIG_MTD_RAM is not set 426# CONFIG_MTD_RAM is not set
404# CONFIG_MTD_ROM is not set 427# CONFIG_MTD_ROM is not set
405# CONFIG_MTD_ABSENT is not set 428# CONFIG_MTD_ABSENT is not set
429# CONFIG_MTD_OBSOLETE_CHIPS is not set
406 430
407# 431#
408# Mapping drivers for chip access 432# Mapping drivers for chip access
@@ -589,6 +613,7 @@ CONFIG_MIPS_AU1X00_ENET=y
589# CONFIG_CASSINI is not set 613# CONFIG_CASSINI is not set
590# CONFIG_NET_VENDOR_3COM is not set 614# CONFIG_NET_VENDOR_3COM is not set
591# CONFIG_SMC91X is not set 615# CONFIG_SMC91X is not set
616# CONFIG_DM9000 is not set
592 617
593# 618#
594# Tulip family network device support 619# Tulip family network device support
@@ -609,6 +634,7 @@ CONFIG_MIPS_AU1X00_ENET=y
609# CONFIG_R8169 is not set 634# CONFIG_R8169 is not set
610# CONFIG_SIS190 is not set 635# CONFIG_SIS190 is not set
611# CONFIG_SKGE is not set 636# CONFIG_SKGE is not set
637# CONFIG_SKY2 is not set
612# CONFIG_SK98LIN is not set 638# CONFIG_SK98LIN is not set
613# CONFIG_TIGON3 is not set 639# CONFIG_TIGON3 is not set
614# CONFIG_BNX2 is not set 640# CONFIG_BNX2 is not set
@@ -629,8 +655,6 @@ CONFIG_MIPS_AU1X00_ENET=y
629# Wireless LAN (non-hamradio) 655# Wireless LAN (non-hamradio)
630# 656#
631# CONFIG_NET_RADIO is not set 657# CONFIG_NET_RADIO is not set
632# CONFIG_IPW_DEBUG is not set
633CONFIG_IPW2200=m
634 658
635# 659#
636# PCMCIA network device support 660# PCMCIA network device support
@@ -728,16 +752,15 @@ CONFIG_SERIAL_8250=y
728CONFIG_SERIAL_8250_CONSOLE=y 752CONFIG_SERIAL_8250_CONSOLE=y
729# CONFIG_SERIAL_8250_CS is not set 753# CONFIG_SERIAL_8250_CS is not set
730CONFIG_SERIAL_8250_NR_UARTS=4 754CONFIG_SERIAL_8250_NR_UARTS=4
755CONFIG_SERIAL_8250_RUNTIME_UARTS=4
731# CONFIG_SERIAL_8250_EXTENDED is not set 756# CONFIG_SERIAL_8250_EXTENDED is not set
732CONFIG_SERIAL_8250_AU1X00=y 757CONFIG_SERIAL_8250_AU1X00=y
733 758
734# 759#
735# Non-8250 serial port support 760# Non-8250 serial port support
736# 761#
737# CONFIG_SERIAL_AU1X00 is not set
738CONFIG_SERIAL_CORE=y 762CONFIG_SERIAL_CORE=y
739CONFIG_SERIAL_CORE_CONSOLE=y 763CONFIG_SERIAL_CORE_CONSOLE=y
740# CONFIG_SERIAL_JSM is not set
741CONFIG_UNIX98_PTYS=y 764CONFIG_UNIX98_PTYS=y
742CONFIG_LEGACY_PTYS=y 765CONFIG_LEGACY_PTYS=y
743CONFIG_LEGACY_PTY_COUNT=256 766CONFIG_LEGACY_PTY_COUNT=256
@@ -782,6 +805,12 @@ CONFIG_SYNCLINK_CS=m
782# CONFIG_I2C is not set 805# CONFIG_I2C is not set
783 806
784# 807#
808# SPI support
809#
810# CONFIG_SPI is not set
811# CONFIG_SPI_MASTER is not set
812
813#
785# Dallas's 1-wire bus 814# Dallas's 1-wire bus
786# 815#
787# CONFIG_W1 is not set 816# CONFIG_W1 is not set
@@ -874,6 +903,7 @@ CONFIG_REISERFS_FS_SECURITY=y
874# CONFIG_JFS_FS is not set 903# CONFIG_JFS_FS is not set
875CONFIG_FS_POSIX_ACL=y 904CONFIG_FS_POSIX_ACL=y
876# CONFIG_XFS_FS is not set 905# CONFIG_XFS_FS is not set
906# CONFIG_OCFS2_FS is not set
877# CONFIG_MINIX_FS is not set 907# CONFIG_MINIX_FS is not set
878# CONFIG_ROMFS_FS is not set 908# CONFIG_ROMFS_FS is not set
879CONFIG_INOTIFY=y 909CONFIG_INOTIFY=y
@@ -906,6 +936,7 @@ CONFIG_TMPFS=y
906# CONFIG_HUGETLB_PAGE is not set 936# CONFIG_HUGETLB_PAGE is not set
907CONFIG_RAMFS=y 937CONFIG_RAMFS=y
908CONFIG_RELAYFS_FS=m 938CONFIG_RELAYFS_FS=m
939# CONFIG_CONFIGFS_FS is not set
909 940
910# 941#
911# Miscellaneous filesystems 942# Miscellaneous filesystems
@@ -1010,6 +1041,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1010# Kernel hacking 1041# Kernel hacking
1011# 1042#
1012# CONFIG_PRINTK_TIME is not set 1043# CONFIG_PRINTK_TIME is not set
1044# CONFIG_MAGIC_SYSRQ is not set
1013# CONFIG_DEBUG_KERNEL is not set 1045# CONFIG_DEBUG_KERNEL is not set
1014CONFIG_LOG_BUF_SHIFT=14 1046CONFIG_LOG_BUF_SHIFT=14
1015CONFIG_CROSSCOMPILE=y 1047CONFIG_CROSSCOMPILE=y
@@ -1064,3 +1096,7 @@ CONFIG_CRC32=y
1064CONFIG_LIBCRC32C=m 1096CONFIG_LIBCRC32C=m
1065CONFIG_ZLIB_INFLATE=m 1097CONFIG_ZLIB_INFLATE=m
1066CONFIG_ZLIB_DEFLATE=m 1098CONFIG_ZLIB_DEFLATE=m
1099CONFIG_TEXTSEARCH=y
1100CONFIG_TEXTSEARCH_KMP=m
1101CONFIG_TEXTSEARCH_BM=m
1102CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index 3d694cd68d38..adbf997b540e 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:52 2005 4# Fri Jan 27 15:40:25 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -152,26 +152,29 @@ CONFIG_SYSVIPC=y
152# CONFIG_BSD_PROCESS_ACCT is not set 152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
155CONFIG_HOTPLUG=y
156CONFIG_KOBJECT_UEVENT=y
157# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set 160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_HOTPLUG=y
162CONFIG_PRINTK=y 162CONFIG_PRINTK=y
163CONFIG_BUG=y 163CONFIG_BUG=y
164CONFIG_ELF_CORE=y
164CONFIG_BASE_FULL=y 165CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 166CONFIG_FUTEX=y
166CONFIG_EPOLL=y 167CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y 168CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0 169CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0 170CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0 171CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0 172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
176# CONFIG_SLOB is not set
177CONFIG_OBSOLETE_INTERMODULE=y
175 178
176# 179#
177# Loadable module support 180# Loadable module support
@@ -293,6 +296,21 @@ CONFIG_NETFILTER_NETLINK=m
293CONFIG_NETFILTER_NETLINK_QUEUE=m 296CONFIG_NETFILTER_NETLINK_QUEUE=m
294CONFIG_NETFILTER_NETLINK_LOG=m 297CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set 298# CONFIG_NF_CONNTRACK is not set
299CONFIG_NETFILTER_XTABLES=m
300CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
301CONFIG_NETFILTER_XT_TARGET_MARK=m
302CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
303CONFIG_NETFILTER_XT_MATCH_COMMENT=m
304CONFIG_NETFILTER_XT_MATCH_DCCP=m
305CONFIG_NETFILTER_XT_MATCH_LENGTH=m
306CONFIG_NETFILTER_XT_MATCH_LIMIT=m
307CONFIG_NETFILTER_XT_MATCH_MAC=m
308CONFIG_NETFILTER_XT_MATCH_MARK=m
309CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
310CONFIG_NETFILTER_XT_MATCH_REALM=m
311CONFIG_NETFILTER_XT_MATCH_SCTP=m
312CONFIG_NETFILTER_XT_MATCH_STRING=m
313CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
296 314
297# 315#
298# IP: Netfilter Configuration 316# IP: Netfilter Configuration
@@ -320,6 +338,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
320# CONFIG_ATALK is not set 338# CONFIG_ATALK is not set
321# CONFIG_X25 is not set 339# CONFIG_X25 is not set
322# CONFIG_LAPB is not set 340# CONFIG_LAPB is not set
341
342#
343# TIPC Configuration (EXPERIMENTAL)
344#
345# CONFIG_TIPC is not set
323# CONFIG_NET_DIVERT is not set 346# CONFIG_NET_DIVERT is not set
324# CONFIG_ECONET is not set 347# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 348# CONFIG_WAN_ROUTER is not set
@@ -328,6 +351,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
328# QoS and/or fair queueing 351# QoS and/or fair queueing
329# 352#
330# CONFIG_NET_SCHED is not set 353# CONFIG_NET_SCHED is not set
354CONFIG_NET_CLS_ROUTE=y
331 355
332# 356#
333# Network testing 357# Network testing
@@ -340,7 +364,6 @@ CONFIG_IEEE80211=m
340# CONFIG_IEEE80211_DEBUG is not set 364# CONFIG_IEEE80211_DEBUG is not set
341CONFIG_IEEE80211_CRYPT_WEP=m 365CONFIG_IEEE80211_CRYPT_WEP=m
342CONFIG_IEEE80211_CRYPT_CCMP=m 366CONFIG_IEEE80211_CRYPT_CCMP=m
343CONFIG_IEEE80211_CRYPT_TKIP=m
344 367
345# 368#
346# Device Drivers 369# Device Drivers
@@ -403,6 +426,7 @@ CONFIG_MTD_CFI_UTIL=y
403# CONFIG_MTD_RAM is not set 426# CONFIG_MTD_RAM is not set
404# CONFIG_MTD_ROM is not set 427# CONFIG_MTD_ROM is not set
405# CONFIG_MTD_ABSENT is not set 428# CONFIG_MTD_ABSENT is not set
429# CONFIG_MTD_OBSOLETE_CHIPS is not set
406 430
407# 431#
408# Mapping drivers for chip access 432# Mapping drivers for chip access
@@ -589,6 +613,7 @@ CONFIG_MIPS_AU1X00_ENET=y
589# CONFIG_CASSINI is not set 613# CONFIG_CASSINI is not set
590# CONFIG_NET_VENDOR_3COM is not set 614# CONFIG_NET_VENDOR_3COM is not set
591# CONFIG_SMC91X is not set 615# CONFIG_SMC91X is not set
616# CONFIG_DM9000 is not set
592 617
593# 618#
594# Tulip family network device support 619# Tulip family network device support
@@ -609,6 +634,7 @@ CONFIG_MIPS_AU1X00_ENET=y
609# CONFIG_R8169 is not set 634# CONFIG_R8169 is not set
610# CONFIG_SIS190 is not set 635# CONFIG_SIS190 is not set
611# CONFIG_SKGE is not set 636# CONFIG_SKGE is not set
637# CONFIG_SKY2 is not set
612# CONFIG_SK98LIN is not set 638# CONFIG_SK98LIN is not set
613# CONFIG_TIGON3 is not set 639# CONFIG_TIGON3 is not set
614# CONFIG_BNX2 is not set 640# CONFIG_BNX2 is not set
@@ -629,8 +655,6 @@ CONFIG_MIPS_AU1X00_ENET=y
629# Wireless LAN (non-hamradio) 655# Wireless LAN (non-hamradio)
630# 656#
631# CONFIG_NET_RADIO is not set 657# CONFIG_NET_RADIO is not set
632# CONFIG_IPW_DEBUG is not set
633CONFIG_IPW2200=m
634 658
635# 659#
636# PCMCIA network device support 660# PCMCIA network device support
@@ -720,16 +744,15 @@ CONFIG_SERIAL_8250=y
720CONFIG_SERIAL_8250_CONSOLE=y 744CONFIG_SERIAL_8250_CONSOLE=y
721# CONFIG_SERIAL_8250_CS is not set 745# CONFIG_SERIAL_8250_CS is not set
722CONFIG_SERIAL_8250_NR_UARTS=4 746CONFIG_SERIAL_8250_NR_UARTS=4
747CONFIG_SERIAL_8250_RUNTIME_UARTS=4
723# CONFIG_SERIAL_8250_EXTENDED is not set 748# CONFIG_SERIAL_8250_EXTENDED is not set
724CONFIG_SERIAL_8250_AU1X00=y 749CONFIG_SERIAL_8250_AU1X00=y
725 750
726# 751#
727# Non-8250 serial port support 752# Non-8250 serial port support
728# 753#
729# CONFIG_SERIAL_AU1X00 is not set
730CONFIG_SERIAL_CORE=y 754CONFIG_SERIAL_CORE=y
731CONFIG_SERIAL_CORE_CONSOLE=y 755CONFIG_SERIAL_CORE_CONSOLE=y
732# CONFIG_SERIAL_JSM is not set
733CONFIG_UNIX98_PTYS=y 756CONFIG_UNIX98_PTYS=y
734CONFIG_LEGACY_PTYS=y 757CONFIG_LEGACY_PTYS=y
735CONFIG_LEGACY_PTY_COUNT=256 758CONFIG_LEGACY_PTY_COUNT=256
@@ -774,6 +797,12 @@ CONFIG_SYNCLINK_CS=m
774# CONFIG_I2C is not set 797# CONFIG_I2C is not set
775 798
776# 799#
800# SPI support
801#
802# CONFIG_SPI is not set
803# CONFIG_SPI_MASTER is not set
804
805#
777# Dallas's 1-wire bus 806# Dallas's 1-wire bus
778# 807#
779# CONFIG_W1 is not set 808# CONFIG_W1 is not set
@@ -866,6 +895,7 @@ CONFIG_REISERFS_FS_SECURITY=y
866# CONFIG_JFS_FS is not set 895# CONFIG_JFS_FS is not set
867CONFIG_FS_POSIX_ACL=y 896CONFIG_FS_POSIX_ACL=y
868# CONFIG_XFS_FS is not set 897# CONFIG_XFS_FS is not set
898# CONFIG_OCFS2_FS is not set
869# CONFIG_MINIX_FS is not set 899# CONFIG_MINIX_FS is not set
870# CONFIG_ROMFS_FS is not set 900# CONFIG_ROMFS_FS is not set
871CONFIG_INOTIFY=y 901CONFIG_INOTIFY=y
@@ -898,6 +928,7 @@ CONFIG_TMPFS=y
898# CONFIG_HUGETLB_PAGE is not set 928# CONFIG_HUGETLB_PAGE is not set
899CONFIG_RAMFS=y 929CONFIG_RAMFS=y
900CONFIG_RELAYFS_FS=m 930CONFIG_RELAYFS_FS=m
931# CONFIG_CONFIGFS_FS is not set
901 932
902# 933#
903# Miscellaneous filesystems 934# Miscellaneous filesystems
@@ -1002,6 +1033,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1002# Kernel hacking 1033# Kernel hacking
1003# 1034#
1004# CONFIG_PRINTK_TIME is not set 1035# CONFIG_PRINTK_TIME is not set
1036# CONFIG_MAGIC_SYSRQ is not set
1005# CONFIG_DEBUG_KERNEL is not set 1037# CONFIG_DEBUG_KERNEL is not set
1006CONFIG_LOG_BUF_SHIFT=14 1038CONFIG_LOG_BUF_SHIFT=14
1007CONFIG_CROSSCOMPILE=y 1039CONFIG_CROSSCOMPILE=y
@@ -1056,3 +1088,7 @@ CONFIG_CRC32=y
1056CONFIG_LIBCRC32C=m 1088CONFIG_LIBCRC32C=m
1057CONFIG_ZLIB_INFLATE=m 1089CONFIG_ZLIB_INFLATE=m
1058CONFIG_ZLIB_DEFLATE=m 1090CONFIG_ZLIB_DEFLATE=m
1091CONFIG_TEXTSEARCH=y
1092CONFIG_TEXTSEARCH_KMP=m
1093CONFIG_TEXTSEARCH_BM=m
1094CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index fba624a792a9..b5db700450ba 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:54 2005 4# Fri Jan 27 15:40:26 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -151,28 +151,30 @@ CONFIG_SYSVIPC=y
151# CONFIG_BSD_PROCESS_ACCT is not set 151# CONFIG_BSD_PROCESS_ACCT is not set
152CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
153# CONFIG_AUDIT is not set 153# CONFIG_AUDIT is not set
154# CONFIG_HOTPLUG is not set
155CONFIG_KOBJECT_UEVENT=y
156CONFIG_IKCONFIG=y 154CONFIG_IKCONFIG=y
157CONFIG_IKCONFIG_PROC=y 155CONFIG_IKCONFIG_PROC=y
158CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_ALL is not set 160# CONFIG_KALLSYMS_ALL is not set
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_HOTPLUG=y
163CONFIG_PRINTK=y 163CONFIG_PRINTK=y
164CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 167CONFIG_FUTEX=y
167CONFIG_EPOLL=y 168CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
176 178
177# 179#
178# Loadable module support 180# Loadable module support
@@ -281,6 +283,11 @@ CONFIG_TCP_CONG_BIC=y
281# CONFIG_ATALK is not set 283# CONFIG_ATALK is not set
282# CONFIG_X25 is not set 284# CONFIG_X25 is not set
283# CONFIG_LAPB is not set 285# CONFIG_LAPB is not set
286
287#
288# TIPC Configuration (EXPERIMENTAL)
289#
290# CONFIG_TIPC is not set
284# CONFIG_NET_DIVERT is not set 291# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set 292# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 293# CONFIG_WAN_ROUTER is not set
@@ -308,7 +315,7 @@ CONFIG_TCP_CONG_BIC=y
308# 315#
309CONFIG_STANDALONE=y 316CONFIG_STANDALONE=y
310CONFIG_PREVENT_FIRMWARE_BUILD=y 317CONFIG_PREVENT_FIRMWARE_BUILD=y
311# CONFIG_FW_LOADER is not set 318CONFIG_FW_LOADER=y
312# CONFIG_DEBUG_DRIVER is not set 319# CONFIG_DEBUG_DRIVER is not set
313 320
314# 321#
@@ -435,7 +442,7 @@ CONFIG_SCSI_CONSTANTS=y
435# SCSI Transport Attributes 442# SCSI Transport Attributes
436# 443#
437# CONFIG_SCSI_SPI_ATTRS is not set 444# CONFIG_SCSI_SPI_ATTRS is not set
438# CONFIG_SCSI_FC_ATTRS is not set 445CONFIG_SCSI_FC_ATTRS=y
439CONFIG_SCSI_ISCSI_ATTRS=m 446CONFIG_SCSI_ISCSI_ATTRS=m
440# CONFIG_SCSI_SAS_ATTRS is not set 447# CONFIG_SCSI_SAS_ATTRS is not set
441 448
@@ -464,13 +471,7 @@ CONFIG_ISCSI_TCP=m
464# CONFIG_SCSI_IPR is not set 471# CONFIG_SCSI_IPR is not set
465# CONFIG_SCSI_QLOGIC_FC is not set 472# CONFIG_SCSI_QLOGIC_FC is not set
466# CONFIG_SCSI_QLOGIC_1280 is not set 473# CONFIG_SCSI_QLOGIC_1280 is not set
467CONFIG_SCSI_QLA2XXX=y 474# CONFIG_SCSI_QLA_FC is not set
468# CONFIG_SCSI_QLA21XX is not set
469# CONFIG_SCSI_QLA22XX is not set
470# CONFIG_SCSI_QLA2300 is not set
471# CONFIG_SCSI_QLA2322 is not set
472# CONFIG_SCSI_QLA6312 is not set
473# CONFIG_SCSI_QLA24XX is not set
474# CONFIG_SCSI_LPFC is not set 475# CONFIG_SCSI_LPFC is not set
475# CONFIG_SCSI_DC395x is not set 476# CONFIG_SCSI_DC395x is not set
476# CONFIG_SCSI_DC390T is not set 477# CONFIG_SCSI_DC390T is not set
@@ -528,6 +529,7 @@ CONFIG_MII=y
528# CONFIG_SUNGEM is not set 529# CONFIG_SUNGEM is not set
529# CONFIG_CASSINI is not set 530# CONFIG_CASSINI is not set
530# CONFIG_NET_VENDOR_3COM is not set 531# CONFIG_NET_VENDOR_3COM is not set
532# CONFIG_DM9000 is not set
531 533
532# 534#
533# Tulip family network device support 535# Tulip family network device support
@@ -571,6 +573,7 @@ CONFIG_8139TOO_8129=y
571# CONFIG_R8169 is not set 573# CONFIG_R8169 is not set
572# CONFIG_SIS190 is not set 574# CONFIG_SIS190 is not set
573# CONFIG_SKGE is not set 575# CONFIG_SKGE is not set
576# CONFIG_SKY2 is not set
574# CONFIG_SK98LIN is not set 577# CONFIG_SK98LIN is not set
575# CONFIG_VIA_VELOCITY is not set 578# CONFIG_VIA_VELOCITY is not set
576# CONFIG_TIGON3 is not set 579# CONFIG_TIGON3 is not set
@@ -668,7 +671,6 @@ CONFIG_HW_CONSOLE=y
668# Non-8250 serial port support 671# Non-8250 serial port support
669# 672#
670# CONFIG_SERIAL_IP3106 is not set 673# CONFIG_SERIAL_IP3106 is not set
671# CONFIG_SERIAL_JSM is not set
672CONFIG_UNIX98_PTYS=y 674CONFIG_UNIX98_PTYS=y
673CONFIG_LEGACY_PTYS=y 675CONFIG_LEGACY_PTYS=y
674CONFIG_LEGACY_PTY_COUNT=256 676CONFIG_LEGACY_PTY_COUNT=256
@@ -706,6 +708,12 @@ CONFIG_LEGACY_PTY_COUNT=256
706# CONFIG_I2C is not set 708# CONFIG_I2C is not set
707 709
708# 710#
711# SPI support
712#
713# CONFIG_SPI is not set
714# CONFIG_SPI_MASTER is not set
715
716#
709# Dallas's 1-wire bus 717# Dallas's 1-wire bus
710# 718#
711# CONFIG_W1 is not set 719# CONFIG_W1 is not set
@@ -801,6 +809,8 @@ CONFIG_USB_STORAGE_USBAT=y
801CONFIG_USB_STORAGE_SDDR09=y 809CONFIG_USB_STORAGE_SDDR09=y
802CONFIG_USB_STORAGE_SDDR55=y 810CONFIG_USB_STORAGE_SDDR55=y
803CONFIG_USB_STORAGE_JUMPSHOT=y 811CONFIG_USB_STORAGE_JUMPSHOT=y
812# CONFIG_USB_STORAGE_ALAUDA is not set
813# CONFIG_USB_LIBUSUAL is not set
804 814
805# 815#
806# USB Input Devices 816# USB Input Devices
@@ -823,6 +833,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
823# CONFIG_USB_YEALINK is not set 833# CONFIG_USB_YEALINK is not set
824# CONFIG_USB_XPAD is not set 834# CONFIG_USB_XPAD is not set
825# CONFIG_USB_ATI_REMOTE is not set 835# CONFIG_USB_ATI_REMOTE is not set
836# CONFIG_USB_ATI_REMOTE2 is not set
826# CONFIG_USB_KEYSPAN_REMOTE is not set 837# CONFIG_USB_KEYSPAN_REMOTE is not set
827# CONFIG_USB_APPLETOUCH is not set 838# CONFIG_USB_APPLETOUCH is not set
828 839
@@ -906,11 +917,11 @@ CONFIG_EXT2_FS=y
906# CONFIG_EXT2_FS_XATTR is not set 917# CONFIG_EXT2_FS_XATTR is not set
907# CONFIG_EXT2_FS_XIP is not set 918# CONFIG_EXT2_FS_XIP is not set
908# CONFIG_EXT3_FS is not set 919# CONFIG_EXT3_FS is not set
909# CONFIG_JBD is not set
910# CONFIG_REISERFS_FS is not set 920# CONFIG_REISERFS_FS is not set
911# CONFIG_JFS_FS is not set 921# CONFIG_JFS_FS is not set
912# CONFIG_FS_POSIX_ACL is not set 922# CONFIG_FS_POSIX_ACL is not set
913# CONFIG_XFS_FS is not set 923# CONFIG_XFS_FS is not set
924# CONFIG_OCFS2_FS is not set
914# CONFIG_MINIX_FS is not set 925# CONFIG_MINIX_FS is not set
915# CONFIG_ROMFS_FS is not set 926# CONFIG_ROMFS_FS is not set
916CONFIG_INOTIFY=y 927CONFIG_INOTIFY=y
@@ -946,6 +957,7 @@ CONFIG_TMPFS=y
946# CONFIG_HUGETLB_PAGE is not set 957# CONFIG_HUGETLB_PAGE is not set
947CONFIG_RAMFS=y 958CONFIG_RAMFS=y
948# CONFIG_RELAYFS_FS is not set 959# CONFIG_RELAYFS_FS is not set
960# CONFIG_CONFIGFS_FS is not set
949 961
950# 962#
951# Miscellaneous filesystems 963# Miscellaneous filesystems
@@ -1049,18 +1061,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1049# Kernel hacking 1061# Kernel hacking
1050# 1062#
1051# CONFIG_PRINTK_TIME is not set 1063# CONFIG_PRINTK_TIME is not set
1052CONFIG_DEBUG_KERNEL=y
1053CONFIG_MAGIC_SYSRQ=y 1064CONFIG_MAGIC_SYSRQ=y
1065CONFIG_DEBUG_KERNEL=y
1054CONFIG_LOG_BUF_SHIFT=14 1066CONFIG_LOG_BUF_SHIFT=14
1055CONFIG_DETECT_SOFTLOCKUP=y 1067CONFIG_DETECT_SOFTLOCKUP=y
1056# CONFIG_SCHEDSTATS is not set 1068# CONFIG_SCHEDSTATS is not set
1057CONFIG_DEBUG_SLAB=y 1069CONFIG_DEBUG_SLAB=y
1070CONFIG_DEBUG_MUTEXES=y
1058# CONFIG_DEBUG_SPINLOCK is not set 1071# CONFIG_DEBUG_SPINLOCK is not set
1059# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 1072# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1060# CONFIG_DEBUG_KOBJECT is not set 1073# CONFIG_DEBUG_KOBJECT is not set
1061# CONFIG_DEBUG_INFO is not set 1074# CONFIG_DEBUG_INFO is not set
1062# CONFIG_DEBUG_FS is not set 1075# CONFIG_DEBUG_FS is not set
1063# CONFIG_DEBUG_VM is not set 1076# CONFIG_DEBUG_VM is not set
1077CONFIG_FORCED_INLINING=y
1064# CONFIG_RCU_TORTURE_TEST is not set 1078# CONFIG_RCU_TORTURE_TEST is not set
1065CONFIG_CROSSCOMPILE=y 1079CONFIG_CROSSCOMPILE=y
1066CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1080CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 4c650e708133..4187287f0763 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:06:58 2005 4# Fri Jan 27 15:40:28 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -152,27 +152,29 @@ CONFIG_SYSVIPC=y
152# CONFIG_BSD_PROCESS_ACCT is not set 152# CONFIG_BSD_PROCESS_ACCT is not set
153CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
154# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
155# CONFIG_HOTPLUG is not set
156CONFIG_KOBJECT_UEVENT=y
157CONFIG_IKCONFIG=y 155CONFIG_IKCONFIG=y
158CONFIG_IKCONFIG_PROC=y 156CONFIG_IKCONFIG_PROC=y
159CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 160CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162CONFIG_HOTPLUG=y
163CONFIG_PRINTK=y 163CONFIG_PRINTK=y
164CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 167CONFIG_FUTEX=y
167CONFIG_EPOLL=y 168CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 169CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
176 178
177# 179#
178# Loadable module support 180# Loadable module support
@@ -279,6 +281,21 @@ CONFIG_NETFILTER=y
279# 281#
280# CONFIG_NETFILTER_NETLINK is not set 282# CONFIG_NETFILTER_NETLINK is not set
281# CONFIG_NF_CONNTRACK is not set 283# CONFIG_NF_CONNTRACK is not set
284CONFIG_NETFILTER_XTABLES=m
285CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
286CONFIG_NETFILTER_XT_TARGET_MARK=m
287CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
288CONFIG_NETFILTER_XT_MATCH_COMMENT=m
289CONFIG_NETFILTER_XT_MATCH_DCCP=m
290CONFIG_NETFILTER_XT_MATCH_LENGTH=m
291CONFIG_NETFILTER_XT_MATCH_LIMIT=m
292CONFIG_NETFILTER_XT_MATCH_MAC=m
293CONFIG_NETFILTER_XT_MATCH_MARK=m
294CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
295CONFIG_NETFILTER_XT_MATCH_REALM=m
296CONFIG_NETFILTER_XT_MATCH_SCTP=m
297CONFIG_NETFILTER_XT_MATCH_STRING=m
298CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
282 299
283# 300#
284# IP: Netfilter Configuration 301# IP: Netfilter Configuration
@@ -312,6 +329,11 @@ CONFIG_NETFILTER=y
312# CONFIG_ATALK is not set 329# CONFIG_ATALK is not set
313# CONFIG_X25 is not set 330# CONFIG_X25 is not set
314# CONFIG_LAPB is not set 331# CONFIG_LAPB is not set
332
333#
334# TIPC Configuration (EXPERIMENTAL)
335#
336# CONFIG_TIPC is not set
315# CONFIG_NET_DIVERT is not set 337# CONFIG_NET_DIVERT is not set
316# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
317# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
@@ -320,6 +342,7 @@ CONFIG_NETFILTER=y
320# QoS and/or fair queueing 342# QoS and/or fair queueing
321# 343#
322# CONFIG_NET_SCHED is not set 344# CONFIG_NET_SCHED is not set
345CONFIG_NET_CLS_ROUTE=y
323 346
324# 347#
325# Network testing 348# Network testing
@@ -339,7 +362,7 @@ CONFIG_NETFILTER=y
339# 362#
340CONFIG_STANDALONE=y 363CONFIG_STANDALONE=y
341CONFIG_PREVENT_FIRMWARE_BUILD=y 364CONFIG_PREVENT_FIRMWARE_BUILD=y
342# CONFIG_FW_LOADER is not set 365CONFIG_FW_LOADER=y
343 366
344# 367#
345# Connector - unified userspace <-> kernelspace linker 368# Connector - unified userspace <-> kernelspace linker
@@ -466,7 +489,7 @@ CONFIG_BLK_DEV_SD=y
466# SCSI Transport Attributes 489# SCSI Transport Attributes
467# 490#
468CONFIG_SCSI_SPI_ATTRS=m 491CONFIG_SCSI_SPI_ATTRS=m
469# CONFIG_SCSI_FC_ATTRS is not set 492CONFIG_SCSI_FC_ATTRS=y
470CONFIG_SCSI_ISCSI_ATTRS=m 493CONFIG_SCSI_ISCSI_ATTRS=m
471# CONFIG_SCSI_SAS_ATTRS is not set 494# CONFIG_SCSI_SAS_ATTRS is not set
472 495
@@ -500,13 +523,7 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
500# CONFIG_SCSI_IPR is not set 523# CONFIG_SCSI_IPR is not set
501# CONFIG_SCSI_QLOGIC_FC is not set 524# CONFIG_SCSI_QLOGIC_FC is not set
502# CONFIG_SCSI_QLOGIC_1280 is not set 525# CONFIG_SCSI_QLOGIC_1280 is not set
503CONFIG_SCSI_QLA2XXX=y 526# CONFIG_SCSI_QLA_FC is not set
504# CONFIG_SCSI_QLA21XX is not set
505# CONFIG_SCSI_QLA22XX is not set
506# CONFIG_SCSI_QLA2300 is not set
507# CONFIG_SCSI_QLA2322 is not set
508# CONFIG_SCSI_QLA6312 is not set
509# CONFIG_SCSI_QLA24XX is not set
510# CONFIG_SCSI_LPFC is not set 527# CONFIG_SCSI_LPFC is not set
511# CONFIG_SCSI_DC395x is not set 528# CONFIG_SCSI_DC395x is not set
512# CONFIG_SCSI_DC390T is not set 529# CONFIG_SCSI_DC390T is not set
@@ -564,6 +581,7 @@ CONFIG_MII=y
564# CONFIG_SUNGEM is not set 581# CONFIG_SUNGEM is not set
565# CONFIG_CASSINI is not set 582# CONFIG_CASSINI is not set
566# CONFIG_NET_VENDOR_3COM is not set 583# CONFIG_NET_VENDOR_3COM is not set
584# CONFIG_DM9000 is not set
567 585
568# 586#
569# Tulip family network device support 587# Tulip family network device support
@@ -607,6 +625,7 @@ CONFIG_8139TOO=y
607# CONFIG_R8169 is not set 625# CONFIG_R8169 is not set
608# CONFIG_SIS190 is not set 626# CONFIG_SIS190 is not set
609# CONFIG_SKGE is not set 627# CONFIG_SKGE is not set
628# CONFIG_SKY2 is not set
610# CONFIG_SK98LIN is not set 629# CONFIG_SK98LIN is not set
611# CONFIG_VIA_VELOCITY is not set 630# CONFIG_VIA_VELOCITY is not set
612# CONFIG_TIGON3 is not set 631# CONFIG_TIGON3 is not set
@@ -721,6 +740,7 @@ CONFIG_SERIAL_NONSTANDARD=y
721# CONFIG_MOXA_SMARTIO is not set 740# CONFIG_MOXA_SMARTIO is not set
722# CONFIG_ISI is not set 741# CONFIG_ISI is not set
723# CONFIG_SYNCLINKMP is not set 742# CONFIG_SYNCLINKMP is not set
743# CONFIG_SYNCLINK_GT is not set
724# CONFIG_N_HDLC is not set 744# CONFIG_N_HDLC is not set
725# CONFIG_RISCOM8 is not set 745# CONFIG_RISCOM8 is not set
726# CONFIG_SPECIALIX is not set 746# CONFIG_SPECIALIX is not set
@@ -737,7 +757,6 @@ CONFIG_SERIAL_NONSTANDARD=y
737# Non-8250 serial port support 757# Non-8250 serial port support
738# 758#
739# CONFIG_SERIAL_IP3106 is not set 759# CONFIG_SERIAL_IP3106 is not set
740# CONFIG_SERIAL_JSM is not set
741CONFIG_UNIX98_PTYS=y 760CONFIG_UNIX98_PTYS=y
742CONFIG_LEGACY_PTYS=y 761CONFIG_LEGACY_PTYS=y
743CONFIG_LEGACY_PTY_COUNT=256 762CONFIG_LEGACY_PTY_COUNT=256
@@ -825,6 +844,12 @@ CONFIG_I2C_ALGOBIT=m
825# CONFIG_I2C_DEBUG_CHIP is not set 844# CONFIG_I2C_DEBUG_CHIP is not set
826 845
827# 846#
847# SPI support
848#
849# CONFIG_SPI is not set
850# CONFIG_SPI_MASTER is not set
851
852#
828# Dallas's 1-wire bus 853# Dallas's 1-wire bus
829# 854#
830# CONFIG_W1 is not set 855# CONFIG_W1 is not set
@@ -863,6 +888,7 @@ CONFIG_HWMON=y
863# CONFIG_SENSORS_SMSC47M1 is not set 888# CONFIG_SENSORS_SMSC47M1 is not set
864# CONFIG_SENSORS_SMSC47B397 is not set 889# CONFIG_SENSORS_SMSC47B397 is not set
865# CONFIG_SENSORS_VIA686A is not set 890# CONFIG_SENSORS_VIA686A is not set
891# CONFIG_SENSORS_VT8231 is not set
866# CONFIG_SENSORS_W83781D is not set 892# CONFIG_SENSORS_W83781D is not set
867# CONFIG_SENSORS_W83792D is not set 893# CONFIG_SENSORS_W83792D is not set
868# CONFIG_SENSORS_W83L785TS is not set 894# CONFIG_SENSORS_W83L785TS is not set
@@ -918,7 +944,6 @@ CONFIG_FB=y
918# CONFIG_FB_3DFX is not set 944# CONFIG_FB_3DFX is not set
919# CONFIG_FB_VOODOO1 is not set 945# CONFIG_FB_VOODOO1 is not set
920# CONFIG_FB_SMIVGX is not set 946# CONFIG_FB_SMIVGX is not set
921# CONFIG_FB_CYBLA is not set
922# CONFIG_FB_TRIDENT is not set 947# CONFIG_FB_TRIDENT is not set
923# CONFIG_FB_VIRTUAL is not set 948# CONFIG_FB_VIRTUAL is not set
924 949
@@ -988,13 +1013,16 @@ CONFIG_USB_STORAGE=y
988# CONFIG_USB_STORAGE_SDDR09 is not set 1013# CONFIG_USB_STORAGE_SDDR09 is not set
989# CONFIG_USB_STORAGE_SDDR55 is not set 1014# CONFIG_USB_STORAGE_SDDR55 is not set
990# CONFIG_USB_STORAGE_JUMPSHOT is not set 1015# CONFIG_USB_STORAGE_JUMPSHOT is not set
1016# CONFIG_USB_STORAGE_ALAUDA is not set
991# CONFIG_USB_STORAGE_ONETOUCH is not set 1017# CONFIG_USB_STORAGE_ONETOUCH is not set
1018# CONFIG_USB_LIBUSUAL is not set
992 1019
993# 1020#
994# USB Input Devices 1021# USB Input Devices
995# 1022#
996CONFIG_USB_HID=y 1023CONFIG_USB_HID=y
997CONFIG_USB_HIDINPUT=y 1024CONFIG_USB_HIDINPUT=y
1025# CONFIG_USB_HIDINPUT_POWERBOOK is not set
998# CONFIG_HID_FF is not set 1026# CONFIG_HID_FF is not set
999CONFIG_USB_HIDDEV=y 1027CONFIG_USB_HIDDEV=y
1000# CONFIG_USB_AIPTEK is not set 1028# CONFIG_USB_AIPTEK is not set
@@ -1008,6 +1036,7 @@ CONFIG_USB_HIDDEV=y
1008# CONFIG_USB_YEALINK is not set 1036# CONFIG_USB_YEALINK is not set
1009# CONFIG_USB_XPAD is not set 1037# CONFIG_USB_XPAD is not set
1010# CONFIG_USB_ATI_REMOTE is not set 1038# CONFIG_USB_ATI_REMOTE is not set
1039# CONFIG_USB_ATI_REMOTE2 is not set
1011# CONFIG_USB_KEYSPAN_REMOTE is not set 1040# CONFIG_USB_KEYSPAN_REMOTE is not set
1012# CONFIG_USB_APPLETOUCH is not set 1041# CONFIG_USB_APPLETOUCH is not set
1013 1042
@@ -1107,6 +1136,7 @@ CONFIG_XFS_EXPORT=y
1107# CONFIG_XFS_SECURITY is not set 1136# CONFIG_XFS_SECURITY is not set
1108# CONFIG_XFS_POSIX_ACL is not set 1137# CONFIG_XFS_POSIX_ACL is not set
1109# CONFIG_XFS_RT is not set 1138# CONFIG_XFS_RT is not set
1139# CONFIG_OCFS2_FS is not set
1110# CONFIG_MINIX_FS is not set 1140# CONFIG_MINIX_FS is not set
1111# CONFIG_ROMFS_FS is not set 1141# CONFIG_ROMFS_FS is not set
1112CONFIG_INOTIFY=y 1142CONFIG_INOTIFY=y
@@ -1142,6 +1172,7 @@ CONFIG_TMPFS=y
1142# CONFIG_HUGETLB_PAGE is not set 1172# CONFIG_HUGETLB_PAGE is not set
1143CONFIG_RAMFS=y 1173CONFIG_RAMFS=y
1144# CONFIG_RELAYFS_FS is not set 1174# CONFIG_RELAYFS_FS is not set
1175# CONFIG_CONFIGFS_FS is not set
1145 1176
1146# 1177#
1147# Miscellaneous filesystems 1178# Miscellaneous filesystems
@@ -1246,6 +1277,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1246# Kernel hacking 1277# Kernel hacking
1247# 1278#
1248# CONFIG_PRINTK_TIME is not set 1279# CONFIG_PRINTK_TIME is not set
1280# CONFIG_MAGIC_SYSRQ is not set
1249# CONFIG_DEBUG_KERNEL is not set 1281# CONFIG_DEBUG_KERNEL is not set
1250CONFIG_LOG_BUF_SHIFT=14 1282CONFIG_LOG_BUF_SHIFT=14
1251CONFIG_CROSSCOMPILE=y 1283CONFIG_CROSSCOMPILE=y
@@ -1299,3 +1331,7 @@ CONFIG_CRC32=y
1299CONFIG_LIBCRC32C=m 1331CONFIG_LIBCRC32C=m
1300CONFIG_ZLIB_INFLATE=y 1332CONFIG_ZLIB_INFLATE=y
1301CONFIG_ZLIB_DEFLATE=m 1333CONFIG_ZLIB_DEFLATE=m
1334CONFIG_TEXTSEARCH=y
1335CONFIG_TEXTSEARCH_KMP=m
1336CONFIG_TEXTSEARCH_BM=m
1337CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index c02becab850b..31f5afabafa8 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.16-rc2 3# Linux kernel version: 2.6.16-rc2
4# Fri Feb 3 17:14:27 2006 4# Sun Feb 12 19:18:55 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -133,7 +133,6 @@ CONFIG_PREEMPT_NONE=y
133# Code maturity level options 133# Code maturity level options
134# 134#
135# CONFIG_EXPERIMENTAL is not set 135# CONFIG_EXPERIMENTAL is not set
136CONFIG_CLEAN_COMPILE=y
137CONFIG_BROKEN_ON_SMP=y 136CONFIG_BROKEN_ON_SMP=y
138CONFIG_INIT_ENV_ARG_LIMIT=32 137CONFIG_INIT_ENV_ARG_LIMIT=32
139 138
@@ -145,7 +144,7 @@ CONFIG_LOCALVERSION_AUTO=y
145# CONFIG_SWAP is not set 144# CONFIG_SWAP is not set
146# CONFIG_SYSVIPC is not set 145# CONFIG_SYSVIPC is not set
147# CONFIG_BSD_PROCESS_ACCT is not set 146# CONFIG_BSD_PROCESS_ACCT is not set
148# CONFIG_SYSCTL is not set 147CONFIG_SYSCTL=y
149# CONFIG_AUDIT is not set 148# CONFIG_AUDIT is not set
150# CONFIG_IKCONFIG is not set 149# CONFIG_IKCONFIG is not set
151CONFIG_INITRAMFS_SOURCE="" 150CONFIG_INITRAMFS_SOURCE=""
@@ -222,6 +221,7 @@ CONFIG_NET=y
222# 221#
223# Networking options 222# Networking options
224# 223#
224# CONFIG_NETDEBUG is not set
225CONFIG_PACKET=y 225CONFIG_PACKET=y
226CONFIG_PACKET_MMAP=y 226CONFIG_PACKET_MMAP=y
227CONFIG_UNIX=y 227CONFIG_UNIX=y
@@ -476,8 +476,9 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
476# 476#
477CONFIG_SERIAL_CORE=y 477CONFIG_SERIAL_CORE=y
478CONFIG_SERIAL_CORE_CONSOLE=y 478CONFIG_SERIAL_CORE_CONSOLE=y
479# CONFIG_UNIX98_PTYS is not set 479CONFIG_UNIX98_PTYS=y
480# CONFIG_LEGACY_PTYS is not set 480CONFIG_LEGACY_PTYS=y
481CONFIG_LEGACY_PTY_COUNT=256
481 482
482# 483#
483# IPMI 484# IPMI
@@ -627,7 +628,7 @@ CONFIG_FUSE_FS=y
627# 628#
628CONFIG_PROC_FS=y 629CONFIG_PROC_FS=y
629CONFIG_PROC_KCORE=y 630CONFIG_PROC_KCORE=y
630# CONFIG_SYSFS is not set 631CONFIG_SYSFS=y
631# CONFIG_TMPFS is not set 632# CONFIG_TMPFS is not set
632# CONFIG_HUGETLB_PAGE is not set 633# CONFIG_HUGETLB_PAGE is not set
633CONFIG_RAMFS=y 634CONFIG_RAMFS=y
@@ -680,12 +681,13 @@ CONFIG_MSDOS_PARTITION=y
680# CONFIG_DEBUG_KERNEL is not set 681# CONFIG_DEBUG_KERNEL is not set
681CONFIG_LOG_BUF_SHIFT=14 682CONFIG_LOG_BUF_SHIFT=14
682CONFIG_CROSSCOMPILE=y 683CONFIG_CROSSCOMPILE=y
683CONFIG_CMDLINE="console=ttyS0 debug ip=172.20.0.2:172.20.0.1::255.255.0.0" 684CONFIG_CMDLINE=""
684 685
685# 686#
686# Security options 687# Security options
687# 688#
688# CONFIG_KEYS is not set 689# CONFIG_KEYS is not set
690# CONFIG_SECURITY is not set
689 691
690# 692#
691# Cryptographic options 693# Cryptographic options
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 9aaa43024aec..b126f763cf51 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:03 2005 4# Fri Jan 27 15:40:30 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -160,27 +160,30 @@ CONFIG_SYSVIPC=y
160# CONFIG_BSD_PROCESS_ACCT is not set 160# CONFIG_BSD_PROCESS_ACCT is not set
161CONFIG_SYSCTL=y 161CONFIG_SYSCTL=y
162# CONFIG_AUDIT is not set 162# CONFIG_AUDIT is not set
163CONFIG_HOTPLUG=y
164# CONFIG_KOBJECT_UEVENT is not set
165CONFIG_IKCONFIG=y 163CONFIG_IKCONFIG=y
166CONFIG_IKCONFIG_PROC=y 164CONFIG_IKCONFIG_PROC=y
167CONFIG_INITRAMFS_SOURCE="" 165CONFIG_INITRAMFS_SOURCE=""
166# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_EMBEDDED=y 167CONFIG_EMBEDDED=y
169CONFIG_KALLSYMS=y 168CONFIG_KALLSYMS=y
170# CONFIG_KALLSYMS_EXTRA_PASS is not set 169# CONFIG_KALLSYMS_EXTRA_PASS is not set
170CONFIG_HOTPLUG=y
171CONFIG_PRINTK=y 171CONFIG_PRINTK=y
172CONFIG_BUG=y 172CONFIG_BUG=y
173CONFIG_ELF_CORE=y
173CONFIG_BASE_FULL=y 174CONFIG_BASE_FULL=y
174# CONFIG_FUTEX is not set 175# CONFIG_FUTEX is not set
175# CONFIG_EPOLL is not set 176# CONFIG_EPOLL is not set
176# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
177CONFIG_SHMEM=y 177CONFIG_SHMEM=y
178CONFIG_CC_ALIGN_FUNCTIONS=0 178CONFIG_CC_ALIGN_FUNCTIONS=0
179CONFIG_CC_ALIGN_LABELS=0 179CONFIG_CC_ALIGN_LABELS=0
180CONFIG_CC_ALIGN_LOOPS=0 180CONFIG_CC_ALIGN_LOOPS=0
181CONFIG_CC_ALIGN_JUMPS=0 181CONFIG_CC_ALIGN_JUMPS=0
182CONFIG_SLAB=y
182# CONFIG_TINY_SHMEM is not set 183# CONFIG_TINY_SHMEM is not set
183CONFIG_BASE_SMALL=0 184CONFIG_BASE_SMALL=0
185# CONFIG_SLOB is not set
186CONFIG_OBSOLETE_INTERMODULE=y
184 187
185# 188#
186# Loadable module support 189# Loadable module support
@@ -291,6 +294,21 @@ CONFIG_NETFILTER_NETLINK=m
291CONFIG_NETFILTER_NETLINK_QUEUE=m 294CONFIG_NETFILTER_NETLINK_QUEUE=m
292CONFIG_NETFILTER_NETLINK_LOG=m 295CONFIG_NETFILTER_NETLINK_LOG=m
293# CONFIG_NF_CONNTRACK is not set 296# CONFIG_NF_CONNTRACK is not set
297CONFIG_NETFILTER_XTABLES=m
298CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
299CONFIG_NETFILTER_XT_TARGET_MARK=m
300CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
301CONFIG_NETFILTER_XT_MATCH_COMMENT=m
302CONFIG_NETFILTER_XT_MATCH_DCCP=m
303CONFIG_NETFILTER_XT_MATCH_LENGTH=m
304CONFIG_NETFILTER_XT_MATCH_LIMIT=m
305CONFIG_NETFILTER_XT_MATCH_MAC=m
306CONFIG_NETFILTER_XT_MATCH_MARK=m
307CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
308CONFIG_NETFILTER_XT_MATCH_REALM=m
309CONFIG_NETFILTER_XT_MATCH_SCTP=m
310CONFIG_NETFILTER_XT_MATCH_STRING=m
311CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
294 312
295# 313#
296# IP: Netfilter Configuration 314# IP: Netfilter Configuration
@@ -324,6 +342,11 @@ CONFIG_NETFILTER_NETLINK_LOG=m
324# CONFIG_ATALK is not set 342# CONFIG_ATALK is not set
325# CONFIG_X25 is not set 343# CONFIG_X25 is not set
326# CONFIG_LAPB is not set 344# CONFIG_LAPB is not set
345
346#
347# TIPC Configuration (EXPERIMENTAL)
348#
349# CONFIG_TIPC is not set
327# CONFIG_NET_DIVERT is not set 350# CONFIG_NET_DIVERT is not set
328# CONFIG_ECONET is not set 351# CONFIG_ECONET is not set
329# CONFIG_WAN_ROUTER is not set 352# CONFIG_WAN_ROUTER is not set
@@ -332,6 +355,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
332# QoS and/or fair queueing 355# QoS and/or fair queueing
333# 356#
334# CONFIG_NET_SCHED is not set 357# CONFIG_NET_SCHED is not set
358CONFIG_NET_CLS_ROUTE=y
335 359
336# 360#
337# Network testing 361# Network testing
@@ -407,6 +431,7 @@ CONFIG_MTD_CFI_UTIL=y
407# CONFIG_MTD_RAM is not set 431# CONFIG_MTD_RAM is not set
408# CONFIG_MTD_ROM is not set 432# CONFIG_MTD_ROM is not set
409# CONFIG_MTD_ABSENT is not set 433# CONFIG_MTD_ABSENT is not set
434# CONFIG_MTD_OBSOLETE_CHIPS is not set
410 435
411# 436#
412# Mapping drivers for chip access 437# Mapping drivers for chip access
@@ -598,6 +623,7 @@ CONFIG_NET_ETHERNET=y
598# CONFIG_CASSINI is not set 623# CONFIG_CASSINI is not set
599# CONFIG_NET_VENDOR_3COM is not set 624# CONFIG_NET_VENDOR_3COM is not set
600# CONFIG_NET_VENDOR_SMC is not set 625# CONFIG_NET_VENDOR_SMC is not set
626# CONFIG_DM9000 is not set
601# CONFIG_NET_VENDOR_RACAL is not set 627# CONFIG_NET_VENDOR_RACAL is not set
602 628
603# 629#
@@ -654,6 +680,7 @@ CONFIG_NET_PCI=y
654# CONFIG_R8169 is not set 680# CONFIG_R8169 is not set
655# CONFIG_SIS190 is not set 681# CONFIG_SIS190 is not set
656# CONFIG_SKGE is not set 682# CONFIG_SKGE is not set
683# CONFIG_SKY2 is not set
657# CONFIG_SK98LIN is not set 684# CONFIG_SK98LIN is not set
658# CONFIG_VIA_VELOCITY is not set 685# CONFIG_VIA_VELOCITY is not set
659# CONFIG_TIGON3 is not set 686# CONFIG_TIGON3 is not set
@@ -687,8 +714,8 @@ CONFIG_NET_RADIO=y
687# Wireless 802.11b ISA/PCI cards support 714# Wireless 802.11b ISA/PCI cards support
688# 715#
689# CONFIG_IPW2100 is not set 716# CONFIG_IPW2100 is not set
690# CONFIG_IPW_DEBUG is not set
691CONFIG_IPW2200=m 717CONFIG_IPW2200=m
718# CONFIG_IPW2200_DEBUG is not set
692# CONFIG_HERMES is not set 719# CONFIG_HERMES is not set
693# CONFIG_ATMEL is not set 720# CONFIG_ATMEL is not set
694 721
@@ -795,7 +822,6 @@ CONFIG_HW_CONSOLE=y
795# Non-8250 serial port support 822# Non-8250 serial port support
796# 823#
797CONFIG_HAS_TXX9_SERIAL=y 824CONFIG_HAS_TXX9_SERIAL=y
798# CONFIG_SERIAL_JSM is not set
799CONFIG_UNIX98_PTYS=y 825CONFIG_UNIX98_PTYS=y
800CONFIG_LEGACY_PTYS=y 826CONFIG_LEGACY_PTYS=y
801CONFIG_LEGACY_PTY_COUNT=256 827CONFIG_LEGACY_PTY_COUNT=256
@@ -833,6 +859,12 @@ CONFIG_LEGACY_PTY_COUNT=256
833# CONFIG_I2C is not set 859# CONFIG_I2C is not set
834 860
835# 861#
862# SPI support
863#
864# CONFIG_SPI is not set
865# CONFIG_SPI_MASTER is not set
866
867#
836# Dallas's 1-wire bus 868# Dallas's 1-wire bus
837# 869#
838# CONFIG_W1 is not set 870# CONFIG_W1 is not set
@@ -887,7 +919,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
887CONFIG_FB_ATY=y 919CONFIG_FB_ATY=y
888CONFIG_FB_ATY_CT=y 920CONFIG_FB_ATY_CT=y
889# CONFIG_FB_ATY_GENERIC_LCD is not set 921# CONFIG_FB_ATY_GENERIC_LCD is not set
890# CONFIG_FB_ATY_XL_INIT is not set
891# CONFIG_FB_ATY_GX is not set 922# CONFIG_FB_ATY_GX is not set
892# CONFIG_FB_SAVAGE is not set 923# CONFIG_FB_SAVAGE is not set
893# CONFIG_FB_SIS is not set 924# CONFIG_FB_SIS is not set
@@ -896,7 +927,6 @@ CONFIG_FB_ATY_CT=y
896# CONFIG_FB_3DFX is not set 927# CONFIG_FB_3DFX is not set
897# CONFIG_FB_VOODOO1 is not set 928# CONFIG_FB_VOODOO1 is not set
898# CONFIG_FB_SMIVGX is not set 929# CONFIG_FB_SMIVGX is not set
899# CONFIG_FB_CYBLA is not set
900# CONFIG_FB_TRIDENT is not set 930# CONFIG_FB_TRIDENT is not set
901# CONFIG_FB_VIRTUAL is not set 931# CONFIG_FB_VIRTUAL is not set
902 932
@@ -958,12 +988,14 @@ CONFIG_USB=y
958# may also be needed; see USB_STORAGE Help for more information 988# may also be needed; see USB_STORAGE Help for more information
959# 989#
960# CONFIG_USB_STORAGE is not set 990# CONFIG_USB_STORAGE is not set
991# CONFIG_USB_LIBUSUAL is not set
961 992
962# 993#
963# USB Input Devices 994# USB Input Devices
964# 995#
965CONFIG_USB_HID=y 996CONFIG_USB_HID=y
966CONFIG_USB_HIDINPUT=y 997CONFIG_USB_HIDINPUT=y
998# CONFIG_USB_HIDINPUT_POWERBOOK is not set
967# CONFIG_HID_FF is not set 999# CONFIG_HID_FF is not set
968CONFIG_USB_HIDDEV=y 1000CONFIG_USB_HIDDEV=y
969# CONFIG_USB_AIPTEK is not set 1001# CONFIG_USB_AIPTEK is not set
@@ -977,6 +1009,7 @@ CONFIG_USB_HIDDEV=y
977CONFIG_USB_YEALINK=m 1009CONFIG_USB_YEALINK=m
978# CONFIG_USB_XPAD is not set 1010# CONFIG_USB_XPAD is not set
979# CONFIG_USB_ATI_REMOTE is not set 1011# CONFIG_USB_ATI_REMOTE is not set
1012# CONFIG_USB_ATI_REMOTE2 is not set
980# CONFIG_USB_KEYSPAN_REMOTE is not set 1013# CONFIG_USB_KEYSPAN_REMOTE is not set
981# CONFIG_USB_APPLETOUCH is not set 1014# CONFIG_USB_APPLETOUCH is not set
982 1015
@@ -1078,6 +1111,7 @@ CONFIG_XFS_EXPORT=y
1078# CONFIG_XFS_SECURITY is not set 1111# CONFIG_XFS_SECURITY is not set
1079# CONFIG_XFS_POSIX_ACL is not set 1112# CONFIG_XFS_POSIX_ACL is not set
1080# CONFIG_XFS_RT is not set 1113# CONFIG_XFS_RT is not set
1114# CONFIG_OCFS2_FS is not set
1081# CONFIG_MINIX_FS is not set 1115# CONFIG_MINIX_FS is not set
1082# CONFIG_ROMFS_FS is not set 1116# CONFIG_ROMFS_FS is not set
1083CONFIG_INOTIFY=y 1117CONFIG_INOTIFY=y
@@ -1115,6 +1149,7 @@ CONFIG_TMPFS=y
1115# CONFIG_HUGETLB_PAGE is not set 1149# CONFIG_HUGETLB_PAGE is not set
1116CONFIG_RAMFS=y 1150CONFIG_RAMFS=y
1117CONFIG_RELAYFS_FS=m 1151CONFIG_RELAYFS_FS=m
1152# CONFIG_CONFIGFS_FS is not set
1118 1153
1119# 1154#
1120# Miscellaneous filesystems 1155# Miscellaneous filesystems
@@ -1228,6 +1263,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1228# Kernel hacking 1263# Kernel hacking
1229# 1264#
1230# CONFIG_PRINTK_TIME is not set 1265# CONFIG_PRINTK_TIME is not set
1266# CONFIG_MAGIC_SYSRQ is not set
1231# CONFIG_DEBUG_KERNEL is not set 1267# CONFIG_DEBUG_KERNEL is not set
1232CONFIG_LOG_BUF_SHIFT=14 1268CONFIG_LOG_BUF_SHIFT=14
1233CONFIG_CROSSCOMPILE=y 1269CONFIG_CROSSCOMPILE=y
@@ -1281,3 +1317,7 @@ CONFIG_CRC32=y
1281CONFIG_LIBCRC32C=m 1317CONFIG_LIBCRC32C=m
1282CONFIG_ZLIB_INFLATE=y 1318CONFIG_ZLIB_INFLATE=y
1283CONFIG_ZLIB_DEFLATE=y 1319CONFIG_ZLIB_DEFLATE=y
1320CONFIG_TEXTSEARCH=y
1321CONFIG_TEXTSEARCH_KMP=m
1322CONFIG_TEXTSEARCH_BM=m
1323CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index abf61095931e..463ed3dbf6ae 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:06 2005 4# Fri Jan 27 15:40:31 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -161,27 +161,29 @@ CONFIG_BSD_PROCESS_ACCT=y
161# CONFIG_BSD_PROCESS_ACCT_V3 is not set 161# CONFIG_BSD_PROCESS_ACCT_V3 is not set
162CONFIG_SYSCTL=y 162CONFIG_SYSCTL=y
163# CONFIG_AUDIT is not set 163# CONFIG_AUDIT is not set
164CONFIG_HOTPLUG=y
165CONFIG_KOBJECT_UEVENT=y
166CONFIG_IKCONFIG=y 164CONFIG_IKCONFIG=y
167CONFIG_IKCONFIG_PROC=y 165CONFIG_IKCONFIG_PROC=y
168CONFIG_INITRAMFS_SOURCE="" 166CONFIG_INITRAMFS_SOURCE=""
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_EMBEDDED=y 168CONFIG_EMBEDDED=y
170CONFIG_KALLSYMS=y 169CONFIG_KALLSYMS=y
171# CONFIG_KALLSYMS_EXTRA_PASS is not set 170# CONFIG_KALLSYMS_EXTRA_PASS is not set
171CONFIG_HOTPLUG=y
172CONFIG_PRINTK=y 172CONFIG_PRINTK=y
173CONFIG_BUG=y 173CONFIG_BUG=y
174CONFIG_ELF_CORE=y
174CONFIG_BASE_FULL=y 175CONFIG_BASE_FULL=y
175CONFIG_FUTEX=y 176CONFIG_FUTEX=y
176CONFIG_EPOLL=y 177CONFIG_EPOLL=y
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
178CONFIG_SHMEM=y 178CONFIG_SHMEM=y
179CONFIG_CC_ALIGN_FUNCTIONS=0 179CONFIG_CC_ALIGN_FUNCTIONS=0
180CONFIG_CC_ALIGN_LABELS=0 180CONFIG_CC_ALIGN_LABELS=0
181CONFIG_CC_ALIGN_LOOPS=0 181CONFIG_CC_ALIGN_LOOPS=0
182CONFIG_CC_ALIGN_JUMPS=0 182CONFIG_CC_ALIGN_JUMPS=0
183CONFIG_SLAB=y
183# CONFIG_TINY_SHMEM is not set 184# CONFIG_TINY_SHMEM is not set
184CONFIG_BASE_SMALL=0 185CONFIG_BASE_SMALL=0
186# CONFIG_SLOB is not set
185 187
186# 188#
187# Loadable module support 189# Loadable module support
@@ -297,6 +299,28 @@ CONFIG_BRIDGE_NETFILTER=y
297CONFIG_NETFILTER_NETLINK=m 299CONFIG_NETFILTER_NETLINK=m
298CONFIG_NETFILTER_NETLINK_QUEUE=m 300CONFIG_NETFILTER_NETLINK_QUEUE=m
299CONFIG_NETFILTER_NETLINK_LOG=m 301CONFIG_NETFILTER_NETLINK_LOG=m
302CONFIG_NETFILTER_XTABLES=m
303CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
304CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
305CONFIG_NETFILTER_XT_TARGET_MARK=m
306CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
307CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
308CONFIG_NETFILTER_XT_MATCH_COMMENT=m
309CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
310CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
311CONFIG_NETFILTER_XT_MATCH_DCCP=m
312CONFIG_NETFILTER_XT_MATCH_HELPER=m
313CONFIG_NETFILTER_XT_MATCH_LENGTH=m
314CONFIG_NETFILTER_XT_MATCH_LIMIT=m
315CONFIG_NETFILTER_XT_MATCH_MAC=m
316CONFIG_NETFILTER_XT_MATCH_MARK=m
317CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
318CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
319CONFIG_NETFILTER_XT_MATCH_REALM=m
320CONFIG_NETFILTER_XT_MATCH_SCTP=m
321CONFIG_NETFILTER_XT_MATCH_STATE=m
322CONFIG_NETFILTER_XT_MATCH_STRING=m
323CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
300 324
301# 325#
302# IP: Netfilter Configuration 326# IP: Netfilter Configuration
@@ -315,39 +339,23 @@ CONFIG_IP_NF_AMANDA=m
315CONFIG_IP_NF_PPTP=m 339CONFIG_IP_NF_PPTP=m
316CONFIG_IP_NF_QUEUE=m 340CONFIG_IP_NF_QUEUE=m
317CONFIG_IP_NF_IPTABLES=m 341CONFIG_IP_NF_IPTABLES=m
318CONFIG_IP_NF_MATCH_LIMIT=m
319CONFIG_IP_NF_MATCH_IPRANGE=m 342CONFIG_IP_NF_MATCH_IPRANGE=m
320CONFIG_IP_NF_MATCH_MAC=m
321CONFIG_IP_NF_MATCH_PKTTYPE=m
322CONFIG_IP_NF_MATCH_MARK=m
323CONFIG_IP_NF_MATCH_MULTIPORT=m 343CONFIG_IP_NF_MATCH_MULTIPORT=m
324CONFIG_IP_NF_MATCH_TOS=m 344CONFIG_IP_NF_MATCH_TOS=m
325CONFIG_IP_NF_MATCH_RECENT=m 345CONFIG_IP_NF_MATCH_RECENT=m
326CONFIG_IP_NF_MATCH_ECN=m 346CONFIG_IP_NF_MATCH_ECN=m
327CONFIG_IP_NF_MATCH_DSCP=m 347CONFIG_IP_NF_MATCH_DSCP=m
328CONFIG_IP_NF_MATCH_AH_ESP=m 348CONFIG_IP_NF_MATCH_AH_ESP=m
329CONFIG_IP_NF_MATCH_LENGTH=m
330CONFIG_IP_NF_MATCH_TTL=m 349CONFIG_IP_NF_MATCH_TTL=m
331CONFIG_IP_NF_MATCH_TCPMSS=m
332CONFIG_IP_NF_MATCH_HELPER=m
333CONFIG_IP_NF_MATCH_STATE=m
334CONFIG_IP_NF_MATCH_CONNTRACK=m
335CONFIG_IP_NF_MATCH_OWNER=m 350CONFIG_IP_NF_MATCH_OWNER=m
336CONFIG_IP_NF_MATCH_PHYSDEV=m
337CONFIG_IP_NF_MATCH_ADDRTYPE=m 351CONFIG_IP_NF_MATCH_ADDRTYPE=m
338CONFIG_IP_NF_MATCH_REALM=m
339CONFIG_IP_NF_MATCH_SCTP=m
340CONFIG_IP_NF_MATCH_DCCP=m
341CONFIG_IP_NF_MATCH_COMMENT=m
342CONFIG_IP_NF_MATCH_CONNMARK=m
343CONFIG_IP_NF_MATCH_HASHLIMIT=m 352CONFIG_IP_NF_MATCH_HASHLIMIT=m
344CONFIG_IP_NF_MATCH_STRING=m 353CONFIG_IP_NF_MATCH_POLICY=m
345CONFIG_IP_NF_FILTER=m 354CONFIG_IP_NF_FILTER=m
346CONFIG_IP_NF_TARGET_REJECT=m 355CONFIG_IP_NF_TARGET_REJECT=m
347CONFIG_IP_NF_TARGET_LOG=m 356CONFIG_IP_NF_TARGET_LOG=m
348CONFIG_IP_NF_TARGET_ULOG=m 357CONFIG_IP_NF_TARGET_ULOG=m
349CONFIG_IP_NF_TARGET_TCPMSS=m 358CONFIG_IP_NF_TARGET_TCPMSS=m
350CONFIG_IP_NF_TARGET_NFQUEUE=m
351CONFIG_IP_NF_NAT=m 359CONFIG_IP_NF_NAT=m
352CONFIG_IP_NF_NAT_NEEDED=y 360CONFIG_IP_NF_NAT_NEEDED=y
353CONFIG_IP_NF_TARGET_MASQUERADE=m 361CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -364,13 +372,9 @@ CONFIG_IP_NF_MANGLE=m
364CONFIG_IP_NF_TARGET_TOS=m 372CONFIG_IP_NF_TARGET_TOS=m
365CONFIG_IP_NF_TARGET_ECN=m 373CONFIG_IP_NF_TARGET_ECN=m
366CONFIG_IP_NF_TARGET_DSCP=m 374CONFIG_IP_NF_TARGET_DSCP=m
367CONFIG_IP_NF_TARGET_MARK=m
368CONFIG_IP_NF_TARGET_CLASSIFY=m
369CONFIG_IP_NF_TARGET_TTL=m 375CONFIG_IP_NF_TARGET_TTL=m
370CONFIG_IP_NF_TARGET_CONNMARK=m
371CONFIG_IP_NF_TARGET_CLUSTERIP=m 376CONFIG_IP_NF_TARGET_CLUSTERIP=m
372CONFIG_IP_NF_RAW=m 377CONFIG_IP_NF_RAW=m
373CONFIG_IP_NF_TARGET_NOTRACK=m
374CONFIG_IP_NF_ARPTABLES=m 378CONFIG_IP_NF_ARPTABLES=m
375CONFIG_IP_NF_ARPFILTER=m 379CONFIG_IP_NF_ARPFILTER=m
376CONFIG_IP_NF_ARP_MANGLE=m 380CONFIG_IP_NF_ARP_MANGLE=m
@@ -380,26 +384,20 @@ CONFIG_IP_NF_ARP_MANGLE=m
380# 384#
381CONFIG_IP6_NF_QUEUE=m 385CONFIG_IP6_NF_QUEUE=m
382CONFIG_IP6_NF_IPTABLES=m 386CONFIG_IP6_NF_IPTABLES=m
383CONFIG_IP6_NF_MATCH_LIMIT=m
384CONFIG_IP6_NF_MATCH_MAC=m
385CONFIG_IP6_NF_MATCH_RT=m 387CONFIG_IP6_NF_MATCH_RT=m
386CONFIG_IP6_NF_MATCH_OPTS=m 388CONFIG_IP6_NF_MATCH_OPTS=m
387CONFIG_IP6_NF_MATCH_FRAG=m 389CONFIG_IP6_NF_MATCH_FRAG=m
388CONFIG_IP6_NF_MATCH_HL=m 390CONFIG_IP6_NF_MATCH_HL=m
389CONFIG_IP6_NF_MATCH_MULTIPORT=m 391CONFIG_IP6_NF_MATCH_MULTIPORT=m
390CONFIG_IP6_NF_MATCH_OWNER=m 392CONFIG_IP6_NF_MATCH_OWNER=m
391CONFIG_IP6_NF_MATCH_MARK=m
392CONFIG_IP6_NF_MATCH_IPV6HEADER=m 393CONFIG_IP6_NF_MATCH_IPV6HEADER=m
393CONFIG_IP6_NF_MATCH_AHESP=m 394CONFIG_IP6_NF_MATCH_AHESP=m
394CONFIG_IP6_NF_MATCH_LENGTH=m
395CONFIG_IP6_NF_MATCH_EUI64=m 395CONFIG_IP6_NF_MATCH_EUI64=m
396CONFIG_IP6_NF_MATCH_PHYSDEV=m 396CONFIG_IP6_NF_MATCH_POLICY=m
397CONFIG_IP6_NF_FILTER=m 397CONFIG_IP6_NF_FILTER=m
398CONFIG_IP6_NF_TARGET_LOG=m 398CONFIG_IP6_NF_TARGET_LOG=m
399CONFIG_IP6_NF_TARGET_REJECT=m 399CONFIG_IP6_NF_TARGET_REJECT=m
400CONFIG_IP6_NF_TARGET_NFQUEUE=m
401CONFIG_IP6_NF_MANGLE=m 400CONFIG_IP6_NF_MANGLE=m
402CONFIG_IP6_NF_TARGET_MARK=m
403CONFIG_IP6_NF_TARGET_HL=m 401CONFIG_IP6_NF_TARGET_HL=m
404CONFIG_IP6_NF_RAW=m 402CONFIG_IP6_NF_RAW=m
405 403
@@ -451,6 +449,11 @@ CONFIG_DECNET=m
451# CONFIG_ATALK is not set 449# CONFIG_ATALK is not set
452# CONFIG_X25 is not set 450# CONFIG_X25 is not set
453# CONFIG_LAPB is not set 451# CONFIG_LAPB is not set
452
453#
454# TIPC Configuration (EXPERIMENTAL)
455#
456# CONFIG_TIPC is not set
454# CONFIG_NET_DIVERT is not set 457# CONFIG_NET_DIVERT is not set
455# CONFIG_ECONET is not set 458# CONFIG_ECONET is not set
456# CONFIG_WAN_ROUTER is not set 459# CONFIG_WAN_ROUTER is not set
@@ -530,7 +533,6 @@ CONFIG_IEEE80211=m
530# CONFIG_IEEE80211_DEBUG is not set 533# CONFIG_IEEE80211_DEBUG is not set
531CONFIG_IEEE80211_CRYPT_WEP=m 534CONFIG_IEEE80211_CRYPT_WEP=m
532CONFIG_IEEE80211_CRYPT_CCMP=m 535CONFIG_IEEE80211_CRYPT_CCMP=m
533CONFIG_IEEE80211_CRYPT_TKIP=m
534 536
535# 537#
536# Device Drivers 538# Device Drivers
@@ -541,7 +543,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
541# 543#
542CONFIG_STANDALONE=y 544CONFIG_STANDALONE=y
543CONFIG_PREVENT_FIRMWARE_BUILD=y 545CONFIG_PREVENT_FIRMWARE_BUILD=y
544CONFIG_FW_LOADER=m 546CONFIG_FW_LOADER=y
545 547
546# 548#
547# Connector - unified userspace <-> kernelspace linker 549# Connector - unified userspace <-> kernelspace linker
@@ -657,7 +659,7 @@ CONFIG_SCSI_CONSTANTS=y
657# SCSI Transport Attributes 659# SCSI Transport Attributes
658# 660#
659CONFIG_SCSI_SPI_ATTRS=y 661CONFIG_SCSI_SPI_ATTRS=y
660# CONFIG_SCSI_FC_ATTRS is not set 662CONFIG_SCSI_FC_ATTRS=y
661CONFIG_SCSI_ISCSI_ATTRS=m 663CONFIG_SCSI_ISCSI_ATTRS=m
662CONFIG_SCSI_SAS_ATTRS=m 664CONFIG_SCSI_SAS_ATTRS=m
663 665
@@ -678,6 +680,7 @@ CONFIG_ISCSI_TCP=m
678CONFIG_MEGARAID_NEWGEN=y 680CONFIG_MEGARAID_NEWGEN=y
679CONFIG_MEGARAID_MM=m 681CONFIG_MEGARAID_MM=m
680CONFIG_MEGARAID_MAILBOX=m 682CONFIG_MEGARAID_MAILBOX=m
683# CONFIG_MEGARAID_LEGACY is not set
681# CONFIG_MEGARAID_SAS is not set 684# CONFIG_MEGARAID_SAS is not set
682# CONFIG_SCSI_SATA is not set 685# CONFIG_SCSI_SATA is not set
683# CONFIG_SCSI_DMX3191D is not set 686# CONFIG_SCSI_DMX3191D is not set
@@ -704,13 +707,7 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
704# CONFIG_SCSI_QLOGIC_FAS is not set 707# CONFIG_SCSI_QLOGIC_FAS is not set
705# CONFIG_SCSI_QLOGIC_FC is not set 708# CONFIG_SCSI_QLOGIC_FC is not set
706# CONFIG_SCSI_QLOGIC_1280 is not set 709# CONFIG_SCSI_QLOGIC_1280 is not set
707CONFIG_SCSI_QLA2XXX=y 710# CONFIG_SCSI_QLA_FC is not set
708# CONFIG_SCSI_QLA21XX is not set
709# CONFIG_SCSI_QLA22XX is not set
710# CONFIG_SCSI_QLA2300 is not set
711# CONFIG_SCSI_QLA2322 is not set
712# CONFIG_SCSI_QLA6312 is not set
713# CONFIG_SCSI_QLA24XX is not set
714# CONFIG_SCSI_LPFC is not set 711# CONFIG_SCSI_LPFC is not set
715# CONFIG_SCSI_SYM53C416 is not set 712# CONFIG_SCSI_SYM53C416 is not set
716# CONFIG_SCSI_DC395x is not set 713# CONFIG_SCSI_DC395x is not set
@@ -801,6 +798,7 @@ CONFIG_MII=y
801# CONFIG_CASSINI is not set 798# CONFIG_CASSINI is not set
802# CONFIG_NET_VENDOR_3COM is not set 799# CONFIG_NET_VENDOR_3COM is not set
803# CONFIG_NET_VENDOR_SMC is not set 800# CONFIG_NET_VENDOR_SMC is not set
801# CONFIG_DM9000 is not set
804# CONFIG_NET_VENDOR_RACAL is not set 802# CONFIG_NET_VENDOR_RACAL is not set
805 803
806# 804#
@@ -858,6 +856,7 @@ CONFIG_EEPRO100=m
858# CONFIG_R8169 is not set 856# CONFIG_R8169 is not set
859# CONFIG_SIS190 is not set 857# CONFIG_SIS190 is not set
860# CONFIG_SKGE is not set 858# CONFIG_SKGE is not set
859# CONFIG_SKY2 is not set
861# CONFIG_SK98LIN is not set 860# CONFIG_SK98LIN is not set
862CONFIG_VIA_VELOCITY=m 861CONFIG_VIA_VELOCITY=m
863# CONFIG_TIGON3 is not set 862# CONFIG_TIGON3 is not set
@@ -879,8 +878,6 @@ CONFIG_VIA_VELOCITY=m
879# Wireless LAN (non-hamradio) 878# Wireless LAN (non-hamradio)
880# 879#
881# CONFIG_NET_RADIO is not set 880# CONFIG_NET_RADIO is not set
882# CONFIG_IPW_DEBUG is not set
883CONFIG_IPW2200=m
884 881
885# 882#
886# Wan interfaces 883# Wan interfaces
@@ -969,6 +966,7 @@ CONFIG_HW_CONSOLE=y
969# 966#
970CONFIG_SERIAL_8250=m 967CONFIG_SERIAL_8250=m
971CONFIG_SERIAL_8250_NR_UARTS=4 968CONFIG_SERIAL_8250_NR_UARTS=4
969CONFIG_SERIAL_8250_RUNTIME_UARTS=4
972CONFIG_SERIAL_8250_EXTENDED=y 970CONFIG_SERIAL_8250_EXTENDED=y
973# CONFIG_SERIAL_8250_MANY_PORTS is not set 971# CONFIG_SERIAL_8250_MANY_PORTS is not set
974CONFIG_SERIAL_8250_SHARE_IRQ=y 972CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -979,7 +977,6 @@ CONFIG_SERIAL_8250_RSA=y
979# Non-8250 serial port support 977# Non-8250 serial port support
980# 978#
981CONFIG_SERIAL_CORE=m 979CONFIG_SERIAL_CORE=m
982# CONFIG_SERIAL_JSM is not set
983CONFIG_UNIX98_PTYS=y 980CONFIG_UNIX98_PTYS=y
984CONFIG_LEGACY_PTYS=y 981CONFIG_LEGACY_PTYS=y
985CONFIG_LEGACY_PTY_COUNT=256 982CONFIG_LEGACY_PTY_COUNT=256
@@ -1021,6 +1018,12 @@ CONFIG_RTC=m
1021# CONFIG_I2C is not set 1018# CONFIG_I2C is not set
1022 1019
1023# 1020#
1021# SPI support
1022#
1023# CONFIG_SPI is not set
1024# CONFIG_SPI_MASTER is not set
1025
1026#
1024# Dallas's 1-wire bus 1027# Dallas's 1-wire bus
1025# 1028#
1026CONFIG_W1=m 1029CONFIG_W1=m
@@ -1123,12 +1126,15 @@ CONFIG_USB_STORAGE_DPCM=y
1123CONFIG_USB_STORAGE_SDDR09=y 1126CONFIG_USB_STORAGE_SDDR09=y
1124CONFIG_USB_STORAGE_SDDR55=y 1127CONFIG_USB_STORAGE_SDDR55=y
1125CONFIG_USB_STORAGE_JUMPSHOT=y 1128CONFIG_USB_STORAGE_JUMPSHOT=y
1129# CONFIG_USB_STORAGE_ALAUDA is not set
1130# CONFIG_USB_LIBUSUAL is not set
1126 1131
1127# 1132#
1128# USB Input Devices 1133# USB Input Devices
1129# 1134#
1130CONFIG_USB_HID=m 1135CONFIG_USB_HID=m
1131CONFIG_USB_HIDINPUT=y 1136CONFIG_USB_HIDINPUT=y
1137# CONFIG_USB_HIDINPUT_POWERBOOK is not set
1132CONFIG_HID_FF=y 1138CONFIG_HID_FF=y
1133CONFIG_HID_PID=y 1139CONFIG_HID_PID=y
1134CONFIG_LOGITECH_FF=y 1140CONFIG_LOGITECH_FF=y
@@ -1151,6 +1157,7 @@ CONFIG_USB_EGALAX=m
1151CONFIG_USB_YEALINK=m 1157CONFIG_USB_YEALINK=m
1152CONFIG_USB_XPAD=m 1158CONFIG_USB_XPAD=m
1153# CONFIG_USB_ATI_REMOTE is not set 1159# CONFIG_USB_ATI_REMOTE is not set
1160# CONFIG_USB_ATI_REMOTE2 is not set
1154# CONFIG_USB_KEYSPAN_REMOTE is not set 1161# CONFIG_USB_KEYSPAN_REMOTE is not set
1155# CONFIG_USB_APPLETOUCH is not set 1162# CONFIG_USB_APPLETOUCH is not set
1156 1163
@@ -1309,6 +1316,7 @@ CONFIG_XFS_QUOTA=y
1309CONFIG_XFS_SECURITY=y 1316CONFIG_XFS_SECURITY=y
1310# CONFIG_XFS_POSIX_ACL is not set 1317# CONFIG_XFS_POSIX_ACL is not set
1311# CONFIG_XFS_RT is not set 1318# CONFIG_XFS_RT is not set
1319# CONFIG_OCFS2_FS is not set
1312CONFIG_MINIX_FS=m 1320CONFIG_MINIX_FS=m
1313CONFIG_ROMFS_FS=m 1321CONFIG_ROMFS_FS=m
1314CONFIG_INOTIFY=y 1322CONFIG_INOTIFY=y
@@ -1351,6 +1359,7 @@ CONFIG_SYSFS=y
1351# CONFIG_HUGETLB_PAGE is not set 1359# CONFIG_HUGETLB_PAGE is not set
1352CONFIG_RAMFS=y 1360CONFIG_RAMFS=y
1353CONFIG_RELAYFS_FS=m 1361CONFIG_RELAYFS_FS=m
1362# CONFIG_CONFIGFS_FS is not set
1354 1363
1355# 1364#
1356# Miscellaneous filesystems 1365# Miscellaneous filesystems
@@ -1432,6 +1441,7 @@ CONFIG_MSDOS_PARTITION=y
1432# CONFIG_SGI_PARTITION is not set 1441# CONFIG_SGI_PARTITION is not set
1433# CONFIG_ULTRIX_PARTITION is not set 1442# CONFIG_ULTRIX_PARTITION is not set
1434# CONFIG_SUN_PARTITION is not set 1443# CONFIG_SUN_PARTITION is not set
1444# CONFIG_KARMA_PARTITION is not set
1435# CONFIG_EFI_PARTITION is not set 1445# CONFIG_EFI_PARTITION is not set
1436 1446
1437# 1447#
@@ -1487,6 +1497,7 @@ CONFIG_NLS_UTF8=m
1487# Kernel hacking 1497# Kernel hacking
1488# 1498#
1489# CONFIG_PRINTK_TIME is not set 1499# CONFIG_PRINTK_TIME is not set
1500# CONFIG_MAGIC_SYSRQ is not set
1490# CONFIG_DEBUG_KERNEL is not set 1501# CONFIG_DEBUG_KERNEL is not set
1491CONFIG_LOG_BUF_SHIFT=14 1502CONFIG_LOG_BUF_SHIFT=14
1492CONFIG_CROSSCOMPILE=y 1503CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 52048c906079..da68c3f72050 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:09 2005 4# Fri Jan 27 15:40:32 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -173,27 +173,29 @@ CONFIG_SYSVIPC=y
173# CONFIG_BSD_PROCESS_ACCT is not set 173# CONFIG_BSD_PROCESS_ACCT is not set
174CONFIG_SYSCTL=y 174CONFIG_SYSCTL=y
175# CONFIG_AUDIT is not set 175# CONFIG_AUDIT is not set
176CONFIG_HOTPLUG=y
177CONFIG_KOBJECT_UEVENT=y
178# CONFIG_IKCONFIG is not set 176# CONFIG_IKCONFIG is not set
179CONFIG_CPUSETS=y 177CONFIG_CPUSETS=y
180CONFIG_INITRAMFS_SOURCE="" 178CONFIG_INITRAMFS_SOURCE=""
179# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
181CONFIG_EMBEDDED=y 180CONFIG_EMBEDDED=y
182CONFIG_KALLSYMS=y 181CONFIG_KALLSYMS=y
183# CONFIG_KALLSYMS_EXTRA_PASS is not set 182# CONFIG_KALLSYMS_EXTRA_PASS is not set
183CONFIG_HOTPLUG=y
184CONFIG_PRINTK=y 184CONFIG_PRINTK=y
185CONFIG_BUG=y 185CONFIG_BUG=y
186CONFIG_ELF_CORE=y
186CONFIG_BASE_FULL=y 187CONFIG_BASE_FULL=y
187CONFIG_FUTEX=y 188CONFIG_FUTEX=y
188CONFIG_EPOLL=y 189CONFIG_EPOLL=y
189# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
190CONFIG_SHMEM=y 190CONFIG_SHMEM=y
191CONFIG_CC_ALIGN_FUNCTIONS=0 191CONFIG_CC_ALIGN_FUNCTIONS=0
192CONFIG_CC_ALIGN_LABELS=0 192CONFIG_CC_ALIGN_LABELS=0
193CONFIG_CC_ALIGN_LOOPS=0 193CONFIG_CC_ALIGN_LOOPS=0
194CONFIG_CC_ALIGN_JUMPS=0 194CONFIG_CC_ALIGN_JUMPS=0
195CONFIG_SLAB=y
195# CONFIG_TINY_SHMEM is not set 196# CONFIG_TINY_SHMEM is not set
196CONFIG_BASE_SMALL=0 197CONFIG_BASE_SMALL=0
198# CONFIG_SLOB is not set
197 199
198# 200#
199# Loadable module support 201# Loadable module support
@@ -247,7 +249,6 @@ CONFIG_MMU=y
247# 249#
248CONFIG_BINFMT_ELF=y 250CONFIG_BINFMT_ELF=y
249# CONFIG_BINFMT_MISC is not set 251# CONFIG_BINFMT_MISC is not set
250# CONFIG_BUILD_ELF64 is not set
251CONFIG_MIPS32_COMPAT=y 252CONFIG_MIPS32_COMPAT=y
252CONFIG_COMPAT=y 253CONFIG_COMPAT=y
253CONFIG_MIPS32_O32=y 254CONFIG_MIPS32_O32=y
@@ -309,6 +310,11 @@ CONFIG_TCP_CONG_BIC=y
309# CONFIG_ATALK is not set 310# CONFIG_ATALK is not set
310# CONFIG_X25 is not set 311# CONFIG_X25 is not set
311# CONFIG_LAPB is not set 312# CONFIG_LAPB is not set
313
314#
315# TIPC Configuration (EXPERIMENTAL)
316#
317# CONFIG_TIPC is not set
312# CONFIG_NET_DIVERT is not set 318# CONFIG_NET_DIVERT is not set
313# CONFIG_ECONET is not set 319# CONFIG_ECONET is not set
314# CONFIG_WAN_ROUTER is not set 320# CONFIG_WAN_ROUTER is not set
@@ -329,7 +335,6 @@ CONFIG_IEEE80211=m
329# CONFIG_IEEE80211_DEBUG is not set 335# CONFIG_IEEE80211_DEBUG is not set
330CONFIG_IEEE80211_CRYPT_WEP=m 336CONFIG_IEEE80211_CRYPT_WEP=m
331CONFIG_IEEE80211_CRYPT_CCMP=m 337CONFIG_IEEE80211_CRYPT_CCMP=m
332CONFIG_IEEE80211_CRYPT_TKIP=m
333 338
334# 339#
335# Device Drivers 340# Device Drivers
@@ -472,6 +477,7 @@ CONFIG_MII=y
472# CONFIG_SUNGEM is not set 477# CONFIG_SUNGEM is not set
473# CONFIG_CASSINI is not set 478# CONFIG_CASSINI is not set
474# CONFIG_NET_VENDOR_3COM is not set 479# CONFIG_NET_VENDOR_3COM is not set
480# CONFIG_DM9000 is not set
475 481
476# 482#
477# Tulip family network device support 483# Tulip family network device support
@@ -493,6 +499,7 @@ CONFIG_MII=y
493CONFIG_NET_SB1250_MAC=y 499CONFIG_NET_SB1250_MAC=y
494# CONFIG_SIS190 is not set 500# CONFIG_SIS190 is not set
495# CONFIG_SKGE is not set 501# CONFIG_SKGE is not set
502# CONFIG_SKY2 is not set
496# CONFIG_SK98LIN is not set 503# CONFIG_SK98LIN is not set
497# CONFIG_TIGON3 is not set 504# CONFIG_TIGON3 is not set
498# CONFIG_BNX2 is not set 505# CONFIG_BNX2 is not set
@@ -513,8 +520,6 @@ CONFIG_NET_SB1250_MAC=y
513# Wireless LAN (non-hamradio) 520# Wireless LAN (non-hamradio)
514# 521#
515# CONFIG_NET_RADIO is not set 522# CONFIG_NET_RADIO is not set
516# CONFIG_IPW_DEBUG is not set
517CONFIG_IPW2200=m
518 523
519# 524#
520# Wan interfaces 525# Wan interfaces
@@ -560,12 +565,15 @@ CONFIG_SERIO_RAW=m
560# 565#
561# CONFIG_VT is not set 566# CONFIG_VT is not set
562CONFIG_SERIAL_NONSTANDARD=y 567CONFIG_SERIAL_NONSTANDARD=y
568# CONFIG_COMPUTONE is not set
563# CONFIG_ROCKETPORT is not set 569# CONFIG_ROCKETPORT is not set
564# CONFIG_CYCLADES is not set 570# CONFIG_CYCLADES is not set
565# CONFIG_DIGIEPCA is not set 571# CONFIG_DIGIEPCA is not set
572# CONFIG_MOXA_INTELLIO is not set
566# CONFIG_MOXA_SMARTIO is not set 573# CONFIG_MOXA_SMARTIO is not set
567# CONFIG_ISI is not set 574# CONFIG_ISI is not set
568# CONFIG_SYNCLINKMP is not set 575# CONFIG_SYNCLINKMP is not set
576# CONFIG_SYNCLINK_GT is not set
569# CONFIG_N_HDLC is not set 577# CONFIG_N_HDLC is not set
570# CONFIG_SPECIALIX is not set 578# CONFIG_SPECIALIX is not set
571# CONFIG_SX is not set 579# CONFIG_SX is not set
@@ -581,7 +589,6 @@ CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y
581# 589#
582# Non-8250 serial port support 590# Non-8250 serial port support
583# 591#
584# CONFIG_SERIAL_JSM is not set
585CONFIG_UNIX98_PTYS=y 592CONFIG_UNIX98_PTYS=y
586CONFIG_LEGACY_PTYS=y 593CONFIG_LEGACY_PTYS=y
587CONFIG_LEGACY_PTY_COUNT=256 594CONFIG_LEGACY_PTY_COUNT=256
@@ -619,6 +626,12 @@ CONFIG_LEGACY_PTY_COUNT=256
619# CONFIG_I2C is not set 626# CONFIG_I2C is not set
620 627
621# 628#
629# SPI support
630#
631# CONFIG_SPI is not set
632# CONFIG_SPI_MASTER is not set
633
634#
622# Dallas's 1-wire bus 635# Dallas's 1-wire bus
623# 636#
624# CONFIG_W1 is not set 637# CONFIG_W1 is not set
@@ -696,12 +709,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
696CONFIG_EXT2_FS_SECURITY=y 709CONFIG_EXT2_FS_SECURITY=y
697# CONFIG_EXT2_FS_XIP is not set 710# CONFIG_EXT2_FS_XIP is not set
698# CONFIG_EXT3_FS is not set 711# CONFIG_EXT3_FS is not set
699# CONFIG_JBD is not set
700CONFIG_FS_MBCACHE=y 712CONFIG_FS_MBCACHE=y
701# CONFIG_REISERFS_FS is not set 713# CONFIG_REISERFS_FS is not set
702# CONFIG_JFS_FS is not set 714# CONFIG_JFS_FS is not set
703CONFIG_FS_POSIX_ACL=y 715CONFIG_FS_POSIX_ACL=y
704# CONFIG_XFS_FS is not set 716# CONFIG_XFS_FS is not set
717# CONFIG_OCFS2_FS is not set
705# CONFIG_MINIX_FS is not set 718# CONFIG_MINIX_FS is not set
706# CONFIG_ROMFS_FS is not set 719# CONFIG_ROMFS_FS is not set
707CONFIG_INOTIFY=y 720CONFIG_INOTIFY=y
@@ -734,6 +747,7 @@ CONFIG_SYSFS=y
734# CONFIG_HUGETLB_PAGE is not set 747# CONFIG_HUGETLB_PAGE is not set
735CONFIG_RAMFS=y 748CONFIG_RAMFS=y
736CONFIG_RELAYFS_FS=m 749CONFIG_RELAYFS_FS=m
750# CONFIG_CONFIGFS_FS is not set
737 751
738# 752#
739# Miscellaneous filesystems 753# Miscellaneous filesystems
@@ -795,6 +809,7 @@ CONFIG_MSDOS_PARTITION=y
795# Kernel hacking 809# Kernel hacking
796# 810#
797# CONFIG_PRINTK_TIME is not set 811# CONFIG_PRINTK_TIME is not set
812# CONFIG_MAGIC_SYSRQ is not set
798# CONFIG_DEBUG_KERNEL is not set 813# CONFIG_DEBUG_KERNEL is not set
799CONFIG_LOG_BUF_SHIFT=15 814CONFIG_LOG_BUF_SHIFT=15
800CONFIG_CROSSCOMPILE=y 815CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index 41dd70824976..9a936d7b7c0c 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:10 2005 4# Fri Jan 27 15:40:33 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -153,25 +153,28 @@ CONFIG_LOCALVERSION_AUTO=y
153CONFIG_SYSVIPC=y 153CONFIG_SYSVIPC=y
154# CONFIG_BSD_PROCESS_ACCT is not set 154# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
156# CONFIG_HOTPLUG is not set
157# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
158CONFIG_INITRAMFS_SOURCE="" 157CONFIG_INITRAMFS_SOURCE=""
158# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
159CONFIG_EMBEDDED=y 159CONFIG_EMBEDDED=y
160CONFIG_KALLSYMS=y 160CONFIG_KALLSYMS=y
161# CONFIG_KALLSYMS_EXTRA_PASS is not set 161# CONFIG_KALLSYMS_EXTRA_PASS is not set
162# CONFIG_HOTPLUG is not set
162CONFIG_PRINTK=y 163CONFIG_PRINTK=y
163CONFIG_BUG=y 164CONFIG_BUG=y
165CONFIG_ELF_CORE=y
164CONFIG_BASE_FULL=y 166CONFIG_BASE_FULL=y
165CONFIG_FUTEX=y 167CONFIG_FUTEX=y
166CONFIG_EPOLL=y 168CONFIG_EPOLL=y
167# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
168CONFIG_SHMEM=y 169CONFIG_SHMEM=y
169CONFIG_CC_ALIGN_FUNCTIONS=0 170CONFIG_CC_ALIGN_FUNCTIONS=0
170CONFIG_CC_ALIGN_LABELS=0 171CONFIG_CC_ALIGN_LABELS=0
171CONFIG_CC_ALIGN_LOOPS=0 172CONFIG_CC_ALIGN_LOOPS=0
172CONFIG_CC_ALIGN_JUMPS=0 173CONFIG_CC_ALIGN_JUMPS=0
174CONFIG_SLAB=y
173# CONFIG_TINY_SHMEM is not set 175# CONFIG_TINY_SHMEM is not set
174CONFIG_BASE_SMALL=0 176CONFIG_BASE_SMALL=0
177# CONFIG_SLOB is not set
175 178
176# 179#
177# Loadable module support 180# Loadable module support
@@ -330,6 +333,7 @@ CONFIG_RAID_ATTRS=y
330CONFIG_SERIAL_8250=y 333CONFIG_SERIAL_8250=y
331CONFIG_SERIAL_8250_CONSOLE=y 334CONFIG_SERIAL_8250_CONSOLE=y
332CONFIG_SERIAL_8250_NR_UARTS=4 335CONFIG_SERIAL_8250_NR_UARTS=4
336CONFIG_SERIAL_8250_RUNTIME_UARTS=4
333# CONFIG_SERIAL_8250_EXTENDED is not set 337# CONFIG_SERIAL_8250_EXTENDED is not set
334 338
335# 339#
@@ -372,6 +376,12 @@ CONFIG_LEGACY_PTY_COUNT=256
372# CONFIG_I2C is not set 376# CONFIG_I2C is not set
373 377
374# 378#
379# SPI support
380#
381# CONFIG_SPI is not set
382# CONFIG_SPI_MASTER is not set
383
384#
375# Dallas's 1-wire bus 385# Dallas's 1-wire bus
376# 386#
377# CONFIG_W1 is not set 387# CONFIG_W1 is not set
@@ -444,7 +454,6 @@ CONFIG_EXT2_FS=y
444# CONFIG_EXT2_FS_XATTR is not set 454# CONFIG_EXT2_FS_XATTR is not set
445# CONFIG_EXT2_FS_XIP is not set 455# CONFIG_EXT2_FS_XIP is not set
446# CONFIG_EXT3_FS is not set 456# CONFIG_EXT3_FS is not set
447# CONFIG_JBD is not set
448# CONFIG_REISERFS_FS is not set 457# CONFIG_REISERFS_FS is not set
449# CONFIG_JFS_FS is not set 458# CONFIG_JFS_FS is not set
450# CONFIG_FS_POSIX_ACL is not set 459# CONFIG_FS_POSIX_ACL is not set
@@ -481,6 +490,7 @@ CONFIG_SYSFS=y
481# CONFIG_HUGETLB_PAGE is not set 490# CONFIG_HUGETLB_PAGE is not set
482CONFIG_RAMFS=y 491CONFIG_RAMFS=y
483CONFIG_RELAYFS_FS=y 492CONFIG_RELAYFS_FS=y
493# CONFIG_CONFIGFS_FS is not set
484 494
485# 495#
486# Miscellaneous filesystems 496# Miscellaneous filesystems
@@ -513,6 +523,7 @@ CONFIG_PARTITION_ADVANCED=y
513# CONFIG_SGI_PARTITION is not set 523# CONFIG_SGI_PARTITION is not set
514# CONFIG_ULTRIX_PARTITION is not set 524# CONFIG_ULTRIX_PARTITION is not set
515# CONFIG_SUN_PARTITION is not set 525# CONFIG_SUN_PARTITION is not set
526# CONFIG_KARMA_PARTITION is not set
516# CONFIG_EFI_PARTITION is not set 527# CONFIG_EFI_PARTITION is not set
517 528
518# 529#
@@ -529,6 +540,7 @@ CONFIG_PARTITION_ADVANCED=y
529# Kernel hacking 540# Kernel hacking
530# 541#
531# CONFIG_PRINTK_TIME is not set 542# CONFIG_PRINTK_TIME is not set
543# CONFIG_MAGIC_SYSRQ is not set
532# CONFIG_DEBUG_KERNEL is not set 544# CONFIG_DEBUG_KERNEL is not set
533CONFIG_LOG_BUF_SHIFT=14 545CONFIG_LOG_BUF_SHIFT=14
534CONFIG_CROSSCOMPILE=y 546CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index 83969466ecf6..c2dee0d1c72c 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:12 2005 4# Fri Jan 27 15:40:34 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,11 +63,12 @@ CONFIG_MACH_VR41XX=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_NEC_CMBVR4133 is not set
67# CONFIG_CASIO_E55 is not set 66# CONFIG_CASIO_E55 is not set
68# CONFIG_IBM_WORKPAD is not set 67# CONFIG_IBM_WORKPAD is not set
68# CONFIG_NEC_CMBVR4133 is not set
69CONFIG_TANBAC_TB022X=y 69CONFIG_TANBAC_TB022X=y
70CONFIG_TANBAC_TB0226=y 70CONFIG_TANBAC_TB0226=y
71CONFIG_TANBAC_TB0287=y
71# CONFIG_VICTOR_MPC30X is not set 72# CONFIG_VICTOR_MPC30X is not set
72# CONFIG_ZAO_CAPCELLA is not set 73# CONFIG_ZAO_CAPCELLA is not set
73CONFIG_PCI_VR41XX=y 74CONFIG_PCI_VR41XX=y
@@ -91,7 +92,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
91# CONFIG_CPU_MIPS64_R2 is not set 92# CONFIG_CPU_MIPS64_R2 is not set
92# CONFIG_CPU_R3000 is not set 93# CONFIG_CPU_R3000 is not set
93# CONFIG_CPU_TX39XX is not set 94# CONFIG_CPU_TX39XX is not set
94CONFIG_CPU_VR41XX=y 95# CONFIG_CPU_VR41XX is not set
95# CONFIG_CPU_R4300 is not set 96# CONFIG_CPU_R4300 is not set
96# CONFIG_CPU_R4X00 is not set 97# CONFIG_CPU_R4X00 is not set
97# CONFIG_CPU_TX49XX is not set 98# CONFIG_CPU_TX49XX is not set
@@ -104,23 +105,18 @@ CONFIG_CPU_VR41XX=y
104# CONFIG_CPU_RM7000 is not set 105# CONFIG_CPU_RM7000 is not set
105# CONFIG_CPU_RM9000 is not set 106# CONFIG_CPU_RM9000 is not set
106# CONFIG_CPU_SB1 is not set 107# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
109CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 108
113# 109#
114# Kernel type 110# Kernel type
115# 111#
116CONFIG_32BIT=y 112# CONFIG_32BIT is not set
117# CONFIG_64BIT is not set 113# CONFIG_64BIT is not set
118CONFIG_PAGE_SIZE_4KB=y 114CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_8KB is not set 115# CONFIG_PAGE_SIZE_8KB is not set
120# CONFIG_PAGE_SIZE_16KB is not set 116# CONFIG_PAGE_SIZE_16KB is not set
121# CONFIG_PAGE_SIZE_64KB is not set 117# CONFIG_PAGE_SIZE_64KB is not set
122# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
123# CONFIG_CPU_ADVANCED is not set 119CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
125CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
126CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
@@ -156,26 +152,28 @@ CONFIG_SYSVIPC=y
156# CONFIG_BSD_PROCESS_ACCT is not set 152# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
159# CONFIG_HOTPLUG is not set
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_EXTRA_PASS is not set 160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_HOTPLUG=y
166CONFIG_PRINTK=y 162CONFIG_PRINTK=y
167CONFIG_BUG=y 163CONFIG_BUG=y
164CONFIG_ELF_CORE=y
168CONFIG_BASE_FULL=y 165CONFIG_BASE_FULL=y
169CONFIG_FUTEX=y 166CONFIG_FUTEX=y
170CONFIG_EPOLL=y 167CONFIG_EPOLL=y
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
172CONFIG_SHMEM=y 168CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0 169CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0 170CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0 171CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0 172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y
177# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
178CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
176# CONFIG_SLOB is not set
179 177
180# 178#
181# Loadable module support 179# Loadable module support
@@ -191,7 +189,6 @@ CONFIG_KMOD=y
191# 189#
192# Block layer 190# Block layer
193# 191#
194# CONFIG_LBD is not set
195 192
196# 193#
197# IO Schedulers 194# IO Schedulers
@@ -229,7 +226,6 @@ CONFIG_MMU=y
229# 226#
230CONFIG_BINFMT_ELF=y 227CONFIG_BINFMT_ELF=y
231# CONFIG_BINFMT_MISC is not set 228# CONFIG_BINFMT_MISC is not set
232CONFIG_TRAD_SIGNALS=y
233 229
234# 230#
235# Networking 231# Networking
@@ -293,6 +289,11 @@ CONFIG_TCP_CONG_BIC=y
293# CONFIG_ATALK is not set 289# CONFIG_ATALK is not set
294# CONFIG_X25 is not set 290# CONFIG_X25 is not set
295# CONFIG_LAPB is not set 291# CONFIG_LAPB is not set
292
293#
294# TIPC Configuration (EXPERIMENTAL)
295#
296# CONFIG_TIPC is not set
296# CONFIG_NET_DIVERT is not set 297# CONFIG_NET_DIVERT is not set
297# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
298# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
@@ -313,7 +314,6 @@ CONFIG_IEEE80211=m
313# CONFIG_IEEE80211_DEBUG is not set 314# CONFIG_IEEE80211_DEBUG is not set
314CONFIG_IEEE80211_CRYPT_WEP=m 315CONFIG_IEEE80211_CRYPT_WEP=m
315CONFIG_IEEE80211_CRYPT_CCMP=m 316CONFIG_IEEE80211_CRYPT_CCMP=m
316CONFIG_IEEE80211_CRYPT_TKIP=m
317 317
318# 318#
319# Device Drivers 319# Device Drivers
@@ -324,7 +324,7 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
324# 324#
325CONFIG_STANDALONE=y 325CONFIG_STANDALONE=y
326CONFIG_PREVENT_FIRMWARE_BUILD=y 326CONFIG_PREVENT_FIRMWARE_BUILD=y
327# CONFIG_FW_LOADER is not set 327CONFIG_FW_LOADER=y
328 328
329# 329#
330# Connector - unified userspace <-> kernelspace linker 330# Connector - unified userspace <-> kernelspace linker
@@ -397,7 +397,7 @@ CONFIG_SCSI_MULTI_LUN=y
397# SCSI Transport Attributes 397# SCSI Transport Attributes
398# 398#
399# CONFIG_SCSI_SPI_ATTRS is not set 399# CONFIG_SCSI_SPI_ATTRS is not set
400# CONFIG_SCSI_FC_ATTRS is not set 400CONFIG_SCSI_FC_ATTRS=y
401CONFIG_SCSI_ISCSI_ATTRS=m 401CONFIG_SCSI_ISCSI_ATTRS=m
402# CONFIG_SCSI_SAS_ATTRS is not set 402# CONFIG_SCSI_SAS_ATTRS is not set
403 403
@@ -426,13 +426,7 @@ CONFIG_ISCSI_TCP=m
426# CONFIG_SCSI_IPR is not set 426# CONFIG_SCSI_IPR is not set
427# CONFIG_SCSI_QLOGIC_FC is not set 427# CONFIG_SCSI_QLOGIC_FC is not set
428# CONFIG_SCSI_QLOGIC_1280 is not set 428# CONFIG_SCSI_QLOGIC_1280 is not set
429CONFIG_SCSI_QLA2XXX=y 429# CONFIG_SCSI_QLA_FC is not set
430# CONFIG_SCSI_QLA21XX is not set
431# CONFIG_SCSI_QLA22XX is not set
432# CONFIG_SCSI_QLA2300 is not set
433# CONFIG_SCSI_QLA2322 is not set
434# CONFIG_SCSI_QLA6312 is not set
435# CONFIG_SCSI_QLA24XX is not set
436# CONFIG_SCSI_LPFC is not set 430# CONFIG_SCSI_LPFC is not set
437# CONFIG_SCSI_DC395x is not set 431# CONFIG_SCSI_DC395x is not set
438# CONFIG_SCSI_DC390T is not set 432# CONFIG_SCSI_DC390T is not set
@@ -499,6 +493,7 @@ CONFIG_MII=y
499# CONFIG_SUNGEM is not set 493# CONFIG_SUNGEM is not set
500# CONFIG_CASSINI is not set 494# CONFIG_CASSINI is not set
501# CONFIG_NET_VENDOR_3COM is not set 495# CONFIG_NET_VENDOR_3COM is not set
496# CONFIG_DM9000 is not set
502 497
503# 498#
504# Tulip family network device support 499# Tulip family network device support
@@ -538,6 +533,7 @@ CONFIG_EEPRO100=y
538# CONFIG_R8169 is not set 533# CONFIG_R8169 is not set
539# CONFIG_SIS190 is not set 534# CONFIG_SIS190 is not set
540# CONFIG_SKGE is not set 535# CONFIG_SKGE is not set
536# CONFIG_SKY2 is not set
541# CONFIG_SK98LIN is not set 537# CONFIG_SK98LIN is not set
542# CONFIG_VIA_VELOCITY is not set 538# CONFIG_VIA_VELOCITY is not set
543# CONFIG_TIGON3 is not set 539# CONFIG_TIGON3 is not set
@@ -559,7 +555,6 @@ CONFIG_EEPRO100=y
559# Wireless LAN (non-hamradio) 555# Wireless LAN (non-hamradio)
560# 556#
561# CONFIG_NET_RADIO is not set 557# CONFIG_NET_RADIO is not set
562# CONFIG_IPW2200 is not set
563 558
564# 559#
565# Wan interfaces 560# Wan interfaces
@@ -630,11 +625,6 @@ CONFIG_HW_CONSOLE=y
630# 625#
631# Non-8250 serial port support 626# Non-8250 serial port support
632# 627#
633CONFIG_SERIAL_CORE=y
634CONFIG_SERIAL_CORE_CONSOLE=y
635CONFIG_SERIAL_VR41XX=y
636CONFIG_SERIAL_VR41XX_CONSOLE=y
637# CONFIG_SERIAL_JSM is not set
638CONFIG_UNIX98_PTYS=y 628CONFIG_UNIX98_PTYS=y
639CONFIG_LEGACY_PTYS=y 629CONFIG_LEGACY_PTYS=y
640CONFIG_LEGACY_PTY_COUNT=256 630CONFIG_LEGACY_PTY_COUNT=256
@@ -650,7 +640,6 @@ CONFIG_LEGACY_PTY_COUNT=256
650# CONFIG_WATCHDOG is not set 640# CONFIG_WATCHDOG is not set
651# CONFIG_RTC is not set 641# CONFIG_RTC is not set
652# CONFIG_GEN_RTC is not set 642# CONFIG_GEN_RTC is not set
653# CONFIG_RTC_VR41XX is not set
654# CONFIG_DTLK is not set 643# CONFIG_DTLK is not set
655# CONFIG_R3964 is not set 644# CONFIG_R3964 is not set
656# CONFIG_APPLICOM is not set 645# CONFIG_APPLICOM is not set
@@ -675,6 +664,12 @@ CONFIG_GPIO_VR41XX=y
675# CONFIG_I2C is not set 664# CONFIG_I2C is not set
676 665
677# 666#
667# SPI support
668#
669# CONFIG_SPI is not set
670# CONFIG_SPI_MASTER is not set
671
672#
678# Dallas's 1-wire bus 673# Dallas's 1-wire bus
679# 674#
680# CONFIG_W1 is not set 675# CONFIG_W1 is not set
@@ -770,6 +765,8 @@ CONFIG_USB_STORAGE=m
770# CONFIG_USB_STORAGE_SDDR09 is not set 765# CONFIG_USB_STORAGE_SDDR09 is not set
771# CONFIG_USB_STORAGE_SDDR55 is not set 766# CONFIG_USB_STORAGE_SDDR55 is not set
772# CONFIG_USB_STORAGE_JUMPSHOT is not set 767# CONFIG_USB_STORAGE_JUMPSHOT is not set
768# CONFIG_USB_STORAGE_ALAUDA is not set
769# CONFIG_USB_LIBUSUAL is not set
773 770
774# 771#
775# USB Input Devices 772# USB Input Devices
@@ -792,6 +789,7 @@ CONFIG_USB_STORAGE=m
792# CONFIG_USB_YEALINK is not set 789# CONFIG_USB_YEALINK is not set
793# CONFIG_USB_XPAD is not set 790# CONFIG_USB_XPAD is not set
794# CONFIG_USB_ATI_REMOTE is not set 791# CONFIG_USB_ATI_REMOTE is not set
792# CONFIG_USB_ATI_REMOTE2 is not set
795# CONFIG_USB_KEYSPAN_REMOTE is not set 793# CONFIG_USB_KEYSPAN_REMOTE is not set
796# CONFIG_USB_APPLETOUCH is not set 794# CONFIG_USB_APPLETOUCH is not set
797 795
@@ -877,11 +875,11 @@ CONFIG_EXT2_FS=y
877# CONFIG_EXT2_FS_XATTR is not set 875# CONFIG_EXT2_FS_XATTR is not set
878# CONFIG_EXT2_FS_XIP is not set 876# CONFIG_EXT2_FS_XIP is not set
879# CONFIG_EXT3_FS is not set 877# CONFIG_EXT3_FS is not set
880# CONFIG_JBD is not set
881# CONFIG_REISERFS_FS is not set 878# CONFIG_REISERFS_FS is not set
882# CONFIG_JFS_FS is not set 879# CONFIG_JFS_FS is not set
883# CONFIG_FS_POSIX_ACL is not set 880# CONFIG_FS_POSIX_ACL is not set
884# CONFIG_XFS_FS is not set 881# CONFIG_XFS_FS is not set
882# CONFIG_OCFS2_FS is not set
885# CONFIG_MINIX_FS is not set 883# CONFIG_MINIX_FS is not set
886CONFIG_ROMFS_FS=m 884CONFIG_ROMFS_FS=m
887CONFIG_INOTIFY=y 885CONFIG_INOTIFY=y
@@ -914,6 +912,7 @@ CONFIG_TMPFS=y
914# CONFIG_HUGETLB_PAGE is not set 912# CONFIG_HUGETLB_PAGE is not set
915CONFIG_RAMFS=y 913CONFIG_RAMFS=y
916CONFIG_RELAYFS_FS=m 914CONFIG_RELAYFS_FS=m
915# CONFIG_CONFIGFS_FS is not set
917 916
918# 917#
919# Miscellaneous filesystems 918# Miscellaneous filesystems
@@ -1021,6 +1020,7 @@ CONFIG_NLS_ISO8859_1=m
1021# Kernel hacking 1020# Kernel hacking
1022# 1021#
1023# CONFIG_PRINTK_TIME is not set 1022# CONFIG_PRINTK_TIME is not set
1023# CONFIG_MAGIC_SYSRQ is not set
1024# CONFIG_DEBUG_KERNEL is not set 1024# CONFIG_DEBUG_KERNEL is not set
1025CONFIG_LOG_BUF_SHIFT=14 1025CONFIG_LOG_BUF_SHIFT=14
1026CONFIG_CROSSCOMPILE=y 1026CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index ce7b9ed44432..be99261d7997 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:15 2005 4# Fri Jan 27 15:40:35 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,11 +63,12 @@ CONFIG_MACH_VR41XX=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_NEC_CMBVR4133 is not set
67# CONFIG_CASIO_E55 is not set 66# CONFIG_CASIO_E55 is not set
68# CONFIG_IBM_WORKPAD is not set 67# CONFIG_IBM_WORKPAD is not set
68# CONFIG_NEC_CMBVR4133 is not set
69CONFIG_TANBAC_TB022X=y 69CONFIG_TANBAC_TB022X=y
70# CONFIG_TANBAC_TB0226 is not set 70# CONFIG_TANBAC_TB0226 is not set
71CONFIG_TANBAC_TB0287=y
71# CONFIG_VICTOR_MPC30X is not set 72# CONFIG_VICTOR_MPC30X is not set
72# CONFIG_ZAO_CAPCELLA is not set 73# CONFIG_ZAO_CAPCELLA is not set
73CONFIG_PCI_VR41XX=y 74CONFIG_PCI_VR41XX=y
@@ -91,7 +92,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
91# CONFIG_CPU_MIPS64_R2 is not set 92# CONFIG_CPU_MIPS64_R2 is not set
92# CONFIG_CPU_R3000 is not set 93# CONFIG_CPU_R3000 is not set
93# CONFIG_CPU_TX39XX is not set 94# CONFIG_CPU_TX39XX is not set
94CONFIG_CPU_VR41XX=y 95# CONFIG_CPU_VR41XX is not set
95# CONFIG_CPU_R4300 is not set 96# CONFIG_CPU_R4300 is not set
96# CONFIG_CPU_R4X00 is not set 97# CONFIG_CPU_R4X00 is not set
97# CONFIG_CPU_TX49XX is not set 98# CONFIG_CPU_TX49XX is not set
@@ -104,23 +105,18 @@ CONFIG_CPU_VR41XX=y
104# CONFIG_CPU_RM7000 is not set 105# CONFIG_CPU_RM7000 is not set
105# CONFIG_CPU_RM9000 is not set 106# CONFIG_CPU_RM9000 is not set
106# CONFIG_CPU_SB1 is not set 107# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
109CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 108
113# 109#
114# Kernel type 110# Kernel type
115# 111#
116CONFIG_32BIT=y 112# CONFIG_32BIT is not set
117# CONFIG_64BIT is not set 113# CONFIG_64BIT is not set
118CONFIG_PAGE_SIZE_4KB=y 114CONFIG_PAGE_SIZE_4KB=y
119# CONFIG_PAGE_SIZE_8KB is not set 115# CONFIG_PAGE_SIZE_8KB is not set
120# CONFIG_PAGE_SIZE_16KB is not set 116# CONFIG_PAGE_SIZE_16KB is not set
121# CONFIG_PAGE_SIZE_64KB is not set 117# CONFIG_PAGE_SIZE_64KB is not set
122# CONFIG_MIPS_MT is not set 118# CONFIG_MIPS_MT is not set
123# CONFIG_CPU_ADVANCED is not set 119CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 120CONFIG_CPU_HAS_SYNC=y
125CONFIG_GENERIC_HARDIRQS=y 121CONFIG_GENERIC_HARDIRQS=y
126CONFIG_GENERIC_IRQ_PROBE=y 122CONFIG_GENERIC_IRQ_PROBE=y
@@ -156,26 +152,28 @@ CONFIG_SYSVIPC=y
156# CONFIG_BSD_PROCESS_ACCT is not set 152# CONFIG_BSD_PROCESS_ACCT is not set
157CONFIG_SYSCTL=y 153CONFIG_SYSCTL=y
158# CONFIG_AUDIT is not set 154# CONFIG_AUDIT is not set
159CONFIG_HOTPLUG=y
160CONFIG_KOBJECT_UEVENT=y
161# CONFIG_IKCONFIG is not set 155# CONFIG_IKCONFIG is not set
162CONFIG_INITRAMFS_SOURCE="" 156CONFIG_INITRAMFS_SOURCE=""
157# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
163CONFIG_EMBEDDED=y 158CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y 159CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_EXTRA_PASS is not set 160# CONFIG_KALLSYMS_EXTRA_PASS is not set
161CONFIG_HOTPLUG=y
166CONFIG_PRINTK=y 162CONFIG_PRINTK=y
167CONFIG_BUG=y 163CONFIG_BUG=y
164CONFIG_ELF_CORE=y
168CONFIG_BASE_FULL=y 165CONFIG_BASE_FULL=y
169CONFIG_FUTEX=y 166CONFIG_FUTEX=y
170CONFIG_EPOLL=y 167CONFIG_EPOLL=y
171# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
172CONFIG_SHMEM=y 168CONFIG_SHMEM=y
173CONFIG_CC_ALIGN_FUNCTIONS=0 169CONFIG_CC_ALIGN_FUNCTIONS=0
174CONFIG_CC_ALIGN_LABELS=0 170CONFIG_CC_ALIGN_LABELS=0
175CONFIG_CC_ALIGN_LOOPS=0 171CONFIG_CC_ALIGN_LOOPS=0
176CONFIG_CC_ALIGN_JUMPS=0 172CONFIG_CC_ALIGN_JUMPS=0
173CONFIG_SLAB=y
177# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
178CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
176# CONFIG_SLOB is not set
179 177
180# 178#
181# Loadable module support 179# Loadable module support
@@ -191,7 +189,6 @@ CONFIG_KMOD=y
191# 189#
192# Block layer 190# Block layer
193# 191#
194# CONFIG_LBD is not set
195 192
196# 193#
197# IO Schedulers 194# IO Schedulers
@@ -229,7 +226,6 @@ CONFIG_MMU=y
229# 226#
230CONFIG_BINFMT_ELF=y 227CONFIG_BINFMT_ELF=y
231# CONFIG_BINFMT_MISC is not set 228# CONFIG_BINFMT_MISC is not set
232CONFIG_TRAD_SIGNALS=y
233 229
234# 230#
235# Networking 231# Networking
@@ -294,6 +290,11 @@ CONFIG_TCP_CONG_BIC=y
294# CONFIG_ATALK is not set 290# CONFIG_ATALK is not set
295# CONFIG_X25 is not set 291# CONFIG_X25 is not set
296# CONFIG_LAPB is not set 292# CONFIG_LAPB is not set
293
294#
295# TIPC Configuration (EXPERIMENTAL)
296#
297# CONFIG_TIPC is not set
297# CONFIG_NET_DIVERT is not set 298# CONFIG_NET_DIVERT is not set
298# CONFIG_ECONET is not set 299# CONFIG_ECONET is not set
299# CONFIG_WAN_ROUTER is not set 300# CONFIG_WAN_ROUTER is not set
@@ -314,7 +315,6 @@ CONFIG_IEEE80211=m
314# CONFIG_IEEE80211_DEBUG is not set 315# CONFIG_IEEE80211_DEBUG is not set
315CONFIG_IEEE80211_CRYPT_WEP=m 316CONFIG_IEEE80211_CRYPT_WEP=m
316CONFIG_IEEE80211_CRYPT_CCMP=m 317CONFIG_IEEE80211_CRYPT_CCMP=m
317CONFIG_IEEE80211_CRYPT_TKIP=m
318 318
319# 319#
320# Device Drivers 320# Device Drivers
@@ -436,6 +436,7 @@ CONFIG_MII=y
436# CONFIG_SUNGEM is not set 436# CONFIG_SUNGEM is not set
437# CONFIG_CASSINI is not set 437# CONFIG_CASSINI is not set
438# CONFIG_NET_VENDOR_3COM is not set 438# CONFIG_NET_VENDOR_3COM is not set
439# CONFIG_DM9000 is not set
439 440
440# 441#
441# Tulip family network device support 442# Tulip family network device support
@@ -480,6 +481,7 @@ CONFIG_R8169=y
480# CONFIG_R8169_NAPI is not set 481# CONFIG_R8169_NAPI is not set
481# CONFIG_SIS190 is not set 482# CONFIG_SIS190 is not set
482# CONFIG_SKGE is not set 483# CONFIG_SKGE is not set
484# CONFIG_SKY2 is not set
483# CONFIG_SK98LIN is not set 485# CONFIG_SK98LIN is not set
484# CONFIG_VIA_VELOCITY is not set 486# CONFIG_VIA_VELOCITY is not set
485# CONFIG_TIGON3 is not set 487# CONFIG_TIGON3 is not set
@@ -501,8 +503,6 @@ CONFIG_R8169=y
501# Wireless LAN (non-hamradio) 503# Wireless LAN (non-hamradio)
502# 504#
503# CONFIG_NET_RADIO is not set 505# CONFIG_NET_RADIO is not set
504# CONFIG_IPW_DEBUG is not set
505CONFIG_IPW2200=m
506 506
507# 507#
508# Wan interfaces 508# Wan interfaces
@@ -583,11 +583,6 @@ CONFIG_HW_CONSOLE=y
583# 583#
584# Non-8250 serial port support 584# Non-8250 serial port support
585# 585#
586CONFIG_SERIAL_CORE=y
587CONFIG_SERIAL_CORE_CONSOLE=y
588CONFIG_SERIAL_VR41XX=y
589CONFIG_SERIAL_VR41XX_CONSOLE=y
590# CONFIG_SERIAL_JSM is not set
591CONFIG_UNIX98_PTYS=y 586CONFIG_UNIX98_PTYS=y
592CONFIG_LEGACY_PTYS=y 587CONFIG_LEGACY_PTYS=y
593CONFIG_LEGACY_PTY_COUNT=256 588CONFIG_LEGACY_PTY_COUNT=256
@@ -603,7 +598,6 @@ CONFIG_LEGACY_PTY_COUNT=256
603# CONFIG_WATCHDOG is not set 598# CONFIG_WATCHDOG is not set
604# CONFIG_RTC is not set 599# CONFIG_RTC is not set
605# CONFIG_GEN_RTC is not set 600# CONFIG_GEN_RTC is not set
606# CONFIG_RTC_VR41XX is not set
607# CONFIG_DTLK is not set 601# CONFIG_DTLK is not set
608# CONFIG_R3964 is not set 602# CONFIG_R3964 is not set
609# CONFIG_APPLICOM is not set 603# CONFIG_APPLICOM is not set
@@ -613,7 +607,6 @@ CONFIG_TANBAC_TB0219=y
613# Ftape, the floppy tape device driver 607# Ftape, the floppy tape device driver
614# 608#
615# CONFIG_DRM is not set 609# CONFIG_DRM is not set
616CONFIG_GPIO_VR41XX=y
617# CONFIG_RAW_DRIVER is not set 610# CONFIG_RAW_DRIVER is not set
618 611
619# 612#
@@ -628,6 +621,12 @@ CONFIG_GPIO_VR41XX=y
628# CONFIG_I2C is not set 621# CONFIG_I2C is not set
629 622
630# 623#
624# SPI support
625#
626# CONFIG_SPI is not set
627# CONFIG_SPI_MASTER is not set
628
629#
631# Dallas's 1-wire bus 630# Dallas's 1-wire bus
632# 631#
633# CONFIG_W1 is not set 632# CONFIG_W1 is not set
@@ -715,6 +714,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
715# may also be needed; see USB_STORAGE Help for more information 714# may also be needed; see USB_STORAGE Help for more information
716# 715#
717# CONFIG_USB_STORAGE is not set 716# CONFIG_USB_STORAGE is not set
717# CONFIG_USB_LIBUSUAL is not set
718 718
719# 719#
720# USB Input Devices 720# USB Input Devices
@@ -737,6 +737,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
737# CONFIG_USB_YEALINK is not set 737# CONFIG_USB_YEALINK is not set
738# CONFIG_USB_XPAD is not set 738# CONFIG_USB_XPAD is not set
739# CONFIG_USB_ATI_REMOTE is not set 739# CONFIG_USB_ATI_REMOTE is not set
740# CONFIG_USB_ATI_REMOTE2 is not set
740# CONFIG_USB_KEYSPAN_REMOTE is not set 741# CONFIG_USB_KEYSPAN_REMOTE is not set
741# CONFIG_USB_APPLETOUCH is not set 742# CONFIG_USB_APPLETOUCH is not set
742 743
@@ -840,6 +841,7 @@ CONFIG_XFS_QUOTA=y
840# CONFIG_XFS_SECURITY is not set 841# CONFIG_XFS_SECURITY is not set
841CONFIG_XFS_POSIX_ACL=y 842CONFIG_XFS_POSIX_ACL=y
842# CONFIG_XFS_RT is not set 843# CONFIG_XFS_RT is not set
844# CONFIG_OCFS2_FS is not set
843# CONFIG_MINIX_FS is not set 845# CONFIG_MINIX_FS is not set
844CONFIG_ROMFS_FS=m 846CONFIG_ROMFS_FS=m
845CONFIG_INOTIFY=y 847CONFIG_INOTIFY=y
@@ -879,6 +881,7 @@ CONFIG_TMPFS=y
879# CONFIG_HUGETLB_PAGE is not set 881# CONFIG_HUGETLB_PAGE is not set
880CONFIG_RAMFS=y 882CONFIG_RAMFS=y
881CONFIG_RELAYFS_FS=m 883CONFIG_RELAYFS_FS=m
884# CONFIG_CONFIGFS_FS is not set
882 885
883# 886#
884# Miscellaneous filesystems 887# Miscellaneous filesystems
@@ -986,6 +989,7 @@ CONFIG_NLS_ISO8859_1=m
986# Kernel hacking 989# Kernel hacking
987# 990#
988# CONFIG_PRINTK_TIME is not set 991# CONFIG_PRINTK_TIME is not set
992# CONFIG_MAGIC_SYSRQ is not set
989# CONFIG_DEBUG_KERNEL is not set 993# CONFIG_DEBUG_KERNEL is not set
990CONFIG_LOG_BUF_SHIFT=14 994CONFIG_LOG_BUF_SHIFT=14
991CONFIG_CROSSCOMPILE=y 995CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
deleted file mode 100644
index 95344832d66e..000000000000
--- a/arch/mips/configs/tb0287_defconfig
+++ /dev/null
@@ -1,1105 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc5-mm1
4# Tue Oct 25 00:20:22 2005
5#
6CONFIG_MIPS=y
7
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_SWAP_PREFETCH=y
23CONFIG_SYSVIPC=y
24# CONFIG_POSIX_MQUEUE is not set
25# CONFIG_BSD_PROCESS_ACCT 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
62#
63# CONFIG_MIPS_MTX1 is not set
64# CONFIG_MIPS_BOSPORUS is not set
65# CONFIG_MIPS_PB1000 is not set
66# CONFIG_MIPS_PB1100 is not set
67# CONFIG_MIPS_PB1500 is not set
68# CONFIG_MIPS_PB1550 is not set
69# CONFIG_MIPS_PB1200 is not set
70# CONFIG_MIPS_DB1000 is not set
71# CONFIG_MIPS_DB1100 is not set
72# CONFIG_MIPS_DB1500 is not set
73# CONFIG_MIPS_DB1550 is not set
74# CONFIG_MIPS_DB1200 is not set
75# CONFIG_MIPS_MIRAGE is not set
76# CONFIG_MIPS_COBALT is not set
77# CONFIG_MACH_DECSTATION is not set
78# CONFIG_MIPS_EV64120 is not set
79# CONFIG_MIPS_EV96100 is not set
80# CONFIG_MIPS_IVR is not set
81# CONFIG_MIPS_ITE8172 is not set
82# CONFIG_MACH_JAZZ is not set
83# CONFIG_LASAT is not set
84# CONFIG_MIPS_ATLAS is not set
85# CONFIG_MIPS_MALTA is not set
86# CONFIG_MIPS_SEAD is not set
87# CONFIG_MIPS_SIM is not set
88# CONFIG_MOMENCO_JAGUAR_ATX is not set
89# CONFIG_MOMENCO_OCELOT is not set
90# CONFIG_MOMENCO_OCELOT_3 is not set
91# CONFIG_MOMENCO_OCELOT_C is not set
92# CONFIG_MOMENCO_OCELOT_G is not set
93# CONFIG_MIPS_XXS1500 is not set
94# CONFIG_PNX8550_V2PCI is not set
95# CONFIG_PNX8550_JBS is not set
96# CONFIG_DDB5074 is not set
97# CONFIG_DDB5476 is not set
98# CONFIG_DDB5477 is not set
99CONFIG_MACH_VR41XX=y
100# CONFIG_PMC_YOSEMITE is not set
101# CONFIG_QEMU is not set
102# CONFIG_SGI_IP22 is not set
103# CONFIG_SGI_IP27 is not set
104# CONFIG_SGI_IP32 is not set
105# CONFIG_SIBYTE_SWARM is not set
106# CONFIG_SIBYTE_SENTOSA is not set
107# CONFIG_SIBYTE_RHONE is not set
108# CONFIG_SIBYTE_CARMEL is not set
109# CONFIG_SIBYTE_PTSWARM is not set
110# CONFIG_SIBYTE_LITTLESUR is not set
111# CONFIG_SIBYTE_CRHINE is not set
112# CONFIG_SIBYTE_CRHONE is not set
113# CONFIG_SNI_RM200_PCI is not set
114# CONFIG_TOSHIBA_JMR3927 is not set
115# CONFIG_TOSHIBA_RBTX4927 is not set
116# CONFIG_TOSHIBA_RBTX4938 is not set
117# CONFIG_CASIO_E55 is not set
118# CONFIG_IBM_WORKPAD is not set
119# CONFIG_NEC_CMBVR4133 is not set
120CONFIG_TANBAC_TB022X=y
121# CONFIG_TANBAC_TB0226 is not set
122CONFIG_TANBAC_TB0287=y
123# CONFIG_VICTOR_MPC30X is not set
124# CONFIG_ZAO_CAPCELLA is not set
125CONFIG_PCI_VR41XX=y
126# CONFIG_VRC4173 is not set
127CONFIG_RWSEM_GENERIC_SPINLOCK=y
128CONFIG_GENERIC_CALIBRATE_DELAY=y
129CONFIG_DMA_NONCOHERENT=y
130CONFIG_DMA_NEED_PCI_MAP_STATE=y
131# CONFIG_CPU_BIG_ENDIAN is not set
132CONFIG_CPU_LITTLE_ENDIAN=y
133CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
134CONFIG_IRQ_CPU=y
135CONFIG_MIPS_L1_CACHE_SHIFT=5
136
137#
138# CPU selection
139#
140# CONFIG_CPU_MIPS32_R1 is not set
141# CONFIG_CPU_MIPS32_R2 is not set
142# CONFIG_CPU_MIPS64_R1 is not set
143# CONFIG_CPU_MIPS64_R2 is not set
144# CONFIG_CPU_R3000 is not set
145# CONFIG_CPU_TX39XX is not set
146CONFIG_CPU_VR41XX=y
147# CONFIG_CPU_R4300 is not set
148# CONFIG_CPU_R4X00 is not set
149# CONFIG_CPU_TX49XX is not set
150# CONFIG_CPU_R5000 is not set
151# CONFIG_CPU_R5432 is not set
152# CONFIG_CPU_R6000 is not set
153# CONFIG_CPU_NEVADA is not set
154# CONFIG_CPU_R8000 is not set
155# CONFIG_CPU_R10000 is not set
156# CONFIG_CPU_RM7000 is not set
157# CONFIG_CPU_RM9000 is not set
158# CONFIG_CPU_SB1 is not set
159CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
160CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
161CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
162CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
163
164#
165# Kernel type
166#
167CONFIG_32BIT=y
168# CONFIG_64BIT is not set
169CONFIG_PAGE_SIZE_4KB=y
170# CONFIG_PAGE_SIZE_8KB is not set
171# CONFIG_PAGE_SIZE_16KB is not set
172# CONFIG_PAGE_SIZE_64KB is not set
173# CONFIG_MIPS_MT is not set
174# CONFIG_CPU_ADVANCED is not set
175CONFIG_CPU_HAS_SYNC=y
176CONFIG_GENERIC_HARDIRQS=y
177CONFIG_GENERIC_IRQ_PROBE=y
178CONFIG_ARCH_FLATMEM_ENABLE=y
179CONFIG_SELECT_MEMORY_MODEL=y
180CONFIG_FLATMEM_MANUAL=y
181# CONFIG_DISCONTIGMEM_MANUAL is not set
182# CONFIG_SPARSEMEM_MANUAL is not set
183CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set
186CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set
190
191#
192# Bus options (PCI, PCMCIA, EISA, ISA, TC)
193#
194CONFIG_HW_HAS_PCI=y
195CONFIG_PCI=y
196# CONFIG_PCI_LEGACY_PROC is not set
197CONFIG_MMU=y
198
199#
200# PCCARD (PCMCIA/CardBus) support
201#
202# CONFIG_PCCARD is not set
203
204#
205# PCI Hotplug Support
206#
207# CONFIG_HOTPLUG_PCI is not set
208
209#
210# Executable file formats
211#
212CONFIG_BINFMT_ELF=y
213# CONFIG_BINFMT_MISC is not set
214CONFIG_TRAD_SIGNALS=y
215
216#
217# Networking
218#
219CONFIG_NET=y
220
221#
222# Networking options
223#
224CONFIG_PACKET=y
225# CONFIG_PACKET_MMAP is not set
226CONFIG_UNIX=y
227CONFIG_XFRM=y
228CONFIG_XFRM_USER=m
229# CONFIG_NET_KEY is not set
230CONFIG_INET=y
231CONFIG_IP_MULTICAST=y
232CONFIG_IP_ADVANCED_ROUTER=y
233CONFIG_ASK_IP_FIB_HASH=y
234# CONFIG_IP_FIB_TRIE is not set
235CONFIG_IP_FIB_HASH=y
236CONFIG_IP_MULTIPLE_TABLES=y
237CONFIG_IP_ROUTE_MULTIPATH=y
238# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
239CONFIG_IP_ROUTE_VERBOSE=y
240CONFIG_IP_PNP=y
241# CONFIG_IP_PNP_DHCP is not set
242CONFIG_IP_PNP_BOOTP=y
243# CONFIG_IP_PNP_RARP is not set
244CONFIG_NET_IPIP=m
245CONFIG_NET_IPGRE=m
246# CONFIG_NET_IPGRE_BROADCAST is not set
247# CONFIG_IP_MROUTE is not set
248# CONFIG_ARPD is not set
249CONFIG_SYN_COOKIES=y
250# CONFIG_INET_AH is not set
251# CONFIG_INET_ESP is not set
252# CONFIG_INET_IPCOMP is not set
253CONFIG_INET_TUNNEL=m
254CONFIG_INET_DIAG=y
255CONFIG_INET_TCP_DIAG=y
256CONFIG_TCP_CONG_ADVANCED=y
257
258#
259# TCP congestion control
260#
261CONFIG_TCP_CONG_BIC=y
262CONFIG_TCP_CONG_WESTWOOD=m
263CONFIG_TCP_CONG_HTCP=m
264# CONFIG_TCP_CONG_HSTCP is not set
265# CONFIG_TCP_CONG_HYBLA is not set
266# CONFIG_TCP_CONG_VEGAS is not set
267# CONFIG_TCP_CONG_SCALABLE is not set
268# CONFIG_IPV6 is not set
269# CONFIG_NETFILTER is not set
270
271#
272# DCCP Configuration (EXPERIMENTAL)
273#
274# CONFIG_IP_DCCP is not set
275
276#
277# SCTP Configuration (EXPERIMENTAL)
278#
279# CONFIG_IP_SCTP is not set
280# CONFIG_ATM is not set
281# CONFIG_BRIDGE is not set
282# CONFIG_VLAN_8021Q is not set
283# CONFIG_DECNET is not set
284# CONFIG_LLC2 is not set
285# CONFIG_IPX is not set
286# CONFIG_ATALK is not set
287# CONFIG_X25 is not set
288# CONFIG_LAPB is not set
289# CONFIG_NET_DIVERT is not set
290# CONFIG_ECONET is not set
291# CONFIG_WAN_ROUTER is not set
292# CONFIG_NET_SCHED is not set
293# CONFIG_NET_CLS_ROUTE is not set
294
295#
296# Network testing
297#
298# CONFIG_NET_PKTGEN is not set
299# CONFIG_HAMRADIO is not set
300# CONFIG_IRDA is not set
301# CONFIG_BT is not set
302# CONFIG_IEEE80211 is not set
303
304#
305# Device Drivers
306#
307
308#
309# Generic Driver Options
310#
311CONFIG_STANDALONE=y
312CONFIG_PREVENT_FIRMWARE_BUILD=y
313# CONFIG_FW_LOADER is not set
314
315#
316# Connector - unified userspace <-> kernelspace linker
317#
318# CONFIG_CONNECTOR is not set
319
320#
321# Memory Technology Devices (MTD)
322#
323# CONFIG_MTD is not set
324
325#
326# Parallel port support
327#
328# CONFIG_PARPORT is not set
329
330#
331# Plug and Play support
332#
333
334#
335# Block devices
336#
337# CONFIG_BLK_CPQ_DA is not set
338# CONFIG_BLK_CPQ_CISS_DA is not set
339# CONFIG_BLK_DEV_DAC960 is not set
340# CONFIG_BLK_DEV_UMEM is not set
341# CONFIG_BLK_DEV_COW_COMMON is not set
342CONFIG_BLK_DEV_LOOP=m
343# CONFIG_BLK_DEV_CRYPTOLOOP is not set
344CONFIG_BLK_DEV_NBD=m
345# CONFIG_BLK_DEV_SX8 is not set
346# CONFIG_BLK_DEV_UB is not set
347CONFIG_BLK_DEV_RAM=y
348CONFIG_BLK_DEV_RAM_COUNT=16
349CONFIG_BLK_DEV_RAM_SIZE=4096
350# CONFIG_BLK_DEV_INITRD is not set
351# CONFIG_LBD is not set
352# CONFIG_BLK_DEV_IO_TRACE is not set
353# CONFIG_CDROM_PKTCDVD is not set
354
355#
356# IO Schedulers
357#
358CONFIG_IOSCHED_NOOP=y
359CONFIG_IOSCHED_AS=y
360CONFIG_IOSCHED_DEADLINE=y
361CONFIG_IOSCHED_CFQ=y
362CONFIG_DEFAULT_AS=y
363# CONFIG_DEFAULT_DEADLINE is not set
364# CONFIG_DEFAULT_CFQ is not set
365# CONFIG_DEFAULT_NOOP is not set
366CONFIG_DEFAULT_IOSCHED="anticipatory"
367# CONFIG_ATA_OVER_ETH is not set
368
369#
370# ATA/ATAPI/MFM/RLL support
371#
372CONFIG_IDE=y
373CONFIG_BLK_DEV_IDE=y
374
375#
376# Please see Documentation/ide.txt for help/info on IDE drives
377#
378# CONFIG_BLK_DEV_IDE_SATA is not set
379CONFIG_BLK_DEV_IDEDISK=y
380# CONFIG_IDEDISK_MULTI_MODE is not set
381# CONFIG_BLK_DEV_IDECD is not set
382# CONFIG_BLK_DEV_IDETAPE is not set
383# CONFIG_BLK_DEV_IDEFLOPPY is not set
384# CONFIG_BLK_DEV_IDESCSI is not set
385# CONFIG_IDE_TASK_IOCTL is not set
386
387#
388# IDE chipset support/bugfixes
389#
390CONFIG_IDE_GENERIC=y
391CONFIG_BLK_DEV_IDEPCI=y
392# CONFIG_IDEPCI_SHARE_IRQ is not set
393# CONFIG_BLK_DEV_OFFBOARD is not set
394# CONFIG_BLK_DEV_GENERIC is not set
395# CONFIG_BLK_DEV_OPTI621 is not set
396CONFIG_BLK_DEV_IDEDMA_PCI=y
397# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
398# CONFIG_IDEDMA_PCI_AUTO is not set
399# CONFIG_BLK_DEV_AEC62XX is not set
400# CONFIG_BLK_DEV_ALI15X3 is not set
401# CONFIG_BLK_DEV_AMD74XX is not set
402# CONFIG_BLK_DEV_CMD64X is not set
403# CONFIG_BLK_DEV_TRIFLEX is not set
404# CONFIG_BLK_DEV_CY82C693 is not set
405# CONFIG_BLK_DEV_CS5520 is not set
406# CONFIG_BLK_DEV_CS5530 is not set
407# CONFIG_BLK_DEV_HPT34X is not set
408# CONFIG_BLK_DEV_HPT366 is not set
409# CONFIG_BLK_DEV_SC1200 is not set
410# CONFIG_BLK_DEV_PIIX is not set
411# CONFIG_BLK_DEV_IT821X is not set
412# CONFIG_BLK_DEV_NS87415 is not set
413# CONFIG_BLK_DEV_PDC202XX_OLD is not set
414# CONFIG_BLK_DEV_PDC202XX_NEW is not set
415# CONFIG_BLK_DEV_SVWKS is not set
416CONFIG_BLK_DEV_SIIMAGE=y
417# CONFIG_BLK_DEV_SLC90E66 is not set
418# CONFIG_BLK_DEV_TRM290 is not set
419# CONFIG_BLK_DEV_VIA82CXXX is not set
420# CONFIG_IDE_ARM is not set
421CONFIG_BLK_DEV_IDEDMA=y
422# CONFIG_IDEDMA_IVB is not set
423# CONFIG_IDEDMA_AUTO is not set
424# CONFIG_BLK_DEV_HD is not set
425
426#
427# SCSI device support
428#
429# CONFIG_RAID_ATTRS is not set
430CONFIG_SCSI=y
431CONFIG_SCSI_PROC_FS=y
432
433#
434# SCSI support type (disk, tape, CD-ROM)
435#
436CONFIG_BLK_DEV_SD=y
437# CONFIG_CHR_DEV_ST is not set
438# CONFIG_CHR_DEV_OSST is not set
439# CONFIG_BLK_DEV_SR is not set
440# CONFIG_CHR_DEV_SG is not set
441# CONFIG_CHR_DEV_SCH is not set
442
443#
444# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
445#
446# CONFIG_SCSI_MULTI_LUN is not set
447# CONFIG_SCSI_CONSTANTS is not set
448# CONFIG_SCSI_LOGGING is not set
449
450#
451# SCSI Transport Attributes
452#
453# CONFIG_SCSI_SPI_ATTRS is not set
454# CONFIG_SCSI_FC_ATTRS is not set
455# CONFIG_SCSI_ISCSI_ATTRS is not set
456# CONFIG_SCSI_SAS_ATTRS is not set
457
458#
459# SCSI Transport Layers
460#
461# CONFIG_SAS_CLASS is not set
462
463#
464# SCSI low-level drivers
465#
466# CONFIG_ISCSI_TCP is not set
467# CONFIG_SCSI_ARCMSR is not set
468# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
469# CONFIG_SCSI_3W_9XXX is not set
470# CONFIG_SCSI_ACARD is not set
471# CONFIG_SCSI_AACRAID is not set
472# CONFIG_SCSI_AIC7XXX is not set
473# CONFIG_SCSI_AIC7XXX_OLD is not set
474# CONFIG_SCSI_AIC79XX is not set
475# CONFIG_SCSI_DPT_I2O is not set
476# CONFIG_MEGARAID_NEWGEN is not set
477# CONFIG_MEGARAID_LEGACY is not set
478# CONFIG_MEGARAID_SAS is not set
479# CONFIG_SCSI_SATA is not set
480# CONFIG_SCSI_DMX3191D is not set
481# CONFIG_SCSI_FUTURE_DOMAIN is not set
482# CONFIG_SCSI_IPS is not set
483# CONFIG_SCSI_INITIO is not set
484# CONFIG_SCSI_INIA100 is not set
485# CONFIG_SCSI_SYM53C8XX_2 is not set
486# CONFIG_SCSI_IPR is not set
487# CONFIG_SCSI_QLOGIC_FC is not set
488# CONFIG_SCSI_QLOGIC_1280 is not set
489CONFIG_SCSI_QLA2XXX=y
490# CONFIG_SCSI_QLA21XX is not set
491# CONFIG_SCSI_QLA22XX is not set
492# CONFIG_SCSI_QLA2300 is not set
493# CONFIG_SCSI_QLA2322 is not set
494# CONFIG_SCSI_QLA6312 is not set
495# CONFIG_SCSI_QLA24XX is not set
496# CONFIG_SCSI_LPFC is not set
497# CONFIG_SCSI_DC395x is not set
498# CONFIG_SCSI_DC390T is not set
499# CONFIG_SCSI_NSP32 is not set
500# CONFIG_SCSI_DEBUG is not set
501
502#
503# Multi-device support (RAID and LVM)
504#
505# CONFIG_MD is not set
506
507#
508# Fusion MPT device support
509#
510# CONFIG_FUSION is not set
511# CONFIG_FUSION_SPI is not set
512# CONFIG_FUSION_FC is not set
513# CONFIG_FUSION_SAS is not set
514
515#
516# IEEE 1394 (FireWire) support
517#
518CONFIG_IEEE1394=m
519
520#
521# Subsystem Options
522#
523# CONFIG_IEEE1394_VERBOSEDEBUG is not set
524# CONFIG_IEEE1394_OUI_DB is not set
525CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
526CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
527# CONFIG_IEEE1394_EXPORT_FULL_API is not set
528
529#
530# Device Drivers
531#
532
533#
534# Texas Instruments PCILynx requires I2C
535#
536CONFIG_IEEE1394_OHCI1394=m
537
538#
539# Protocol Drivers
540#
541CONFIG_IEEE1394_VIDEO1394=m
542CONFIG_IEEE1394_SBP2=m
543# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
544CONFIG_IEEE1394_ETH1394=m
545CONFIG_IEEE1394_DV1394=m
546CONFIG_IEEE1394_RAWIO=m
547CONFIG_IEEE1394_CMP=m
548CONFIG_IEEE1394_AMDTP=m
549
550#
551# I2O device support
552#
553# CONFIG_I2O is not set
554
555#
556# Network device support
557#
558CONFIG_NETDEVICES=y
559CONFIG_DUMMY=m
560# CONFIG_BONDING is not set
561# CONFIG_EQUALIZER is not set
562# CONFIG_TUN is not set
563
564#
565# ARCnet devices
566#
567# CONFIG_ARCNET is not set
568
569#
570# PHY device support
571#
572# CONFIG_PHYLIB is not set
573
574#
575# Ethernet (10 or 100Mbit)
576#
577CONFIG_NET_ETHERNET=y
578CONFIG_MII=y
579# CONFIG_HAPPYMEAL is not set
580# CONFIG_SUNGEM is not set
581# CONFIG_CASSINI is not set
582# CONFIG_NET_VENDOR_3COM is not set
583
584#
585# Tulip family network device support
586#
587# CONFIG_NET_TULIP is not set
588# CONFIG_HP100 is not set
589# CONFIG_NET_PCI is not set
590
591#
592# Ethernet (1000 Mbit)
593#
594# CONFIG_ACENIC is not set
595# CONFIG_DL2K is not set
596# CONFIG_E1000 is not set
597# CONFIG_NS83820 is not set
598# CONFIG_HAMACHI is not set
599# CONFIG_YELLOWFIN is not set
600CONFIG_R8169=y
601# CONFIG_R8169_NAPI is not set
602# CONFIG_SIS190 is not set
603# CONFIG_SKGE is not set
604# CONFIG_SKY2 is not set
605# CONFIG_SK98LIN is not set
606# CONFIG_TIGON3 is not set
607# CONFIG_BNX2 is not set
608
609#
610# Ethernet (10000 Mbit)
611#
612# CONFIG_CHELSIO_T1 is not set
613# CONFIG_IXGB is not set
614# CONFIG_S2IO is not set
615
616#
617# Token Ring devices
618#
619# CONFIG_TR is not set
620
621#
622# Wireless LAN (non-hamradio)
623#
624# CONFIG_NET_RADIO is not set
625# CONFIG_HOSTAP is not set
626
627#
628# Wan interfaces
629#
630# CONFIG_WAN is not set
631# CONFIG_FDDI is not set
632# CONFIG_HIPPI is not set
633# CONFIG_PPP is not set
634# CONFIG_SLIP is not set
635# CONFIG_NET_FC is not set
636# CONFIG_SHAPER is not set
637# CONFIG_NETCONSOLE is not set
638# CONFIG_KGDBOE is not set
639# CONFIG_NETPOLL is not set
640# CONFIG_NETPOLL_RX is not set
641# CONFIG_NETPOLL_TRAP is not set
642# CONFIG_NET_POLL_CONTROLLER is not set
643
644#
645# ISDN subsystem
646#
647# CONFIG_ISDN is not set
648
649#
650# Telephony Support
651#
652# CONFIG_PHONE is not set
653
654#
655# Input device support
656#
657CONFIG_INPUT=y
658
659#
660# Userland interfaces
661#
662# CONFIG_INPUT_MOUSEDEV is not set
663# CONFIG_INPUT_JOYDEV is not set
664# CONFIG_INPUT_TSDEV is not set
665# CONFIG_INPUT_EVDEV is not set
666# CONFIG_INPUT_EVBUG is not set
667
668#
669# Input Device Drivers
670#
671# CONFIG_INPUT_KEYBOARD is not set
672# CONFIG_INPUT_MOUSE is not set
673# CONFIG_INPUT_JOYSTICK is not set
674# CONFIG_INPUT_TOUCHSCREEN is not set
675# CONFIG_INPUT_MISC is not set
676
677#
678# Hardware I/O ports
679#
680# CONFIG_SERIO is not set
681# CONFIG_GAMEPORT is not set
682
683#
684# Character devices
685#
686CONFIG_VT=y
687CONFIG_VT_CONSOLE=y
688CONFIG_HW_CONSOLE=y
689# CONFIG_SERIAL_NONSTANDARD is not set
690
691#
692# Serial drivers
693#
694# CONFIG_SERIAL_8250 is not set
695
696#
697# Non-8250 serial port support
698#
699CONFIG_SERIAL_CORE=y
700CONFIG_SERIAL_CORE_CONSOLE=y
701CONFIG_SERIAL_VR41XX=y
702CONFIG_SERIAL_VR41XX_CONSOLE=y
703# CONFIG_SERIAL_JSM is not set
704CONFIG_UNIX98_PTYS=y
705CONFIG_LEGACY_PTYS=y
706CONFIG_LEGACY_PTY_COUNT=256
707
708#
709# IPMI
710#
711# CONFIG_IPMI_HANDLER is not set
712
713#
714# Watchdog Cards
715#
716# CONFIG_WATCHDOG is not set
717# CONFIG_RTC is not set
718# CONFIG_GEN_RTC is not set
719# CONFIG_RTC_VR41XX is not set
720# CONFIG_DTLK is not set
721# CONFIG_R3964 is not set
722# CONFIG_APPLICOM is not set
723# CONFIG_TANBAC_TB0219 is not set
724
725#
726# Ftape, the floppy tape device driver
727#
728# CONFIG_DRM is not set
729CONFIG_GPIO_VR41XX=y
730# CONFIG_RAW_DRIVER is not set
731
732#
733# TPM devices
734#
735# CONFIG_TCG_TPM is not set
736# CONFIG_TELCLOCK is not set
737
738#
739# I2C support
740#
741# CONFIG_I2C is not set
742
743#
744# Dallas's 1-wire bus
745#
746# CONFIG_W1 is not set
747
748#
749# Hardware Monitoring support
750#
751# CONFIG_HWMON is not set
752# CONFIG_HWMON_VID is not set
753
754#
755# Misc devices
756#
757
758#
759# Multimedia Capabilities Port drivers
760#
761
762#
763# Multimedia devices
764#
765# CONFIG_VIDEO_DEV is not set
766
767#
768# Digital Video Broadcasting Devices
769#
770# CONFIG_DVB is not set
771
772#
773# Graphics support
774#
775# CONFIG_FB is not set
776
777#
778# Console display driver support
779#
780# CONFIG_VGA_CONSOLE is not set
781CONFIG_DUMMY_CONSOLE=y
782
783#
784# Speakup console speech
785#
786# CONFIG_SPEAKUP is not set
787
788#
789# Sound
790#
791# CONFIG_SOUND is not set
792
793#
794# USB support
795#
796CONFIG_USB_ARCH_HAS_HCD=y
797CONFIG_USB_ARCH_HAS_OHCI=y
798CONFIG_USB=m
799# CONFIG_USB_DEBUG is not set
800
801#
802# Miscellaneous USB options
803#
804# CONFIG_USB_DEVICEFS is not set
805# CONFIG_USB_BANDWIDTH is not set
806# CONFIG_USB_DYNAMIC_MINORS is not set
807# CONFIG_USB_OTG is not set
808
809#
810# USB Host Controller Drivers
811#
812CONFIG_USB_EHCI_HCD=m
813# CONFIG_USB_EHCI_SPLIT_ISO is not set
814# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
815# CONFIG_USB_ISP116X_HCD is not set
816CONFIG_USB_OHCI_HCD=m
817# CONFIG_USB_OHCI_BIG_ENDIAN is not set
818CONFIG_USB_OHCI_LITTLE_ENDIAN=y
819# CONFIG_USB_UHCI_HCD is not set
820# CONFIG_USB_SL811_HCD is not set
821
822#
823# USB Device Class drivers
824#
825# CONFIG_USB_ACM is not set
826# CONFIG_USB_PRINTER is not set
827
828#
829# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
830#
831
832#
833# may also be needed; see USB_STORAGE Help for more information
834#
835CONFIG_USB_STORAGE=m
836# CONFIG_USB_STORAGE_DEBUG is not set
837# CONFIG_USB_STORAGE_DATAFAB is not set
838# CONFIG_USB_STORAGE_FREECOM is not set
839# CONFIG_USB_STORAGE_ISD200 is not set
840# CONFIG_USB_STORAGE_DPCM is not set
841# CONFIG_USB_STORAGE_USBAT is not set
842# CONFIG_USB_STORAGE_SDDR09 is not set
843# CONFIG_USB_STORAGE_SDDR55 is not set
844# CONFIG_USB_STORAGE_JUMPSHOT is not set
845
846#
847# USB Input Devices
848#
849CONFIG_USB_HID=m
850CONFIG_USB_HIDINPUT=y
851# CONFIG_HID_FF is not set
852# CONFIG_USB_HIDDEV is not set
853
854#
855# USB HID Boot Protocol drivers
856#
857# CONFIG_USB_KBD is not set
858# CONFIG_USB_MOUSE is not set
859# CONFIG_USB_AIPTEK is not set
860# CONFIG_USB_WACOM is not set
861# CONFIG_USB_ACECAD is not set
862# CONFIG_USB_KBTAB is not set
863# CONFIG_USB_POWERMATE is not set
864# CONFIG_USB_MTOUCH is not set
865# CONFIG_USB_ITMTOUCH is not set
866# CONFIG_USB_EGALAX is not set
867# CONFIG_USB_YEALINK is not set
868# CONFIG_USB_XPAD is not set
869# CONFIG_USB_ATI_REMOTE is not set
870# CONFIG_USB_KEYSPAN_REMOTE is not set
871# CONFIG_USB_APPLETOUCH is not set
872
873#
874# USB Imaging devices
875#
876# CONFIG_USB_MDC800 is not set
877# CONFIG_USB_MICROTEK is not set
878
879#
880# USB Multimedia devices
881#
882# CONFIG_USB_DABUSB is not set
883
884#
885# Video4Linux support is needed for USB Multimedia device support
886#
887
888#
889# USB Network Adapters
890#
891# CONFIG_USB_CATC is not set
892# CONFIG_USB_KAWETH is not set
893# CONFIG_USB_PEGASUS is not set
894# CONFIG_USB_RTL8150 is not set
895# CONFIG_USB_USBNET is not set
896CONFIG_USB_MON=y
897
898#
899# USB port drivers
900#
901
902#
903# USB Serial Converter support
904#
905# CONFIG_USB_SERIAL is not set
906
907#
908# USB Miscellaneous drivers
909#
910# CONFIG_USB_EMI62 is not set
911# CONFIG_USB_EMI26 is not set
912# CONFIG_USB_AUERSWALD is not set
913# CONFIG_USB_RIO500 is not set
914# CONFIG_USB_LEGOTOWER is not set
915# CONFIG_USB_LCD is not set
916# CONFIG_USB_LED is not set
917# CONFIG_USB_CYTHERM is not set
918# CONFIG_USB_GOTEMP is not set
919# CONFIG_USB_PHIDGETKIT is not set
920# CONFIG_USB_PHIDGETSERVO is not set
921# CONFIG_USB_IDMOUSE is not set
922# CONFIG_USB_SISUSBVGA is not set
923# CONFIG_USB_LD is not set
924
925#
926# USB DSL modem support
927#
928
929#
930# USB Gadget Support
931#
932# CONFIG_USB_GADGET is not set
933
934#
935# MMC/SD Card support
936#
937# CONFIG_MMC is not set
938
939#
940# InfiniBand support
941#
942# CONFIG_INFINIBAND is not set
943
944#
945# SN Devices
946#
947
948#
949# EDAC - error detection and reporting (RAS)
950#
951# CONFIG_EDAC is not set
952
953#
954# Distributed Lock Manager
955#
956# CONFIG_DLM is not set
957
958#
959# File systems
960#
961CONFIG_EXT2_FS=y
962# CONFIG_EXT2_FS_XATTR is not set
963# CONFIG_EXT2_FS_XIP is not set
964CONFIG_EXT3_FS=y
965CONFIG_EXT3_FS_XATTR=y
966# CONFIG_EXT3_FS_POSIX_ACL is not set
967# CONFIG_EXT3_FS_SECURITY is not set
968CONFIG_JBD=y
969# CONFIG_JBD_DEBUG is not set
970CONFIG_FS_MBCACHE=y
971# CONFIG_REISER4_FS is not set
972# CONFIG_REISERFS_FS is not set
973# CONFIG_JFS_FS is not set
974# CONFIG_FS_POSIX_ACL is not set
975CONFIG_XFS_FS=y
976CONFIG_XFS_QUOTA=y
977# CONFIG_XFS_SECURITY is not set
978CONFIG_XFS_POSIX_ACL=y
979# CONFIG_XFS_RT is not set
980# CONFIG_OCFS2_FS is not set
981# CONFIG_MINIX_FS is not set
982CONFIG_ROMFS_FS=m
983CONFIG_INOTIFY=y
984# CONFIG_QUOTA is not set
985CONFIG_QUOTACTL=y
986# CONFIG_DNOTIFY is not set
987# CONFIG_AUTOFS_FS is not set
988CONFIG_AUTOFS4_FS=y
989# CONFIG_FUSE_FS is not set
990
991#
992# CD-ROM/DVD Filesystems
993#
994# CONFIG_ISO9660_FS is not set
995# CONFIG_UDF_FS is not set
996
997#
998# DOS/FAT/NT Filesystems
999#
1000# CONFIG_MSDOS_FS is not set
1001# CONFIG_VFAT_FS is not set
1002# CONFIG_NTFS_FS is not set
1003
1004#
1005# Pseudo filesystems
1006#
1007CONFIG_PROC_FS=y
1008CONFIG_PROC_KCORE=y
1009CONFIG_SYSFS=y
1010CONFIG_TMPFS=y
1011# CONFIG_HUGETLB_PAGE is not set
1012CONFIG_RAMFS=y
1013# CONFIG_RELAYFS_FS is not set
1014# CONFIG_CONFIGFS_FS is not set
1015
1016#
1017# Miscellaneous filesystems
1018#
1019# CONFIG_ADFS_FS is not set
1020# CONFIG_AFFS_FS is not set
1021# CONFIG_ASFS_FS is not set
1022# CONFIG_HFS_FS is not set
1023# CONFIG_HFSPLUS_FS is not set
1024# CONFIG_BEFS_FS is not set
1025# CONFIG_BFS_FS is not set
1026# CONFIG_EFS_FS is not set
1027CONFIG_CRAMFS=m
1028# CONFIG_VXFS_FS is not set
1029# CONFIG_HPFS_FS is not set
1030# CONFIG_QNX4FS_FS is not set
1031# CONFIG_SYSV_FS is not set
1032# CONFIG_UFS_FS is not set
1033
1034#
1035# Network File Systems
1036#
1037CONFIG_NFS_FS=y
1038CONFIG_NFS_V3=y
1039# CONFIG_NFS_V3_ACL is not set
1040# CONFIG_NFS_V4 is not set
1041# CONFIG_NFS_DIRECTIO is not set
1042# CONFIG_NFSD is not set
1043CONFIG_ROOT_NFS=y
1044CONFIG_LOCKD=y
1045CONFIG_LOCKD_V4=y
1046CONFIG_NFS_COMMON=y
1047CONFIG_SUNRPC=y
1048# CONFIG_RPCSEC_GSS_KRB5 is not set
1049# CONFIG_RPCSEC_GSS_SPKM3 is not set
1050# CONFIG_SMB_FS is not set
1051# CONFIG_CIFS is not set
1052# CONFIG_NCP_FS is not set
1053# CONFIG_CODA_FS is not set
1054# CONFIG_AFS_FS is not set
1055# CONFIG_9P_FS is not set
1056
1057#
1058# Partition Types
1059#
1060# CONFIG_PARTITION_ADVANCED is not set
1061CONFIG_MSDOS_PARTITION=y
1062
1063#
1064# Native Language Support
1065#
1066# CONFIG_NLS is not set
1067
1068#
1069# Profiling support
1070#
1071# CONFIG_PROFILING is not set
1072
1073#
1074# Kernel hacking
1075#
1076# CONFIG_PRINTK_TIME is not set
1077# CONFIG_DEBUG_KERNEL is not set
1078CONFIG_LOG_BUF_SHIFT=14
1079CONFIG_CROSSCOMPILE=y
1080CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1081
1082#
1083# Security options
1084#
1085CONFIG_KEYS=y
1086CONFIG_KEYS_DEBUG_PROC_KEYS=y
1087# CONFIG_SECURITY is not set
1088
1089#
1090# Cryptographic options
1091#
1092# CONFIG_CRYPTO is not set
1093
1094#
1095# Hardware crypto devices
1096#
1097
1098#
1099# Library routines
1100#
1101# CONFIG_CRC_CCITT is not set
1102# CONFIG_CRC16 is not set
1103CONFIG_CRC32=y
1104# CONFIG_LIBCRC32C is not set
1105CONFIG_ZLIB_INFLATE=m
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index 02b2551023d4..7132e296d40a 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:17 2005 4# Fri Jan 27 15:40:36 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -63,9 +63,9 @@ CONFIG_MACH_VR41XX=y
63# CONFIG_TOSHIBA_JMR3927 is not set 63# CONFIG_TOSHIBA_JMR3927 is not set
64# CONFIG_TOSHIBA_RBTX4927 is not set 64# CONFIG_TOSHIBA_RBTX4927 is not set
65# CONFIG_TOSHIBA_RBTX4938 is not set 65# CONFIG_TOSHIBA_RBTX4938 is not set
66# CONFIG_NEC_CMBVR4133 is not set
67# CONFIG_CASIO_E55 is not set 66# CONFIG_CASIO_E55 is not set
68CONFIG_IBM_WORKPAD=y 67CONFIG_IBM_WORKPAD=y
68# CONFIG_NEC_CMBVR4133 is not set
69# CONFIG_TANBAC_TB022X is not set 69# CONFIG_TANBAC_TB022X is not set
70# CONFIG_VICTOR_MPC30X is not set 70# CONFIG_VICTOR_MPC30X is not set
71# CONFIG_ZAO_CAPCELLA is not set 71# CONFIG_ZAO_CAPCELLA is not set
@@ -88,7 +88,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
88# CONFIG_CPU_MIPS64_R2 is not set 88# CONFIG_CPU_MIPS64_R2 is not set
89# CONFIG_CPU_R3000 is not set 89# CONFIG_CPU_R3000 is not set
90# CONFIG_CPU_TX39XX is not set 90# CONFIG_CPU_TX39XX is not set
91CONFIG_CPU_VR41XX=y 91# CONFIG_CPU_VR41XX is not set
92# CONFIG_CPU_R4300 is not set 92# CONFIG_CPU_R4300 is not set
93# CONFIG_CPU_R4X00 is not set 93# CONFIG_CPU_R4X00 is not set
94# CONFIG_CPU_TX49XX is not set 94# CONFIG_CPU_TX49XX is not set
@@ -101,23 +101,18 @@ CONFIG_CPU_VR41XX=y
101# CONFIG_CPU_RM7000 is not set 101# CONFIG_CPU_RM7000 is not set
102# CONFIG_CPU_RM9000 is not set 102# CONFIG_CPU_RM9000 is not set
103# CONFIG_CPU_SB1 is not set 103# CONFIG_CPU_SB1 is not set
104CONFIG_SYS_HAS_CPU_VR41XX=y
105CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
106CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
108CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
109 104
110# 105#
111# Kernel type 106# Kernel type
112# 107#
113CONFIG_32BIT=y 108# CONFIG_32BIT is not set
114# CONFIG_64BIT is not set 109# CONFIG_64BIT is not set
115CONFIG_PAGE_SIZE_4KB=y 110CONFIG_PAGE_SIZE_4KB=y
116# CONFIG_PAGE_SIZE_8KB is not set 111# CONFIG_PAGE_SIZE_8KB is not set
117# CONFIG_PAGE_SIZE_16KB is not set 112# CONFIG_PAGE_SIZE_16KB is not set
118# CONFIG_PAGE_SIZE_64KB is not set 113# CONFIG_PAGE_SIZE_64KB is not set
119# CONFIG_MIPS_MT is not set 114# CONFIG_MIPS_MT is not set
120# CONFIG_CPU_ADVANCED is not set 115CONFIG_CPU_HAS_LLSC=y
121CONFIG_CPU_HAS_SYNC=y 116CONFIG_CPU_HAS_SYNC=y
122CONFIG_GENERIC_HARDIRQS=y 117CONFIG_GENERIC_HARDIRQS=y
123CONFIG_GENERIC_IRQ_PROBE=y 118CONFIG_GENERIC_IRQ_PROBE=y
@@ -153,26 +148,28 @@ CONFIG_SYSVIPC=y
153# CONFIG_BSD_PROCESS_ACCT is not set 148# CONFIG_BSD_PROCESS_ACCT is not set
154CONFIG_SYSCTL=y 149CONFIG_SYSCTL=y
155# CONFIG_AUDIT is not set 150# CONFIG_AUDIT is not set
156CONFIG_HOTPLUG=y
157CONFIG_KOBJECT_UEVENT=y
158# CONFIG_IKCONFIG is not set 151# CONFIG_IKCONFIG is not set
159CONFIG_INITRAMFS_SOURCE="" 152CONFIG_INITRAMFS_SOURCE=""
153# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
160CONFIG_EMBEDDED=y 154CONFIG_EMBEDDED=y
161CONFIG_KALLSYMS=y 155CONFIG_KALLSYMS=y
162# CONFIG_KALLSYMS_EXTRA_PASS is not set 156# CONFIG_KALLSYMS_EXTRA_PASS is not set
157CONFIG_HOTPLUG=y
163CONFIG_PRINTK=y 158CONFIG_PRINTK=y
164CONFIG_BUG=y 159CONFIG_BUG=y
160CONFIG_ELF_CORE=y
165CONFIG_BASE_FULL=y 161CONFIG_BASE_FULL=y
166CONFIG_FUTEX=y 162CONFIG_FUTEX=y
167CONFIG_EPOLL=y 163CONFIG_EPOLL=y
168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
169CONFIG_SHMEM=y 164CONFIG_SHMEM=y
170CONFIG_CC_ALIGN_FUNCTIONS=0 165CONFIG_CC_ALIGN_FUNCTIONS=0
171CONFIG_CC_ALIGN_LABELS=0 166CONFIG_CC_ALIGN_LABELS=0
172CONFIG_CC_ALIGN_LOOPS=0 167CONFIG_CC_ALIGN_LOOPS=0
173CONFIG_CC_ALIGN_JUMPS=0 168CONFIG_CC_ALIGN_JUMPS=0
169CONFIG_SLAB=y
174# CONFIG_TINY_SHMEM is not set 170# CONFIG_TINY_SHMEM is not set
175CONFIG_BASE_SMALL=0 171CONFIG_BASE_SMALL=0
172# CONFIG_SLOB is not set
176 173
177# 174#
178# Loadable module support 175# Loadable module support
@@ -188,7 +185,6 @@ CONFIG_KMOD=y
188# 185#
189# Block layer 186# Block layer
190# 187#
191# CONFIG_LBD is not set
192 188
193# 189#
194# IO Schedulers 190# IO Schedulers
@@ -234,7 +230,6 @@ CONFIG_PCMCIA_PROBE=y
234# 230#
235CONFIG_BINFMT_ELF=y 231CONFIG_BINFMT_ELF=y
236# CONFIG_BINFMT_MISC is not set 232# CONFIG_BINFMT_MISC is not set
237CONFIG_TRAD_SIGNALS=y
238 233
239# 234#
240# Networking 235# Networking
@@ -289,6 +284,11 @@ CONFIG_TCP_CONG_BIC=y
289# CONFIG_ATALK is not set 284# CONFIG_ATALK is not set
290# CONFIG_X25 is not set 285# CONFIG_X25 is not set
291# CONFIG_LAPB is not set 286# CONFIG_LAPB is not set
287
288#
289# TIPC Configuration (EXPERIMENTAL)
290#
291# CONFIG_TIPC is not set
292# CONFIG_NET_DIVERT is not set 292# CONFIG_NET_DIVERT is not set
293# CONFIG_ECONET is not set 293# CONFIG_ECONET is not set
294# CONFIG_WAN_ROUTER is not set 294# CONFIG_WAN_ROUTER is not set
@@ -309,7 +309,6 @@ CONFIG_IEEE80211=m
309# CONFIG_IEEE80211_DEBUG is not set 309# CONFIG_IEEE80211_DEBUG is not set
310CONFIG_IEEE80211_CRYPT_WEP=m 310CONFIG_IEEE80211_CRYPT_WEP=m
311CONFIG_IEEE80211_CRYPT_CCMP=m 311CONFIG_IEEE80211_CRYPT_CCMP=m
312CONFIG_IEEE80211_CRYPT_TKIP=m
313 312
314# 313#
315# Device Drivers 314# Device Drivers
@@ -445,6 +444,7 @@ CONFIG_NET_ETHERNET=y
445CONFIG_MII=m 444CONFIG_MII=m
446# CONFIG_NET_VENDOR_3COM is not set 445# CONFIG_NET_VENDOR_3COM is not set
447# CONFIG_NET_VENDOR_SMC is not set 446# CONFIG_NET_VENDOR_SMC is not set
447# CONFIG_DM9000 is not set
448# CONFIG_NET_VENDOR_RACAL is not set 448# CONFIG_NET_VENDOR_RACAL is not set
449# CONFIG_AT1700 is not set 449# CONFIG_AT1700 is not set
450# CONFIG_DEPCA is not set 450# CONFIG_DEPCA is not set
@@ -556,10 +556,6 @@ CONFIG_HW_CONSOLE=y
556# 556#
557# Non-8250 serial port support 557# Non-8250 serial port support
558# 558#
559CONFIG_SERIAL_CORE=y
560CONFIG_SERIAL_CORE_CONSOLE=y
561CONFIG_SERIAL_VR41XX=y
562CONFIG_SERIAL_VR41XX_CONSOLE=y
563CONFIG_UNIX98_PTYS=y 559CONFIG_UNIX98_PTYS=y
564CONFIG_LEGACY_PTYS=y 560CONFIG_LEGACY_PTYS=y
565CONFIG_LEGACY_PTY_COUNT=256 561CONFIG_LEGACY_PTY_COUNT=256
@@ -588,7 +584,6 @@ CONFIG_WATCHDOG=y
588# CONFIG_WDT is not set 584# CONFIG_WDT is not set
589# CONFIG_RTC is not set 585# CONFIG_RTC is not set
590# CONFIG_GEN_RTC is not set 586# CONFIG_GEN_RTC is not set
591# CONFIG_RTC_VR41XX is not set
592# CONFIG_DTLK is not set 587# CONFIG_DTLK is not set
593# CONFIG_R3964 is not set 588# CONFIG_R3964 is not set
594 589
@@ -602,7 +597,6 @@ CONFIG_WATCHDOG=y
602# CONFIG_SYNCLINK_CS is not set 597# CONFIG_SYNCLINK_CS is not set
603# CONFIG_CARDMAN_4000 is not set 598# CONFIG_CARDMAN_4000 is not set
604# CONFIG_CARDMAN_4040 is not set 599# CONFIG_CARDMAN_4040 is not set
605# CONFIG_GPIO_VR41XX is not set
606# CONFIG_RAW_DRIVER is not set 600# CONFIG_RAW_DRIVER is not set
607 601
608# 602#
@@ -617,6 +611,12 @@ CONFIG_WATCHDOG=y
617# CONFIG_I2C is not set 611# CONFIG_I2C is not set
618 612
619# 613#
614# SPI support
615#
616# CONFIG_SPI is not set
617# CONFIG_SPI_MASTER is not set
618
619#
620# Dallas's 1-wire bus 620# Dallas's 1-wire bus
621# 621#
622# CONFIG_W1 is not set 622# CONFIG_W1 is not set
@@ -699,12 +699,12 @@ CONFIG_EXT2_FS_POSIX_ACL=y
699CONFIG_EXT2_FS_SECURITY=y 699CONFIG_EXT2_FS_SECURITY=y
700# CONFIG_EXT2_FS_XIP is not set 700# CONFIG_EXT2_FS_XIP is not set
701# CONFIG_EXT3_FS is not set 701# CONFIG_EXT3_FS is not set
702# CONFIG_JBD is not set
703CONFIG_FS_MBCACHE=y 702CONFIG_FS_MBCACHE=y
704# CONFIG_REISERFS_FS is not set 703# CONFIG_REISERFS_FS is not set
705# CONFIG_JFS_FS is not set 704# CONFIG_JFS_FS is not set
706CONFIG_FS_POSIX_ACL=y 705CONFIG_FS_POSIX_ACL=y
707# CONFIG_XFS_FS is not set 706# CONFIG_XFS_FS is not set
707# CONFIG_OCFS2_FS is not set
708# CONFIG_MINIX_FS is not set 708# CONFIG_MINIX_FS is not set
709# CONFIG_ROMFS_FS is not set 709# CONFIG_ROMFS_FS is not set
710CONFIG_INOTIFY=y 710CONFIG_INOTIFY=y
@@ -737,6 +737,7 @@ CONFIG_SYSFS=y
737# CONFIG_HUGETLB_PAGE is not set 737# CONFIG_HUGETLB_PAGE is not set
738CONFIG_RAMFS=y 738CONFIG_RAMFS=y
739CONFIG_RELAYFS_FS=m 739CONFIG_RELAYFS_FS=m
740# CONFIG_CONFIGFS_FS is not set
740 741
741# 742#
742# Miscellaneous filesystems 743# Miscellaneous filesystems
@@ -798,6 +799,7 @@ CONFIG_MSDOS_PARTITION=y
798# Kernel hacking 799# Kernel hacking
799# 800#
800# CONFIG_PRINTK_TIME is not set 801# CONFIG_PRINTK_TIME is not set
802# CONFIG_MAGIC_SYSRQ is not set
801# CONFIG_DEBUG_KERNEL is not set 803# CONFIG_DEBUG_KERNEL is not set
802CONFIG_LOG_BUF_SHIFT=14 804CONFIG_LOG_BUF_SHIFT=14
803CONFIG_CROSSCOMPILE=y 805CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 468c2e443d71..67457850941d 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:07:19 2005 4# Fri Jan 27 15:40:37 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -154,8 +154,6 @@ CONFIG_SYSVIPC=y
154# CONFIG_BSD_PROCESS_ACCT is not set 154# CONFIG_BSD_PROCESS_ACCT is not set
155CONFIG_SYSCTL=y 155CONFIG_SYSCTL=y
156# CONFIG_AUDIT is not set 156# CONFIG_AUDIT is not set
157CONFIG_HOTPLUG=y
158CONFIG_KOBJECT_UEVENT=y
159CONFIG_IKCONFIG=y 157CONFIG_IKCONFIG=y
160CONFIG_IKCONFIG_PROC=y 158CONFIG_IKCONFIG_PROC=y
161# CONFIG_CPUSETS is not set 159# CONFIG_CPUSETS is not set
@@ -164,19 +162,22 @@ CONFIG_EMBEDDED=y
164CONFIG_KALLSYMS=y 162CONFIG_KALLSYMS=y
165# CONFIG_KALLSYMS_ALL is not set 163# CONFIG_KALLSYMS_ALL is not set
166# CONFIG_KALLSYMS_EXTRA_PASS is not set 164# CONFIG_KALLSYMS_EXTRA_PASS is not set
165CONFIG_HOTPLUG=y
167CONFIG_PRINTK=y 166CONFIG_PRINTK=y
168CONFIG_BUG=y 167CONFIG_BUG=y
168CONFIG_ELF_CORE=y
169CONFIG_BASE_FULL=y 169CONFIG_BASE_FULL=y
170CONFIG_FUTEX=y 170CONFIG_FUTEX=y
171CONFIG_EPOLL=y 171CONFIG_EPOLL=y
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SHMEM=y 172CONFIG_SHMEM=y
174CONFIG_CC_ALIGN_FUNCTIONS=0 173CONFIG_CC_ALIGN_FUNCTIONS=0
175CONFIG_CC_ALIGN_LABELS=0 174CONFIG_CC_ALIGN_LABELS=0
176CONFIG_CC_ALIGN_LOOPS=0 175CONFIG_CC_ALIGN_LOOPS=0
177CONFIG_CC_ALIGN_JUMPS=0 176CONFIG_CC_ALIGN_JUMPS=0
177CONFIG_SLAB=y
178# CONFIG_TINY_SHMEM is not set 178# CONFIG_TINY_SHMEM is not set
179CONFIG_BASE_SMALL=0 179CONFIG_BASE_SMALL=0
180# CONFIG_SLOB is not set
180 181
181# 182#
182# Loadable module support 183# Loadable module support
@@ -184,6 +185,7 @@ CONFIG_BASE_SMALL=0
184CONFIG_MODULES=y 185CONFIG_MODULES=y
185CONFIG_MODULE_UNLOAD=y 186CONFIG_MODULE_UNLOAD=y
186CONFIG_OBSOLETE_MODPARM=y 187CONFIG_OBSOLETE_MODPARM=y
188# CONFIG_MODVERSIONS is not set
187# CONFIG_MODULE_SRCVERSION_ALL is not set 189# CONFIG_MODULE_SRCVERSION_ALL is not set
188CONFIG_KMOD=y 190CONFIG_KMOD=y
189CONFIG_STOP_MACHINE=y 191CONFIG_STOP_MACHINE=y
@@ -295,7 +297,6 @@ CONFIG_IEEE80211=m
295# CONFIG_IEEE80211_DEBUG is not set 297# CONFIG_IEEE80211_DEBUG is not set
296CONFIG_IEEE80211_CRYPT_WEP=m 298CONFIG_IEEE80211_CRYPT_WEP=m
297CONFIG_IEEE80211_CRYPT_CCMP=m 299CONFIG_IEEE80211_CRYPT_CCMP=m
298CONFIG_IEEE80211_CRYPT_TKIP=m
299 300
300# 301#
301# Device Drivers 302# Device Drivers
@@ -413,6 +414,7 @@ CONFIG_MII=y
413# CONFIG_SUNGEM is not set 414# CONFIG_SUNGEM is not set
414# CONFIG_CASSINI is not set 415# CONFIG_CASSINI is not set
415# CONFIG_NET_VENDOR_3COM is not set 416# CONFIG_NET_VENDOR_3COM is not set
417# CONFIG_DM9000 is not set
416 418
417# 419#
418# Tulip family network device support 420# Tulip family network device support
@@ -452,8 +454,6 @@ CONFIG_TITAN_GE=y
452# Wireless LAN (non-hamradio) 454# Wireless LAN (non-hamradio)
453# 455#
454# CONFIG_NET_RADIO is not set 456# CONFIG_NET_RADIO is not set
455# CONFIG_IPW_DEBUG is not set
456CONFIG_IPW2200=m
457 457
458# 458#
459# Wan interfaces 459# Wan interfaces
@@ -498,6 +498,7 @@ CONFIG_IPW2200=m
498CONFIG_SERIAL_8250=y 498CONFIG_SERIAL_8250=y
499CONFIG_SERIAL_8250_CONSOLE=y 499CONFIG_SERIAL_8250_CONSOLE=y
500CONFIG_SERIAL_8250_NR_UARTS=4 500CONFIG_SERIAL_8250_NR_UARTS=4
501CONFIG_SERIAL_8250_RUNTIME_UARTS=4
501# CONFIG_SERIAL_8250_EXTENDED is not set 502# CONFIG_SERIAL_8250_EXTENDED is not set
502 503
503# 504#
@@ -505,7 +506,6 @@ CONFIG_SERIAL_8250_NR_UARTS=4
505# 506#
506CONFIG_SERIAL_CORE=y 507CONFIG_SERIAL_CORE=y
507CONFIG_SERIAL_CORE_CONSOLE=y 508CONFIG_SERIAL_CORE_CONSOLE=y
508# CONFIG_SERIAL_JSM is not set
509CONFIG_UNIX98_PTYS=y 509CONFIG_UNIX98_PTYS=y
510CONFIG_LEGACY_PTYS=y 510CONFIG_LEGACY_PTYS=y
511CONFIG_LEGACY_PTY_COUNT=256 511CONFIG_LEGACY_PTY_COUNT=256
@@ -542,6 +542,12 @@ CONFIG_GEN_RTC_X=y
542# CONFIG_I2C is not set 542# CONFIG_I2C is not set
543 543
544# 544#
545# SPI support
546#
547# CONFIG_SPI is not set
548# CONFIG_SPI_MASTER is not set
549
550#
545# Dallas's 1-wire bus 551# Dallas's 1-wire bus
546# 552#
547# CONFIG_W1 is not set 553# CONFIG_W1 is not set
@@ -615,7 +621,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
615# 621#
616# CONFIG_EXT2_FS is not set 622# CONFIG_EXT2_FS is not set
617# CONFIG_EXT3_FS is not set 623# CONFIG_EXT3_FS is not set
618# CONFIG_JBD is not set
619# CONFIG_REISERFS_FS is not set 624# CONFIG_REISERFS_FS is not set
620# CONFIG_JFS_FS is not set 625# CONFIG_JFS_FS is not set
621# CONFIG_FS_POSIX_ACL is not set 626# CONFIG_FS_POSIX_ACL is not set
@@ -694,12 +699,13 @@ CONFIG_MSDOS_PARTITION=y
694# Kernel hacking 699# Kernel hacking
695# 700#
696# CONFIG_PRINTK_TIME is not set 701# CONFIG_PRINTK_TIME is not set
697CONFIG_DEBUG_KERNEL=y
698# CONFIG_MAGIC_SYSRQ is not set 702# CONFIG_MAGIC_SYSRQ is not set
703CONFIG_DEBUG_KERNEL=y
699CONFIG_LOG_BUF_SHIFT=14 704CONFIG_LOG_BUF_SHIFT=14
700CONFIG_DETECT_SOFTLOCKUP=y 705CONFIG_DETECT_SOFTLOCKUP=y
701# CONFIG_SCHEDSTATS is not set 706# CONFIG_SCHEDSTATS is not set
702# CONFIG_DEBUG_SLAB is not set 707# CONFIG_DEBUG_SLAB is not set
708CONFIG_DEBUG_MUTEXES=y
703# CONFIG_DEBUG_SPINLOCK is not set 709# CONFIG_DEBUG_SPINLOCK is not set
704# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 710# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
705# CONFIG_DEBUG_KOBJECT is not set 711# CONFIG_DEBUG_KOBJECT is not set
@@ -707,6 +713,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
707# CONFIG_DEBUG_INFO is not set 713# CONFIG_DEBUG_INFO is not set
708# CONFIG_DEBUG_FS is not set 714# CONFIG_DEBUG_FS is not set
709# CONFIG_DEBUG_VM is not set 715# CONFIG_DEBUG_VM is not set
716CONFIG_FORCED_INLINING=y
710# CONFIG_RCU_TORTURE_TEST is not set 717# CONFIG_RCU_TORTURE_TEST is not set
711CONFIG_CROSSCOMPILE=y 718CONFIG_CROSSCOMPILE=y
712CONFIG_CMDLINE="" 719CONFIG_CMDLINE=""
diff --git a/arch/mips/ddb5xxx/common/rtc_ds1386.c b/arch/mips/ddb5xxx/common/rtc_ds1386.c
index 995896ac0e39..5dc34daa7150 100644
--- a/arch/mips/ddb5xxx/common/rtc_ds1386.c
+++ b/arch/mips/ddb5xxx/common/rtc_ds1386.c
@@ -165,6 +165,6 @@ rtc_ds1386_init(unsigned long base)
165 WRITE_RTC(0xB, byte); 165 WRITE_RTC(0xB, byte);
166 166
167 /* set the function pointers */ 167 /* set the function pointers */
168 rtc_get_time = rtc_ds1386_get_time; 168 rtc_mips_get_time = rtc_ds1386_get_time;
169 rtc_set_time = rtc_ds1386_set_time; 169 rtc_mips_set_time = rtc_ds1386_set_time;
170} 170}
diff --git a/arch/mips/dec/prom/memory.c b/arch/mips/dec/prom/memory.c
index 83d4556c3cb5..1edaf3074ee9 100644
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
@@ -45,7 +45,7 @@ static inline void pmax_setup_memory_region(void)
45 */ 45 */
46 for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE; 46 for (memory_page = (unsigned char *)CKSEG1 + CHUNK_SIZE;
47 mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000; 47 mem_err == 0 && memory_page < (unsigned char *)CKSEG1 + 0x1e00000;
48 memory_page += CHUNK_SIZE) { 48 memory_page += CHUNK_SIZE) {
49 dummy = *memory_page; 49 dummy = *memory_page;
50 } 50 }
51 memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80); 51 memcpy((void *)(CKSEG0 + 0x80), &old_handler, 0x80);
@@ -118,7 +118,7 @@ unsigned long __init prom_free_prom_memory(void)
118 addr = PAGE_SIZE; 118 addr = PAGE_SIZE;
119 while (addr < end) { 119 while (addr < end) {
120 ClearPageReserved(virt_to_page(__va(addr))); 120 ClearPageReserved(virt_to_page(__va(addr)));
121 set_page_count(virt_to_page(__va(addr)), 1); 121 init_page_count(virt_to_page(__va(addr)));
122 free_page((unsigned long)__va(addr)); 122 free_page((unsigned long)__va(addr));
123 addr += PAGE_SIZE; 123 addr += PAGE_SIZE;
124 } 124 }
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index 174822344131..74cb055d4bf6 100644
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -36,41 +36,13 @@
36#include <asm/dec/ioasic_addrs.h> 36#include <asm/dec/ioasic_addrs.h>
37#include <asm/dec/machtype.h> 37#include <asm/dec/machtype.h>
38 38
39
40/*
41 * Returns true if a clock update is in progress
42 */
43static inline unsigned char dec_rtc_is_updating(void)
44{
45 unsigned char uip;
46 unsigned long flags;
47
48 spin_lock_irqsave(&rtc_lock, flags);
49 uip = (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP);
50 spin_unlock_irqrestore(&rtc_lock, flags);
51 return uip;
52}
53
54static unsigned long dec_rtc_get_time(void) 39static unsigned long dec_rtc_get_time(void)
55{ 40{
56 unsigned int year, mon, day, hour, min, sec, real_year; 41 unsigned int year, mon, day, hour, min, sec, real_year;
57 int i;
58 unsigned long flags; 42 unsigned long flags;
59 43
60 /* The Linux interpretation of the DS1287 clock register contents:
61 * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
62 * RTC registers show the second which has precisely just started.
63 * Let's hope other operating systems interpret the RTC the same way.
64 */
65 /* read RTC exactly on falling edge of update flag */
66 for (i = 0; i < 1000000; i++) /* may take up to 1 second... */
67 if (dec_rtc_is_updating())
68 break;
69 for (i = 0; i < 1000000; i++) /* must try at least 2.228 ms */
70 if (!dec_rtc_is_updating())
71 break;
72 spin_lock_irqsave(&rtc_lock, flags); 44 spin_lock_irqsave(&rtc_lock, flags);
73 /* Isn't this overkill? UIP above should guarantee consistency */ 45
74 do { 46 do {
75 sec = CMOS_READ(RTC_SECONDS); 47 sec = CMOS_READ(RTC_SECONDS);
76 min = CMOS_READ(RTC_MINUTES); 48 min = CMOS_READ(RTC_MINUTES);
@@ -78,7 +50,16 @@ static unsigned long dec_rtc_get_time(void)
78 day = CMOS_READ(RTC_DAY_OF_MONTH); 50 day = CMOS_READ(RTC_DAY_OF_MONTH);
79 mon = CMOS_READ(RTC_MONTH); 51 mon = CMOS_READ(RTC_MONTH);
80 year = CMOS_READ(RTC_YEAR); 52 year = CMOS_READ(RTC_YEAR);
53 /*
54 * The PROM will reset the year to either '72 or '73.
55 * Therefore we store the real year separately, in one
56 * of unused BBU RAM locations.
57 */
58 real_year = CMOS_READ(RTC_DEC_YEAR);
81 } while (sec != CMOS_READ(RTC_SECONDS)); 59 } while (sec != CMOS_READ(RTC_SECONDS));
60
61 spin_unlock_irqrestore(&rtc_lock, flags);
62
82 if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { 63 if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
83 sec = BCD2BIN(sec); 64 sec = BCD2BIN(sec);
84 min = BCD2BIN(min); 65 min = BCD2BIN(min);
@@ -87,13 +68,7 @@ static unsigned long dec_rtc_get_time(void)
87 mon = BCD2BIN(mon); 68 mon = BCD2BIN(mon);
88 year = BCD2BIN(year); 69 year = BCD2BIN(year);
89 } 70 }
90 /* 71
91 * The PROM will reset the year to either '72 or '73.
92 * Therefore we store the real year separately, in one
93 * of unused BBU RAM locations.
94 */
95 real_year = CMOS_READ(RTC_DEC_YEAR);
96 spin_unlock_irqrestore(&rtc_lock, flags);
97 year += real_year - 72 + 2000; 72 year += real_year - 72 + 2000;
98 73
99 return mktime(year, mon, day, hour, min, sec); 74 return mktime(year, mon, day, hour, min, sec);
@@ -193,8 +168,8 @@ static void dec_ioasic_hpt_init(unsigned int count)
193 168
194void __init dec_time_init(void) 169void __init dec_time_init(void)
195{ 170{
196 rtc_get_time = dec_rtc_get_time; 171 rtc_mips_get_time = dec_rtc_get_time;
197 rtc_set_mmss = dec_rtc_set_mmss; 172 rtc_mips_set_mmss = dec_rtc_set_mmss;
198 173
199 mips_timer_state = dec_timer_state; 174 mips_timer_state = dec_timer_state;
200 mips_timer_ack = dec_timer_ack; 175 mips_timer_ack = dec_timer_ack;
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 4f125e9e8e0b..42d5cd7927cb 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.15-rc2 3# Linux kernel version: 2.6.16-rc1
4# Thu Nov 24 01:05:49 2005 4# Fri Jan 27 15:39:51 2006
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -158,27 +158,29 @@ CONFIG_SYSVIPC=y
158# CONFIG_BSD_PROCESS_ACCT is not set 158# CONFIG_BSD_PROCESS_ACCT is not set
159CONFIG_SYSCTL=y 159CONFIG_SYSCTL=y
160# CONFIG_AUDIT is not set 160# CONFIG_AUDIT is not set
161# CONFIG_HOTPLUG is not set
162CONFIG_KOBJECT_UEVENT=y
163CONFIG_IKCONFIG=y 161CONFIG_IKCONFIG=y
164CONFIG_IKCONFIG_PROC=y 162CONFIG_IKCONFIG_PROC=y
165CONFIG_INITRAMFS_SOURCE="" 163CONFIG_INITRAMFS_SOURCE=""
164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
166CONFIG_EMBEDDED=y 165CONFIG_EMBEDDED=y
167CONFIG_KALLSYMS=y 166CONFIG_KALLSYMS=y
168# CONFIG_KALLSYMS_EXTRA_PASS is not set 167# CONFIG_KALLSYMS_EXTRA_PASS is not set
168# CONFIG_HOTPLUG is not set
169CONFIG_PRINTK=y 169CONFIG_PRINTK=y
170CONFIG_BUG=y 170CONFIG_BUG=y
171CONFIG_ELF_CORE=y
171CONFIG_BASE_FULL=y 172CONFIG_BASE_FULL=y
172CONFIG_FUTEX=y 173CONFIG_FUTEX=y
173CONFIG_EPOLL=y 174CONFIG_EPOLL=y
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SHMEM=y 175CONFIG_SHMEM=y
176CONFIG_CC_ALIGN_FUNCTIONS=0 176CONFIG_CC_ALIGN_FUNCTIONS=0
177CONFIG_CC_ALIGN_LABELS=0 177CONFIG_CC_ALIGN_LABELS=0
178CONFIG_CC_ALIGN_LOOPS=0 178CONFIG_CC_ALIGN_LOOPS=0
179CONFIG_CC_ALIGN_JUMPS=0 179CONFIG_CC_ALIGN_JUMPS=0
180CONFIG_SLAB=y
180# CONFIG_TINY_SHMEM is not set 181# CONFIG_TINY_SHMEM is not set
181CONFIG_BASE_SMALL=0 182CONFIG_BASE_SMALL=0
183# CONFIG_SLOB is not set
182 184
183# 185#
184# Loadable module support 186# Loadable module support
@@ -317,6 +319,28 @@ CONFIG_NETFILTER=y
317CONFIG_NETFILTER_NETLINK=m 319CONFIG_NETFILTER_NETLINK=m
318CONFIG_NETFILTER_NETLINK_QUEUE=m 320CONFIG_NETFILTER_NETLINK_QUEUE=m
319CONFIG_NETFILTER_NETLINK_LOG=m 321CONFIG_NETFILTER_NETLINK_LOG=m
322CONFIG_NETFILTER_XTABLES=m
323CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
324CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
325CONFIG_NETFILTER_XT_TARGET_MARK=m
326CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
327CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
328CONFIG_NETFILTER_XT_MATCH_COMMENT=m
329CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
330CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
331CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
332CONFIG_NETFILTER_XT_MATCH_DCCP=m
333CONFIG_NETFILTER_XT_MATCH_HELPER=m
334CONFIG_NETFILTER_XT_MATCH_LENGTH=m
335CONFIG_NETFILTER_XT_MATCH_LIMIT=m
336CONFIG_NETFILTER_XT_MATCH_MAC=m
337CONFIG_NETFILTER_XT_MATCH_MARK=m
338CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
339CONFIG_NETFILTER_XT_MATCH_REALM=m
340CONFIG_NETFILTER_XT_MATCH_SCTP=m
341CONFIG_NETFILTER_XT_MATCH_STATE=m
342CONFIG_NETFILTER_XT_MATCH_STRING=m
343CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
320 344
321# 345#
322# IP: Netfilter Configuration 346# IP: Netfilter Configuration
@@ -335,39 +359,23 @@ CONFIG_IP_NF_AMANDA=m
335CONFIG_IP_NF_PPTP=m 359CONFIG_IP_NF_PPTP=m
336CONFIG_IP_NF_QUEUE=m 360CONFIG_IP_NF_QUEUE=m
337CONFIG_IP_NF_IPTABLES=m 361CONFIG_IP_NF_IPTABLES=m
338CONFIG_IP_NF_MATCH_LIMIT=m
339CONFIG_IP_NF_MATCH_IPRANGE=m 362CONFIG_IP_NF_MATCH_IPRANGE=m
340CONFIG_IP_NF_MATCH_MAC=m
341CONFIG_IP_NF_MATCH_PKTTYPE=m
342CONFIG_IP_NF_MATCH_MARK=m
343CONFIG_IP_NF_MATCH_MULTIPORT=m 363CONFIG_IP_NF_MATCH_MULTIPORT=m
344CONFIG_IP_NF_MATCH_TOS=m 364CONFIG_IP_NF_MATCH_TOS=m
345CONFIG_IP_NF_MATCH_RECENT=m 365CONFIG_IP_NF_MATCH_RECENT=m
346CONFIG_IP_NF_MATCH_ECN=m 366CONFIG_IP_NF_MATCH_ECN=m
347CONFIG_IP_NF_MATCH_DSCP=m 367CONFIG_IP_NF_MATCH_DSCP=m
348CONFIG_IP_NF_MATCH_AH_ESP=m 368CONFIG_IP_NF_MATCH_AH_ESP=m
349CONFIG_IP_NF_MATCH_LENGTH=m
350CONFIG_IP_NF_MATCH_TTL=m 369CONFIG_IP_NF_MATCH_TTL=m
351CONFIG_IP_NF_MATCH_TCPMSS=m
352CONFIG_IP_NF_MATCH_HELPER=m
353CONFIG_IP_NF_MATCH_STATE=m
354CONFIG_IP_NF_MATCH_CONNTRACK=m
355CONFIG_IP_NF_MATCH_OWNER=m 370CONFIG_IP_NF_MATCH_OWNER=m
356CONFIG_IP_NF_MATCH_ADDRTYPE=m 371CONFIG_IP_NF_MATCH_ADDRTYPE=m
357CONFIG_IP_NF_MATCH_REALM=m
358CONFIG_IP_NF_MATCH_SCTP=m
359CONFIG_IP_NF_MATCH_DCCP=m
360CONFIG_IP_NF_MATCH_COMMENT=m
361CONFIG_IP_NF_MATCH_CONNMARK=m
362CONFIG_IP_NF_MATCH_CONNBYTES=m
363CONFIG_IP_NF_MATCH_HASHLIMIT=m 372CONFIG_IP_NF_MATCH_HASHLIMIT=m
364CONFIG_IP_NF_MATCH_STRING=m 373CONFIG_IP_NF_MATCH_POLICY=m
365CONFIG_IP_NF_FILTER=m 374CONFIG_IP_NF_FILTER=m
366CONFIG_IP_NF_TARGET_REJECT=m 375CONFIG_IP_NF_TARGET_REJECT=m
367CONFIG_IP_NF_TARGET_LOG=m 376CONFIG_IP_NF_TARGET_LOG=m
368CONFIG_IP_NF_TARGET_ULOG=m 377CONFIG_IP_NF_TARGET_ULOG=m
369CONFIG_IP_NF_TARGET_TCPMSS=m 378CONFIG_IP_NF_TARGET_TCPMSS=m
370CONFIG_IP_NF_TARGET_NFQUEUE=m
371CONFIG_IP_NF_NAT=m 379CONFIG_IP_NF_NAT=m
372CONFIG_IP_NF_NAT_NEEDED=y 380CONFIG_IP_NF_NAT_NEEDED=y
373CONFIG_IP_NF_TARGET_MASQUERADE=m 381CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -384,13 +392,9 @@ CONFIG_IP_NF_MANGLE=m
384CONFIG_IP_NF_TARGET_TOS=m 392CONFIG_IP_NF_TARGET_TOS=m
385CONFIG_IP_NF_TARGET_ECN=m 393CONFIG_IP_NF_TARGET_ECN=m
386CONFIG_IP_NF_TARGET_DSCP=m 394CONFIG_IP_NF_TARGET_DSCP=m
387CONFIG_IP_NF_TARGET_MARK=m
388CONFIG_IP_NF_TARGET_CLASSIFY=m
389CONFIG_IP_NF_TARGET_TTL=m 395CONFIG_IP_NF_TARGET_TTL=m
390CONFIG_IP_NF_TARGET_CONNMARK=m
391CONFIG_IP_NF_TARGET_CLUSTERIP=m 396CONFIG_IP_NF_TARGET_CLUSTERIP=m
392CONFIG_IP_NF_RAW=m 397CONFIG_IP_NF_RAW=m
393CONFIG_IP_NF_TARGET_NOTRACK=m
394CONFIG_IP_NF_ARPTABLES=m 398CONFIG_IP_NF_ARPTABLES=m
395CONFIG_IP_NF_ARPFILTER=m 399CONFIG_IP_NF_ARPFILTER=m
396CONFIG_IP_NF_ARP_MANGLE=m 400CONFIG_IP_NF_ARP_MANGLE=m
@@ -400,25 +404,20 @@ CONFIG_IP_NF_ARP_MANGLE=m
400# 404#
401CONFIG_IP6_NF_QUEUE=m 405CONFIG_IP6_NF_QUEUE=m
402CONFIG_IP6_NF_IPTABLES=m 406CONFIG_IP6_NF_IPTABLES=m
403CONFIG_IP6_NF_MATCH_LIMIT=m
404CONFIG_IP6_NF_MATCH_MAC=m
405CONFIG_IP6_NF_MATCH_RT=m 407CONFIG_IP6_NF_MATCH_RT=m
406CONFIG_IP6_NF_MATCH_OPTS=m 408CONFIG_IP6_NF_MATCH_OPTS=m
407CONFIG_IP6_NF_MATCH_FRAG=m 409CONFIG_IP6_NF_MATCH_FRAG=m
408CONFIG_IP6_NF_MATCH_HL=m 410CONFIG_IP6_NF_MATCH_HL=m
409CONFIG_IP6_NF_MATCH_MULTIPORT=m 411CONFIG_IP6_NF_MATCH_MULTIPORT=m
410CONFIG_IP6_NF_MATCH_OWNER=m 412CONFIG_IP6_NF_MATCH_OWNER=m
411CONFIG_IP6_NF_MATCH_MARK=m
412CONFIG_IP6_NF_MATCH_IPV6HEADER=m 413CONFIG_IP6_NF_MATCH_IPV6HEADER=m
413CONFIG_IP6_NF_MATCH_AHESP=m 414CONFIG_IP6_NF_MATCH_AHESP=m
414CONFIG_IP6_NF_MATCH_LENGTH=m
415CONFIG_IP6_NF_MATCH_EUI64=m 415CONFIG_IP6_NF_MATCH_EUI64=m
416CONFIG_IP6_NF_MATCH_POLICY=m
416CONFIG_IP6_NF_FILTER=m 417CONFIG_IP6_NF_FILTER=m
417CONFIG_IP6_NF_TARGET_LOG=m 418CONFIG_IP6_NF_TARGET_LOG=m
418CONFIG_IP6_NF_TARGET_REJECT=m 419CONFIG_IP6_NF_TARGET_REJECT=m
419CONFIG_IP6_NF_TARGET_NFQUEUE=m
420CONFIG_IP6_NF_MANGLE=m 420CONFIG_IP6_NF_MANGLE=m
421CONFIG_IP6_NF_TARGET_MARK=m
422CONFIG_IP6_NF_TARGET_HL=m 421CONFIG_IP6_NF_TARGET_HL=m
423CONFIG_IP6_NF_RAW=m 422CONFIG_IP6_NF_RAW=m
424 423
@@ -445,6 +444,11 @@ CONFIG_SCTP_HMAC_MD5=y
445# CONFIG_ATALK is not set 444# CONFIG_ATALK is not set
446# CONFIG_X25 is not set 445# CONFIG_X25 is not set
447# CONFIG_LAPB is not set 446# CONFIG_LAPB is not set
447
448#
449# TIPC Configuration (EXPERIMENTAL)
450#
451# CONFIG_TIPC is not set
448CONFIG_NET_DIVERT=y 452CONFIG_NET_DIVERT=y
449# CONFIG_ECONET is not set 453# CONFIG_ECONET is not set
450# CONFIG_WAN_ROUTER is not set 454# CONFIG_WAN_ROUTER is not set
@@ -504,7 +508,6 @@ CONFIG_IEEE80211=m
504# CONFIG_IEEE80211_DEBUG is not set 508# CONFIG_IEEE80211_DEBUG is not set
505CONFIG_IEEE80211_CRYPT_WEP=m 509CONFIG_IEEE80211_CRYPT_WEP=m
506CONFIG_IEEE80211_CRYPT_CCMP=m 510CONFIG_IEEE80211_CRYPT_CCMP=m
507CONFIG_IEEE80211_CRYPT_TKIP=m
508 511
509# 512#
510# Device Drivers 513# Device Drivers
@@ -641,6 +644,7 @@ CONFIG_CICADA_PHY=m
641# 644#
642CONFIG_NET_ETHERNET=y 645CONFIG_NET_ETHERNET=y
643# CONFIG_MII is not set 646# CONFIG_MII is not set
647# CONFIG_DM9000 is not set
644CONFIG_SGISEEQ=y 648CONFIG_SGISEEQ=y
645 649
646# 650#
@@ -787,6 +791,12 @@ CONFIG_MAX_RAW_DEVS=256
787# CONFIG_I2C is not set 791# CONFIG_I2C is not set
788 792
789# 793#
794# SPI support
795#
796# CONFIG_SPI is not set
797# CONFIG_SPI_MASTER is not set
798
799#
790# Dallas's 1-wire bus 800# Dallas's 1-wire bus
791# 801#
792# CONFIG_W1 is not set 802# CONFIG_W1 is not set
@@ -892,6 +902,7 @@ CONFIG_XFS_QUOTA=y
892CONFIG_XFS_SECURITY=y 902CONFIG_XFS_SECURITY=y
893# CONFIG_XFS_POSIX_ACL is not set 903# CONFIG_XFS_POSIX_ACL is not set
894# CONFIG_XFS_RT is not set 904# CONFIG_XFS_RT is not set
905# CONFIG_OCFS2_FS is not set
895CONFIG_MINIX_FS=m 906CONFIG_MINIX_FS=m
896# CONFIG_ROMFS_FS is not set 907# CONFIG_ROMFS_FS is not set
897CONFIG_INOTIFY=y 908CONFIG_INOTIFY=y
@@ -934,6 +945,7 @@ CONFIG_SYSFS=y
934# CONFIG_HUGETLB_PAGE is not set 945# CONFIG_HUGETLB_PAGE is not set
935CONFIG_RAMFS=y 946CONFIG_RAMFS=y
936CONFIG_RELAYFS_FS=m 947CONFIG_RELAYFS_FS=m
948# CONFIG_CONFIGFS_FS is not set
937 949
938# 950#
939# Miscellaneous filesystems 951# Miscellaneous filesystems
@@ -1007,6 +1019,7 @@ CONFIG_MSDOS_PARTITION=y
1007CONFIG_SGI_PARTITION=y 1019CONFIG_SGI_PARTITION=y
1008# CONFIG_ULTRIX_PARTITION is not set 1020# CONFIG_ULTRIX_PARTITION is not set
1009# CONFIG_SUN_PARTITION is not set 1021# CONFIG_SUN_PARTITION is not set
1022# CONFIG_KARMA_PARTITION is not set
1010# CONFIG_EFI_PARTITION is not set 1023# CONFIG_EFI_PARTITION is not set
1011 1024
1012# 1025#
@@ -1062,6 +1075,7 @@ CONFIG_NLS_UTF8=m
1062# Kernel hacking 1075# Kernel hacking
1063# 1076#
1064# CONFIG_PRINTK_TIME is not set 1077# CONFIG_PRINTK_TIME is not set
1078# CONFIG_MAGIC_SYSRQ is not set
1065# CONFIG_DEBUG_KERNEL is not set 1079# CONFIG_DEBUG_KERNEL is not set
1066CONFIG_LOG_BUF_SHIFT=14 1080CONFIG_LOG_BUF_SHIFT=14
1067CONFIG_CROSSCOMPILE=y 1081CONFIG_CROSSCOMPILE=y
diff --git a/arch/mips/ite-boards/generic/time.c b/arch/mips/ite-boards/generic/time.c
index f5d67ee21ac6..b79817bb6cce 100644
--- a/arch/mips/ite-boards/generic/time.c
+++ b/arch/mips/ite-boards/generic/time.c
@@ -227,8 +227,8 @@ void __init it8172_time_init(void)
227 227
228 local_irq_restore(flags); 228 local_irq_restore(flags);
229 229
230 rtc_get_time = it8172_rtc_get_time; 230 rtc_mips_get_time = it8172_rtc_get_time;
231 rtc_set_time = it8172_rtc_set_time; 231 rtc_mips_set_time = it8172_rtc_set_time;
232} 232}
233 233
234#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5) 234#define ALLINTS (IE_IRQ0 | IE_IRQ1 | IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5)
diff --git a/arch/mips/ite-boards/ivr/init.c b/arch/mips/ite-boards/ivr/init.c
index ea4e1935fec5..b774db035b31 100644
--- a/arch/mips/ite-boards/ivr/init.c
+++ b/arch/mips/ite-boards/ivr/init.c
@@ -45,9 +45,6 @@ extern void __init prom_init_cmdline(void);
45extern unsigned long __init prom_get_memsize(void); 45extern unsigned long __init prom_get_memsize(void);
46extern void __init it8172_init_ram_resource(unsigned long memsize); 46extern void __init it8172_init_ram_resource(unsigned long memsize);
47 47
48#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
49#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
50
51const char *get_system_type(void) 48const char *get_system_type(void)
52{ 49{
53 return "Globespan IVR"; 50 return "Globespan IVR";
diff --git a/arch/mips/ite-boards/qed-4n-s01b/init.c b/arch/mips/ite-boards/qed-4n-s01b/init.c
index 56dca7e0c21d..e8ec8be66a80 100644
--- a/arch/mips/ite-boards/qed-4n-s01b/init.c
+++ b/arch/mips/ite-boards/qed-4n-s01b/init.c
@@ -45,9 +45,6 @@ extern void __init prom_init_cmdline(void);
45extern unsigned long __init prom_get_memsize(void); 45extern unsigned long __init prom_get_memsize(void);
46extern void __init it8172_init_ram_resource(unsigned long memsize); 46extern void __init it8172_init_ram_resource(unsigned long memsize);
47 47
48#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
49#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
50
51const char *get_system_type(void) 48const char *get_system_type(void)
52{ 49{
53 return "ITE QED-4N-S01B"; 50 return "ITE QED-4N-S01B";
diff --git a/arch/mips/jazz/int-handler.S b/arch/mips/jazz/int-handler.S
index 4dbcf91db884..dc752c67b528 100644
--- a/arch/mips/jazz/int-handler.S
+++ b/arch/mips/jazz/int-handler.S
@@ -248,17 +248,17 @@ loc_call: /*
248 and t2,s1 248 and t2,s1
249 sh t2,JAZZ_IO_IRQ_ENABLE 249 sh t2,JAZZ_IO_IRQ_ENABLE
250 250
251 nor s1,zero,s1 251 nor s1,zero,s1
252 jal do_IRQ 252 jal do_IRQ
253 253
254 /* 254 /*
255 * Reenable interrupt 255 * Reenable interrupt
256 */ 256 */
257 lhu t2,JAZZ_IO_IRQ_ENABLE 257 lhu t2,JAZZ_IO_IRQ_ENABLE
258 or t2,s1 258 or t2,s1
259 sh t2,JAZZ_IO_IRQ_ENABLE 259 sh t2,JAZZ_IO_IRQ_ENABLE
260 260
261 j ret_from_irq 261 j ret_from_irq
262 262
263/* 263/*
264 * "Jump extender" to reach spurious_interrupt 264 * "Jump extender" to reach spurious_interrupt
diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
index 9a8bff153d80..a6bd3f4d3049 100644
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ b/arch/mips/jmr3927/common/rtc_ds1742.c
@@ -159,8 +159,8 @@ rtc_ds1742_init(unsigned long base)
159 db_assert((rtc_base & 0xe0000000) == KSEG1); 159 db_assert((rtc_base & 0xe0000000) == KSEG1);
160 160
161 /* set the function pointers */ 161 /* set the function pointers */
162 rtc_get_time = rtc_ds1742_get_time; 162 rtc_mips_get_time = rtc_ds1742_get_time;
163 rtc_set_time = rtc_ds1742_set_time; 163 rtc_mips_set_time = rtc_ds1742_set_time;
164 164
165 /* clear oscillator stop bit */ 165 /* clear oscillator stop bit */
166 CMOS_WRITE(RTC_READ, RTC_CONTROL); 166 CMOS_WRITE(RTC_READ, RTC_CONTROL);
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 292f8b243a5e..58b3b14873cb 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -291,7 +291,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
291 * for documentation. Commented out because it shares 291 * for documentation. Commented out because it shares
292 * it's c0_prid id number with the TX3900. 292 * it's c0_prid id number with the TX3900.
293 */ 293 */
294 c->cputype = CPU_R4650; 294 c->cputype = CPU_R4650;
295 c->isa_level = MIPS_CPU_ISA_III; 295 c->isa_level = MIPS_CPU_ISA_III;
296 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC; 296 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC;
297 c->tlbsize = 48; 297 c->tlbsize = 48;
@@ -604,7 +604,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
604 case PRID_IMP_AU1_REV2: 604 case PRID_IMP_AU1_REV2:
605 switch ((c->processor_id >> 24) & 0xff) { 605 switch ((c->processor_id >> 24) & 0xff) {
606 case 0: 606 case 0:
607 c->cputype = CPU_AU1000; 607 c->cputype = CPU_AU1000;
608 break; 608 break;
609 case 1: 609 case 1:
610 c->cputype = CPU_AU1500; 610 c->cputype = CPU_AU1500;
@@ -705,7 +705,7 @@ __init void cpu_probe(void)
705 break; 705 break;
706 case PRID_COMP_PHILIPS: 706 case PRID_COMP_PHILIPS:
707 cpu_probe_philips(c); 707 cpu_probe_philips(c);
708 break; 708 break;
709 default: 709 default:
710 c->cputype = CPU_UNKNOWN; 710 c->cputype = CPU_UNKNOWN;
711 } 711 }
diff --git a/arch/mips/kernel/gdb-low.S b/arch/mips/kernel/gdb-low.S
index 83b8986f9401..235ad9f6bd35 100644
--- a/arch/mips/kernel/gdb-low.S
+++ b/arch/mips/kernel/gdb-low.S
@@ -41,7 +41,7 @@
41 */ 41 */
42 .align 5 42 .align 5
43 NESTED(trap_low, GDB_FR_SIZE, sp) 43 NESTED(trap_low, GDB_FR_SIZE, sp)
44 .set noat 44 .set noat
45 .set noreorder 45 .set noreorder
46 46
47 mfc0 k0, CP0_STATUS 47 mfc0 k0, CP0_STATUS
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 08273a2a501d..8150f071f80a 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -603,7 +603,7 @@ repeat:
603 /* move to end of parent's list to avoid starvation */ 603 /* move to end of parent's list to avoid starvation */
604 write_lock_irq(&tasklist_lock); 604 write_lock_irq(&tasklist_lock);
605 remove_parent(p); 605 remove_parent(p);
606 add_parent(p, p->parent); 606 add_parent(p);
607 write_unlock_irq(&tasklist_lock); 607 write_unlock_irq(&tasklist_lock);
608 retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0; 608 retval = ru ? getrusage(p, RUSAGE_BOTH, ru) : 0;
609 if (retval) 609 if (retval)
@@ -643,7 +643,7 @@ repeat:
643 write_lock_irq(&tasklist_lock); 643 write_lock_irq(&tasklist_lock);
644 remove_parent(p); 644 remove_parent(p);
645 p->parent = p->real_parent; 645 p->parent = p->real_parent;
646 add_parent(p, p->parent); 646 add_parent(p);
647 do_notify_parent(p, SIGCHLD); 647 do_notify_parent(p, SIGCHLD);
648 write_unlock_irq(&tasklist_lock); 648 write_unlock_irq(&tasklist_lock);
649 } else 649 } else
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index 7d93992e462c..3dd76b3d2967 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -68,9 +68,8 @@ int show_interrupts(struct seq_file *p, void *v)
68 68
69 if (i == 0) { 69 if (i == 0) {
70 seq_printf(p, " "); 70 seq_printf(p, " ");
71 for (j=0; j<NR_CPUS; j++) 71 for_each_online_cpu(j)
72 if (cpu_online(j)) 72 seq_printf(p, "CPU%d ",j);
73 seq_printf(p, "CPU%d ",j);
74 seq_putc(p, '\n'); 73 seq_putc(p, '\n');
75 } 74 }
76 75
@@ -83,9 +82,8 @@ int show_interrupts(struct seq_file *p, void *v)
83#ifndef CONFIG_SMP 82#ifndef CONFIG_SMP
84 seq_printf(p, "%10u ", kstat_irqs(i)); 83 seq_printf(p, "%10u ", kstat_irqs(i));
85#else 84#else
86 for (j = 0; j < NR_CPUS; j++) 85 for_each_online_cpu(j)
87 if (cpu_online(j)) 86 seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
88 seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
89#endif 87#endif
90 seq_printf(p, " %14s", irq_desc[i].handler->typename); 88 seq_printf(p, " %14s", irq_desc[i].handler->typename);
91 seq_printf(p, " %s", action->name); 89 seq_printf(p, " %s", action->name);
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index e00e5f6e7fdd..3f40c37a9ee6 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -30,7 +30,6 @@
30#include <linux/utime.h> 30#include <linux/utime.h>
31#include <linux/utsname.h> 31#include <linux/utsname.h>
32#include <linux/personality.h> 32#include <linux/personality.h>
33#include <linux/timex.h>
34#include <linux/dnotify.h> 33#include <linux/dnotify.h>
35#include <linux/module.h> 34#include <linux/module.h>
36#include <linux/binfmts.h> 35#include <linux/binfmts.h>
@@ -69,7 +68,7 @@
69 * Revalidate the inode. This is required for proper NFS attribute caching. 68 * Revalidate the inode. This is required for proper NFS attribute caching.
70 */ 69 */
71 70
72int cp_compat_stat(struct kstat *stat, struct compat_stat *statbuf) 71int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
73{ 72{
74 struct compat_stat tmp; 73 struct compat_stat tmp;
75 74
@@ -106,6 +105,10 @@ sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
106 unsigned long error; 105 unsigned long error;
107 106
108 error = -EINVAL; 107 error = -EINVAL;
108 if (pgoff & (~PAGE_MASK >> 12))
109 goto out;
110 pgoff >>= PAGE_SHIFT-12;
111
109 if (!(flags & MAP_ANONYMOUS)) { 112 if (!(flags & MAP_ANONYMOUS)) {
110 error = -EBADF; 113 error = -EBADF;
111 file = fget(fd); 114 file = fget(fd);
@@ -125,7 +128,7 @@ out:
125} 128}
126 129
127 130
128asmlinkage int sys_truncate64(const char *path, unsigned int high, 131asmlinkage int sys_truncate64(const char __user *path, unsigned int high,
129 unsigned int low) 132 unsigned int low)
130{ 133{
131 if ((int)high < 0) 134 if ((int)high < 0)
@@ -161,12 +164,6 @@ out:
161 return error; 164 return error;
162} 165}
163 166
164asmlinkage int
165sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, int options)
166{
167 return compat_sys_wait4(pid, stat_addr, options, NULL);
168}
169
170asmlinkage long 167asmlinkage long
171sysn32_waitid(int which, compat_pid_t pid, 168sysn32_waitid(int which, compat_pid_t pid,
172 siginfo_t __user *uinfo, int options, 169 siginfo_t __user *uinfo, int options,
@@ -175,6 +172,7 @@ sysn32_waitid(int which, compat_pid_t pid,
175 struct rusage ru; 172 struct rusage ru;
176 long ret; 173 long ret;
177 mm_segment_t old_fs = get_fs(); 174 mm_segment_t old_fs = get_fs();
175 int si_signo;
178 176
179 if (!access_ok(VERIFY_WRITE, uinfo, sizeof(*uinfo))) 177 if (!access_ok(VERIFY_WRITE, uinfo, sizeof(*uinfo)))
180 return -EFAULT; 178 return -EFAULT;
@@ -184,7 +182,9 @@ sysn32_waitid(int which, compat_pid_t pid,
184 uru ? (struct rusage __user *) &ru : NULL); 182 uru ? (struct rusage __user *) &ru : NULL);
185 set_fs (old_fs); 183 set_fs (old_fs);
186 184
187 if (ret < 0 || uinfo->si_signo == 0) 185 if (__get_user(si_signo, &uinfo->si_signo))
186 return -EFAULT;
187 if (ret < 0 || si_signo == 0)
188 return ret; 188 return ret;
189 189
190 if (uru) 190 if (uru)
@@ -208,14 +208,14 @@ struct sysinfo32 {
208 char _f[8]; 208 char _f[8];
209}; 209};
210 210
211asmlinkage int sys32_sysinfo(struct sysinfo32 *info) 211asmlinkage int sys32_sysinfo(struct sysinfo32 __user *info)
212{ 212{
213 struct sysinfo s; 213 struct sysinfo s;
214 int ret, err; 214 int ret, err;
215 mm_segment_t old_fs = get_fs (); 215 mm_segment_t old_fs = get_fs ();
216 216
217 set_fs (KERNEL_DS); 217 set_fs (KERNEL_DS);
218 ret = sys_sysinfo(&s); 218 ret = sys_sysinfo((struct sysinfo __user *)&s);
219 set_fs (old_fs); 219 set_fs (old_fs);
220 err = put_user (s.uptime, &info->uptime); 220 err = put_user (s.uptime, &info->uptime);
221 err |= __put_user (s.loads[0], &info->loads[0]); 221 err |= __put_user (s.loads[0], &info->loads[0]);
@@ -245,11 +245,11 @@ struct rlimit32 {
245}; 245};
246 246
247#ifdef __MIPSEB__ 247#ifdef __MIPSEB__
248asmlinkage long sys32_truncate64(const char * path, unsigned long __dummy, 248asmlinkage long sys32_truncate64(const char __user * path, unsigned long __dummy,
249 int length_hi, int length_lo) 249 int length_hi, int length_lo)
250#endif 250#endif
251#ifdef __MIPSEL__ 251#ifdef __MIPSEL__
252asmlinkage long sys32_truncate64(const char * path, unsigned long __dummy, 252asmlinkage long sys32_truncate64(const char __user * path, unsigned long __dummy,
253 int length_lo, int length_hi) 253 int length_lo, int length_hi)
254#endif 254#endif
255{ 255{
@@ -277,7 +277,7 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long __dummy,
277} 277}
278 278
279static inline long 279static inline long
280get_tv32(struct timeval *o, struct compat_timeval *i) 280get_tv32(struct timeval *o, struct compat_timeval __user *i)
281{ 281{
282 return (!access_ok(VERIFY_READ, i, sizeof(*i)) || 282 return (!access_ok(VERIFY_READ, i, sizeof(*i)) ||
283 (__get_user(o->tv_sec, &i->tv_sec) | 283 (__get_user(o->tv_sec, &i->tv_sec) |
@@ -285,7 +285,7 @@ get_tv32(struct timeval *o, struct compat_timeval *i)
285} 285}
286 286
287static inline long 287static inline long
288put_tv32(struct compat_timeval *o, struct timeval *i) 288put_tv32(struct compat_timeval __user *o, struct timeval *i)
289{ 289{
290 return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) || 290 return (!access_ok(VERIFY_WRITE, o, sizeof(*o)) ||
291 (__put_user(i->tv_sec, &o->tv_sec) | 291 (__put_user(i->tv_sec, &o->tv_sec) |
@@ -295,7 +295,7 @@ put_tv32(struct compat_timeval *o, struct timeval *i)
295extern struct timezone sys_tz; 295extern struct timezone sys_tz;
296 296
297asmlinkage int 297asmlinkage int
298sys32_gettimeofday(struct compat_timeval *tv, struct timezone *tz) 298sys32_gettimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
299{ 299{
300 if (tv) { 300 if (tv) {
301 struct timeval ktv; 301 struct timeval ktv;
@@ -310,7 +310,7 @@ sys32_gettimeofday(struct compat_timeval *tv, struct timezone *tz)
310 return 0; 310 return 0;
311} 311}
312 312
313static inline long get_ts32(struct timespec *o, struct compat_timeval *i) 313static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)
314{ 314{
315 long usec; 315 long usec;
316 316
@@ -325,7 +325,7 @@ static inline long get_ts32(struct timespec *o, struct compat_timeval *i)
325} 325}
326 326
327asmlinkage int 327asmlinkage int
328sys32_settimeofday(struct compat_timeval *tv, struct timezone *tz) 328sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user *tz)
329{ 329{
330 struct timespec kts; 330 struct timespec kts;
331 struct timezone ktz; 331 struct timezone ktz;
@@ -343,7 +343,7 @@ sys32_settimeofday(struct compat_timeval *tv, struct timezone *tz)
343} 343}
344 344
345asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high, 345asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high,
346 unsigned int offset_low, loff_t * result, 346 unsigned int offset_low, loff_t __user * result,
347 unsigned int origin) 347 unsigned int origin)
348{ 348{
349 return sys_llseek(fd, offset_high, offset_low, result, origin); 349 return sys_llseek(fd, offset_high, offset_low, result, origin);
@@ -353,12 +353,12 @@ asmlinkage int sys32_llseek(unsigned int fd, unsigned int offset_high,
353 lseek back to original location. They fail just like lseek does on 353 lseek back to original location. They fail just like lseek does on
354 non-seekable files. */ 354 non-seekable files. */
355 355
356asmlinkage ssize_t sys32_pread(unsigned int fd, char * buf, 356asmlinkage ssize_t sys32_pread(unsigned int fd, char __user * buf,
357 size_t count, u32 unused, u64 a4, u64 a5) 357 size_t count, u32 unused, u64 a4, u64 a5)
358{ 358{
359 ssize_t ret; 359 ssize_t ret;
360 struct file * file; 360 struct file * file;
361 ssize_t (*read)(struct file *, char *, size_t, loff_t *); 361 ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
362 loff_t pos; 362 loff_t pos;
363 363
364 ret = -EBADF; 364 ret = -EBADF;
@@ -388,12 +388,12 @@ bad_file:
388 return ret; 388 return ret;
389} 389}
390 390
391asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char * buf, 391asmlinkage ssize_t sys32_pwrite(unsigned int fd, const char __user * buf,
392 size_t count, u32 unused, u64 a4, u64 a5) 392 size_t count, u32 unused, u64 a4, u64 a5)
393{ 393{
394 ssize_t ret; 394 ssize_t ret;
395 struct file * file; 395 struct file * file;
396 ssize_t (*write)(struct file *, const char *, size_t, loff_t *); 396 ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);
397 loff_t pos; 397 loff_t pos;
398 398
399 ret = -EBADF; 399 ret = -EBADF;
@@ -426,14 +426,14 @@ bad_file:
426} 426}
427 427
428asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid, 428asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,
429 struct compat_timespec *interval) 429 struct compat_timespec __user *interval)
430{ 430{
431 struct timespec t; 431 struct timespec t;
432 int ret; 432 int ret;
433 mm_segment_t old_fs = get_fs (); 433 mm_segment_t old_fs = get_fs ();
434 434
435 set_fs (KERNEL_DS); 435 set_fs (KERNEL_DS);
436 ret = sys_sched_rr_get_interval(pid, &t); 436 ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
437 set_fs (old_fs); 437 set_fs (old_fs);
438 if (put_user (t.tv_sec, &interval->tv_sec) || 438 if (put_user (t.tv_sec, &interval->tv_sec) ||
439 __put_user (t.tv_nsec, &interval->tv_nsec)) 439 __put_user (t.tv_nsec, &interval->tv_nsec))
@@ -551,7 +551,7 @@ struct ipc_kludge32 {
551}; 551};
552 552
553static int 553static int
554do_sys32_semctl(int first, int second, int third, void *uptr) 554do_sys32_semctl(int first, int second, int third, void __user *uptr)
555{ 555{
556 union semun fourth; 556 union semun fourth;
557 u32 pad; 557 u32 pad;
@@ -562,12 +562,12 @@ do_sys32_semctl(int first, int second, int third, void *uptr)
562 if (!uptr) 562 if (!uptr)
563 return -EINVAL; 563 return -EINVAL;
564 err = -EFAULT; 564 err = -EFAULT;
565 if (get_user (pad, (u32 *)uptr)) 565 if (get_user (pad, (u32 __user *)uptr))
566 return err; 566 return err;
567 if ((third & ~IPC_64) == SETVAL) 567 if ((third & ~IPC_64) == SETVAL)
568 fourth.val = (int)pad; 568 fourth.val = (int)pad;
569 else 569 else
570 fourth.__pad = (void *)A(pad); 570 fourth.__pad = (void __user *)A(pad);
571 switch (third & ~IPC_64) { 571 switch (third & ~IPC_64) {
572 case IPC_INFO: 572 case IPC_INFO:
573 case IPC_RMID: 573 case IPC_RMID:
@@ -585,14 +585,14 @@ do_sys32_semctl(int first, int second, int third, void *uptr)
585 585
586 case IPC_STAT: 586 case IPC_STAT:
587 case SEM_STAT: 587 case SEM_STAT:
588 fourth.__pad = &s; 588 fourth.__pad = (struct semid64_ds __user *)&s;
589 old_fs = get_fs(); 589 old_fs = get_fs();
590 set_fs(KERNEL_DS); 590 set_fs(KERNEL_DS);
591 err = sys_semctl(first, second, third | IPC_64, fourth); 591 err = sys_semctl(first, second, third | IPC_64, fourth);
592 set_fs(old_fs); 592 set_fs(old_fs);
593 593
594 if (third & IPC_64) { 594 if (third & IPC_64) {
595 struct semid64_ds32 *usp64 = (struct semid64_ds32 *) A(pad); 595 struct semid64_ds32 __user *usp64 = (struct semid64_ds32 __user *) A(pad);
596 596
597 if (!access_ok(VERIFY_WRITE, usp64, sizeof(*usp64))) { 597 if (!access_ok(VERIFY_WRITE, usp64, sizeof(*usp64))) {
598 err = -EFAULT; 598 err = -EFAULT;
@@ -609,7 +609,7 @@ do_sys32_semctl(int first, int second, int third, void *uptr)
609 err2 |= __put_user(s.sem_ctime, &usp64->sem_ctime); 609 err2 |= __put_user(s.sem_ctime, &usp64->sem_ctime);
610 err2 |= __put_user(s.sem_nsems, &usp64->sem_nsems); 610 err2 |= __put_user(s.sem_nsems, &usp64->sem_nsems);
611 } else { 611 } else {
612 struct semid_ds32 *usp32 = (struct semid_ds32 *) A(pad); 612 struct semid_ds32 __user *usp32 = (struct semid_ds32 __user *) A(pad);
613 613
614 if (!access_ok(VERIFY_WRITE, usp32, sizeof(*usp32))) { 614 if (!access_ok(VERIFY_WRITE, usp32, sizeof(*usp32))) {
615 err = -EFAULT; 615 err = -EFAULT;
@@ -639,9 +639,9 @@ do_sys32_semctl(int first, int second, int third, void *uptr)
639} 639}
640 640
641static int 641static int
642do_sys32_msgsnd (int first, int second, int third, void *uptr) 642do_sys32_msgsnd (int first, int second, int third, void __user *uptr)
643{ 643{
644 struct msgbuf32 *up = (struct msgbuf32 *)uptr; 644 struct msgbuf32 __user *up = (struct msgbuf32 __user *)uptr;
645 struct msgbuf *p; 645 struct msgbuf *p;
646 mm_segment_t old_fs; 646 mm_segment_t old_fs;
647 int err; 647 int err;
@@ -660,7 +660,7 @@ do_sys32_msgsnd (int first, int second, int third, void *uptr)
660 goto out; 660 goto out;
661 old_fs = get_fs (); 661 old_fs = get_fs ();
662 set_fs (KERNEL_DS); 662 set_fs (KERNEL_DS);
663 err = sys_msgsnd (first, p, second, third); 663 err = sys_msgsnd (first, (struct msgbuf __user *)p, second, third);
664 set_fs (old_fs); 664 set_fs (old_fs);
665out: 665out:
666 kfree (p); 666 kfree (p);
@@ -670,15 +670,15 @@ out:
670 670
671static int 671static int
672do_sys32_msgrcv (int first, int second, int msgtyp, int third, 672do_sys32_msgrcv (int first, int second, int msgtyp, int third,
673 int version, void *uptr) 673 int version, void __user *uptr)
674{ 674{
675 struct msgbuf32 *up; 675 struct msgbuf32 __user *up;
676 struct msgbuf *p; 676 struct msgbuf *p;
677 mm_segment_t old_fs; 677 mm_segment_t old_fs;
678 int err; 678 int err;
679 679
680 if (!version) { 680 if (!version) {
681 struct ipc_kludge32 *uipck = (struct ipc_kludge32 *)uptr; 681 struct ipc_kludge32 __user *uipck = (struct ipc_kludge32 __user *)uptr;
682 struct ipc_kludge32 ipck; 682 struct ipc_kludge32 ipck;
683 683
684 err = -EINVAL; 684 err = -EINVAL;
@@ -687,7 +687,7 @@ do_sys32_msgrcv (int first, int second, int msgtyp, int third,
687 err = -EFAULT; 687 err = -EFAULT;
688 if (copy_from_user (&ipck, uipck, sizeof (struct ipc_kludge32))) 688 if (copy_from_user (&ipck, uipck, sizeof (struct ipc_kludge32)))
689 goto out; 689 goto out;
690 uptr = (void *)AA(ipck.msgp); 690 uptr = (void __user *)AA(ipck.msgp);
691 msgtyp = ipck.msgtyp; 691 msgtyp = ipck.msgtyp;
692 } 692 }
693 693
@@ -699,11 +699,11 @@ do_sys32_msgrcv (int first, int second, int msgtyp, int third,
699 goto out; 699 goto out;
700 old_fs = get_fs (); 700 old_fs = get_fs ();
701 set_fs (KERNEL_DS); 701 set_fs (KERNEL_DS);
702 err = sys_msgrcv (first, p, second + 4, msgtyp, third); 702 err = sys_msgrcv (first, (struct msgbuf __user *)p, second + 4, msgtyp, third);
703 set_fs (old_fs); 703 set_fs (old_fs);
704 if (err < 0) 704 if (err < 0)
705 goto free_then_out; 705 goto free_then_out;
706 up = (struct msgbuf32 *)uptr; 706 up = (struct msgbuf32 __user *)uptr;
707 if (put_user (p->mtype, &up->mtype) || 707 if (put_user (p->mtype, &up->mtype) ||
708 __copy_to_user (&up->mtext, p->mtext, err)) 708 __copy_to_user (&up->mtext, p->mtext, err))
709 err = -EFAULT; 709 err = -EFAULT;
@@ -714,19 +714,19 @@ out:
714} 714}
715 715
716static int 716static int
717do_sys32_msgctl (int first, int second, void *uptr) 717do_sys32_msgctl (int first, int second, void __user *uptr)
718{ 718{
719 int err = -EINVAL, err2; 719 int err = -EINVAL, err2;
720 struct msqid64_ds m; 720 struct msqid64_ds m;
721 struct msqid_ds32 *up32 = (struct msqid_ds32 *)uptr; 721 struct msqid_ds32 __user *up32 = (struct msqid_ds32 __user *)uptr;
722 struct msqid64_ds32 *up64 = (struct msqid64_ds32 *)uptr; 722 struct msqid64_ds32 __user *up64 = (struct msqid64_ds32 __user *)uptr;
723 mm_segment_t old_fs; 723 mm_segment_t old_fs;
724 724
725 switch (second & ~IPC_64) { 725 switch (second & ~IPC_64) {
726 case IPC_INFO: 726 case IPC_INFO:
727 case IPC_RMID: 727 case IPC_RMID:
728 case MSG_INFO: 728 case MSG_INFO:
729 err = sys_msgctl (first, second, (struct msqid_ds *)uptr); 729 err = sys_msgctl (first, second, (struct msqid_ds __user *)uptr);
730 break; 730 break;
731 731
732 case IPC_SET: 732 case IPC_SET:
@@ -753,7 +753,7 @@ do_sys32_msgctl (int first, int second, void *uptr)
753 break; 753 break;
754 old_fs = get_fs(); 754 old_fs = get_fs();
755 set_fs(KERNEL_DS); 755 set_fs(KERNEL_DS);
756 err = sys_msgctl(first, second | IPC_64, (struct msqid_ds *)&m); 756 err = sys_msgctl(first, second | IPC_64, (struct msqid_ds __user *)&m);
757 set_fs(old_fs); 757 set_fs(old_fs);
758 break; 758 break;
759 759
@@ -761,7 +761,7 @@ do_sys32_msgctl (int first, int second, void *uptr)
761 case MSG_STAT: 761 case MSG_STAT:
762 old_fs = get_fs(); 762 old_fs = get_fs();
763 set_fs(KERNEL_DS); 763 set_fs(KERNEL_DS);
764 err = sys_msgctl(first, second | IPC_64, (struct msqid_ds *)&m); 764 err = sys_msgctl(first, second | IPC_64, (struct msqid_ds __user *)&m);
765 set_fs(old_fs); 765 set_fs(old_fs);
766 if (second & IPC_64) { 766 if (second & IPC_64) {
767 if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) { 767 if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) {
@@ -815,10 +815,10 @@ do_sys32_msgctl (int first, int second, void *uptr)
815} 815}
816 816
817static int 817static int
818do_sys32_shmat (int first, int second, int third, int version, void *uptr) 818do_sys32_shmat (int first, int second, int third, int version, void __user *uptr)
819{ 819{
820 unsigned long raddr; 820 unsigned long raddr;
821 u32 *uaddr = (u32 *)A((u32)third); 821 u32 __user *uaddr = (u32 __user *)A((u32)third);
822 int err = -EINVAL; 822 int err = -EINVAL;
823 823
824 if (version == 1) 824 if (version == 1)
@@ -837,11 +837,11 @@ struct shm_info32 {
837}; 837};
838 838
839static int 839static int
840do_sys32_shmctl (int first, int second, void *uptr) 840do_sys32_shmctl (int first, int second, void __user *uptr)
841{ 841{
842 struct shmid64_ds32 *up64 = (struct shmid64_ds32 *)uptr; 842 struct shmid64_ds32 __user *up64 = (struct shmid64_ds32 __user *)uptr;
843 struct shmid_ds32 *up32 = (struct shmid_ds32 *)uptr; 843 struct shmid_ds32 __user *up32 = (struct shmid_ds32 __user *)uptr;
844 struct shm_info32 *uip = (struct shm_info32 *)uptr; 844 struct shm_info32 __user *uip = (struct shm_info32 __user *)uptr;
845 int err = -EFAULT, err2; 845 int err = -EFAULT, err2;
846 struct shmid64_ds s64; 846 struct shmid64_ds s64;
847 mm_segment_t old_fs; 847 mm_segment_t old_fs;
@@ -854,7 +854,7 @@ do_sys32_shmctl (int first, int second, void *uptr)
854 case IPC_RMID: 854 case IPC_RMID:
855 case SHM_LOCK: 855 case SHM_LOCK:
856 case SHM_UNLOCK: 856 case SHM_UNLOCK:
857 err = sys_shmctl(first, second, (struct shmid_ds *)uptr); 857 err = sys_shmctl(first, second, (struct shmid_ds __user *)uptr);
858 break; 858 break;
859 case IPC_SET: 859 case IPC_SET:
860 if (second & IPC_64) { 860 if (second & IPC_64) {
@@ -870,7 +870,7 @@ do_sys32_shmctl (int first, int second, void *uptr)
870 break; 870 break;
871 old_fs = get_fs(); 871 old_fs = get_fs();
872 set_fs(KERNEL_DS); 872 set_fs(KERNEL_DS);
873 err = sys_shmctl(first, second & ~IPC_64, &s); 873 err = sys_shmctl(first, second & ~IPC_64, (struct shmid_ds __user *)&s);
874 set_fs(old_fs); 874 set_fs(old_fs);
875 break; 875 break;
876 876
@@ -878,7 +878,7 @@ do_sys32_shmctl (int first, int second, void *uptr)
878 case SHM_STAT: 878 case SHM_STAT:
879 old_fs = get_fs(); 879 old_fs = get_fs();
880 set_fs(KERNEL_DS); 880 set_fs(KERNEL_DS);
881 err = sys_shmctl(first, second | IPC_64, (void *) &s64); 881 err = sys_shmctl(first, second | IPC_64, (void __user *) &s64);
882 set_fs(old_fs); 882 set_fs(old_fs);
883 if (err < 0) 883 if (err < 0)
884 break; 884 break;
@@ -928,7 +928,7 @@ do_sys32_shmctl (int first, int second, void *uptr)
928 case SHM_INFO: 928 case SHM_INFO:
929 old_fs = get_fs(); 929 old_fs = get_fs();
930 set_fs(KERNEL_DS); 930 set_fs(KERNEL_DS);
931 err = sys_shmctl(first, second, (void *)&si); 931 err = sys_shmctl(first, second, (void __user *)&si);
932 set_fs(old_fs); 932 set_fs(old_fs);
933 if (err < 0) 933 if (err < 0)
934 break; 934 break;
@@ -950,11 +950,11 @@ do_sys32_shmctl (int first, int second, void *uptr)
950 return err; 950 return err;
951} 951}
952 952
953static int sys32_semtimedop(int semid, struct sembuf *tsems, int nsems, 953static int sys32_semtimedop(int semid, struct sembuf __user *tsems, int nsems,
954 const struct compat_timespec *timeout32) 954 const struct compat_timespec __user *timeout32)
955{ 955{
956 struct compat_timespec t32; 956 struct compat_timespec t32;
957 struct timespec *t64 = compat_alloc_user_space(sizeof(*t64)); 957 struct timespec __user *t64 = compat_alloc_user_space(sizeof(*t64));
958 958
959 if (copy_from_user(&t32, timeout32, sizeof(t32))) 959 if (copy_from_user(&t32, timeout32, sizeof(t32)))
960 return -EFAULT; 960 return -EFAULT;
@@ -977,11 +977,11 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
977 switch (call) { 977 switch (call) {
978 case SEMOP: 978 case SEMOP:
979 /* struct sembuf is the same on 32 and 64bit :)) */ 979 /* struct sembuf is the same on 32 and 64bit :)) */
980 err = sys_semtimedop (first, (struct sembuf *)AA(ptr), second, 980 err = sys_semtimedop (first, (struct sembuf __user *)AA(ptr), second,
981 NULL); 981 NULL);
982 break; 982 break;
983 case SEMTIMEDOP: 983 case SEMTIMEDOP:
984 err = sys32_semtimedop (first, (struct sembuf *)AA(ptr), second, 984 err = sys32_semtimedop (first, (struct sembuf __user *)AA(ptr), second,
985 (const struct compat_timespec __user *)AA(fifth)); 985 (const struct compat_timespec __user *)AA(fifth));
986 break; 986 break;
987 case SEMGET: 987 case SEMGET:
@@ -989,36 +989,36 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
989 break; 989 break;
990 case SEMCTL: 990 case SEMCTL:
991 err = do_sys32_semctl (first, second, third, 991 err = do_sys32_semctl (first, second, third,
992 (void *)AA(ptr)); 992 (void __user *)AA(ptr));
993 break; 993 break;
994 994
995 case MSGSND: 995 case MSGSND:
996 err = do_sys32_msgsnd (first, second, third, 996 err = do_sys32_msgsnd (first, second, third,
997 (void *)AA(ptr)); 997 (void __user *)AA(ptr));
998 break; 998 break;
999 case MSGRCV: 999 case MSGRCV:
1000 err = do_sys32_msgrcv (first, second, fifth, third, 1000 err = do_sys32_msgrcv (first, second, fifth, third,
1001 version, (void *)AA(ptr)); 1001 version, (void __user *)AA(ptr));
1002 break; 1002 break;
1003 case MSGGET: 1003 case MSGGET:
1004 err = sys_msgget ((key_t) first, second); 1004 err = sys_msgget ((key_t) first, second);
1005 break; 1005 break;
1006 case MSGCTL: 1006 case MSGCTL:
1007 err = do_sys32_msgctl (first, second, (void *)AA(ptr)); 1007 err = do_sys32_msgctl (first, second, (void __user *)AA(ptr));
1008 break; 1008 break;
1009 1009
1010 case SHMAT: 1010 case SHMAT:
1011 err = do_sys32_shmat (first, second, third, 1011 err = do_sys32_shmat (first, second, third,
1012 version, (void *)AA(ptr)); 1012 version, (void __user *)AA(ptr));
1013 break; 1013 break;
1014 case SHMDT: 1014 case SHMDT:
1015 err = sys_shmdt ((char *)A(ptr)); 1015 err = sys_shmdt ((char __user *)A(ptr));
1016 break; 1016 break;
1017 case SHMGET: 1017 case SHMGET:
1018 err = sys_shmget (first, (unsigned)second, third); 1018 err = sys_shmget (first, (unsigned)second, third);
1019 break; 1019 break;
1020 case SHMCTL: 1020 case SHMCTL:
1021 err = do_sys32_shmctl (first, second, (void *)AA(ptr)); 1021 err = do_sys32_shmctl (first, second, (void __user *)AA(ptr));
1022 break; 1022 break;
1023 default: 1023 default:
1024 err = -EINVAL; 1024 err = -EINVAL;
@@ -1029,7 +1029,7 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
1029} 1029}
1030 1030
1031asmlinkage long sys32_shmat(int shmid, char __user *shmaddr, 1031asmlinkage long sys32_shmat(int shmid, char __user *shmaddr,
1032 int shmflg, int32_t *addr) 1032 int shmflg, int32_t __user *addr)
1033{ 1033{
1034 unsigned long raddr; 1034 unsigned long raddr;
1035 int err; 1035 int err;
@@ -1054,12 +1054,13 @@ struct sysctl_args32
1054 1054
1055#ifdef CONFIG_SYSCTL 1055#ifdef CONFIG_SYSCTL
1056 1056
1057asmlinkage long sys32_sysctl(struct sysctl_args32 *args) 1057asmlinkage long sys32_sysctl(struct sysctl_args32 __user *args)
1058{ 1058{
1059 struct sysctl_args32 tmp; 1059 struct sysctl_args32 tmp;
1060 int error; 1060 int error;
1061 size_t oldlen, *oldlenp = NULL; 1061 size_t oldlen;
1062 unsigned long addr = (((long)&args->__unused[0]) + 7) & ~7; 1062 size_t __user *oldlenp = NULL;
1063 unsigned long addr = (((unsigned long)&args->__unused[0]) + 7) & ~7;
1063 1064
1064 if (copy_from_user(&tmp, args, sizeof(tmp))) 1065 if (copy_from_user(&tmp, args, sizeof(tmp)))
1065 return -EFAULT; 1066 return -EFAULT;
@@ -1071,20 +1072,20 @@ asmlinkage long sys32_sysctl(struct sysctl_args32 *args)
1071 basically copy the whole sysctl.c here, and 1072 basically copy the whole sysctl.c here, and
1072 glibc's __sysctl uses rw memory for the structure 1073 glibc's __sysctl uses rw memory for the structure
1073 anyway. */ 1074 anyway. */
1074 if (get_user(oldlen, (u32 *)A(tmp.oldlenp)) || 1075 if (get_user(oldlen, (u32 __user *)A(tmp.oldlenp)) ||
1075 put_user(oldlen, (size_t *)addr)) 1076 put_user(oldlen, (size_t __user *)addr))
1076 return -EFAULT; 1077 return -EFAULT;
1077 oldlenp = (size_t *)addr; 1078 oldlenp = (size_t __user *)addr;
1078 } 1079 }
1079 1080
1080 lock_kernel(); 1081 lock_kernel();
1081 error = do_sysctl((int *)A(tmp.name), tmp.nlen, (void *)A(tmp.oldval), 1082 error = do_sysctl((int __user *)A(tmp.name), tmp.nlen, (void __user *)A(tmp.oldval),
1082 oldlenp, (void *)A(tmp.newval), tmp.newlen); 1083 oldlenp, (void __user *)A(tmp.newval), tmp.newlen);
1083 unlock_kernel(); 1084 unlock_kernel();
1084 if (oldlenp) { 1085 if (oldlenp) {
1085 if (!error) { 1086 if (!error) {
1086 if (get_user(oldlen, (size_t *)addr) || 1087 if (get_user(oldlen, (size_t __user *)addr) ||
1087 put_user(oldlen, (u32 *)A(tmp.oldlenp))) 1088 put_user(oldlen, (u32 __user *)A(tmp.oldlenp)))
1088 error = -EFAULT; 1089 error = -EFAULT;
1089 } 1090 }
1090 copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused)); 1091 copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));
@@ -1094,7 +1095,7 @@ asmlinkage long sys32_sysctl(struct sysctl_args32 *args)
1094 1095
1095#endif /* CONFIG_SYSCTL */ 1096#endif /* CONFIG_SYSCTL */
1096 1097
1097asmlinkage long sys32_newuname(struct new_utsname * name) 1098asmlinkage long sys32_newuname(struct new_utsname __user * name)
1098{ 1099{
1099 int ret = 0; 1100 int ret = 0;
1100 1101
@@ -1129,9 +1130,9 @@ struct ustat32 {
1129 char f_fpack[6]; 1130 char f_fpack[6];
1130}; 1131};
1131 1132
1132extern asmlinkage long sys_ustat(dev_t dev, struct ustat * ubuf); 1133extern asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf);
1133 1134
1134asmlinkage int sys32_ustat(dev_t dev, struct ustat32 * ubuf32) 1135asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)
1135{ 1136{
1136 int err; 1137 int err;
1137 struct ustat tmp; 1138 struct ustat tmp;
@@ -1139,7 +1140,7 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 * ubuf32)
1139 mm_segment_t old_fs = get_fs(); 1140 mm_segment_t old_fs = get_fs();
1140 1141
1141 set_fs(KERNEL_DS); 1142 set_fs(KERNEL_DS);
1142 err = sys_ustat(dev, &tmp); 1143 err = sys_ustat(dev, (struct ustat __user *)&tmp);
1143 set_fs (old_fs); 1144 set_fs (old_fs);
1144 1145
1145 if (err) 1146 if (err)
@@ -1155,80 +1156,7 @@ out:
1155 return err; 1156 return err;
1156} 1157}
1157 1158
1158/* Handle adjtimex compatibility. */ 1159asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset,
1159
1160struct timex32 {
1161 u32 modes;
1162 s32 offset, freq, maxerror, esterror;
1163 s32 status, constant, precision, tolerance;
1164 struct compat_timeval time;
1165 s32 tick;
1166 s32 ppsfreq, jitter, shift, stabil;
1167 s32 jitcnt, calcnt, errcnt, stbcnt;
1168 s32 :32; s32 :32; s32 :32; s32 :32;
1169 s32 :32; s32 :32; s32 :32; s32 :32;
1170 s32 :32; s32 :32; s32 :32; s32 :32;
1171};
1172
1173extern int do_adjtimex(struct timex *);
1174
1175asmlinkage int sys32_adjtimex(struct timex32 *utp)
1176{
1177 struct timex txc;
1178 int ret;
1179
1180 memset(&txc, 0, sizeof(struct timex));
1181
1182 if (get_user(txc.modes, &utp->modes) ||
1183 __get_user(txc.offset, &utp->offset) ||
1184 __get_user(txc.freq, &utp->freq) ||
1185 __get_user(txc.maxerror, &utp->maxerror) ||
1186 __get_user(txc.esterror, &utp->esterror) ||
1187 __get_user(txc.status, &utp->status) ||
1188 __get_user(txc.constant, &utp->constant) ||
1189 __get_user(txc.precision, &utp->precision) ||
1190 __get_user(txc.tolerance, &utp->tolerance) ||
1191 __get_user(txc.time.tv_sec, &utp->time.tv_sec) ||
1192 __get_user(txc.time.tv_usec, &utp->time.tv_usec) ||
1193 __get_user(txc.tick, &utp->tick) ||
1194 __get_user(txc.ppsfreq, &utp->ppsfreq) ||
1195 __get_user(txc.jitter, &utp->jitter) ||
1196 __get_user(txc.shift, &utp->shift) ||
1197 __get_user(txc.stabil, &utp->stabil) ||
1198 __get_user(txc.jitcnt, &utp->jitcnt) ||
1199 __get_user(txc.calcnt, &utp->calcnt) ||
1200 __get_user(txc.errcnt, &utp->errcnt) ||
1201 __get_user(txc.stbcnt, &utp->stbcnt))
1202 return -EFAULT;
1203
1204 ret = do_adjtimex(&txc);
1205
1206 if (put_user(txc.modes, &utp->modes) ||
1207 __put_user(txc.offset, &utp->offset) ||
1208 __put_user(txc.freq, &utp->freq) ||
1209 __put_user(txc.maxerror, &utp->maxerror) ||
1210 __put_user(txc.esterror, &utp->esterror) ||
1211 __put_user(txc.status, &utp->status) ||
1212 __put_user(txc.constant, &utp->constant) ||
1213 __put_user(txc.precision, &utp->precision) ||
1214 __put_user(txc.tolerance, &utp->tolerance) ||
1215 __put_user(txc.time.tv_sec, &utp->time.tv_sec) ||
1216 __put_user(txc.time.tv_usec, &utp->time.tv_usec) ||
1217 __put_user(txc.tick, &utp->tick) ||
1218 __put_user(txc.ppsfreq, &utp->ppsfreq) ||
1219 __put_user(txc.jitter, &utp->jitter) ||
1220 __put_user(txc.shift, &utp->shift) ||
1221 __put_user(txc.stabil, &utp->stabil) ||
1222 __put_user(txc.jitcnt, &utp->jitcnt) ||
1223 __put_user(txc.calcnt, &utp->calcnt) ||
1224 __put_user(txc.errcnt, &utp->errcnt) ||
1225 __put_user(txc.stbcnt, &utp->stbcnt))
1226 ret = -EFAULT;
1227
1228 return ret;
1229}
1230
1231asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset,
1232 s32 count) 1160 s32 count)
1233{ 1161{
1234 mm_segment_t old_fs = get_fs(); 1162 mm_segment_t old_fs = get_fs();
@@ -1239,7 +1167,7 @@ asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset,
1239 return -EFAULT; 1167 return -EFAULT;
1240 1168
1241 set_fs(KERNEL_DS); 1169 set_fs(KERNEL_DS);
1242 ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); 1170 ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, count);
1243 set_fs(old_fs); 1171 set_fs(old_fs);
1244 1172
1245 if (offset && put_user(of, offset)) 1173 if (offset && put_user(of, offset))
@@ -1269,7 +1197,7 @@ static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),
1269 * it is set by the callees. 1197 * it is set by the callees.
1270 */ 1198 */
1271 1199
1272asmlinkage long sys32_socketcall(int call, unsigned int *args32) 1200asmlinkage long sys32_socketcall(int call, unsigned int __user *args32)
1273{ 1201{
1274 unsigned int a[6]; 1202 unsigned int a[6];
1275 unsigned int a0,a1; 1203 unsigned int a0,a1;
@@ -1291,7 +1219,7 @@ asmlinkage long sys32_socketcall(int call, unsigned int *args32)
1291 struct sockaddr __user *addr, int __user *addr_len); 1219 struct sockaddr __user *addr, int __user *addr_len);
1292 extern asmlinkage long sys_shutdown(int fd, int how); 1220 extern asmlinkage long sys_shutdown(int fd, int how);
1293 extern asmlinkage long sys_setsockopt(int fd, int level, int optname, char __user *optval, int optlen); 1221 extern asmlinkage long sys_setsockopt(int fd, int level, int optname, char __user *optval, int optlen);
1294 extern asmlinkage long sys_getsockopt(int fd, int level, int optname, char __user *optval, int *optlen); 1222 extern asmlinkage long sys_getsockopt(int fd, int level, int optname, char __user *optval, int __user *optlen);
1295 extern asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags); 1223 extern asmlinkage long sys_sendmsg(int fd, struct msghdr __user *msg, unsigned flags);
1296 extern asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flags); 1224 extern asmlinkage long sys_recvmsg(int fd, struct msghdr __user *msg, unsigned int flags);
1297 1225
@@ -1411,7 +1339,7 @@ _sys32_clone(nabi_no_regargs struct pt_regs regs)
1411 newsp = regs.regs[5]; 1339 newsp = regs.regs[5];
1412 if (!newsp) 1340 if (!newsp)
1413 newsp = regs.regs[29]; 1341 newsp = regs.regs[29];
1414 parent_tidptr = (int *) regs.regs[6]; 1342 parent_tidptr = (int __user *) regs.regs[6];
1415 1343
1416 /* Use __dummy4 instead of getting it off the stack, so that 1344 /* Use __dummy4 instead of getting it off the stack, so that
1417 syscall() works. */ 1345 syscall() works. */
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 86fe15b273cd..84ab959f924a 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -135,6 +135,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
135 cpu_has_vce ? "%u" : "not available"); 135 cpu_has_vce ? "%u" : "not available");
136 seq_printf(m, fmt, 'D', vced_count); 136 seq_printf(m, fmt, 'D', vced_count);
137 seq_printf(m, fmt, 'I', vcei_count); 137 seq_printf(m, fmt, 'I', vcei_count);
138 seq_printf(m, "\n");
138 139
139 return 0; 140 return 0;
140} 141}
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 092679c2dca9..c66db5e5ab62 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -60,17 +60,9 @@ ATTRIB_NORET void cpu_idle(void)
60 } 60 }
61} 61}
62 62
63extern void do_signal(struct pt_regs *regs);
64extern void do_signal32(struct pt_regs *regs);
65
66/* 63/*
67 * Native o32 and N64 ABI without DSP ASE 64 * Native o32 and N64 ABI without DSP ASE
68 */ 65 */
69extern int setup_frame(struct k_sigaction * ka, struct pt_regs *regs,
70 int signr, sigset_t *set);
71extern int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
72 int signr, sigset_t *set, siginfo_t *info);
73
74struct mips_abi mips_abi = { 66struct mips_abi mips_abi = {
75 .do_signal = do_signal, 67 .do_signal = do_signal,
76#ifdef CONFIG_TRAD_SIGNALS 68#ifdef CONFIG_TRAD_SIGNALS
@@ -83,11 +75,6 @@ struct mips_abi mips_abi = {
83/* 75/*
84 * o32 compatibility on 64-bit kernels, without DSP ASE 76 * o32 compatibility on 64-bit kernels, without DSP ASE
85 */ 77 */
86extern int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
87 int signr, sigset_t *set);
88extern int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
89 int signr, sigset_t *set, siginfo_t *info);
90
91struct mips_abi mips_abi_32 = { 78struct mips_abi mips_abi_32 = {
92 .do_signal = do_signal32, 79 .do_signal = do_signal32,
93 .setup_frame = setup_frame_32, 80 .setup_frame = setup_frame_32,
@@ -99,9 +86,6 @@ struct mips_abi mips_abi_32 = {
99/* 86/*
100 * N32 on 64-bit kernels, without DSP ASE 87 * N32 on 64-bit kernels, without DSP ASE
101 */ 88 */
102extern int setup_rt_frame_n32(struct k_sigaction * ka, struct pt_regs *regs,
103 int signr, sigset_t *set, siginfo_t *info);
104
105struct mips_abi mips_abi_n32 = { 89struct mips_abi mips_abi_n32 = {
106 .do_signal = do_signal, 90 .do_signal = do_signal,
107 .setup_rt_frame = setup_rt_frame_n32 91 .setup_rt_frame = setup_rt_frame_n32
@@ -435,4 +419,3 @@ unsigned long get_wchan(struct task_struct *p)
435 return pc; 419 return pc;
436} 420}
437 421
438EXPORT_SYMBOL(get_wchan);
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 02c8267e45e7..05a2c0567dae 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -273,7 +273,7 @@ EXPORT(sysn32_call_table)
273 PTR sys_pivot_root 273 PTR sys_pivot_root
274 PTR sys32_sysctl 274 PTR sys32_sysctl
275 PTR sys_prctl 275 PTR sys_prctl
276 PTR sys32_adjtimex 276 PTR compat_sys_adjtimex
277 PTR compat_sys_setrlimit /* 6155 */ 277 PTR compat_sys_setrlimit /* 6155 */
278 PTR sys_chroot 278 PTR sys_chroot
279 PTR sys_sync 279 PTR sys_sync
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 797e0d874889..19c4ca481b02 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -328,7 +328,7 @@ sys_call_table:
328 PTR sys_setdomainname 328 PTR sys_setdomainname
329 PTR sys32_newuname 329 PTR sys32_newuname
330 PTR sys_ni_syscall /* sys_modify_ldt */ 330 PTR sys_ni_syscall /* sys_modify_ldt */
331 PTR sys32_adjtimex 331 PTR compat_sys_adjtimex
332 PTR sys_mprotect /* 4125 */ 332 PTR sys_mprotect /* 4125 */
333 PTR compat_sys_sigprocmask 333 PTR compat_sys_sigprocmask
334 PTR sys_ni_syscall /* was creat_module */ 334 PTR sys_ni_syscall /* was creat_module */
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index d9293c558e41..dcbfd27071f0 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -34,6 +34,7 @@
34#include <linux/highmem.h> 34#include <linux/highmem.h>
35#include <linux/console.h> 35#include <linux/console.h>
36#include <linux/mmzone.h> 36#include <linux/mmzone.h>
37#include <linux/pfn.h>
37 38
38#include <asm/addrspace.h> 39#include <asm/addrspace.h>
39#include <asm/bootinfo.h> 40#include <asm/bootinfo.h>
@@ -257,10 +258,6 @@ static inline int parse_rd_cmdline(unsigned long* rd_start, unsigned long* rd_en
257 return 0; 258 return 0;
258} 259}
259 260
260#define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
261#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
262#define PFN_PHYS(x) ((x) << PAGE_SHIFT)
263
264#define MAXMEM HIGHMEM_START 261#define MAXMEM HIGHMEM_START
265#define MAXMEM_PFN PFN_DOWN(MAXMEM) 262#define MAXMEM_PFN PFN_DOWN(MAXMEM)
266 263
@@ -447,21 +444,10 @@ static inline void resource_init(void)
447{ 444{
448 int i; 445 int i;
449 446
450#if defined(CONFIG_64BIT) && !defined(CONFIG_BUILD_ELF64)
451 /*
452 * The 64bit code in 32bit object format trick can't represent
453 * 64bit wide relocations for linker script symbols.
454 */
455 code_resource.start = CPHYSADDR(&_text);
456 code_resource.end = CPHYSADDR(&_etext) - 1;
457 data_resource.start = CPHYSADDR(&_etext);
458 data_resource.end = CPHYSADDR(&_edata) - 1;
459#else
460 code_resource.start = virt_to_phys(&_text); 447 code_resource.start = virt_to_phys(&_text);
461 code_resource.end = virt_to_phys(&_etext) - 1; 448 code_resource.end = virt_to_phys(&_etext) - 1;
462 data_resource.start = virt_to_phys(&_etext); 449 data_resource.start = virt_to_phys(&_etext);
463 data_resource.end = virt_to_phys(&_edata) - 1; 450 data_resource.end = virt_to_phys(&_edata) - 1;
464#endif
465 451
466 /* 452 /*
467 * Request address space for all standard RAM. 453 * Request address space for all standard RAM.
@@ -504,10 +490,6 @@ static inline void resource_init(void)
504 } 490 }
505} 491}
506 492
507#undef PFN_UP
508#undef PFN_DOWN
509#undef PFN_PHYS
510
511#undef MAXMEM 493#undef MAXMEM
512#undef MAXMEM_PFN 494#undef MAXMEM_PFN
513 495
diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index 36bfc2588aa3..3ca786215d48 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -166,11 +166,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
166 sp = regs->regs[29]; 166 sp = regs->regs[29];
167 167
168 /* 168 /*
169 * FPU emulator may have it's own trampoline active just 169 * FPU emulator may have it's own trampoline active just
170 * above the user stack, 16-bytes before the next lowest 170 * above the user stack, 16-bytes before the next lowest
171 * 16 byte boundary. Try to avoid trashing it. 171 * 16 byte boundary. Try to avoid trashing it.
172 */ 172 */
173 sp -= 32; 173 sp -= 32;
174 174
175 /* This is the X/Open sanctioned signal stack switching. */ 175 /* This is the X/Open sanctioned signal stack switching. */
176 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0)) 176 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index c974cc9b30eb..402efd27c79e 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -100,8 +100,8 @@ _sys_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
100} 100}
101 101
102#ifdef CONFIG_TRAD_SIGNALS 102#ifdef CONFIG_TRAD_SIGNALS
103asmlinkage int sys_sigaction(int sig, const struct sigaction *act, 103asmlinkage int sys_sigaction(int sig, const struct sigaction __user *act,
104 struct sigaction *oact) 104 struct sigaction __user *oact)
105{ 105{
106 struct k_sigaction new_ka, old_ka; 106 struct k_sigaction new_ka, old_ka;
107 int ret; 107 int ret;
@@ -331,7 +331,7 @@ int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs,
331 /* Create the ucontext. */ 331 /* Create the ucontext. */
332 err |= __put_user(0, &frame->rs_uc.uc_flags); 332 err |= __put_user(0, &frame->rs_uc.uc_flags);
333 err |= __put_user(NULL, &frame->rs_uc.uc_link); 333 err |= __put_user(NULL, &frame->rs_uc.uc_link);
334 err |= __put_user((void *)current->sas_ss_sp, 334 err |= __put_user((void __user *)current->sas_ss_sp,
335 &frame->rs_uc.uc_stack.ss_sp); 335 &frame->rs_uc.uc_stack.ss_sp);
336 err |= __put_user(sas_ss_flags(regs->regs[29]), 336 err |= __put_user(sas_ss_flags(regs->regs[29]),
337 &frame->rs_uc.uc_stack.ss_flags); 337 &frame->rs_uc.uc_stack.ss_flags);
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 237cd8a2cd32..f32a22997c3d 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -163,7 +163,7 @@ static inline int put_sigset(const sigset_t *kbuf, compat_sigset_t __user *ubuf)
163 return err; 163 return err;
164} 164}
165 165
166static inline int get_sigset(sigset_t *kbuf, const compat_sigset_t *ubuf) 166static inline int get_sigset(sigset_t *kbuf, const compat_sigset_t __user *ubuf)
167{ 167{
168 int err = 0; 168 int err = 0;
169 unsigned long sig[4]; 169 unsigned long sig[4];
@@ -195,10 +195,10 @@ save_static_function(sys32_sigsuspend);
195__attribute_used__ noinline static int 195__attribute_used__ noinline static int
196_sys32_sigsuspend(nabi_no_regargs struct pt_regs regs) 196_sys32_sigsuspend(nabi_no_regargs struct pt_regs regs)
197{ 197{
198 compat_sigset_t *uset; 198 compat_sigset_t __user *uset;
199 sigset_t newset; 199 sigset_t newset;
200 200
201 uset = (compat_sigset_t *) regs.regs[4]; 201 uset = (compat_sigset_t __user *) regs.regs[4];
202 if (get_sigset(&newset, uset)) 202 if (get_sigset(&newset, uset))
203 return -EFAULT; 203 return -EFAULT;
204 sigdelsetmask(&newset, ~_BLOCKABLE); 204 sigdelsetmask(&newset, ~_BLOCKABLE);
@@ -219,7 +219,7 @@ save_static_function(sys32_rt_sigsuspend);
219__attribute_used__ noinline static int 219__attribute_used__ noinline static int
220_sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) 220_sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
221{ 221{
222 compat_sigset_t *uset; 222 compat_sigset_t __user *uset;
223 sigset_t newset; 223 sigset_t newset;
224 size_t sigsetsize; 224 size_t sigsetsize;
225 225
@@ -228,7 +228,7 @@ _sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
228 if (sigsetsize != sizeof(compat_sigset_t)) 228 if (sigsetsize != sizeof(compat_sigset_t))
229 return -EINVAL; 229 return -EINVAL;
230 230
231 uset = (compat_sigset_t *) regs.regs[4]; 231 uset = (compat_sigset_t __user *) regs.regs[4];
232 if (get_sigset(&newset, uset)) 232 if (get_sigset(&newset, uset))
233 return -EFAULT; 233 return -EFAULT;
234 sigdelsetmask(&newset, ~_BLOCKABLE); 234 sigdelsetmask(&newset, ~_BLOCKABLE);
@@ -236,7 +236,7 @@ _sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
236 spin_lock_irq(&current->sighand->siglock); 236 spin_lock_irq(&current->sighand->siglock);
237 current->saved_sigmask = current->blocked; 237 current->saved_sigmask = current->blocked;
238 current->blocked = newset; 238 current->blocked = newset;
239 recalc_sigpending(); 239 recalc_sigpending();
240 spin_unlock_irq(&current->sighand->siglock); 240 spin_unlock_irq(&current->sighand->siglock);
241 241
242 current->state = TASK_INTERRUPTIBLE; 242 current->state = TASK_INTERRUPTIBLE;
@@ -245,8 +245,8 @@ _sys32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
245 return -ERESTARTNOHAND; 245 return -ERESTARTNOHAND;
246} 246}
247 247
248asmlinkage int sys32_sigaction(int sig, const struct sigaction32 *act, 248asmlinkage int sys32_sigaction(int sig, const struct sigaction32 __user *act,
249 struct sigaction32 *oact) 249 struct sigaction32 __user *oact)
250{ 250{
251 struct k_sigaction new_ka, old_ka; 251 struct k_sigaction new_ka, old_ka;
252 int ret; 252 int ret;
@@ -272,15 +272,15 @@ asmlinkage int sys32_sigaction(int sig, const struct sigaction32 *act,
272 272
273 if (!ret && oact) { 273 if (!ret && oact) {
274 if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact))) 274 if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)))
275 return -EFAULT; 275 return -EFAULT;
276 err |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags); 276 err |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
277 err |= __put_user((u32)(u64)old_ka.sa.sa_handler, 277 err |= __put_user((u32)(u64)old_ka.sa.sa_handler,
278 &oact->sa_handler); 278 &oact->sa_handler);
279 err |= __put_user(old_ka.sa.sa_mask.sig[0], oact->sa_mask.sig); 279 err |= __put_user(old_ka.sa.sa_mask.sig[0], oact->sa_mask.sig);
280 err |= __put_user(0, &oact->sa_mask.sig[1]); 280 err |= __put_user(0, &oact->sa_mask.sig[1]);
281 err |= __put_user(0, &oact->sa_mask.sig[2]); 281 err |= __put_user(0, &oact->sa_mask.sig[2]);
282 err |= __put_user(0, &oact->sa_mask.sig[3]); 282 err |= __put_user(0, &oact->sa_mask.sig[3]);
283 if (err) 283 if (err)
284 return -EFAULT; 284 return -EFAULT;
285 } 285 }
286 286
@@ -301,7 +301,7 @@ asmlinkage int sys32_sigaltstack(nabi_no_regargs struct pt_regs regs)
301 if (!access_ok(VERIFY_READ, uss, sizeof(*uss))) 301 if (!access_ok(VERIFY_READ, uss, sizeof(*uss)))
302 return -EFAULT; 302 return -EFAULT;
303 err |= __get_user(sp, &uss->ss_sp); 303 err |= __get_user(sp, &uss->ss_sp);
304 kss.ss_sp = (void *) (long) sp; 304 kss.ss_sp = (void __user *) (long) sp;
305 err |= __get_user(kss.ss_size, &uss->ss_size); 305 err |= __get_user(kss.ss_size, &uss->ss_size);
306 err |= __get_user(kss.ss_flags, &uss->ss_flags); 306 err |= __get_user(kss.ss_flags, &uss->ss_flags);
307 if (err) 307 if (err)
@@ -316,7 +316,7 @@ asmlinkage int sys32_sigaltstack(nabi_no_regargs struct pt_regs regs)
316 if (!ret && uoss) { 316 if (!ret && uoss) {
317 if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss))) 317 if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
318 return -EFAULT; 318 return -EFAULT;
319 sp = (int) (long) koss.ss_sp; 319 sp = (int) (unsigned long) koss.ss_sp;
320 err |= __put_user(sp, &uoss->ss_sp); 320 err |= __put_user(sp, &uoss->ss_sp);
321 err |= __put_user(koss.ss_size, &uoss->ss_size); 321 err |= __put_user(koss.ss_size, &uoss->ss_size);
322 err |= __put_user(koss.ss_flags, &uoss->ss_flags); 322 err |= __put_user(koss.ss_flags, &uoss->ss_flags);
@@ -527,7 +527,7 @@ _sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
527 /* The ucontext contains a stack32_t, so we must convert! */ 527 /* The ucontext contains a stack32_t, so we must convert! */
528 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp)) 528 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp))
529 goto badframe; 529 goto badframe;
530 st.ss_sp = (void *)(long) sp; 530 st.ss_sp = (void __user *)(long) sp;
531 if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size)) 531 if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size))
532 goto badframe; 532 goto badframe;
533 if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags)) 533 if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags))
@@ -624,11 +624,11 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
624 sp = regs->regs[29]; 624 sp = regs->regs[29];
625 625
626 /* 626 /*
627 * FPU emulator may have it's own trampoline active just 627 * FPU emulator may have it's own trampoline active just
628 * above the user stack, 16-bytes before the next lowest 628 * above the user stack, 16-bytes before the next lowest
629 * 16 byte boundary. Try to avoid trashing it. 629 * 16 byte boundary. Try to avoid trashing it.
630 */ 630 */
631 sp -= 32; 631 sp -= 32;
632 632
633 /* This is the X/Open sanctioned signal stack switching. */ 633 /* This is the X/Open sanctioned signal stack switching. */
634 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0)) 634 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags (sp) == 0))
@@ -868,7 +868,7 @@ no_signal:
868 } 868 }
869} 869}
870 870
871asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 *act, 871asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 __user *act,
872 struct sigaction32 __user *oact, 872 struct sigaction32 __user *oact,
873 unsigned int sigsetsize) 873 unsigned int sigsetsize)
874{ 874{
@@ -912,7 +912,7 @@ out:
912 return ret; 912 return ret;
913} 913}
914 914
915asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t *set, 915asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
916 compat_sigset_t __user *oset, unsigned int sigsetsize) 916 compat_sigset_t __user *oset, unsigned int sigsetsize)
917{ 917{
918 sigset_t old_set, new_set; 918 sigset_t old_set, new_set;
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index 3e168c08a3a8..477c5334ec1b 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -87,7 +87,8 @@ save_static_function(sysn32_rt_sigsuspend);
87__attribute_used__ noinline static int 87__attribute_used__ noinline static int
88_sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs) 88_sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
89{ 89{
90 compat_sigset_t __user *unewset, uset; 90 compat_sigset_t __user *unewset;
91 compat_sigset_t uset;
91 size_t sigsetsize; 92 size_t sigsetsize;
92 sigset_t newset; 93 sigset_t newset;
93 94
@@ -141,7 +142,7 @@ _sysn32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
141 /* The ucontext contains a stack32_t, so we must convert! */ 142 /* The ucontext contains a stack32_t, so we must convert! */
142 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp)) 143 if (__get_user(sp, &frame->rs_uc.uc_stack.ss_sp))
143 goto badframe; 144 goto badframe;
144 st.ss_sp = (void *)(long) sp; 145 st.ss_sp = (void __user *)(long) sp;
145 if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size)) 146 if (__get_user(st.ss_size, &frame->rs_uc.uc_stack.ss_size))
146 goto badframe; 147 goto badframe;
147 if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags)) 148 if (__get_user(st.ss_flags, &frame->rs_uc.uc_stack.ss_flags))
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 06ed90752424..78d171bfa331 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -167,8 +167,8 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
167 mb(); 167 mb();
168 168
169 /* Send a message to all other CPUs and wait for them to respond */ 169 /* Send a message to all other CPUs and wait for them to respond */
170 for (i = 0; i < NR_CPUS; i++) 170 for_each_online_cpu(i)
171 if (cpu_online(i) && i != cpu) 171 if (i != cpu)
172 core_send_ipi(i, SMP_CALL_FUNCTION); 172 core_send_ipi(i, SMP_CALL_FUNCTION);
173 173
174 /* Wait for response */ 174 /* Wait for response */
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 1da2eeb3ef9e..2aeaa2fd4b32 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -162,7 +162,10 @@ asmlinkage unsigned long
162sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, 162sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
163 unsigned long flags, unsigned long fd, unsigned long pgoff) 163 unsigned long flags, unsigned long fd, unsigned long pgoff)
164{ 164{
165 return do_mmap2(addr, len, prot, flags, fd, pgoff); 165 if (pgoff & (~PAGE_MASK >> 12))
166 return -EINVAL;
167
168 return do_mmap2(addr, len, prot, flags, fd, pgoff >> (PAGE_SHIFT-12));
166} 169}
167 170
168save_static_function(sys_fork); 171save_static_function(sys_fork);
@@ -345,7 +348,7 @@ asmlinkage int sys_ipc (uint call, int first, int second,
345 union semun fourth; 348 union semun fourth;
346 if (!ptr) 349 if (!ptr)
347 return -EINVAL; 350 return -EINVAL;
348 if (get_user(fourth.__pad, (void *__user *) ptr)) 351 if (get_user(fourth.__pad, (void __user *__user *) ptr))
349 return -EFAULT; 352 return -EFAULT;
350 return sys_semctl (first, second, third, fourth); 353 return sys_semctl (first, second, third, fourth);
351 } 354 }
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 0fc3730a294f..5407b784cd01 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -645,27 +645,7 @@ static inline void getitimer_real(struct itimerval *value)
645 645
646asmlinkage unsigned int irix_alarm(unsigned int seconds) 646asmlinkage unsigned int irix_alarm(unsigned int seconds)
647{ 647{
648 struct itimerval it_new, it_old; 648 return alarm_setitimer(seconds);
649 unsigned int oldalarm;
650
651 if (!seconds) {
652 getitimer_real(&it_old);
653 del_timer(&current->real_timer);
654 } else {
655 it_new.it_interval.tv_sec = it_new.it_interval.tv_usec = 0;
656 it_new.it_value.tv_sec = seconds;
657 it_new.it_value.tv_usec = 0;
658 do_setitimer(ITIMER_REAL, &it_new, &it_old);
659 }
660 oldalarm = it_old.it_value.tv_sec;
661 /*
662 * ehhh.. We can't return 0 if we have an alarm pending ...
663 * And we'd better return too much than too little anyway
664 */
665 if (it_old.it_value.tv_usec)
666 oldalarm++;
667
668 return oldalarm;
669} 649}
670 650
671asmlinkage int irix_pause(void) 651asmlinkage int irix_pause(void)
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 42c94c771afb..5e51a2d8f3f0 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -65,9 +65,9 @@ static int null_rtc_set_time(unsigned long sec)
65 return 0; 65 return 0;
66} 66}
67 67
68unsigned long (*rtc_get_time)(void) = null_rtc_get_time; 68unsigned long (*rtc_mips_get_time)(void) = null_rtc_get_time;
69int (*rtc_set_time)(unsigned long) = null_rtc_set_time; 69int (*rtc_mips_set_time)(unsigned long) = null_rtc_set_time;
70int (*rtc_set_mmss)(unsigned long); 70int (*rtc_mips_set_mmss)(unsigned long);
71 71
72 72
73/* usecs per counter cycle, shifted to left by 32 bits */ 73/* usecs per counter cycle, shifted to left by 32 bits */
@@ -424,6 +424,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
424 unsigned long j; 424 unsigned long j;
425 unsigned int count; 425 unsigned int count;
426 426
427 write_seqlock(&xtime_lock);
428
427 count = mips_hpt_read(); 429 count = mips_hpt_read();
428 mips_timer_ack(); 430 mips_timer_ack();
429 431
@@ -438,22 +440,20 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
438 440
439 /* 441 /*
440 * If we have an externally synchronized Linux clock, then update 442 * If we have an externally synchronized Linux clock, then update
441 * CMOS clock accordingly every ~11 minutes. rtc_set_time() has to be 443 * CMOS clock accordingly every ~11 minutes. rtc_mips_set_time() has to be
442 * called as close as possible to 500 ms before the new second starts. 444 * called as close as possible to 500 ms before the new second starts.
443 */ 445 */
444 write_seqlock(&xtime_lock);
445 if (ntp_synced() && 446 if (ntp_synced() &&
446 xtime.tv_sec > last_rtc_update + 660 && 447 xtime.tv_sec > last_rtc_update + 660 &&
447 (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 && 448 (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
448 (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) { 449 (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
449 if (rtc_set_mmss(xtime.tv_sec) == 0) { 450 if (rtc_mips_set_mmss(xtime.tv_sec) == 0) {
450 last_rtc_update = xtime.tv_sec; 451 last_rtc_update = xtime.tv_sec;
451 } else { 452 } else {
452 /* do it again in 60 s */ 453 /* do it again in 60 s */
453 last_rtc_update = xtime.tv_sec - 600; 454 last_rtc_update = xtime.tv_sec - 600;
454 } 455 }
455 } 456 }
456 write_sequnlock(&xtime_lock);
457 457
458 /* 458 /*
459 * If jiffies has overflown in this timer_interrupt, we must 459 * If jiffies has overflown in this timer_interrupt, we must
@@ -496,6 +496,8 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
496 } 496 }
497 } 497 }
498 498
499 write_sequnlock(&xtime_lock);
500
499 /* 501 /*
500 * In UP mode, we call local_timer_interrupt() to do profiling 502 * In UP mode, we call local_timer_interrupt() to do profiling
501 * and process accouting. 503 * and process accouting.
@@ -563,7 +565,7 @@ asmlinkage void ll_local_timer_interrupt(int irq, struct pt_regs *regs)
563 * b) (optional) calibrate and set the mips_hpt_frequency 565 * b) (optional) calibrate and set the mips_hpt_frequency
564 * (only needed if you intended to use fixed_rate_gettimeoffset 566 * (only needed if you intended to use fixed_rate_gettimeoffset
565 * or use cpu counter as timer interrupt source) 567 * or use cpu counter as timer interrupt source)
566 * 2) setup xtime based on rtc_get_time(). 568 * 2) setup xtime based on rtc_mips_get_time().
567 * 3) choose a appropriate gettimeoffset routine. 569 * 3) choose a appropriate gettimeoffset routine.
568 * 4) calculate a couple of cached variables for later usage 570 * 4) calculate a couple of cached variables for later usage
569 * 5) board_timer_setup() - 571 * 5) board_timer_setup() -
@@ -631,10 +633,10 @@ void __init time_init(void)
631 if (board_time_init) 633 if (board_time_init)
632 board_time_init(); 634 board_time_init();
633 635
634 if (!rtc_set_mmss) 636 if (!rtc_mips_set_mmss)
635 rtc_set_mmss = rtc_set_time; 637 rtc_mips_set_mmss = rtc_mips_set_time;
636 638
637 xtime.tv_sec = rtc_get_time(); 639 xtime.tv_sec = rtc_mips_get_time();
638 xtime.tv_nsec = 0; 640 xtime.tv_nsec = 0;
639 641
640 set_normalized_timespec(&wall_to_monotonic, 642 set_normalized_timespec(&wall_to_monotonic,
@@ -770,8 +772,8 @@ void to_tm(unsigned long tim, struct rtc_time *tm)
770 772
771EXPORT_SYMBOL(rtc_lock); 773EXPORT_SYMBOL(rtc_lock);
772EXPORT_SYMBOL(to_tm); 774EXPORT_SYMBOL(to_tm);
773EXPORT_SYMBOL(rtc_set_time); 775EXPORT_SYMBOL(rtc_mips_set_time);
774EXPORT_SYMBOL(rtc_get_time); 776EXPORT_SYMBOL(rtc_mips_get_time);
775 777
776unsigned long long sched_clock(void) 778unsigned long long sched_clock(void)
777{ 779{
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 005debbfbe84..bed0eb6cf55d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -576,7 +576,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
576 } 576 }
577#endif 577#endif
578 /* 578 /*
579 * Unimplemented operation exception. If we've got the full 579 * Unimplemented operation exception. If we've got the full
580 * software emulator on-board, let's use it... 580 * software emulator on-board, let's use it...
581 * 581 *
582 * Force FPU to dump state into task/thread context. We're 582 * Force FPU to dump state into task/thread context. We're
diff --git a/arch/mips/lasat/image/romscript.normal b/arch/mips/lasat/image/romscript.normal
index ca22336f6c36..988f8ad189cb 100644
--- a/arch/mips/lasat/image/romscript.normal
+++ b/arch/mips/lasat/image/romscript.normal
@@ -16,7 +16,8 @@ SECTIONS
16 _image_start = ADDR(.data); 16 _image_start = ADDR(.data);
17 _image_size = SIZEOF(.data); 17 _image_size = SIZEOF(.data);
18 18
19 .other : { 19 .other :
20 *(.*) 20 {
21 *(.*)
21 } 22 }
22} 23}
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
index 83eb08b7a072..bb70a8240e61 100644
--- a/arch/mips/lasat/setup.c
+++ b/arch/mips/lasat/setup.c
@@ -165,7 +165,8 @@ void __init plat_setup(void)
165 165
166 /* Set up panic notifier */ 166 /* Set up panic notifier */
167 for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++) 167 for (i = 0; i < sizeof(lasat_panic_block) / sizeof(struct notifier_block); i++)
168 notifier_chain_register(&panic_notifier_list, &lasat_panic_block[i]); 168 atomic_notifier_chain_register(&panic_notifier_list,
169 &lasat_panic_block[i]);
169 170
170 lasat_reboot_setup(); 171 lasat_reboot_setup();
171 172
@@ -174,8 +175,8 @@ void __init plat_setup(void)
174 175
175#ifdef CONFIG_DS1603 176#ifdef CONFIG_DS1603
176 ds1603 = &ds_defs[mips_machtype]; 177 ds1603 = &ds_defs[mips_machtype];
177 rtc_get_time = ds1603_read; 178 rtc_mips_get_time = ds1603_read;
178 rtc_set_time = ds1603_set; 179 rtc_mips_set_time = ds1603_set;
179#endif 180#endif
180 181
181#ifdef DYNAMIC_SERIAL_INIT 182#ifdef DYNAMIC_SERIAL_INIT
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 8ff43a1c1e99..e3d5aaa90f0d 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -30,12 +30,13 @@
30#include <linux/string.h> 30#include <linux/string.h>
31#include <linux/net.h> 31#include <linux/net.h>
32#include <linux/inet.h> 32#include <linux/inet.h>
33#include <linux/mutex.h>
33#include <asm/uaccess.h> 34#include <asm/uaccess.h>
34 35
35#include "sysctl.h" 36#include "sysctl.h"
36#include "ds1603.h" 37#include "ds1603.h"
37 38
38static DECLARE_MUTEX(lasat_info_sem); 39static DEFINE_MUTEX(lasat_info_mutex);
39 40
40/* Strategy function to write EEPROM after changing string entry */ 41/* Strategy function to write EEPROM after changing string entry */
41int sysctl_lasatstring(ctl_table *table, int *name, int nlen, 42int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
@@ -43,17 +44,17 @@ int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
43 void *newval, size_t newlen, void **context) 44 void *newval, size_t newlen, void **context)
44{ 45{
45 int r; 46 int r;
46 down(&lasat_info_sem); 47 mutex_lock(&lasat_info_mutex);
47 r = sysctl_string(table, name, 48 r = sysctl_string(table, name,
48 nlen, oldval, oldlenp, newval, newlen, context); 49 nlen, oldval, oldlenp, newval, newlen, context);
49 if (r < 0) { 50 if (r < 0) {
50 up(&lasat_info_sem); 51 mutex_unlock(&lasat_info_mutex);
51 return r; 52 return r;
52 } 53 }
53 if (newval && newlen) { 54 if (newval && newlen) {
54 lasat_write_eeprom_info(); 55 lasat_write_eeprom_info();
55 } 56 }
56 up(&lasat_info_sem); 57 mutex_unlock(&lasat_info_mutex);
57 return 1; 58 return 1;
58} 59}
59 60
@@ -63,14 +64,14 @@ int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
63 void *buffer, size_t *lenp, loff_t *ppos) 64 void *buffer, size_t *lenp, loff_t *ppos)
64{ 65{
65 int r; 66 int r;
66 down(&lasat_info_sem); 67 mutex_lock(&lasat_info_mutex);
67 r = proc_dostring(table, write, filp, buffer, lenp, ppos); 68 r = proc_dostring(table, write, filp, buffer, lenp, ppos);
68 if ( (!write) || r) { 69 if ( (!write) || r) {
69 up(&lasat_info_sem); 70 mutex_unlock(&lasat_info_mutex);
70 return r; 71 return r;
71 } 72 }
72 lasat_write_eeprom_info(); 73 lasat_write_eeprom_info();
73 up(&lasat_info_sem); 74 mutex_unlock(&lasat_info_mutex);
74 return 0; 75 return 0;
75} 76}
76 77
@@ -79,14 +80,14 @@ int proc_dolasatint(ctl_table *table, int write, struct file *filp,
79 void *buffer, size_t *lenp, loff_t *ppos) 80 void *buffer, size_t *lenp, loff_t *ppos)
80{ 81{
81 int r; 82 int r;
82 down(&lasat_info_sem); 83 mutex_lock(&lasat_info_mutex);
83 r = proc_dointvec(table, write, filp, buffer, lenp, ppos); 84 r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
84 if ( (!write) || r) { 85 if ( (!write) || r) {
85 up(&lasat_info_sem); 86 mutex_unlock(&lasat_info_mutex);
86 return r; 87 return r;
87 } 88 }
88 lasat_write_eeprom_info(); 89 lasat_write_eeprom_info();
89 up(&lasat_info_sem); 90 mutex_unlock(&lasat_info_mutex);
90 return 0; 91 return 0;
91} 92}
92 93
@@ -98,7 +99,7 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
98 void *buffer, size_t *lenp, loff_t *ppos) 99 void *buffer, size_t *lenp, loff_t *ppos)
99{ 100{
100 int r; 101 int r;
101 down(&lasat_info_sem); 102 mutex_lock(&lasat_info_mutex);
102 if (!write) { 103 if (!write) {
103 rtctmp = ds1603_read(); 104 rtctmp = ds1603_read();
104 /* check for time < 0 and set to 0 */ 105 /* check for time < 0 and set to 0 */
@@ -107,11 +108,11 @@ int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
107 } 108 }
108 r = proc_dointvec(table, write, filp, buffer, lenp, ppos); 109 r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
109 if ( (!write) || r) { 110 if ( (!write) || r) {
110 up(&lasat_info_sem); 111 mutex_unlock(&lasat_info_mutex);
111 return r; 112 return r;
112 } 113 }
113 ds1603_set(rtctmp); 114 ds1603_set(rtctmp);
114 up(&lasat_info_sem); 115 mutex_unlock(&lasat_info_mutex);
115 return 0; 116 return 0;
116} 117}
117#endif 118#endif
@@ -122,16 +123,16 @@ int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
122 void *newval, size_t newlen, void **context) 123 void *newval, size_t newlen, void **context)
123{ 124{
124 int r; 125 int r;
125 down(&lasat_info_sem); 126 mutex_lock(&lasat_info_mutex);
126 r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context); 127 r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
127 if (r < 0) { 128 if (r < 0) {
128 up(&lasat_info_sem); 129 mutex_unlock(&lasat_info_mutex);
129 return r; 130 return r;
130 } 131 }
131 if (newval && newlen) { 132 if (newval && newlen) {
132 lasat_write_eeprom_info(); 133 lasat_write_eeprom_info();
133 } 134 }
134 up(&lasat_info_sem); 135 mutex_unlock(&lasat_info_mutex);
135 return 1; 136 return 1;
136} 137}
137 138
@@ -142,19 +143,19 @@ int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
142 void *newval, size_t newlen, void **context) 143 void *newval, size_t newlen, void **context)
143{ 144{
144 int r; 145 int r;
145 down(&lasat_info_sem); 146 mutex_lock(&lasat_info_mutex);
146 rtctmp = ds1603_read(); 147 rtctmp = ds1603_read();
147 if (rtctmp < 0) 148 if (rtctmp < 0)
148 rtctmp = 0; 149 rtctmp = 0;
149 r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context); 150 r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
150 if (r < 0) { 151 if (r < 0) {
151 up(&lasat_info_sem); 152 mutex_unlock(&lasat_info_mutex);
152 return r; 153 return r;
153 } 154 }
154 if (newval && newlen) { 155 if (newval && newlen) {
155 ds1603_set(rtctmp); 156 ds1603_set(rtctmp);
156 } 157 }
157 up(&lasat_info_sem); 158 mutex_unlock(&lasat_info_mutex);
158 return 1; 159 return 1;
159} 160}
160#endif 161#endif
@@ -192,13 +193,13 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
192 return 0; 193 return 0;
193 } 194 }
194 195
195 down(&lasat_info_sem); 196 mutex_lock(&lasat_info_mutex);
196 if (write) { 197 if (write) {
197 len = 0; 198 len = 0;
198 p = buffer; 199 p = buffer;
199 while (len < *lenp) { 200 while (len < *lenp) {
200 if(get_user(c, p++)) { 201 if(get_user(c, p++)) {
201 up(&lasat_info_sem); 202 mutex_unlock(&lasat_info_mutex);
202 return -EFAULT; 203 return -EFAULT;
203 } 204 }
204 if (c == 0 || c == '\n') 205 if (c == 0 || c == '\n')
@@ -209,7 +210,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
209 len = sizeof(proc_lasat_ipbuf) - 1; 210 len = sizeof(proc_lasat_ipbuf) - 1;
210 if (copy_from_user(proc_lasat_ipbuf, buffer, len)) 211 if (copy_from_user(proc_lasat_ipbuf, buffer, len))
211 { 212 {
212 up(&lasat_info_sem); 213 mutex_unlock(&lasat_info_mutex);
213 return -EFAULT; 214 return -EFAULT;
214 } 215 }
215 proc_lasat_ipbuf[len] = 0; 216 proc_lasat_ipbuf[len] = 0;
@@ -230,12 +231,12 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
230 len = *lenp; 231 len = *lenp;
231 if (len) 232 if (len)
232 if(copy_to_user(buffer, proc_lasat_ipbuf, len)) { 233 if(copy_to_user(buffer, proc_lasat_ipbuf, len)) {
233 up(&lasat_info_sem); 234 mutex_unlock(&lasat_info_mutex);
234 return -EFAULT; 235 return -EFAULT;
235 } 236 }
236 if (len < *lenp) { 237 if (len < *lenp) {
237 if(put_user('\n', ((char *) buffer) + len)) { 238 if(put_user('\n', ((char *) buffer) + len)) {
238 up(&lasat_info_sem); 239 mutex_unlock(&lasat_info_mutex);
239 return -EFAULT; 240 return -EFAULT;
240 } 241 }
241 len++; 242 len++;
@@ -244,7 +245,7 @@ int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
244 *ppos += len; 245 *ppos += len;
245 } 246 }
246 update_bcastaddr(); 247 update_bcastaddr();
247 up(&lasat_info_sem); 248 mutex_unlock(&lasat_info_mutex);
248 return 0; 249 return 0;
249} 250}
250#endif /* defined(CONFIG_INET) */ 251#endif /* defined(CONFIG_INET) */
@@ -256,10 +257,10 @@ static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
256{ 257{
257 int r; 258 int r;
258 259
259 down(&lasat_info_sem); 260 mutex_lock(&lasat_info_mutex);
260 r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context); 261 r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen, context);
261 if (r < 0) { 262 if (r < 0) {
262 up(&lasat_info_sem); 263 mutex_unlock(&lasat_info_mutex);
263 return r; 264 return r;
264 } 265 }
265 266
@@ -271,7 +272,7 @@ static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
271 lasat_write_eeprom_info(); 272 lasat_write_eeprom_info();
272 lasat_init_board_info(); 273 lasat_init_board_info();
273 } 274 }
274 up(&lasat_info_sem); 275 mutex_unlock(&lasat_info_mutex);
275 276
276 return 0; 277 return 0;
277} 278}
@@ -280,10 +281,10 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
280 void *buffer, size_t *lenp, loff_t *ppos) 281 void *buffer, size_t *lenp, loff_t *ppos)
281{ 282{
282 int r; 283 int r;
283 down(&lasat_info_sem); 284 mutex_lock(&lasat_info_mutex);
284 r = proc_dointvec(table, write, filp, buffer, lenp, ppos); 285 r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
285 if ( (!write) || r) { 286 if ( (!write) || r) {
286 up(&lasat_info_sem); 287 mutex_unlock(&lasat_info_mutex);
287 return r; 288 return r;
288 } 289 }
289 if (filp && filp->f_dentry) 290 if (filp && filp->f_dentry)
@@ -294,7 +295,7 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
294 lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess; 295 lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
295 } 296 }
296 lasat_write_eeprom_info(); 297 lasat_write_eeprom_info();
297 up(&lasat_info_sem); 298 mutex_unlock(&lasat_info_mutex);
298 return 0; 299 return 0;
299} 300}
300 301
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index 873cf3141a31..c20d401ecf80 100644
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -65,7 +65,7 @@ void __init plat_setup(void)
65 65
66 board_time_init = mips_time_init; 66 board_time_init = mips_time_init;
67 board_timer_setup = mips_timer_setup; 67 board_timer_setup = mips_timer_setup;
68 rtc_get_time = mips_rtc_get_time; 68 rtc_mips_get_time = mips_rtc_get_time;
69} 69}
70 70
71static void __init serial_init(void) 71static void __init serial_init(void)
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index 2c8afd77a20b..32c9210373ac 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -49,9 +49,6 @@ static char *mtypes[3] = {
49/* References to section boundaries */ 49/* References to section boundaries */
50extern char _end; 50extern char _end;
51 51
52#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
53
54
55struct prom_pmemblock * __init prom_getmdesc(void) 52struct prom_pmemblock * __init prom_getmdesc(void)
56{ 53{
57 char *memsize_str; 54 char *memsize_str;
@@ -109,10 +106,10 @@ struct prom_pmemblock * __init prom_getmdesc(void)
109 106
110 mdesc[3].type = yamon_dontuse; 107 mdesc[3].type = yamon_dontuse;
111 mdesc[3].base = 0x00100000; 108 mdesc[3].base = 0x00100000;
112 mdesc[3].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[3].base; 109 mdesc[3].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[3].base;
113 110
114 mdesc[4].type = yamon_free; 111 mdesc[4].type = yamon_free;
115 mdesc[4].base = CPHYSADDR(PFN_ALIGN(&_end)); 112 mdesc[4].base = CPHYSADDR(PAGE_ALIGN(&_end));
116 mdesc[4].size = memsize - mdesc[4].base; 113 mdesc[4].size = memsize - mdesc[4].base;
117 114
118 return &mdesc[0]; 115 return &mdesc[0];
@@ -174,7 +171,7 @@ unsigned long __init prom_free_prom_memory(void)
174 while (addr < boot_mem_map.map[i].addr 171 while (addr < boot_mem_map.map[i].addr
175 + boot_mem_map.map[i].size) { 172 + boot_mem_map.map[i].size) {
176 ClearPageReserved(virt_to_page(__va(addr))); 173 ClearPageReserved(virt_to_page(__va(addr)));
177 set_page_count(virt_to_page(__va(addr)), 1); 174 init_page_count(virt_to_page(__va(addr)));
178 free_page((unsigned long)__va(addr)); 175 free_page((unsigned long)__va(addr));
179 addr += PAGE_SIZE; 176 addr += PAGE_SIZE;
180 freed += PAGE_SIZE; 177 freed += PAGE_SIZE;
diff --git a/arch/mips/mips-boards/generic/mipsIRQ.S b/arch/mips/mips-boards/generic/mipsIRQ.S
index a397ecb872d6..ddd5c73a2971 100644
--- a/arch/mips/mips-boards/generic/mipsIRQ.S
+++ b/arch/mips/mips-boards/generic/mipsIRQ.S
@@ -98,7 +98,7 @@
98 and s0, s1 98 and s0, s1
99 99
100#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) 100#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
101 .set mips32 101 .set mips32
102 clz a0, s0 102 clz a0, s0
103 .set mips0 103 .set mips0
104 negu a0 104 negu a0
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 2209e8a9de34..b8488aab6df1 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -225,5 +225,5 @@ void __init plat_setup(void)
225 225
226 board_time_init = mips_time_init; 226 board_time_init = mips_time_init;
227 board_timer_setup = mips_timer_setup; 227 board_timer_setup = mips_timer_setup;
228 rtc_get_time = mips_rtc_get_time; 228 rtc_mips_get_time = mips_rtc_get_time;
229} 229}
diff --git a/arch/mips/mips-boards/sim/sim_IRQ.c b/arch/mips/mips-boards/sim/sim_IRQ.c
index 9987a85aabeb..5b84c7fe1022 100644
--- a/arch/mips/mips-boards/sim/sim_IRQ.c
+++ b/arch/mips/mips-boards/sim/sim_IRQ.c
@@ -96,7 +96,7 @@
96 andi a0, s0, CAUSEF_IP3 # delay slot, check hw1 interrupt 96 andi a0, s0, CAUSEF_IP3 # delay slot, check hw1 interrupt
97#else 97#else
98 beq a0, zero, 1f # delay slot, check hw3 interrupt 98 beq a0, zero, 1f # delay slot, check hw3 interrupt
99 andi a0, s0, CAUSEF_IP5 99 andi a0, s0, CAUSEF_IP5
100#endif 100#endif
101 101
102 /* Wheee, combined hardware level zero interrupt. */ 102 /* Wheee, combined hardware level zero interrupt. */
diff --git a/arch/mips/mips-boards/sim/sim_irq.S b/arch/mips/mips-boards/sim/sim_irq.S
index 835f0387fcd4..da52297a2216 100644
--- a/arch/mips/mips-boards/sim/sim_irq.S
+++ b/arch/mips/mips-boards/sim/sim_irq.S
@@ -42,7 +42,7 @@
42 and s0, s1 42 and s0, s1
43 43
44#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) 44#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
45 .set mips32 45 .set mips32
46 clz a0, s0 46 clz a0, s0
47 .set mips0 47 .set mips0
48 negu a0 48 negu a0
diff --git a/arch/mips/mips-boards/sim/sim_mem.c b/arch/mips/mips-boards/sim/sim_mem.c
index 0dbd7435bb2a..e57f737bab10 100644
--- a/arch/mips/mips-boards/sim/sim_mem.c
+++ b/arch/mips/mips-boards/sim/sim_mem.c
@@ -42,9 +42,6 @@ static char *mtypes[3] = {
42/* References to section boundaries */ 42/* References to section boundaries */
43extern char _end; 43extern char _end;
44 44
45#define PFN_ALIGN(x) (((unsigned long)(x) + (PAGE_SIZE - 1)) & PAGE_MASK)
46
47
48struct prom_pmemblock * __init prom_getmdesc(void) 45struct prom_pmemblock * __init prom_getmdesc(void)
49{ 46{
50 unsigned int memsize; 47 unsigned int memsize;
@@ -64,10 +61,10 @@ struct prom_pmemblock * __init prom_getmdesc(void)
64 61
65 mdesc[2].type = simmem_reserved; 62 mdesc[2].type = simmem_reserved;
66 mdesc[2].base = 0x00100000; 63 mdesc[2].base = 0x00100000;
67 mdesc[2].size = CPHYSADDR(PFN_ALIGN(&_end)) - mdesc[2].base; 64 mdesc[2].size = CPHYSADDR(PAGE_ALIGN(&_end)) - mdesc[2].base;
68 65
69 mdesc[3].type = simmem_free; 66 mdesc[3].type = simmem_free;
70 mdesc[3].base = CPHYSADDR(PFN_ALIGN(&_end)); 67 mdesc[3].base = CPHYSADDR(PAGE_ALIGN(&_end));
71 mdesc[3].size = memsize - mdesc[3].base; 68 mdesc[3].size = memsize - mdesc[3].base;
72 69
73 return &mdesc[0]; 70 return &mdesc[0];
@@ -117,7 +114,7 @@ unsigned long __init prom_free_prom_memory(void)
117 while (addr < boot_mem_map.map[i].addr 114 while (addr < boot_mem_map.map[i].addr
118 + boot_mem_map.map[i].size) { 115 + boot_mem_map.map[i].size) {
119 ClearPageReserved(virt_to_page(__va(addr))); 116 ClearPageReserved(virt_to_page(__va(addr)));
120 set_page_count(virt_to_page(__va(addr)), 1); 117 init_page_count(virt_to_page(__va(addr)));
121 free_page((unsigned long)__va(addr)); 118 free_page((unsigned long)__va(addr));
122 addr += PAGE_SIZE; 119 addr += PAGE_SIZE;
123 freed += PAGE_SIZE; 120 freed += PAGE_SIZE;
diff --git a/arch/mips/mips-boards/sim/sim_smp.c b/arch/mips/mips-boards/sim/sim_smp.c
index 19824359f5de..a9f0c2bfe4ad 100644
--- a/arch/mips/mips-boards/sim/sim_smp.c
+++ b/arch/mips/mips-boards/sim/sim_smp.c
@@ -115,7 +115,7 @@ void prom_prepare_cpus(unsigned int max_cpus)
115#ifdef CONFIG_MIPS_MT_SMTC 115#ifdef CONFIG_MIPS_MT_SMTC
116 void mipsmt_prepare_cpus(int c); 116 void mipsmt_prepare_cpus(int c);
117 /* 117 /*
118 * As noted above, we can assume a single CPU for now 118 * As noted above, we can assume a single CPU for now
119 * but it may be multithreaded. 119 * but it may be multithreaded.
120 */ 120 */
121 121
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index b0178da019f0..4a6220116c96 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -12,7 +12,7 @@ obj-$(CONFIG_HIGHMEM) += highmem.o
12obj-$(CONFIG_CPU_MIPS32) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o 12obj-$(CONFIG_CPU_MIPS32) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
13obj-$(CONFIG_CPU_MIPS64) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o 13obj-$(CONFIG_CPU_MIPS64) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
14obj-$(CONFIG_CPU_NEVADA) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o 14obj-$(CONFIG_CPU_NEVADA) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
15obj-$(CONFIG_CPU_R10000) += c-r4k.o cex-gen.o pg-r4k.o tlb-andes.o 15obj-$(CONFIG_CPU_R10000) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
16obj-$(CONFIG_CPU_R3000) += c-r3k.o tlb-r3k.o pg-r4k.o 16obj-$(CONFIG_CPU_R3000) += c-r3k.o tlb-r3k.o pg-r4k.o
17obj-$(CONFIG_CPU_R4300) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o 17obj-$(CONFIG_CPU_R4300) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
18obj-$(CONFIG_CPU_R4X00) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o 18obj-$(CONFIG_CPU_R4X00) += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c
index 27f4fa25e8c9..9dd1352d5748 100644
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
@@ -129,7 +129,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end)
129 "sb\t$0, 0x014(%0)\n\t" 129 "sb\t$0, 0x014(%0)\n\t"
130 "sb\t$0, 0x018(%0)\n\t" 130 "sb\t$0, 0x018(%0)\n\t"
131 "sb\t$0, 0x01c(%0)\n\t" 131 "sb\t$0, 0x01c(%0)\n\t"
132 "sb\t$0, 0x020(%0)\n\t" 132 "sb\t$0, 0x020(%0)\n\t"
133 "sb\t$0, 0x024(%0)\n\t" 133 "sb\t$0, 0x024(%0)\n\t"
134 "sb\t$0, 0x028(%0)\n\t" 134 "sb\t$0, 0x028(%0)\n\t"
135 "sb\t$0, 0x02c(%0)\n\t" 135 "sb\t$0, 0x02c(%0)\n\t"
@@ -145,7 +145,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end)
145 "sb\t$0, 0x054(%0)\n\t" 145 "sb\t$0, 0x054(%0)\n\t"
146 "sb\t$0, 0x058(%0)\n\t" 146 "sb\t$0, 0x058(%0)\n\t"
147 "sb\t$0, 0x05c(%0)\n\t" 147 "sb\t$0, 0x05c(%0)\n\t"
148 "sb\t$0, 0x060(%0)\n\t" 148 "sb\t$0, 0x060(%0)\n\t"
149 "sb\t$0, 0x064(%0)\n\t" 149 "sb\t$0, 0x064(%0)\n\t"
150 "sb\t$0, 0x068(%0)\n\t" 150 "sb\t$0, 0x068(%0)\n\t"
151 "sb\t$0, 0x06c(%0)\n\t" 151 "sb\t$0, 0x06c(%0)\n\t"
@@ -182,31 +182,31 @@ static void r3k_flush_dcache_range(unsigned long start, unsigned long end)
182 "sb\t$0, 0x004(%0)\n\t" 182 "sb\t$0, 0x004(%0)\n\t"
183 "sb\t$0, 0x008(%0)\n\t" 183 "sb\t$0, 0x008(%0)\n\t"
184 "sb\t$0, 0x00c(%0)\n\t" 184 "sb\t$0, 0x00c(%0)\n\t"
185 "sb\t$0, 0x010(%0)\n\t" 185 "sb\t$0, 0x010(%0)\n\t"
186 "sb\t$0, 0x014(%0)\n\t" 186 "sb\t$0, 0x014(%0)\n\t"
187 "sb\t$0, 0x018(%0)\n\t" 187 "sb\t$0, 0x018(%0)\n\t"
188 "sb\t$0, 0x01c(%0)\n\t" 188 "sb\t$0, 0x01c(%0)\n\t"
189 "sb\t$0, 0x020(%0)\n\t" 189 "sb\t$0, 0x020(%0)\n\t"
190 "sb\t$0, 0x024(%0)\n\t" 190 "sb\t$0, 0x024(%0)\n\t"
191 "sb\t$0, 0x028(%0)\n\t" 191 "sb\t$0, 0x028(%0)\n\t"
192 "sb\t$0, 0x02c(%0)\n\t" 192 "sb\t$0, 0x02c(%0)\n\t"
193 "sb\t$0, 0x030(%0)\n\t" 193 "sb\t$0, 0x030(%0)\n\t"
194 "sb\t$0, 0x034(%0)\n\t" 194 "sb\t$0, 0x034(%0)\n\t"
195 "sb\t$0, 0x038(%0)\n\t" 195 "sb\t$0, 0x038(%0)\n\t"
196 "sb\t$0, 0x03c(%0)\n\t" 196 "sb\t$0, 0x03c(%0)\n\t"
197 "sb\t$0, 0x040(%0)\n\t" 197 "sb\t$0, 0x040(%0)\n\t"
198 "sb\t$0, 0x044(%0)\n\t" 198 "sb\t$0, 0x044(%0)\n\t"
199 "sb\t$0, 0x048(%0)\n\t" 199 "sb\t$0, 0x048(%0)\n\t"
200 "sb\t$0, 0x04c(%0)\n\t" 200 "sb\t$0, 0x04c(%0)\n\t"
201 "sb\t$0, 0x050(%0)\n\t" 201 "sb\t$0, 0x050(%0)\n\t"
202 "sb\t$0, 0x054(%0)\n\t" 202 "sb\t$0, 0x054(%0)\n\t"
203 "sb\t$0, 0x058(%0)\n\t" 203 "sb\t$0, 0x058(%0)\n\t"
204 "sb\t$0, 0x05c(%0)\n\t" 204 "sb\t$0, 0x05c(%0)\n\t"
205 "sb\t$0, 0x060(%0)\n\t" 205 "sb\t$0, 0x060(%0)\n\t"
206 "sb\t$0, 0x064(%0)\n\t" 206 "sb\t$0, 0x064(%0)\n\t"
207 "sb\t$0, 0x068(%0)\n\t" 207 "sb\t$0, 0x068(%0)\n\t"
208 "sb\t$0, 0x06c(%0)\n\t" 208 "sb\t$0, 0x06c(%0)\n\t"
209 "sb\t$0, 0x070(%0)\n\t" 209 "sb\t$0, 0x070(%0)\n\t"
210 "sb\t$0, 0x074(%0)\n\t" 210 "sb\t$0, 0x074(%0)\n\t"
211 "sb\t$0, 0x078(%0)\n\t" 211 "sb\t$0, 0x078(%0)\n\t"
212 "sb\t$0, 0x07c(%0)\n\t" 212 "sb\t$0, 0x07c(%0)\n\t"
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 0668e9bfce41..32b7f6aeb983 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -375,6 +375,7 @@ static void r4k_flush_cache_mm(struct mm_struct *mm)
375struct flush_cache_page_args { 375struct flush_cache_page_args {
376 struct vm_area_struct *vma; 376 struct vm_area_struct *vma;
377 unsigned long addr; 377 unsigned long addr;
378 unsigned long pfn;
378}; 379};
379 380
380static inline void local_r4k_flush_cache_page(void *args) 381static inline void local_r4k_flush_cache_page(void *args)
@@ -382,6 +383,7 @@ static inline void local_r4k_flush_cache_page(void *args)
382 struct flush_cache_page_args *fcp_args = args; 383 struct flush_cache_page_args *fcp_args = args;
383 struct vm_area_struct *vma = fcp_args->vma; 384 struct vm_area_struct *vma = fcp_args->vma;
384 unsigned long addr = fcp_args->addr; 385 unsigned long addr = fcp_args->addr;
386 unsigned long paddr = fcp_args->pfn << PAGE_SHIFT;
385 int exec = vma->vm_flags & VM_EXEC; 387 int exec = vma->vm_flags & VM_EXEC;
386 struct mm_struct *mm = vma->vm_mm; 388 struct mm_struct *mm = vma->vm_mm;
387 pgd_t *pgdp; 389 pgd_t *pgdp;
@@ -431,11 +433,12 @@ static inline void local_r4k_flush_cache_page(void *args)
431 * Do indexed flush, too much work to get the (possible) TLB refills 433 * Do indexed flush, too much work to get the (possible) TLB refills
432 * to work correctly. 434 * to work correctly.
433 */ 435 */
434 addr = INDEX_BASE + (addr & (dcache_size - 1));
435 if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) { 436 if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) {
436 r4k_blast_dcache_page_indexed(addr); 437 r4k_blast_dcache_page_indexed(cpu_has_pindexed_dcache ?
437 if (exec && !cpu_icache_snoops_remote_store) 438 paddr : addr);
438 r4k_blast_scache_page_indexed(addr); 439 if (exec && !cpu_icache_snoops_remote_store) {
440 r4k_blast_scache_page_indexed(paddr);
441 }
439 } 442 }
440 if (exec) { 443 if (exec) {
441 if (cpu_has_vtag_icache) { 444 if (cpu_has_vtag_icache) {
@@ -455,6 +458,7 @@ static void r4k_flush_cache_page(struct vm_area_struct *vma,
455 458
456 args.vma = vma; 459 args.vma = vma;
457 args.addr = addr; 460 args.addr = addr;
461 args.pfn = pfn;
458 462
459 on_each_cpu(local_r4k_flush_cache_page, &args, 1, 1); 463 on_each_cpu(local_r4k_flush_cache_page, &args, 1, 1);
460} 464}
@@ -782,6 +786,7 @@ static void __init probe_pcache(void)
782 c->dcache.waybit = 0; 786 c->dcache.waybit = 0;
783 787
784 c->options |= MIPS_CPU_CACHE_CDEX_P; 788 c->options |= MIPS_CPU_CACHE_CDEX_P;
789 c->options |= MIPS_CPU_PREFETCH;
785 break; 790 break;
786 791
787 case CPU_R4000PC: 792 case CPU_R4000PC:
@@ -956,6 +961,7 @@ static void __init probe_pcache(void)
956 switch (c->cputype) { 961 switch (c->cputype) {
957 case CPU_20KC: 962 case CPU_20KC:
958 case CPU_25KF: 963 case CPU_25KF:
964 c->dcache.flags |= MIPS_CACHE_PINDEX;
959 case CPU_R10000: 965 case CPU_R10000:
960 case CPU_R12000: 966 case CPU_R12000:
961 case CPU_SB1: 967 case CPU_SB1:
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c
index 7c572bea4a98..fe232e3988e3 100644
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
@@ -210,7 +210,6 @@ static void tx39_flush_cache_page(struct vm_area_struct *vma, unsigned long page
210 * Do indexed flush, too much work to get the (possible) TLB refills 210 * Do indexed flush, too much work to get the (possible) TLB refills
211 * to work correctly. 211 * to work correctly.
212 */ 212 */
213 page = (KSEG0 + (page & (dcache_size - 1)));
214 if (cpu_has_dc_aliases || exec) 213 if (cpu_has_dc_aliases || exec)
215 tx39_blast_dcache_page_indexed(page); 214 tx39_blast_dcache_page_indexed(page);
216 if (exec) 215 if (exec)
diff --git a/arch/mips/mm/dma-ip32.c b/arch/mips/mm/dma-ip32.c
index a7e3072ff78d..ec54ed0d26ff 100644
--- a/arch/mips/mm/dma-ip32.c
+++ b/arch/mips/mm/dma-ip32.c
@@ -138,7 +138,7 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
138 BUG(); 138 BUG();
139 } 139 }
140 140
141 addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;; 141 addr = virt_to_phys(ptr)&RAM_OFFSET_MASK;
142 if(dev == NULL) 142 if(dev == NULL)
143 addr+=CRIME_HI_MEM_BASE; 143 addr+=CRIME_HI_MEM_BASE;
144 return (dma_addr_t)addr; 144 return (dma_addr_t)addr;
@@ -179,7 +179,7 @@ int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
179 addr = (unsigned long) page_address(sg->page)+sg->offset; 179 addr = (unsigned long) page_address(sg->page)+sg->offset;
180 if (addr) 180 if (addr)
181 __dma_sync(addr, sg->length, direction); 181 __dma_sync(addr, sg->length, direction);
182 addr = __pa(addr)&RAM_OFFSET_MASK;; 182 addr = __pa(addr)&RAM_OFFSET_MASK;
183 if(dev == NULL) 183 if(dev == NULL)
184 addr += CRIME_HI_MEM_BASE; 184 addr += CRIME_HI_MEM_BASE;
185 sg->dma_address = (dma_addr_t)addr; 185 sg->dma_address = (dma_addr_t)addr;
@@ -199,7 +199,7 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
199 199
200 addr = (unsigned long) page_address(page) + offset; 200 addr = (unsigned long) page_address(page) + offset;
201 dma_cache_wback_inv(addr, size); 201 dma_cache_wback_inv(addr, size);
202 addr = __pa(addr)&RAM_OFFSET_MASK;; 202 addr = __pa(addr)&RAM_OFFSET_MASK;
203 if(dev == NULL) 203 if(dev == NULL)
204 addr += CRIME_HI_MEM_BASE; 204 addr += CRIME_HI_MEM_BASE;
205 205
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 0ff9a348b843..ad89c442f299 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -25,6 +25,7 @@
25#include <linux/highmem.h> 25#include <linux/highmem.h>
26#include <linux/swap.h> 26#include <linux/swap.h>
27#include <linux/proc_fs.h> 27#include <linux/proc_fs.h>
28#include <linux/pfn.h>
28 29
29#include <asm/bootinfo.h> 30#include <asm/bootinfo.h>
30#include <asm/cachectl.h> 31#include <asm/cachectl.h>
@@ -54,7 +55,8 @@ unsigned long empty_zero_page, zero_page_mask;
54 */ 55 */
55unsigned long setup_zero_pages(void) 56unsigned long setup_zero_pages(void)
56{ 57{
57 unsigned long order, size; 58 unsigned int order;
59 unsigned long size;
58 struct page *page; 60 struct page *page;
59 61
60 if (cpu_has_vce) 62 if (cpu_has_vce)
@@ -67,9 +69,9 @@ unsigned long setup_zero_pages(void)
67 panic("Oh boy, that early out of memory?"); 69 panic("Oh boy, that early out of memory?");
68 70
69 page = virt_to_page(empty_zero_page); 71 page = virt_to_page(empty_zero_page);
72 split_page(page, order);
70 while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { 73 while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) {
71 SetPageReserved(page); 74 SetPageReserved(page);
72 set_page_count(page, 1);
73 page++; 75 page++;
74 } 76 }
75 77
@@ -176,9 +178,6 @@ void __init paging_init(void)
176 free_area_init(zones_size); 178 free_area_init(zones_size);
177} 179}
178 180
179#define PFN_UP(x) (((x) + PAGE_SIZE - 1) >> PAGE_SHIFT)
180#define PFN_DOWN(x) ((x) >> PAGE_SHIFT)
181
182static inline int page_is_ram(unsigned long pagenr) 181static inline int page_is_ram(unsigned long pagenr)
183{ 182{
184 int i; 183 int i;
@@ -244,7 +243,7 @@ void __init mem_init(void)
244#ifdef CONFIG_LIMITED_DMA 243#ifdef CONFIG_LIMITED_DMA
245 set_page_address(page, lowmem_page_address(page)); 244 set_page_address(page, lowmem_page_address(page));
246#endif 245#endif
247 set_page_count(page, 1); 246 init_page_count(page);
248 __free_page(page); 247 __free_page(page);
249 totalhigh_pages++; 248 totalhigh_pages++;
250 } 249 }
@@ -291,7 +290,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
291 290
292 for (; start < end; start += PAGE_SIZE) { 291 for (; start < end; start += PAGE_SIZE) {
293 ClearPageReserved(virt_to_page(start)); 292 ClearPageReserved(virt_to_page(start));
294 set_page_count(virt_to_page(start), 1); 293 init_page_count(virt_to_page(start));
295 free_page(start); 294 free_page(start);
296 totalram_pages++; 295 totalram_pages++;
297 } 296 }
@@ -314,7 +313,7 @@ void free_initmem(void)
314 page = addr; 313 page = addr;
315#endif 314#endif
316 ClearPageReserved(virt_to_page(page)); 315 ClearPageReserved(virt_to_page(page));
317 set_page_count(virt_to_page(page), 1); 316 init_page_count(virt_to_page(page));
318 free_page(page); 317 free_page(page);
319 totalram_pages++; 318 totalram_pages++;
320 freed += PAGE_SIZE; 319 freed += PAGE_SIZE;
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c
index f51e180072e3..e4390dc3eb48 100644
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
@@ -124,7 +124,7 @@ static inline void build_nop(void)
124 124
125static inline void build_src_pref(int advance) 125static inline void build_src_pref(int advance)
126{ 126{
127 if (!(load_offset & (cpu_dcache_line_size() - 1))) { 127 if (!(load_offset & (cpu_dcache_line_size() - 1)) && advance) {
128 union mips_instruction mi; 128 union mips_instruction mi;
129 129
130 mi.i_format.opcode = pref_op; 130 mi.i_format.opcode = pref_op;
@@ -166,7 +166,7 @@ static inline void build_load_reg(int reg)
166 166
167static inline void build_dst_pref(int advance) 167static inline void build_dst_pref(int advance)
168{ 168{
169 if (!(store_offset & (cpu_dcache_line_size() - 1))) { 169 if (!(store_offset & (cpu_dcache_line_size() - 1)) && advance) {
170 union mips_instruction mi; 170 union mips_instruction mi;
171 171
172 mi.i_format.opcode = pref_op; 172 mi.i_format.opcode = pref_op;
@@ -340,6 +340,12 @@ void __init build_clear_page(void)
340 340
341 if (cpu_has_prefetch) { 341 if (cpu_has_prefetch) {
342 switch (current_cpu_data.cputype) { 342 switch (current_cpu_data.cputype) {
343 case CPU_TX49XX:
344 /* TX49 supports only Pref_Load */
345 pref_offset_clear = 0;
346 pref_offset_copy = 0;
347 break;
348
343 case CPU_RM9000: 349 case CPU_RM9000:
344 /* 350 /*
345 * As a workaround for erratum G105 which make the 351 * As a workaround for erratum G105 which make the
diff --git a/arch/mips/mm/sc-rm7k.c b/arch/mips/mm/sc-rm7k.c
index 9e8ff8badb19..3b6cc9ba1b05 100644
--- a/arch/mips/mm/sc-rm7k.c
+++ b/arch/mips/mm/sc-rm7k.c
@@ -9,6 +9,7 @@
9#include <linux/init.h> 9#include <linux/init.h>
10#include <linux/kernel.h> 10#include <linux/kernel.h>
11#include <linux/mm.h> 11#include <linux/mm.h>
12#include <linux/bitops.h>
12 13
13#include <asm/addrspace.h> 14#include <asm/addrspace.h>
14#include <asm/bcache.h> 15#include <asm/bcache.h>
@@ -43,14 +44,7 @@ static void rm7k_sc_wback_inv(unsigned long addr, unsigned long size)
43 /* Catch bad driver code */ 44 /* Catch bad driver code */
44 BUG_ON(size == 0); 45 BUG_ON(size == 0);
45 46
46 a = addr & ~(sc_lsize - 1); 47 blast_scache_range(addr, addr + size);
47 end = (addr + size - 1) & ~(sc_lsize - 1);
48 while (1) {
49 flush_scache_line(a); /* Hit_Writeback_Inv_SD */
50 if (a == end)
51 break;
52 a += sc_lsize;
53 }
54 48
55 if (!rm7k_tcache_enabled) 49 if (!rm7k_tcache_enabled)
56 return; 50 return;
@@ -74,14 +68,7 @@ static void rm7k_sc_inv(unsigned long addr, unsigned long size)
74 /* Catch bad driver code */ 68 /* Catch bad driver code */
75 BUG_ON(size == 0); 69 BUG_ON(size == 0);
76 70
77 a = addr & ~(sc_lsize - 1); 71 blast_inv_scache_range(addr, addr + size);
78 end = (addr + size - 1) & ~(sc_lsize - 1);
79 while (1) {
80 invalidate_scache_line(a); /* Hit_Invalidate_SD */
81 if (a == end)
82 break;
83 a += sc_lsize;
84 }
85 72
86 if (!rm7k_tcache_enabled) 73 if (!rm7k_tcache_enabled)
87 return; 74 return;
@@ -143,11 +130,17 @@ struct bcache_ops rm7k_sc_ops = {
143 130
144void __init rm7k_sc_init(void) 131void __init rm7k_sc_init(void)
145{ 132{
133 struct cpuinfo_mips *c = &current_cpu_data;
146 unsigned int config = read_c0_config(); 134 unsigned int config = read_c0_config();
147 135
148 if ((config & RM7K_CONF_SC)) 136 if ((config & RM7K_CONF_SC))
149 return; 137 return;
150 138
139 c->scache.linesz = sc_lsize;
140 c->scache.ways = 4;
141 c->scache.waybit= ffs(scache_size / c->scache.ways) - 1;
142 c->scache.waysize = scache_size / c->scache.ways;
143 c->scache.sets = scache_size / (c->scache.linesz * c->scache.ways);
151 printk(KERN_INFO "Secondary cache size %dK, linesize %d bytes.\n", 144 printk(KERN_INFO "Secondary cache size %dK, linesize %d bytes.\n",
152 (scache_size >> 10), sc_lsize); 145 (scache_size >> 10), sc_lsize);
153 146
diff --git a/arch/mips/mm/tlb-andes.c b/arch/mips/mm/tlb-andes.c
deleted file mode 100644
index 3f422a849c41..000000000000
--- a/arch/mips/mm/tlb-andes.c
+++ /dev/null
@@ -1,259 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 1997, 1998, 1999 Ralf Baechle (ralf@gnu.org)
7 * Copyright (C) 1999 Silicon Graphics, Inc.
8 * Copyright (C) 2000 Kanoj Sarcar (kanoj@sgi.com)
9 */
10#include <linux/init.h>
11#include <linux/kernel.h>
12#include <linux/sched.h>
13#include <linux/mm.h>
14#include <asm/page.h>
15#include <asm/pgtable.h>
16#include <asm/system.h>
17#include <asm/mmu_context.h>
18
19extern void build_tlb_refill_handler(void);
20
21#define NTLB_ENTRIES 64
22#define NTLB_ENTRIES_HALF 32
23
24void local_flush_tlb_all(void)
25{
26 unsigned long flags;
27 unsigned long old_ctx;
28 unsigned long entry;
29
30 local_irq_save(flags);
31 /* Save old context and create impossible VPN2 value */
32 old_ctx = read_c0_entryhi() & ASID_MASK;
33 write_c0_entryhi(CKSEG0);
34 write_c0_entrylo0(0);
35 write_c0_entrylo1(0);
36
37 entry = read_c0_wired();
38
39 /* Blast 'em all away. */
40 while (entry < NTLB_ENTRIES) {
41 write_c0_index(entry);
42 tlb_write_indexed();
43 entry++;
44 }
45 write_c0_entryhi(old_ctx);
46 local_irq_restore(flags);
47}
48
49void local_flush_tlb_mm(struct mm_struct *mm)
50{
51 int cpu = smp_processor_id();
52 if (cpu_context(cpu, mm) != 0) {
53 drop_mmu_context(mm,cpu);
54 }
55}
56
57void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
58 unsigned long end)
59{
60 struct mm_struct *mm = vma->vm_mm;
61 int cpu = smp_processor_id();
62
63 if (cpu_context(cpu, mm) != 0) {
64 unsigned long flags;
65 int size;
66
67 local_irq_save(flags);
68 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
69 size = (size + 1) >> 1;
70 if (size <= NTLB_ENTRIES_HALF) {
71 int oldpid = (read_c0_entryhi() & ASID_MASK);
72 int newpid = (cpu_context(smp_processor_id(), mm)
73 & ASID_MASK);
74
75 start &= (PAGE_MASK << 1);
76 end += ((PAGE_SIZE << 1) - 1);
77 end &= (PAGE_MASK << 1);
78 while(start < end) {
79 int idx;
80
81 write_c0_entryhi(start | newpid);
82 start += (PAGE_SIZE << 1);
83 tlb_probe();
84 idx = read_c0_index();
85 write_c0_entrylo0(0);
86 write_c0_entrylo1(0);
87 write_c0_entryhi(CKSEG0);
88 if(idx < 0)
89 continue;
90 tlb_write_indexed();
91 }
92 write_c0_entryhi(oldpid);
93 } else {
94 drop_mmu_context(mm, cpu);
95 }
96 local_irq_restore(flags);
97 }
98}
99
100void local_flush_tlb_kernel_range(unsigned long start, unsigned long end)
101{
102 unsigned long flags;
103 int size;
104
105 size = (end - start + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
106 size = (size + 1) >> 1;
107
108 local_irq_save(flags);
109 if (size <= NTLB_ENTRIES_HALF) {
110 int pid = read_c0_entryhi();
111
112 start &= (PAGE_MASK << 1);
113 end += ((PAGE_SIZE << 1) - 1);
114 end &= (PAGE_MASK << 1);
115
116 while (start < end) {
117 int idx;
118
119 write_c0_entryhi(start);
120 start += (PAGE_SIZE << 1);
121 tlb_probe();
122 idx = read_c0_index();
123 write_c0_entrylo0(0);
124 write_c0_entrylo1(0);
125 write_c0_entryhi(CKSEG0 + (idx << (PAGE_SHIFT+1)));
126 if (idx < 0)
127 continue;
128 tlb_write_indexed();
129 }
130 write_c0_entryhi(pid);
131 } else {
132 local_flush_tlb_all();
133 }
134 local_irq_restore(flags);
135}
136
137void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
138{
139 if (cpu_context(smp_processor_id(), vma->vm_mm) != 0) {
140 unsigned long flags;
141 int oldpid, newpid, idx;
142
143 newpid = (cpu_context(smp_processor_id(), vma->vm_mm) &
144 ASID_MASK);
145 page &= (PAGE_MASK << 1);
146 local_irq_save(flags);
147 oldpid = (read_c0_entryhi() & ASID_MASK);
148 write_c0_entryhi(page | newpid);
149 tlb_probe();
150 idx = read_c0_index();
151 write_c0_entrylo0(0);
152 write_c0_entrylo1(0);
153 write_c0_entryhi(CKSEG0);
154 if (idx < 0)
155 goto finish;
156 tlb_write_indexed();
157
158 finish:
159 write_c0_entryhi(oldpid);
160 local_irq_restore(flags);
161 }
162}
163
164/*
165 * This one is only used for pages with the global bit set so we don't care
166 * much about the ASID.
167 */
168void local_flush_tlb_one(unsigned long page)
169{
170 unsigned long flags;
171 int oldpid, idx;
172
173 local_irq_save(flags);
174 page &= (PAGE_MASK << 1);
175 oldpid = read_c0_entryhi() & 0xff;
176 write_c0_entryhi(page);
177 tlb_probe();
178 idx = read_c0_index();
179 write_c0_entrylo0(0);
180 write_c0_entrylo1(0);
181 if (idx >= 0) {
182 /* Make sure all entries differ. */
183 write_c0_entryhi(CKSEG0+(idx<<(PAGE_SHIFT+1)));
184 tlb_write_indexed();
185 }
186 write_c0_entryhi(oldpid);
187
188 local_irq_restore(flags);
189}
190
191/* XXX Simplify this. On the R10000 writing a TLB entry for an virtual
192 address that already exists will overwrite the old entry and not result
193 in TLB malfunction or TLB shutdown. */
194void __update_tlb(struct vm_area_struct * vma, unsigned long address, pte_t pte)
195{
196 unsigned long flags;
197 pgd_t *pgdp;
198 pud_t *pudp;
199 pmd_t *pmdp;
200 pte_t *ptep;
201 int idx, pid;
202
203 /*
204 * Handle debugger faulting in for debugee.
205 */
206 if (current->active_mm != vma->vm_mm)
207 return;
208
209 pid = read_c0_entryhi() & ASID_MASK;
210
211 if ((pid != (cpu_context(smp_processor_id(), vma->vm_mm) & ASID_MASK))
212 || (cpu_context(smp_processor_id(), vma->vm_mm) == 0)) {
213 printk(KERN_WARNING
214 "%s: Wheee, bogus tlbpid mmpid=%d tlbpid=%d\n",
215 __FUNCTION__, (int) (cpu_context(smp_processor_id(),
216 vma->vm_mm) & ASID_MASK), pid);
217 }
218
219 local_irq_save(flags);
220 address &= (PAGE_MASK << 1);
221 write_c0_entryhi(address | (pid));
222 pgdp = pgd_offset(vma->vm_mm, address);
223 tlb_probe();
224 pudp = pud_offset(pgdp, address);
225 pmdp = pmd_offset(pudp, address);
226 idx = read_c0_index();
227 ptep = pte_offset_map(pmdp, address);
228 write_c0_entrylo0(pte_val(*ptep++) >> 6);
229 write_c0_entrylo1(pte_val(*ptep) >> 6);
230 write_c0_entryhi(address | pid);
231 if (idx < 0) {
232 tlb_write_random();
233 } else {
234 tlb_write_indexed();
235 }
236 write_c0_entryhi(pid);
237 local_irq_restore(flags);
238}
239
240void __init tlb_init(void)
241{
242 /*
243 * You should never change this register:
244 * - On R4600 1.7 the tlbp never hits for pages smaller than
245 * the value in the c0_pagemask register.
246 * - The entire mm handling assumes the c0_pagemask register to
247 * be set for 4kb pages.
248 */
249 write_c0_pagemask(PM_4K);
250 write_c0_wired(0);
251 write_c0_framemask(0);
252
253 /* From this point on the ARC firmware is dead. */
254 local_flush_tlb_all();
255
256 /* Did I tell you that ARC SUCKS? */
257
258 build_tlb_refill_handler();
259}
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 8297970f0bb1..a865f2394cb0 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -424,8 +424,13 @@ void __init tlb_init(void)
424 probe_tlb(config); 424 probe_tlb(config);
425 write_c0_pagemask(PM_DEFAULT_MASK); 425 write_c0_pagemask(PM_DEFAULT_MASK);
426 write_c0_wired(0); 426 write_c0_wired(0);
427 write_c0_framemask(0);
427 temp_tlb_entry = current_cpu_data.tlbsize - 1; 428 temp_tlb_entry = current_cpu_data.tlbsize - 1;
429
430 /* From this point on the ARC firmware is dead. */
428 local_flush_tlb_all(); 431 local_flush_tlb_all();
429 432
433 /* Did I tell you that ARC SUCKS? */
434
430 build_tlb_refill_handler(); 435 build_tlb_refill_handler();
431} 436}
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index ac4f4bfaae50..599b3c297186 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -951,7 +951,6 @@ build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
951 /* No i_nop needed here, since the next insn doesn't touch TMP. */ 951 /* No i_nop needed here, since the next insn doesn't touch TMP. */
952 952
953#ifdef CONFIG_SMP 953#ifdef CONFIG_SMP
954# ifdef CONFIG_BUILD_ELF64
955 /* 954 /*
956 * 64 bit SMP running in XKPHYS has smp_processor_id() << 3 955 * 64 bit SMP running in XKPHYS has smp_processor_id() << 3
957 * stored in CONTEXT. 956 * stored in CONTEXT.
@@ -962,18 +961,6 @@ build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
962 i_daddu(p, ptr, ptr, tmp); 961 i_daddu(p, ptr, ptr, tmp);
963 i_dmfc0(p, tmp, C0_BADVADDR); 962 i_dmfc0(p, tmp, C0_BADVADDR);
964 i_ld(p, ptr, rel_lo(pgdc), ptr); 963 i_ld(p, ptr, rel_lo(pgdc), ptr);
965# else
966 /*
967 * 64 bit SMP running in compat space has the lower part of
968 * &pgd_current[smp_processor_id()] stored in CONTEXT.
969 */
970 if (!in_compat_space_p(pgdc))
971 panic("Invalid page directory address!");
972
973 i_dmfc0(p, ptr, C0_CONTEXT);
974 i_dsra(p, ptr, ptr, 23);
975 i_ld(p, ptr, 0, ptr);
976# endif
977#else 964#else
978 i_LA_mostly(p, ptr, pgdc); 965 i_LA_mostly(p, ptr, pgdc);
979 i_ld(p, ptr, rel_lo(pgdc), ptr); 966 i_ld(p, ptr, rel_lo(pgdc), ptr);
diff --git a/arch/mips/momentum/jaguar_atx/reset.c b/arch/mips/momentum/jaguar_atx/reset.c
index c4236b1e59fa..ce9fb2e3d952 100644
--- a/arch/mips/momentum/jaguar_atx/reset.c
+++ b/arch/mips/momentum/jaguar_atx/reset.c
@@ -32,7 +32,7 @@ void momenco_jaguar_restart(char *command)
32#else 32#else
33 void *nvram = (void*) 0xfc807000; 33 void *nvram = (void*) 0xfc807000;
34#endif 34#endif
35 /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 35 /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
36 writeb(0x84, nvram + 0xff7); 36 writeb(0x84, nvram + 0xff7);
37 37
38 /* wait for the watchdog to go off */ 38 /* wait for the watchdog to go off */
diff --git a/arch/mips/momentum/jaguar_atx/setup.c b/arch/mips/momentum/jaguar_atx/setup.c
index 2699917b640a..91d9637143d7 100644
--- a/arch/mips/momentum/jaguar_atx/setup.c
+++ b/arch/mips/momentum/jaguar_atx/setup.c
@@ -229,8 +229,8 @@ void momenco_time_init(void)
229 mips_hpt_frequency = cpu_clock / 2; 229 mips_hpt_frequency = cpu_clock / 2;
230 board_timer_setup = momenco_timer_setup; 230 board_timer_setup = momenco_timer_setup;
231 231
232 rtc_get_time = m48t37y_get_time; 232 rtc_mips_get_time = m48t37y_get_time;
233 rtc_set_time = m48t37y_set_time; 233 rtc_mips_set_time = m48t37y_set_time;
234} 234}
235 235
236static struct resource mv_pci_io_mem0_resource = { 236static struct resource mv_pci_io_mem0_resource = {
@@ -461,7 +461,7 @@ void __init plat_setup(void)
461 unsigned int tbControl; 461 unsigned int tbControl;
462 tbControl = 462 tbControl =
463 0 << 26 | /* post trigger delay 0 */ 463 0 << 26 | /* post trigger delay 0 */
464 0x2 << 16 | /* sequential trace mode */ 464 0x2 << 16 | /* sequential trace mode */
465 // 0x0 << 16 | /* non-sequential trace mode */ 465 // 0x0 << 16 | /* non-sequential trace mode */
466 // 0xf << 4 | /* watchpoints disabled */ 466 // 0xf << 4 | /* watchpoints disabled */
467 2 << 2 | /* armed */ 467 2 << 2 | /* armed */
diff --git a/arch/mips/momentum/ocelot_3/reset.c b/arch/mips/momentum/ocelot_3/reset.c
index 72b4423c0864..9d86d2468376 100644
--- a/arch/mips/momentum/ocelot_3/reset.c
+++ b/arch/mips/momentum/ocelot_3/reset.c
@@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command)
34 /* base address of timekeeper portion of part */ 34 /* base address of timekeeper portion of part */
35 void *nvram = (void *) 0xfc807000L; 35 void *nvram = (void *) 0xfc807000L;
36 36
37 /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 37 /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
38 writeb(0x84, nvram + 0xff7); 38 writeb(0x84, nvram + 0xff7);
39 39
40 /* wait for the watchdog to go off */ 40 /* wait for the watchdog to go off */
diff --git a/arch/mips/momentum/ocelot_3/setup.c b/arch/mips/momentum/ocelot_3/setup.c
index f95677f4f06f..370e75d0e75c 100644
--- a/arch/mips/momentum/ocelot_3/setup.c
+++ b/arch/mips/momentum/ocelot_3/setup.c
@@ -58,6 +58,7 @@
58#include <linux/bootmem.h> 58#include <linux/bootmem.h>
59#include <linux/mv643xx.h> 59#include <linux/mv643xx.h>
60#include <linux/pm.h> 60#include <linux/pm.h>
61#include <linux/bcd.h>
61 62
62#include <asm/time.h> 63#include <asm/time.h>
63#include <asm/page.h> 64#include <asm/page.h>
@@ -131,9 +132,6 @@ void setup_wired_tlb_entries(void)
131 add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), (signed)0xfc000000, PM_16M); 132 add_wired_entry(ENTRYLO(0xfc000000), ENTRYLO(0xfd000000), (signed)0xfc000000, PM_16M);
132} 133}
133 134
134#define CONV_BCD_TO_BIN(val) (((val) & 0xf) + (((val) >> 4) * 10))
135#define CONV_BIN_TO_BCD(val) (((val) % 10) + (((val) / 10) << 4))
136
137unsigned long m48t37y_get_time(void) 135unsigned long m48t37y_get_time(void)
138{ 136{
139 unsigned int year, month, day, hour, min, sec; 137 unsigned int year, month, day, hour, min, sec;
@@ -143,16 +141,16 @@ unsigned long m48t37y_get_time(void)
143 /* stop the update */ 141 /* stop the update */
144 rtc_base[0x7ff8] = 0x40; 142 rtc_base[0x7ff8] = 0x40;
145 143
146 year = CONV_BCD_TO_BIN(rtc_base[0x7fff]); 144 year = BCD2BIN(rtc_base[0x7fff]);
147 year += CONV_BCD_TO_BIN(rtc_base[0x7ff1]) * 100; 145 year += BCD2BIN(rtc_base[0x7ff1]) * 100;
148 146
149 month = CONV_BCD_TO_BIN(rtc_base[0x7ffe]); 147 month = BCD2BIN(rtc_base[0x7ffe]);
150 148
151 day = CONV_BCD_TO_BIN(rtc_base[0x7ffd]); 149 day = BCD2BIN(rtc_base[0x7ffd]);
152 150
153 hour = CONV_BCD_TO_BIN(rtc_base[0x7ffb]); 151 hour = BCD2BIN(rtc_base[0x7ffb]);
154 min = CONV_BCD_TO_BIN(rtc_base[0x7ffa]); 152 min = BCD2BIN(rtc_base[0x7ffa]);
155 sec = CONV_BCD_TO_BIN(rtc_base[0x7ff9]); 153 sec = BCD2BIN(rtc_base[0x7ff9]);
156 154
157 /* start the update */ 155 /* start the update */
158 rtc_base[0x7ff8] = 0x00; 156 rtc_base[0x7ff8] = 0x00;
@@ -175,22 +173,22 @@ int m48t37y_set_time(unsigned long sec)
175 rtc_base[0x7ff8] = 0x80; 173 rtc_base[0x7ff8] = 0x80;
176 174
177 /* year */ 175 /* year */
178 rtc_base[0x7fff] = CONV_BIN_TO_BCD(tm.tm_year % 100); 176 rtc_base[0x7fff] = BIN2BCD(tm.tm_year % 100);
179 rtc_base[0x7ff1] = CONV_BIN_TO_BCD(tm.tm_year / 100); 177 rtc_base[0x7ff1] = BIN2BCD(tm.tm_year / 100);
180 178
181 /* month */ 179 /* month */
182 rtc_base[0x7ffe] = CONV_BIN_TO_BCD(tm.tm_mon); 180 rtc_base[0x7ffe] = BIN2BCD(tm.tm_mon);
183 181
184 /* day */ 182 /* day */
185 rtc_base[0x7ffd] = CONV_BIN_TO_BCD(tm.tm_mday); 183 rtc_base[0x7ffd] = BIN2BCD(tm.tm_mday);
186 184
187 /* hour/min/sec */ 185 /* hour/min/sec */
188 rtc_base[0x7ffb] = CONV_BIN_TO_BCD(tm.tm_hour); 186 rtc_base[0x7ffb] = BIN2BCD(tm.tm_hour);
189 rtc_base[0x7ffa] = CONV_BIN_TO_BCD(tm.tm_min); 187 rtc_base[0x7ffa] = BIN2BCD(tm.tm_min);
190 rtc_base[0x7ff9] = CONV_BIN_TO_BCD(tm.tm_sec); 188 rtc_base[0x7ff9] = BIN2BCD(tm.tm_sec);
191 189
192 /* day of week -- not really used, but let's keep it up-to-date */ 190 /* day of week -- not really used, but let's keep it up-to-date */
193 rtc_base[0x7ffc] = CONV_BIN_TO_BCD(tm.tm_wday + 1); 191 rtc_base[0x7ffc] = BIN2BCD(tm.tm_wday + 1);
194 192
195 /* disable writing */ 193 /* disable writing */
196 rtc_base[0x7ff8] = 0x00; 194 rtc_base[0x7ff8] = 0x00;
@@ -215,8 +213,8 @@ void momenco_time_init(void)
215 mips_hpt_frequency = cpu_clock / 2; 213 mips_hpt_frequency = cpu_clock / 2;
216 board_timer_setup = momenco_timer_setup; 214 board_timer_setup = momenco_timer_setup;
217 215
218 rtc_get_time = m48t37y_get_time; 216 rtc_mips_get_time = m48t37y_get_time;
219 rtc_set_time = m48t37y_set_time; 217 rtc_mips_set_time = m48t37y_set_time;
220} 218}
221 219
222/* 220/*
diff --git a/arch/mips/momentum/ocelot_c/reset.c b/arch/mips/momentum/ocelot_c/reset.c
index 6a2489f3b9a0..9dcd154c7767 100644
--- a/arch/mips/momentum/ocelot_c/reset.c
+++ b/arch/mips/momentum/ocelot_c/reset.c
@@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command)
34 0xfc807000; 34 0xfc807000;
35#endif 35#endif
36 36
37 /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ 37 /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
38 writeb(0x84, nvram + 0xff7); 38 writeb(0x84, nvram + 0xff7);
39 39
40 /* wait for the watchdog to go off */ 40 /* wait for the watchdog to go off */
diff --git a/arch/mips/momentum/ocelot_c/setup.c b/arch/mips/momentum/ocelot_c/setup.c
index bd02e60d037a..a3e6f5575592 100644
--- a/arch/mips/momentum/ocelot_c/setup.c
+++ b/arch/mips/momentum/ocelot_c/setup.c
@@ -227,8 +227,8 @@ void momenco_time_init(void)
227 printk("momenco_time_init cpu_clock=%d\n", cpu_clock); 227 printk("momenco_time_init cpu_clock=%d\n", cpu_clock);
228 board_timer_setup = momenco_timer_setup; 228 board_timer_setup = momenco_timer_setup;
229 229
230 rtc_get_time = m48t37y_get_time; 230 rtc_mips_get_time = m48t37y_get_time;
231 rtc_set_time = m48t37y_set_time; 231 rtc_mips_set_time = m48t37y_set_time;
232} 232}
233 233
234void __init plat_setup(void) 234void __init plat_setup(void)
diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c
index 03a0ff2fc993..a8a47b494b23 100644
--- a/arch/mips/pci/fixup-vr4133.c
+++ b/arch/mips/pci/fixup-vr4133.c
@@ -45,7 +45,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
45 45
46 /* 46 /*
47 * we have to open the bridges' windows down to 0 because otherwise 47 * we have to open the bridges' windows down to 0 because otherwise
48 * we cannot access ISA south bridge I/O registers that get mapped from 48 * we cannot access ISA south bridge I/O registers that get mapped from
49 * 0. for example, 8259 PIC would be unaccessible without that 49 * 0. for example, 8259 PIC would be unaccessible without that
50 */ 50 */
51 if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) { 51 if(dev->vendor == PCI_VENDOR_ID_INTEL && dev->device == PCI_DEVICE_ID_INTEL_S21152BB) {
diff --git a/arch/mips/pci/ops-ddb5477.c b/arch/mips/pci/ops-ddb5477.c
index 0406b50a37d8..8e57d4c5d90f 100644
--- a/arch/mips/pci/ops-ddb5477.c
+++ b/arch/mips/pci/ops-ddb5477.c
@@ -253,9 +253,9 @@ static int write_config_byte(struct pci_config_swap *swap,
253static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \ 253static int prefix##_##rw##_config(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 star val) \
254{ \ 254{ \
255 if (size == 1) \ 255 if (size == 1) \
256 return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \ 256 return rw##_config_byte(pciswap, bus, devfn, where, (u8 star)val); \
257 else if (size == 2) \ 257 else if (size == 2) \
258 return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \ 258 return rw##_config_word(pciswap, bus, devfn, where, (u16 star)val); \
259 /* Size must be 4 */ \ 259 /* Size must be 4 */ \
260 return rw##_config_dword(pciswap, bus, devfn, where, val); \ 260 return rw##_config_dword(pciswap, bus, devfn, where, val); \
261} 261}
diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c
index 4c0dcfce5297..0ff083489efd 100644
--- a/arch/mips/pci/ops-tx4938.c
+++ b/arch/mips/pci/ops-tx4938.c
@@ -34,16 +34,16 @@ struct resource pci_mem_resource = {
34}; 34};
35 35
36struct resource tx4938_pcic1_pci_io_resource = { 36struct resource tx4938_pcic1_pci_io_resource = {
37 .name = "PCI1 IO", 37 .name = "PCI1 IO",
38 .start = 0, 38 .start = 0,
39 .end = 0, 39 .end = 0,
40 .flags = IORESOURCE_IO 40 .flags = IORESOURCE_IO
41}; 41};
42struct resource tx4938_pcic1_pci_mem_resource = { 42struct resource tx4938_pcic1_pci_mem_resource = {
43 .name = "PCI1 mem", 43 .name = "PCI1 mem",
44 .start = 0, 44 .start = 0,
45 .end = 0, 45 .end = 0,
46 .flags = IORESOURCE_MEM 46 .flags = IORESOURCE_MEM
47}; 47};
48 48
49static int mkaddr(int bus, int dev_fn, int where, int *flagsp) 49static int mkaddr(int bus, int dev_fn, int where, int *flagsp)
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index ca975e7d32ff..f4ef1a35ca18 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -100,7 +100,7 @@ static int bcm1480_pci_can_access(struct pci_bus *bus, int devfn)
100 100
101 if (bus->number == 0) { 101 if (bus->number == 0) {
102 devno = PCI_SLOT(devfn); 102 devno = PCI_SLOT(devfn);
103 if (bcm1480_bus_status & PCI_DEVICE_MODE) 103 if (bcm1480_bus_status & PCI_DEVICE_MODE)
104 return 0; 104 return 0;
105 else 105 else
106 return 1; 106 return 1;
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c
index aca4a2e7a1c6..a3eebe5890a7 100644
--- a/arch/mips/pci/pci-bcm1480ht.c
+++ b/arch/mips/pci/pci-bcm1480ht.c
@@ -95,7 +95,7 @@ static int bcm1480ht_can_access(struct pci_bus *bus, int devfn)
95 95
96 if (bus->number == 0) { 96 if (bus->number == 0) {
97 devno = PCI_SLOT(devfn); 97 devno = PCI_SLOT(devfn);
98 if (bcm1480ht_bus_status & PCI_DEVICE_MODE) 98 if (bcm1480ht_bus_status & PCI_DEVICE_MODE)
99 return 0; 99 return 0;
100 } 100 }
101 return 1; 101 return 1;
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index efc96ce99eeb..6002d2a6a262 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -379,18 +379,18 @@ int __init bridge_probe(nasid_t nasid, int widget_id, int masterwid)
379 bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id); 379 bridge = (bridge_t *) RAW_NODE_SWIN_BASE(nasid, widget_id);
380 380
381 /* 381 /*
382 * Clear all pending interrupts. 382 * Clear all pending interrupts.
383 */ 383 */
384 bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR; 384 bridge->b_int_rst_stat = BRIDGE_IRR_ALL_CLR;
385 385
386 /* 386 /*
387 * Until otherwise set up, assume all interrupts are from slot 0 387 * Until otherwise set up, assume all interrupts are from slot 0
388 */ 388 */
389 bridge->b_int_device = 0x0; 389 bridge->b_int_device = 0x0;
390 390
391 /* 391 /*
392 * swap pio's to pci mem and io space (big windows) 392 * swap pio's to pci mem and io space (big windows)
393 */ 393 */
394 bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP | 394 bridge->b_wid_control |= BRIDGE_CTRL_IO_SWAP |
395 BRIDGE_CTRL_MEM_SWAP; 395 BRIDGE_CTRL_MEM_SWAP;
396 396
diff --git a/arch/mips/philips/pnx8550/common/int.c b/arch/mips/philips/pnx8550/common/int.c
index 546144988bf5..c500e2d41f2c 100644
--- a/arch/mips/philips/pnx8550/common/int.c
+++ b/arch/mips/philips/pnx8550/common/int.c
@@ -251,7 +251,7 @@ void __init arch_init_irq(void)
251 if (gic_int_line == (PNX8550_INT_GPIO0 - PNX8550_INT_GIC_MIN)) { 251 if (gic_int_line == (PNX8550_INT_GPIO0 - PNX8550_INT_GIC_MIN)) {
252 /* PCI INT through gpio 8, which is setup in 252 /* PCI INT through gpio 8, which is setup in
253 * pnx8550_setup.c and routed to GPIO 253 * pnx8550_setup.c and routed to GPIO
254 * Interrupt Level 0 (GPIO Connection 58). 254 * Interrupt Level 0 (GPIO Connection 58).
255 * Set it active low. */ 255 * Set it active low. */
256 256
257 PNX8550_GIC_REQ(gic_int_line) = 0x1E020000; 257 PNX8550_GIC_REQ(gic_int_line) = 0x1E020000;
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index 8bce711575de..3f724d661bdb 100644
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -198,8 +198,8 @@ static void __init py_rtc_setup(void)
198 if (!m48t37_base) 198 if (!m48t37_base)
199 printk(KERN_ERR "Mapping the RTC failed\n"); 199 printk(KERN_ERR "Mapping the RTC failed\n");
200 200
201 rtc_get_time = m48t37y_get_time; 201 rtc_mips_get_time = m48t37y_get_time;
202 rtc_set_time = m48t37y_set_time; 202 rtc_mips_set_time = m48t37y_set_time;
203 203
204 write_seqlock(&xtime_lock); 204 write_seqlock(&xtime_lock);
205 xtime.tv_sec = m48t37y_get_time(); 205 xtime.tv_sec = m48t37y_get_time();
diff --git a/arch/mips/qemu/Makefile b/arch/mips/qemu/Makefile
index 934944ab9e85..6a8e8bcef552 100644
--- a/arch/mips/qemu/Makefile
+++ b/arch/mips/qemu/Makefile
@@ -3,3 +3,5 @@
3# 3#
4 4
5obj-y = q-firmware.o q-int.o q-irq.o q-mem.o q-setup.o 5obj-y = q-firmware.o q-int.o q-irq.o q-mem.o q-setup.o
6
7obj-$(CONFIG_SMP) += q-smp.o
diff --git a/arch/mips/qemu/q-smp.c b/arch/mips/qemu/q-smp.c
new file mode 100644
index 000000000000..5a12354cd576
--- /dev/null
+++ b/arch/mips/qemu/q-smp.c
@@ -0,0 +1,48 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 2006 by Ralf Baechle (ralf@linux-mips.org)
7 *
8 * Symmetric Uniprocessor (TM) Support
9 */
10#include <linux/kernel.h>
11#include <linux/sched.h>
12
13/*
14 * Send inter-processor interrupt
15 */
16void core_send_ipi(int cpu, unsigned int action)
17{
18 panic(KERN_ERR "%s called", __FUNCTION__);
19}
20
21/*
22 * After we've done initial boot, this function is called to allow the
23 * board code to clean up state, if needed
24 */
25void prom_init_secondary(void)
26{
27}
28
29void prom_smp_finish(void)
30{
31}
32
33/* Hook for after all CPUs are online */
34void prom_cpus_done(void)
35{
36}
37
38void __init prom_prepare_cpus(unsigned int max_cpus)
39{
40 cpus_clear(phys_cpu_present_map);
41}
42
43/*
44 * Firmware CPU startup hook
45 */
46void prom_boot_secondary(int cpu, struct task_struct *idle)
47{
48}
diff --git a/arch/mips/sgi-ip22/ip22-reset.c b/arch/mips/sgi-ip22/ip22-reset.c
index 92a3b3c15ed3..a9c58e067b53 100644
--- a/arch/mips/sgi-ip22/ip22-reset.c
+++ b/arch/mips/sgi-ip22/ip22-reset.c
@@ -238,7 +238,7 @@ static int __init reboot_setup(void)
238 request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL); 238 request_irq(SGI_PANEL_IRQ, panel_int, 0, "Front Panel", NULL);
239 init_timer(&blink_timer); 239 init_timer(&blink_timer);
240 blink_timer.function = blink_timeout; 240 blink_timer.function = blink_timeout;
241 notifier_chain_register(&panic_notifier_list, &panic_block); 241 atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
242 242
243 return 0; 243 return 0;
244} 244}
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index b7300cc5c5ad..cca688ad64ad 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -212,8 +212,8 @@ static void indy_timer_setup(struct irqaction *irq)
212void __init ip22_time_init(void) 212void __init ip22_time_init(void)
213{ 213{
214 /* setup hookup functions */ 214 /* setup hookup functions */
215 rtc_get_time = indy_rtc_get_time; 215 rtc_mips_get_time = indy_rtc_get_time;
216 rtc_set_time = indy_rtc_set_time; 216 rtc_mips_set_time = indy_rtc_set_time;
217 217
218 board_time_init = indy_time_init; 218 board_time_init = indy_time_init;
219 board_timer_setup = indy_timer_setup; 219 board_timer_setup = indy_timer_setup;
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 73e5e52781d8..2854ac4c9be1 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -88,12 +88,9 @@ static inline int find_level(cpuid_t *cpunum, int irq)
88{ 88{
89 int cpu, i; 89 int cpu, i;
90 90
91 for (cpu = 0; cpu <= NR_CPUS; cpu++) { 91 for_each_online_cpu(cpu) {
92 struct slice_data *si = cpu_data[cpu].data; 92 struct slice_data *si = cpu_data[cpu].data;
93 93
94 if (!cpu_online(cpu))
95 continue;
96
97 for (i = BASE_PCI_IRQ; i < LEVELS_PER_SLICE; i++) 94 for (i = BASE_PCI_IRQ; i < LEVELS_PER_SLICE; i++)
98 if (si->level_to_irq[i] == irq) { 95 if (si->level_to_irq[i] == irq) {
99 *cpunum = cpu; 96 *cpunum = cpu;
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index ef20d9ac0ba3..6c00dce9f73f 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -19,6 +19,7 @@
19#include <linux/nodemask.h> 19#include <linux/nodemask.h>
20#include <linux/swap.h> 20#include <linux/swap.h>
21#include <linux/bootmem.h> 21#include <linux/bootmem.h>
22#include <linux/pfn.h>
22#include <asm/page.h> 23#include <asm/page.h>
23#include <asm/sections.h> 24#include <asm/sections.h>
24 25
@@ -28,8 +29,6 @@
28#include <asm/sn/sn_private.h> 29#include <asm/sn/sn_private.h>
29 30
30 31
31#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
32
33#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) 32#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
34#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) 33#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)
35 34
@@ -540,8 +539,8 @@ void __init mem_init(void)
540 struct page *end, *p; 539 struct page *end, *p;
541 540
542 /* 541 /*
543 * This will free up the bootmem, ie, slot 0 memory. 542 * This will free up the bootmem, ie, slot 0 memory.
544 */ 543 */
545 totalram_pages += free_all_bootmem_node(NODE_DATA(node)); 544 totalram_pages += free_all_bootmem_node(NODE_DATA(node));
546 545
547 /* 546 /*
@@ -559,7 +558,7 @@ void __init mem_init(void)
559 /* if (!page_is_ram(pgnr)) continue; */ 558 /* if (!page_is_ram(pgnr)) continue; */
560 /* commented out until page_is_ram works */ 559 /* commented out until page_is_ram works */
561 ClearPageReserved(p); 560 ClearPageReserved(p);
562 set_page_count(p, 1); 561 init_page_count(p);
563 __free_page(p); 562 __free_page(p);
564 totalram_pages++; 563 totalram_pages++;
565 } 564 }
diff --git a/arch/mips/sgi-ip32/ip32-reset.c b/arch/mips/sgi-ip32/ip32-reset.c
index 0c948008b023..ab9d9cef089e 100644
--- a/arch/mips/sgi-ip32/ip32-reset.c
+++ b/arch/mips/sgi-ip32/ip32-reset.c
@@ -193,7 +193,7 @@ static __init int ip32_reboot_setup(void)
193 193
194 init_timer(&blink_timer); 194 init_timer(&blink_timer);
195 blink_timer.function = blink_timeout; 195 blink_timer.function = blink_timeout;
196 notifier_chain_register(&panic_notifier_list, &panic_block); 196 atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
197 197
198 request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL); 198 request_irq(MACEISA_RTC_IRQ, ip32_rtc_int, 0, "rtc", NULL);
199 199
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index 2c38770b1e1b..a2dd8ae1ea8f 100644
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -91,14 +91,14 @@ void __init plat_setup(void)
91{ 91{
92 board_be_init = ip32_be_init; 92 board_be_init = ip32_be_init;
93 93
94 rtc_get_time = mc146818_get_cmos_time; 94 rtc_mips_get_time = mc146818_get_cmos_time;
95 rtc_set_mmss = mc146818_set_rtc_mmss; 95 rtc_mips_set_mmss = mc146818_set_rtc_mmss;
96 96
97 board_time_init = ip32_time_init; 97 board_time_init = ip32_time_init;
98 board_timer_setup = ip32_timer_setup; 98 board_timer_setup = ip32_timer_setup;
99 99
100#ifdef CONFIG_SERIAL_8250 100#ifdef CONFIG_SERIAL_8250
101 { 101 {
102 static struct uart_port o2_serial[2]; 102 static struct uart_port o2_serial[2];
103 103
104 memset(o2_serial, 0, sizeof(o2_serial)); 104 memset(o2_serial, 0, sizeof(o2_serial));
diff --git a/arch/mips/sibyte/sb1250/time.c b/arch/mips/sibyte/sb1250/time.c
index 511c89d65f38..1588f6debd90 100644
--- a/arch/mips/sibyte/sb1250/time.c
+++ b/arch/mips/sibyte/sb1250/time.c
@@ -47,23 +47,51 @@
47#define IMR_IP3_VAL K_INT_MAP_I1 47#define IMR_IP3_VAL K_INT_MAP_I1
48#define IMR_IP4_VAL K_INT_MAP_I2 48#define IMR_IP4_VAL K_INT_MAP_I2
49 49
50#define SB1250_HPT_NUM 3
51#define SB1250_HPT_VALUE M_SCD_TIMER_CNT /* max value */
52#define SB1250_HPT_SHIFT ((sizeof(unsigned int)*8)-V_SCD_TIMER_WIDTH)
53
54
50extern int sb1250_steal_irq(int irq); 55extern int sb1250_steal_irq(int irq);
51 56
57static unsigned int sb1250_hpt_read(void);
58static void sb1250_hpt_init(unsigned int);
59
60static unsigned int hpt_offset;
61
62void __init sb1250_hpt_setup(void)
63{
64 int cpu = smp_processor_id();
65
66 if (!cpu) {
67 /* Setup hpt using timer #3 but do not enable irq for it */
68 __raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CFG)));
69 __raw_writeq(SB1250_HPT_VALUE,
70 IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_INIT)));
71 __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
72 IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CFG)));
73
74 /*
75 * we need to fill 32 bits, so just use the upper 23 bits and pretend
76 * the timer is going 512Mhz instead of 1Mhz
77 */
78 mips_hpt_frequency = V_SCD_TIMER_FREQ << SB1250_HPT_SHIFT;
79 mips_hpt_init = sb1250_hpt_init;
80 mips_hpt_read = sb1250_hpt_read;
81 }
82}
83
84
52void sb1250_time_init(void) 85void sb1250_time_init(void)
53{ 86{
54 int cpu = smp_processor_id(); 87 int cpu = smp_processor_id();
55 int irq = K_INT_TIMER_0+cpu; 88 int irq = K_INT_TIMER_0+cpu;
56 89
57 /* Only have 4 general purpose timers */ 90 /* Only have 4 general purpose timers, and we use last one as hpt */
58 if (cpu > 3) { 91 if (cpu > 2) {
59 BUG(); 92 BUG();
60 } 93 }
61 94
62 if (!cpu) {
63 /* Use our own gettimeoffset() routine */
64 do_gettimeoffset = sb1250_gettimeoffset;
65 }
66
67 sb1250_mask_irq(cpu, irq); 95 sb1250_mask_irq(cpu, irq);
68 96
69 /* Map the timer interrupt to ip[4] of this cpu */ 97 /* Map the timer interrupt to ip[4] of this cpu */
@@ -75,10 +103,10 @@ void sb1250_time_init(void)
75 /* Disable the timer and set up the count */ 103 /* Disable the timer and set up the count */
76 __raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG))); 104 __raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
77#ifdef CONFIG_SIMULATION 105#ifdef CONFIG_SIMULATION
78 __raw_writeq(50000 / HZ, 106 __raw_writeq((50000 / HZ) - 1,
79 IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT))); 107 IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
80#else 108#else
81 __raw_writeq(1000000 / HZ, 109 __raw_writeq((V_SCD_TIMER_FREQ / HZ) - 1,
82 IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT))); 110 IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
83#endif 111#endif
84 112
@@ -103,7 +131,7 @@ void sb1250_timer_interrupt(struct pt_regs *regs)
103 int cpu = smp_processor_id(); 131 int cpu = smp_processor_id();
104 int irq = K_INT_TIMER_0 + cpu; 132 int irq = K_INT_TIMER_0 + cpu;
105 133
106 /* Reset the timer */ 134 /* ACK interrupt */
107 ____raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS, 135 ____raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
108 IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG))); 136 IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
109 137
@@ -122,15 +150,26 @@ void sb1250_timer_interrupt(struct pt_regs *regs)
122} 150}
123 151
124/* 152/*
125 * We use our own do_gettimeoffset() instead of the generic one, 153 * The HPT is free running from SB1250_HPT_VALUE down to 0 then starts over
126 * because the generic one does not work for SMP case. 154 * again. There's no easy way to set to a specific value so store init value
127 * In addition, since we use general timer 0 for system time, 155 * in hpt_offset and subtract each time.
128 * we can get accurate intra-jiffy offset without calibration. 156 *
157 * Note: Timer isn't full 32bits so shift it into the upper part making
158 * it appear to run at a higher frequency.
129 */ 159 */
130unsigned long sb1250_gettimeoffset(void) 160static unsigned int sb1250_hpt_read(void)
131{ 161{
132 unsigned long count = 162 unsigned int count;
133 __raw_readq(IOADDR(A_SCD_TIMER_REGISTER(0, R_SCD_TIMER_CNT)));
134 163
135 return 1000000/HZ - count; 164 count = G_SCD_TIMER_CNT(__raw_readq(IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM, R_SCD_TIMER_CNT))));
136 } 165
166 count = (SB1250_HPT_VALUE - count) << SB1250_HPT_SHIFT;
167
168 return count - hpt_offset;
169}
170
171static void sb1250_hpt_init(unsigned int count)
172{
173 hpt_offset = count;
174 return;
175}
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index b614ca0ddb69..4b5f74ff3edd 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -70,6 +70,12 @@ const char *get_system_type(void)
70 return "SiByte " SIBYTE_BOARD_NAME; 70 return "SiByte " SIBYTE_BOARD_NAME;
71} 71}
72 72
73void __init swarm_time_init(void)
74{
75 /* Setup HPT */
76 sb1250_hpt_setup();
77}
78
73void __init swarm_timer_setup(struct irqaction *irq) 79void __init swarm_timer_setup(struct irqaction *irq)
74{ 80{
75 /* 81 /*
@@ -109,19 +115,20 @@ void __init plat_setup(void)
109 115
110 panic_timeout = 5; /* For debug. */ 116 panic_timeout = 5; /* For debug. */
111 117
118 board_time_init = swarm_time_init;
112 board_timer_setup = swarm_timer_setup; 119 board_timer_setup = swarm_timer_setup;
113 board_be_handler = swarm_be_handler; 120 board_be_handler = swarm_be_handler;
114 121
115 if (xicor_probe()) { 122 if (xicor_probe()) {
116 printk("swarm setup: Xicor 1241 RTC detected.\n"); 123 printk("swarm setup: Xicor 1241 RTC detected.\n");
117 rtc_get_time = xicor_get_time; 124 rtc_mips_get_time = xicor_get_time;
118 rtc_set_time = xicor_set_time; 125 rtc_mips_set_time = xicor_set_time;
119 } 126 }
120 127
121 if (m41t81_probe()) { 128 if (m41t81_probe()) {
122 printk("swarm setup: M41T81 RTC detected.\n"); 129 printk("swarm setup: M41T81 RTC detected.\n");
123 rtc_get_time = m41t81_get_time; 130 rtc_mips_get_time = m41t81_get_time;
124 rtc_set_time = m41t81_set_time; 131 rtc_mips_set_time = m41t81_set_time;
125 } 132 }
126 133
127 printk("This kernel optimized for " 134 printk("This kernel optimized for "
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 1141fcd13a59..01ba6c581e3d 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -164,8 +164,8 @@ static struct pci_controller sni_controller = {
164 164
165static inline void sni_pcimt_time_init(void) 165static inline void sni_pcimt_time_init(void)
166{ 166{
167 rtc_get_time = mc146818_get_cmos_time; 167 rtc_mips_get_time = mc146818_get_cmos_time;
168 rtc_set_time = mc146818_set_rtc_mmss; 168 rtc_mips_set_time = mc146818_set_rtc_mmss;
169} 169}
170 170
171void __init plat_setup(void) 171void __init plat_setup(void)
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
index e19e2be70f76..efe50562f0ce 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
@@ -70,10 +70,10 @@ void __init prom_init(void)
70 70
71 if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) { 71 if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
72 mips_machtype = MACH_TOSHIBA_RBTX4927; 72 mips_machtype = MACH_TOSHIBA_RBTX4927;
73 toshiba_name = "TX4927"; 73 toshiba_name = "TX4927";
74 } else { 74 } else {
75 mips_machtype = MACH_TOSHIBA_RBTX4937; 75 mips_machtype = MACH_TOSHIBA_RBTX4937;
76 toshiba_name = "TX4937"; 76 toshiba_name = "TX4937";
77 } 77 }
78 78
79 msize = tx4927_get_mem_size(); 79 msize = tx4927_get_mem_size();
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index 2ad6401d2af4..6dcf077f61a0 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -1036,8 +1036,8 @@ toshiba_rbtx4927_time_init(void)
1036 1036
1037#ifdef CONFIG_RTC_DS1742 1037#ifdef CONFIG_RTC_DS1742
1038 1038
1039 rtc_get_time = rtc_ds1742_get_time; 1039 rtc_mips_get_time = rtc_ds1742_get_time;
1040 rtc_set_time = rtc_ds1742_set_time; 1040 rtc_mips_set_time = rtc_ds1742_set_time;
1041 1041
1042 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT, 1042 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_TIME_INIT,
1043 ":rtc_ds1742_init()-\n"); 1043 ":rtc_ds1742_init()-\n");
diff --git a/arch/mips/tx4938/common/rtc_rx5c348.c b/arch/mips/tx4938/common/rtc_rx5c348.c
index d249edbb6af4..07f782fc0725 100644
--- a/arch/mips/tx4938/common/rtc_rx5c348.c
+++ b/arch/mips/tx4938/common/rtc_rx5c348.c
@@ -14,6 +14,7 @@
14#include <linux/string.h> 14#include <linux/string.h>
15#include <linux/rtc.h> 15#include <linux/rtc.h>
16#include <linux/time.h> 16#include <linux/time.h>
17#include <linux/bcd.h>
17#include <asm/time.h> 18#include <asm/time.h>
18#include <asm/tx4938/spi.h> 19#include <asm/tx4938/spi.h>
19 20
@@ -77,17 +78,6 @@ spi_rtc_io(unsigned char *inbuf, unsigned char *outbuf, unsigned int count)
77 inbufs, incounts, outbufs, outcounts, 0); 78 inbufs, incounts, outbufs, outcounts, 0);
78} 79}
79 80
80/*
81 * Conversion between binary and BCD.
82 */
83#ifndef BCD_TO_BIN
84#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
85#endif
86
87#ifndef BIN_TO_BCD
88#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
89#endif
90
91/* RTC-dependent code for time.c */ 81/* RTC-dependent code for time.c */
92 82
93static int 83static int
@@ -197,6 +187,6 @@ rtc_rx5c348_init(int chipid)
197 srtc_24h = 1; 187 srtc_24h = 1;
198 188
199 /* set the function pointers */ 189 /* set the function pointers */
200 rtc_get_time = rtc_rx5c348_get_time; 190 rtc_mips_get_time = rtc_rx5c348_get_time;
201 rtc_set_time = rtc_rx5c348_set_time; 191 rtc_mips_set_time = rtc_rx5c348_set_time;
202} 192}
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 5c7ace982a49..9166cd4557eb 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -684,7 +684,7 @@ void __init tx4938_board_setup(void)
684 for (i = 0; i < 8; i++) { 684 for (i = 0; i < 8; i++) {
685 if (!(tx4938_ebuscptr->cr[i] & 0x8)) 685 if (!(tx4938_ebuscptr->cr[i] & 0x8))
686 continue; /* disabled */ 686 continue; /* disabled */
687 rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i); 687 rbtx4938_ce_base[i] = (unsigned long)TX4938_EBUSC_BA(i);
688 txboard_add_phys_region(rbtx4938_ce_base[i], TX4938_EBUSC_SIZE(i)); 688 txboard_add_phys_region(rbtx4938_ce_base[i], TX4938_EBUSC_SIZE(i));
689 } 689 }
690 690
diff --git a/arch/mips/vr41xx/common/bcu.c b/arch/mips/vr41xx/common/bcu.c
index de0c1b35f11c..ff272b2e8395 100644
--- a/arch/mips/vr41xx/common/bcu.c
+++ b/arch/mips/vr41xx/common/bcu.c
@@ -183,11 +183,11 @@ static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pc
183 switch (current_cpu_data.cputype) { 183 switch (current_cpu_data.cputype) {
184 case CPU_VR4111: 184 case CPU_VR4111:
185 if (!(clkspeed & DIV2B)) 185 if (!(clkspeed & DIV2B))
186 tclock = pclock / 2; 186 tclock = pclock / 2;
187 else if (!(clkspeed & DIV3B)) 187 else if (!(clkspeed & DIV3B))
188 tclock = pclock / 3; 188 tclock = pclock / 3;
189 else if (!(clkspeed & DIV4B)) 189 else if (!(clkspeed & DIV4B))
190 tclock = pclock / 4; 190 tclock = pclock / 4;
191 break; 191 break;
192 case CPU_VR4121: 192 case CPU_VR4121:
193 tclock = pclock / DIVT(clkspeed); 193 tclock = pclock / DIVT(clkspeed);
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-28 08:23:27 -0500