aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2005-11-21 09:56:52 -0500
committerDave Jones <davej@redhat.com>2005-11-21 09:56:52 -0500
commite7e37ee9c547213d726b29c2510cbb6696050405 (patch)
tree50c45625de666b23f209d79eb1bfae05c64feee9 /arch
parentc243f1f1f6545985afcc6adf1fc085729029c3ee (diff)
parentdb93a82fa9d8b4d6e31c227922eaae829253bb88 (diff)
Merge ../linus/
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/compressed/head.S30
-rw-r--r--arch/arm/common/sa1111.c12
-rw-r--r--arch/arm/configs/s3c2410_defconfig119
-rw-r--r--arch/arm/kernel/armksyms.c1
-rw-r--r--arch/arm/kernel/entry-common.S3
-rw-r--r--arch/arm/kernel/signal.c25
-rw-r--r--arch/arm/kernel/vmlinux.lds.S6
-rw-r--r--arch/arm/lib/getuser.S11
-rw-r--r--arch/arm/mach-pxa/corgi_lcd.c2
-rw-r--r--arch/arm/mach-realview/core.h2
-rw-r--r--arch/arm/mach-realview/localtimer.c2
-rw-r--r--arch/arm/mach-realview/platsmp.c3
-rw-r--r--arch/arm/mach-s3c2410/mach-bast.c28
-rw-r--r--arch/arm/mm/Makefile2
-rw-r--r--arch/arm/mm/blockops.c185
-rw-r--r--arch/arm/mm/init.c24
-rw-r--r--arch/arm/mm/ioremap.c3
-rw-r--r--arch/arm/plat-omap/dmtimer.c2
-rw-r--r--arch/arm/plat-omap/ocpi.c2
-rw-r--r--arch/arm/plat-omap/pm.c2
-rw-r--r--arch/arm/plat-omap/sram-fn.S2
-rw-r--r--arch/i386/kernel/acpi/boot.c4
-rw-r--r--arch/i386/kernel/mpparse.c5
-rw-r--r--arch/ia64/kernel/ivt.S133
-rw-r--r--arch/mips/Makefile1
-rw-r--r--arch/mips/au1000/common/setup.c2
-rw-r--r--arch/mips/configs/atlas_defconfig67
-rw-r--r--arch/mips/configs/bigsur_defconfig47
-rw-r--r--arch/mips/configs/capcella_defconfig44
-rw-r--r--arch/mips/configs/cobalt_defconfig44
-rw-r--r--arch/mips/configs/db1000_defconfig69
-rw-r--r--arch/mips/configs/db1100_defconfig69
-rw-r--r--arch/mips/configs/db1200_defconfig72
-rw-r--r--arch/mips/configs/db1500_defconfig159
-rw-r--r--arch/mips/configs/db1550_defconfig70
-rw-r--r--arch/mips/configs/ddb5476_defconfig48
-rw-r--r--arch/mips/configs/ddb5477_defconfig44
-rw-r--r--arch/mips/configs/decstation_defconfig55
-rw-r--r--arch/mips/configs/e55_defconfig44
-rw-r--r--arch/mips/configs/ev64120_defconfig44
-rw-r--r--arch/mips/configs/ev96100_defconfig42
-rw-r--r--arch/mips/configs/ip22_defconfig64
-rw-r--r--arch/mips/configs/ip27_defconfig63
-rw-r--r--arch/mips/configs/ip32_defconfig45
-rw-r--r--arch/mips/configs/it8172_defconfig50
-rw-r--r--arch/mips/configs/ivr_defconfig46
-rw-r--r--arch/mips/configs/jaguar-atx_defconfig42
-rw-r--r--arch/mips/configs/jmr3927_defconfig47
-rw-r--r--arch/mips/configs/lasat200_defconfig49
-rw-r--r--arch/mips/configs/malta_defconfig67
-rw-r--r--arch/mips/configs/mipssim_defconfig54
-rw-r--r--arch/mips/configs/mpc30x_defconfig48
-rw-r--r--arch/mips/configs/ocelot_3_defconfig59
-rw-r--r--arch/mips/configs/ocelot_c_defconfig42
-rw-r--r--arch/mips/configs/ocelot_defconfig43
-rw-r--r--arch/mips/configs/ocelot_g_defconfig42
-rw-r--r--arch/mips/configs/pb1100_defconfig68
-rw-r--r--arch/mips/configs/pb1500_defconfig70
-rw-r--r--arch/mips/configs/pb1550_defconfig70
-rw-r--r--arch/mips/configs/pnx8550-jbs_defconfig80
-rw-r--r--arch/mips/configs/pnx8550-v2pci_defconfig89
-rw-r--r--arch/mips/configs/qemu_defconfig43
-rw-r--r--arch/mips/configs/rbhma4500_defconfig65
-rw-r--r--arch/mips/configs/rm200_defconfig71
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig45
-rw-r--r--arch/mips/configs/sead_defconfig37
-rw-r--r--arch/mips/configs/tb0226_defconfig52
-rw-r--r--arch/mips/configs/tb0229_defconfig48
-rw-r--r--arch/mips/configs/workpad_defconfig46
-rw-r--r--arch/mips/configs/yosemite_defconfig44
-rw-r--r--arch/mips/ddb5xxx/ddb5477/lcd44780.c10
-rw-r--r--arch/mips/defconfig64
-rw-r--r--arch/mips/jmr3927/common/rtc_ds1742.c2
-rw-r--r--arch/mips/jmr3927/rbhma3100/setup.c2
-rw-r--r--arch/mips/mips-boards/sead/sead_int.c12
-rw-r--r--arch/mips/mips-boards/sead/sead_setup.c4
-rw-r--r--arch/mips/momentum/ocelot_g/gt-irq.c2
-rw-r--r--arch/mips/pci/Makefile2
-rw-r--r--arch/mips/pci/ops-tx3927.c114
-rw-r--r--arch/mips/pci/pci-jmr3927.c2
-rw-r--r--arch/mips/sgi-ip32/crime.c7
-rw-r--r--arch/parisc/kernel/drivers.c8
-rw-r--r--arch/parisc/kernel/entry.S1
-rw-r--r--arch/parisc/kernel/inventory.c2
-rw-r--r--arch/parisc/kernel/ioctl32.c546
-rw-r--r--arch/parisc/kernel/irq.c110
-rw-r--r--arch/parisc/kernel/perf.c33
-rw-r--r--arch/parisc/kernel/ptrace.c5
-rw-r--r--arch/parisc/kernel/signal.c1
-rw-r--r--arch/parisc/kernel/smp.c24
-rw-r--r--arch/parisc/kernel/syscall.S3
-rw-r--r--arch/powerpc/Kconfig13
-rw-r--r--arch/powerpc/Makefile9
-rw-r--r--arch/powerpc/boot/crt0.S23
-rw-r--r--arch/powerpc/configs/ppc64_defconfig (renamed from arch/ppc64/defconfig)346
-rw-r--r--arch/powerpc/configs/pseries_defconfig1
-rw-r--r--arch/powerpc/kernel/Makefile7
-rw-r--r--arch/powerpc/kernel/align.c (renamed from arch/ppc64/kernel/align.c)394
-rw-r--r--arch/powerpc/kernel/idle_64.c (renamed from arch/ppc64/kernel/idle.c)0
-rw-r--r--arch/powerpc/kernel/misc_32.S8
-rw-r--r--arch/powerpc/kernel/nvram_64.c (renamed from arch/ppc64/kernel/nvram.c)0
-rw-r--r--arch/powerpc/kernel/pci_64.c18
-rw-r--r--arch/powerpc/kernel/ppc_ksyms.c3
-rw-r--r--arch/powerpc/kernel/ptrace-common.h164
-rw-r--r--arch/powerpc/kernel/ptrace.c3
-rw-r--r--arch/powerpc/kernel/ptrace32.c3
-rw-r--r--arch/powerpc/kernel/rtas-rtc.c6
-rw-r--r--arch/powerpc/kernel/time.c28
-rw-r--r--arch/powerpc/mm/imalloc.c3
-rw-r--r--arch/powerpc/mm/init_64.c3
-rw-r--r--arch/powerpc/mm/mmu_decl.h14
-rw-r--r--arch/powerpc/mm/pgtable_64.c3
-rw-r--r--arch/powerpc/platforms/chrp/setup.c11
-rw-r--r--arch/powerpc/platforms/chrp/smp.c1
-rw-r--r--arch/powerpc/platforms/chrp/time.c3
-rw-r--r--arch/powerpc/platforms/maple/time.c11
-rw-r--r--arch/powerpc/platforms/powermac/smp.c6
-rw-r--r--arch/powerpc/platforms/pseries/eeh.c3
-rw-r--r--arch/powerpc/platforms/pseries/setup.c4
-rw-r--r--arch/powerpc/sysdev/mpic.c13
-rw-r--r--arch/ppc/kernel/Makefile4
-rw-r--r--arch/ppc/kernel/align.c410
-rw-r--r--arch/ppc/kernel/pci.c1
-rw-r--r--arch/ppc/platforms/85xx/mpc85xx_ads_common.h2
-rw-r--r--arch/ppc/platforms/85xx/stx_gp3.h2
-rw-r--r--arch/ppc/syslib/mpc83xx_sys.c28
-rw-r--r--arch/ppc64/Kconfig.debug65
-rw-r--r--arch/ppc64/Makefile142
-rw-r--r--arch/ppc64/configs/bpa_defconfig1024
-rw-r--r--arch/ppc64/configs/g5_defconfig1392
-rw-r--r--arch/ppc64/configs/iSeries_defconfig998
-rw-r--r--arch/ppc64/configs/maple_defconfig1062
-rw-r--r--arch/ppc64/configs/pSeries_defconfig1371
-rw-r--r--arch/ppc64/kernel/Makefile7
134 files changed, 3183 insertions, 8498 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 7c7f475e213e..6abafb6f1844 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -19,38 +19,28 @@
19 */ 19 */
20#ifdef DEBUG 20#ifdef DEBUG
21 21
22#include <asm/arch/debug-macro.S>
23
24#if defined(CONFIG_DEBUG_ICEDCC) 22#if defined(CONFIG_DEBUG_ICEDCC)
25 .macro loadsp, rb 23 .macro loadsp, rb
26 .endm 24 .endm
27 .macro writeb, ch, rb 25 .macro writeb, ch, rb
28 mcr p14, 0, \ch, c0, c1, 0 26 mcr p14, 0, \ch, c0, c1, 0
29 .endm 27 .endm
30#else 28#else
29
30#include <asm/arch/debug-macro.S>
31
31 .macro writeb, ch, rb 32 .macro writeb, ch, rb
32 senduart \ch, \rb 33 senduart \ch, \rb
33 .endm 34 .endm
34 35
35#if defined(CONFIG_FOOTBRIDGE) || \ 36#if defined(CONFIG_ARCH_SA1100)
36 defined(CONFIG_ARCH_RPC) || \
37 defined(CONFIG_ARCH_INTEGRATOR) || \
38 defined(CONFIG_ARCH_PXA) || \
39 defined(CONFIG_ARCH_IXP4XX) || \
40 defined(CONFIG_ARCH_IXP2000) || \
41 defined(CONFIG_ARCH_LH7A40X) || \
42 defined(CONFIG_ARCH_OMAP)
43 .macro loadsp, rb
44 addruart \rb
45 .endm
46#elif defined(CONFIG_ARCH_SA1100)
47 .macro loadsp, rb 37 .macro loadsp, rb
48 mov \rb, #0x80000000 @ physical base address 38 mov \rb, #0x80000000 @ physical base address
49# if defined(CONFIG_DEBUG_LL_SER3) 39#ifdef CONFIG_DEBUG_LL_SER3
50 add \rb, \rb, #0x00050000 @ Ser3 40 add \rb, \rb, #0x00050000 @ Ser3
51# else 41#else
52 add \rb, \rb, #0x00010000 @ Ser1 42 add \rb, \rb, #0x00010000 @ Ser1
53# endif 43#endif
54 .endm 44 .endm
55#elif defined(CONFIG_ARCH_IOP331) 45#elif defined(CONFIG_ARCH_IOP331)
56 .macro loadsp, rb 46 .macro loadsp, rb
@@ -64,7 +54,9 @@
64 add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT 54 add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
65 .endm 55 .endm
66#else 56#else
67#error no serial architecture defined 57 .macro loadsp, rb
58 addruart \rb
59 .endm
68#endif 60#endif
69#endif 61#endif
70#endif 62#endif
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 39a6eea300a2..d0d6e6d2d649 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -32,6 +32,7 @@
32#include <asm/io.h> 32#include <asm/io.h>
33#include <asm/irq.h> 33#include <asm/irq.h>
34#include <asm/mach/irq.h> 34#include <asm/mach/irq.h>
35#include <asm/sizes.h>
35 36
36#include <asm/hardware/sa1111.h> 37#include <asm/hardware/sa1111.h>
37 38
@@ -132,6 +133,17 @@ static struct sa1111_dev_info sa1111_devices[] = {
132 }, 133 },
133}; 134};
134 135
136void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes)
137{
138 unsigned int sz = SZ_1M >> PAGE_SHIFT;
139
140 if (node != 0)
141 sz = 0;
142
143 size[1] = size[0] - sz;
144 size[0] = sz;
145}
146
135/* 147/*
136 * SA1111 interrupt support. Since clearing an IRQ while there are 148 * SA1111 interrupt support. Since clearing an IRQ while there are
137 * active IRQs causes the interrupt output to pulse, the upper levels 149 * active IRQs causes the interrupt output to pulse, the upper levels
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index 756348bf5170..3f97590c91f2 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_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.13-git8 3# Linux kernel version: 2.6.15-rc1
4# Thu Sep 8 19:24:02 2005 4# Sun Nov 13 17:41:24 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -62,6 +62,23 @@ CONFIG_OBSOLETE_MODPARM=y
62CONFIG_KMOD=y 62CONFIG_KMOD=y
63 63
64# 64#
65# Block layer
66#
67
68#
69# IO Schedulers
70#
71CONFIG_IOSCHED_NOOP=y
72CONFIG_IOSCHED_AS=y
73CONFIG_IOSCHED_DEADLINE=y
74CONFIG_IOSCHED_CFQ=y
75CONFIG_DEFAULT_AS=y
76# CONFIG_DEFAULT_DEADLINE is not set
77# CONFIG_DEFAULT_CFQ is not set
78# CONFIG_DEFAULT_NOOP is not set
79CONFIG_DEFAULT_IOSCHED="anticipatory"
80
81#
65# System Type 82# System Type
66# 83#
67# CONFIG_ARCH_CLPS7500 is not set 84# CONFIG_ARCH_CLPS7500 is not set
@@ -83,6 +100,7 @@ CONFIG_ARCH_S3C2410=y
83# CONFIG_ARCH_LH7A40X is not set 100# CONFIG_ARCH_LH7A40X is not set
84# CONFIG_ARCH_OMAP is not set 101# CONFIG_ARCH_OMAP is not set
85# CONFIG_ARCH_VERSATILE is not set 102# CONFIG_ARCH_VERSATILE is not set
103# CONFIG_ARCH_REALVIEW is not set
86# CONFIG_ARCH_IMX is not set 104# CONFIG_ARCH_IMX is not set
87# CONFIG_ARCH_H720X is not set 105# CONFIG_ARCH_H720X is not set
88# CONFIG_ARCH_AAEC2000 is not set 106# CONFIG_ARCH_AAEC2000 is not set
@@ -108,6 +126,7 @@ CONFIG_CPU_S3C2440=y
108# S3C2410 Boot 126# S3C2410 Boot
109# 127#
110# CONFIG_S3C2410_BOOT_WATCHDOG is not set 128# CONFIG_S3C2410_BOOT_WATCHDOG is not set
129# CONFIG_S3C2410_BOOT_ERROR_RESET is not set
111 130
112# 131#
113# S3C2410 Setup 132# S3C2410 Setup
@@ -142,6 +161,7 @@ CONFIG_CPU_TLB_V4WBI=y
142# 161#
143# Bus support 162# Bus support
144# 163#
164CONFIG_ISA=y
145CONFIG_ISA_DMA_API=y 165CONFIG_ISA_DMA_API=y
146 166
147# 167#
@@ -152,7 +172,6 @@ CONFIG_ISA_DMA_API=y
152# 172#
153# Kernel Features 173# Kernel Features
154# 174#
155# CONFIG_SMP is not set
156# CONFIG_PREEMPT is not set 175# CONFIG_PREEMPT is not set
157# CONFIG_NO_IDLE_HZ is not set 176# CONFIG_NO_IDLE_HZ is not set
158# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set 177# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -163,6 +182,7 @@ CONFIG_FLATMEM_MANUAL=y
163CONFIG_FLATMEM=y 182CONFIG_FLATMEM=y
164CONFIG_FLAT_NODE_MEM_MAP=y 183CONFIG_FLAT_NODE_MEM_MAP=y
165# CONFIG_SPARSEMEM_STATIC is not set 184# CONFIG_SPARSEMEM_STATIC is not set
185CONFIG_SPLIT_PTLOCK_CPUS=4096
166CONFIG_ALIGNMENT_TRAP=y 186CONFIG_ALIGNMENT_TRAP=y
167 187
168# 188#
@@ -253,6 +273,10 @@ CONFIG_TCP_CONG_BIC=y
253# CONFIG_NET_DIVERT is not set 273# CONFIG_NET_DIVERT is not set
254# CONFIG_ECONET is not set 274# CONFIG_ECONET is not set
255# CONFIG_WAN_ROUTER is not set 275# CONFIG_WAN_ROUTER is not set
276
277#
278# QoS and/or fair queueing
279#
256# CONFIG_NET_SCHED is not set 280# CONFIG_NET_SCHED is not set
257# CONFIG_NET_CLS_ROUTE is not set 281# CONFIG_NET_CLS_ROUTE is not set
258 282
@@ -260,7 +284,6 @@ CONFIG_TCP_CONG_BIC=y
260# Network testing 284# Network testing
261# 285#
262# CONFIG_NET_PKTGEN is not set 286# CONFIG_NET_PKTGEN is not set
263# CONFIG_NETFILTER_NETLINK is not set
264# CONFIG_HAMRADIO is not set 287# CONFIG_HAMRADIO is not set
265# CONFIG_IRDA is not set 288# CONFIG_IRDA is not set
266# CONFIG_BT is not set 289# CONFIG_BT is not set
@@ -300,6 +323,7 @@ CONFIG_MTD_BLOCK=y
300# CONFIG_FTL is not set 323# CONFIG_FTL is not set
301# CONFIG_NFTL is not set 324# CONFIG_NFTL is not set
302# CONFIG_INFTL is not set 325# CONFIG_INFTL is not set
326# CONFIG_RFD_FTL is not set
303 327
304# 328#
305# RAM/ROM/Flash chip drivers 329# RAM/ROM/Flash chip drivers
@@ -335,7 +359,6 @@ CONFIG_MTD_ROM=y
335# CONFIG_MTD_COMPLEX_MAPPINGS is not set 359# CONFIG_MTD_COMPLEX_MAPPINGS is not set
336# CONFIG_MTD_PHYSMAP is not set 360# CONFIG_MTD_PHYSMAP is not set
337# CONFIG_MTD_ARM_INTEGRATOR is not set 361# CONFIG_MTD_ARM_INTEGRATOR is not set
338# CONFIG_MTD_EDB7312 is not set
339# CONFIG_MTD_IMPA7 is not set 362# CONFIG_MTD_IMPA7 is not set
340CONFIG_MTD_BAST=y 363CONFIG_MTD_BAST=y
341CONFIG_MTD_BAST_MAXSIZE=4 364CONFIG_MTD_BAST_MAXSIZE=4
@@ -370,6 +393,11 @@ CONFIG_MTD_NAND_S3C2410=y
370# CONFIG_MTD_NAND_NANDSIM is not set 393# CONFIG_MTD_NAND_NANDSIM is not set
371 394
372# 395#
396# OneNAND Flash Device Drivers
397#
398# CONFIG_MTD_ONENAND is not set
399
400#
373# Parallel port support 401# Parallel port support
374# 402#
375CONFIG_PARPORT=y 403CONFIG_PARPORT=y
@@ -381,10 +409,12 @@ CONFIG_PARPORT_1284=y
381# 409#
382# Plug and Play support 410# Plug and Play support
383# 411#
412# CONFIG_PNP is not set
384 413
385# 414#
386# Block devices 415# Block devices
387# 416#
417# CONFIG_BLK_DEV_XD is not set
388# CONFIG_PARIDE is not set 418# CONFIG_PARIDE is not set
389# CONFIG_BLK_DEV_COW_COMMON is not set 419# CONFIG_BLK_DEV_COW_COMMON is not set
390CONFIG_BLK_DEV_LOOP=y 420CONFIG_BLK_DEV_LOOP=y
@@ -395,14 +425,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
395CONFIG_BLK_DEV_RAM_SIZE=4096 425CONFIG_BLK_DEV_RAM_SIZE=4096
396CONFIG_BLK_DEV_INITRD=y 426CONFIG_BLK_DEV_INITRD=y
397# CONFIG_CDROM_PKTCDVD is not set 427# CONFIG_CDROM_PKTCDVD is not set
398
399#
400# IO Schedulers
401#
402CONFIG_IOSCHED_NOOP=y
403CONFIG_IOSCHED_AS=y
404CONFIG_IOSCHED_DEADLINE=y
405CONFIG_IOSCHED_CFQ=y
406CONFIG_ATA_OVER_ETH=m 428CONFIG_ATA_OVER_ETH=m
407 429
408# 430#
@@ -428,6 +450,7 @@ CONFIG_BLK_DEV_IDEFLOPPY=m
428CONFIG_IDE_GENERIC=y 450CONFIG_IDE_GENERIC=y
429# CONFIG_IDE_ARM is not set 451# CONFIG_IDE_ARM is not set
430CONFIG_BLK_DEV_IDE_BAST=y 452CONFIG_BLK_DEV_IDE_BAST=y
453# CONFIG_IDE_CHIPSETS is not set
431# CONFIG_BLK_DEV_IDEDMA is not set 454# CONFIG_BLK_DEV_IDEDMA is not set
432# CONFIG_IDEDMA_AUTO is not set 455# CONFIG_IDEDMA_AUTO is not set
433# CONFIG_BLK_DEV_HD is not set 456# CONFIG_BLK_DEV_HD is not set
@@ -467,6 +490,11 @@ CONFIG_NETDEVICES=y
467# CONFIG_TUN is not set 490# CONFIG_TUN is not set
468 491
469# 492#
493# ARCnet devices
494#
495# CONFIG_ARCNET is not set
496
497#
470# PHY device support 498# PHY device support
471# 499#
472# CONFIG_PHYLIB is not set 500# CONFIG_PHYLIB is not set
@@ -475,9 +503,19 @@ CONFIG_NETDEVICES=y
475# Ethernet (10 or 100Mbit) 503# Ethernet (10 or 100Mbit)
476# 504#
477CONFIG_NET_ETHERNET=y 505CONFIG_NET_ETHERNET=y
478CONFIG_MII=m 506CONFIG_MII=y
507# CONFIG_NET_VENDOR_3COM is not set
508# CONFIG_LANCE is not set
509# CONFIG_NET_VENDOR_SMC is not set
479# CONFIG_SMC91X is not set 510# CONFIG_SMC91X is not set
480CONFIG_DM9000=m 511CONFIG_DM9000=y
512# CONFIG_NET_VENDOR_RACAL is not set
513# CONFIG_AT1700 is not set
514# CONFIG_DEPCA is not set
515# CONFIG_HP100 is not set
516# CONFIG_NET_ISA is not set
517# CONFIG_NET_PCI is not set
518# CONFIG_NET_POCKET is not set
481 519
482# 520#
483# Ethernet (1000 Mbit) 521# Ethernet (1000 Mbit)
@@ -490,6 +528,7 @@ CONFIG_DM9000=m
490# 528#
491# Token Ring devices 529# Token Ring devices
492# 530#
531# CONFIG_TR is not set
493 532
494# 533#
495# Wireless LAN (non-hamradio) 534# Wireless LAN (non-hamradio)
@@ -542,6 +581,9 @@ CONFIG_KEYBOARD_ATKBD=y
542CONFIG_INPUT_MOUSE=y 581CONFIG_INPUT_MOUSE=y
543CONFIG_MOUSE_PS2=y 582CONFIG_MOUSE_PS2=y
544# CONFIG_MOUSE_SERIAL is not set 583# CONFIG_MOUSE_SERIAL is not set
584# CONFIG_MOUSE_INPORT is not set
585# CONFIG_MOUSE_LOGIBM is not set
586# CONFIG_MOUSE_PC110PAD is not set
545# CONFIG_MOUSE_VSXXXAA is not set 587# CONFIG_MOUSE_VSXXXAA is not set
546# CONFIG_INPUT_JOYSTICK is not set 588# CONFIG_INPUT_JOYSTICK is not set
547# CONFIG_INPUT_TOUCHSCREEN is not set 589# CONFIG_INPUT_TOUCHSCREEN is not set
@@ -568,6 +610,7 @@ CONFIG_SERIAL_NONSTANDARD=y
568# CONFIG_ROCKETPORT is not set 610# CONFIG_ROCKETPORT is not set
569# CONFIG_CYCLADES is not set 611# CONFIG_CYCLADES is not set
570# CONFIG_DIGIEPCA is not set 612# CONFIG_DIGIEPCA is not set
613# CONFIG_ESPSERIAL is not set
571# CONFIG_MOXA_INTELLIO is not set 614# CONFIG_MOXA_INTELLIO is not set
572# CONFIG_MOXA_SMARTIO is not set 615# CONFIG_MOXA_SMARTIO is not set
573# CONFIG_ISI is not set 616# CONFIG_ISI is not set
@@ -590,6 +633,10 @@ CONFIG_SERIAL_8250_MANY_PORTS=y
590CONFIG_SERIAL_8250_SHARE_IRQ=y 633CONFIG_SERIAL_8250_SHARE_IRQ=y
591# CONFIG_SERIAL_8250_DETECT_IRQ is not set 634# CONFIG_SERIAL_8250_DETECT_IRQ is not set
592# CONFIG_SERIAL_8250_RSA is not set 635# CONFIG_SERIAL_8250_RSA is not set
636# CONFIG_SERIAL_8250_FOURPORT is not set
637# CONFIG_SERIAL_8250_ACCENT is not set
638# CONFIG_SERIAL_8250_BOCA is not set
639# CONFIG_SERIAL_8250_HUB6 is not set
593 640
594# 641#
595# Non-8250 serial port support 642# Non-8250 serial port support
@@ -622,6 +669,13 @@ CONFIG_WATCHDOG=y
622# 669#
623# CONFIG_SOFT_WATCHDOG is not set 670# CONFIG_SOFT_WATCHDOG is not set
624CONFIG_S3C2410_WATCHDOG=y 671CONFIG_S3C2410_WATCHDOG=y
672
673#
674# ISA-based Watchdog Cards
675#
676# CONFIG_PCWATCHDOG is not set
677# CONFIG_MIXCOMWD is not set
678# CONFIG_WDT is not set
625# CONFIG_NVRAM is not set 679# CONFIG_NVRAM is not set
626# CONFIG_RTC is not set 680# CONFIG_RTC is not set
627CONFIG_S3C2410_RTC=y 681CONFIG_S3C2410_RTC=y
@@ -636,6 +690,7 @@ CONFIG_S3C2410_RTC=y
636# 690#
637# TPM devices 691# TPM devices
638# 692#
693# CONFIG_TELCLOCK is not set
639 694
640# 695#
641# I2C support 696# I2C support
@@ -653,6 +708,7 @@ CONFIG_I2C_ALGOBIT=m
653# 708#
654# I2C Hardware Bus support 709# I2C Hardware Bus support
655# 710#
711# CONFIG_I2C_ELEKTOR is not set
656CONFIG_I2C_ISA=m 712CONFIG_I2C_ISA=m
657# CONFIG_I2C_PARPORT is not set 713# CONFIG_I2C_PARPORT is not set
658# CONFIG_I2C_PARPORT_LIGHT is not set 714# CONFIG_I2C_PARPORT_LIGHT is not set
@@ -671,6 +727,7 @@ CONFIG_SENSORS_EEPROM=m
671# CONFIG_SENSORS_PCF8591 is not set 727# CONFIG_SENSORS_PCF8591 is not set
672# CONFIG_SENSORS_RTC8564 is not set 728# CONFIG_SENSORS_RTC8564 is not set
673# CONFIG_SENSORS_MAX6875 is not set 729# CONFIG_SENSORS_MAX6875 is not set
730# CONFIG_RTC_X1205_I2C is not set
674# CONFIG_I2C_DEBUG_CORE is not set 731# CONFIG_I2C_DEBUG_CORE is not set
675# CONFIG_I2C_DEBUG_ALGO is not set 732# CONFIG_I2C_DEBUG_ALGO is not set
676# CONFIG_I2C_DEBUG_BUS is not set 733# CONFIG_I2C_DEBUG_BUS is not set
@@ -737,22 +794,28 @@ CONFIG_SENSORS_LM85=m
737# Graphics support 794# Graphics support
738# 795#
739CONFIG_FB=y 796CONFIG_FB=y
740# CONFIG_FB_CFB_FILLRECT is not set 797CONFIG_FB_CFB_FILLRECT=y
741# CONFIG_FB_CFB_COPYAREA is not set 798CONFIG_FB_CFB_COPYAREA=y
742# CONFIG_FB_CFB_IMAGEBLIT is not set 799CONFIG_FB_CFB_IMAGEBLIT=y
743# CONFIG_FB_SOFT_CURSOR is not set
744# CONFIG_FB_MACMODES is not set 800# CONFIG_FB_MACMODES is not set
745CONFIG_FB_MODE_HELPERS=y 801CONFIG_FB_MODE_HELPERS=y
746# CONFIG_FB_TILEBLITTING is not set 802# CONFIG_FB_TILEBLITTING is not set
747# CONFIG_FB_S1D13XXX is not set 803# CONFIG_FB_S1D13XXX is not set
804CONFIG_FB_S3C2410=y
805# CONFIG_FB_S3C2410_DEBUG is not set
748# CONFIG_FB_VIRTUAL is not set 806# CONFIG_FB_VIRTUAL is not set
749 807
750# 808#
751# Console display driver support 809# Console display driver support
752# 810#
753# CONFIG_VGA_CONSOLE is not set 811# CONFIG_VGA_CONSOLE is not set
812# CONFIG_MDA_CONSOLE is not set
754CONFIG_DUMMY_CONSOLE=y 813CONFIG_DUMMY_CONSOLE=y
755# CONFIG_FRAMEBUFFER_CONSOLE is not set 814CONFIG_FRAMEBUFFER_CONSOLE=y
815# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
816# CONFIG_FONTS is not set
817CONFIG_FONT_8x8=y
818CONFIG_FONT_8x16=y
756 819
757# 820#
758# Logo configuration 821# Logo configuration
@@ -773,6 +836,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
773# CONFIG_USB is not set 836# CONFIG_USB is not set
774 837
775# 838#
839# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
840#
841
842#
776# USB Gadget Support 843# USB Gadget Support
777# 844#
778# CONFIG_USB_GADGET is not set 845# CONFIG_USB_GADGET is not set
@@ -798,10 +865,6 @@ CONFIG_FS_MBCACHE=y
798# CONFIG_REISERFS_FS is not set 865# CONFIG_REISERFS_FS is not set
799# CONFIG_JFS_FS is not set 866# CONFIG_JFS_FS is not set
800# CONFIG_FS_POSIX_ACL is not set 867# CONFIG_FS_POSIX_ACL is not set
801
802#
803# XFS support
804#
805# CONFIG_XFS_FS is not set 868# CONFIG_XFS_FS is not set
806# CONFIG_MINIX_FS is not set 869# CONFIG_MINIX_FS is not set
807CONFIG_ROMFS_FS=y 870CONFIG_ROMFS_FS=y
@@ -810,6 +873,7 @@ CONFIG_INOTIFY=y
810CONFIG_DNOTIFY=y 873CONFIG_DNOTIFY=y
811# CONFIG_AUTOFS_FS is not set 874# CONFIG_AUTOFS_FS is not set
812# CONFIG_AUTOFS4_FS is not set 875# CONFIG_AUTOFS4_FS is not set
876# CONFIG_FUSE_FS is not set
813 877
814# 878#
815# CD-ROM/DVD Filesystems 879# CD-ROM/DVD Filesystems
@@ -854,6 +918,7 @@ CONFIG_JFFS_FS_VERBOSE=0
854CONFIG_JFFS2_FS=y 918CONFIG_JFFS2_FS=y
855CONFIG_JFFS2_FS_DEBUG=0 919CONFIG_JFFS2_FS_DEBUG=0
856CONFIG_JFFS2_FS_WRITEBUFFER=y 920CONFIG_JFFS2_FS_WRITEBUFFER=y
921# CONFIG_JFFS2_SUMMARY is not set
857# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 922# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
858CONFIG_JFFS2_ZLIB=y 923CONFIG_JFFS2_ZLIB=y
859CONFIG_JFFS2_RTIME=y 924CONFIG_JFFS2_RTIME=y
@@ -884,6 +949,7 @@ CONFIG_SUNRPC=y
884# CONFIG_NCP_FS is not set 949# CONFIG_NCP_FS is not set
885# CONFIG_CODA_FS is not set 950# CONFIG_CODA_FS is not set
886# CONFIG_AFS_FS is not set 951# CONFIG_AFS_FS is not set
952# CONFIG_9P_FS is not set
887 953
888# 954#
889# Partition Types 955# Partition Types
@@ -959,7 +1025,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
959# 1025#
960# CONFIG_PRINTK_TIME is not set 1026# CONFIG_PRINTK_TIME is not set
961CONFIG_DEBUG_KERNEL=y 1027CONFIG_DEBUG_KERNEL=y
962# CONFIG_MAGIC_SYSRQ is not set 1028CONFIG_MAGIC_SYSRQ=y
963CONFIG_LOG_BUF_SHIFT=16 1029CONFIG_LOG_BUF_SHIFT=16
964CONFIG_DETECT_SOFTLOCKUP=y 1030CONFIG_DETECT_SOFTLOCKUP=y
965# CONFIG_SCHEDSTATS is not set 1031# CONFIG_SCHEDSTATS is not set
@@ -970,7 +1036,9 @@ CONFIG_DETECT_SOFTLOCKUP=y
970CONFIG_DEBUG_BUGVERBOSE=y 1036CONFIG_DEBUG_BUGVERBOSE=y
971CONFIG_DEBUG_INFO=y 1037CONFIG_DEBUG_INFO=y
972# CONFIG_DEBUG_FS is not set 1038# CONFIG_DEBUG_FS is not set
1039# CONFIG_DEBUG_VM is not set
973CONFIG_FRAME_POINTER=y 1040CONFIG_FRAME_POINTER=y
1041# CONFIG_RCU_TORTURE_TEST is not set
974CONFIG_DEBUG_USER=y 1042CONFIG_DEBUG_USER=y
975# CONFIG_DEBUG_WAITQ is not set 1043# CONFIG_DEBUG_WAITQ is not set
976# CONFIG_DEBUG_ERRORS is not set 1044# CONFIG_DEBUG_ERRORS is not set
@@ -998,6 +1066,7 @@ CONFIG_DEBUG_S3C2410_UART=0
998# Library routines 1066# Library routines
999# 1067#
1000# CONFIG_CRC_CCITT is not set 1068# CONFIG_CRC_CCITT is not set
1069# CONFIG_CRC16 is not set
1001CONFIG_CRC32=y 1070CONFIG_CRC32=y
1002# CONFIG_LIBCRC32C is not set 1071# CONFIG_LIBCRC32C is not set
1003CONFIG_ZLIB_INFLATE=y 1072CONFIG_ZLIB_INFLATE=y
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index 7a3261f0bf79..9997098009a9 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -120,7 +120,6 @@ EXPORT_SYMBOL(__arch_strncpy_from_user);
120EXPORT_SYMBOL(__get_user_1); 120EXPORT_SYMBOL(__get_user_1);
121EXPORT_SYMBOL(__get_user_2); 121EXPORT_SYMBOL(__get_user_2);
122EXPORT_SYMBOL(__get_user_4); 122EXPORT_SYMBOL(__get_user_4);
123EXPORT_SYMBOL(__get_user_8);
124 123
125EXPORT_SYMBOL(__put_user_1); 124EXPORT_SYMBOL(__put_user_1);
126EXPORT_SYMBOL(__put_user_2); 125EXPORT_SYMBOL(__put_user_2);
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 066597f4345a..f7f183075237 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -48,8 +48,7 @@ work_pending:
48 mov r0, sp @ 'regs' 48 mov r0, sp @ 'regs'
49 mov r2, why @ 'syscall' 49 mov r2, why @ 'syscall'
50 bl do_notify_resume 50 bl do_notify_resume
51 disable_irq @ disable interrupts 51 b ret_slow_syscall @ Check work again
52 b no_work_pending
53 52
54work_resched: 53work_resched:
55 bl schedule 54 bl schedule
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index a917e3dd3666..765922bcf9e7 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -595,23 +595,22 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
595 */ 595 */
596 ret |= !valid_user_regs(regs); 596 ret |= !valid_user_regs(regs);
597 597
598 /*
599 * Block the signal if we were unsuccessful.
600 */
601 if (ret != 0) { 598 if (ret != 0) {
602 spin_lock_irq(&tsk->sighand->siglock); 599 force_sigsegv(sig, tsk);
603 sigorsets(&tsk->blocked, &tsk->blocked, 600 return;
604 &ka->sa.sa_mask);
605 if (!(ka->sa.sa_flags & SA_NODEFER))
606 sigaddset(&tsk->blocked, sig);
607 recalc_sigpending();
608 spin_unlock_irq(&tsk->sighand->siglock);
609 } 601 }
610 602
611 if (ret == 0) 603 /*
612 return; 604 * Block the signal if we were successful.
605 */
606 spin_lock_irq(&tsk->sighand->siglock);
607 sigorsets(&tsk->blocked, &tsk->blocked,
608 &ka->sa.sa_mask);
609 if (!(ka->sa.sa_flags & SA_NODEFER))
610 sigaddset(&tsk->blocked, sig);
611 recalc_sigpending();
612 spin_unlock_irq(&tsk->sighand->siglock);
613 613
614 force_sigsegv(sig, tsk);
615} 614}
616 615
617/* 616/*
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 80c8e4c8cefa..9a47770114d4 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -172,6 +172,10 @@ SECTIONS
172 .comment 0 : { *(.comment) } 172 .comment 0 : { *(.comment) }
173} 173}
174 174
175/* those must never be empty */ 175/*
176 * These must never be empty
177 * If you have to comment these two assert statements out, your
178 * binutils is too old (for other reasons as well)
179 */
176ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") 180ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support")
177ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") 181ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined")
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index d204018070a4..c03ea8e666ba 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -54,15 +54,6 @@ __get_user_4:
54 mov r0, #0 54 mov r0, #0
55 mov pc, lr 55 mov pc, lr
56 56
57 .global __get_user_8
58__get_user_8:
595: ldrt r2, [r0], #4
606: ldrt r3, [r0]
61 mov r0, #0
62 mov pc, lr
63
64__get_user_bad_8:
65 mov r3, #0
66__get_user_bad: 57__get_user_bad:
67 mov r2, #0 58 mov r2, #0
68 mov r0, #-EFAULT 59 mov r0, #-EFAULT
@@ -73,6 +64,4 @@ __get_user_bad:
73 .long 2b, __get_user_bad 64 .long 2b, __get_user_bad
74 .long 3b, __get_user_bad 65 .long 3b, __get_user_bad
75 .long 4b, __get_user_bad 66 .long 4b, __get_user_bad
76 .long 5b, __get_user_bad_8
77 .long 6b, __get_user_bad_8
78.previous 67.previous
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c
index 698eb06545c4..6dbcaf114ad7 100644
--- a/arch/arm/mach-pxa/corgi_lcd.c
+++ b/arch/arm/mach-pxa/corgi_lcd.c
@@ -22,7 +22,7 @@
22#include <linux/string.h> 22#include <linux/string.h>
23#include <asm/arch/akita.h> 23#include <asm/arch/akita.h>
24#include <asm/arch/corgi.h> 24#include <asm/arch/corgi.h>
25#include <asm/arch/hardware.h> 25#include <asm/hardware.h>
26#include <asm/arch/pxa-regs.h> 26#include <asm/arch/pxa-regs.h>
27#include <asm/arch/sharpsl.h> 27#include <asm/arch/sharpsl.h>
28#include <asm/arch/spitz.h> 28#include <asm/arch/spitz.h>
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index d83e8bad2038..c06e6041df41 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -26,8 +26,6 @@
26#include <asm/leds.h> 26#include <asm/leds.h>
27#include <asm/io.h> 27#include <asm/io.h>
28 28
29#define __io_address(n) __io(IO_ADDRESS(n))
30
31extern struct sys_timer realview_timer; 29extern struct sys_timer realview_timer;
32 30
33#define AMBA_DEVICE(name,busid,base,plat) \ 31#define AMBA_DEVICE(name,busid,base,plat) \
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index 5e917e37d095..c9d7c596b200 100644
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -21,8 +21,6 @@
21#include <asm/io.h> 21#include <asm/io.h>
22#include <asm/irq.h> 22#include <asm/irq.h>
23 23
24#include "core.h"
25
26#define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \ 24#define TWD_BASE(cpu) (__io_address(REALVIEW_TWD_BASE) + \
27 ((cpu) * REALVIEW_TWD_SIZE)) 25 ((cpu) * REALVIEW_TWD_SIZE))
28 26
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index 0c7d4ac9a7b3..a8fbd76d8be5 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -17,8 +17,7 @@
17#include <asm/cacheflush.h> 17#include <asm/cacheflush.h>
18#include <asm/hardware/arm_scu.h> 18#include <asm/hardware/arm_scu.h>
19#include <asm/hardware.h> 19#include <asm/hardware.h>
20 20#include <asm/io.h>
21#include "core.h"
22 21
23extern void realview_secondary_startup(void); 22extern void realview_secondary_startup(void);
24 23
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 1be2567a7486..4d962717fdf7 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -203,7 +203,7 @@ static struct s3c24xx_uart_clksrc bast_serial_clocks[] = {
203 .name = "pclk", 203 .name = "pclk",
204 .divisor = 1, 204 .divisor = 1,
205 .min_baud = 0, 205 .min_baud = 0,
206 .max_baud = 0. 206 .max_baud = 0,
207 } 207 }
208}; 208};
209 209
@@ -216,7 +216,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] = {
216 .ulcon = ULCON, 216 .ulcon = ULCON,
217 .ufcon = UFCON, 217 .ufcon = UFCON,
218 .clocks = bast_serial_clocks, 218 .clocks = bast_serial_clocks,
219 .clocks_size = ARRAY_SIZE(bast_serial_clocks) 219 .clocks_size = ARRAY_SIZE(bast_serial_clocks),
220 }, 220 },
221 [1] = { 221 [1] = {
222 .hwport = 1, 222 .hwport = 1,
@@ -225,7 +225,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] = {
225 .ulcon = ULCON, 225 .ulcon = ULCON,
226 .ufcon = UFCON, 226 .ufcon = UFCON,
227 .clocks = bast_serial_clocks, 227 .clocks = bast_serial_clocks,
228 .clocks_size = ARRAY_SIZE(bast_serial_clocks) 228 .clocks_size = ARRAY_SIZE(bast_serial_clocks),
229 }, 229 },
230 /* port 2 is not actually used */ 230 /* port 2 is not actually used */
231 [2] = { 231 [2] = {
@@ -235,7 +235,7 @@ static struct s3c2410_uartcfg bast_uartcfgs[] = {
235 .ulcon = ULCON, 235 .ulcon = ULCON,
236 .ufcon = UFCON, 236 .ufcon = UFCON,
237 .clocks = bast_serial_clocks, 237 .clocks = bast_serial_clocks,
238 .clocks_size = ARRAY_SIZE(bast_serial_clocks) 238 .clocks_size = ARRAY_SIZE(bast_serial_clocks),
239 } 239 }
240}; 240};
241 241
@@ -268,7 +268,7 @@ static struct mtd_partition bast_default_nand_part[] = {
268 [0] = { 268 [0] = {
269 .name = "Boot Agent", 269 .name = "Boot Agent",
270 .size = SZ_16K, 270 .size = SZ_16K,
271 .offset = 0 271 .offset = 0,
272 }, 272 },
273 [1] = { 273 [1] = {
274 .name = "/boot", 274 .name = "/boot",
@@ -296,28 +296,28 @@ static struct s3c2410_nand_set bast_nand_sets[] = {
296 .nr_chips = 1, 296 .nr_chips = 1,
297 .nr_map = smartmedia_map, 297 .nr_map = smartmedia_map,
298 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 298 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
299 .partitions = bast_default_nand_part 299 .partitions = bast_default_nand_part,
300 }, 300 },
301 [1] = { 301 [1] = {
302 .name = "chip0", 302 .name = "chip0",
303 .nr_chips = 1, 303 .nr_chips = 1,
304 .nr_map = chip0_map, 304 .nr_map = chip0_map,
305 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 305 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
306 .partitions = bast_default_nand_part 306 .partitions = bast_default_nand_part,
307 }, 307 },
308 [2] = { 308 [2] = {
309 .name = "chip1", 309 .name = "chip1",
310 .nr_chips = 1, 310 .nr_chips = 1,
311 .nr_map = chip1_map, 311 .nr_map = chip1_map,
312 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 312 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
313 .partitions = bast_default_nand_part 313 .partitions = bast_default_nand_part,
314 }, 314 },
315 [3] = { 315 [3] = {
316 .name = "chip2", 316 .name = "chip2",
317 .nr_chips = 1, 317 .nr_chips = 1,
318 .nr_map = chip2_map, 318 .nr_map = chip2_map,
319 .nr_partitions = ARRAY_SIZE(bast_default_nand_part), 319 .nr_partitions = ARRAY_SIZE(bast_default_nand_part),
320 .partitions = bast_default_nand_part 320 .partitions = bast_default_nand_part,
321 } 321 }
322}; 322};
323 323
@@ -355,17 +355,17 @@ static struct resource bast_dm9k_resource[] = {
355 [0] = { 355 [0] = {
356 .start = S3C2410_CS5 + BAST_PA_DM9000, 356 .start = S3C2410_CS5 + BAST_PA_DM9000,
357 .end = S3C2410_CS5 + BAST_PA_DM9000 + 3, 357 .end = S3C2410_CS5 + BAST_PA_DM9000 + 3,
358 .flags = IORESOURCE_MEM 358 .flags = IORESOURCE_MEM,
359 }, 359 },
360 [1] = { 360 [1] = {
361 .start = S3C2410_CS5 + BAST_PA_DM9000 + 0x40, 361 .start = S3C2410_CS5 + BAST_PA_DM9000 + 0x40,
362 .end = S3C2410_CS5 + BAST_PA_DM9000 + 0x40 + 0x3f, 362 .end = S3C2410_CS5 + BAST_PA_DM9000 + 0x40 + 0x3f,
363 .flags = IORESOURCE_MEM 363 .flags = IORESOURCE_MEM,
364 }, 364 },
365 [2] = { 365 [2] = {
366 .start = IRQ_DM9000, 366 .start = IRQ_DM9000,
367 .end = IRQ_DM9000, 367 .end = IRQ_DM9000,
368 .flags = IORESOURCE_IRQ 368 .flags = IORESOURCE_IRQ,
369 } 369 }
370 370
371}; 371};
@@ -375,7 +375,7 @@ static struct resource bast_dm9k_resource[] = {
375*/ 375*/
376 376
377static struct dm9000_plat_data bast_dm9k_platdata = { 377static struct dm9000_plat_data bast_dm9k_platdata = {
378 .flags = DM9000_PLATF_16BITONLY 378 .flags = DM9000_PLATF_16BITONLY,
379}; 379};
380 380
381static struct platform_device bast_device_dm9k = { 381static struct platform_device bast_device_dm9k = {
@@ -492,7 +492,7 @@ static struct s3c24xx_board bast_board __initdata = {
492 .devices = bast_devices, 492 .devices = bast_devices,
493 .devices_count = ARRAY_SIZE(bast_devices), 493 .devices_count = ARRAY_SIZE(bast_devices),
494 .clocks = bast_clocks, 494 .clocks = bast_clocks,
495 .clocks_count = ARRAY_SIZE(bast_clocks) 495 .clocks_count = ARRAY_SIZE(bast_clocks),
496}; 496};
497 497
498static void __init bast_map_io(void) 498static void __init bast_map_io(void)
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 59f47d4c2dfe..ffe73ba2bf17 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -51,4 +51,4 @@ obj-$(CONFIG_CPU_ARM1026) += proc-arm1026.o
51obj-$(CONFIG_CPU_SA110) += proc-sa110.o 51obj-$(CONFIG_CPU_SA110) += proc-sa110.o
52obj-$(CONFIG_CPU_SA1100) += proc-sa1100.o 52obj-$(CONFIG_CPU_SA1100) += proc-sa1100.o
53obj-$(CONFIG_CPU_XSCALE) += proc-xscale.o 53obj-$(CONFIG_CPU_XSCALE) += proc-xscale.o
54obj-$(CONFIG_CPU_V6) += proc-v6.o blockops.o 54obj-$(CONFIG_CPU_V6) += proc-v6.o
diff --git a/arch/arm/mm/blockops.c b/arch/arm/mm/blockops.c
deleted file mode 100644
index 4f5ee2d08996..000000000000
--- a/arch/arm/mm/blockops.c
+++ /dev/null
@@ -1,185 +0,0 @@
1#include <linux/kernel.h>
2#include <linux/init.h>
3#include <linux/errno.h>
4#include <linux/mm.h>
5
6#include <asm/memory.h>
7#include <asm/ptrace.h>
8#include <asm/cacheflush.h>
9#include <asm/traps.h>
10
11extern struct cpu_cache_fns blk_cache_fns;
12
13#define HARVARD_CACHE
14
15/*
16 * blk_flush_kern_dcache_page(kaddr)
17 *
18 * Ensure that the data held in the page kaddr is written back
19 * to the page in question.
20 *
21 * - kaddr - kernel address (guaranteed to be page aligned)
22 */
23static void __attribute__((naked))
24blk_flush_kern_dcache_page(void *kaddr)
25{
26 asm(
27 "add r1, r0, %0 \n\
28 sub r1, r1, %1 \n\
291: .word 0xec401f0e @ mcrr p15, 0, r0, r1, c14, 0 @ blocking \n\
30 mov r0, #0 \n\
31 mcr p15, 0, r0, c7, c5, 0 \n\
32 mcr p15, 0, r0, c7, c10, 4 \n\
33 mov pc, lr"
34 :
35 : "I" (PAGE_SIZE), "I" (L1_CACHE_BYTES));
36}
37
38/*
39 * blk_dma_inv_range(start,end)
40 *
41 * Invalidate the data cache within the specified region; we will
42 * be performing a DMA operation in this region and we want to
43 * purge old data in the cache.
44 *
45 * - start - virtual start address of region
46 * - end - virtual end address of region
47 */
48static void __attribute__((naked))
49blk_dma_inv_range_unified(unsigned long start, unsigned long end)
50{
51 asm(
52 "tst r0, %0 \n\
53 mcrne p15, 0, r0, c7, c11, 1 @ clean unified line \n\
54 tst r1, %0 \n\
55 mcrne p15, 0, r1, c7, c15, 1 @ clean & invalidate unified line\n\
56 .word 0xec401f06 @ mcrr p15, 0, r1, r0, c6, 0 @ blocking \n\
57 mov r0, #0 \n\
58 mcr p15, 0, r0, c7, c10, 4 @ drain write buffer \n\
59 mov pc, lr"
60 :
61 : "I" (L1_CACHE_BYTES - 1));
62}
63
64static void __attribute__((naked))
65blk_dma_inv_range_harvard(unsigned long start, unsigned long end)
66{
67 asm(
68 "tst r0, %0 \n\
69 mcrne p15, 0, r0, c7, c10, 1 @ clean D line \n\
70 tst r1, %0 \n\
71 mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D line \n\
72 .word 0xec401f06 @ mcrr p15, 0, r1, r0, c6, 0 @ blocking \n\
73 mov r0, #0 \n\
74 mcr p15, 0, r0, c7, c10, 4 @ drain write buffer \n\
75 mov pc, lr"
76 :
77 : "I" (L1_CACHE_BYTES - 1));
78}
79
80/*
81 * blk_dma_clean_range(start,end)
82 * - start - virtual start address of region
83 * - end - virtual end address of region
84 */
85static void __attribute__((naked))
86blk_dma_clean_range(unsigned long start, unsigned long end)
87{
88 asm(
89 ".word 0xec401f0c @ mcrr p15, 0, r1, r0, c12, 0 @ blocking \n\
90 mov r0, #0 \n\
91 mcr p15, 0, r0, c7, c10, 4 @ drain write buffer \n\
92 mov pc, lr");
93}
94
95/*
96 * blk_dma_flush_range(start,end)
97 * - start - virtual start address of region
98 * - end - virtual end address of region
99 */
100static void __attribute__((naked))
101blk_dma_flush_range(unsigned long start, unsigned long end)
102{
103 asm(
104 ".word 0xec401f0e @ mcrr p15, 0, r1, r0, c14, 0 @ blocking \n\
105 mov pc, lr");
106}
107
108static int blockops_trap(struct pt_regs *regs, unsigned int instr)
109{
110 regs->ARM_r4 |= regs->ARM_r2;
111 regs->ARM_pc += 4;
112 return 0;
113}
114
115static char *func[] = {
116 "Prefetch data range",
117 "Clean+Invalidate data range",
118 "Clean data range",
119 "Invalidate data range",
120 "Invalidate instr range"
121};
122
123static struct undef_hook blockops_hook __initdata = {
124 .instr_mask = 0x0fffffd0,
125 .instr_val = 0x0c401f00,
126 .cpsr_mask = PSR_T_BIT,
127 .cpsr_val = 0,
128 .fn = blockops_trap,
129};
130
131static int __init blockops_check(void)
132{
133 register unsigned int err asm("r4") = 0;
134 unsigned int err_pos = 1;
135 unsigned int cache_type;
136 int i;
137
138 asm("mrc p15, 0, %0, c0, c0, 1" : "=r" (cache_type));
139
140 printk("Checking V6 block cache operations:\n");
141 register_undef_hook(&blockops_hook);
142
143 __asm__ ("mov r0, %0\n\t"
144 "mov r1, %1\n\t"
145 "mov r2, #1\n\t"
146 ".word 0xec401f2c @ mcrr p15, 0, r1, r0, c12, 2\n\t"
147 "mov r2, #2\n\t"
148 ".word 0xec401f0e @ mcrr p15, 0, r1, r0, c14, 0\n\t"
149 "mov r2, #4\n\t"
150 ".word 0xec401f0c @ mcrr p15, 0, r1, r0, c12, 0\n\t"
151 "mov r2, #8\n\t"
152 ".word 0xec401f06 @ mcrr p15, 0, r1, r0, c6, 0\n\t"
153 "mov r2, #16\n\t"
154 ".word 0xec401f05 @ mcrr p15, 0, r1, r0, c5, 0\n\t"
155 :
156 : "r" (PAGE_OFFSET), "r" (PAGE_OFFSET + 128)
157 : "r0", "r1", "r2");
158
159 unregister_undef_hook(&blockops_hook);
160
161 for (i = 0; i < ARRAY_SIZE(func); i++, err_pos <<= 1)
162 printk("%30s: %ssupported\n", func[i], err & err_pos ? "not " : "");
163
164 if ((err & 8) == 0) {
165 printk(" --> Using %s block cache invalidate\n",
166 cache_type & (1 << 24) ? "harvard" : "unified");
167 if (cache_type & (1 << 24))
168 cpu_cache.dma_inv_range = blk_dma_inv_range_harvard;
169 else
170 cpu_cache.dma_inv_range = blk_dma_inv_range_unified;
171 }
172 if ((err & 4) == 0) {
173 printk(" --> Using block cache clean\n");
174 cpu_cache.dma_clean_range = blk_dma_clean_range;
175 }
176 if ((err & 2) == 0) {
177 printk(" --> Using block cache clean+invalidate\n");
178 cpu_cache.dma_flush_range = blk_dma_flush_range;
179 cpu_cache.flush_kern_dcache_page = blk_flush_kern_dcache_page;
180 }
181
182 return 0;
183}
184
185__initcall(blockops_check);
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index c168f322ef8c..8b276ee38acf 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -420,7 +420,8 @@ static void __init bootmem_init(struct meminfo *mi)
420 * Set up device the mappings. Since we clear out the page tables for all 420 * Set up device the mappings. Since we clear out the page tables for all
421 * mappings above VMALLOC_END, we will remove any debug device mappings. 421 * mappings above VMALLOC_END, we will remove any debug device mappings.
422 * This means you have to be careful how you debug this function, or any 422 * This means you have to be careful how you debug this function, or any
423 * called function. (Do it by code inspection!) 423 * called function. This means you can't use any function or debugging
424 * method which may touch any device, otherwise the kernel _will_ crash.
424 */ 425 */
425static void __init devicemaps_init(struct machine_desc *mdesc) 426static void __init devicemaps_init(struct machine_desc *mdesc)
426{ 427{
@@ -428,6 +429,12 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
428 unsigned long addr; 429 unsigned long addr;
429 void *vectors; 430 void *vectors;
430 431
432 /*
433 * Allocate the vector page early.
434 */
435 vectors = alloc_bootmem_low_pages(PAGE_SIZE);
436 BUG_ON(!vectors);
437
431 for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) 438 for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE)
432 pmd_clear(pmd_off_k(addr)); 439 pmd_clear(pmd_off_k(addr));
433 440
@@ -461,12 +468,6 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
461 create_mapping(&map); 468 create_mapping(&map);
462#endif 469#endif
463 470
464 flush_cache_all();
465 local_flush_tlb_all();
466
467 vectors = alloc_bootmem_low_pages(PAGE_SIZE);
468 BUG_ON(!vectors);
469
470 /* 471 /*
471 * Create a mapping for the machine vectors at the high-vectors 472 * Create a mapping for the machine vectors at the high-vectors
472 * location (0xffff0000). If we aren't using high-vectors, also 473 * location (0xffff0000). If we aren't using high-vectors, also
@@ -491,12 +492,13 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
491 mdesc->map_io(); 492 mdesc->map_io();
492 493
493 /* 494 /*
494 * Finally flush the tlb again - this ensures that we're in a 495 * Finally flush the caches and tlb to ensure that we're in a
495 * consistent state wrt the writebuffer if the writebuffer needs 496 * consistent state wrt the writebuffer. This also ensures that
496 * draining. After this point, we can start to touch devices 497 * any write-allocated cache lines in the vector page are written
497 * again. 498 * back. After this point, we can start to touch devices again.
498 */ 499 */
499 local_flush_tlb_all(); 500 local_flush_tlb_all();
501 flush_cache_all();
500} 502}
501 503
502/* 504/*
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 0f128c28fee4..10901398e4a2 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -130,8 +130,7 @@ remap_area_pages(unsigned long start, unsigned long phys_addr,
130 * mapping. See include/asm-arm/proc-armv/pgtable.h for more information. 130 * mapping. See include/asm-arm/proc-armv/pgtable.h for more information.
131 */ 131 */
132void __iomem * 132void __iomem *
133__ioremap(unsigned long phys_addr, size_t size, unsigned long flags, 133__ioremap(unsigned long phys_addr, size_t size, unsigned long flags)
134 unsigned long align)
135{ 134{
136 void * addr; 135 void * addr;
137 struct vm_struct * area; 136 struct vm_struct * area;
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index a1468d7326eb..38d7ebf87920 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -26,7 +26,7 @@
26 */ 26 */
27 27
28#include <linux/init.h> 28#include <linux/init.h>
29#include <asm/arch/hardware.h> 29#include <asm/hardware.h>
30#include <asm/arch/dmtimer.h> 30#include <asm/arch/dmtimer.h>
31#include <asm/io.h> 31#include <asm/io.h>
32#include <asm/arch/irqs.h> 32#include <asm/arch/irqs.h>
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index 2ede2ee8cae4..b86148227480 100644
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -34,7 +34,7 @@
34 34
35#include <asm/io.h> 35#include <asm/io.h>
36#include <asm/hardware/clock.h> 36#include <asm/hardware/clock.h>
37#include <asm/arch/hardware.h> 37#include <asm/hardware.h>
38 38
39#define OCPI_BASE 0xfffec320 39#define OCPI_BASE 0xfffec320
40#define OCPI_FAULT (OCPI_BASE + 0x00) 40#define OCPI_FAULT (OCPI_BASE + 0x00)
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index 966cca031ca7..1a24e2c10714 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -509,7 +509,7 @@ static void omap_pm_init_proc(void)
509 * @state: suspend state we're entering. 509 * @state: suspend state we're entering.
510 * 510 *
511 */ 511 */
512//#include <asm/arch/hardware.h> 512//#include <asm/hardware.h>
513 513
514static int omap_pm_prepare(suspend_state_t state) 514static int omap_pm_prepare(suspend_state_t state)
515{ 515{
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S
index 4bea36964a00..66414cc8e6e3 100644
--- a/arch/arm/plat-omap/sram-fn.S
+++ b/arch/arm/plat-omap/sram-fn.S
@@ -12,7 +12,7 @@
12#include <linux/linkage.h> 12#include <linux/linkage.h>
13#include <asm/assembler.h> 13#include <asm/assembler.h>
14#include <asm/arch/io.h> 14#include <asm/arch/io.h>
15#include <asm/arch/hardware.h> 15#include <asm/hardware.h>
16 16
17 .text 17 .text
18 18
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index f36677241ecd..76b1135d401a 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -248,9 +248,7 @@ acpi_parse_lapic(acpi_table_entry_header * header, const unsigned long end)
248 248
249 acpi_table_print_madt_entry(header); 249 acpi_table_print_madt_entry(header);
250 250
251 /* no utility in registering a disabled processor */ 251 /* Register even disabled CPUs for cpu hotplug */
252 if (processor->flags.enabled == 0)
253 return 0;
254 252
255 x86_acpiid_to_apicid[processor->acpi_id] = processor->id; 253 x86_acpiid_to_apicid[processor->acpi_id] = processor->id;
256 254
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 8f767d9aa45d..1ca5269b1e86 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -220,8 +220,9 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m)
220 num_processors++; 220 num_processors++;
221 221
222 if ((num_processors > 8) && 222 if ((num_processors > 8) &&
223 APIC_XAPIC(ver) && 223 ((APIC_XAPIC(ver) &&
224 (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) 224 (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) ||
225 (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)))
225 def_to_bigsmp = 1; 226 def_to_bigsmp = 1;
226 else 227 else
227 def_to_bigsmp = 0; 228 def_to_bigsmp = 0;
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index e06f21f60dc5..301f2e9d262e 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -91,16 +91,17 @@ ENTRY(vhpt_miss)
91 * (the "original") TLB miss, which may either be caused by an instruction 91 * (the "original") TLB miss, which may either be caused by an instruction
92 * fetch or a data access (or non-access). 92 * fetch or a data access (or non-access).
93 * 93 *
94 * What we do here is normal TLB miss handing for the _original_ miss, followed 94 * What we do here is normal TLB miss handing for the _original_ miss,
95 * by inserting the TLB entry for the virtual page table page that the VHPT 95 * followed by inserting the TLB entry for the virtual page table page
96 * walker was attempting to access. The latter gets inserted as long 96 * that the VHPT walker was attempting to access. The latter gets
97 * as both L1 and L2 have valid mappings for the faulting address. 97 * inserted as long as page table entry above pte level have valid
98 * The TLB entry for the original miss gets inserted only if 98 * mappings for the faulting address. The TLB entry for the original
99 * the L3 entry indicates that the page is present. 99 * miss gets inserted only if the pte entry indicates that the page is
100 * present.
100 * 101 *
101 * do_page_fault gets invoked in the following cases: 102 * do_page_fault gets invoked in the following cases:
102 * - the faulting virtual address uses unimplemented address bits 103 * - the faulting virtual address uses unimplemented address bits
103 * - the faulting virtual address has no L1, L2, or L3 mapping 104 * - the faulting virtual address has no valid page table mapping
104 */ 105 */
105 mov r16=cr.ifa // get address that caused the TLB miss 106 mov r16=cr.ifa // get address that caused the TLB miss
106#ifdef CONFIG_HUGETLB_PAGE 107#ifdef CONFIG_HUGETLB_PAGE
@@ -126,7 +127,7 @@ ENTRY(vhpt_miss)
126#endif 127#endif
127 ;; 128 ;;
128 cmp.eq p6,p7=5,r17 // is IFA pointing into to region 5? 129 cmp.eq p6,p7=5,r17 // is IFA pointing into to region 5?
129 shr.u r18=r22,PGDIR_SHIFT // get bits 33-63 of the faulting address 130 shr.u r18=r22,PGDIR_SHIFT // get bottom portion of pgd index bit
130 ;; 131 ;;
131(p7) dep r17=r17,r19,(PAGE_SHIFT-3),3 // put region number bits in place 132(p7) dep r17=r17,r19,(PAGE_SHIFT-3),3 // put region number bits in place
132 133
@@ -137,38 +138,38 @@ ENTRY(vhpt_miss)
137(p6) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT 138(p6) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT
138(p7) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT-3 139(p7) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT-3
139 ;; 140 ;;
140(p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=PTA + IFA(33,42)*8 141(p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=pgd_offset for region 5
141(p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8) 142(p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=pgd_offset for region[0-4]
142 cmp.eq p7,p6=0,r21 // unused address bits all zeroes? 143 cmp.eq p7,p6=0,r21 // unused address bits all zeroes?
143#ifdef CONFIG_PGTABLE_4 144#ifdef CONFIG_PGTABLE_4
144 shr.u r28=r22,PUD_SHIFT // shift L2 index into position 145 shr.u r28=r22,PUD_SHIFT // shift pud index into position
145#else 146#else
146 shr.u r18=r22,PMD_SHIFT // shift L3 index into position 147 shr.u r18=r22,PMD_SHIFT // shift pmd index into position
147#endif 148#endif
148 ;; 149 ;;
149 ld8 r17=[r17] // fetch the L1 entry (may be 0) 150 ld8 r17=[r17] // get *pgd (may be 0)
150 ;; 151 ;;
151(p7) cmp.eq p6,p7=r17,r0 // was L1 entry NULL? 152(p7) cmp.eq p6,p7=r17,r0 // was pgd_present(*pgd) == NULL?
152#ifdef CONFIG_PGTABLE_4 153#ifdef CONFIG_PGTABLE_4
153 dep r28=r28,r17,3,(PAGE_SHIFT-3) // compute address of L2 page table entry 154 dep r28=r28,r17,3,(PAGE_SHIFT-3) // r28=pud_offset(pgd,addr)
154 ;; 155 ;;
155 shr.u r18=r22,PMD_SHIFT // shift L3 index into position 156 shr.u r18=r22,PMD_SHIFT // shift pmd index into position
156(p7) ld8 r29=[r28] // fetch the L2 entry (may be 0) 157(p7) ld8 r29=[r28] // get *pud (may be 0)
157 ;; 158 ;;
158(p7) cmp.eq.or.andcm p6,p7=r29,r0 // was L2 entry NULL? 159(p7) cmp.eq.or.andcm p6,p7=r29,r0 // was pud_present(*pud) == NULL?
159 dep r17=r18,r29,3,(PAGE_SHIFT-3) // compute address of L3 page table entry 160 dep r17=r18,r29,3,(PAGE_SHIFT-3) // r17=pmd_offset(pud,addr)
160#else 161#else
161 dep r17=r18,r17,3,(PAGE_SHIFT-3) // compute address of L3 page table entry 162 dep r17=r18,r17,3,(PAGE_SHIFT-3) // r17=pmd_offset(pgd,addr)
162#endif 163#endif
163 ;; 164 ;;
164(p7) ld8 r20=[r17] // fetch the L3 entry (may be 0) 165(p7) ld8 r20=[r17] // get *pmd (may be 0)
165 shr.u r19=r22,PAGE_SHIFT // shift L4 index into position 166 shr.u r19=r22,PAGE_SHIFT // shift pte index into position
166 ;; 167 ;;
167(p7) cmp.eq.or.andcm p6,p7=r20,r0 // was L3 entry NULL? 168(p7) cmp.eq.or.andcm p6,p7=r20,r0 // was pmd_present(*pmd) == NULL?
168 dep r21=r19,r20,3,(PAGE_SHIFT-3) // compute address of L4 page table entry 169 dep r21=r19,r20,3,(PAGE_SHIFT-3) // r21=pte_offset(pmd,addr)
169 ;; 170 ;;
170(p7) ld8 r18=[r21] // read the L4 PTE 171(p7) ld8 r18=[r21] // read *pte
171 mov r19=cr.isr // cr.isr bit 0 tells us if this is an insn miss 172 mov r19=cr.isr // cr.isr bit 32 tells us if this is an insn miss
172 ;; 173 ;;
173(p7) tbit.z p6,p7=r18,_PAGE_P_BIT // page present bit cleared? 174(p7) tbit.z p6,p7=r18,_PAGE_P_BIT // page present bit cleared?
174 mov r22=cr.iha // get the VHPT address that caused the TLB miss 175 mov r22=cr.iha // get the VHPT address that caused the TLB miss
@@ -202,25 +203,33 @@ ENTRY(vhpt_miss)
202 dv_serialize_data 203 dv_serialize_data
203 204
204 /* 205 /*
205 * Re-check L2 and L3 pagetable. If they changed, we may have received a ptc.g 206 * Re-check pagetable entry. If they changed, we may have received a ptc.g
206 * between reading the pagetable and the "itc". If so, flush the entry we 207 * between reading the pagetable and the "itc". If so, flush the entry we
207 * inserted and retry. 208 * inserted and retry. At this point, we have:
209 *
210 * r28 = equivalent of pud_offset(pgd, ifa)
211 * r17 = equivalent of pmd_offset(pud, ifa)
212 * r21 = equivalent of pte_offset(pmd, ifa)
213 *
214 * r29 = *pud
215 * r20 = *pmd
216 * r18 = *pte
208 */ 217 */
209 ld8 r25=[r21] // read L4 entry again 218 ld8 r25=[r21] // read *pte again
210 ld8 r26=[r17] // read L3 PTE again 219 ld8 r26=[r17] // read *pmd again
211#ifdef CONFIG_PGTABLE_4 220#ifdef CONFIG_PGTABLE_4
212 ld8 r18=[r28] // read L2 entry again 221 ld8 r19=[r28] // read *pud again
213#endif 222#endif
214 cmp.ne p6,p7=r0,r0 223 cmp.ne p6,p7=r0,r0
215 ;; 224 ;;
216 cmp.ne.or.andcm p6,p7=r26,r20 // did L3 entry change 225 cmp.ne.or.andcm p6,p7=r26,r20 // did *pmd change
217#ifdef CONFIG_PGTABLE_4 226#ifdef CONFIG_PGTABLE_4
218 cmp.ne.or.andcm p6,p7=r29,r18 // did L4 PTE change 227 cmp.ne.or.andcm p6,p7=r19,r29 // did *pud change
219#endif 228#endif
220 mov r27=PAGE_SHIFT<<2 229 mov r27=PAGE_SHIFT<<2
221 ;; 230 ;;
222(p6) ptc.l r22,r27 // purge PTE page translation 231(p6) ptc.l r22,r27 // purge PTE page translation
223(p7) cmp.ne.or.andcm p6,p7=r25,r18 // did L4 PTE change 232(p7) cmp.ne.or.andcm p6,p7=r25,r18 // did *pte change
224 ;; 233 ;;
225(p6) ptc.l r16,r27 // purge translation 234(p6) ptc.l r16,r27 // purge translation
226#endif 235#endif
@@ -235,19 +244,19 @@ END(vhpt_miss)
235ENTRY(itlb_miss) 244ENTRY(itlb_miss)
236 DBG_FAULT(1) 245 DBG_FAULT(1)
237 /* 246 /*
238 * The ITLB handler accesses the L3 PTE via the virtually mapped linear 247 * The ITLB handler accesses the PTE via the virtually mapped linear
239 * page table. If a nested TLB miss occurs, we switch into physical 248 * page table. If a nested TLB miss occurs, we switch into physical
240 * mode, walk the page table, and then re-execute the L3 PTE read 249 * mode, walk the page table, and then re-execute the PTE read and
241 * and go on normally after that. 250 * go on normally after that.
242 */ 251 */
243 mov r16=cr.ifa // get virtual address 252 mov r16=cr.ifa // get virtual address
244 mov r29=b0 // save b0 253 mov r29=b0 // save b0
245 mov r31=pr // save predicates 254 mov r31=pr // save predicates
246.itlb_fault: 255.itlb_fault:
247 mov r17=cr.iha // get virtual address of L3 PTE 256 mov r17=cr.iha // get virtual address of PTE
248 movl r30=1f // load nested fault continuation point 257 movl r30=1f // load nested fault continuation point
249 ;; 258 ;;
2501: ld8 r18=[r17] // read L3 PTE 2591: ld8 r18=[r17] // read *pte
251 ;; 260 ;;
252 mov b0=r29 261 mov b0=r29
253 tbit.z p6,p0=r18,_PAGE_P_BIT // page present bit cleared? 262 tbit.z p6,p0=r18,_PAGE_P_BIT // page present bit cleared?
@@ -262,7 +271,7 @@ ENTRY(itlb_miss)
262 */ 271 */
263 dv_serialize_data 272 dv_serialize_data
264 273
265 ld8 r19=[r17] // read L3 PTE again and see if same 274 ld8 r19=[r17] // read *pte again and see if same
266 mov r20=PAGE_SHIFT<<2 // setup page size for purge 275 mov r20=PAGE_SHIFT<<2 // setup page size for purge
267 ;; 276 ;;
268 cmp.ne p7,p0=r18,r19 277 cmp.ne p7,p0=r18,r19
@@ -279,19 +288,19 @@ END(itlb_miss)
279ENTRY(dtlb_miss) 288ENTRY(dtlb_miss)
280 DBG_FAULT(2) 289 DBG_FAULT(2)
281 /* 290 /*
282 * The DTLB handler accesses the L3 PTE via the virtually mapped linear 291 * The DTLB handler accesses the PTE via the virtually mapped linear
283 * page table. If a nested TLB miss occurs, we switch into physical 292 * page table. If a nested TLB miss occurs, we switch into physical
284 * mode, walk the page table, and then re-execute the L3 PTE read 293 * mode, walk the page table, and then re-execute the PTE read and
285 * and go on normally after that. 294 * go on normally after that.
286 */ 295 */
287 mov r16=cr.ifa // get virtual address 296 mov r16=cr.ifa // get virtual address
288 mov r29=b0 // save b0 297 mov r29=b0 // save b0
289 mov r31=pr // save predicates 298 mov r31=pr // save predicates
290dtlb_fault: 299dtlb_fault:
291 mov r17=cr.iha // get virtual address of L3 PTE 300 mov r17=cr.iha // get virtual address of PTE
292 movl r30=1f // load nested fault continuation point 301 movl r30=1f // load nested fault continuation point
293 ;; 302 ;;
2941: ld8 r18=[r17] // read L3 PTE 3031: ld8 r18=[r17] // read *pte
295 ;; 304 ;;
296 mov b0=r29 305 mov b0=r29
297 tbit.z p6,p0=r18,_PAGE_P_BIT // page present bit cleared? 306 tbit.z p6,p0=r18,_PAGE_P_BIT // page present bit cleared?
@@ -306,7 +315,7 @@ dtlb_fault:
306 */ 315 */
307 dv_serialize_data 316 dv_serialize_data
308 317
309 ld8 r19=[r17] // read L3 PTE again and see if same 318 ld8 r19=[r17] // read *pte again and see if same
310 mov r20=PAGE_SHIFT<<2 // setup page size for purge 319 mov r20=PAGE_SHIFT<<2 // setup page size for purge
311 ;; 320 ;;
312 cmp.ne p7,p0=r18,r19 321 cmp.ne p7,p0=r18,r19
@@ -420,7 +429,7 @@ ENTRY(nested_dtlb_miss)
420 * r30: continuation address 429 * r30: continuation address
421 * r31: saved pr 430 * r31: saved pr
422 * 431 *
423 * Output: r17: physical address of L3 PTE of faulting address 432 * Output: r17: physical address of PTE of faulting address
424 * r29: saved b0 433 * r29: saved b0
425 * r30: continuation address 434 * r30: continuation address
426 * r31: saved pr 435 * r31: saved pr
@@ -450,33 +459,33 @@ ENTRY(nested_dtlb_miss)
450(p6) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT 459(p6) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT
451(p7) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT-3 460(p7) shr.u r21=r21,PGDIR_SHIFT+PAGE_SHIFT-3
452 ;; 461 ;;
453(p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=PTA + IFA(33,42)*8 462(p6) dep r17=r18,r19,3,(PAGE_SHIFT-3) // r17=pgd_offset for region 5
454(p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=PTA + (((IFA(61,63) << 7) | IFA(33,39))*8) 463(p7) dep r17=r18,r17,3,(PAGE_SHIFT-6) // r17=pgd_offset for region[0-4]
455 cmp.eq p7,p6=0,r21 // unused address bits all zeroes? 464 cmp.eq p7,p6=0,r21 // unused address bits all zeroes?
456#ifdef CONFIG_PGTABLE_4 465#ifdef CONFIG_PGTABLE_4
457 shr.u r18=r22,PUD_SHIFT // shift L2 index into position 466 shr.u r18=r22,PUD_SHIFT // shift pud index into position
458#else 467#else
459 shr.u r18=r22,PMD_SHIFT // shift L3 index into position 468 shr.u r18=r22,PMD_SHIFT // shift pmd index into position
460#endif 469#endif
461 ;; 470 ;;
462 ld8 r17=[r17] // fetch the L1 entry (may be 0) 471 ld8 r17=[r17] // get *pgd (may be 0)
463 ;; 472 ;;
464(p7) cmp.eq p6,p7=r17,r0 // was L1 entry NULL? 473(p7) cmp.eq p6,p7=r17,r0 // was pgd_present(*pgd) == NULL?
465 dep r17=r18,r17,3,(PAGE_SHIFT-3) // compute address of L2 page table entry 474 dep r17=r18,r17,3,(PAGE_SHIFT-3) // r17=p[u|m]d_offset(pgd,addr)
466 ;; 475 ;;
467#ifdef CONFIG_PGTABLE_4 476#ifdef CONFIG_PGTABLE_4
468(p7) ld8 r17=[r17] // fetch the L2 entry (may be 0) 477(p7) ld8 r17=[r17] // get *pud (may be 0)
469 shr.u r18=r22,PMD_SHIFT // shift L3 index into position 478 shr.u r18=r22,PMD_SHIFT // shift pmd index into position
470 ;; 479 ;;
471(p7) cmp.eq.or.andcm p6,p7=r17,r0 // was L2 entry NULL? 480(p7) cmp.eq.or.andcm p6,p7=r17,r0 // was pud_present(*pud) == NULL?
472 dep r17=r18,r17,3,(PAGE_SHIFT-3) // compute address of L2 page table entry 481 dep r17=r18,r17,3,(PAGE_SHIFT-3) // r17=pmd_offset(pud,addr)
473 ;; 482 ;;
474#endif 483#endif
475(p7) ld8 r17=[r17] // fetch the L3 entry (may be 0) 484(p7) ld8 r17=[r17] // get *pmd (may be 0)
476 shr.u r19=r22,PAGE_SHIFT // shift L4 index into position 485 shr.u r19=r22,PAGE_SHIFT // shift pte index into position
477 ;; 486 ;;
478(p7) cmp.eq.or.andcm p6,p7=r17,r0 // was L3 entry NULL? 487(p7) cmp.eq.or.andcm p6,p7=r17,r0 // was pmd_present(*pmd) == NULL?
479 dep r17=r19,r17,3,(PAGE_SHIFT-3) // compute address of L4 page table entry 488 dep r17=r19,r17,3,(PAGE_SHIFT-3) // r17=pte_offset(pmd,addr);
480(p6) br.cond.spnt page_fault 489(p6) br.cond.spnt page_fault
481 mov b0=r30 490 mov b0=r30
482 br.sptk.many b0 // return to continuation point 491 br.sptk.many b0 // return to continuation point
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 02692027730a..e14ba5e01a36 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -700,6 +700,7 @@ load-$(CONFIG_SNI_RM200_PCI) += 0xffffffff80600000
700# 700#
701core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \ 701core-$(CONFIG_TOSHIBA_JMR3927) += arch/mips/jmr3927/rbhma3100/ \
702 arch/mips/jmr3927/common/ 702 arch/mips/jmr3927/common/
703cflags-$(CONFIG_TOSHIBA_JMR3927) += -Iinclude/asm-mips/mach-jmr3927
703load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000 704load-$(CONFIG_TOSHIBA_JMR3927) += 0xffffffff80050000
704 705
705# 706#
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index 4f21f42d096b..08c8c855cc9c 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -93,7 +93,7 @@ void __init plat_setup(void)
93 93
94 argptr = prom_getcmdline(); 94 argptr = prom_getcmdline();
95 95
96#ifdef CONFIG_SERIAL_AU1X00_CONSOLE 96#if defined(CONFIG_SERIAL_AU1X00_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
97 if ((argptr = strstr(argptr, "console=")) == NULL) { 97 if ((argptr = strstr(argptr, "console=")) == NULL) {
98 argptr = prom_getcmdline(); 98 argptr = prom_getcmdline();
99 strcat(argptr, " console=ttyS0,115200"); 99 strcat(argptr, " console=ttyS0,115200");
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig
index 132ec3dac63f..74990758154b 100644
--- a/arch/mips/configs/atlas_defconfig
+++ b/arch/mips/configs/atlas_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:13 2005 4# Thu Nov 10 12:14:02 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -191,6 +209,7 @@ CONFIG_FLATMEM_MANUAL=y
191CONFIG_FLATMEM=y 209CONFIG_FLATMEM=y
192CONFIG_FLAT_NODE_MEM_MAP=y 210CONFIG_FLAT_NODE_MEM_MAP=y
193# CONFIG_SPARSEMEM_STATIC is not set 211# CONFIG_SPARSEMEM_STATIC is not set
212CONFIG_SPLIT_PTLOCK_CPUS=4
194CONFIG_PREEMPT_NONE=y 213CONFIG_PREEMPT_NONE=y
195# CONFIG_PREEMPT_VOLUNTARY is not set 214# CONFIG_PREEMPT_VOLUNTARY is not set
196# CONFIG_PREEMPT is not set 215# CONFIG_PREEMPT is not set
@@ -309,6 +328,10 @@ CONFIG_IPV6_TUNNEL=m
309CONFIG_NETFILTER=y 328CONFIG_NETFILTER=y
310# CONFIG_NETFILTER_DEBUG is not set 329# CONFIG_NETFILTER_DEBUG is not set
311CONFIG_BRIDGE_NETFILTER=y 330CONFIG_BRIDGE_NETFILTER=y
331
332#
333# Core Netfilter Configuration
334#
312CONFIG_NETFILTER_NETLINK=m 335CONFIG_NETFILTER_NETLINK=m
313CONFIG_NETFILTER_NETLINK_QUEUE=m 336CONFIG_NETFILTER_NETLINK_QUEUE=m
314CONFIG_NETFILTER_NETLINK_LOG=m 337CONFIG_NETFILTER_NETLINK_LOG=m
@@ -363,6 +386,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
363CONFIG_IP_NF_TARGET_LOG=m 386CONFIG_IP_NF_TARGET_LOG=m
364CONFIG_IP_NF_TARGET_ULOG=m 387CONFIG_IP_NF_TARGET_ULOG=m
365CONFIG_IP_NF_TARGET_TCPMSS=m 388CONFIG_IP_NF_TARGET_TCPMSS=m
389CONFIG_IP_NF_TARGET_NFQUEUE=m
366CONFIG_IP_NF_NAT=m 390CONFIG_IP_NF_NAT=m
367CONFIG_IP_NF_NAT_NEEDED=y 391CONFIG_IP_NF_NAT_NEEDED=y
368CONFIG_IP_NF_TARGET_MASQUERADE=m 392CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -412,6 +436,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
412CONFIG_IP6_NF_FILTER=m 436CONFIG_IP6_NF_FILTER=m
413CONFIG_IP6_NF_TARGET_LOG=m 437CONFIG_IP6_NF_TARGET_LOG=m
414CONFIG_IP6_NF_TARGET_REJECT=m 438CONFIG_IP6_NF_TARGET_REJECT=m
439CONFIG_IP6_NF_TARGET_NFQUEUE=m
415CONFIG_IP6_NF_MANGLE=m 440CONFIG_IP6_NF_MANGLE=m
416CONFIG_IP6_NF_TARGET_MARK=m 441CONFIG_IP6_NF_TARGET_MARK=m
417CONFIG_IP6_NF_TARGET_HL=m 442CONFIG_IP6_NF_TARGET_HL=m
@@ -472,10 +497,18 @@ CONFIG_IPDDP_DECAP=y
472CONFIG_NET_DIVERT=y 497CONFIG_NET_DIVERT=y
473# CONFIG_ECONET is not set 498# CONFIG_ECONET is not set
474# CONFIG_WAN_ROUTER is not set 499# CONFIG_WAN_ROUTER is not set
500
501#
502# QoS and/or fair queueing
503#
475CONFIG_NET_SCHED=y 504CONFIG_NET_SCHED=y
476CONFIG_NET_SCH_CLK_JIFFIES=y 505CONFIG_NET_SCH_CLK_JIFFIES=y
477# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 506# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
478# CONFIG_NET_SCH_CLK_CPU is not set 507# CONFIG_NET_SCH_CLK_CPU is not set
508
509#
510# Queueing/Scheduling
511#
479CONFIG_NET_SCH_CBQ=m 512CONFIG_NET_SCH_CBQ=m
480CONFIG_NET_SCH_HTB=m 513CONFIG_NET_SCH_HTB=m
481CONFIG_NET_SCH_HFSC=m 514CONFIG_NET_SCH_HFSC=m
@@ -488,8 +521,10 @@ CONFIG_NET_SCH_GRED=m
488CONFIG_NET_SCH_DSMARK=m 521CONFIG_NET_SCH_DSMARK=m
489CONFIG_NET_SCH_NETEM=m 522CONFIG_NET_SCH_NETEM=m
490CONFIG_NET_SCH_INGRESS=m 523CONFIG_NET_SCH_INGRESS=m
491CONFIG_NET_QOS=y 524
492CONFIG_NET_ESTIMATOR=y 525#
526# Classification
527#
493CONFIG_NET_CLS=y 528CONFIG_NET_CLS=y
494CONFIG_NET_CLS_BASIC=m 529CONFIG_NET_CLS_BASIC=m
495CONFIG_NET_CLS_TCINDEX=m 530CONFIG_NET_CLS_TCINDEX=m
@@ -498,13 +533,14 @@ CONFIG_NET_CLS_ROUTE=y
498CONFIG_NET_CLS_FW=m 533CONFIG_NET_CLS_FW=m
499CONFIG_NET_CLS_U32=m 534CONFIG_NET_CLS_U32=m
500# CONFIG_CLS_U32_PERF is not set 535# CONFIG_CLS_U32_PERF is not set
501CONFIG_NET_CLS_IND=y
502# CONFIG_CLS_U32_MARK is not set 536# CONFIG_CLS_U32_MARK is not set
503CONFIG_NET_CLS_RSVP=m 537CONFIG_NET_CLS_RSVP=m
504CONFIG_NET_CLS_RSVP6=m 538CONFIG_NET_CLS_RSVP6=m
505# CONFIG_NET_EMATCH is not set 539# CONFIG_NET_EMATCH is not set
506# CONFIG_NET_CLS_ACT is not set 540# CONFIG_NET_CLS_ACT is not set
507CONFIG_NET_CLS_POLICE=y 541CONFIG_NET_CLS_POLICE=y
542CONFIG_NET_CLS_IND=y
543CONFIG_NET_ESTIMATOR=y
508 544
509# 545#
510# Network testing 546# Network testing
@@ -565,18 +601,9 @@ CONFIG_BLK_DEV_RAM=y
565CONFIG_BLK_DEV_RAM_COUNT=16 601CONFIG_BLK_DEV_RAM_COUNT=16
566CONFIG_BLK_DEV_RAM_SIZE=4096 602CONFIG_BLK_DEV_RAM_SIZE=4096
567# CONFIG_BLK_DEV_INITRD is not set 603# CONFIG_BLK_DEV_INITRD is not set
568# CONFIG_LBD is not set
569CONFIG_CDROM_PKTCDVD=m 604CONFIG_CDROM_PKTCDVD=m
570CONFIG_CDROM_PKTCDVD_BUFFERS=8 605CONFIG_CDROM_PKTCDVD_BUFFERS=8
571# CONFIG_CDROM_PKTCDVD_WCACHE is not set 606# CONFIG_CDROM_PKTCDVD_WCACHE is not set
572
573#
574# IO Schedulers
575#
576CONFIG_IOSCHED_NOOP=y
577CONFIG_IOSCHED_AS=y
578CONFIG_IOSCHED_DEADLINE=y
579CONFIG_IOSCHED_CFQ=y
580CONFIG_ATA_OVER_ETH=m 607CONFIG_ATA_OVER_ETH=m
581 608
582# 609#
@@ -643,6 +670,7 @@ CONFIG_SCSI_SAS_ATTRS=m
643# 670#
644# SCSI low-level drivers 671# SCSI low-level drivers
645# 672#
673CONFIG_ISCSI_TCP=m
646# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 674# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
647# CONFIG_SCSI_3W_9XXX is not set 675# CONFIG_SCSI_3W_9XXX is not set
648# CONFIG_SCSI_ACARD is not set 676# CONFIG_SCSI_ACARD is not set
@@ -653,6 +681,7 @@ CONFIG_SCSI_SAS_ATTRS=m
653# CONFIG_SCSI_DPT_I2O is not set 681# CONFIG_SCSI_DPT_I2O is not set
654# CONFIG_MEGARAID_NEWGEN is not set 682# CONFIG_MEGARAID_NEWGEN is not set
655# CONFIG_MEGARAID_LEGACY is not set 683# CONFIG_MEGARAID_LEGACY is not set
684# CONFIG_MEGARAID_SAS is not set
656# CONFIG_SCSI_SATA is not set 685# CONFIG_SCSI_SATA is not set
657# CONFIG_SCSI_DMX3191D is not set 686# CONFIG_SCSI_DMX3191D is not set
658# CONFIG_SCSI_FUTURE_DOMAIN is not set 687# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -707,6 +736,7 @@ CONFIG_DM_MULTIPATH_EMC=m
707# CONFIG_FUSION is not set 736# CONFIG_FUSION is not set
708# CONFIG_FUSION_SPI is not set 737# CONFIG_FUSION_SPI is not set
709# CONFIG_FUSION_FC is not set 738# CONFIG_FUSION_FC is not set
739# CONFIG_FUSION_SAS is not set
710 740
711# 741#
712# IEEE 1394 (FireWire) support 742# IEEE 1394 (FireWire) support
@@ -736,7 +766,6 @@ CONFIG_TUN=m
736# PHY device support 766# PHY device support
737# 767#
738CONFIG_PHYLIB=m 768CONFIG_PHYLIB=m
739CONFIG_PHYCONTROL=y
740 769
741# 770#
742# MII PHY device drivers 771# MII PHY device drivers
@@ -754,6 +783,7 @@ CONFIG_NET_ETHERNET=y
754CONFIG_MII=y 783CONFIG_MII=y
755# CONFIG_HAPPYMEAL is not set 784# CONFIG_HAPPYMEAL is not set
756# CONFIG_SUNGEM is not set 785# CONFIG_SUNGEM is not set
786# CONFIG_CASSINI is not set
757# CONFIG_NET_VENDOR_3COM is not set 787# CONFIG_NET_VENDOR_3COM is not set
758 788
759# 789#
@@ -933,6 +963,7 @@ CONFIG_LEGACY_PTY_COUNT=256
933# TPM devices 963# TPM devices
934# 964#
935# CONFIG_TCG_TPM is not set 965# CONFIG_TCG_TPM is not set
966# CONFIG_TELCLOCK is not set
936 967
937# 968#
938# I2C support 969# I2C support
@@ -992,6 +1023,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
992# CONFIG_USB is not set 1023# CONFIG_USB is not set
993 1024
994# 1025#
1026# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1027#
1028
1029#
995# USB Gadget Support 1030# USB Gadget Support
996# 1031#
997# CONFIG_USB_GADGET is not set 1032# CONFIG_USB_GADGET is not set
@@ -1037,7 +1072,7 @@ CONFIG_JFS_SECURITY=y
1037CONFIG_FS_POSIX_ACL=y 1072CONFIG_FS_POSIX_ACL=y
1038CONFIG_XFS_FS=m 1073CONFIG_XFS_FS=m
1039CONFIG_XFS_EXPORT=y 1074CONFIG_XFS_EXPORT=y
1040CONFIG_XFS_QUOTA=m 1075CONFIG_XFS_QUOTA=y
1041CONFIG_XFS_SECURITY=y 1076CONFIG_XFS_SECURITY=y
1042CONFIG_XFS_POSIX_ACL=y 1077CONFIG_XFS_POSIX_ACL=y
1043# CONFIG_XFS_RT is not set 1078# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 25e8a08e68be..ea4b75604c23 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:17 2005 4# Mon Nov 7 23:04:36 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -61,6 +61,23 @@ CONFIG_KMOD=y
61CONFIG_STOP_MACHINE=y 61CONFIG_STOP_MACHINE=y
62 62
63# 63#
64# Block layer
65#
66
67#
68# IO Schedulers
69#
70CONFIG_IOSCHED_NOOP=y
71CONFIG_IOSCHED_AS=y
72CONFIG_IOSCHED_DEADLINE=y
73CONFIG_IOSCHED_CFQ=y
74CONFIG_DEFAULT_AS=y
75# CONFIG_DEFAULT_DEADLINE is not set
76# CONFIG_DEFAULT_CFQ is not set
77# CONFIG_DEFAULT_NOOP is not set
78CONFIG_DEFAULT_IOSCHED="anticipatory"
79
80#
64# Machine selection 81# Machine selection
65# 82#
66# CONFIG_MIPS_MTX1 is not set 83# CONFIG_MIPS_MTX1 is not set
@@ -127,8 +144,8 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
127# CONFIG_CPU_SB1_PASS_2_112x is not set 144# CONFIG_CPU_SB1_PASS_2_112x is not set
128# CONFIG_CPU_SB1_PASS_3 is not set 145# CONFIG_CPU_SB1_PASS_3 is not set
129# CONFIG_SIMULATION is not set 146# CONFIG_SIMULATION is not set
130# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set 147# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
131# CONFIG_CONFIG_SB1_CERR_STALL is not set 148# CONFIG_SB1_CERR_STALL is not set
132CONFIG_SIBYTE_CFE=y 149CONFIG_SIBYTE_CFE=y
133# CONFIG_SIBYTE_CFE_CONSOLE is not set 150# CONFIG_SIBYTE_CFE_CONSOLE is not set
134# CONFIG_SIBYTE_BUS_WATCHER is not set 151# CONFIG_SIBYTE_BUS_WATCHER is not set
@@ -198,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
198CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
199CONFIG_FLAT_NODE_MEM_MAP=y 216CONFIG_FLAT_NODE_MEM_MAP=y
200# CONFIG_SPARSEMEM_STATIC is not set 217# CONFIG_SPARSEMEM_STATIC is not set
218CONFIG_SPLIT_PTLOCK_CPUS=4
201CONFIG_SMP=y 219CONFIG_SMP=y
202CONFIG_NR_CPUS=4 220CONFIG_NR_CPUS=4
203CONFIG_PREEMPT_NONE=y 221CONFIG_PREEMPT_NONE=y
@@ -295,6 +313,10 @@ CONFIG_TCP_CONG_BIC=y
295# CONFIG_NET_DIVERT is not set 313# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 314# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 315# CONFIG_WAN_ROUTER is not set
316
317#
318# QoS and/or fair queueing
319#
298# CONFIG_NET_SCHED is not set 320# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set 321# CONFIG_NET_CLS_ROUTE is not set
300 322
@@ -353,14 +375,6 @@ CONFIG_BLK_DEV_NBD=m
353# CONFIG_BLK_DEV_RAM is not set 375# CONFIG_BLK_DEV_RAM is not set
354CONFIG_BLK_DEV_RAM_COUNT=16 376CONFIG_BLK_DEV_RAM_COUNT=16
355# CONFIG_CDROM_PKTCDVD is not set 377# CONFIG_CDROM_PKTCDVD is not set
356
357#
358# IO Schedulers
359#
360CONFIG_IOSCHED_NOOP=y
361CONFIG_IOSCHED_AS=y
362CONFIG_IOSCHED_DEADLINE=y
363CONFIG_IOSCHED_CFQ=y
364# CONFIG_ATA_OVER_ETH is not set 378# CONFIG_ATA_OVER_ETH is not set
365 379
366# 380#
@@ -443,6 +457,7 @@ CONFIG_NET_ETHERNET=y
443CONFIG_MII=y 457CONFIG_MII=y
444# CONFIG_HAPPYMEAL is not set 458# CONFIG_HAPPYMEAL is not set
445# CONFIG_SUNGEM is not set 459# CONFIG_SUNGEM is not set
460# CONFIG_CASSINI is not set
446# CONFIG_NET_VENDOR_3COM is not set 461# CONFIG_NET_VENDOR_3COM is not set
447 462
448# 463#
@@ -582,6 +597,7 @@ CONFIG_GEN_RTC=y
582# TPM devices 597# TPM devices
583# 598#
584# CONFIG_TCG_TPM is not set 599# CONFIG_TCG_TPM is not set
600# CONFIG_TELCLOCK is not set
585 601
586# 602#
587# I2C support 603# I2C support
@@ -634,6 +650,7 @@ CONFIG_SENSORS_PCA9539=y
634CONFIG_SENSORS_PCF8591=y 650CONFIG_SENSORS_PCF8591=y
635CONFIG_SENSORS_RTC8564=y 651CONFIG_SENSORS_RTC8564=y
636CONFIG_SENSORS_MAX6875=y 652CONFIG_SENSORS_MAX6875=y
653# CONFIG_RTC_X1205_I2C is not set
637CONFIG_I2C_DEBUG_CORE=y 654CONFIG_I2C_DEBUG_CORE=y
638CONFIG_I2C_DEBUG_ALGO=y 655CONFIG_I2C_DEBUG_ALGO=y
639CONFIG_I2C_DEBUG_BUS=y 656CONFIG_I2C_DEBUG_BUS=y
@@ -686,6 +703,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
686# CONFIG_USB is not set 703# CONFIG_USB is not set
687 704
688# 705#
706# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
707#
708
709#
689# USB Gadget Support 710# USB Gadget Support
690# 711#
691# CONFIG_USB_GADGET is not set 712# CONFIG_USB_GADGET is not set
@@ -823,6 +844,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
823# CONFIG_DEBUG_KOBJECT is not set 844# CONFIG_DEBUG_KOBJECT is not set
824# CONFIG_DEBUG_INFO is not set 845# CONFIG_DEBUG_INFO is not set
825# CONFIG_DEBUG_FS is not set 846# CONFIG_DEBUG_FS is not set
847# CONFIG_DEBUG_VM is not set
848# CONFIG_RCU_TORTURE_TEST is not set
826CONFIG_CROSSCOMPILE=y 849CONFIG_CROSSCOMPILE=y
827CONFIG_CMDLINE="" 850CONFIG_CMDLINE=""
828# CONFIG_DEBUG_STACK_USAGE is not set 851# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index bfbaa08c47cb..a86cc9d9bdae 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:20 2005 4# Mon Nov 7 23:04:39 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -182,6 +200,7 @@ CONFIG_FLATMEM_MANUAL=y
182CONFIG_FLATMEM=y 200CONFIG_FLATMEM=y
183CONFIG_FLAT_NODE_MEM_MAP=y 201CONFIG_FLAT_NODE_MEM_MAP=y
184# CONFIG_SPARSEMEM_STATIC is not set 202# CONFIG_SPARSEMEM_STATIC is not set
203CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_PREEMPT_NONE=y 204CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
@@ -270,6 +289,10 @@ CONFIG_TCP_CONG_BIC=y
270# CONFIG_NET_DIVERT is not set 289# CONFIG_NET_DIVERT is not set
271# CONFIG_ECONET is not set 290# CONFIG_ECONET is not set
272# CONFIG_WAN_ROUTER is not set 291# CONFIG_WAN_ROUTER is not set
292
293#
294# QoS and/or fair queueing
295#
273# CONFIG_NET_SCHED is not set 296# CONFIG_NET_SCHED is not set
274# CONFIG_NET_CLS_ROUTE is not set 297# CONFIG_NET_CLS_ROUTE is not set
275 298
@@ -329,16 +352,7 @@ CONFIG_CONNECTOR=m
329# CONFIG_BLK_DEV_SX8 is not set 352# CONFIG_BLK_DEV_SX8 is not set
330# CONFIG_BLK_DEV_RAM is not set 353# CONFIG_BLK_DEV_RAM is not set
331CONFIG_BLK_DEV_RAM_COUNT=16 354CONFIG_BLK_DEV_RAM_COUNT=16
332# CONFIG_LBD is not set
333# CONFIG_CDROM_PKTCDVD is not set 355# CONFIG_CDROM_PKTCDVD is not set
334
335#
336# IO Schedulers
337#
338CONFIG_IOSCHED_NOOP=y
339CONFIG_IOSCHED_AS=y
340CONFIG_IOSCHED_DEADLINE=y
341CONFIG_IOSCHED_CFQ=y
342CONFIG_ATA_OVER_ETH=m 356CONFIG_ATA_OVER_ETH=m
343 357
344# 358#
@@ -412,7 +426,6 @@ CONFIG_NETDEVICES=y
412# PHY device support 426# PHY device support
413# 427#
414CONFIG_PHYLIB=m 428CONFIG_PHYLIB=m
415CONFIG_PHYCONTROL=y
416 429
417# 430#
418# MII PHY device drivers 431# MII PHY device drivers
@@ -430,6 +443,7 @@ CONFIG_NET_ETHERNET=y
430CONFIG_MII=y 443CONFIG_MII=y
431# CONFIG_HAPPYMEAL is not set 444# CONFIG_HAPPYMEAL is not set
432# CONFIG_SUNGEM is not set 445# CONFIG_SUNGEM is not set
446# CONFIG_CASSINI is not set
433# CONFIG_NET_VENDOR_3COM is not set 447# CONFIG_NET_VENDOR_3COM is not set
434 448
435# 449#
@@ -586,6 +600,7 @@ CONFIG_LEGACY_PTY_COUNT=256
586# CONFIG_WATCHDOG is not set 600# CONFIG_WATCHDOG is not set
587# CONFIG_RTC is not set 601# CONFIG_RTC is not set
588# CONFIG_GEN_RTC is not set 602# CONFIG_GEN_RTC is not set
603# CONFIG_RTC_VR41XX is not set
589# CONFIG_DTLK is not set 604# CONFIG_DTLK is not set
590# CONFIG_R3964 is not set 605# CONFIG_R3964 is not set
591# CONFIG_APPLICOM is not set 606# CONFIG_APPLICOM is not set
@@ -601,6 +616,7 @@ CONFIG_GPIO_VR41XX=y
601# TPM devices 616# TPM devices
602# 617#
603# CONFIG_TCG_TPM is not set 618# CONFIG_TCG_TPM is not set
619# CONFIG_TELCLOCK is not set
604 620
605# 621#
606# I2C support 622# I2C support
@@ -660,6 +676,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
660# CONFIG_USB is not set 676# CONFIG_USB is not set
661 677
662# 678#
679# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
680#
681
682#
663# USB Gadget Support 683# USB Gadget Support
664# 684#
665# CONFIG_USB_GADGET is not set 685# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 4b4d1ddb3d42..3558c79b0eb7 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:23 2005 4# Mon Nov 7 23:04:42 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -172,6 +190,7 @@ CONFIG_FLATMEM_MANUAL=y
172CONFIG_FLATMEM=y 190CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 191CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 192# CONFIG_SPARSEMEM_STATIC is not set
193CONFIG_SPLIT_PTLOCK_CPUS=4
175CONFIG_PREEMPT_NONE=y 194CONFIG_PREEMPT_NONE=y
176# CONFIG_PREEMPT_VOLUNTARY is not set 195# CONFIG_PREEMPT_VOLUNTARY is not set
177# CONFIG_PREEMPT is not set 196# CONFIG_PREEMPT is not set
@@ -256,6 +275,10 @@ CONFIG_TCP_CONG_BIC=y
256# CONFIG_NET_DIVERT is not set 275# CONFIG_NET_DIVERT is not set
257# CONFIG_ECONET is not set 276# CONFIG_ECONET is not set
258# CONFIG_WAN_ROUTER is not set 277# CONFIG_WAN_ROUTER is not set
278
279#
280# QoS and/or fair queueing
281#
259# CONFIG_NET_SCHED is not set 282# CONFIG_NET_SCHED is not set
260# CONFIG_NET_CLS_ROUTE is not set 283# CONFIG_NET_CLS_ROUTE is not set
261 284
@@ -287,6 +310,7 @@ CONFIG_FW_LOADER=y
287# Connector - unified userspace <-> kernelspace linker 310# Connector - unified userspace <-> kernelspace linker
288# 311#
289CONFIG_CONNECTOR=y 312CONFIG_CONNECTOR=y
313CONFIG_PROC_EVENTS=y
290 314
291# 315#
292# Memory Technology Devices (MTD) 316# Memory Technology Devices (MTD)
@@ -316,18 +340,9 @@ CONFIG_BLK_DEV_LOOP=y
316# CONFIG_BLK_DEV_SX8 is not set 340# CONFIG_BLK_DEV_SX8 is not set
317# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
318CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
319# CONFIG_LBD is not set
320CONFIG_CDROM_PKTCDVD=y 343CONFIG_CDROM_PKTCDVD=y
321CONFIG_CDROM_PKTCDVD_BUFFERS=8 344CONFIG_CDROM_PKTCDVD_BUFFERS=8
322# CONFIG_CDROM_PKTCDVD_WCACHE is not set 345# CONFIG_CDROM_PKTCDVD_WCACHE is not set
323
324#
325# IO Schedulers
326#
327CONFIG_IOSCHED_NOOP=y
328CONFIG_IOSCHED_AS=y
329CONFIG_IOSCHED_DEADLINE=y
330CONFIG_IOSCHED_CFQ=y
331CONFIG_ATA_OVER_ETH=y 346CONFIG_ATA_OVER_ETH=y
332 347
333# 348#
@@ -401,7 +416,6 @@ CONFIG_NETDEVICES=y
401# PHY device support 416# PHY device support
402# 417#
403CONFIG_PHYLIB=y 418CONFIG_PHYLIB=y
404CONFIG_PHYCONTROL=y
405 419
406# 420#
407# MII PHY device drivers 421# MII PHY device drivers
@@ -419,6 +433,7 @@ CONFIG_NET_ETHERNET=y
419# CONFIG_MII is not set 433# CONFIG_MII is not set
420# CONFIG_HAPPYMEAL is not set 434# CONFIG_HAPPYMEAL is not set
421# CONFIG_SUNGEM is not set 435# CONFIG_SUNGEM is not set
436# CONFIG_CASSINI is not set
422# CONFIG_NET_VENDOR_3COM is not set 437# CONFIG_NET_VENDOR_3COM is not set
423 438
424# 439#
@@ -574,6 +589,7 @@ CONFIG_COBALT_LCD=y
574# TPM devices 589# TPM devices
575# 590#
576# CONFIG_TCG_TPM is not set 591# CONFIG_TCG_TPM is not set
592# CONFIG_TELCLOCK is not set
577 593
578# 594#
579# I2C support 595# I2C support
@@ -633,6 +649,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
633# CONFIG_USB is not set 649# CONFIG_USB is not set
634 650
635# 651#
652# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
653#
654
655#
636# USB Gadget Support 656# USB Gadget Support
637# 657#
638# CONFIG_USB_GADGET is not set 658# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 6501144ec612..3b103fec7b86 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:26 2005 4# Tue Nov 15 11:11:04 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -201,7 +220,6 @@ CONFIG_PCMCIA_IOCTL=y
201# 220#
202# PC-card bridges 221# PC-card bridges
203# 222#
204# CONFIG_TCIC is not set
205# CONFIG_PCMCIA_AU1X00 is not set 223# CONFIG_PCMCIA_AU1X00 is not set
206 224
207# 225#
@@ -259,15 +277,19 @@ CONFIG_TCP_CONG_BIC=y
259# CONFIG_IPV6 is not set 277# CONFIG_IPV6 is not set
260CONFIG_NETFILTER=y 278CONFIG_NETFILTER=y
261# CONFIG_NETFILTER_DEBUG is not set 279# CONFIG_NETFILTER_DEBUG is not set
280
281#
282# Core Netfilter Configuration
283#
262CONFIG_NETFILTER_NETLINK=m 284CONFIG_NETFILTER_NETLINK=m
263CONFIG_NETFILTER_NETLINK_QUEUE=m 285CONFIG_NETFILTER_NETLINK_QUEUE=m
264CONFIG_NETFILTER_NETLINK_LOG=m 286CONFIG_NETFILTER_NETLINK_LOG=m
287# CONFIG_NF_CONNTRACK is not set
265 288
266# 289#
267# IP: Netfilter Configuration 290# IP: Netfilter Configuration
268# 291#
269# CONFIG_IP_NF_CONNTRACK is not set 292# CONFIG_IP_NF_CONNTRACK is not set
270CONFIG_IP_NF_PPTP=m
271# CONFIG_IP_NF_QUEUE is not set 293# CONFIG_IP_NF_QUEUE is not set
272# CONFIG_IP_NF_IPTABLES is not set 294# CONFIG_IP_NF_IPTABLES is not set
273# CONFIG_IP_NF_ARPTABLES is not set 295# CONFIG_IP_NF_ARPTABLES is not set
@@ -293,6 +315,10 @@ CONFIG_IP_NF_PPTP=m
293# CONFIG_NET_DIVERT is not set 315# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set 316# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set 317# CONFIG_WAN_ROUTER is not set
318
319#
320# QoS and/or fair queueing
321#
296# CONFIG_NET_SCHED is not set 322# CONFIG_NET_SCHED is not set
297# CONFIG_NET_CLS_ROUTE is not set 323# CONFIG_NET_CLS_ROUTE is not set
298 324
@@ -343,6 +369,7 @@ CONFIG_MTD_BLOCK=y
343# CONFIG_FTL is not set 369# CONFIG_FTL is not set
344# CONFIG_NFTL is not set 370# CONFIG_NFTL is not set
345# CONFIG_INFTL is not set 371# CONFIG_INFTL is not set
372# CONFIG_RFD_FTL is not set
346 373
347# 374#
348# RAM/ROM/Flash chip drivers 375# RAM/ROM/Flash chip drivers
@@ -400,6 +427,11 @@ CONFIG_MTD_ALCHEMY=y
400# CONFIG_MTD_NAND is not set 427# CONFIG_MTD_NAND is not set
401 428
402# 429#
430# OneNAND Flash Device Drivers
431#
432# CONFIG_MTD_ONENAND is not set
433
434#
403# Parallel port support 435# Parallel port support
404# 436#
405# CONFIG_PARPORT is not set 437# CONFIG_PARPORT is not set
@@ -417,18 +449,9 @@ CONFIG_BLK_DEV_LOOP=y
417# CONFIG_BLK_DEV_NBD is not set 449# CONFIG_BLK_DEV_NBD is not set
418# CONFIG_BLK_DEV_RAM is not set 450# CONFIG_BLK_DEV_RAM is not set
419CONFIG_BLK_DEV_RAM_COUNT=16 451CONFIG_BLK_DEV_RAM_COUNT=16
420# CONFIG_LBD is not set
421CONFIG_CDROM_PKTCDVD=m 452CONFIG_CDROM_PKTCDVD=m
422CONFIG_CDROM_PKTCDVD_BUFFERS=8 453CONFIG_CDROM_PKTCDVD_BUFFERS=8
423# CONFIG_CDROM_PKTCDVD_WCACHE is not set 454# CONFIG_CDROM_PKTCDVD_WCACHE is not set
424
425#
426# IO Schedulers
427#
428CONFIG_IOSCHED_NOOP=y
429CONFIG_IOSCHED_AS=y
430CONFIG_IOSCHED_DEADLINE=y
431CONFIG_IOSCHED_CFQ=y
432CONFIG_ATA_OVER_ETH=m 455CONFIG_ATA_OVER_ETH=m
433 456
434# 457#
@@ -473,7 +496,6 @@ CONFIG_NETDEVICES=y
473# PHY device support 496# PHY device support
474# 497#
475CONFIG_PHYLIB=m 498CONFIG_PHYLIB=m
476CONFIG_PHYCONTROL=y
477 499
478# 500#
479# MII PHY device drivers 501# MII PHY device drivers
@@ -490,6 +512,7 @@ CONFIG_CICADA_PHY=m
490CONFIG_NET_ETHERNET=y 512CONFIG_NET_ETHERNET=y
491CONFIG_MII=m 513CONFIG_MII=m
492CONFIG_MIPS_AU1X00_ENET=y 514CONFIG_MIPS_AU1X00_ENET=y
515# CONFIG_SMC91X is not set
493 516
494# 517#
495# Ethernet (1000 Mbit) 518# Ethernet (1000 Mbit)
@@ -532,6 +555,7 @@ CONFIG_PPP_ASYNC=m
532# CONFIG_PPP_SYNC_TTY is not set 555# CONFIG_PPP_SYNC_TTY is not set
533CONFIG_PPP_DEFLATE=m 556CONFIG_PPP_DEFLATE=m
534# CONFIG_PPP_BSDCOMP is not set 557# CONFIG_PPP_BSDCOMP is not set
558CONFIG_PPP_MPPE=m
535CONFIG_PPPOE=m 559CONFIG_PPPOE=m
536# CONFIG_SLIP is not set 560# CONFIG_SLIP is not set
537# CONFIG_SHAPER is not set 561# CONFIG_SHAPER is not set
@@ -598,13 +622,17 @@ CONFIG_HW_CONSOLE=y
598# 622#
599# Serial drivers 623# Serial drivers
600# 624#
601# CONFIG_SERIAL_8250 is not set 625CONFIG_SERIAL_8250=y
626CONFIG_SERIAL_8250_CONSOLE=y
627CONFIG_SERIAL_8250_CS=m
628CONFIG_SERIAL_8250_NR_UARTS=4
629# CONFIG_SERIAL_8250_EXTENDED is not set
630CONFIG_SERIAL_8250_AU1X00=y
602 631
603# 632#
604# Non-8250 serial port support 633# Non-8250 serial port support
605# 634#
606CONFIG_SERIAL_AU1X00=y 635# CONFIG_SERIAL_AU1X00 is not set
607CONFIG_SERIAL_AU1X00_CONSOLE=y
608CONFIG_SERIAL_CORE=y 636CONFIG_SERIAL_CORE=y
609CONFIG_SERIAL_CORE_CONSOLE=y 637CONFIG_SERIAL_CORE_CONSOLE=y
610CONFIG_UNIX98_PTYS=y 638CONFIG_UNIX98_PTYS=y
@@ -633,11 +661,14 @@ CONFIG_LEGACY_PTY_COUNT=256
633# PCMCIA character devices 661# PCMCIA character devices
634# 662#
635CONFIG_SYNCLINK_CS=m 663CONFIG_SYNCLINK_CS=m
664# CONFIG_CARDMAN_4000 is not set
665# CONFIG_CARDMAN_4040 is not set
636# CONFIG_RAW_DRIVER is not set 666# CONFIG_RAW_DRIVER is not set
637 667
638# 668#
639# TPM devices 669# TPM devices
640# 670#
671# CONFIG_TELCLOCK is not set
641 672
642# 673#
643# I2C support 674# I2C support
@@ -697,6 +728,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
697# CONFIG_USB is not set 728# CONFIG_USB is not set
698 729
699# 730#
731# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
732#
733
734#
700# USB Gadget Support 735# USB Gadget Support
701# 736#
702# CONFIG_USB_GADGET is not set 737# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig
index b8cd2cd923dd..79cdd940c6a8 100644
--- a/arch/mips/configs/db1100_defconfig
+++ b/arch/mips/configs/db1100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:29 2005 4# Tue Nov 15 11:11:07 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -247,15 +266,19 @@ CONFIG_TCP_CONG_BIC=y
247# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
248CONFIG_NETFILTER=y 267CONFIG_NETFILTER=y
249# CONFIG_NETFILTER_DEBUG is not set 268# CONFIG_NETFILTER_DEBUG is not set
269
270#
271# Core Netfilter Configuration
272#
250CONFIG_NETFILTER_NETLINK=m 273CONFIG_NETFILTER_NETLINK=m
251CONFIG_NETFILTER_NETLINK_QUEUE=m 274CONFIG_NETFILTER_NETLINK_QUEUE=m
252CONFIG_NETFILTER_NETLINK_LOG=m 275CONFIG_NETFILTER_NETLINK_LOG=m
276# CONFIG_NF_CONNTRACK is not set
253 277
254# 278#
255# IP: Netfilter Configuration 279# IP: Netfilter Configuration
256# 280#
257# CONFIG_IP_NF_CONNTRACK is not set 281# CONFIG_IP_NF_CONNTRACK is not set
258CONFIG_IP_NF_PPTP=m
259# CONFIG_IP_NF_QUEUE is not set 282# CONFIG_IP_NF_QUEUE is not set
260# CONFIG_IP_NF_IPTABLES is not set 283# CONFIG_IP_NF_IPTABLES is not set
261# CONFIG_IP_NF_ARPTABLES is not set 284# CONFIG_IP_NF_ARPTABLES is not set
@@ -281,6 +304,10 @@ CONFIG_IP_NF_PPTP=m
281# CONFIG_NET_DIVERT is not set 304# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 305# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 306# CONFIG_WAN_ROUTER is not set
307
308#
309# QoS and/or fair queueing
310#
284# CONFIG_NET_SCHED is not set 311# CONFIG_NET_SCHED is not set
285# CONFIG_NET_CLS_ROUTE is not set 312# CONFIG_NET_CLS_ROUTE is not set
286 313
@@ -331,6 +358,7 @@ CONFIG_MTD_BLOCK=y
331# CONFIG_FTL is not set 358# CONFIG_FTL is not set
332# CONFIG_NFTL is not set 359# CONFIG_NFTL is not set
333# CONFIG_INFTL is not set 360# CONFIG_INFTL is not set
361# CONFIG_RFD_FTL is not set
334 362
335# 363#
336# RAM/ROM/Flash chip drivers 364# RAM/ROM/Flash chip drivers
@@ -388,6 +416,11 @@ CONFIG_MTD_ALCHEMY=y
388# CONFIG_MTD_NAND is not set 416# CONFIG_MTD_NAND is not set
389 417
390# 418#
419# OneNAND Flash Device Drivers
420#
421# CONFIG_MTD_ONENAND is not set
422
423#
391# Parallel port support 424# Parallel port support
392# 425#
393# CONFIG_PARPORT is not set 426# CONFIG_PARPORT is not set
@@ -405,18 +438,9 @@ CONFIG_BLK_DEV_LOOP=y
405# CONFIG_BLK_DEV_NBD is not set 438# CONFIG_BLK_DEV_NBD is not set
406# CONFIG_BLK_DEV_RAM is not set 439# CONFIG_BLK_DEV_RAM is not set
407CONFIG_BLK_DEV_RAM_COUNT=16 440CONFIG_BLK_DEV_RAM_COUNT=16
408# CONFIG_LBD is not set
409CONFIG_CDROM_PKTCDVD=m 441CONFIG_CDROM_PKTCDVD=m
410CONFIG_CDROM_PKTCDVD_BUFFERS=8 442CONFIG_CDROM_PKTCDVD_BUFFERS=8
411# CONFIG_CDROM_PKTCDVD_WCACHE is not set 443# CONFIG_CDROM_PKTCDVD_WCACHE is not set
412
413#
414# IO Schedulers
415#
416CONFIG_IOSCHED_NOOP=y
417CONFIG_IOSCHED_AS=y
418CONFIG_IOSCHED_DEADLINE=y
419CONFIG_IOSCHED_CFQ=y
420CONFIG_ATA_OVER_ETH=m 444CONFIG_ATA_OVER_ETH=m
421 445
422# 446#
@@ -461,7 +485,6 @@ CONFIG_NETDEVICES=y
461# PHY device support 485# PHY device support
462# 486#
463CONFIG_PHYLIB=m 487CONFIG_PHYLIB=m
464CONFIG_PHYCONTROL=y
465 488
466# 489#
467# MII PHY device drivers 490# MII PHY device drivers
@@ -478,6 +501,7 @@ CONFIG_CICADA_PHY=m
478CONFIG_NET_ETHERNET=y 501CONFIG_NET_ETHERNET=y
479CONFIG_MII=m 502CONFIG_MII=m
480CONFIG_MIPS_AU1X00_ENET=y 503CONFIG_MIPS_AU1X00_ENET=y
504# CONFIG_SMC91X is not set
481 505
482# 506#
483# Ethernet (1000 Mbit) 507# Ethernet (1000 Mbit)
@@ -507,6 +531,7 @@ CONFIG_PPP_ASYNC=m
507# CONFIG_PPP_SYNC_TTY is not set 531# CONFIG_PPP_SYNC_TTY is not set
508CONFIG_PPP_DEFLATE=m 532CONFIG_PPP_DEFLATE=m
509# CONFIG_PPP_BSDCOMP is not set 533# CONFIG_PPP_BSDCOMP is not set
534CONFIG_PPP_MPPE=m
510CONFIG_PPPOE=m 535CONFIG_PPPOE=m
511# CONFIG_SLIP is not set 536# CONFIG_SLIP is not set
512# CONFIG_SHAPER is not set 537# CONFIG_SHAPER is not set
@@ -573,13 +598,16 @@ CONFIG_HW_CONSOLE=y
573# 598#
574# Serial drivers 599# Serial drivers
575# 600#
576# CONFIG_SERIAL_8250 is not set 601CONFIG_SERIAL_8250=y
602CONFIG_SERIAL_8250_CONSOLE=y
603CONFIG_SERIAL_8250_NR_UARTS=4
604# CONFIG_SERIAL_8250_EXTENDED is not set
605CONFIG_SERIAL_8250_AU1X00=y
577 606
578# 607#
579# Non-8250 serial port support 608# Non-8250 serial port support
580# 609#
581CONFIG_SERIAL_AU1X00=y 610# CONFIG_SERIAL_AU1X00 is not set
582CONFIG_SERIAL_AU1X00_CONSOLE=y
583CONFIG_SERIAL_CORE=y 611CONFIG_SERIAL_CORE=y
584CONFIG_SERIAL_CORE_CONSOLE=y 612CONFIG_SERIAL_CORE_CONSOLE=y
585CONFIG_UNIX98_PTYS=y 613CONFIG_UNIX98_PTYS=y
@@ -608,6 +636,7 @@ CONFIG_LEGACY_PTY_COUNT=256
608# 636#
609# TPM devices 637# TPM devices
610# 638#
639# CONFIG_TELCLOCK is not set
611 640
612# 641#
613# I2C support 642# I2C support
@@ -650,12 +679,11 @@ CONFIG_FB=y
650CONFIG_FB_CFB_FILLRECT=y 679CONFIG_FB_CFB_FILLRECT=y
651CONFIG_FB_CFB_COPYAREA=y 680CONFIG_FB_CFB_COPYAREA=y
652CONFIG_FB_CFB_IMAGEBLIT=y 681CONFIG_FB_CFB_IMAGEBLIT=y
653CONFIG_FB_SOFT_CURSOR=y
654# CONFIG_FB_MACMODES is not set 682# CONFIG_FB_MACMODES is not set
655# CONFIG_FB_MODE_HELPERS is not set 683# CONFIG_FB_MODE_HELPERS is not set
656# CONFIG_FB_TILEBLITTING is not set 684# CONFIG_FB_TILEBLITTING is not set
657CONFIG_FB_AU1100=y
658# CONFIG_FB_S1D13XXX is not set 685# CONFIG_FB_S1D13XXX is not set
686CONFIG_FB_AU1100=y
659# CONFIG_FB_VIRTUAL is not set 687# CONFIG_FB_VIRTUAL is not set
660 688
661# 689#
@@ -664,6 +692,7 @@ CONFIG_FB_AU1100=y
664# CONFIG_VGA_CONSOLE is not set 692# CONFIG_VGA_CONSOLE is not set
665CONFIG_DUMMY_CONSOLE=y 693CONFIG_DUMMY_CONSOLE=y
666CONFIG_FRAMEBUFFER_CONSOLE=y 694CONFIG_FRAMEBUFFER_CONSOLE=y
695# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
667CONFIG_FONTS=y 696CONFIG_FONTS=y
668CONFIG_FONT_8x8=y 697CONFIG_FONT_8x8=y
669CONFIG_FONT_8x16=y 698CONFIG_FONT_8x16=y
@@ -698,6 +727,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
698# CONFIG_USB is not set 727# CONFIG_USB is not set
699 728
700# 729#
730# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
731#
732
733#
701# USB Gadget Support 734# USB Gadget Support
702# 735#
703# CONFIG_USB_GADGET is not set 736# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index 530b6c2d99f6..b6bad69398e1 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:32 2005 4# Tue Nov 15 11:11:10 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -200,7 +219,6 @@ CONFIG_PCMCIA_IOCTL=y
200# 219#
201# PC-card bridges 220# PC-card bridges
202# 221#
203# CONFIG_TCIC is not set
204CONFIG_PCMCIA_AU1X00=m 222CONFIG_PCMCIA_AU1X00=m
205 223
206# 224#
@@ -255,13 +273,17 @@ CONFIG_TCP_CONG_BIC=y
255# CONFIG_IPV6 is not set 273# CONFIG_IPV6 is not set
256CONFIG_NETFILTER=y 274CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 275# CONFIG_NETFILTER_DEBUG is not set
276
277#
278# Core Netfilter Configuration
279#
258# CONFIG_NETFILTER_NETLINK is not set 280# CONFIG_NETFILTER_NETLINK is not set
281# CONFIG_NF_CONNTRACK is not set
259 282
260# 283#
261# IP: Netfilter Configuration 284# IP: Netfilter Configuration
262# 285#
263# CONFIG_IP_NF_CONNTRACK is not set 286# CONFIG_IP_NF_CONNTRACK is not set
264CONFIG_IP_NF_PPTP=m
265# CONFIG_IP_NF_QUEUE is not set 287# CONFIG_IP_NF_QUEUE is not set
266# CONFIG_IP_NF_IPTABLES is not set 288# CONFIG_IP_NF_IPTABLES is not set
267# CONFIG_IP_NF_ARPTABLES is not set 289# CONFIG_IP_NF_ARPTABLES is not set
@@ -287,6 +309,10 @@ CONFIG_IP_NF_PPTP=m
287# CONFIG_NET_DIVERT is not set 309# CONFIG_NET_DIVERT is not set
288# CONFIG_ECONET is not set 310# CONFIG_ECONET is not set
289# CONFIG_WAN_ROUTER is not set 311# CONFIG_WAN_ROUTER is not set
312
313#
314# QoS and/or fair queueing
315#
290# CONFIG_NET_SCHED is not set 316# CONFIG_NET_SCHED is not set
291# CONFIG_NET_CLS_ROUTE is not set 317# CONFIG_NET_CLS_ROUTE is not set
292 318
@@ -333,6 +359,7 @@ CONFIG_MTD_BLOCK=y
333# CONFIG_FTL is not set 359# CONFIG_FTL is not set
334# CONFIG_NFTL is not set 360# CONFIG_NFTL is not set
335# CONFIG_INFTL is not set 361# CONFIG_INFTL is not set
362# CONFIG_RFD_FTL is not set
336 363
337# 364#
338# RAM/ROM/Flash chip drivers 365# RAM/ROM/Flash chip drivers
@@ -395,6 +422,11 @@ CONFIG_MTD_NAND_IDS=y
395# CONFIG_MTD_NAND_NANDSIM is not set 422# CONFIG_MTD_NAND_NANDSIM is not set
396 423
397# 424#
425# OneNAND Flash Device Drivers
426#
427# CONFIG_MTD_ONENAND is not set
428
429#
398# Parallel port support 430# Parallel port support
399# 431#
400# CONFIG_PARPORT is not set 432# CONFIG_PARPORT is not set
@@ -414,16 +446,7 @@ CONFIG_BLK_DEV_RAM=y
414CONFIG_BLK_DEV_RAM_COUNT=16 446CONFIG_BLK_DEV_RAM_COUNT=16
415CONFIG_BLK_DEV_RAM_SIZE=4096 447CONFIG_BLK_DEV_RAM_SIZE=4096
416# CONFIG_BLK_DEV_INITRD is not set 448# CONFIG_BLK_DEV_INITRD is not set
417# CONFIG_LBD is not set
418# CONFIG_CDROM_PKTCDVD is not set 449# CONFIG_CDROM_PKTCDVD is not set
419
420#
421# IO Schedulers
422#
423CONFIG_IOSCHED_NOOP=y
424CONFIG_IOSCHED_AS=y
425CONFIG_IOSCHED_DEADLINE=y
426CONFIG_IOSCHED_CFQ=y
427# CONFIG_ATA_OVER_ETH is not set 450# CONFIG_ATA_OVER_ETH is not set
428 451
429# 452#
@@ -495,6 +518,7 @@ CONFIG_SCSI_MULTI_LUN=y
495# 518#
496# SCSI low-level drivers 519# SCSI low-level drivers
497# 520#
521# CONFIG_ISCSI_TCP is not set
498# CONFIG_SCSI_SATA is not set 522# CONFIG_SCSI_SATA is not set
499# CONFIG_SCSI_DEBUG is not set 523# CONFIG_SCSI_DEBUG is not set
500 524
@@ -545,6 +569,7 @@ CONFIG_NETDEVICES=y
545CONFIG_NET_ETHERNET=y 569CONFIG_NET_ETHERNET=y
546CONFIG_MII=m 570CONFIG_MII=m
547# CONFIG_MIPS_AU1X00_ENET is not set 571# CONFIG_MIPS_AU1X00_ENET is not set
572# CONFIG_SMC91X is not set
548 573
549# 574#
550# Ethernet (1000 Mbit) 575# Ethernet (1000 Mbit)
@@ -638,13 +663,17 @@ CONFIG_HW_CONSOLE=y
638# 663#
639# Serial drivers 664# Serial drivers
640# 665#
641# CONFIG_SERIAL_8250 is not set 666CONFIG_SERIAL_8250=y
667CONFIG_SERIAL_8250_CONSOLE=y
668# CONFIG_SERIAL_8250_CS is not set
669CONFIG_SERIAL_8250_NR_UARTS=4
670# CONFIG_SERIAL_8250_EXTENDED is not set
671CONFIG_SERIAL_8250_AU1X00=y
642 672
643# 673#
644# Non-8250 serial port support 674# Non-8250 serial port support
645# 675#
646CONFIG_SERIAL_AU1X00=y 676# CONFIG_SERIAL_AU1X00 is not set
647CONFIG_SERIAL_AU1X00_CONSOLE=y
648CONFIG_SERIAL_CORE=y 677CONFIG_SERIAL_CORE=y
649CONFIG_SERIAL_CORE_CONSOLE=y 678CONFIG_SERIAL_CORE_CONSOLE=y
650CONFIG_UNIX98_PTYS=y 679CONFIG_UNIX98_PTYS=y
@@ -673,11 +702,14 @@ CONFIG_LEGACY_PTY_COUNT=256
673# PCMCIA character devices 702# PCMCIA character devices
674# 703#
675# CONFIG_SYNCLINK_CS is not set 704# CONFIG_SYNCLINK_CS is not set
705# CONFIG_CARDMAN_4000 is not set
706# CONFIG_CARDMAN_4040 is not set
676# CONFIG_RAW_DRIVER is not set 707# CONFIG_RAW_DRIVER is not set
677 708
678# 709#
679# TPM devices 710# TPM devices
680# 711#
712# CONFIG_TELCLOCK is not set
681 713
682# 714#
683# I2C support 715# I2C support
@@ -720,12 +752,11 @@ CONFIG_FB=y
720CONFIG_FB_CFB_FILLRECT=y 752CONFIG_FB_CFB_FILLRECT=y
721CONFIG_FB_CFB_COPYAREA=y 753CONFIG_FB_CFB_COPYAREA=y
722CONFIG_FB_CFB_IMAGEBLIT=y 754CONFIG_FB_CFB_IMAGEBLIT=y
723CONFIG_FB_SOFT_CURSOR=y
724# CONFIG_FB_MACMODES is not set 755# CONFIG_FB_MACMODES is not set
725# CONFIG_FB_MODE_HELPERS is not set 756# CONFIG_FB_MODE_HELPERS is not set
726# CONFIG_FB_TILEBLITTING is not set 757# CONFIG_FB_TILEBLITTING is not set
727CONFIG_FB_AU1200=y
728# CONFIG_FB_S1D13XXX is not set 758# CONFIG_FB_S1D13XXX is not set
759CONFIG_FB_AU1200=y
729# CONFIG_FB_VIRTUAL is not set 760# CONFIG_FB_VIRTUAL is not set
730 761
731# 762#
@@ -757,6 +788,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
757# CONFIG_USB is not set 788# CONFIG_USB is not set
758 789
759# 790#
791# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
792#
793
794#
760# USB Gadget Support 795# USB Gadget Support
761# 796#
762CONFIG_USB_GADGET=m 797CONFIG_USB_GADGET=m
@@ -862,6 +897,7 @@ CONFIG_RAMFS=y
862CONFIG_JFFS2_FS=y 897CONFIG_JFFS2_FS=y
863CONFIG_JFFS2_FS_DEBUG=0 898CONFIG_JFFS2_FS_DEBUG=0
864CONFIG_JFFS2_FS_WRITEBUFFER=y 899CONFIG_JFFS2_FS_WRITEBUFFER=y
900# CONFIG_JFFS2_SUMMARY is not set
865# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 901# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
866CONFIG_JFFS2_ZLIB=y 902CONFIG_JFFS2_ZLIB=y
867CONFIG_JFFS2_RTIME=y 903CONFIG_JFFS2_RTIME=y
diff --git a/arch/mips/configs/db1500_defconfig b/arch/mips/configs/db1500_defconfig
index 1c2784dee697..dbaf189fc9c0 100644
--- a/arch/mips/configs/db1500_defconfig
+++ b/arch/mips/configs/db1500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:36 2005 4# Tue Nov 15 11:11:15 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -208,7 +227,6 @@ CONFIG_CARDBUS=y
208# CONFIG_YENTA is not set 227# CONFIG_YENTA is not set
209# CONFIG_PD6729 is not set 228# CONFIG_PD6729 is not set
210# CONFIG_I82092 is not set 229# CONFIG_I82092 is not set
211# CONFIG_TCIC is not set
212CONFIG_PCMCIA_AU1X00=m 230CONFIG_PCMCIA_AU1X00=m
213 231
214# 232#
@@ -267,15 +285,19 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
268CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
269# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
288
289#
290# Core Netfilter Configuration
291#
270CONFIG_NETFILTER_NETLINK=m 292CONFIG_NETFILTER_NETLINK=m
271CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
272CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set
273 296
274# 297#
275# IP: Netfilter Configuration 298# IP: Netfilter Configuration
276# 299#
277# CONFIG_IP_NF_CONNTRACK is not set 300# CONFIG_IP_NF_CONNTRACK is not set
278CONFIG_IP_NF_PPTP=m
279# CONFIG_IP_NF_QUEUE is not set 301# CONFIG_IP_NF_QUEUE is not set
280# CONFIG_IP_NF_IPTABLES is not set 302# CONFIG_IP_NF_IPTABLES is not set
281# CONFIG_IP_NF_ARPTABLES is not set 303# CONFIG_IP_NF_ARPTABLES is not set
@@ -301,6 +323,10 @@ CONFIG_IP_NF_PPTP=m
301# CONFIG_NET_DIVERT is not set 323# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 324# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 325# CONFIG_WAN_ROUTER is not set
326
327#
328# QoS and/or fair queueing
329#
304# CONFIG_NET_SCHED is not set 330# CONFIG_NET_SCHED is not set
305# CONFIG_NET_CLS_ROUTE is not set 331# CONFIG_NET_CLS_ROUTE is not set
306 332
@@ -351,6 +377,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 377# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 378# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 379# CONFIG_INFTL is not set
380# CONFIG_RFD_FTL is not set
354 381
355# 382#
356# RAM/ROM/Flash chip drivers 383# RAM/ROM/Flash chip drivers
@@ -409,6 +436,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 436# CONFIG_MTD_NAND is not set
410 437
411# 438#
439# OneNAND Flash Device Drivers
440#
441# CONFIG_MTD_ONENAND is not set
442
443#
412# Parallel port support 444# Parallel port support
413# 445#
414# CONFIG_PARPORT is not set 446# CONFIG_PARPORT is not set
@@ -432,18 +464,9 @@ CONFIG_BLK_DEV_LOOP=y
432# CONFIG_BLK_DEV_UB is not set 464# CONFIG_BLK_DEV_UB is not set
433# CONFIG_BLK_DEV_RAM is not set 465# CONFIG_BLK_DEV_RAM is not set
434CONFIG_BLK_DEV_RAM_COUNT=16 466CONFIG_BLK_DEV_RAM_COUNT=16
435# CONFIG_LBD is not set
436CONFIG_CDROM_PKTCDVD=m 467CONFIG_CDROM_PKTCDVD=m
437CONFIG_CDROM_PKTCDVD_BUFFERS=8 468CONFIG_CDROM_PKTCDVD_BUFFERS=8
438# CONFIG_CDROM_PKTCDVD_WCACHE is not set 469# CONFIG_CDROM_PKTCDVD_WCACHE is not set
439
440#
441# IO Schedulers
442#
443CONFIG_IOSCHED_NOOP=y
444CONFIG_IOSCHED_AS=y
445CONFIG_IOSCHED_DEADLINE=y
446CONFIG_IOSCHED_CFQ=y
447CONFIG_ATA_OVER_ETH=m 470CONFIG_ATA_OVER_ETH=m
448 471
449# 472#
@@ -518,7 +541,6 @@ CONFIG_NETDEVICES=y
518# PHY device support 541# PHY device support
519# 542#
520CONFIG_PHYLIB=m 543CONFIG_PHYLIB=m
521CONFIG_PHYCONTROL=y
522 544
523# 545#
524# MII PHY device drivers 546# MII PHY device drivers
@@ -537,7 +559,9 @@ CONFIG_NET_ETHERNET=y
537CONFIG_MIPS_AU1X00_ENET=y 559CONFIG_MIPS_AU1X00_ENET=y
538# CONFIG_HAPPYMEAL is not set 560# CONFIG_HAPPYMEAL is not set
539# CONFIG_SUNGEM is not set 561# CONFIG_SUNGEM is not set
562# CONFIG_CASSINI is not set
540# CONFIG_NET_VENDOR_3COM is not set 563# CONFIG_NET_VENDOR_3COM is not set
564# CONFIG_SMC91X is not set
541 565
542# 566#
543# Tulip family network device support 567# Tulip family network device support
@@ -599,6 +623,7 @@ CONFIG_PPP_ASYNC=m
599# CONFIG_PPP_SYNC_TTY is not set 623# CONFIG_PPP_SYNC_TTY is not set
600CONFIG_PPP_DEFLATE=m 624CONFIG_PPP_DEFLATE=m
601# CONFIG_PPP_BSDCOMP is not set 625# CONFIG_PPP_BSDCOMP is not set
626CONFIG_PPP_MPPE=m
602CONFIG_PPPOE=m 627CONFIG_PPPOE=m
603# CONFIG_SLIP is not set 628# CONFIG_SLIP is not set
604# CONFIG_SHAPER is not set 629# CONFIG_SHAPER is not set
@@ -664,13 +689,17 @@ CONFIG_SERIO_RAW=m
664# 689#
665# Serial drivers 690# Serial drivers
666# 691#
667# CONFIG_SERIAL_8250 is not set 692CONFIG_SERIAL_8250=y
693CONFIG_SERIAL_8250_CONSOLE=y
694# CONFIG_SERIAL_8250_CS is not set
695CONFIG_SERIAL_8250_NR_UARTS=4
696# CONFIG_SERIAL_8250_EXTENDED is not set
697CONFIG_SERIAL_8250_AU1X00=y
668 698
669# 699#
670# Non-8250 serial port support 700# Non-8250 serial port support
671# 701#
672CONFIG_SERIAL_AU1X00=y 702# CONFIG_SERIAL_AU1X00 is not set
673CONFIG_SERIAL_AU1X00_CONSOLE=y
674CONFIG_SERIAL_CORE=y 703CONFIG_SERIAL_CORE=y
675CONFIG_SERIAL_CORE_CONSOLE=y 704CONFIG_SERIAL_CORE_CONSOLE=y
676# CONFIG_SERIAL_JSM is not set 705# CONFIG_SERIAL_JSM is not set
@@ -702,12 +731,15 @@ CONFIG_LEGACY_PTY_COUNT=256
702# PCMCIA character devices 731# PCMCIA character devices
703# 732#
704CONFIG_SYNCLINK_CS=m 733CONFIG_SYNCLINK_CS=m
734# CONFIG_CARDMAN_4000 is not set
735# CONFIG_CARDMAN_4040 is not set
705# CONFIG_RAW_DRIVER is not set 736# CONFIG_RAW_DRIVER is not set
706 737
707# 738#
708# TPM devices 739# TPM devices
709# 740#
710# CONFIG_TCG_TPM is not set 741# CONFIG_TCG_TPM is not set
742# CONFIG_TELCLOCK is not set
711 743
712# 744#
713# I2C support 745# I2C support
@@ -756,12 +788,94 @@ CONFIG_SOUND=y
756# 788#
757# Advanced Linux Sound Architecture 789# Advanced Linux Sound Architecture
758# 790#
759# CONFIG_SND is not set 791CONFIG_SND=m
792CONFIG_SND_AC97_CODEC=m
793CONFIG_SND_AC97_BUS=m
794CONFIG_SND_TIMER=m
795CONFIG_SND_PCM=m
796CONFIG_SND_RAWMIDI=m
797CONFIG_SND_SEQUENCER=m
798CONFIG_SND_SEQ_DUMMY=m
799CONFIG_SND_OSSEMUL=y
800CONFIG_SND_MIXER_OSS=m
801CONFIG_SND_PCM_OSS=m
802CONFIG_SND_SEQUENCER_OSS=y
803# CONFIG_SND_VERBOSE_PRINTK is not set
804# CONFIG_SND_DEBUG is not set
805CONFIG_SND_GENERIC_DRIVER=y
806
807#
808# Generic devices
809#
810# CONFIG_SND_DUMMY is not set
811CONFIG_SND_VIRMIDI=m
812CONFIG_SND_MTPAV=m
813# CONFIG_SND_SERIAL_U16550 is not set
814# CONFIG_SND_MPU401 is not set
815
816#
817# PCI devices
818#
819# CONFIG_SND_ALI5451 is not set
820# CONFIG_SND_ATIIXP is not set
821# CONFIG_SND_ATIIXP_MODEM is not set
822# CONFIG_SND_AU8810 is not set
823# CONFIG_SND_AU8820 is not set
824# CONFIG_SND_AU8830 is not set
825# CONFIG_SND_AZT3328 is not set
826# CONFIG_SND_BT87X is not set
827# CONFIG_SND_CS46XX is not set
828# CONFIG_SND_CS4281 is not set
829# CONFIG_SND_EMU10K1 is not set
830# CONFIG_SND_EMU10K1X is not set
831# CONFIG_SND_CA0106 is not set
832# CONFIG_SND_KORG1212 is not set
833# CONFIG_SND_MIXART is not set
834# CONFIG_SND_NM256 is not set
835# CONFIG_SND_RME32 is not set
836# CONFIG_SND_RME96 is not set
837# CONFIG_SND_RME9652 is not set
838# CONFIG_SND_HDSP is not set
839# CONFIG_SND_HDSPM is not set
840# CONFIG_SND_TRIDENT is not set
841# CONFIG_SND_YMFPCI is not set
842# CONFIG_SND_AD1889 is not set
843# CONFIG_SND_CMIPCI is not set
844# CONFIG_SND_ENS1370 is not set
845# CONFIG_SND_ENS1371 is not set
846# CONFIG_SND_ES1938 is not set
847# CONFIG_SND_ES1968 is not set
848# CONFIG_SND_MAESTRO3 is not set
849# CONFIG_SND_FM801 is not set
850# CONFIG_SND_ICE1712 is not set
851# CONFIG_SND_ICE1724 is not set
852# CONFIG_SND_INTEL8X0 is not set
853# CONFIG_SND_INTEL8X0M is not set
854# CONFIG_SND_SONICVIBES is not set
855# CONFIG_SND_VIA82XX is not set
856# CONFIG_SND_VIA82XX_MODEM is not set
857# CONFIG_SND_VX222 is not set
858# CONFIG_SND_HDA_INTEL is not set
859
860#
861# ALSA MIPS devices
862#
863CONFIG_SND_AU1X00=m
864
865#
866# USB devices
867#
868# CONFIG_SND_USB_AUDIO is not set
869
870#
871# PCMCIA devices
872#
760 873
761# 874#
762# Open Sound System 875# Open Sound System
763# 876#
764CONFIG_SOUND_PRIME=y 877CONFIG_SOUND_PRIME=y
878CONFIG_OBSOLETE_OSS_DRIVER=y
765# CONFIG_SOUND_BT878 is not set 879# CONFIG_SOUND_BT878 is not set
766# CONFIG_SOUND_CMPCI is not set 880# CONFIG_SOUND_CMPCI is not set
767# CONFIG_SOUND_EMU10K1 is not set 881# CONFIG_SOUND_EMU10K1 is not set
@@ -774,7 +888,7 @@ CONFIG_SOUND_PRIME=y
774# CONFIG_SOUND_MAESTRO3 is not set 888# CONFIG_SOUND_MAESTRO3 is not set
775# CONFIG_SOUND_ICH is not set 889# CONFIG_SOUND_ICH is not set
776# CONFIG_SOUND_SONICVIBES is not set 890# CONFIG_SOUND_SONICVIBES is not set
777CONFIG_SOUND_AU1000=y 891# CONFIG_SOUND_AU1000 is not set
778# CONFIG_SOUND_TRIDENT is not set 892# CONFIG_SOUND_TRIDENT is not set
779# CONFIG_SOUND_MSNDCLAS is not set 893# CONFIG_SOUND_MSNDCLAS is not set
780# CONFIG_SOUND_MSNDPIN is not set 894# CONFIG_SOUND_MSNDPIN is not set
@@ -815,12 +929,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
815# USB Device Class drivers 929# USB Device Class drivers
816# 930#
817# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set 931# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
818# CONFIG_USB_BLUETOOTH_TTY is not set
819# CONFIG_USB_ACM is not set 932# CONFIG_USB_ACM is not set
820# CONFIG_USB_PRINTER is not set 933# CONFIG_USB_PRINTER is not set
821 934
822# 935#
823# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 936# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
937#
938
939#
940# may also be needed; see USB_STORAGE Help for more information
824# 941#
825# CONFIG_USB_STORAGE is not set 942# CONFIG_USB_STORAGE is not set
826 943
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 64248e2e924a..59c1ef214fc0 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:25:39 2005 4# Tue Nov 15 11:11:18 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -207,7 +226,6 @@ CONFIG_CARDBUS=y
207# CONFIG_YENTA is not set 226# CONFIG_YENTA is not set
208# CONFIG_PD6729 is not set 227# CONFIG_PD6729 is not set
209# CONFIG_I82092 is not set 228# CONFIG_I82092 is not set
210# CONFIG_TCIC is not set
211CONFIG_PCMCIA_AU1X00=m 229CONFIG_PCMCIA_AU1X00=m
212 230
213# 231#
@@ -266,15 +284,19 @@ CONFIG_TCP_CONG_BIC=y
266# CONFIG_IPV6 is not set 284# CONFIG_IPV6 is not set
267CONFIG_NETFILTER=y 285CONFIG_NETFILTER=y
268# CONFIG_NETFILTER_DEBUG is not set 286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
269CONFIG_NETFILTER_NETLINK=m 291CONFIG_NETFILTER_NETLINK=m
270CONFIG_NETFILTER_NETLINK_QUEUE=m 292CONFIG_NETFILTER_NETLINK_QUEUE=m
271CONFIG_NETFILTER_NETLINK_LOG=m 293CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set
272 295
273# 296#
274# IP: Netfilter Configuration 297# IP: Netfilter Configuration
275# 298#
276# CONFIG_IP_NF_CONNTRACK is not set 299# CONFIG_IP_NF_CONNTRACK is not set
277CONFIG_IP_NF_PPTP=m
278# CONFIG_IP_NF_QUEUE is not set 300# CONFIG_IP_NF_QUEUE is not set
279# CONFIG_IP_NF_IPTABLES is not set 301# CONFIG_IP_NF_IPTABLES is not set
280# CONFIG_IP_NF_ARPTABLES is not set 302# CONFIG_IP_NF_ARPTABLES is not set
@@ -300,6 +322,10 @@ CONFIG_IP_NF_PPTP=m
300# CONFIG_NET_DIVERT is not set 322# CONFIG_NET_DIVERT is not set
301# CONFIG_ECONET is not set 323# CONFIG_ECONET is not set
302# CONFIG_WAN_ROUTER is not set 324# CONFIG_WAN_ROUTER is not set
325
326#
327# QoS and/or fair queueing
328#
303# CONFIG_NET_SCHED is not set 329# CONFIG_NET_SCHED is not set
304# CONFIG_NET_CLS_ROUTE is not set 330# CONFIG_NET_CLS_ROUTE is not set
305 331
@@ -350,6 +376,7 @@ CONFIG_MTD_BLOCK=y
350# CONFIG_FTL is not set 376# CONFIG_FTL is not set
351# CONFIG_NFTL is not set 377# CONFIG_NFTL is not set
352# CONFIG_INFTL is not set 378# CONFIG_INFTL is not set
379# CONFIG_RFD_FTL is not set
353 380
354# 381#
355# RAM/ROM/Flash chip drivers 382# RAM/ROM/Flash chip drivers
@@ -413,6 +440,11 @@ CONFIG_MTD_NAND_AU1550=m
413# CONFIG_MTD_NAND_NANDSIM is not set 440# CONFIG_MTD_NAND_NANDSIM is not set
414 441
415# 442#
443# OneNAND Flash Device Drivers
444#
445# CONFIG_MTD_ONENAND is not set
446
447#
416# Parallel port support 448# Parallel port support
417# 449#
418# CONFIG_PARPORT is not set 450# CONFIG_PARPORT is not set
@@ -435,18 +467,9 @@ CONFIG_BLK_DEV_LOOP=y
435# CONFIG_BLK_DEV_SX8 is not set 467# CONFIG_BLK_DEV_SX8 is not set
436# CONFIG_BLK_DEV_RAM is not set 468# CONFIG_BLK_DEV_RAM is not set
437CONFIG_BLK_DEV_RAM_COUNT=16 469CONFIG_BLK_DEV_RAM_COUNT=16
438# CONFIG_LBD is not set
439CONFIG_CDROM_PKTCDVD=m 470CONFIG_CDROM_PKTCDVD=m
440CONFIG_CDROM_PKTCDVD_BUFFERS=8 471CONFIG_CDROM_PKTCDVD_BUFFERS=8
441# CONFIG_CDROM_PKTCDVD_WCACHE is not set 472# CONFIG_CDROM_PKTCDVD_WCACHE is not set
442
443#
444# IO Schedulers
445#
446CONFIG_IOSCHED_NOOP=y
447CONFIG_IOSCHED_AS=y
448CONFIG_IOSCHED_DEADLINE=y
449CONFIG_IOSCHED_CFQ=y
450CONFIG_ATA_OVER_ETH=m 473CONFIG_ATA_OVER_ETH=m
451 474
452# 475#
@@ -550,7 +573,6 @@ CONFIG_NETDEVICES=y
550# PHY device support 573# PHY device support
551# 574#
552CONFIG_PHYLIB=m 575CONFIG_PHYLIB=m
553CONFIG_PHYCONTROL=y
554 576
555# 577#
556# MII PHY device drivers 578# MII PHY device drivers
@@ -569,7 +591,9 @@ CONFIG_MII=m
569CONFIG_MIPS_AU1X00_ENET=y 591CONFIG_MIPS_AU1X00_ENET=y
570# CONFIG_HAPPYMEAL is not set 592# CONFIG_HAPPYMEAL is not set
571# CONFIG_SUNGEM is not set 593# CONFIG_SUNGEM is not set
594# CONFIG_CASSINI is not set
572# CONFIG_NET_VENDOR_3COM is not set 595# CONFIG_NET_VENDOR_3COM is not set
596# CONFIG_SMC91X is not set
573 597
574# 598#
575# Tulip family network device support 599# Tulip family network device support
@@ -639,6 +663,7 @@ CONFIG_PPP_ASYNC=m
639# CONFIG_PPP_SYNC_TTY is not set 663# CONFIG_PPP_SYNC_TTY is not set
640CONFIG_PPP_DEFLATE=m 664CONFIG_PPP_DEFLATE=m
641# CONFIG_PPP_BSDCOMP is not set 665# CONFIG_PPP_BSDCOMP is not set
666CONFIG_PPP_MPPE=m
642CONFIG_PPPOE=m 667CONFIG_PPPOE=m
643# CONFIG_SLIP is not set 668# CONFIG_SLIP is not set
644# CONFIG_SHAPER is not set 669# CONFIG_SHAPER is not set
@@ -704,13 +729,17 @@ CONFIG_SERIO_RAW=m
704# 729#
705# Serial drivers 730# Serial drivers
706# 731#
707# CONFIG_SERIAL_8250 is not set 732CONFIG_SERIAL_8250=y
733CONFIG_SERIAL_8250_CONSOLE=y
734# CONFIG_SERIAL_8250_CS is not set
735CONFIG_SERIAL_8250_NR_UARTS=4
736# CONFIG_SERIAL_8250_EXTENDED is not set
737CONFIG_SERIAL_8250_AU1X00=y
708 738
709# 739#
710# Non-8250 serial port support 740# Non-8250 serial port support
711# 741#
712CONFIG_SERIAL_AU1X00=y 742# CONFIG_SERIAL_AU1X00 is not set
713CONFIG_SERIAL_AU1X00_CONSOLE=y
714CONFIG_SERIAL_CORE=y 743CONFIG_SERIAL_CORE=y
715CONFIG_SERIAL_CORE_CONSOLE=y 744CONFIG_SERIAL_CORE_CONSOLE=y
716# CONFIG_SERIAL_JSM is not set 745# CONFIG_SERIAL_JSM is not set
@@ -742,12 +771,15 @@ CONFIG_LEGACY_PTY_COUNT=256
742# PCMCIA character devices 771# PCMCIA character devices
743# 772#
744CONFIG_SYNCLINK_CS=m 773CONFIG_SYNCLINK_CS=m
774# CONFIG_CARDMAN_4000 is not set
775# CONFIG_CARDMAN_4040 is not set
745# CONFIG_RAW_DRIVER is not set 776# CONFIG_RAW_DRIVER is not set
746 777
747# 778#
748# TPM devices 779# TPM devices
749# 780#
750# CONFIG_TCG_TPM is not set 781# CONFIG_TCG_TPM is not set
782# CONFIG_TELCLOCK is not set
751 783
752# 784#
753# I2C support 785# I2C support
@@ -801,6 +833,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
801# CONFIG_USB is not set 833# CONFIG_USB is not set
802 834
803# 835#
836# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
837#
838
839#
804# USB Gadget Support 840# USB Gadget Support
805# 841#
806# CONFIG_USB_GADGET is not set 842# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig
index 326f3aa63741..4ba29e612bdf 100644
--- a/arch/mips/configs/ddb5476_defconfig
+++ b/arch/mips/configs/ddb5476_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:42 2005 4# Mon Nov 7 23:05:04 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -173,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
@@ -261,6 +280,10 @@ CONFIG_TCP_CONG_BIC=y
261# CONFIG_NET_DIVERT is not set 280# CONFIG_NET_DIVERT is not set
262# CONFIG_ECONET is not set 281# CONFIG_ECONET is not set
263# CONFIG_WAN_ROUTER is not set 282# CONFIG_WAN_ROUTER is not set
283
284#
285# QoS and/or fair queueing
286#
264# CONFIG_NET_SCHED is not set 287# CONFIG_NET_SCHED is not set
265# CONFIG_NET_CLS_ROUTE is not set 288# CONFIG_NET_CLS_ROUTE is not set
266 289
@@ -292,6 +315,7 @@ CONFIG_FW_LOADER=y
292# Connector - unified userspace <-> kernelspace linker 315# Connector - unified userspace <-> kernelspace linker
293# 316#
294CONFIG_CONNECTOR=y 317CONFIG_CONNECTOR=y
318CONFIG_PROC_EVENTS=y
295 319
296# 320#
297# Memory Technology Devices (MTD) 321# Memory Technology Devices (MTD)
@@ -321,18 +345,9 @@ CONFIG_CONNECTOR=y
321# CONFIG_BLK_DEV_SX8 is not set 345# CONFIG_BLK_DEV_SX8 is not set
322# CONFIG_BLK_DEV_RAM is not set 346# CONFIG_BLK_DEV_RAM is not set
323CONFIG_BLK_DEV_RAM_COUNT=16 347CONFIG_BLK_DEV_RAM_COUNT=16
324# CONFIG_LBD is not set
325CONFIG_CDROM_PKTCDVD=y 348CONFIG_CDROM_PKTCDVD=y
326CONFIG_CDROM_PKTCDVD_BUFFERS=8 349CONFIG_CDROM_PKTCDVD_BUFFERS=8
327# CONFIG_CDROM_PKTCDVD_WCACHE is not set 350# CONFIG_CDROM_PKTCDVD_WCACHE is not set
328
329#
330# IO Schedulers
331#
332CONFIG_IOSCHED_NOOP=y
333CONFIG_IOSCHED_AS=y
334CONFIG_IOSCHED_DEADLINE=y
335CONFIG_IOSCHED_CFQ=y
336CONFIG_ATA_OVER_ETH=y 351CONFIG_ATA_OVER_ETH=y
337 352
338# 353#
@@ -412,7 +427,6 @@ CONFIG_NETDEVICES=y
412# PHY device support 427# PHY device support
413# 428#
414CONFIG_PHYLIB=y 429CONFIG_PHYLIB=y
415CONFIG_PHYCONTROL=y
416 430
417# 431#
418# MII PHY device drivers 432# MII PHY device drivers
@@ -430,6 +444,7 @@ CONFIG_NET_ETHERNET=y
430# CONFIG_MII is not set 444# CONFIG_MII is not set
431# CONFIG_HAPPYMEAL is not set 445# CONFIG_HAPPYMEAL is not set
432# CONFIG_SUNGEM is not set 446# CONFIG_SUNGEM is not set
447# CONFIG_CASSINI is not set
433# CONFIG_NET_VENDOR_3COM is not set 448# CONFIG_NET_VENDOR_3COM is not set
434# CONFIG_NET_VENDOR_SMC is not set 449# CONFIG_NET_VENDOR_SMC is not set
435# CONFIG_NET_VENDOR_RACAL is not set 450# CONFIG_NET_VENDOR_RACAL is not set
@@ -443,7 +458,6 @@ CONFIG_NET_ETHERNET=y
443# CONFIG_HP100 is not set 458# CONFIG_HP100 is not set
444# CONFIG_NET_ISA is not set 459# CONFIG_NET_ISA is not set
445# CONFIG_NET_PCI is not set 460# CONFIG_NET_PCI is not set
446# CONFIG_NET_POCKET is not set
447 461
448# 462#
449# Ethernet (1000 Mbit) 463# Ethernet (1000 Mbit)
@@ -591,6 +605,7 @@ CONFIG_LEGACY_PTY_COUNT=256
591# TPM devices 605# TPM devices
592# 606#
593# CONFIG_TCG_TPM is not set 607# CONFIG_TCG_TPM is not set
608# CONFIG_TELCLOCK is not set
594 609
595# 610#
596# I2C support 611# I2C support
@@ -633,7 +648,6 @@ CONFIG_FB=y
633# CONFIG_FB_CFB_FILLRECT is not set 648# CONFIG_FB_CFB_FILLRECT is not set
634# CONFIG_FB_CFB_COPYAREA is not set 649# CONFIG_FB_CFB_COPYAREA is not set
635# CONFIG_FB_CFB_IMAGEBLIT is not set 650# CONFIG_FB_CFB_IMAGEBLIT is not set
636# CONFIG_FB_SOFT_CURSOR is not set
637# CONFIG_FB_MACMODES is not set 651# CONFIG_FB_MACMODES is not set
638# CONFIG_FB_MODE_HELPERS is not set 652# CONFIG_FB_MODE_HELPERS is not set
639# CONFIG_FB_TILEBLITTING is not set 653# CONFIG_FB_TILEBLITTING is not set
@@ -642,6 +656,7 @@ CONFIG_FB=y
642# CONFIG_FB_CYBER2000 is not set 656# CONFIG_FB_CYBER2000 is not set
643# CONFIG_FB_ASILIANT is not set 657# CONFIG_FB_ASILIANT is not set
644# CONFIG_FB_IMSTT is not set 658# CONFIG_FB_IMSTT is not set
659# CONFIG_FB_S1D13XXX is not set
645# CONFIG_FB_NVIDIA is not set 660# CONFIG_FB_NVIDIA is not set
646# CONFIG_FB_RIVA is not set 661# CONFIG_FB_RIVA is not set
647# CONFIG_FB_MATROX is not set 662# CONFIG_FB_MATROX is not set
@@ -658,7 +673,6 @@ CONFIG_FB=y
658# CONFIG_FB_SMIVGX is not set 673# CONFIG_FB_SMIVGX is not set
659# CONFIG_FB_CYBLA is not set 674# CONFIG_FB_CYBLA is not set
660# CONFIG_FB_TRIDENT is not set 675# CONFIG_FB_TRIDENT is not set
661# CONFIG_FB_S1D13XXX is not set
662# CONFIG_FB_VIRTUAL is not set 676# CONFIG_FB_VIRTUAL is not set
663 677
664# 678#
@@ -688,6 +702,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
688# CONFIG_USB is not set 702# CONFIG_USB is not set
689 703
690# 704#
705# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
706#
707
708#
691# USB Gadget Support 709# USB Gadget Support
692# 710#
693# CONFIG_USB_GADGET is not set 711# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig
index c2a01df3c8df..ea4e9046bbee 100644
--- a/arch/mips/configs/ddb5477_defconfig
+++ b/arch/mips/configs/ddb5477_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:45 2005 4# Mon Nov 7 23:05:08 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -173,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
@@ -260,6 +279,10 @@ CONFIG_TCP_CONG_BIC=y
260# CONFIG_NET_DIVERT is not set 279# CONFIG_NET_DIVERT is not set
261# CONFIG_ECONET is not set 280# CONFIG_ECONET is not set
262# CONFIG_WAN_ROUTER is not set 281# CONFIG_WAN_ROUTER is not set
282
283#
284# QoS and/or fair queueing
285#
263# CONFIG_NET_SCHED is not set 286# CONFIG_NET_SCHED is not set
264# CONFIG_NET_CLS_ROUTE is not set 287# CONFIG_NET_CLS_ROUTE is not set
265 288
@@ -291,6 +314,7 @@ CONFIG_FW_LOADER=y
291# Connector - unified userspace <-> kernelspace linker 314# Connector - unified userspace <-> kernelspace linker
292# 315#
293CONFIG_CONNECTOR=y 316CONFIG_CONNECTOR=y
317CONFIG_PROC_EVENTS=y
294 318
295# 319#
296# Memory Technology Devices (MTD) 320# Memory Technology Devices (MTD)
@@ -319,18 +343,9 @@ CONFIG_CONNECTOR=y
319# CONFIG_BLK_DEV_SX8 is not set 343# CONFIG_BLK_DEV_SX8 is not set
320# CONFIG_BLK_DEV_RAM is not set 344# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 345CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=y 346CONFIG_CDROM_PKTCDVD=y
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 347CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 348# CONFIG_CDROM_PKTCDVD_WCACHE is not set
326
327#
328# IO Schedulers
329#
330CONFIG_IOSCHED_NOOP=y
331CONFIG_IOSCHED_AS=y
332CONFIG_IOSCHED_DEADLINE=y
333CONFIG_IOSCHED_CFQ=y
334CONFIG_ATA_OVER_ETH=y 349CONFIG_ATA_OVER_ETH=y
335 350
336# 351#
@@ -382,7 +397,6 @@ CONFIG_NETDEVICES=y
382# PHY device support 397# PHY device support
383# 398#
384CONFIG_PHYLIB=y 399CONFIG_PHYLIB=y
385CONFIG_PHYCONTROL=y
386 400
387# 401#
388# MII PHY device drivers 402# MII PHY device drivers
@@ -400,6 +414,7 @@ CONFIG_NET_ETHERNET=y
400CONFIG_MII=y 414CONFIG_MII=y
401# CONFIG_HAPPYMEAL is not set 415# CONFIG_HAPPYMEAL is not set
402# CONFIG_SUNGEM is not set 416# CONFIG_SUNGEM is not set
417# CONFIG_CASSINI is not set
403# CONFIG_NET_VENDOR_3COM is not set 418# CONFIG_NET_VENDOR_3COM is not set
404 419
405# 420#
@@ -575,6 +590,7 @@ CONFIG_LEGACY_PTY_COUNT=256
575# TPM devices 590# TPM devices
576# 591#
577# CONFIG_TCG_TPM is not set 592# CONFIG_TCG_TPM is not set
593# CONFIG_TELCLOCK is not set
578 594
579# 595#
580# I2C support 596# I2C support
@@ -634,6 +650,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
634# CONFIG_USB is not set 650# CONFIG_USB is not set
635 651
636# 652#
653# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
654#
655
656#
637# USB Gadget Support 657# USB Gadget Support
638# 658#
639# CONFIG_USB_GADGET is not set 659# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig
index 5bc885b72d14..1ac6c9b7ef96 100644
--- a/arch/mips/configs/decstation_defconfig
+++ b/arch/mips/configs/decstation_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:48 2005 4# Fri Nov 11 13:29:30 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -262,6 +281,10 @@ CONFIG_TCP_CONG_BIC=y
262# CONFIG_NET_DIVERT is not set 281# CONFIG_NET_DIVERT is not set
263# CONFIG_ECONET is not set 282# CONFIG_ECONET is not set
264# CONFIG_WAN_ROUTER is not set 283# CONFIG_WAN_ROUTER is not set
284
285#
286# QoS and/or fair queueing
287#
265# CONFIG_NET_SCHED is not set 288# CONFIG_NET_SCHED is not set
266# CONFIG_NET_CLS_ROUTE is not set 289# CONFIG_NET_CLS_ROUTE is not set
267 290
@@ -318,16 +341,7 @@ CONFIG_BLK_DEV_LOOP=m
318# CONFIG_BLK_DEV_NBD is not set 341# CONFIG_BLK_DEV_NBD is not set
319# CONFIG_BLK_DEV_RAM is not set 342# CONFIG_BLK_DEV_RAM is not set
320CONFIG_BLK_DEV_RAM_COUNT=16 343CONFIG_BLK_DEV_RAM_COUNT=16
321# CONFIG_LBD is not set
322# CONFIG_CDROM_PKTCDVD is not set 344# CONFIG_CDROM_PKTCDVD is not set
323
324#
325# IO Schedulers
326#
327CONFIG_IOSCHED_NOOP=y
328CONFIG_IOSCHED_AS=y
329CONFIG_IOSCHED_DEADLINE=y
330CONFIG_IOSCHED_CFQ=y
331# CONFIG_ATA_OVER_ETH is not set 345# CONFIG_ATA_OVER_ETH is not set
332 346
333# 347#
@@ -365,12 +379,13 @@ CONFIG_SCSI_CONSTANTS=y
365# 379#
366CONFIG_SCSI_SPI_ATTRS=m 380CONFIG_SCSI_SPI_ATTRS=m
367# CONFIG_SCSI_FC_ATTRS is not set 381# CONFIG_SCSI_FC_ATTRS is not set
368# CONFIG_SCSI_ISCSI_ATTRS is not set 382CONFIG_SCSI_ISCSI_ATTRS=m
369CONFIG_SCSI_SAS_ATTRS=m 383CONFIG_SCSI_SAS_ATTRS=m
370 384
371# 385#
372# SCSI low-level drivers 386# SCSI low-level drivers
373# 387#
388CONFIG_ISCSI_TCP=m
374CONFIG_SCSI_DECNCR=y 389CONFIG_SCSI_DECNCR=y
375# CONFIG_SCSI_DECSII is not set 390# CONFIG_SCSI_DECSII is not set
376# CONFIG_SCSI_SATA is not set 391# CONFIG_SCSI_SATA is not set
@@ -407,7 +422,6 @@ CONFIG_NETDEVICES=y
407# PHY device support 422# PHY device support
408# 423#
409CONFIG_PHYLIB=m 424CONFIG_PHYLIB=m
410CONFIG_PHYCONTROL=y
411 425
412# 426#
413# MII PHY device drivers 427# MII PHY device drivers
@@ -491,10 +505,7 @@ CONFIG_ZS=y
491# 505#
492# Non-8250 serial port support 506# Non-8250 serial port support
493# 507#
494CONFIG_SERIAL_DZ=y 508# CONFIG_SERIAL_DZ is not set
495CONFIG_SERIAL_DZ_CONSOLE=y
496CONFIG_SERIAL_CORE=y
497CONFIG_SERIAL_CORE_CONSOLE=y
498CONFIG_UNIX98_PTYS=y 509CONFIG_UNIX98_PTYS=y
499CONFIG_LEGACY_PTYS=y 510CONFIG_LEGACY_PTYS=y
500CONFIG_LEGACY_PTY_COUNT=256 511CONFIG_LEGACY_PTY_COUNT=256
@@ -520,6 +531,7 @@ CONFIG_RTC=y
520# 531#
521# TPM devices 532# TPM devices
522# 533#
534# CONFIG_TELCLOCK is not set
523 535
524# 536#
525# I2C support 537# I2C support
@@ -562,15 +574,14 @@ CONFIG_FB=y
562CONFIG_FB_CFB_FILLRECT=y 574CONFIG_FB_CFB_FILLRECT=y
563CONFIG_FB_CFB_COPYAREA=y 575CONFIG_FB_CFB_COPYAREA=y
564CONFIG_FB_CFB_IMAGEBLIT=y 576CONFIG_FB_CFB_IMAGEBLIT=y
565CONFIG_FB_SOFT_CURSOR=y
566# CONFIG_FB_MACMODES is not set 577# CONFIG_FB_MACMODES is not set
567# CONFIG_FB_MODE_HELPERS is not set 578# CONFIG_FB_MODE_HELPERS is not set
568# CONFIG_FB_TILEBLITTING is not set 579# CONFIG_FB_TILEBLITTING is not set
580# CONFIG_FB_S1D13XXX is not set
569# CONFIG_FB_PMAG_AA is not set 581# CONFIG_FB_PMAG_AA is not set
570CONFIG_FB_PMAG_BA=y 582CONFIG_FB_PMAG_BA=y
571CONFIG_FB_PMAGB_B=y 583CONFIG_FB_PMAGB_B=y
572# CONFIG_FB_MAXINE is not set 584# CONFIG_FB_MAXINE is not set
573# CONFIG_FB_S1D13XXX is not set
574# CONFIG_FB_VIRTUAL is not set 585# CONFIG_FB_VIRTUAL is not set
575 586
576# 587#
@@ -595,6 +606,10 @@ CONFIG_LOGO_DEC_CLUT224=y
595# CONFIG_USB_ARCH_HAS_OHCI is not set 606# CONFIG_USB_ARCH_HAS_OHCI is not set
596 607
597# 608#
609# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
610#
611
612#
598# USB Gadget Support 613# USB Gadget Support
599# 614#
600# CONFIG_USB_GADGET is not set 615# CONFIG_USB_GADGET is not set
@@ -746,6 +761,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
746# CONFIG_DEBUG_KOBJECT is not set 761# CONFIG_DEBUG_KOBJECT is not set
747# CONFIG_DEBUG_INFO is not set 762# CONFIG_DEBUG_INFO is not set
748# CONFIG_DEBUG_FS is not set 763# CONFIG_DEBUG_FS is not set
764# CONFIG_DEBUG_VM is not set
765# CONFIG_RCU_TORTURE_TEST is not set
749CONFIG_CROSSCOMPILE=y 766CONFIG_CROSSCOMPILE=y
750CONFIG_CMDLINE="" 767CONFIG_CMDLINE=""
751# CONFIG_DEBUG_STACK_USAGE is not set 768# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index c0d06ea5566c..a89d2f66cdfa 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:51 2005 4# Mon Nov 7 23:05:15 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -262,6 +281,10 @@ CONFIG_TCP_CONG_BIC=y
262# CONFIG_NET_DIVERT is not set 281# CONFIG_NET_DIVERT is not set
263# CONFIG_ECONET is not set 282# CONFIG_ECONET is not set
264# CONFIG_WAN_ROUTER is not set 283# CONFIG_WAN_ROUTER is not set
284
285#
286# QoS and/or fair queueing
287#
265# CONFIG_NET_SCHED is not set 288# CONFIG_NET_SCHED is not set
266# CONFIG_NET_CLS_ROUTE is not set 289# CONFIG_NET_CLS_ROUTE is not set
267 290
@@ -317,16 +340,7 @@ CONFIG_CONNECTOR=m
317# CONFIG_BLK_DEV_NBD is not set 340# CONFIG_BLK_DEV_NBD is not set
318# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
319CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
320# CONFIG_LBD is not set
321# CONFIG_CDROM_PKTCDVD is not set 343# CONFIG_CDROM_PKTCDVD is not set
322
323#
324# IO Schedulers
325#
326CONFIG_IOSCHED_NOOP=y
327CONFIG_IOSCHED_AS=y
328CONFIG_IOSCHED_DEADLINE=y
329CONFIG_IOSCHED_CFQ=y
330# CONFIG_ATA_OVER_ETH is not set 344# CONFIG_ATA_OVER_ETH is not set
331 345
332# 346#
@@ -403,7 +417,6 @@ CONFIG_NETDEVICES=y
403# PHY device support 417# PHY device support
404# 418#
405CONFIG_PHYLIB=m 419CONFIG_PHYLIB=m
406CONFIG_PHYCONTROL=y
407 420
408# 421#
409# MII PHY device drivers 422# MII PHY device drivers
@@ -427,7 +440,6 @@ CONFIG_NET_ETHERNET=y
427# CONFIG_HP100 is not set 440# CONFIG_HP100 is not set
428# CONFIG_NET_ISA is not set 441# CONFIG_NET_ISA is not set
429# CONFIG_NET_PCI is not set 442# CONFIG_NET_PCI is not set
430# CONFIG_NET_POCKET is not set
431 443
432# 444#
433# Ethernet (1000 Mbit) 445# Ethernet (1000 Mbit)
@@ -552,6 +564,7 @@ CONFIG_WATCHDOG=y
552# CONFIG_WDT is not set 564# CONFIG_WDT is not set
553# CONFIG_RTC is not set 565# CONFIG_RTC is not set
554# CONFIG_GEN_RTC is not set 566# CONFIG_GEN_RTC is not set
567# CONFIG_RTC_VR41XX is not set
555# CONFIG_DTLK is not set 568# CONFIG_DTLK is not set
556# CONFIG_R3964 is not set 569# CONFIG_R3964 is not set
557 570
@@ -564,6 +577,7 @@ CONFIG_GPIO_VR41XX=y
564# 577#
565# TPM devices 578# TPM devices
566# 579#
580# CONFIG_TELCLOCK is not set
567 581
568# 582#
569# I2C support 583# I2C support
@@ -623,6 +637,10 @@ CONFIG_DUMMY_CONSOLE=y
623# CONFIG_USB_ARCH_HAS_OHCI is not set 637# CONFIG_USB_ARCH_HAS_OHCI is not set
624 638
625# 639#
640# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
641#
642
643#
626# USB Gadget Support 644# USB Gadget Support
627# 645#
628# CONFIG_USB_GADGET is not set 646# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig
index f1309d84d2fe..e6c3c27f41fe 100644
--- a/arch/mips/configs/ev64120_defconfig
+++ b/arch/mips/configs/ev64120_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:54 2005 4# Wed Nov 9 11:05:12 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_KMOD is not set 57# CONFIG_KMOD is not set
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
@@ -267,6 +286,10 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 286# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 287# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 288# CONFIG_WAN_ROUTER is not set
289
290#
291# QoS and/or fair queueing
292#
270# CONFIG_NET_SCHED is not set 293# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set 294# CONFIG_NET_CLS_ROUTE is not set
272 295
@@ -326,18 +349,9 @@ CONFIG_CONNECTOR=m
326# CONFIG_BLK_DEV_SX8 is not set 349# CONFIG_BLK_DEV_SX8 is not set
327# CONFIG_BLK_DEV_RAM is not set 350# CONFIG_BLK_DEV_RAM is not set
328CONFIG_BLK_DEV_RAM_COUNT=16 351CONFIG_BLK_DEV_RAM_COUNT=16
329# CONFIG_LBD is not set
330CONFIG_CDROM_PKTCDVD=m 352CONFIG_CDROM_PKTCDVD=m
331CONFIG_CDROM_PKTCDVD_BUFFERS=8 353CONFIG_CDROM_PKTCDVD_BUFFERS=8
332# CONFIG_CDROM_PKTCDVD_WCACHE is not set 354# CONFIG_CDROM_PKTCDVD_WCACHE is not set
333
334#
335# IO Schedulers
336#
337CONFIG_IOSCHED_NOOP=y
338CONFIG_IOSCHED_AS=y
339CONFIG_IOSCHED_DEADLINE=y
340CONFIG_IOSCHED_CFQ=y
341CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
342 356
343# 357#
@@ -389,7 +403,6 @@ CONFIG_NETDEVICES=y
389# PHY device support 403# PHY device support
390# 404#
391CONFIG_PHYLIB=m 405CONFIG_PHYLIB=m
392CONFIG_PHYCONTROL=y
393 406
394# 407#
395# MII PHY device drivers 408# MII PHY device drivers
@@ -407,6 +420,7 @@ CONFIG_NET_ETHERNET=y
407# CONFIG_MII is not set 420# CONFIG_MII is not set
408# CONFIG_HAPPYMEAL is not set 421# CONFIG_HAPPYMEAL is not set
409# CONFIG_SUNGEM is not set 422# CONFIG_SUNGEM is not set
423# CONFIG_CASSINI is not set
410# CONFIG_NET_VENDOR_3COM is not set 424# CONFIG_NET_VENDOR_3COM is not set
411 425
412# 426#
@@ -464,6 +478,7 @@ CONFIG_PPP_ASYNC=y
464# CONFIG_PPP_SYNC_TTY is not set 478# CONFIG_PPP_SYNC_TTY is not set
465# CONFIG_PPP_DEFLATE is not set 479# CONFIG_PPP_DEFLATE is not set
466# CONFIG_PPP_BSDCOMP is not set 480# CONFIG_PPP_BSDCOMP is not set
481CONFIG_PPP_MPPE=m
467# CONFIG_PPPOE is not set 482# CONFIG_PPPOE is not set
468# CONFIG_SLIP is not set 483# CONFIG_SLIP is not set
469# CONFIG_SHAPER is not set 484# CONFIG_SHAPER is not set
@@ -569,6 +584,7 @@ CONFIG_LEGACY_PTY_COUNT=256
569# TPM devices 584# TPM devices
570# 585#
571# CONFIG_TCG_TPM is not set 586# CONFIG_TCG_TPM is not set
587# CONFIG_TELCLOCK is not set
572 588
573# 589#
574# I2C support 590# I2C support
@@ -628,6 +644,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
628# CONFIG_USB is not set 644# CONFIG_USB is not set
629 645
630# 646#
647# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
648#
649
650#
631# USB Gadget Support 651# USB Gadget Support
632# 652#
633# CONFIG_USB_GADGET is not set 653# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig
index 8ac55b7acc01..52ca6bf5be66 100644
--- a/arch/mips/configs/ev96100_defconfig
+++ b/arch/mips/configs/ev96100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:57 2005 4# Mon Nov 7 23:05:22 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57# CONFIG_KMOD is not set 57# CONFIG_KMOD is not set
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -185,6 +203,7 @@ CONFIG_FLATMEM_MANUAL=y
185CONFIG_FLATMEM=y 203CONFIG_FLATMEM=y
186CONFIG_FLAT_NODE_MEM_MAP=y 204CONFIG_FLAT_NODE_MEM_MAP=y
187# CONFIG_SPARSEMEM_STATIC is not set 205# CONFIG_SPARSEMEM_STATIC is not set
206CONFIG_SPLIT_PTLOCK_CPUS=4
188CONFIG_PREEMPT_NONE=y 207CONFIG_PREEMPT_NONE=y
189# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
190# CONFIG_PREEMPT is not set 209# CONFIG_PREEMPT is not set
@@ -269,6 +288,10 @@ CONFIG_TCP_CONG_BIC=y
269# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
270# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
271# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
291
292#
293# QoS and/or fair queueing
294#
272# CONFIG_NET_SCHED is not set 295# CONFIG_NET_SCHED is not set
273# CONFIG_NET_CLS_ROUTE is not set 296# CONFIG_NET_CLS_ROUTE is not set
274 297
@@ -323,18 +346,9 @@ CONFIG_CONNECTOR=m
323# CONFIG_BLK_DEV_NBD is not set 346# CONFIG_BLK_DEV_NBD is not set
324# CONFIG_BLK_DEV_RAM is not set 347# CONFIG_BLK_DEV_RAM is not set
325CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
326# CONFIG_LBD is not set
327CONFIG_CDROM_PKTCDVD=m 349CONFIG_CDROM_PKTCDVD=m
328CONFIG_CDROM_PKTCDVD_BUFFERS=8 350CONFIG_CDROM_PKTCDVD_BUFFERS=8
329# CONFIG_CDROM_PKTCDVD_WCACHE is not set 351# CONFIG_CDROM_PKTCDVD_WCACHE is not set
330
331#
332# IO Schedulers
333#
334CONFIG_IOSCHED_NOOP=y
335CONFIG_IOSCHED_AS=y
336CONFIG_IOSCHED_DEADLINE=y
337CONFIG_IOSCHED_CFQ=y
338CONFIG_ATA_OVER_ETH=m 352CONFIG_ATA_OVER_ETH=m
339 353
340# 354#
@@ -379,7 +393,6 @@ CONFIG_NETDEVICES=y
379# PHY device support 393# PHY device support
380# 394#
381CONFIG_PHYLIB=m 395CONFIG_PHYLIB=m
382CONFIG_PHYCONTROL=y
383 396
384# 397#
385# MII PHY device drivers 398# MII PHY device drivers
@@ -518,6 +531,7 @@ CONFIG_LEGACY_PTY_COUNT=256
518# 531#
519# TPM devices 532# TPM devices
520# 533#
534# CONFIG_TELCLOCK is not set
521 535
522# 536#
523# I2C support 537# I2C support
@@ -576,6 +590,10 @@ CONFIG_DUMMY_CONSOLE=y
576# CONFIG_USB_ARCH_HAS_OHCI is not set 590# CONFIG_USB_ARCH_HAS_OHCI is not set
577 591
578# 592#
593# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
594#
595
596#
579# USB Gadget Support 597# USB Gadget Support
580# 598#
581# CONFIG_USB_GADGET is not set 599# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 3ae3838f283c..79e3fe7e2d54 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:01 2005 4# Thu Nov 10 13:38:41 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -187,6 +205,7 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 205CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 206CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 207# CONFIG_SPARSEMEM_STATIC is not set
208CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PREEMPT_NONE is not set 209# CONFIG_PREEMPT_NONE is not set
191CONFIG_PREEMPT_VOLUNTARY=y 210CONFIG_PREEMPT_VOLUNTARY=y
192# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
@@ -292,6 +311,10 @@ CONFIG_INET6_TUNNEL=m
292CONFIG_IPV6_TUNNEL=m 311CONFIG_IPV6_TUNNEL=m
293CONFIG_NETFILTER=y 312CONFIG_NETFILTER=y
294# CONFIG_NETFILTER_DEBUG is not set 313# CONFIG_NETFILTER_DEBUG is not set
314
315#
316# Core Netfilter Configuration
317#
295CONFIG_NETFILTER_NETLINK=m 318CONFIG_NETFILTER_NETLINK=m
296CONFIG_NETFILTER_NETLINK_QUEUE=m 319CONFIG_NETFILTER_NETLINK_QUEUE=m
297CONFIG_NETFILTER_NETLINK_LOG=m 320CONFIG_NETFILTER_NETLINK_LOG=m
@@ -345,6 +368,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
345CONFIG_IP_NF_TARGET_LOG=m 368CONFIG_IP_NF_TARGET_LOG=m
346CONFIG_IP_NF_TARGET_ULOG=m 369CONFIG_IP_NF_TARGET_ULOG=m
347CONFIG_IP_NF_TARGET_TCPMSS=m 370CONFIG_IP_NF_TARGET_TCPMSS=m
371CONFIG_IP_NF_TARGET_NFQUEUE=m
348CONFIG_IP_NF_NAT=m 372CONFIG_IP_NF_NAT=m
349CONFIG_IP_NF_NAT_NEEDED=y 373CONFIG_IP_NF_NAT_NEEDED=y
350CONFIG_IP_NF_TARGET_MASQUERADE=m 374CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -393,6 +417,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
393CONFIG_IP6_NF_FILTER=m 417CONFIG_IP6_NF_FILTER=m
394CONFIG_IP6_NF_TARGET_LOG=m 418CONFIG_IP6_NF_TARGET_LOG=m
395CONFIG_IP6_NF_TARGET_REJECT=m 419CONFIG_IP6_NF_TARGET_REJECT=m
420CONFIG_IP6_NF_TARGET_NFQUEUE=m
396CONFIG_IP6_NF_MANGLE=m 421CONFIG_IP6_NF_MANGLE=m
397CONFIG_IP6_NF_TARGET_MARK=m 422CONFIG_IP6_NF_TARGET_MARK=m
398CONFIG_IP6_NF_TARGET_HL=m 423CONFIG_IP6_NF_TARGET_HL=m
@@ -424,10 +449,18 @@ CONFIG_SCTP_HMAC_MD5=y
424CONFIG_NET_DIVERT=y 449CONFIG_NET_DIVERT=y
425# CONFIG_ECONET is not set 450# CONFIG_ECONET is not set
426# CONFIG_WAN_ROUTER is not set 451# CONFIG_WAN_ROUTER is not set
452
453#
454# QoS and/or fair queueing
455#
427CONFIG_NET_SCHED=y 456CONFIG_NET_SCHED=y
428# CONFIG_NET_SCH_CLK_JIFFIES is not set 457# CONFIG_NET_SCH_CLK_JIFFIES is not set
429CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 458CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
430# CONFIG_NET_SCH_CLK_CPU is not set 459# CONFIG_NET_SCH_CLK_CPU is not set
460
461#
462# Queueing/Scheduling
463#
431CONFIG_NET_SCH_CBQ=m 464CONFIG_NET_SCH_CBQ=m
432CONFIG_NET_SCH_HTB=m 465CONFIG_NET_SCH_HTB=m
433CONFIG_NET_SCH_HFSC=m 466CONFIG_NET_SCH_HFSC=m
@@ -440,8 +473,10 @@ CONFIG_NET_SCH_GRED=m
440CONFIG_NET_SCH_DSMARK=m 473CONFIG_NET_SCH_DSMARK=m
441CONFIG_NET_SCH_NETEM=m 474CONFIG_NET_SCH_NETEM=m
442CONFIG_NET_SCH_INGRESS=m 475CONFIG_NET_SCH_INGRESS=m
443CONFIG_NET_QOS=y 476
444CONFIG_NET_ESTIMATOR=y 477#
478# Classification
479#
445CONFIG_NET_CLS=y 480CONFIG_NET_CLS=y
446CONFIG_NET_CLS_BASIC=m 481CONFIG_NET_CLS_BASIC=m
447CONFIG_NET_CLS_TCINDEX=m 482CONFIG_NET_CLS_TCINDEX=m
@@ -450,13 +485,14 @@ CONFIG_NET_CLS_ROUTE=y
450CONFIG_NET_CLS_FW=m 485CONFIG_NET_CLS_FW=m
451CONFIG_NET_CLS_U32=m 486CONFIG_NET_CLS_U32=m
452# CONFIG_CLS_U32_PERF is not set 487# CONFIG_CLS_U32_PERF is not set
453# CONFIG_NET_CLS_IND is not set
454# CONFIG_CLS_U32_MARK is not set 488# CONFIG_CLS_U32_MARK is not set
455CONFIG_NET_CLS_RSVP=m 489CONFIG_NET_CLS_RSVP=m
456CONFIG_NET_CLS_RSVP6=m 490CONFIG_NET_CLS_RSVP6=m
457# CONFIG_NET_EMATCH is not set 491# CONFIG_NET_EMATCH is not set
458# CONFIG_NET_CLS_ACT is not set 492# CONFIG_NET_CLS_ACT is not set
459CONFIG_NET_CLS_POLICE=y 493CONFIG_NET_CLS_POLICE=y
494# CONFIG_NET_CLS_IND is not set
495CONFIG_NET_ESTIMATOR=y
460 496
461# 497#
462# Network testing 498# Network testing
@@ -509,18 +545,9 @@ CONFIG_CONNECTOR=m
509# CONFIG_BLK_DEV_NBD is not set 545# CONFIG_BLK_DEV_NBD is not set
510# CONFIG_BLK_DEV_RAM is not set 546# CONFIG_BLK_DEV_RAM is not set
511CONFIG_BLK_DEV_RAM_COUNT=16 547CONFIG_BLK_DEV_RAM_COUNT=16
512# CONFIG_LBD is not set
513CONFIG_CDROM_PKTCDVD=m 548CONFIG_CDROM_PKTCDVD=m
514CONFIG_CDROM_PKTCDVD_BUFFERS=8 549CONFIG_CDROM_PKTCDVD_BUFFERS=8
515# CONFIG_CDROM_PKTCDVD_WCACHE is not set 550# CONFIG_CDROM_PKTCDVD_WCACHE is not set
516
517#
518# IO Schedulers
519#
520CONFIG_IOSCHED_NOOP=y
521CONFIG_IOSCHED_AS=y
522CONFIG_IOSCHED_DEADLINE=y
523CONFIG_IOSCHED_CFQ=y
524CONFIG_ATA_OVER_ETH=m 551CONFIG_ATA_OVER_ETH=m
525 552
526# 553#
@@ -564,6 +591,7 @@ CONFIG_SCSI_SAS_ATTRS=m
564# 591#
565# SCSI low-level drivers 592# SCSI low-level drivers
566# 593#
594CONFIG_ISCSI_TCP=m
567CONFIG_SGIWD93_SCSI=y 595CONFIG_SGIWD93_SCSI=y
568# CONFIG_SCSI_SATA is not set 596# CONFIG_SCSI_SATA is not set
569# CONFIG_SCSI_DEBUG is not set 597# CONFIG_SCSI_DEBUG is not set
@@ -599,7 +627,6 @@ CONFIG_TUN=m
599# PHY device support 627# PHY device support
600# 628#
601CONFIG_PHYLIB=m 629CONFIG_PHYLIB=m
602CONFIG_PHYCONTROL=y
603 630
604# 631#
605# MII PHY device drivers 632# MII PHY device drivers
@@ -752,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256
752# 779#
753# TPM devices 780# TPM devices
754# 781#
782# CONFIG_TELCLOCK is not set
755 783
756# 784#
757# I2C support 785# I2C support
@@ -821,6 +849,10 @@ CONFIG_LOGO_SGI_CLUT224=y
821# CONFIG_USB_ARCH_HAS_OHCI is not set 849# CONFIG_USB_ARCH_HAS_OHCI is not set
822 850
823# 851#
852# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
853#
854
855#
824# USB Gadget Support 856# USB Gadget Support
825# 857#
826# CONFIG_USB_GADGET is not set 858# CONFIG_USB_GADGET is not set
@@ -856,7 +888,7 @@ CONFIG_FS_MBCACHE=y
856CONFIG_FS_POSIX_ACL=y 888CONFIG_FS_POSIX_ACL=y
857CONFIG_XFS_FS=m 889CONFIG_XFS_FS=m
858CONFIG_XFS_EXPORT=y 890CONFIG_XFS_EXPORT=y
859CONFIG_XFS_QUOTA=m 891CONFIG_XFS_QUOTA=y
860CONFIG_XFS_SECURITY=y 892CONFIG_XFS_SECURITY=y
861# CONFIG_XFS_POSIX_ACL is not set 893# CONFIG_XFS_POSIX_ACL is not set
862# CONFIG_XFS_RT is not set 894# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index d962f61d5b98..72998ec35b0b 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:04 2005 4# Sun Nov 13 23:56:52 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -60,6 +60,23 @@ CONFIG_KMOD=y
60CONFIG_STOP_MACHINE=y 60CONFIG_STOP_MACHINE=y
61 61
62# 62#
63# Block layer
64#
65
66#
67# IO Schedulers
68#
69CONFIG_IOSCHED_NOOP=y
70CONFIG_IOSCHED_AS=y
71CONFIG_IOSCHED_DEADLINE=y
72CONFIG_IOSCHED_CFQ=y
73CONFIG_DEFAULT_AS=y
74# CONFIG_DEFAULT_DEADLINE is not set
75# CONFIG_DEFAULT_CFQ is not set
76# CONFIG_DEFAULT_NOOP is not set
77CONFIG_DEFAULT_IOSCHED="anticipatory"
78
79#
63# Machine selection 80# Machine selection
64# 81#
65# CONFIG_MIPS_MTX1 is not set 82# CONFIG_MIPS_MTX1 is not set
@@ -186,6 +203,7 @@ CONFIG_DISCONTIGMEM=y
186CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
187CONFIG_NEED_MULTIPLE_NODES=y 204CONFIG_NEED_MULTIPLE_NODES=y
188# CONFIG_SPARSEMEM_STATIC is not set 205# CONFIG_SPARSEMEM_STATIC is not set
206CONFIG_SPLIT_PTLOCK_CPUS=4
189CONFIG_SMP=y 207CONFIG_SMP=y
190CONFIG_NR_CPUS=64 208CONFIG_NR_CPUS=64
191CONFIG_PREEMPT_NONE=y 209CONFIG_PREEMPT_NONE=y
@@ -284,10 +302,18 @@ CONFIG_TCP_CONG_BIC=y
284# CONFIG_NET_DIVERT is not set 302# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set 303# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set 304# CONFIG_WAN_ROUTER is not set
305
306#
307# QoS and/or fair queueing
308#
287CONFIG_NET_SCHED=y 309CONFIG_NET_SCHED=y
288# CONFIG_NET_SCH_CLK_JIFFIES is not set 310# CONFIG_NET_SCH_CLK_JIFFIES is not set
289CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 311CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
290# CONFIG_NET_SCH_CLK_CPU is not set 312# CONFIG_NET_SCH_CLK_CPU is not set
313
314#
315# Queueing/Scheduling
316#
291CONFIG_NET_SCH_CBQ=m 317CONFIG_NET_SCH_CBQ=m
292CONFIG_NET_SCH_HTB=m 318CONFIG_NET_SCH_HTB=m
293CONFIG_NET_SCH_HFSC=m 319CONFIG_NET_SCH_HFSC=m
@@ -300,8 +326,10 @@ CONFIG_NET_SCH_GRED=m
300CONFIG_NET_SCH_DSMARK=m 326CONFIG_NET_SCH_DSMARK=m
301CONFIG_NET_SCH_NETEM=m 327CONFIG_NET_SCH_NETEM=m
302CONFIG_NET_SCH_INGRESS=m 328CONFIG_NET_SCH_INGRESS=m
303CONFIG_NET_QOS=y 329
304CONFIG_NET_ESTIMATOR=y 330#
331# Classification
332#
305CONFIG_NET_CLS=y 333CONFIG_NET_CLS=y
306CONFIG_NET_CLS_BASIC=m 334CONFIG_NET_CLS_BASIC=m
307CONFIG_NET_CLS_TCINDEX=m 335CONFIG_NET_CLS_TCINDEX=m
@@ -310,12 +338,13 @@ CONFIG_NET_CLS_ROUTE=y
310CONFIG_NET_CLS_FW=m 338CONFIG_NET_CLS_FW=m
311CONFIG_NET_CLS_U32=m 339CONFIG_NET_CLS_U32=m
312# CONFIG_CLS_U32_PERF is not set 340# CONFIG_CLS_U32_PERF is not set
313# CONFIG_NET_CLS_IND is not set
314CONFIG_NET_CLS_RSVP=m 341CONFIG_NET_CLS_RSVP=m
315CONFIG_NET_CLS_RSVP6=m 342CONFIG_NET_CLS_RSVP6=m
316# CONFIG_NET_EMATCH is not set 343# CONFIG_NET_EMATCH is not set
317# CONFIG_NET_CLS_ACT is not set 344# CONFIG_NET_CLS_ACT is not set
318CONFIG_NET_CLS_POLICE=y 345CONFIG_NET_CLS_POLICE=y
346# CONFIG_NET_CLS_IND is not set
347CONFIG_NET_ESTIMATOR=y
319 348
320# 349#
321# Network testing 350# Network testing
@@ -377,14 +406,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
377CONFIG_CDROM_PKTCDVD=m 406CONFIG_CDROM_PKTCDVD=m
378CONFIG_CDROM_PKTCDVD_BUFFERS=8 407CONFIG_CDROM_PKTCDVD_BUFFERS=8
379# CONFIG_CDROM_PKTCDVD_WCACHE is not set 408# CONFIG_CDROM_PKTCDVD_WCACHE is not set
380
381#
382# IO Schedulers
383#
384CONFIG_IOSCHED_NOOP=y
385CONFIG_IOSCHED_AS=y
386CONFIG_IOSCHED_DEADLINE=y
387CONFIG_IOSCHED_CFQ=y
388CONFIG_ATA_OVER_ETH=m 409CONFIG_ATA_OVER_ETH=m
389 410
390# 411#
@@ -428,6 +449,7 @@ CONFIG_SCSI_SAS_ATTRS=m
428# 449#
429# SCSI low-level drivers 450# SCSI low-level drivers
430# 451#
452CONFIG_ISCSI_TCP=m
431# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 453# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
432# CONFIG_SCSI_3W_9XXX is not set 454# CONFIG_SCSI_3W_9XXX is not set
433# CONFIG_SCSI_ACARD is not set 455# CONFIG_SCSI_ACARD is not set
@@ -437,6 +459,7 @@ CONFIG_SCSI_SAS_ATTRS=m
437# CONFIG_SCSI_AIC79XX is not set 459# CONFIG_SCSI_AIC79XX is not set
438# CONFIG_MEGARAID_NEWGEN is not set 460# CONFIG_MEGARAID_NEWGEN is not set
439# CONFIG_MEGARAID_LEGACY is not set 461# CONFIG_MEGARAID_LEGACY is not set
462# CONFIG_MEGARAID_SAS is not set
440# CONFIG_SCSI_SATA is not set 463# CONFIG_SCSI_SATA is not set
441# CONFIG_SCSI_DMX3191D is not set 464# CONFIG_SCSI_DMX3191D is not set
442# CONFIG_SCSI_FUTURE_DOMAIN is not set 465# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -447,7 +470,6 @@ CONFIG_SCSI_SAS_ATTRS=m
447# CONFIG_SCSI_IPR is not set 470# CONFIG_SCSI_IPR is not set
448# CONFIG_SCSI_QLOGIC_FC is not set 471# CONFIG_SCSI_QLOGIC_FC is not set
449CONFIG_SCSI_QLOGIC_1280=y 472CONFIG_SCSI_QLOGIC_1280=y
450CONFIG_SCSI_QLOGIC_1280_1040=y
451CONFIG_SCSI_QLA2XXX=y 473CONFIG_SCSI_QLA2XXX=y
452# CONFIG_SCSI_QLA21XX is not set 474# CONFIG_SCSI_QLA21XX is not set
453# CONFIG_SCSI_QLA22XX is not set 475# CONFIG_SCSI_QLA22XX is not set
@@ -487,6 +509,7 @@ CONFIG_DM_MULTIPATH_EMC=m
487# CONFIG_FUSION is not set 509# CONFIG_FUSION is not set
488# CONFIG_FUSION_SPI is not set 510# CONFIG_FUSION_SPI is not set
489# CONFIG_FUSION_FC is not set 511# CONFIG_FUSION_FC is not set
512# CONFIG_FUSION_SAS is not set
490 513
491# 514#
492# IEEE 1394 (FireWire) support 515# IEEE 1394 (FireWire) support
@@ -516,7 +539,6 @@ CONFIG_NETDEVICES=y
516# PHY device support 539# PHY device support
517# 540#
518CONFIG_PHYLIB=m 541CONFIG_PHYLIB=m
519CONFIG_PHYCONTROL=y
520 542
521# 543#
522# MII PHY device drivers 544# MII PHY device drivers
@@ -532,8 +554,12 @@ CONFIG_CICADA_PHY=m
532# 554#
533CONFIG_NET_ETHERNET=y 555CONFIG_NET_ETHERNET=y
534CONFIG_MII=y 556CONFIG_MII=y
557CONFIG_SGI_IOC3_ETH=y
558CONFIG_SGI_IOC3_ETH_HW_RX_CSUM=y
559CONFIG_SGI_IOC3_ETH_HW_TX_CSUM=y
535# CONFIG_HAPPYMEAL is not set 560# CONFIG_HAPPYMEAL is not set
536# CONFIG_SUNGEM is not set 561# CONFIG_SUNGEM is not set
562# CONFIG_CASSINI is not set
537# CONFIG_NET_VENDOR_3COM is not set 563# CONFIG_NET_VENDOR_3COM is not set
538 564
539# 565#
@@ -672,6 +698,7 @@ CONFIG_SGI_IP27_RTC=y
672# TPM devices 698# TPM devices
673# 699#
674# CONFIG_TCG_TPM is not set 700# CONFIG_TCG_TPM is not set
701# CONFIG_TELCLOCK is not set
675 702
676# 703#
677# I2C support 704# I2C support
@@ -725,6 +752,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
725# CONFIG_USB is not set 752# CONFIG_USB is not set
726 753
727# 754#
755# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
756#
757
758#
728# USB Gadget Support 759# USB Gadget Support
729# 760#
730# CONFIG_USB_GADGET is not set 761# CONFIG_USB_GADGET is not set
@@ -762,7 +793,7 @@ CONFIG_FS_MBCACHE=y
762# CONFIG_JFS_FS is not set 793# CONFIG_JFS_FS is not set
763CONFIG_FS_POSIX_ACL=y 794CONFIG_FS_POSIX_ACL=y
764CONFIG_XFS_FS=m 795CONFIG_XFS_FS=m
765CONFIG_XFS_QUOTA=m 796CONFIG_XFS_QUOTA=y
766CONFIG_XFS_SECURITY=y 797CONFIG_XFS_SECURITY=y
767CONFIG_XFS_POSIX_ACL=y 798CONFIG_XFS_POSIX_ACL=y
768# CONFIG_XFS_RT is not set 799# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig
index bf8fb95b21dc..955e30f1b1ad 100644
--- a/arch/mips/configs/ip32_defconfig
+++ b/arch/mips/configs/ip32_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:07 2005 4# Mon Nov 7 23:05:32 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -52,6 +52,23 @@ CONFIG_BASE_SMALL=0
52# CONFIG_MODULES is not set 52# CONFIG_MODULES is not set
53 53
54# 54#
55# Block layer
56#
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
55# Machine selection 72# Machine selection
56# 73#
57# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
182# CONFIG_PREEMPT_NONE is not set 200# CONFIG_PREEMPT_NONE is not set
183CONFIG_PREEMPT_VOLUNTARY=y 201CONFIG_PREEMPT_VOLUNTARY=y
184# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -271,6 +289,10 @@ CONFIG_TCP_CONG_BIC=y
271# CONFIG_NET_DIVERT is not set 289# CONFIG_NET_DIVERT is not set
272# CONFIG_ECONET is not set 290# CONFIG_ECONET is not set
273# CONFIG_WAN_ROUTER is not set 291# CONFIG_WAN_ROUTER is not set
292
293#
294# QoS and/or fair queueing
295#
274# CONFIG_NET_SCHED is not set 296# CONFIG_NET_SCHED is not set
275# CONFIG_NET_CLS_ROUTE is not set 297# CONFIG_NET_CLS_ROUTE is not set
276 298
@@ -302,6 +324,7 @@ CONFIG_FW_LOADER=y
302# Connector - unified userspace <-> kernelspace linker 324# Connector - unified userspace <-> kernelspace linker
303# 325#
304CONFIG_CONNECTOR=y 326CONFIG_CONNECTOR=y
327CONFIG_PROC_EVENTS=y
305 328
306# 329#
307# Memory Technology Devices (MTD) 330# Memory Technology Devices (MTD)
@@ -334,14 +357,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
334CONFIG_CDROM_PKTCDVD=y 357CONFIG_CDROM_PKTCDVD=y
335CONFIG_CDROM_PKTCDVD_BUFFERS=8 358CONFIG_CDROM_PKTCDVD_BUFFERS=8
336# CONFIG_CDROM_PKTCDVD_WCACHE is not set 359# CONFIG_CDROM_PKTCDVD_WCACHE is not set
337
338#
339# IO Schedulers
340#
341CONFIG_IOSCHED_NOOP=y
342CONFIG_IOSCHED_AS=y
343CONFIG_IOSCHED_DEADLINE=y
344CONFIG_IOSCHED_CFQ=y
345CONFIG_ATA_OVER_ETH=y 360CONFIG_ATA_OVER_ETH=y
346 361
347# 362#
@@ -385,6 +400,7 @@ CONFIG_SCSI_SAS_ATTRS=y
385# 400#
386# SCSI low-level drivers 401# SCSI low-level drivers
387# 402#
403# CONFIG_ISCSI_TCP is not set
388# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 404# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
389# CONFIG_SCSI_3W_9XXX is not set 405# CONFIG_SCSI_3W_9XXX is not set
390# CONFIG_SCSI_ACARD is not set 406# CONFIG_SCSI_ACARD is not set
@@ -399,6 +415,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
399# CONFIG_SCSI_AIC79XX is not set 415# CONFIG_SCSI_AIC79XX is not set
400# CONFIG_MEGARAID_NEWGEN is not set 416# CONFIG_MEGARAID_NEWGEN is not set
401# CONFIG_MEGARAID_LEGACY is not set 417# CONFIG_MEGARAID_LEGACY is not set
418# CONFIG_MEGARAID_SAS is not set
402# CONFIG_SCSI_SATA is not set 419# CONFIG_SCSI_SATA is not set
403# CONFIG_SCSI_DMX3191D is not set 420# CONFIG_SCSI_DMX3191D is not set
404# CONFIG_SCSI_FUTURE_DOMAIN is not set 421# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -432,6 +449,7 @@ CONFIG_SCSI_QLA2XXX=y
432# CONFIG_FUSION is not set 449# CONFIG_FUSION is not set
433# CONFIG_FUSION_SPI is not set 450# CONFIG_FUSION_SPI is not set
434# CONFIG_FUSION_FC is not set 451# CONFIG_FUSION_FC is not set
452# CONFIG_FUSION_SAS is not set
435 453
436# 454#
437# IEEE 1394 (FireWire) support 455# IEEE 1394 (FireWire) support
@@ -461,7 +479,6 @@ CONFIG_NETDEVICES=y
461# PHY device support 479# PHY device support
462# 480#
463CONFIG_PHYLIB=y 481CONFIG_PHYLIB=y
464CONFIG_PHYCONTROL=y
465 482
466# 483#
467# MII PHY device drivers 484# MII PHY device drivers
@@ -480,6 +497,7 @@ CONFIG_NET_ETHERNET=y
480CONFIG_SGI_O2MACE_ETH=y 497CONFIG_SGI_O2MACE_ETH=y
481# CONFIG_HAPPYMEAL is not set 498# CONFIG_HAPPYMEAL is not set
482# CONFIG_SUNGEM is not set 499# CONFIG_SUNGEM is not set
500# CONFIG_CASSINI is not set
483# CONFIG_NET_VENDOR_3COM is not set 501# CONFIG_NET_VENDOR_3COM is not set
484 502
485# 503#
@@ -637,6 +655,7 @@ CONFIG_LEGACY_PTY_COUNT=256
637# TPM devices 655# TPM devices
638# 656#
639# CONFIG_TCG_TPM is not set 657# CONFIG_TCG_TPM is not set
658# CONFIG_TELCLOCK is not set
640 659
641# 660#
642# I2C support 661# I2C support
@@ -696,6 +715,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
696# CONFIG_USB is not set 715# CONFIG_USB is not set
697 716
698# 717#
718# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
719#
720
721#
699# USB Gadget Support 722# USB Gadget Support
700# 723#
701# CONFIG_USB_GADGET is not set 724# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig
index 0940771bafb1..f631385217db 100644
--- a/arch/mips/configs/it8172_defconfig
+++ b/arch/mips/configs/it8172_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:09 2005 4# Thu Nov 10 13:42:45 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
@@ -266,6 +285,10 @@ CONFIG_TCP_CONG_BIC=y
266# CONFIG_NET_DIVERT is not set 285# CONFIG_NET_DIVERT is not set
267# CONFIG_ECONET is not set 286# CONFIG_ECONET is not set
268# CONFIG_WAN_ROUTER is not set 287# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
269# CONFIG_NET_SCHED is not set 292# CONFIG_NET_SCHED is not set
270# CONFIG_NET_CLS_ROUTE is not set 293# CONFIG_NET_CLS_ROUTE is not set
271 294
@@ -315,6 +338,7 @@ CONFIG_MTD_CHAR=y
315# CONFIG_FTL is not set 338# CONFIG_FTL is not set
316# CONFIG_NFTL is not set 339# CONFIG_NFTL is not set
317# CONFIG_INFTL is not set 340# CONFIG_INFTL is not set
341# CONFIG_RFD_FTL is not set
318 342
319# 343#
320# RAM/ROM/Flash chip drivers 344# RAM/ROM/Flash chip drivers
@@ -373,6 +397,11 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2
373# CONFIG_MTD_NAND is not set 397# CONFIG_MTD_NAND is not set
374 398
375# 399#
400# OneNAND Flash Device Drivers
401#
402# CONFIG_MTD_ONENAND is not set
403
404#
376# Parallel port support 405# Parallel port support
377# 406#
378# CONFIG_PARPORT is not set 407# CONFIG_PARPORT is not set
@@ -390,18 +419,9 @@ CONFIG_BLK_DEV_LOOP=y
390# CONFIG_BLK_DEV_NBD is not set 419# CONFIG_BLK_DEV_NBD is not set
391# CONFIG_BLK_DEV_RAM is not set 420# CONFIG_BLK_DEV_RAM is not set
392CONFIG_BLK_DEV_RAM_COUNT=16 421CONFIG_BLK_DEV_RAM_COUNT=16
393# CONFIG_LBD is not set
394CONFIG_CDROM_PKTCDVD=m 422CONFIG_CDROM_PKTCDVD=m
395CONFIG_CDROM_PKTCDVD_BUFFERS=8 423CONFIG_CDROM_PKTCDVD_BUFFERS=8
396# CONFIG_CDROM_PKTCDVD_WCACHE is not set 424# CONFIG_CDROM_PKTCDVD_WCACHE is not set
397
398#
399# IO Schedulers
400#
401CONFIG_IOSCHED_NOOP=y
402CONFIG_IOSCHED_AS=y
403CONFIG_IOSCHED_DEADLINE=y
404CONFIG_IOSCHED_CFQ=y
405CONFIG_ATA_OVER_ETH=m 425CONFIG_ATA_OVER_ETH=m
406 426
407# 427#
@@ -467,7 +487,6 @@ CONFIG_NETDEVICES=y
467# PHY device support 487# PHY device support
468# 488#
469CONFIG_PHYLIB=m 489CONFIG_PHYLIB=m
470CONFIG_PHYCONTROL=y
471 490
472# 491#
473# MII PHY device drivers 492# MII PHY device drivers
@@ -609,6 +628,7 @@ CONFIG_LEGACY_PTY_COUNT=256
609# 628#
610# TPM devices 629# TPM devices
611# 630#
631# CONFIG_TELCLOCK is not set
612 632
613# 633#
614# I2C support 634# I2C support
@@ -669,10 +689,10 @@ CONFIG_SOUND=y
669# Open Sound System 689# Open Sound System
670# 690#
671CONFIG_SOUND_PRIME=y 691CONFIG_SOUND_PRIME=y
692# CONFIG_OBSOLETE_OSS_DRIVER is not set
672CONFIG_SOUND_IT8172=y 693CONFIG_SOUND_IT8172=y
673# CONFIG_SOUND_MSNDCLAS is not set 694# CONFIG_SOUND_MSNDCLAS is not set
674# CONFIG_SOUND_MSNDPIN is not set 695# CONFIG_SOUND_MSNDPIN is not set
675# CONFIG_SOUND_AD1980 is not set
676 696
677# 697#
678# USB support 698# USB support
@@ -681,6 +701,10 @@ CONFIG_SOUND_IT8172=y
681# CONFIG_USB_ARCH_HAS_OHCI is not set 701# CONFIG_USB_ARCH_HAS_OHCI is not set
682 702
683# 703#
704# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
705#
706
707#
684# USB Gadget Support 708# USB Gadget Support
685# 709#
686# CONFIG_USB_GADGET is not set 710# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig
index 9ba61dfc490d..8d94ac753e78 100644
--- a/arch/mips/configs/ivr_defconfig
+++ b/arch/mips/configs/ivr_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:12 2005 4# Mon Nov 7 23:05:38 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -178,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
178CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
179CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
180# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
181CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
182# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
183# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -265,6 +284,10 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
268# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set 292# CONFIG_NET_CLS_ROUTE is not set
270 293
@@ -324,18 +347,9 @@ CONFIG_CONNECTOR=m
324# CONFIG_BLK_DEV_SX8 is not set 347# CONFIG_BLK_DEV_SX8 is not set
325# CONFIG_BLK_DEV_RAM is not set 348# CONFIG_BLK_DEV_RAM is not set
326CONFIG_BLK_DEV_RAM_COUNT=16 349CONFIG_BLK_DEV_RAM_COUNT=16
327# CONFIG_LBD is not set
328CONFIG_CDROM_PKTCDVD=m 350CONFIG_CDROM_PKTCDVD=m
329CONFIG_CDROM_PKTCDVD_BUFFERS=8 351CONFIG_CDROM_PKTCDVD_BUFFERS=8
330# CONFIG_CDROM_PKTCDVD_WCACHE is not set 352# CONFIG_CDROM_PKTCDVD_WCACHE is not set
331
332#
333# IO Schedulers
334#
335CONFIG_IOSCHED_NOOP=y
336CONFIG_IOSCHED_AS=y
337CONFIG_IOSCHED_DEADLINE=y
338CONFIG_IOSCHED_CFQ=y
339CONFIG_ATA_OVER_ETH=m 353CONFIG_ATA_OVER_ETH=m
340 354
341# 355#
@@ -409,7 +423,6 @@ CONFIG_NETDEVICES=y
409# PHY device support 423# PHY device support
410# 424#
411CONFIG_PHYLIB=m 425CONFIG_PHYLIB=m
412CONFIG_PHYCONTROL=y
413 426
414# 427#
415# MII PHY device drivers 428# MII PHY device drivers
@@ -427,6 +440,7 @@ CONFIG_NET_ETHERNET=y
427# CONFIG_MII is not set 440# CONFIG_MII is not set
428# CONFIG_HAPPYMEAL is not set 441# CONFIG_HAPPYMEAL is not set
429# CONFIG_SUNGEM is not set 442# CONFIG_SUNGEM is not set
443# CONFIG_CASSINI is not set
430# CONFIG_NET_VENDOR_3COM is not set 444# CONFIG_NET_VENDOR_3COM is not set
431 445
432# 446#
@@ -539,7 +553,8 @@ CONFIG_VT_CONSOLE=y
539CONFIG_HW_CONSOLE=y 553CONFIG_HW_CONSOLE=y
540# CONFIG_SERIAL_NONSTANDARD is not set 554# CONFIG_SERIAL_NONSTANDARD is not set
541CONFIG_QTRONIX_KEYBOARD=y 555CONFIG_QTRONIX_KEYBOARD=y
542# CONFIG_IT8172_SCR0 is not set 556CONFIG_IT8172_SCR0=y
557CONFIG_IT8172_SCR1=y
543 558
544# 559#
545# Serial drivers 560# Serial drivers
@@ -583,6 +598,7 @@ CONFIG_RTC=y
583# TPM devices 598# TPM devices
584# 599#
585# CONFIG_TCG_TPM is not set 600# CONFIG_TCG_TPM is not set
601# CONFIG_TELCLOCK is not set
586 602
587# 603#
588# I2C support 604# I2C support
@@ -642,6 +658,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
642# CONFIG_USB is not set 658# CONFIG_USB is not set
643 659
644# 660#
661# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
662#
663
664#
645# USB Gadget Support 665# USB Gadget Support
646# 666#
647# CONFIG_USB_GADGET is not set 667# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig
index 21b2b8042f91..a8b4c9a9a63b 100644
--- a/arch/mips/configs/jaguar-atx_defconfig
+++ b/arch/mips/configs/jaguar-atx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:14 2005 4# Mon Nov 7 23:05:41 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -55,6 +55,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
55CONFIG_KMOD=y 55CONFIG_KMOD=y
56 56
57# 57#
58# Block layer
59#
60# CONFIG_LBD is not set
61
62#
63# IO Schedulers
64#
65CONFIG_IOSCHED_NOOP=y
66CONFIG_IOSCHED_AS=y
67CONFIG_IOSCHED_DEADLINE=y
68CONFIG_IOSCHED_CFQ=y
69CONFIG_DEFAULT_AS=y
70# CONFIG_DEFAULT_DEADLINE is not set
71# CONFIG_DEFAULT_CFQ is not set
72# CONFIG_DEFAULT_NOOP is not set
73CONFIG_DEFAULT_IOSCHED="anticipatory"
74
75#
58# Machine selection 76# Machine selection
59# 77#
60# CONFIG_MIPS_MTX1 is not set 78# CONFIG_MIPS_MTX1 is not set
@@ -184,6 +202,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
184CONFIG_FLATMEM=y 202CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 204# CONFIG_SPARSEMEM_STATIC is not set
205CONFIG_SPLIT_PTLOCK_CPUS=4
187# CONFIG_SMP is not set 206# CONFIG_SMP is not set
188CONFIG_PREEMPT_NONE=y 207CONFIG_PREEMPT_NONE=y
189# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
@@ -259,6 +278,10 @@ CONFIG_IPV6_TUNNEL=m
259# CONFIG_LLC2 is not set 278# CONFIG_LLC2 is not set
260# CONFIG_IPX is not set 279# CONFIG_IPX is not set
261# CONFIG_ATALK is not set 280# CONFIG_ATALK is not set
281
282#
283# QoS and/or fair queueing
284#
262# CONFIG_NET_SCHED is not set 285# CONFIG_NET_SCHED is not set
263# CONFIG_NET_CLS_ROUTE is not set 286# CONFIG_NET_CLS_ROUTE is not set
264 287
@@ -317,18 +340,9 @@ CONFIG_CONNECTOR=m
317# CONFIG_BLK_DEV_SX8 is not set 340# CONFIG_BLK_DEV_SX8 is not set
318# CONFIG_BLK_DEV_RAM is not set 341# CONFIG_BLK_DEV_RAM is not set
319CONFIG_BLK_DEV_RAM_COUNT=16 342CONFIG_BLK_DEV_RAM_COUNT=16
320# CONFIG_LBD is not set
321CONFIG_CDROM_PKTCDVD=m 343CONFIG_CDROM_PKTCDVD=m
322CONFIG_CDROM_PKTCDVD_BUFFERS=8 344CONFIG_CDROM_PKTCDVD_BUFFERS=8
323# CONFIG_CDROM_PKTCDVD_WCACHE is not set 345# CONFIG_CDROM_PKTCDVD_WCACHE is not set
324
325#
326# IO Schedulers
327#
328CONFIG_IOSCHED_NOOP=y
329CONFIG_IOSCHED_AS=y
330CONFIG_IOSCHED_DEADLINE=y
331CONFIG_IOSCHED_CFQ=y
332CONFIG_ATA_OVER_ETH=m 346CONFIG_ATA_OVER_ETH=m
333 347
334# 348#
@@ -380,7 +394,6 @@ CONFIG_NETDEVICES=y
380# PHY device support 394# PHY device support
381# 395#
382CONFIG_PHYLIB=m 396CONFIG_PHYLIB=m
383CONFIG_PHYCONTROL=y
384 397
385# 398#
386# MII PHY device drivers 399# MII PHY device drivers
@@ -398,6 +411,7 @@ CONFIG_NET_ETHERNET=y
398CONFIG_MII=y 411CONFIG_MII=y
399# CONFIG_HAPPYMEAL is not set 412# CONFIG_HAPPYMEAL is not set
400# CONFIG_SUNGEM is not set 413# CONFIG_SUNGEM is not set
414# CONFIG_CASSINI is not set
401# CONFIG_NET_VENDOR_3COM is not set 415# CONFIG_NET_VENDOR_3COM is not set
402 416
403# 417#
@@ -592,6 +606,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
592# CONFIG_USB is not set 606# CONFIG_USB is not set
593 607
594# 608#
609# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
610#
611
612#
595# USB Gadget Support 613# USB Gadget Support
596# 614#
597# CONFIG_USB_GADGET is not set 615# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 6390a753e80b..c0ac5c793ec7 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:17 2005 4# Mon Nov 7 23:05:44 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -168,6 +186,7 @@ CONFIG_FLATMEM_MANUAL=y
168CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189CONFIG_SPLIT_PTLOCK_CPUS=4
171CONFIG_PREEMPT_NONE=y 190CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 191# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 192# CONFIG_PREEMPT is not set
@@ -256,6 +275,10 @@ CONFIG_TCP_CONG_BIC=y
256# CONFIG_NET_DIVERT is not set 275# CONFIG_NET_DIVERT is not set
257# CONFIG_ECONET is not set 276# CONFIG_ECONET is not set
258# CONFIG_WAN_ROUTER is not set 277# CONFIG_WAN_ROUTER is not set
278
279#
280# QoS and/or fair queueing
281#
259# CONFIG_NET_SCHED is not set 282# CONFIG_NET_SCHED is not set
260# CONFIG_NET_CLS_ROUTE is not set 283# CONFIG_NET_CLS_ROUTE is not set
261 284
@@ -287,6 +310,7 @@ CONFIG_FW_LOADER=y
287# Connector - unified userspace <-> kernelspace linker 310# Connector - unified userspace <-> kernelspace linker
288# 311#
289CONFIG_CONNECTOR=y 312CONFIG_CONNECTOR=y
313CONFIG_PROC_EVENTS=y
290 314
291# 315#
292# Memory Technology Devices (MTD) 316# Memory Technology Devices (MTD)
@@ -315,18 +339,9 @@ CONFIG_CONNECTOR=y
315# CONFIG_BLK_DEV_SX8 is not set 339# CONFIG_BLK_DEV_SX8 is not set
316# CONFIG_BLK_DEV_RAM is not set 340# CONFIG_BLK_DEV_RAM is not set
317CONFIG_BLK_DEV_RAM_COUNT=16 341CONFIG_BLK_DEV_RAM_COUNT=16
318# CONFIG_LBD is not set
319CONFIG_CDROM_PKTCDVD=y 342CONFIG_CDROM_PKTCDVD=y
320CONFIG_CDROM_PKTCDVD_BUFFERS=8 343CONFIG_CDROM_PKTCDVD_BUFFERS=8
321# CONFIG_CDROM_PKTCDVD_WCACHE is not set 344# CONFIG_CDROM_PKTCDVD_WCACHE is not set
322
323#
324# IO Schedulers
325#
326CONFIG_IOSCHED_NOOP=y
327CONFIG_IOSCHED_AS=y
328CONFIG_IOSCHED_DEADLINE=y
329CONFIG_IOSCHED_CFQ=y
330CONFIG_ATA_OVER_ETH=y 345CONFIG_ATA_OVER_ETH=y
331 346
332# 347#
@@ -378,7 +393,6 @@ CONFIG_NETDEVICES=y
378# PHY device support 393# PHY device support
379# 394#
380CONFIG_PHYLIB=y 395CONFIG_PHYLIB=y
381CONFIG_PHYCONTROL=y
382 396
383# 397#
384# MII PHY device drivers 398# MII PHY device drivers
@@ -396,6 +410,7 @@ CONFIG_NET_ETHERNET=y
396# CONFIG_MII is not set 410# CONFIG_MII is not set
397# CONFIG_HAPPYMEAL is not set 411# CONFIG_HAPPYMEAL is not set
398# CONFIG_SUNGEM is not set 412# CONFIG_SUNGEM is not set
413# CONFIG_CASSINI is not set
399# CONFIG_NET_VENDOR_3COM is not set 414# CONFIG_NET_VENDOR_3COM is not set
400 415
401# 416#
@@ -561,6 +576,7 @@ CONFIG_LEGACY_PTY_COUNT=256
561# TPM devices 576# TPM devices
562# 577#
563# CONFIG_TCG_TPM is not set 578# CONFIG_TCG_TPM is not set
579# CONFIG_TELCLOCK is not set
564 580
565# 581#
566# I2C support 582# I2C support
@@ -603,7 +619,6 @@ CONFIG_FB=y
603# CONFIG_FB_CFB_FILLRECT is not set 619# CONFIG_FB_CFB_FILLRECT is not set
604# CONFIG_FB_CFB_COPYAREA is not set 620# CONFIG_FB_CFB_COPYAREA is not set
605# CONFIG_FB_CFB_IMAGEBLIT is not set 621# CONFIG_FB_CFB_IMAGEBLIT is not set
606# CONFIG_FB_SOFT_CURSOR is not set
607# CONFIG_FB_MACMODES is not set 622# CONFIG_FB_MACMODES is not set
608# CONFIG_FB_MODE_HELPERS is not set 623# CONFIG_FB_MODE_HELPERS is not set
609# CONFIG_FB_TILEBLITTING is not set 624# CONFIG_FB_TILEBLITTING is not set
@@ -612,6 +627,7 @@ CONFIG_FB=y
612# CONFIG_FB_CYBER2000 is not set 627# CONFIG_FB_CYBER2000 is not set
613# CONFIG_FB_ASILIANT is not set 628# CONFIG_FB_ASILIANT is not set
614# CONFIG_FB_IMSTT is not set 629# CONFIG_FB_IMSTT is not set
630# CONFIG_FB_S1D13XXX is not set
615# CONFIG_FB_NVIDIA is not set 631# CONFIG_FB_NVIDIA is not set
616# CONFIG_FB_RIVA is not set 632# CONFIG_FB_RIVA is not set
617# CONFIG_FB_MATROX is not set 633# CONFIG_FB_MATROX is not set
@@ -628,7 +644,6 @@ CONFIG_FB=y
628# CONFIG_FB_SMIVGX is not set 644# CONFIG_FB_SMIVGX is not set
629# CONFIG_FB_CYBLA is not set 645# CONFIG_FB_CYBLA is not set
630# CONFIG_FB_TRIDENT is not set 646# CONFIG_FB_TRIDENT is not set
631# CONFIG_FB_S1D13XXX is not set
632# CONFIG_FB_VIRTUAL is not set 647# CONFIG_FB_VIRTUAL is not set
633 648
634# 649#
@@ -657,6 +672,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
657# CONFIG_USB is not set 672# CONFIG_USB is not set
658 673
659# 674#
675# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
676#
677
678#
660# USB Gadget Support 679# USB Gadget Support
661# 680#
662# CONFIG_USB_GADGET is not set 681# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig
index 03cd0ca6e639..f2bd620ff0fa 100644
--- a/arch/mips/configs/lasat200_defconfig
+++ b/arch/mips/configs/lasat200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:19 2005 4# Mon Nov 7 23:05:47 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -184,6 +202,7 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 202CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 204# CONFIG_SPARSEMEM_STATIC is not set
205CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
@@ -267,6 +286,10 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 286# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 287# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 288# CONFIG_WAN_ROUTER is not set
289
290#
291# QoS and/or fair queueing
292#
270# CONFIG_NET_SCHED is not set 293# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set 294# CONFIG_NET_CLS_ROUTE is not set
272 295
@@ -317,6 +340,7 @@ CONFIG_MTD_BLOCK=y
317# CONFIG_FTL is not set 340# CONFIG_FTL is not set
318# CONFIG_NFTL is not set 341# CONFIG_NFTL is not set
319# CONFIG_INFTL is not set 342# CONFIG_INFTL is not set
343# CONFIG_RFD_FTL is not set
320 344
321# 345#
322# RAM/ROM/Flash chip drivers 346# RAM/ROM/Flash chip drivers
@@ -375,6 +399,11 @@ CONFIG_MTD_LASAT=y
375# CONFIG_MTD_NAND is not set 399# CONFIG_MTD_NAND is not set
376 400
377# 401#
402# OneNAND Flash Device Drivers
403#
404# CONFIG_MTD_ONENAND is not set
405
406#
378# Parallel port support 407# Parallel port support
379# 408#
380# CONFIG_PARPORT is not set 409# CONFIG_PARPORT is not set
@@ -396,18 +425,9 @@ CONFIG_MTD_LASAT=y
396# CONFIG_BLK_DEV_SX8 is not set 425# CONFIG_BLK_DEV_SX8 is not set
397# CONFIG_BLK_DEV_RAM is not set 426# CONFIG_BLK_DEV_RAM is not set
398CONFIG_BLK_DEV_RAM_COUNT=16 427CONFIG_BLK_DEV_RAM_COUNT=16
399# CONFIG_LBD is not set
400CONFIG_CDROM_PKTCDVD=m 428CONFIG_CDROM_PKTCDVD=m
401CONFIG_CDROM_PKTCDVD_BUFFERS=8 429CONFIG_CDROM_PKTCDVD_BUFFERS=8
402# CONFIG_CDROM_PKTCDVD_WCACHE is not set 430# CONFIG_CDROM_PKTCDVD_WCACHE is not set
403
404#
405# IO Schedulers
406#
407CONFIG_IOSCHED_NOOP=y
408CONFIG_IOSCHED_AS=y
409CONFIG_IOSCHED_DEADLINE=y
410CONFIG_IOSCHED_CFQ=y
411CONFIG_ATA_OVER_ETH=m 431CONFIG_ATA_OVER_ETH=m
412 432
413# 433#
@@ -511,7 +531,6 @@ CONFIG_NETDEVICES=y
511# PHY device support 531# PHY device support
512# 532#
513CONFIG_PHYLIB=m 533CONFIG_PHYLIB=m
514CONFIG_PHYCONTROL=y
515 534
516# 535#
517# MII PHY device drivers 536# MII PHY device drivers
@@ -529,6 +548,7 @@ CONFIG_NET_ETHERNET=y
529# CONFIG_MII is not set 548# CONFIG_MII is not set
530# CONFIG_HAPPYMEAL is not set 549# CONFIG_HAPPYMEAL is not set
531# CONFIG_SUNGEM is not set 550# CONFIG_SUNGEM is not set
551# CONFIG_CASSINI is not set
532# CONFIG_NET_VENDOR_3COM is not set 552# CONFIG_NET_VENDOR_3COM is not set
533 553
534# 554#
@@ -684,6 +704,7 @@ CONFIG_LEGACY_PTY_COUNT=256
684# TPM devices 704# TPM devices
685# 705#
686# CONFIG_TCG_TPM is not set 706# CONFIG_TCG_TPM is not set
707# CONFIG_TELCLOCK is not set
687 708
688# 709#
689# I2C support 710# I2C support
@@ -743,6 +764,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
743# CONFIG_USB is not set 764# CONFIG_USB is not set
744 765
745# 766#
767# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
768#
769
770#
746# USB Gadget Support 771# USB Gadget Support
747# 772#
748# CONFIG_USB_GADGET is not set 773# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 2acdec959dd0..e48e1de442b4 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:22 2005 4# Thu Nov 10 13:42:55 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -197,6 +215,7 @@ CONFIG_FLATMEM_MANUAL=y
197CONFIG_FLATMEM=y 215CONFIG_FLATMEM=y
198CONFIG_FLAT_NODE_MEM_MAP=y 216CONFIG_FLAT_NODE_MEM_MAP=y
199# CONFIG_SPARSEMEM_STATIC is not set 217# CONFIG_SPARSEMEM_STATIC is not set
218CONFIG_SPLIT_PTLOCK_CPUS=4
200CONFIG_PREEMPT_NONE=y 219CONFIG_PREEMPT_NONE=y
201# CONFIG_PREEMPT_VOLUNTARY is not set 220# CONFIG_PREEMPT_VOLUNTARY is not set
202# CONFIG_PREEMPT is not set 221# CONFIG_PREEMPT is not set
@@ -315,6 +334,10 @@ CONFIG_IPV6_TUNNEL=m
315CONFIG_NETFILTER=y 334CONFIG_NETFILTER=y
316# CONFIG_NETFILTER_DEBUG is not set 335# CONFIG_NETFILTER_DEBUG is not set
317CONFIG_BRIDGE_NETFILTER=y 336CONFIG_BRIDGE_NETFILTER=y
337
338#
339# Core Netfilter Configuration
340#
318CONFIG_NETFILTER_NETLINK=m 341CONFIG_NETFILTER_NETLINK=m
319CONFIG_NETFILTER_NETLINK_QUEUE=m 342CONFIG_NETFILTER_NETLINK_QUEUE=m
320CONFIG_NETFILTER_NETLINK_LOG=m 343CONFIG_NETFILTER_NETLINK_LOG=m
@@ -369,6 +392,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
369CONFIG_IP_NF_TARGET_LOG=m 392CONFIG_IP_NF_TARGET_LOG=m
370CONFIG_IP_NF_TARGET_ULOG=m 393CONFIG_IP_NF_TARGET_ULOG=m
371CONFIG_IP_NF_TARGET_TCPMSS=m 394CONFIG_IP_NF_TARGET_TCPMSS=m
395CONFIG_IP_NF_TARGET_NFQUEUE=m
372CONFIG_IP_NF_NAT=m 396CONFIG_IP_NF_NAT=m
373CONFIG_IP_NF_NAT_NEEDED=y 397CONFIG_IP_NF_NAT_NEEDED=y
374CONFIG_IP_NF_TARGET_MASQUERADE=m 398CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -418,6 +442,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
418CONFIG_IP6_NF_FILTER=m 442CONFIG_IP6_NF_FILTER=m
419CONFIG_IP6_NF_TARGET_LOG=m 443CONFIG_IP6_NF_TARGET_LOG=m
420CONFIG_IP6_NF_TARGET_REJECT=m 444CONFIG_IP6_NF_TARGET_REJECT=m
445CONFIG_IP6_NF_TARGET_NFQUEUE=m
421CONFIG_IP6_NF_MANGLE=m 446CONFIG_IP6_NF_MANGLE=m
422CONFIG_IP6_NF_TARGET_MARK=m 447CONFIG_IP6_NF_TARGET_MARK=m
423CONFIG_IP6_NF_TARGET_HL=m 448CONFIG_IP6_NF_TARGET_HL=m
@@ -478,10 +503,18 @@ CONFIG_IPDDP_DECAP=y
478CONFIG_NET_DIVERT=y 503CONFIG_NET_DIVERT=y
479# CONFIG_ECONET is not set 504# CONFIG_ECONET is not set
480# CONFIG_WAN_ROUTER is not set 505# CONFIG_WAN_ROUTER is not set
506
507#
508# QoS and/or fair queueing
509#
481CONFIG_NET_SCHED=y 510CONFIG_NET_SCHED=y
482CONFIG_NET_SCH_CLK_JIFFIES=y 511CONFIG_NET_SCH_CLK_JIFFIES=y
483# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 512# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
484# CONFIG_NET_SCH_CLK_CPU is not set 513# CONFIG_NET_SCH_CLK_CPU is not set
514
515#
516# Queueing/Scheduling
517#
485CONFIG_NET_SCH_CBQ=m 518CONFIG_NET_SCH_CBQ=m
486CONFIG_NET_SCH_HTB=m 519CONFIG_NET_SCH_HTB=m
487CONFIG_NET_SCH_HFSC=m 520CONFIG_NET_SCH_HFSC=m
@@ -494,8 +527,10 @@ CONFIG_NET_SCH_GRED=m
494CONFIG_NET_SCH_DSMARK=m 527CONFIG_NET_SCH_DSMARK=m
495CONFIG_NET_SCH_NETEM=m 528CONFIG_NET_SCH_NETEM=m
496CONFIG_NET_SCH_INGRESS=m 529CONFIG_NET_SCH_INGRESS=m
497CONFIG_NET_QOS=y 530
498CONFIG_NET_ESTIMATOR=y 531#
532# Classification
533#
499CONFIG_NET_CLS=y 534CONFIG_NET_CLS=y
500CONFIG_NET_CLS_BASIC=m 535CONFIG_NET_CLS_BASIC=m
501CONFIG_NET_CLS_TCINDEX=m 536CONFIG_NET_CLS_TCINDEX=m
@@ -504,13 +539,14 @@ CONFIG_NET_CLS_ROUTE=y
504CONFIG_NET_CLS_FW=m 539CONFIG_NET_CLS_FW=m
505CONFIG_NET_CLS_U32=m 540CONFIG_NET_CLS_U32=m
506# CONFIG_CLS_U32_PERF is not set 541# CONFIG_CLS_U32_PERF is not set
507CONFIG_NET_CLS_IND=y
508# CONFIG_CLS_U32_MARK is not set 542# CONFIG_CLS_U32_MARK is not set
509CONFIG_NET_CLS_RSVP=m 543CONFIG_NET_CLS_RSVP=m
510CONFIG_NET_CLS_RSVP6=m 544CONFIG_NET_CLS_RSVP6=m
511# CONFIG_NET_EMATCH is not set 545# CONFIG_NET_EMATCH is not set
512# CONFIG_NET_CLS_ACT is not set 546# CONFIG_NET_CLS_ACT is not set
513CONFIG_NET_CLS_POLICE=y 547CONFIG_NET_CLS_POLICE=y
548CONFIG_NET_CLS_IND=y
549CONFIG_NET_ESTIMATOR=y
514 550
515# 551#
516# Network testing 552# Network testing
@@ -572,18 +608,9 @@ CONFIG_BLK_DEV_RAM=y
572CONFIG_BLK_DEV_RAM_COUNT=16 608CONFIG_BLK_DEV_RAM_COUNT=16
573CONFIG_BLK_DEV_RAM_SIZE=4096 609CONFIG_BLK_DEV_RAM_SIZE=4096
574# CONFIG_BLK_DEV_INITRD is not set 610# CONFIG_BLK_DEV_INITRD is not set
575# CONFIG_LBD is not set
576CONFIG_CDROM_PKTCDVD=m 611CONFIG_CDROM_PKTCDVD=m
577CONFIG_CDROM_PKTCDVD_BUFFERS=8 612CONFIG_CDROM_PKTCDVD_BUFFERS=8
578# CONFIG_CDROM_PKTCDVD_WCACHE is not set 613# CONFIG_CDROM_PKTCDVD_WCACHE is not set
579
580#
581# IO Schedulers
582#
583CONFIG_IOSCHED_NOOP=y
584CONFIG_IOSCHED_AS=y
585CONFIG_IOSCHED_DEADLINE=y
586CONFIG_IOSCHED_CFQ=y
587CONFIG_ATA_OVER_ETH=m 614CONFIG_ATA_OVER_ETH=m
588 615
589# 616#
@@ -680,6 +707,7 @@ CONFIG_SCSI_SAS_ATTRS=m
680# 707#
681# SCSI low-level drivers 708# SCSI low-level drivers
682# 709#
710CONFIG_ISCSI_TCP=m
683CONFIG_BLK_DEV_3W_XXXX_RAID=m 711CONFIG_BLK_DEV_3W_XXXX_RAID=m
684CONFIG_SCSI_3W_9XXX=m 712CONFIG_SCSI_3W_9XXX=m
685CONFIG_SCSI_ACARD=m 713CONFIG_SCSI_ACARD=m
@@ -695,6 +723,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
695# CONFIG_SCSI_DPT_I2O is not set 723# CONFIG_SCSI_DPT_I2O is not set
696# CONFIG_MEGARAID_NEWGEN is not set 724# CONFIG_MEGARAID_NEWGEN is not set
697# CONFIG_MEGARAID_LEGACY is not set 725# CONFIG_MEGARAID_LEGACY is not set
726# CONFIG_MEGARAID_SAS is not set
698# CONFIG_SCSI_SATA is not set 727# CONFIG_SCSI_SATA is not set
699# CONFIG_SCSI_DMX3191D is not set 728# CONFIG_SCSI_DMX3191D is not set
700# CONFIG_SCSI_FUTURE_DOMAIN is not set 729# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -745,6 +774,7 @@ CONFIG_DM_MULTIPATH_EMC=m
745# CONFIG_FUSION is not set 774# CONFIG_FUSION is not set
746# CONFIG_FUSION_SPI is not set 775# CONFIG_FUSION_SPI is not set
747# CONFIG_FUSION_FC is not set 776# CONFIG_FUSION_FC is not set
777# CONFIG_FUSION_SAS is not set
748 778
749# 779#
750# IEEE 1394 (FireWire) support 780# IEEE 1394 (FireWire) support
@@ -774,7 +804,6 @@ CONFIG_TUN=m
774# PHY device support 804# PHY device support
775# 805#
776CONFIG_PHYLIB=m 806CONFIG_PHYLIB=m
777CONFIG_PHYCONTROL=y
778 807
779# 808#
780# MII PHY device drivers 809# MII PHY device drivers
@@ -792,6 +821,7 @@ CONFIG_NET_ETHERNET=y
792CONFIG_MII=y 821CONFIG_MII=y
793# CONFIG_HAPPYMEAL is not set 822# CONFIG_HAPPYMEAL is not set
794# CONFIG_SUNGEM is not set 823# CONFIG_SUNGEM is not set
824# CONFIG_CASSINI is not set
795# CONFIG_NET_VENDOR_3COM is not set 825# CONFIG_NET_VENDOR_3COM is not set
796 826
797# 827#
@@ -967,6 +997,7 @@ CONFIG_RTC=y
967# TPM devices 997# TPM devices
968# 998#
969# CONFIG_TCG_TPM is not set 999# CONFIG_TCG_TPM is not set
1000# CONFIG_TELCLOCK is not set
970 1001
971# 1002#
972# I2C support 1003# I2C support
@@ -1026,6 +1057,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
1026# CONFIG_USB is not set 1057# CONFIG_USB is not set
1027 1058
1028# 1059#
1060# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1061#
1062
1063#
1029# USB Gadget Support 1064# USB Gadget Support
1030# 1065#
1031# CONFIG_USB_GADGET is not set 1066# CONFIG_USB_GADGET is not set
@@ -1071,7 +1106,7 @@ CONFIG_JFS_SECURITY=y
1071CONFIG_FS_POSIX_ACL=y 1106CONFIG_FS_POSIX_ACL=y
1072CONFIG_XFS_FS=m 1107CONFIG_XFS_FS=m
1073CONFIG_XFS_EXPORT=y 1108CONFIG_XFS_EXPORT=y
1074CONFIG_XFS_QUOTA=m 1109CONFIG_XFS_QUOTA=y
1075CONFIG_XFS_SECURITY=y 1110CONFIG_XFS_SECURITY=y
1076CONFIG_XFS_POSIX_ACL=y 1111CONFIG_XFS_POSIX_ACL=y
1077# CONFIG_XFS_RT is not set 1112# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/mipssim_defconfig b/arch/mips/configs/mipssim_defconfig
index fb9bdd9e3151..04abd1b3202b 100644
--- a/arch/mips/configs/mipssim_defconfig
+++ b/arch/mips/configs/mipssim_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:25 2005 4# Mon Nov 7 23:05:55 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -184,6 +202,7 @@ CONFIG_FLATMEM_MANUAL=y
184CONFIG_FLATMEM=y 202CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y 203CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set 204# CONFIG_SPARSEMEM_STATIC is not set
205CONFIG_SPLIT_PTLOCK_CPUS=4
187CONFIG_PREEMPT_NONE=y 206CONFIG_PREEMPT_NONE=y
188# CONFIG_PREEMPT_VOLUNTARY is not set 207# CONFIG_PREEMPT_VOLUNTARY is not set
189# CONFIG_PREEMPT is not set 208# CONFIG_PREEMPT is not set
@@ -281,10 +300,18 @@ CONFIG_SCTP_HMAC_MD5=y
281CONFIG_NET_DIVERT=y 300CONFIG_NET_DIVERT=y
282# CONFIG_ECONET is not set 301# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 302# CONFIG_WAN_ROUTER is not set
303
304#
305# QoS and/or fair queueing
306#
284CONFIG_NET_SCHED=y 307CONFIG_NET_SCHED=y
285CONFIG_NET_SCH_CLK_JIFFIES=y 308CONFIG_NET_SCH_CLK_JIFFIES=y
286# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 309# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
287# CONFIG_NET_SCH_CLK_CPU is not set 310# CONFIG_NET_SCH_CLK_CPU is not set
311
312#
313# Queueing/Scheduling
314#
288CONFIG_NET_SCH_CBQ=m 315CONFIG_NET_SCH_CBQ=m
289CONFIG_NET_SCH_HTB=m 316CONFIG_NET_SCH_HTB=m
290CONFIG_NET_SCH_HFSC=m 317CONFIG_NET_SCH_HFSC=m
@@ -297,8 +324,10 @@ CONFIG_NET_SCH_GRED=m
297CONFIG_NET_SCH_DSMARK=m 324CONFIG_NET_SCH_DSMARK=m
298CONFIG_NET_SCH_NETEM=m 325CONFIG_NET_SCH_NETEM=m
299CONFIG_NET_SCH_INGRESS=m 326CONFIG_NET_SCH_INGRESS=m
300CONFIG_NET_QOS=y 327
301CONFIG_NET_ESTIMATOR=y 328#
329# Classification
330#
302CONFIG_NET_CLS=y 331CONFIG_NET_CLS=y
303CONFIG_NET_CLS_BASIC=m 332CONFIG_NET_CLS_BASIC=m
304CONFIG_NET_CLS_TCINDEX=m 333CONFIG_NET_CLS_TCINDEX=m
@@ -311,6 +340,7 @@ CONFIG_NET_CLS_ROUTE=y
311# CONFIG_NET_EMATCH is not set 340# CONFIG_NET_EMATCH is not set
312# CONFIG_NET_CLS_ACT is not set 341# CONFIG_NET_CLS_ACT is not set
313# CONFIG_NET_CLS_POLICE is not set 342# CONFIG_NET_CLS_POLICE is not set
343CONFIG_NET_ESTIMATOR=y
314 344
315# 345#
316# Network testing 346# Network testing
@@ -361,16 +391,7 @@ CONFIG_BLK_DEV_LOOP=y
361CONFIG_BLK_DEV_NBD=y 391CONFIG_BLK_DEV_NBD=y
362# CONFIG_BLK_DEV_RAM is not set 392# CONFIG_BLK_DEV_RAM is not set
363CONFIG_BLK_DEV_RAM_COUNT=16 393CONFIG_BLK_DEV_RAM_COUNT=16
364# CONFIG_LBD is not set
365# CONFIG_CDROM_PKTCDVD is not set 394# CONFIG_CDROM_PKTCDVD is not set
366
367#
368# IO Schedulers
369#
370CONFIG_IOSCHED_NOOP=y
371CONFIG_IOSCHED_AS=y
372CONFIG_IOSCHED_DEADLINE=y
373CONFIG_IOSCHED_CFQ=y
374# CONFIG_ATA_OVER_ETH is not set 395# CONFIG_ATA_OVER_ETH is not set
375 396
376# 397#
@@ -537,6 +558,7 @@ CONFIG_LEGACY_PTY_COUNT=256
537# 558#
538# TPM devices 559# TPM devices
539# 560#
561# CONFIG_TELCLOCK is not set
540 562
541# 563#
542# I2C support 564# I2C support
@@ -589,6 +611,10 @@ CONFIG_LEGACY_PTY_COUNT=256
589# CONFIG_USB_ARCH_HAS_OHCI is not set 611# CONFIG_USB_ARCH_HAS_OHCI is not set
590 612
591# 613#
614# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
615#
616
617#
592# USB Gadget Support 618# USB Gadget Support
593# 619#
594# CONFIG_USB_GADGET is not set 620# CONFIG_USB_GADGET is not set
@@ -721,6 +747,8 @@ CONFIG_LOG_BUF_SHIFT=14
721# CONFIG_DEBUG_SPINLOCK_SLEEP is not set 747# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
722# CONFIG_DEBUG_KOBJECT is not set 748# CONFIG_DEBUG_KOBJECT is not set
723CONFIG_DEBUG_INFO=y 749CONFIG_DEBUG_INFO=y
750# CONFIG_DEBUG_VM is not set
751# CONFIG_RCU_TORTURE_TEST is not set
724CONFIG_CROSSCOMPILE=y 752CONFIG_CROSSCOMPILE=y
725CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp" 753CONFIG_CMDLINE="nfsroot=192.168.192.169:/u1/mipsel,timeo=20 ip=dhcp"
726# CONFIG_DEBUG_STACK_USAGE is not set 754# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index e2c082128532..46814be0ac38 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:28 2005 4# Tue Nov 15 11:12:01 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -182,6 +200,7 @@ CONFIG_FLATMEM_MANUAL=y
182CONFIG_FLATMEM=y 200CONFIG_FLATMEM=y
183CONFIG_FLAT_NODE_MEM_MAP=y 201CONFIG_FLAT_NODE_MEM_MAP=y
184# CONFIG_SPARSEMEM_STATIC is not set 202# CONFIG_SPARSEMEM_STATIC is not set
203CONFIG_SPLIT_PTLOCK_CPUS=4
185CONFIG_PREEMPT_NONE=y 204CONFIG_PREEMPT_NONE=y
186# CONFIG_PREEMPT_VOLUNTARY is not set 205# CONFIG_PREEMPT_VOLUNTARY is not set
187# CONFIG_PREEMPT is not set 206# CONFIG_PREEMPT is not set
@@ -210,7 +229,6 @@ CONFIG_PCMCIA_IOCTL=y
210# CONFIG_YENTA is not set 229# CONFIG_YENTA is not set
211# CONFIG_PD6729 is not set 230# CONFIG_PD6729 is not set
212# CONFIG_I82092 is not set 231# CONFIG_I82092 is not set
213# CONFIG_TCIC is not set
214CONFIG_PCMCIA_VRC4173=y 232CONFIG_PCMCIA_VRC4173=y
215 233
216# 234#
@@ -281,6 +299,10 @@ CONFIG_TCP_CONG_BIC=y
281# CONFIG_NET_DIVERT is not set 299# CONFIG_NET_DIVERT is not set
282# CONFIG_ECONET is not set 300# CONFIG_ECONET is not set
283# CONFIG_WAN_ROUTER is not set 301# CONFIG_WAN_ROUTER is not set
302
303#
304# QoS and/or fair queueing
305#
284# CONFIG_NET_SCHED is not set 306# CONFIG_NET_SCHED is not set
285# CONFIG_NET_CLS_ROUTE is not set 307# CONFIG_NET_CLS_ROUTE is not set
286 308
@@ -341,16 +363,7 @@ CONFIG_CONNECTOR=m
341# CONFIG_BLK_DEV_UB is not set 363# CONFIG_BLK_DEV_UB is not set
342# CONFIG_BLK_DEV_RAM is not set 364# CONFIG_BLK_DEV_RAM is not set
343CONFIG_BLK_DEV_RAM_COUNT=16 365CONFIG_BLK_DEV_RAM_COUNT=16
344# CONFIG_LBD is not set
345# CONFIG_CDROM_PKTCDVD is not set 366# CONFIG_CDROM_PKTCDVD is not set
346
347#
348# IO Schedulers
349#
350CONFIG_IOSCHED_NOOP=y
351CONFIG_IOSCHED_AS=y
352CONFIG_IOSCHED_DEADLINE=y
353CONFIG_IOSCHED_CFQ=y
354CONFIG_ATA_OVER_ETH=m 367CONFIG_ATA_OVER_ETH=m
355 368
356# 369#
@@ -612,6 +625,7 @@ CONFIG_LEGACY_PTY_COUNT=256
612# CONFIG_WATCHDOG is not set 625# CONFIG_WATCHDOG is not set
613# CONFIG_RTC is not set 626# CONFIG_RTC is not set
614# CONFIG_GEN_RTC is not set 627# CONFIG_GEN_RTC is not set
628# CONFIG_RTC_VR41XX is not set
615# CONFIG_DTLK is not set 629# CONFIG_DTLK is not set
616# CONFIG_R3964 is not set 630# CONFIG_R3964 is not set
617# CONFIG_APPLICOM is not set 631# CONFIG_APPLICOM is not set
@@ -625,6 +639,8 @@ CONFIG_LEGACY_PTY_COUNT=256
625# PCMCIA character devices 639# PCMCIA character devices
626# 640#
627# CONFIG_SYNCLINK_CS is not set 641# CONFIG_SYNCLINK_CS is not set
642# CONFIG_CARDMAN_4000 is not set
643# CONFIG_CARDMAN_4040 is not set
628CONFIG_GPIO_VR41XX=y 644CONFIG_GPIO_VR41XX=y
629# CONFIG_RAW_DRIVER is not set 645# CONFIG_RAW_DRIVER is not set
630 646
@@ -632,6 +648,7 @@ CONFIG_GPIO_VR41XX=y
632# TPM devices 648# TPM devices
633# 649#
634# CONFIG_TCG_TPM is not set 650# CONFIG_TCG_TPM is not set
651# CONFIG_TELCLOCK is not set
635 652
636# 653#
637# I2C support 654# I2C support
@@ -713,12 +730,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
713# 730#
714# USB Device Class drivers 731# USB Device Class drivers
715# 732#
716# CONFIG_USB_BLUETOOTH_TTY is not set
717# CONFIG_USB_ACM is not set 733# CONFIG_USB_ACM is not set
718# CONFIG_USB_PRINTER is not set 734# CONFIG_USB_PRINTER is not set
719 735
720# 736#
721# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 737# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
738#
739
740#
741# may also be needed; see USB_STORAGE Help for more information
722# 742#
723# CONFIG_USB_STORAGE is not set 743# CONFIG_USB_STORAGE is not set
724 744
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig
index f18d05c2ca77..e12118c30db4 100644
--- a/arch/mips/configs/ocelot_3_defconfig
+++ b/arch/mips/configs/ocelot_3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:30 2005 4# Thu Nov 10 14:01:36 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODVERSIONS=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -187,6 +205,7 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 205CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 206CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 207# CONFIG_SPARSEMEM_STATIC is not set
208CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_SMP is not set 209# CONFIG_SMP is not set
191CONFIG_PREEMPT_NONE=y 210CONFIG_PREEMPT_NONE=y
192# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
@@ -265,15 +284,19 @@ CONFIG_IPV6=m
265# CONFIG_IPV6_TUNNEL is not set 284# CONFIG_IPV6_TUNNEL is not set
266CONFIG_NETFILTER=y 285CONFIG_NETFILTER=y
267# CONFIG_NETFILTER_DEBUG is not set 286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
268CONFIG_NETFILTER_NETLINK=m 291CONFIG_NETFILTER_NETLINK=m
269CONFIG_NETFILTER_NETLINK_QUEUE=m 292CONFIG_NETFILTER_NETLINK_QUEUE=m
270CONFIG_NETFILTER_NETLINK_LOG=m 293CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set
271 295
272# 296#
273# IP: Netfilter Configuration 297# IP: Netfilter Configuration
274# 298#
275# CONFIG_IP_NF_CONNTRACK is not set 299# CONFIG_IP_NF_CONNTRACK is not set
276CONFIG_IP_NF_PPTP=m
277# CONFIG_IP_NF_QUEUE is not set 300# CONFIG_IP_NF_QUEUE is not set
278# CONFIG_IP_NF_IPTABLES is not set 301# CONFIG_IP_NF_IPTABLES is not set
279# CONFIG_IP_NF_ARPTABLES is not set 302# CONFIG_IP_NF_ARPTABLES is not set
@@ -305,6 +328,10 @@ CONFIG_IP_NF_PPTP=m
305# CONFIG_NET_DIVERT is not set 328# CONFIG_NET_DIVERT is not set
306# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
307# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
331
332#
333# QoS and/or fair queueing
334#
308# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
309# CONFIG_NET_CLS_ROUTE is not set 336# CONFIG_NET_CLS_ROUTE is not set
310 337
@@ -365,16 +392,7 @@ CONFIG_BLK_DEV_LOOP=y
365# CONFIG_BLK_DEV_SX8 is not set 392# CONFIG_BLK_DEV_SX8 is not set
366# CONFIG_BLK_DEV_RAM is not set 393# CONFIG_BLK_DEV_RAM is not set
367CONFIG_BLK_DEV_RAM_COUNT=16 394CONFIG_BLK_DEV_RAM_COUNT=16
368# CONFIG_LBD is not set
369# CONFIG_CDROM_PKTCDVD is not set 395# CONFIG_CDROM_PKTCDVD is not set
370
371#
372# IO Schedulers
373#
374CONFIG_IOSCHED_NOOP=y
375CONFIG_IOSCHED_AS=y
376CONFIG_IOSCHED_DEADLINE=y
377CONFIG_IOSCHED_CFQ=y
378CONFIG_ATA_OVER_ETH=m 396CONFIG_ATA_OVER_ETH=m
379 397
380# 398#
@@ -411,12 +429,13 @@ CONFIG_SCSI_PROC_FS=y
411# 429#
412# CONFIG_SCSI_SPI_ATTRS is not set 430# CONFIG_SCSI_SPI_ATTRS is not set
413# CONFIG_SCSI_FC_ATTRS is not set 431# CONFIG_SCSI_FC_ATTRS is not set
414# CONFIG_SCSI_ISCSI_ATTRS is not set 432CONFIG_SCSI_ISCSI_ATTRS=m
415CONFIG_SCSI_SAS_ATTRS=m 433CONFIG_SCSI_SAS_ATTRS=m
416 434
417# 435#
418# SCSI low-level drivers 436# SCSI low-level drivers
419# 437#
438CONFIG_ISCSI_TCP=m
420# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 439# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
421# CONFIG_SCSI_3W_9XXX is not set 440# CONFIG_SCSI_3W_9XXX is not set
422# CONFIG_SCSI_ACARD is not set 441# CONFIG_SCSI_ACARD is not set
@@ -427,6 +446,7 @@ CONFIG_SCSI_SAS_ATTRS=m
427# CONFIG_SCSI_DPT_I2O is not set 446# CONFIG_SCSI_DPT_I2O is not set
428# CONFIG_MEGARAID_NEWGEN is not set 447# CONFIG_MEGARAID_NEWGEN is not set
429# CONFIG_MEGARAID_LEGACY is not set 448# CONFIG_MEGARAID_LEGACY is not set
449# CONFIG_MEGARAID_SAS is not set
430# CONFIG_SCSI_SATA is not set 450# CONFIG_SCSI_SATA is not set
431# CONFIG_SCSI_DMX3191D is not set 451# CONFIG_SCSI_DMX3191D is not set
432# CONFIG_SCSI_FUTURE_DOMAIN is not set 452# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -461,6 +481,7 @@ CONFIG_SCSI_QLA2XXX=m
461# CONFIG_FUSION is not set 481# CONFIG_FUSION is not set
462# CONFIG_FUSION_SPI is not set 482# CONFIG_FUSION_SPI is not set
463# CONFIG_FUSION_FC is not set 483# CONFIG_FUSION_FC is not set
484# CONFIG_FUSION_SAS is not set
464 485
465# 486#
466# IEEE 1394 (FireWire) support 487# IEEE 1394 (FireWire) support
@@ -490,7 +511,6 @@ CONFIG_TUN=m
490# PHY device support 511# PHY device support
491# 512#
492CONFIG_PHYLIB=m 513CONFIG_PHYLIB=m
493CONFIG_PHYCONTROL=y
494 514
495# 515#
496# MII PHY device drivers 516# MII PHY device drivers
@@ -508,6 +528,7 @@ CONFIG_NET_ETHERNET=y
508CONFIG_MII=y 528CONFIG_MII=y
509# CONFIG_HAPPYMEAL is not set 529# CONFIG_HAPPYMEAL is not set
510# CONFIG_SUNGEM is not set 530# CONFIG_SUNGEM is not set
531# CONFIG_CASSINI is not set
511# CONFIG_NET_VENDOR_3COM is not set 532# CONFIG_NET_VENDOR_3COM is not set
512 533
513# 534#
@@ -589,6 +610,7 @@ CONFIG_PPP_ASYNC=m
589CONFIG_PPP_SYNC_TTY=m 610CONFIG_PPP_SYNC_TTY=m
590CONFIG_PPP_DEFLATE=m 611CONFIG_PPP_DEFLATE=m
591# CONFIG_PPP_BSDCOMP is not set 612# CONFIG_PPP_BSDCOMP is not set
613CONFIG_PPP_MPPE=m
592CONFIG_PPPOE=m 614CONFIG_PPPOE=m
593# CONFIG_SLIP is not set 615# CONFIG_SLIP is not set
594# CONFIG_NET_FC is not set 616# CONFIG_NET_FC is not set
@@ -691,6 +713,7 @@ CONFIG_RTC=y
691# TPM devices 713# TPM devices
692# 714#
693# CONFIG_TCG_TPM is not set 715# CONFIG_TCG_TPM is not set
716# CONFIG_TELCLOCK is not set
694 717
695# 718#
696# I2C support 719# I2C support
@@ -733,7 +756,6 @@ CONFIG_FB=y
733# CONFIG_FB_CFB_FILLRECT is not set 756# CONFIG_FB_CFB_FILLRECT is not set
734# CONFIG_FB_CFB_COPYAREA is not set 757# CONFIG_FB_CFB_COPYAREA is not set
735# CONFIG_FB_CFB_IMAGEBLIT is not set 758# CONFIG_FB_CFB_IMAGEBLIT is not set
736# CONFIG_FB_SOFT_CURSOR is not set
737# CONFIG_FB_MACMODES is not set 759# CONFIG_FB_MACMODES is not set
738CONFIG_FB_MODE_HELPERS=y 760CONFIG_FB_MODE_HELPERS=y
739# CONFIG_FB_TILEBLITTING is not set 761# CONFIG_FB_TILEBLITTING is not set
@@ -742,6 +764,7 @@ CONFIG_FB_MODE_HELPERS=y
742# CONFIG_FB_CYBER2000 is not set 764# CONFIG_FB_CYBER2000 is not set
743# CONFIG_FB_ASILIANT is not set 765# CONFIG_FB_ASILIANT is not set
744# CONFIG_FB_IMSTT is not set 766# CONFIG_FB_IMSTT is not set
767# CONFIG_FB_S1D13XXX is not set
745# CONFIG_FB_NVIDIA is not set 768# CONFIG_FB_NVIDIA is not set
746# CONFIG_FB_RIVA is not set 769# CONFIG_FB_RIVA is not set
747# CONFIG_FB_MATROX is not set 770# CONFIG_FB_MATROX is not set
@@ -758,7 +781,6 @@ CONFIG_FB_MODE_HELPERS=y
758# CONFIG_FB_SMIVGX is not set 781# CONFIG_FB_SMIVGX is not set
759# CONFIG_FB_CYBLA is not set 782# CONFIG_FB_CYBLA is not set
760# CONFIG_FB_TRIDENT is not set 783# CONFIG_FB_TRIDENT is not set
761# CONFIG_FB_S1D13XXX is not set
762# CONFIG_FB_VIRTUAL is not set 784# CONFIG_FB_VIRTUAL is not set
763 785
764# 786#
@@ -767,6 +789,7 @@ CONFIG_FB_MODE_HELPERS=y
767# CONFIG_VGA_CONSOLE is not set 789# CONFIG_VGA_CONSOLE is not set
768CONFIG_DUMMY_CONSOLE=y 790CONFIG_DUMMY_CONSOLE=y
769CONFIG_FRAMEBUFFER_CONSOLE=y 791CONFIG_FRAMEBUFFER_CONSOLE=y
792# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
770# CONFIG_FONTS is not set 793# CONFIG_FONTS is not set
771CONFIG_FONT_8x8=y 794CONFIG_FONT_8x8=y
772CONFIG_FONT_8x16=y 795CONFIG_FONT_8x16=y
@@ -793,6 +816,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
793# CONFIG_USB is not set 816# CONFIG_USB is not set
794 817
795# 818#
819# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
820#
821
822#
796# USB Gadget Support 823# USB Gadget Support
797# 824#
798# CONFIG_USB_GADGET is not set 825# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig
index d3a5fee02b79..99f0c980aee7 100644
--- a/arch/mips/configs/ocelot_c_defconfig
+++ b/arch/mips/configs/ocelot_c_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:33 2005 4# Mon Nov 7 23:06:05 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,23 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56
57#
58# IO Schedulers
59#
60CONFIG_IOSCHED_NOOP=y
61CONFIG_IOSCHED_AS=y
62CONFIG_IOSCHED_DEADLINE=y
63CONFIG_IOSCHED_CFQ=y
64CONFIG_DEFAULT_AS=y
65# CONFIG_DEFAULT_DEADLINE is not set
66# CONFIG_DEFAULT_CFQ is not set
67# CONFIG_DEFAULT_NOOP is not set
68CONFIG_DEFAULT_IOSCHED="anticipatory"
69
70#
54# Machine selection 71# Machine selection
55# 72#
56# CONFIG_MIPS_MTX1 is not set 73# CONFIG_MIPS_MTX1 is not set
@@ -176,6 +193,7 @@ CONFIG_FLATMEM_MANUAL=y
176CONFIG_FLATMEM=y 193CONFIG_FLATMEM=y
177CONFIG_FLAT_NODE_MEM_MAP=y 194CONFIG_FLAT_NODE_MEM_MAP=y
178# CONFIG_SPARSEMEM_STATIC is not set 195# CONFIG_SPARSEMEM_STATIC is not set
196CONFIG_SPLIT_PTLOCK_CPUS=4
179CONFIG_PREEMPT_NONE=y 197CONFIG_PREEMPT_NONE=y
180# CONFIG_PREEMPT_VOLUNTARY is not set 198# CONFIG_PREEMPT_VOLUNTARY is not set
181# CONFIG_PREEMPT is not set 199# CONFIG_PREEMPT is not set
@@ -267,6 +285,10 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_NET_DIVERT is not set 285# CONFIG_NET_DIVERT is not set
268# CONFIG_ECONET is not set 286# CONFIG_ECONET is not set
269# CONFIG_WAN_ROUTER is not set 287# CONFIG_WAN_ROUTER is not set
288
289#
290# QoS and/or fair queueing
291#
270# CONFIG_NET_SCHED is not set 292# CONFIG_NET_SCHED is not set
271# CONFIG_NET_CLS_ROUTE is not set 293# CONFIG_NET_CLS_ROUTE is not set
272 294
@@ -298,6 +320,7 @@ CONFIG_FW_LOADER=y
298# Connector - unified userspace <-> kernelspace linker 320# Connector - unified userspace <-> kernelspace linker
299# 321#
300CONFIG_CONNECTOR=y 322CONFIG_CONNECTOR=y
323CONFIG_PROC_EVENTS=y
301 324
302# 325#
303# Memory Technology Devices (MTD) 326# Memory Technology Devices (MTD)
@@ -329,14 +352,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
329CONFIG_CDROM_PKTCDVD=y 352CONFIG_CDROM_PKTCDVD=y
330CONFIG_CDROM_PKTCDVD_BUFFERS=8 353CONFIG_CDROM_PKTCDVD_BUFFERS=8
331# CONFIG_CDROM_PKTCDVD_WCACHE is not set 354# CONFIG_CDROM_PKTCDVD_WCACHE is not set
332
333#
334# IO Schedulers
335#
336CONFIG_IOSCHED_NOOP=y
337CONFIG_IOSCHED_AS=y
338CONFIG_IOSCHED_DEADLINE=y
339CONFIG_IOSCHED_CFQ=y
340CONFIG_ATA_OVER_ETH=y 355CONFIG_ATA_OVER_ETH=y
341 356
342# 357#
@@ -388,7 +403,6 @@ CONFIG_NETDEVICES=y
388# PHY device support 403# PHY device support
389# 404#
390CONFIG_PHYLIB=y 405CONFIG_PHYLIB=y
391CONFIG_PHYCONTROL=y
392 406
393# 407#
394# MII PHY device drivers 408# MII PHY device drivers
@@ -406,6 +420,7 @@ CONFIG_NET_ETHERNET=y
406# CONFIG_MII is not set 420# CONFIG_MII is not set
407# CONFIG_HAPPYMEAL is not set 421# CONFIG_HAPPYMEAL is not set
408# CONFIG_SUNGEM is not set 422# CONFIG_SUNGEM is not set
423# CONFIG_CASSINI is not set
409# CONFIG_NET_VENDOR_3COM is not set 424# CONFIG_NET_VENDOR_3COM is not set
410 425
411# 426#
@@ -562,6 +577,7 @@ CONFIG_LEGACY_PTY_COUNT=256
562# TPM devices 577# TPM devices
563# 578#
564# CONFIG_TCG_TPM is not set 579# CONFIG_TCG_TPM is not set
580# CONFIG_TELCLOCK is not set
565 581
566# 582#
567# I2C support 583# I2C support
@@ -621,6 +637,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
621# CONFIG_USB is not set 637# CONFIG_USB is not set
622 638
623# 639#
640# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
641#
642
643#
624# USB Gadget Support 644# USB Gadget Support
625# 645#
626# CONFIG_USB_GADGET is not set 646# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig
index 1edde12ebff9..11c7d74ee1e5 100644
--- a/arch/mips/configs/ocelot_defconfig
+++ b/arch/mips/configs/ocelot_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:35 2005 4# Mon Nov 7 23:06:08 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,24 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56# CONFIG_LBD is not set
57
58#
59# IO Schedulers
60#
61CONFIG_IOSCHED_NOOP=y
62CONFIG_IOSCHED_AS=y
63CONFIG_IOSCHED_DEADLINE=y
64CONFIG_IOSCHED_CFQ=y
65CONFIG_DEFAULT_AS=y
66# CONFIG_DEFAULT_DEADLINE is not set
67# CONFIG_DEFAULT_CFQ is not set
68# CONFIG_DEFAULT_NOOP is not set
69CONFIG_DEFAULT_IOSCHED="anticipatory"
70
71#
54# Machine selection 72# Machine selection
55# 73#
56# CONFIG_MIPS_MTX1 is not set 74# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_FLATMEM_MANUAL=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_PREEMPT_NONE=y 203CONFIG_PREEMPT_NONE=y
185# CONFIG_PREEMPT_VOLUNTARY is not set 204# CONFIG_PREEMPT_VOLUNTARY is not set
186# CONFIG_PREEMPT is not set 205# CONFIG_PREEMPT is not set
@@ -265,6 +284,10 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
268# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set 292# CONFIG_NET_CLS_ROUTE is not set
270 293
@@ -296,6 +319,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
296# Connector - unified userspace <-> kernelspace linker 319# Connector - unified userspace <-> kernelspace linker
297# 320#
298CONFIG_CONNECTOR=y 321CONFIG_CONNECTOR=y
322CONFIG_PROC_EVENTS=y
299 323
300# 324#
301# Memory Technology Devices (MTD) 325# Memory Technology Devices (MTD)
@@ -319,18 +343,9 @@ CONFIG_CONNECTOR=y
319# CONFIG_BLK_DEV_NBD is not set 343# CONFIG_BLK_DEV_NBD is not set
320# CONFIG_BLK_DEV_RAM is not set 344# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 345CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=y 346CONFIG_CDROM_PKTCDVD=y
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 347CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 348# CONFIG_CDROM_PKTCDVD_WCACHE is not set
326
327#
328# IO Schedulers
329#
330CONFIG_IOSCHED_NOOP=y
331CONFIG_IOSCHED_AS=y
332CONFIG_IOSCHED_DEADLINE=y
333CONFIG_IOSCHED_CFQ=y
334CONFIG_ATA_OVER_ETH=y 349CONFIG_ATA_OVER_ETH=y
335 350
336# 351#
@@ -375,7 +390,6 @@ CONFIG_NETDEVICES=y
375# PHY device support 390# PHY device support
376# 391#
377CONFIG_PHYLIB=y 392CONFIG_PHYLIB=y
378CONFIG_PHYCONTROL=y
379 393
380# 394#
381# MII PHY device drivers 395# MII PHY device drivers
@@ -513,6 +527,7 @@ CONFIG_LEGACY_PTY_COUNT=256
513# 527#
514# TPM devices 528# TPM devices
515# 529#
530# CONFIG_TELCLOCK is not set
516 531
517# 532#
518# I2C support 533# I2C support
@@ -571,6 +586,10 @@ CONFIG_DUMMY_CONSOLE=y
571# CONFIG_USB_ARCH_HAS_OHCI is not set 586# CONFIG_USB_ARCH_HAS_OHCI is not set
572 587
573# 588#
589# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
590#
591
592#
574# USB Gadget Support 593# USB Gadget Support
575# 594#
576# CONFIG_USB_GADGET is not set 595# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig
index e2d5188cdc15..9ced1a9029d4 100644
--- a/arch/mips/configs/ocelot_g_defconfig
+++ b/arch/mips/configs/ocelot_g_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:38 2005 4# Mon Nov 7 23:06:11 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -51,6 +51,23 @@ CONFIG_BASE_SMALL=0
51# CONFIG_MODULES is not set 51# CONFIG_MODULES is not set
52 52
53# 53#
54# Block layer
55#
56
57#
58# IO Schedulers
59#
60CONFIG_IOSCHED_NOOP=y
61CONFIG_IOSCHED_AS=y
62CONFIG_IOSCHED_DEADLINE=y
63CONFIG_IOSCHED_CFQ=y
64CONFIG_DEFAULT_AS=y
65# CONFIG_DEFAULT_DEADLINE is not set
66# CONFIG_DEFAULT_CFQ is not set
67# CONFIG_DEFAULT_NOOP is not set
68CONFIG_DEFAULT_IOSCHED="anticipatory"
69
70#
54# Machine selection 71# Machine selection
55# 72#
56# CONFIG_MIPS_MTX1 is not set 73# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +196,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 196CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 197CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 198# CONFIG_SPARSEMEM_STATIC is not set
199CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 200CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 201# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 202# CONFIG_PREEMPT is not set
@@ -270,6 +288,10 @@ CONFIG_TCP_CONG_BIC=y
270# CONFIG_NET_DIVERT is not set 288# CONFIG_NET_DIVERT is not set
271# CONFIG_ECONET is not set 289# CONFIG_ECONET is not set
272# CONFIG_WAN_ROUTER is not set 290# CONFIG_WAN_ROUTER is not set
291
292#
293# QoS and/or fair queueing
294#
273# CONFIG_NET_SCHED is not set 295# CONFIG_NET_SCHED is not set
274# CONFIG_NET_CLS_ROUTE is not set 296# CONFIG_NET_CLS_ROUTE is not set
275 297
@@ -301,6 +323,7 @@ CONFIG_FW_LOADER=y
301# Connector - unified userspace <-> kernelspace linker 323# Connector - unified userspace <-> kernelspace linker
302# 324#
303CONFIG_CONNECTOR=y 325CONFIG_CONNECTOR=y
326CONFIG_PROC_EVENTS=y
304 327
305# 328#
306# Memory Technology Devices (MTD) 329# Memory Technology Devices (MTD)
@@ -332,14 +355,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
332CONFIG_CDROM_PKTCDVD=y 355CONFIG_CDROM_PKTCDVD=y
333CONFIG_CDROM_PKTCDVD_BUFFERS=8 356CONFIG_CDROM_PKTCDVD_BUFFERS=8
334# CONFIG_CDROM_PKTCDVD_WCACHE is not set 357# CONFIG_CDROM_PKTCDVD_WCACHE is not set
335
336#
337# IO Schedulers
338#
339CONFIG_IOSCHED_NOOP=y
340CONFIG_IOSCHED_AS=y
341CONFIG_IOSCHED_DEADLINE=y
342CONFIG_IOSCHED_CFQ=y
343CONFIG_ATA_OVER_ETH=y 358CONFIG_ATA_OVER_ETH=y
344 359
345# 360#
@@ -391,7 +406,6 @@ CONFIG_NETDEVICES=y
391# PHY device support 406# PHY device support
392# 407#
393CONFIG_PHYLIB=y 408CONFIG_PHYLIB=y
394CONFIG_PHYCONTROL=y
395 409
396# 410#
397# MII PHY device drivers 411# MII PHY device drivers
@@ -410,6 +424,7 @@ CONFIG_MII=y
410CONFIG_GALILEO_64240_ETH=y 424CONFIG_GALILEO_64240_ETH=y
411# CONFIG_HAPPYMEAL is not set 425# CONFIG_HAPPYMEAL is not set
412# CONFIG_SUNGEM is not set 426# CONFIG_SUNGEM is not set
427# CONFIG_CASSINI is not set
413# CONFIG_NET_VENDOR_3COM is not set 428# CONFIG_NET_VENDOR_3COM is not set
414 429
415# 430#
@@ -565,6 +580,7 @@ CONFIG_LEGACY_PTY_COUNT=256
565# TPM devices 580# TPM devices
566# 581#
567# CONFIG_TCG_TPM is not set 582# CONFIG_TCG_TPM is not set
583# CONFIG_TELCLOCK is not set
568 584
569# 585#
570# I2C support 586# I2C support
@@ -624,6 +640,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
624# CONFIG_USB is not set 640# CONFIG_USB is not set
625 641
626# 642#
643# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
644#
645
646#
627# USB Gadget Support 647# USB Gadget Support
628# 648#
629# CONFIG_USB_GADGET is not set 649# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 47247addee1b..dbcaa77add7c 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:41 2005 4# Tue Nov 15 11:12:31 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -203,7 +222,6 @@ CONFIG_PCMCIA_IOCTL=y
203# 222#
204# PC-card bridges 223# PC-card bridges
205# 224#
206# CONFIG_TCIC is not set
207# CONFIG_PCMCIA_AU1X00 is not set 225# CONFIG_PCMCIA_AU1X00 is not set
208 226
209# 227#
@@ -261,15 +279,19 @@ CONFIG_TCP_CONG_BIC=y
261# CONFIG_IPV6 is not set 279# CONFIG_IPV6 is not set
262CONFIG_NETFILTER=y 280CONFIG_NETFILTER=y
263# CONFIG_NETFILTER_DEBUG is not set 281# CONFIG_NETFILTER_DEBUG is not set
282
283#
284# Core Netfilter Configuration
285#
264CONFIG_NETFILTER_NETLINK=m 286CONFIG_NETFILTER_NETLINK=m
265CONFIG_NETFILTER_NETLINK_QUEUE=m 287CONFIG_NETFILTER_NETLINK_QUEUE=m
266CONFIG_NETFILTER_NETLINK_LOG=m 288CONFIG_NETFILTER_NETLINK_LOG=m
289# CONFIG_NF_CONNTRACK is not set
267 290
268# 291#
269# IP: Netfilter Configuration 292# IP: Netfilter Configuration
270# 293#
271# CONFIG_IP_NF_CONNTRACK is not set 294# CONFIG_IP_NF_CONNTRACK is not set
272CONFIG_IP_NF_PPTP=m
273# CONFIG_IP_NF_QUEUE is not set 295# CONFIG_IP_NF_QUEUE is not set
274# CONFIG_IP_NF_IPTABLES is not set 296# CONFIG_IP_NF_IPTABLES is not set
275# CONFIG_IP_NF_ARPTABLES is not set 297# CONFIG_IP_NF_ARPTABLES is not set
@@ -295,6 +317,10 @@ CONFIG_IP_NF_PPTP=m
295# CONFIG_NET_DIVERT is not set 317# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 318# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 319# CONFIG_WAN_ROUTER is not set
320
321#
322# QoS and/or fair queueing
323#
298# CONFIG_NET_SCHED is not set 324# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set 325# CONFIG_NET_CLS_ROUTE is not set
300 326
@@ -345,6 +371,7 @@ CONFIG_MTD_BLOCK=y
345# CONFIG_FTL is not set 371# CONFIG_FTL is not set
346# CONFIG_NFTL is not set 372# CONFIG_NFTL is not set
347# CONFIG_INFTL is not set 373# CONFIG_INFTL is not set
374# CONFIG_RFD_FTL is not set
348 375
349# 376#
350# RAM/ROM/Flash chip drivers 377# RAM/ROM/Flash chip drivers
@@ -402,6 +429,11 @@ CONFIG_MTD_ALCHEMY=y
402# CONFIG_MTD_NAND is not set 429# CONFIG_MTD_NAND is not set
403 430
404# 431#
432# OneNAND Flash Device Drivers
433#
434# CONFIG_MTD_ONENAND is not set
435
436#
405# Parallel port support 437# Parallel port support
406# 438#
407# CONFIG_PARPORT is not set 439# CONFIG_PARPORT is not set
@@ -419,18 +451,9 @@ CONFIG_BLK_DEV_LOOP=y
419# CONFIG_BLK_DEV_NBD is not set 451# CONFIG_BLK_DEV_NBD is not set
420# CONFIG_BLK_DEV_RAM is not set 452# CONFIG_BLK_DEV_RAM is not set
421CONFIG_BLK_DEV_RAM_COUNT=16 453CONFIG_BLK_DEV_RAM_COUNT=16
422# CONFIG_LBD is not set
423CONFIG_CDROM_PKTCDVD=m 454CONFIG_CDROM_PKTCDVD=m
424CONFIG_CDROM_PKTCDVD_BUFFERS=8 455CONFIG_CDROM_PKTCDVD_BUFFERS=8
425# CONFIG_CDROM_PKTCDVD_WCACHE is not set 456# CONFIG_CDROM_PKTCDVD_WCACHE is not set
426
427#
428# IO Schedulers
429#
430CONFIG_IOSCHED_NOOP=y
431CONFIG_IOSCHED_AS=y
432CONFIG_IOSCHED_DEADLINE=y
433CONFIG_IOSCHED_CFQ=y
434CONFIG_ATA_OVER_ETH=m 457CONFIG_ATA_OVER_ETH=m
435 458
436# 459#
@@ -475,7 +498,6 @@ CONFIG_NETDEVICES=y
475# PHY device support 498# PHY device support
476# 499#
477CONFIG_PHYLIB=m 500CONFIG_PHYLIB=m
478CONFIG_PHYCONTROL=y
479 501
480# 502#
481# MII PHY device drivers 503# MII PHY device drivers
@@ -492,6 +514,7 @@ CONFIG_CICADA_PHY=m
492CONFIG_NET_ETHERNET=y 514CONFIG_NET_ETHERNET=y
493# CONFIG_MII is not set 515# CONFIG_MII is not set
494# CONFIG_MIPS_AU1X00_ENET is not set 516# CONFIG_MIPS_AU1X00_ENET is not set
517# CONFIG_SMC91X is not set
495 518
496# 519#
497# Ethernet (1000 Mbit) 520# Ethernet (1000 Mbit)
@@ -526,6 +549,7 @@ CONFIG_PPP_ASYNC=m
526# CONFIG_PPP_SYNC_TTY is not set 549# CONFIG_PPP_SYNC_TTY is not set
527CONFIG_PPP_DEFLATE=m 550CONFIG_PPP_DEFLATE=m
528# CONFIG_PPP_BSDCOMP is not set 551# CONFIG_PPP_BSDCOMP is not set
552CONFIG_PPP_MPPE=m
529CONFIG_PPPOE=m 553CONFIG_PPPOE=m
530# CONFIG_SLIP is not set 554# CONFIG_SLIP is not set
531# CONFIG_SHAPER is not set 555# CONFIG_SHAPER is not set
@@ -592,12 +616,19 @@ CONFIG_HW_CONSOLE=y
592# 616#
593# Serial drivers 617# Serial drivers
594# 618#
595# CONFIG_SERIAL_8250 is not set 619CONFIG_SERIAL_8250=y
620CONFIG_SERIAL_8250_CONSOLE=y
621# CONFIG_SERIAL_8250_CS is not set
622CONFIG_SERIAL_8250_NR_UARTS=4
623# CONFIG_SERIAL_8250_EXTENDED is not set
624CONFIG_SERIAL_8250_AU1X00=y
596 625
597# 626#
598# Non-8250 serial port support 627# Non-8250 serial port support
599# 628#
600# CONFIG_SERIAL_AU1X00 is not set 629# CONFIG_SERIAL_AU1X00 is not set
630CONFIG_SERIAL_CORE=y
631CONFIG_SERIAL_CORE_CONSOLE=y
601CONFIG_UNIX98_PTYS=y 632CONFIG_UNIX98_PTYS=y
602CONFIG_LEGACY_PTYS=y 633CONFIG_LEGACY_PTYS=y
603CONFIG_LEGACY_PTY_COUNT=256 634CONFIG_LEGACY_PTY_COUNT=256
@@ -624,11 +655,14 @@ CONFIG_LEGACY_PTY_COUNT=256
624# PCMCIA character devices 655# PCMCIA character devices
625# 656#
626CONFIG_SYNCLINK_CS=m 657CONFIG_SYNCLINK_CS=m
658# CONFIG_CARDMAN_4000 is not set
659# CONFIG_CARDMAN_4040 is not set
627# CONFIG_RAW_DRIVER is not set 660# CONFIG_RAW_DRIVER is not set
628 661
629# 662#
630# TPM devices 663# TPM devices
631# 664#
665# CONFIG_TELCLOCK is not set
632 666
633# 667#
634# I2C support 668# I2C support
@@ -688,6 +722,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
688# CONFIG_USB is not set 722# CONFIG_USB is not set
689 723
690# 724#
725# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
726#
727
728#
691# USB Gadget Support 729# USB Gadget Support
692# 730#
693# CONFIG_USB_GADGET is not set 731# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index f91a4eaae51a..5b685ceb6fde 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:44 2005 4# Tue Nov 15 11:14:25 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -207,7 +226,6 @@ CONFIG_CARDBUS=y
207# CONFIG_YENTA is not set 226# CONFIG_YENTA is not set
208CONFIG_PD6729=m 227CONFIG_PD6729=m
209# CONFIG_I82092 is not set 228# CONFIG_I82092 is not set
210# CONFIG_TCIC is not set
211# CONFIG_PCMCIA_AU1X00 is not set 229# CONFIG_PCMCIA_AU1X00 is not set
212CONFIG_PCCARD_NONSTATIC=m 230CONFIG_PCCARD_NONSTATIC=m
213 231
@@ -267,15 +285,19 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
268CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
269# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
288
289#
290# Core Netfilter Configuration
291#
270CONFIG_NETFILTER_NETLINK=m 292CONFIG_NETFILTER_NETLINK=m
271CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
272CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set
273 296
274# 297#
275# IP: Netfilter Configuration 298# IP: Netfilter Configuration
276# 299#
277# CONFIG_IP_NF_CONNTRACK is not set 300# CONFIG_IP_NF_CONNTRACK is not set
278CONFIG_IP_NF_PPTP=m
279# CONFIG_IP_NF_QUEUE is not set 301# CONFIG_IP_NF_QUEUE is not set
280# CONFIG_IP_NF_IPTABLES is not set 302# CONFIG_IP_NF_IPTABLES is not set
281# CONFIG_IP_NF_ARPTABLES is not set 303# CONFIG_IP_NF_ARPTABLES is not set
@@ -301,6 +323,10 @@ CONFIG_IP_NF_PPTP=m
301# CONFIG_NET_DIVERT is not set 323# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 324# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 325# CONFIG_WAN_ROUTER is not set
326
327#
328# QoS and/or fair queueing
329#
304# CONFIG_NET_SCHED is not set 330# CONFIG_NET_SCHED is not set
305# CONFIG_NET_CLS_ROUTE is not set 331# CONFIG_NET_CLS_ROUTE is not set
306 332
@@ -351,6 +377,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 377# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 378# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 379# CONFIG_INFTL is not set
380# CONFIG_RFD_FTL is not set
354 381
355# 382#
356# RAM/ROM/Flash chip drivers 383# RAM/ROM/Flash chip drivers
@@ -409,6 +436,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 436# CONFIG_MTD_NAND is not set
410 437
411# 438#
439# OneNAND Flash Device Drivers
440#
441# CONFIG_MTD_ONENAND is not set
442
443#
412# Parallel port support 444# Parallel port support
413# 445#
414# CONFIG_PARPORT is not set 446# CONFIG_PARPORT is not set
@@ -431,18 +463,9 @@ CONFIG_BLK_DEV_LOOP=y
431# CONFIG_BLK_DEV_SX8 is not set 463# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 464# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 465CONFIG_BLK_DEV_RAM_COUNT=16
434# CONFIG_LBD is not set
435CONFIG_CDROM_PKTCDVD=m 466CONFIG_CDROM_PKTCDVD=m
436CONFIG_CDROM_PKTCDVD_BUFFERS=8 467CONFIG_CDROM_PKTCDVD_BUFFERS=8
437# CONFIG_CDROM_PKTCDVD_WCACHE is not set 468# CONFIG_CDROM_PKTCDVD_WCACHE is not set
438
439#
440# IO Schedulers
441#
442CONFIG_IOSCHED_NOOP=y
443CONFIG_IOSCHED_AS=y
444CONFIG_IOSCHED_DEADLINE=y
445CONFIG_IOSCHED_CFQ=y
446CONFIG_ATA_OVER_ETH=m 469CONFIG_ATA_OVER_ETH=m
447 470
448# 471#
@@ -546,7 +569,6 @@ CONFIG_NETDEVICES=y
546# PHY device support 569# PHY device support
547# 570#
548CONFIG_PHYLIB=m 571CONFIG_PHYLIB=m
549CONFIG_PHYCONTROL=y
550 572
551# 573#
552# MII PHY device drivers 574# MII PHY device drivers
@@ -565,7 +587,9 @@ CONFIG_MII=m
565CONFIG_MIPS_AU1X00_ENET=y 587CONFIG_MIPS_AU1X00_ENET=y
566# CONFIG_HAPPYMEAL is not set 588# CONFIG_HAPPYMEAL is not set
567# CONFIG_SUNGEM is not set 589# CONFIG_SUNGEM is not set
590# CONFIG_CASSINI is not set
568# CONFIG_NET_VENDOR_3COM is not set 591# CONFIG_NET_VENDOR_3COM is not set
592# CONFIG_SMC91X is not set
569 593
570# 594#
571# Tulip family network device support 595# Tulip family network device support
@@ -635,6 +659,7 @@ CONFIG_PPP_ASYNC=m
635# CONFIG_PPP_SYNC_TTY is not set 659# CONFIG_PPP_SYNC_TTY is not set
636CONFIG_PPP_DEFLATE=m 660CONFIG_PPP_DEFLATE=m
637# CONFIG_PPP_BSDCOMP is not set 661# CONFIG_PPP_BSDCOMP is not set
662CONFIG_PPP_MPPE=m
638CONFIG_PPPOE=m 663CONFIG_PPPOE=m
639# CONFIG_SLIP is not set 664# CONFIG_SLIP is not set
640# CONFIG_SHAPER is not set 665# CONFIG_SHAPER is not set
@@ -700,13 +725,17 @@ CONFIG_SERIO_RAW=m
700# 725#
701# Serial drivers 726# Serial drivers
702# 727#
703# CONFIG_SERIAL_8250 is not set 728CONFIG_SERIAL_8250=y
729CONFIG_SERIAL_8250_CONSOLE=y
730# CONFIG_SERIAL_8250_CS is not set
731CONFIG_SERIAL_8250_NR_UARTS=4
732# CONFIG_SERIAL_8250_EXTENDED is not set
733CONFIG_SERIAL_8250_AU1X00=y
704 734
705# 735#
706# Non-8250 serial port support 736# Non-8250 serial port support
707# 737#
708CONFIG_SERIAL_AU1X00=y 738# CONFIG_SERIAL_AU1X00 is not set
709CONFIG_SERIAL_AU1X00_CONSOLE=y
710CONFIG_SERIAL_CORE=y 739CONFIG_SERIAL_CORE=y
711CONFIG_SERIAL_CORE_CONSOLE=y 740CONFIG_SERIAL_CORE_CONSOLE=y
712# CONFIG_SERIAL_JSM is not set 741# CONFIG_SERIAL_JSM is not set
@@ -738,12 +767,15 @@ CONFIG_LEGACY_PTY_COUNT=256
738# PCMCIA character devices 767# PCMCIA character devices
739# 768#
740CONFIG_SYNCLINK_CS=m 769CONFIG_SYNCLINK_CS=m
770# CONFIG_CARDMAN_4000 is not set
771# CONFIG_CARDMAN_4040 is not set
741# CONFIG_RAW_DRIVER is not set 772# CONFIG_RAW_DRIVER is not set
742 773
743# 774#
744# TPM devices 775# TPM devices
745# 776#
746# CONFIG_TCG_TPM is not set 777# CONFIG_TCG_TPM is not set
778# CONFIG_TELCLOCK is not set
747 779
748# 780#
749# I2C support 781# I2C support
@@ -797,6 +829,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
797# CONFIG_USB is not set 829# CONFIG_USB is not set
798 830
799# 831#
832# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
833#
834
835#
800# USB Gadget Support 836# USB Gadget Support
801# 837#
802# CONFIG_USB_GADGET is not set 838# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index bbad27cb40a2..f8f32e99f72d 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:26:47 2005 4# Tue Nov 15 11:15:34 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -207,7 +226,6 @@ CONFIG_CARDBUS=y
207# CONFIG_YENTA is not set 226# CONFIG_YENTA is not set
208CONFIG_PD6729=m 227CONFIG_PD6729=m
209# CONFIG_I82092 is not set 228# CONFIG_I82092 is not set
210# CONFIG_TCIC is not set
211# CONFIG_PCMCIA_AU1X00 is not set 229# CONFIG_PCMCIA_AU1X00 is not set
212CONFIG_PCCARD_NONSTATIC=m 230CONFIG_PCCARD_NONSTATIC=m
213 231
@@ -267,15 +285,19 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 285# CONFIG_IPV6 is not set
268CONFIG_NETFILTER=y 286CONFIG_NETFILTER=y
269# CONFIG_NETFILTER_DEBUG is not set 287# CONFIG_NETFILTER_DEBUG is not set
288
289#
290# Core Netfilter Configuration
291#
270CONFIG_NETFILTER_NETLINK=m 292CONFIG_NETFILTER_NETLINK=m
271CONFIG_NETFILTER_NETLINK_QUEUE=m 293CONFIG_NETFILTER_NETLINK_QUEUE=m
272CONFIG_NETFILTER_NETLINK_LOG=m 294CONFIG_NETFILTER_NETLINK_LOG=m
295# CONFIG_NF_CONNTRACK is not set
273 296
274# 297#
275# IP: Netfilter Configuration 298# IP: Netfilter Configuration
276# 299#
277# CONFIG_IP_NF_CONNTRACK is not set 300# CONFIG_IP_NF_CONNTRACK is not set
278CONFIG_IP_NF_PPTP=m
279# CONFIG_IP_NF_QUEUE is not set 301# CONFIG_IP_NF_QUEUE is not set
280# CONFIG_IP_NF_IPTABLES is not set 302# CONFIG_IP_NF_IPTABLES is not set
281# CONFIG_IP_NF_ARPTABLES is not set 303# CONFIG_IP_NF_ARPTABLES is not set
@@ -301,6 +323,10 @@ CONFIG_IP_NF_PPTP=m
301# CONFIG_NET_DIVERT is not set 323# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 324# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 325# CONFIG_WAN_ROUTER is not set
326
327#
328# QoS and/or fair queueing
329#
304# CONFIG_NET_SCHED is not set 330# CONFIG_NET_SCHED is not set
305# CONFIG_NET_CLS_ROUTE is not set 331# CONFIG_NET_CLS_ROUTE is not set
306 332
@@ -351,6 +377,7 @@ CONFIG_MTD_BLOCK=y
351# CONFIG_FTL is not set 377# CONFIG_FTL is not set
352# CONFIG_NFTL is not set 378# CONFIG_NFTL is not set
353# CONFIG_INFTL is not set 379# CONFIG_INFTL is not set
380# CONFIG_RFD_FTL is not set
354 381
355# 382#
356# RAM/ROM/Flash chip drivers 383# RAM/ROM/Flash chip drivers
@@ -409,6 +436,11 @@ CONFIG_MTD_ALCHEMY=y
409# CONFIG_MTD_NAND is not set 436# CONFIG_MTD_NAND is not set
410 437
411# 438#
439# OneNAND Flash Device Drivers
440#
441# CONFIG_MTD_ONENAND is not set
442
443#
412# Parallel port support 444# Parallel port support
413# 445#
414# CONFIG_PARPORT is not set 446# CONFIG_PARPORT is not set
@@ -431,18 +463,9 @@ CONFIG_BLK_DEV_LOOP=y
431# CONFIG_BLK_DEV_SX8 is not set 463# CONFIG_BLK_DEV_SX8 is not set
432# CONFIG_BLK_DEV_RAM is not set 464# CONFIG_BLK_DEV_RAM is not set
433CONFIG_BLK_DEV_RAM_COUNT=16 465CONFIG_BLK_DEV_RAM_COUNT=16
434# CONFIG_LBD is not set
435CONFIG_CDROM_PKTCDVD=m 466CONFIG_CDROM_PKTCDVD=m
436CONFIG_CDROM_PKTCDVD_BUFFERS=8 467CONFIG_CDROM_PKTCDVD_BUFFERS=8
437# CONFIG_CDROM_PKTCDVD_WCACHE is not set 468# CONFIG_CDROM_PKTCDVD_WCACHE is not set
438
439#
440# IO Schedulers
441#
442CONFIG_IOSCHED_NOOP=y
443CONFIG_IOSCHED_AS=y
444CONFIG_IOSCHED_DEADLINE=y
445CONFIG_IOSCHED_CFQ=y
446CONFIG_ATA_OVER_ETH=m 469CONFIG_ATA_OVER_ETH=m
447 470
448# 471#
@@ -546,7 +569,6 @@ CONFIG_NETDEVICES=y
546# PHY device support 569# PHY device support
547# 570#
548CONFIG_PHYLIB=m 571CONFIG_PHYLIB=m
549CONFIG_PHYCONTROL=y
550 572
551# 573#
552# MII PHY device drivers 574# MII PHY device drivers
@@ -565,7 +587,9 @@ CONFIG_NET_ETHERNET=y
565CONFIG_MIPS_AU1X00_ENET=y 587CONFIG_MIPS_AU1X00_ENET=y
566# CONFIG_HAPPYMEAL is not set 588# CONFIG_HAPPYMEAL is not set
567# CONFIG_SUNGEM is not set 589# CONFIG_SUNGEM is not set
590# CONFIG_CASSINI is not set
568# CONFIG_NET_VENDOR_3COM is not set 591# CONFIG_NET_VENDOR_3COM is not set
592# CONFIG_SMC91X is not set
569 593
570# 594#
571# Tulip family network device support 595# Tulip family network device support
@@ -627,6 +651,7 @@ CONFIG_PPP_ASYNC=m
627# CONFIG_PPP_SYNC_TTY is not set 651# CONFIG_PPP_SYNC_TTY is not set
628CONFIG_PPP_DEFLATE=m 652CONFIG_PPP_DEFLATE=m
629# CONFIG_PPP_BSDCOMP is not set 653# CONFIG_PPP_BSDCOMP is not set
654CONFIG_PPP_MPPE=m
630CONFIG_PPPOE=m 655CONFIG_PPPOE=m
631# CONFIG_SLIP is not set 656# CONFIG_SLIP is not set
632# CONFIG_SHAPER is not set 657# CONFIG_SHAPER is not set
@@ -692,13 +717,17 @@ CONFIG_SERIO_RAW=m
692# 717#
693# Serial drivers 718# Serial drivers
694# 719#
695# CONFIG_SERIAL_8250 is not set 720CONFIG_SERIAL_8250=y
721CONFIG_SERIAL_8250_CONSOLE=y
722# CONFIG_SERIAL_8250_CS is not set
723CONFIG_SERIAL_8250_NR_UARTS=4
724# CONFIG_SERIAL_8250_EXTENDED is not set
725CONFIG_SERIAL_8250_AU1X00=y
696 726
697# 727#
698# Non-8250 serial port support 728# Non-8250 serial port support
699# 729#
700CONFIG_SERIAL_AU1X00=y 730# CONFIG_SERIAL_AU1X00 is not set
701CONFIG_SERIAL_AU1X00_CONSOLE=y
702CONFIG_SERIAL_CORE=y 731CONFIG_SERIAL_CORE=y
703CONFIG_SERIAL_CORE_CONSOLE=y 732CONFIG_SERIAL_CORE_CONSOLE=y
704# CONFIG_SERIAL_JSM is not set 733# CONFIG_SERIAL_JSM is not set
@@ -730,12 +759,15 @@ CONFIG_LEGACY_PTY_COUNT=256
730# PCMCIA character devices 759# PCMCIA character devices
731# 760#
732CONFIG_SYNCLINK_CS=m 761CONFIG_SYNCLINK_CS=m
762# CONFIG_CARDMAN_4000 is not set
763# CONFIG_CARDMAN_4040 is not set
733# CONFIG_RAW_DRIVER is not set 764# CONFIG_RAW_DRIVER is not set
734 765
735# 766#
736# TPM devices 767# TPM devices
737# 768#
738# CONFIG_TCG_TPM is not set 769# CONFIG_TCG_TPM is not set
770# CONFIG_TELCLOCK is not set
739 771
740# 772#
741# I2C support 773# I2C support
@@ -789,6 +821,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
789# CONFIG_USB is not set 821# CONFIG_USB is not set
790 822
791# 823#
824# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
825#
826
827#
792# USB Gadget Support 828# USB Gadget Support
793# 829#
794# CONFIG_USB_GADGET is not set 830# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/pnx8550-jbs_defconfig b/arch/mips/configs/pnx8550-jbs_defconfig
index 555837e4c06f..5820e5f2295e 100644
--- a/arch/mips/configs/pnx8550-jbs_defconfig
+++ b/arch/mips/configs/pnx8550-jbs_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:50 2005 4# Mon Nov 7 23:06:25 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_OBSOLETE_MODPARM=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -179,6 +197,7 @@ CONFIG_FLATMEM_MANUAL=y
179CONFIG_FLATMEM=y 197CONFIG_FLATMEM=y
180CONFIG_FLAT_NODE_MEM_MAP=y 198CONFIG_FLAT_NODE_MEM_MAP=y
181# CONFIG_SPARSEMEM_STATIC is not set 199# CONFIG_SPARSEMEM_STATIC is not set
200CONFIG_SPLIT_PTLOCK_CPUS=4
182CONFIG_PREEMPT_NONE=y 201CONFIG_PREEMPT_NONE=y
183# CONFIG_PREEMPT_VOLUNTARY is not set 202# CONFIG_PREEMPT_VOLUNTARY is not set
184# CONFIG_PREEMPT is not set 203# CONFIG_PREEMPT is not set
@@ -265,6 +284,10 @@ CONFIG_TCP_CONG_BIC=y
265# CONFIG_NET_DIVERT is not set 284# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set 285# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set 286# CONFIG_WAN_ROUTER is not set
287
288#
289# QoS and/or fair queueing
290#
268# CONFIG_NET_SCHED is not set 291# CONFIG_NET_SCHED is not set
269# CONFIG_NET_CLS_ROUTE is not set 292# CONFIG_NET_CLS_ROUTE is not set
270 293
@@ -325,16 +348,7 @@ CONFIG_BLK_DEV_RAM=y
325CONFIG_BLK_DEV_RAM_COUNT=16 348CONFIG_BLK_DEV_RAM_COUNT=16
326CONFIG_BLK_DEV_RAM_SIZE=8192 349CONFIG_BLK_DEV_RAM_SIZE=8192
327CONFIG_BLK_DEV_INITRD=y 350CONFIG_BLK_DEV_INITRD=y
328# CONFIG_LBD is not set
329# CONFIG_CDROM_PKTCDVD is not set 351# CONFIG_CDROM_PKTCDVD is not set
330
331#
332# IO Schedulers
333#
334CONFIG_IOSCHED_NOOP=y
335CONFIG_IOSCHED_AS=y
336CONFIG_IOSCHED_DEADLINE=y
337CONFIG_IOSCHED_CFQ=y
338# CONFIG_ATA_OVER_ETH is not set 352# CONFIG_ATA_OVER_ETH is not set
339 353
340# 354#
@@ -423,12 +437,13 @@ CONFIG_SCSI_CONSTANTS=y
423# 437#
424# CONFIG_SCSI_SPI_ATTRS is not set 438# CONFIG_SCSI_SPI_ATTRS is not set
425# CONFIG_SCSI_FC_ATTRS is not set 439# CONFIG_SCSI_FC_ATTRS is not set
426# CONFIG_SCSI_ISCSI_ATTRS is not set 440CONFIG_SCSI_ISCSI_ATTRS=m
427# CONFIG_SCSI_SAS_ATTRS is not set 441# CONFIG_SCSI_SAS_ATTRS is not set
428 442
429# 443#
430# SCSI low-level drivers 444# SCSI low-level drivers
431# 445#
446CONFIG_ISCSI_TCP=m
432# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 447# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
433# CONFIG_SCSI_3W_9XXX is not set 448# CONFIG_SCSI_3W_9XXX is not set
434# CONFIG_SCSI_ACARD is not set 449# CONFIG_SCSI_ACARD is not set
@@ -439,6 +454,7 @@ CONFIG_SCSI_CONSTANTS=y
439# CONFIG_SCSI_DPT_I2O is not set 454# CONFIG_SCSI_DPT_I2O is not set
440# CONFIG_MEGARAID_NEWGEN is not set 455# CONFIG_MEGARAID_NEWGEN is not set
441# CONFIG_MEGARAID_LEGACY is not set 456# CONFIG_MEGARAID_LEGACY is not set
457# CONFIG_MEGARAID_SAS is not set
442# CONFIG_SCSI_SATA is not set 458# CONFIG_SCSI_SATA is not set
443# CONFIG_SCSI_DMX3191D is not set 459# CONFIG_SCSI_DMX3191D is not set
444# CONFIG_SCSI_FUTURE_DOMAIN is not set 460# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -473,6 +489,7 @@ CONFIG_SCSI_QLA2XXX=y
473# CONFIG_FUSION is not set 489# CONFIG_FUSION is not set
474# CONFIG_FUSION_SPI is not set 490# CONFIG_FUSION_SPI is not set
475# CONFIG_FUSION_FC is not set 491# CONFIG_FUSION_FC is not set
492# CONFIG_FUSION_SAS is not set
476 493
477# 494#
478# IEEE 1394 (FireWire) support 495# IEEE 1394 (FireWire) support
@@ -510,6 +527,7 @@ CONFIG_NET_ETHERNET=y
510CONFIG_MII=y 527CONFIG_MII=y
511# CONFIG_HAPPYMEAL is not set 528# CONFIG_HAPPYMEAL is not set
512# CONFIG_SUNGEM is not set 529# CONFIG_SUNGEM is not set
530# CONFIG_CASSINI is not set
513# CONFIG_NET_VENDOR_3COM is not set 531# CONFIG_NET_VENDOR_3COM is not set
514 532
515# 533#
@@ -681,6 +699,7 @@ CONFIG_LEGACY_PTY_COUNT=256
681# TPM devices 699# TPM devices
682# 700#
683# CONFIG_TCG_TPM is not set 701# CONFIG_TCG_TPM is not set
702# CONFIG_TELCLOCK is not set
684 703
685# 704#
686# I2C support 705# I2C support
@@ -763,12 +782,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
763# 782#
764# USB Device Class drivers 783# USB Device Class drivers
765# 784#
766# CONFIG_USB_BLUETOOTH_TTY is not set
767# CONFIG_USB_ACM is not set 785# CONFIG_USB_ACM is not set
768# CONFIG_USB_PRINTER is not set 786# CONFIG_USB_PRINTER is not set
769 787
770# 788#
771# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 789# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
790#
791
792#
793# may also be needed; see USB_STORAGE Help for more information
772# 794#
773CONFIG_USB_STORAGE=y 795CONFIG_USB_STORAGE=y
774# CONFIG_USB_STORAGE_DEBUG is not set 796# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1039,6 +1061,8 @@ CONFIG_DEBUG_SLAB=y
1039# CONFIG_DEBUG_KOBJECT is not set 1061# CONFIG_DEBUG_KOBJECT is not set
1040# CONFIG_DEBUG_INFO is not set 1062# CONFIG_DEBUG_INFO is not set
1041# CONFIG_DEBUG_FS is not set 1063# CONFIG_DEBUG_FS is not set
1064# CONFIG_DEBUG_VM is not set
1065# CONFIG_RCU_TORTURE_TEST is not set
1042CONFIG_CROSSCOMPILE=y 1066CONFIG_CROSSCOMPILE=y
1043CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp" 1067CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1044# CONFIG_DEBUG_STACK_USAGE is not set 1068# CONFIG_DEBUG_STACK_USAGE is not set
@@ -1055,7 +1079,31 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1055# 1079#
1056# Cryptographic options 1080# Cryptographic options
1057# 1081#
1058# CONFIG_CRYPTO is not set 1082CONFIG_CRYPTO=y
1083# CONFIG_CRYPTO_HMAC is not set
1084# CONFIG_CRYPTO_NULL is not set
1085# CONFIG_CRYPTO_MD4 is not set
1086CONFIG_CRYPTO_MD5=m
1087# CONFIG_CRYPTO_SHA1 is not set
1088# CONFIG_CRYPTO_SHA256 is not set
1089# CONFIG_CRYPTO_SHA512 is not set
1090# CONFIG_CRYPTO_WP512 is not set
1091# CONFIG_CRYPTO_TGR192 is not set
1092# CONFIG_CRYPTO_DES is not set
1093# CONFIG_CRYPTO_BLOWFISH is not set
1094# CONFIG_CRYPTO_TWOFISH is not set
1095# CONFIG_CRYPTO_SERPENT is not set
1096# CONFIG_CRYPTO_AES is not set
1097# CONFIG_CRYPTO_CAST5 is not set
1098# CONFIG_CRYPTO_CAST6 is not set
1099# CONFIG_CRYPTO_TEA is not set
1100# CONFIG_CRYPTO_ARC4 is not set
1101# CONFIG_CRYPTO_KHAZAD is not set
1102# CONFIG_CRYPTO_ANUBIS is not set
1103# CONFIG_CRYPTO_DEFLATE is not set
1104# CONFIG_CRYPTO_MICHAEL_MIC is not set
1105CONFIG_CRYPTO_CRC32C=m
1106# CONFIG_CRYPTO_TEST is not set
1059 1107
1060# 1108#
1061# Hardware crypto devices 1109# Hardware crypto devices
@@ -1067,4 +1115,4 @@ CONFIG_CMDLINE="console=ttyS1,38400n8 kgdb=ttyS0 root=/dev/nfs ip=bootp"
1067CONFIG_CRC_CCITT=m 1115CONFIG_CRC_CCITT=m
1068# CONFIG_CRC16 is not set 1116# CONFIG_CRC16 is not set
1069CONFIG_CRC32=y 1117CONFIG_CRC32=y
1070# CONFIG_LIBCRC32C is not set 1118CONFIG_LIBCRC32C=m
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig
index 37bd8d5c865d..a4ebb538e15c 100644
--- a/arch/mips/configs/pnx8550-v2pci_defconfig
+++ b/arch/mips/configs/pnx8550-v2pci_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:53 2005 4# Thu Nov 10 14:02:38 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_OBSOLETE_MODPARM=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -255,13 +274,17 @@ CONFIG_IPV6=m
255# CONFIG_IPV6_TUNNEL is not set 274# CONFIG_IPV6_TUNNEL is not set
256CONFIG_NETFILTER=y 275CONFIG_NETFILTER=y
257# CONFIG_NETFILTER_DEBUG is not set 276# CONFIG_NETFILTER_DEBUG is not set
277
278#
279# Core Netfilter Configuration
280#
258# CONFIG_NETFILTER_NETLINK is not set 281# CONFIG_NETFILTER_NETLINK is not set
282# CONFIG_NF_CONNTRACK is not set
259 283
260# 284#
261# IP: Netfilter Configuration 285# IP: Netfilter Configuration
262# 286#
263# CONFIG_IP_NF_CONNTRACK is not set 287# CONFIG_IP_NF_CONNTRACK is not set
264CONFIG_IP_NF_PPTP=m
265# CONFIG_IP_NF_QUEUE is not set 288# CONFIG_IP_NF_QUEUE is not set
266# CONFIG_IP_NF_IPTABLES is not set 289# CONFIG_IP_NF_IPTABLES is not set
267# CONFIG_IP_NF_ARPTABLES is not set 290# CONFIG_IP_NF_ARPTABLES is not set
@@ -293,6 +316,10 @@ CONFIG_IP_NF_PPTP=m
293# CONFIG_NET_DIVERT is not set 316# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set 317# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set 318# CONFIG_WAN_ROUTER is not set
319
320#
321# QoS and/or fair queueing
322#
296# CONFIG_NET_SCHED is not set 323# CONFIG_NET_SCHED is not set
297# CONFIG_NET_CLS_ROUTE is not set 324# CONFIG_NET_CLS_ROUTE is not set
298 325
@@ -352,16 +379,7 @@ CONFIG_BLK_DEV_RAM=y
352CONFIG_BLK_DEV_RAM_COUNT=16 379CONFIG_BLK_DEV_RAM_COUNT=16
353CONFIG_BLK_DEV_RAM_SIZE=8192 380CONFIG_BLK_DEV_RAM_SIZE=8192
354CONFIG_BLK_DEV_INITRD=y 381CONFIG_BLK_DEV_INITRD=y
355# CONFIG_LBD is not set
356# CONFIG_CDROM_PKTCDVD is not set 382# CONFIG_CDROM_PKTCDVD is not set
357
358#
359# IO Schedulers
360#
361CONFIG_IOSCHED_NOOP=y
362CONFIG_IOSCHED_AS=y
363CONFIG_IOSCHED_DEADLINE=y
364CONFIG_IOSCHED_CFQ=y
365# CONFIG_ATA_OVER_ETH is not set 383# CONFIG_ATA_OVER_ETH is not set
366 384
367# 385#
@@ -451,12 +469,13 @@ CONFIG_BLK_DEV_SD=y
451# 469#
452CONFIG_SCSI_SPI_ATTRS=m 470CONFIG_SCSI_SPI_ATTRS=m
453# CONFIG_SCSI_FC_ATTRS is not set 471# CONFIG_SCSI_FC_ATTRS is not set
454# CONFIG_SCSI_ISCSI_ATTRS is not set 472CONFIG_SCSI_ISCSI_ATTRS=m
455# CONFIG_SCSI_SAS_ATTRS is not set 473# CONFIG_SCSI_SAS_ATTRS is not set
456 474
457# 475#
458# SCSI low-level drivers 476# SCSI low-level drivers
459# 477#
478CONFIG_ISCSI_TCP=m
460# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 479# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
461# CONFIG_SCSI_3W_9XXX is not set 480# CONFIG_SCSI_3W_9XXX is not set
462# CONFIG_SCSI_ACARD is not set 481# CONFIG_SCSI_ACARD is not set
@@ -472,6 +491,7 @@ CONFIG_AIC7XXX_DEBUG_MASK=0
472# CONFIG_SCSI_DPT_I2O is not set 491# CONFIG_SCSI_DPT_I2O is not set
473# CONFIG_MEGARAID_NEWGEN is not set 492# CONFIG_MEGARAID_NEWGEN is not set
474# CONFIG_MEGARAID_LEGACY is not set 493# CONFIG_MEGARAID_LEGACY is not set
494# CONFIG_MEGARAID_SAS is not set
475# CONFIG_SCSI_SATA is not set 495# CONFIG_SCSI_SATA is not set
476# CONFIG_SCSI_DMX3191D is not set 496# CONFIG_SCSI_DMX3191D is not set
477# CONFIG_SCSI_FUTURE_DOMAIN is not set 497# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -506,6 +526,7 @@ CONFIG_SCSI_QLA2XXX=y
506# CONFIG_FUSION is not set 526# CONFIG_FUSION is not set
507# CONFIG_FUSION_SPI is not set 527# CONFIG_FUSION_SPI is not set
508# CONFIG_FUSION_FC is not set 528# CONFIG_FUSION_FC is not set
529# CONFIG_FUSION_SAS is not set
509 530
510# 531#
511# IEEE 1394 (FireWire) support 532# IEEE 1394 (FireWire) support
@@ -543,6 +564,7 @@ CONFIG_NET_ETHERNET=y
543CONFIG_MII=y 564CONFIG_MII=y
544# CONFIG_HAPPYMEAL is not set 565# CONFIG_HAPPYMEAL is not set
545# CONFIG_SUNGEM is not set 566# CONFIG_SUNGEM is not set
567# CONFIG_CASSINI is not set
546# CONFIG_NET_VENDOR_3COM is not set 568# CONFIG_NET_VENDOR_3COM is not set
547 569
548# 570#
@@ -622,6 +644,7 @@ CONFIG_PPP_ASYNC=m
622CONFIG_PPP_SYNC_TTY=m 644CONFIG_PPP_SYNC_TTY=m
623CONFIG_PPP_DEFLATE=m 645CONFIG_PPP_DEFLATE=m
624# CONFIG_PPP_BSDCOMP is not set 646# CONFIG_PPP_BSDCOMP is not set
647CONFIG_PPP_MPPE=m
625# CONFIG_PPPOE is not set 648# CONFIG_PPPOE is not set
626# CONFIG_SLIP is not set 649# CONFIG_SLIP is not set
627# CONFIG_NET_FC is not set 650# CONFIG_NET_FC is not set
@@ -746,6 +769,7 @@ CONFIG_LEGACY_PTY_COUNT=256
746# TPM devices 769# TPM devices
747# 770#
748# CONFIG_TCG_TPM is not set 771# CONFIG_TCG_TPM is not set
772# CONFIG_TELCLOCK is not set
749 773
750# 774#
751# I2C support 775# I2C support
@@ -796,6 +820,7 @@ CONFIG_I2C_ALGOBIT=m
796# CONFIG_SENSORS_PCF8591 is not set 820# CONFIG_SENSORS_PCF8591 is not set
797# CONFIG_SENSORS_RTC8564 is not set 821# CONFIG_SENSORS_RTC8564 is not set
798# CONFIG_SENSORS_MAX6875 is not set 822# CONFIG_SENSORS_MAX6875 is not set
823# CONFIG_RTC_X1205_I2C is not set
799# CONFIG_I2C_DEBUG_CORE is not set 824# CONFIG_I2C_DEBUG_CORE is not set
800# CONFIG_I2C_DEBUG_ALGO is not set 825# CONFIG_I2C_DEBUG_ALGO is not set
801# CONFIG_I2C_DEBUG_BUS is not set 826# CONFIG_I2C_DEBUG_BUS is not set
@@ -872,7 +897,6 @@ CONFIG_FB=y
872# CONFIG_FB_CFB_FILLRECT is not set 897# CONFIG_FB_CFB_FILLRECT is not set
873# CONFIG_FB_CFB_COPYAREA is not set 898# CONFIG_FB_CFB_COPYAREA is not set
874# CONFIG_FB_CFB_IMAGEBLIT is not set 899# CONFIG_FB_CFB_IMAGEBLIT is not set
875# CONFIG_FB_SOFT_CURSOR is not set
876# CONFIG_FB_MACMODES is not set 900# CONFIG_FB_MACMODES is not set
877# CONFIG_FB_MODE_HELPERS is not set 901# CONFIG_FB_MODE_HELPERS is not set
878# CONFIG_FB_TILEBLITTING is not set 902# CONFIG_FB_TILEBLITTING is not set
@@ -881,6 +905,7 @@ CONFIG_FB=y
881# CONFIG_FB_CYBER2000 is not set 905# CONFIG_FB_CYBER2000 is not set
882# CONFIG_FB_ASILIANT is not set 906# CONFIG_FB_ASILIANT is not set
883# CONFIG_FB_IMSTT is not set 907# CONFIG_FB_IMSTT is not set
908# CONFIG_FB_S1D13XXX is not set
884# CONFIG_FB_NVIDIA is not set 909# CONFIG_FB_NVIDIA is not set
885# CONFIG_FB_RIVA is not set 910# CONFIG_FB_RIVA is not set
886# CONFIG_FB_MATROX is not set 911# CONFIG_FB_MATROX is not set
@@ -897,7 +922,6 @@ CONFIG_FB=y
897# CONFIG_FB_SMIVGX is not set 922# CONFIG_FB_SMIVGX is not set
898# CONFIG_FB_CYBLA is not set 923# CONFIG_FB_CYBLA is not set
899# CONFIG_FB_TRIDENT is not set 924# CONFIG_FB_TRIDENT is not set
900# CONFIG_FB_S1D13XXX is not set
901# CONFIG_FB_VIRTUAL is not set 925# CONFIG_FB_VIRTUAL is not set
902 926
903# 927#
@@ -946,12 +970,15 @@ CONFIG_USB_DEVICEFS=y
946# 970#
947# USB Device Class drivers 971# USB Device Class drivers
948# 972#
949# CONFIG_USB_BLUETOOTH_TTY is not set
950# CONFIG_USB_ACM is not set 973# CONFIG_USB_ACM is not set
951# CONFIG_USB_PRINTER is not set 974# CONFIG_USB_PRINTER is not set
952 975
953# 976#
954# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 977# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
978#
979
980#
981# may also be needed; see USB_STORAGE Help for more information
955# 982#
956CONFIG_USB_STORAGE=y 983CONFIG_USB_STORAGE=y
957# CONFIG_USB_STORAGE_DEBUG is not set 984# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1235,7 +1262,31 @@ CONFIG_CMDLINE=""
1235# 1262#
1236# Cryptographic options 1263# Cryptographic options
1237# 1264#
1238# CONFIG_CRYPTO is not set 1265CONFIG_CRYPTO=y
1266# CONFIG_CRYPTO_HMAC is not set
1267# CONFIG_CRYPTO_NULL is not set
1268# CONFIG_CRYPTO_MD4 is not set
1269CONFIG_CRYPTO_MD5=m
1270CONFIG_CRYPTO_SHA1=m
1271# CONFIG_CRYPTO_SHA256 is not set
1272# CONFIG_CRYPTO_SHA512 is not set
1273# CONFIG_CRYPTO_WP512 is not set
1274# CONFIG_CRYPTO_TGR192 is not set
1275# CONFIG_CRYPTO_DES is not set
1276# CONFIG_CRYPTO_BLOWFISH is not set
1277# CONFIG_CRYPTO_TWOFISH is not set
1278# CONFIG_CRYPTO_SERPENT is not set
1279# CONFIG_CRYPTO_AES is not set
1280# CONFIG_CRYPTO_CAST5 is not set
1281# CONFIG_CRYPTO_CAST6 is not set
1282# CONFIG_CRYPTO_TEA is not set
1283CONFIG_CRYPTO_ARC4=m
1284# CONFIG_CRYPTO_KHAZAD is not set
1285# CONFIG_CRYPTO_ANUBIS is not set
1286# CONFIG_CRYPTO_DEFLATE is not set
1287# CONFIG_CRYPTO_MICHAEL_MIC is not set
1288CONFIG_CRYPTO_CRC32C=m
1289# CONFIG_CRYPTO_TEST is not set
1239 1290
1240# 1291#
1241# Hardware crypto devices 1292# Hardware crypto devices
@@ -1247,6 +1298,6 @@ CONFIG_CMDLINE=""
1247CONFIG_CRC_CCITT=m 1298CONFIG_CRC_CCITT=m
1248# CONFIG_CRC16 is not set 1299# CONFIG_CRC16 is not set
1249CONFIG_CRC32=y 1300CONFIG_CRC32=y
1250# CONFIG_LIBCRC32C is not set 1301CONFIG_LIBCRC32C=m
1251CONFIG_ZLIB_INFLATE=y 1302CONFIG_ZLIB_INFLATE=y
1252CONFIG_ZLIB_DEFLATE=m 1303CONFIG_ZLIB_DEFLATE=m
diff --git a/arch/mips/configs/qemu_defconfig b/arch/mips/configs/qemu_defconfig
index 741a9a971367..5d39162077f4 100644
--- a/arch/mips/configs/qemu_defconfig
+++ b/arch/mips/configs/qemu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:56 2005 4# Mon Nov 7 23:06:31 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -50,6 +50,24 @@ CONFIG_BASE_SMALL=1
50# CONFIG_MODULES is not set 50# CONFIG_MODULES is not set
51 51
52# 52#
53# Block layer
54#
55# CONFIG_LBD is not set
56
57#
58# IO Schedulers
59#
60CONFIG_IOSCHED_NOOP=y
61# CONFIG_IOSCHED_AS is not set
62# CONFIG_IOSCHED_DEADLINE is not set
63# CONFIG_IOSCHED_CFQ is not set
64# CONFIG_DEFAULT_AS is not set
65# CONFIG_DEFAULT_DEADLINE is not set
66# CONFIG_DEFAULT_CFQ is not set
67CONFIG_DEFAULT_NOOP=y
68CONFIG_DEFAULT_IOSCHED="noop"
69
70#
53# Machine selection 71# Machine selection
54# 72#
55# CONFIG_MIPS_MTX1 is not set 73# CONFIG_MIPS_MTX1 is not set
@@ -168,6 +186,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
168CONFIG_FLATMEM=y 186CONFIG_FLATMEM=y
169CONFIG_FLAT_NODE_MEM_MAP=y 187CONFIG_FLAT_NODE_MEM_MAP=y
170# CONFIG_SPARSEMEM_STATIC is not set 188# CONFIG_SPARSEMEM_STATIC is not set
189CONFIG_SPLIT_PTLOCK_CPUS=4
171CONFIG_PREEMPT_NONE=y 190CONFIG_PREEMPT_NONE=y
172# CONFIG_PREEMPT_VOLUNTARY is not set 191# CONFIG_PREEMPT_VOLUNTARY is not set
173# CONFIG_PREEMPT is not set 192# CONFIG_PREEMPT is not set
@@ -234,6 +253,10 @@ CONFIG_TCP_CONG_BIC=y
234# CONFIG_LLC2 is not set 253# CONFIG_LLC2 is not set
235# CONFIG_IPX is not set 254# CONFIG_IPX is not set
236# CONFIG_ATALK is not set 255# CONFIG_ATALK is not set
256
257#
258# QoS and/or fair queueing
259#
237# CONFIG_NET_SCHED is not set 260# CONFIG_NET_SCHED is not set
238# CONFIG_NET_CLS_ROUTE is not set 261# CONFIG_NET_CLS_ROUTE is not set
239 262
@@ -265,6 +288,7 @@ CONFIG_STANDALONE=y
265# Connector - unified userspace <-> kernelspace linker 288# Connector - unified userspace <-> kernelspace linker
266# 289#
267CONFIG_CONNECTOR=y 290CONFIG_CONNECTOR=y
291CONFIG_PROC_EVENTS=y
268 292
269# 293#
270# Memory Technology Devices (MTD) 294# Memory Technology Devices (MTD)
@@ -289,16 +313,7 @@ CONFIG_CONNECTOR=y
289# CONFIG_BLK_DEV_NBD is not set 313# CONFIG_BLK_DEV_NBD is not set
290# CONFIG_BLK_DEV_RAM is not set 314# CONFIG_BLK_DEV_RAM is not set
291CONFIG_BLK_DEV_RAM_COUNT=16 315CONFIG_BLK_DEV_RAM_COUNT=16
292# CONFIG_LBD is not set
293# CONFIG_CDROM_PKTCDVD is not set 316# CONFIG_CDROM_PKTCDVD is not set
294
295#
296# IO Schedulers
297#
298CONFIG_IOSCHED_NOOP=y
299# CONFIG_IOSCHED_AS is not set
300# CONFIG_IOSCHED_DEADLINE is not set
301# CONFIG_IOSCHED_CFQ is not set
302# CONFIG_ATA_OVER_ETH is not set 317# CONFIG_ATA_OVER_ETH is not set
303 318
304# 319#
@@ -353,7 +368,6 @@ CONFIG_NETDEVICES=y
353# PHY device support 368# PHY device support
354# 369#
355CONFIG_PHYLIB=y 370CONFIG_PHYLIB=y
356CONFIG_PHYCONTROL=y
357 371
358# 372#
359# MII PHY device drivers 373# MII PHY device drivers
@@ -385,7 +399,6 @@ CONFIG_NET_ISA=y
385# CONFIG_ETH16I is not set 399# CONFIG_ETH16I is not set
386CONFIG_NE2000=y 400CONFIG_NE2000=y
387# CONFIG_NET_PCI is not set 401# CONFIG_NET_PCI is not set
388# CONFIG_NET_POCKET is not set
389 402
390# 403#
391# Ethernet (1000 Mbit) 404# Ethernet (1000 Mbit)
@@ -558,6 +571,10 @@ CONFIG_DUMMY_CONSOLE=y
558# CONFIG_USB_ARCH_HAS_OHCI is not set 571# CONFIG_USB_ARCH_HAS_OHCI is not set
559 572
560# 573#
574# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
575#
576
577#
561# USB Gadget Support 578# USB Gadget Support
562# 579#
563# CONFIG_USB_GADGET is not set 580# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 897420d39053..047e0b4236f8 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:26:59 2005 4# Thu Nov 10 14:02:45 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_OBSOLETE_MODPARM=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -188,6 +206,7 @@ CONFIG_FLATMEM_MANUAL=y
188CONFIG_FLATMEM=y 206CONFIG_FLATMEM=y
189CONFIG_FLAT_NODE_MEM_MAP=y 207CONFIG_FLAT_NODE_MEM_MAP=y
190# CONFIG_SPARSEMEM_STATIC is not set 208# CONFIG_SPARSEMEM_STATIC is not set
209CONFIG_SPLIT_PTLOCK_CPUS=4
191CONFIG_PREEMPT_NONE=y 210CONFIG_PREEMPT_NONE=y
192# CONFIG_PREEMPT_VOLUNTARY is not set 211# CONFIG_PREEMPT_VOLUNTARY is not set
193# CONFIG_PREEMPT is not set 212# CONFIG_PREEMPT is not set
@@ -265,15 +284,19 @@ CONFIG_IPV6=m
265# CONFIG_IPV6_TUNNEL is not set 284# CONFIG_IPV6_TUNNEL is not set
266CONFIG_NETFILTER=y 285CONFIG_NETFILTER=y
267# CONFIG_NETFILTER_DEBUG is not set 286# CONFIG_NETFILTER_DEBUG is not set
287
288#
289# Core Netfilter Configuration
290#
268CONFIG_NETFILTER_NETLINK=m 291CONFIG_NETFILTER_NETLINK=m
269CONFIG_NETFILTER_NETLINK_QUEUE=m 292CONFIG_NETFILTER_NETLINK_QUEUE=m
270CONFIG_NETFILTER_NETLINK_LOG=m 293CONFIG_NETFILTER_NETLINK_LOG=m
294# CONFIG_NF_CONNTRACK is not set
271 295
272# 296#
273# IP: Netfilter Configuration 297# IP: Netfilter Configuration
274# 298#
275# CONFIG_IP_NF_CONNTRACK is not set 299# CONFIG_IP_NF_CONNTRACK is not set
276CONFIG_IP_NF_PPTP=m
277# CONFIG_IP_NF_QUEUE is not set 300# CONFIG_IP_NF_QUEUE is not set
278# CONFIG_IP_NF_IPTABLES is not set 301# CONFIG_IP_NF_IPTABLES is not set
279# CONFIG_IP_NF_ARPTABLES is not set 302# CONFIG_IP_NF_ARPTABLES is not set
@@ -305,6 +328,10 @@ CONFIG_IP_NF_PPTP=m
305# CONFIG_NET_DIVERT is not set 328# CONFIG_NET_DIVERT is not set
306# CONFIG_ECONET is not set 329# CONFIG_ECONET is not set
307# CONFIG_WAN_ROUTER is not set 330# CONFIG_WAN_ROUTER is not set
331
332#
333# QoS and/or fair queueing
334#
308# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
309# CONFIG_NET_CLS_ROUTE is not set 336# CONFIG_NET_CLS_ROUTE is not set
310 337
@@ -355,6 +382,7 @@ CONFIG_MTD_BLOCK=y
355# CONFIG_FTL is not set 382# CONFIG_FTL is not set
356# CONFIG_NFTL is not set 383# CONFIG_NFTL is not set
357# CONFIG_INFTL is not set 384# CONFIG_INFTL is not set
385# CONFIG_RFD_FTL is not set
358 386
359# 387#
360# RAM/ROM/Flash chip drivers 388# RAM/ROM/Flash chip drivers
@@ -412,6 +440,11 @@ CONFIG_MTD_CFI_UTIL=y
412# CONFIG_MTD_NAND is not set 440# CONFIG_MTD_NAND is not set
413 441
414# 442#
443# OneNAND Flash Device Drivers
444#
445# CONFIG_MTD_ONENAND is not set
446
447#
415# Parallel port support 448# Parallel port support
416# 449#
417# CONFIG_PARPORT is not set 450# CONFIG_PARPORT is not set
@@ -438,16 +471,7 @@ CONFIG_BLK_DEV_RAM=y
438CONFIG_BLK_DEV_RAM_COUNT=16 471CONFIG_BLK_DEV_RAM_COUNT=16
439CONFIG_BLK_DEV_RAM_SIZE=8192 472CONFIG_BLK_DEV_RAM_SIZE=8192
440CONFIG_BLK_DEV_INITRD=y 473CONFIG_BLK_DEV_INITRD=y
441# CONFIG_LBD is not set
442# CONFIG_CDROM_PKTCDVD is not set 474# CONFIG_CDROM_PKTCDVD is not set
443
444#
445# IO Schedulers
446#
447CONFIG_IOSCHED_NOOP=y
448CONFIG_IOSCHED_AS=y
449CONFIG_IOSCHED_DEADLINE=y
450CONFIG_IOSCHED_CFQ=y
451# CONFIG_ATA_OVER_ETH is not set 475# CONFIG_ATA_OVER_ETH is not set
452 476
453# 477#
@@ -556,7 +580,6 @@ CONFIG_TUN=m
556# PHY device support 580# PHY device support
557# 581#
558CONFIG_PHYLIB=m 582CONFIG_PHYLIB=m
559CONFIG_PHYCONTROL=y
560 583
561# 584#
562# MII PHY device drivers 585# MII PHY device drivers
@@ -574,6 +597,7 @@ CONFIG_NET_ETHERNET=y
574# CONFIG_MII is not set 597# CONFIG_MII is not set
575# CONFIG_HAPPYMEAL is not set 598# CONFIG_HAPPYMEAL is not set
576# CONFIG_SUNGEM is not set 599# CONFIG_SUNGEM is not set
600# CONFIG_CASSINI is not set
577# CONFIG_NET_VENDOR_3COM is not set 601# CONFIG_NET_VENDOR_3COM is not set
578# CONFIG_NET_VENDOR_SMC is not set 602# CONFIG_NET_VENDOR_SMC is not set
579# CONFIG_NET_VENDOR_RACAL is not set 603# CONFIG_NET_VENDOR_RACAL is not set
@@ -619,7 +643,6 @@ CONFIG_NET_PCI=y
619# CONFIG_TLAN is not set 643# CONFIG_TLAN is not set
620# CONFIG_VIA_RHINE is not set 644# CONFIG_VIA_RHINE is not set
621# CONFIG_LAN_SAA9730 is not set 645# CONFIG_LAN_SAA9730 is not set
622# CONFIG_NET_POCKET is not set
623 646
624# 647#
625# Ethernet (1000 Mbit) 648# Ethernet (1000 Mbit)
@@ -668,7 +691,6 @@ CONFIG_NET_RADIO=y
668# CONFIG_IPW2100 is not set 691# CONFIG_IPW2100 is not set
669# CONFIG_IPW_DEBUG is not set 692# CONFIG_IPW_DEBUG is not set
670CONFIG_IPW2200=m 693CONFIG_IPW2200=m
671# CONFIG_AIRO is not set
672# CONFIG_HERMES is not set 694# CONFIG_HERMES is not set
673# CONFIG_ATMEL is not set 695# CONFIG_ATMEL is not set
674 696
@@ -692,6 +714,7 @@ CONFIG_PPP_ASYNC=m
692CONFIG_PPP_SYNC_TTY=m 714CONFIG_PPP_SYNC_TTY=m
693CONFIG_PPP_DEFLATE=m 715CONFIG_PPP_DEFLATE=m
694# CONFIG_PPP_BSDCOMP is not set 716# CONFIG_PPP_BSDCOMP is not set
717CONFIG_PPP_MPPE=m
695CONFIG_PPPOE=m 718CONFIG_PPPOE=m
696# CONFIG_SLIP is not set 719# CONFIG_SLIP is not set
697# CONFIG_SHAPER is not set 720# CONFIG_SHAPER is not set
@@ -804,6 +827,7 @@ CONFIG_LEGACY_PTY_COUNT=256
804# TPM devices 827# TPM devices
805# 828#
806# CONFIG_TCG_TPM is not set 829# CONFIG_TCG_TPM is not set
830# CONFIG_TELCLOCK is not set
807 831
808# 832#
809# I2C support 833# I2C support
@@ -847,7 +871,6 @@ CONFIG_FB=y
847CONFIG_FB_CFB_FILLRECT=y 871CONFIG_FB_CFB_FILLRECT=y
848CONFIG_FB_CFB_COPYAREA=y 872CONFIG_FB_CFB_COPYAREA=y
849CONFIG_FB_CFB_IMAGEBLIT=y 873CONFIG_FB_CFB_IMAGEBLIT=y
850CONFIG_FB_SOFT_CURSOR=y
851# CONFIG_FB_MACMODES is not set 874# CONFIG_FB_MACMODES is not set
852# CONFIG_FB_MODE_HELPERS is not set 875# CONFIG_FB_MODE_HELPERS is not set
853# CONFIG_FB_TILEBLITTING is not set 876# CONFIG_FB_TILEBLITTING is not set
@@ -856,6 +879,7 @@ CONFIG_FB_SOFT_CURSOR=y
856# CONFIG_FB_CYBER2000 is not set 879# CONFIG_FB_CYBER2000 is not set
857# CONFIG_FB_ASILIANT is not set 880# CONFIG_FB_ASILIANT is not set
858# CONFIG_FB_IMSTT is not set 881# CONFIG_FB_IMSTT is not set
882# CONFIG_FB_S1D13XXX is not set
859# CONFIG_FB_NVIDIA is not set 883# CONFIG_FB_NVIDIA is not set
860# CONFIG_FB_RIVA is not set 884# CONFIG_FB_RIVA is not set
861# CONFIG_FB_MATROX is not set 885# CONFIG_FB_MATROX is not set
@@ -876,7 +900,6 @@ CONFIG_FB_ATY_CT=y
876# CONFIG_FB_SMIVGX is not set 900# CONFIG_FB_SMIVGX is not set
877# CONFIG_FB_CYBLA is not set 901# CONFIG_FB_CYBLA is not set
878# CONFIG_FB_TRIDENT is not set 902# CONFIG_FB_TRIDENT is not set
879# CONFIG_FB_S1D13XXX is not set
880# CONFIG_FB_VIRTUAL is not set 903# CONFIG_FB_VIRTUAL is not set
881 904
882# 905#
@@ -926,12 +949,15 @@ CONFIG_USB=y
926# 949#
927# USB Device Class drivers 950# USB Device Class drivers
928# 951#
929# CONFIG_USB_BLUETOOTH_TTY is not set
930# CONFIG_USB_ACM is not set 952# CONFIG_USB_ACM is not set
931# CONFIG_USB_PRINTER is not set 953# CONFIG_USB_PRINTER is not set
932 954
933# 955#
934# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 956# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
957#
958
959#
960# may also be needed; see USB_STORAGE Help for more information
935# 961#
936# CONFIG_USB_STORAGE is not set 962# CONFIG_USB_STORAGE is not set
937 963
@@ -1106,6 +1132,7 @@ CONFIG_RELAYFS_FS=m
1106CONFIG_JFFS2_FS=y 1132CONFIG_JFFS2_FS=y
1107CONFIG_JFFS2_FS_DEBUG=0 1133CONFIG_JFFS2_FS_DEBUG=0
1108CONFIG_JFFS2_FS_WRITEBUFFER=y 1134CONFIG_JFFS2_FS_WRITEBUFFER=y
1135# CONFIG_JFFS2_SUMMARY is not set
1109# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 1136# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1110CONFIG_JFFS2_ZLIB=y 1137CONFIG_JFFS2_ZLIB=y
1111CONFIG_JFFS2_RTIME=y 1138CONFIG_JFFS2_RTIME=y
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig
index 988a05824f01..55458062352e 100644
--- a/arch/mips/configs/rm200_defconfig
+++ b/arch/mips/configs/rm200_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:03 2005 4# Thu Nov 10 14:02:50 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -59,6 +59,24 @@ CONFIG_MODVERSIONS=y
59CONFIG_KMOD=y 59CONFIG_KMOD=y
60 60
61# 61#
62# Block layer
63#
64# CONFIG_LBD is not set
65
66#
67# IO Schedulers
68#
69CONFIG_IOSCHED_NOOP=y
70CONFIG_IOSCHED_AS=y
71CONFIG_IOSCHED_DEADLINE=y
72CONFIG_IOSCHED_CFQ=y
73CONFIG_DEFAULT_AS=y
74# CONFIG_DEFAULT_DEADLINE is not set
75# CONFIG_DEFAULT_CFQ is not set
76# CONFIG_DEFAULT_NOOP is not set
77CONFIG_DEFAULT_IOSCHED="anticipatory"
78
79#
62# Machine selection 80# Machine selection
63# 81#
64# CONFIG_MIPS_MTX1 is not set 82# CONFIG_MIPS_MTX1 is not set
@@ -190,6 +208,7 @@ CONFIG_FLATMEM_MANUAL=y
190CONFIG_FLATMEM=y 208CONFIG_FLATMEM=y
191CONFIG_FLAT_NODE_MEM_MAP=y 209CONFIG_FLAT_NODE_MEM_MAP=y
192# CONFIG_SPARSEMEM_STATIC is not set 210# CONFIG_SPARSEMEM_STATIC is not set
211CONFIG_SPLIT_PTLOCK_CPUS=4
193# CONFIG_PREEMPT_NONE is not set 212# CONFIG_PREEMPT_NONE is not set
194CONFIG_PREEMPT_VOLUNTARY=y 213CONFIG_PREEMPT_VOLUNTARY=y
195# CONFIG_PREEMPT is not set 214# CONFIG_PREEMPT is not set
@@ -272,6 +291,10 @@ CONFIG_IPV6_TUNNEL=m
272CONFIG_NETFILTER=y 291CONFIG_NETFILTER=y
273# CONFIG_NETFILTER_DEBUG is not set 292# CONFIG_NETFILTER_DEBUG is not set
274CONFIG_BRIDGE_NETFILTER=y 293CONFIG_BRIDGE_NETFILTER=y
294
295#
296# Core Netfilter Configuration
297#
275CONFIG_NETFILTER_NETLINK=m 298CONFIG_NETFILTER_NETLINK=m
276CONFIG_NETFILTER_NETLINK_QUEUE=m 299CONFIG_NETFILTER_NETLINK_QUEUE=m
277CONFIG_NETFILTER_NETLINK_LOG=m 300CONFIG_NETFILTER_NETLINK_LOG=m
@@ -325,6 +348,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
325CONFIG_IP_NF_TARGET_LOG=m 348CONFIG_IP_NF_TARGET_LOG=m
326CONFIG_IP_NF_TARGET_ULOG=m 349CONFIG_IP_NF_TARGET_ULOG=m
327CONFIG_IP_NF_TARGET_TCPMSS=m 350CONFIG_IP_NF_TARGET_TCPMSS=m
351CONFIG_IP_NF_TARGET_NFQUEUE=m
328CONFIG_IP_NF_NAT=m 352CONFIG_IP_NF_NAT=m
329CONFIG_IP_NF_NAT_NEEDED=y 353CONFIG_IP_NF_NAT_NEEDED=y
330CONFIG_IP_NF_TARGET_MASQUERADE=m 354CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -374,6 +398,7 @@ CONFIG_IP6_NF_MATCH_PHYSDEV=m
374CONFIG_IP6_NF_FILTER=m 398CONFIG_IP6_NF_FILTER=m
375CONFIG_IP6_NF_TARGET_LOG=m 399CONFIG_IP6_NF_TARGET_LOG=m
376CONFIG_IP6_NF_TARGET_REJECT=m 400CONFIG_IP6_NF_TARGET_REJECT=m
401CONFIG_IP6_NF_TARGET_NFQUEUE=m
377CONFIG_IP6_NF_MANGLE=m 402CONFIG_IP6_NF_MANGLE=m
378CONFIG_IP6_NF_TARGET_MARK=m 403CONFIG_IP6_NF_TARGET_MARK=m
379CONFIG_IP6_NF_TARGET_HL=m 404CONFIG_IP6_NF_TARGET_HL=m
@@ -430,10 +455,18 @@ CONFIG_DECNET=m
430# CONFIG_NET_DIVERT is not set 455# CONFIG_NET_DIVERT is not set
431# CONFIG_ECONET is not set 456# CONFIG_ECONET is not set
432# CONFIG_WAN_ROUTER is not set 457# CONFIG_WAN_ROUTER is not set
458
459#
460# QoS and/or fair queueing
461#
433CONFIG_NET_SCHED=y 462CONFIG_NET_SCHED=y
434CONFIG_NET_SCH_CLK_JIFFIES=y 463CONFIG_NET_SCH_CLK_JIFFIES=y
435# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set 464# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
436# CONFIG_NET_SCH_CLK_CPU is not set 465# CONFIG_NET_SCH_CLK_CPU is not set
466
467#
468# Queueing/Scheduling
469#
437CONFIG_NET_SCH_CBQ=m 470CONFIG_NET_SCH_CBQ=m
438CONFIG_NET_SCH_HTB=m 471CONFIG_NET_SCH_HTB=m
439CONFIG_NET_SCH_HFSC=m 472CONFIG_NET_SCH_HFSC=m
@@ -446,8 +479,10 @@ CONFIG_NET_SCH_GRED=m
446CONFIG_NET_SCH_DSMARK=m 479CONFIG_NET_SCH_DSMARK=m
447CONFIG_NET_SCH_NETEM=m 480CONFIG_NET_SCH_NETEM=m
448CONFIG_NET_SCH_INGRESS=m 481CONFIG_NET_SCH_INGRESS=m
449CONFIG_NET_QOS=y 482
450CONFIG_NET_ESTIMATOR=y 483#
484# Classification
485#
451CONFIG_NET_CLS=y 486CONFIG_NET_CLS=y
452CONFIG_NET_CLS_BASIC=m 487CONFIG_NET_CLS_BASIC=m
453CONFIG_NET_CLS_TCINDEX=m 488CONFIG_NET_CLS_TCINDEX=m
@@ -456,13 +491,14 @@ CONFIG_NET_CLS_ROUTE=y
456CONFIG_NET_CLS_FW=m 491CONFIG_NET_CLS_FW=m
457CONFIG_NET_CLS_U32=m 492CONFIG_NET_CLS_U32=m
458# CONFIG_CLS_U32_PERF is not set 493# CONFIG_CLS_U32_PERF is not set
459# CONFIG_NET_CLS_IND is not set
460# CONFIG_CLS_U32_MARK is not set 494# CONFIG_CLS_U32_MARK is not set
461CONFIG_NET_CLS_RSVP=m 495CONFIG_NET_CLS_RSVP=m
462CONFIG_NET_CLS_RSVP6=m 496CONFIG_NET_CLS_RSVP6=m
463# CONFIG_NET_EMATCH is not set 497# CONFIG_NET_EMATCH is not set
464# CONFIG_NET_CLS_ACT is not set 498# CONFIG_NET_CLS_ACT is not set
465CONFIG_NET_CLS_POLICE=y 499CONFIG_NET_CLS_POLICE=y
500# CONFIG_NET_CLS_IND is not set
501CONFIG_NET_ESTIMATOR=y
466 502
467# 503#
468# Network testing 504# Network testing
@@ -583,18 +619,9 @@ CONFIG_BLK_DEV_UB=m
583CONFIG_BLK_DEV_RAM=m 619CONFIG_BLK_DEV_RAM=m
584CONFIG_BLK_DEV_RAM_COUNT=16 620CONFIG_BLK_DEV_RAM_COUNT=16
585CONFIG_BLK_DEV_RAM_SIZE=4096 621CONFIG_BLK_DEV_RAM_SIZE=4096
586# CONFIG_LBD is not set
587CONFIG_CDROM_PKTCDVD=m 622CONFIG_CDROM_PKTCDVD=m
588CONFIG_CDROM_PKTCDVD_BUFFERS=8 623CONFIG_CDROM_PKTCDVD_BUFFERS=8
589# CONFIG_CDROM_PKTCDVD_WCACHE is not set 624# CONFIG_CDROM_PKTCDVD_WCACHE is not set
590
591#
592# IO Schedulers
593#
594CONFIG_IOSCHED_NOOP=y
595CONFIG_IOSCHED_AS=y
596CONFIG_IOSCHED_DEADLINE=y
597CONFIG_IOSCHED_CFQ=y
598CONFIG_ATA_OVER_ETH=m 625CONFIG_ATA_OVER_ETH=m
599 626
600# 627#
@@ -638,6 +665,7 @@ CONFIG_SCSI_SAS_ATTRS=m
638# 665#
639# SCSI low-level drivers 666# SCSI low-level drivers
640# 667#
668CONFIG_ISCSI_TCP=m
641# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 669# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
642# CONFIG_SCSI_3W_9XXX is not set 670# CONFIG_SCSI_3W_9XXX is not set
643# CONFIG_SCSI_ACARD is not set 671# CONFIG_SCSI_ACARD is not set
@@ -651,6 +679,7 @@ CONFIG_SCSI_SAS_ATTRS=m
651CONFIG_MEGARAID_NEWGEN=y 679CONFIG_MEGARAID_NEWGEN=y
652CONFIG_MEGARAID_MM=m 680CONFIG_MEGARAID_MM=m
653CONFIG_MEGARAID_MAILBOX=m 681CONFIG_MEGARAID_MAILBOX=m
682# CONFIG_MEGARAID_SAS is not set
654# CONFIG_SCSI_SATA is not set 683# CONFIG_SCSI_SATA is not set
655# CONFIG_SCSI_DMX3191D is not set 684# CONFIG_SCSI_DMX3191D is not set
656# CONFIG_SCSI_DTC3280 is not set 685# CONFIG_SCSI_DTC3280 is not set
@@ -723,6 +752,7 @@ CONFIG_DM_MULTIPATH_EMC=m
723# CONFIG_FUSION is not set 752# CONFIG_FUSION is not set
724# CONFIG_FUSION_SPI is not set 753# CONFIG_FUSION_SPI is not set
725# CONFIG_FUSION_FC is not set 754# CONFIG_FUSION_FC is not set
755# CONFIG_FUSION_SAS is not set
726 756
727# 757#
728# IEEE 1394 (FireWire) support 758# IEEE 1394 (FireWire) support
@@ -752,7 +782,6 @@ CONFIG_TUN=m
752# PHY device support 782# PHY device support
753# 783#
754CONFIG_PHYLIB=m 784CONFIG_PHYLIB=m
755CONFIG_PHYCONTROL=y
756 785
757# 786#
758# MII PHY device drivers 787# MII PHY device drivers
@@ -770,6 +799,7 @@ CONFIG_NET_ETHERNET=y
770CONFIG_MII=y 799CONFIG_MII=y
771# CONFIG_HAPPYMEAL is not set 800# CONFIG_HAPPYMEAL is not set
772# CONFIG_SUNGEM is not set 801# CONFIG_SUNGEM is not set
802# CONFIG_CASSINI is not set
773# CONFIG_NET_VENDOR_3COM is not set 803# CONFIG_NET_VENDOR_3COM is not set
774# CONFIG_NET_VENDOR_SMC is not set 804# CONFIG_NET_VENDOR_SMC is not set
775# CONFIG_NET_VENDOR_RACAL is not set 805# CONFIG_NET_VENDOR_RACAL is not set
@@ -984,6 +1014,7 @@ CONFIG_RTC=m
984# TPM devices 1014# TPM devices
985# 1015#
986# CONFIG_TCG_TPM is not set 1016# CONFIG_TCG_TPM is not set
1017# CONFIG_TELCLOCK is not set
987 1018
988# 1019#
989# I2C support 1020# I2C support
@@ -1074,12 +1105,15 @@ CONFIG_USB_UHCI_HCD=m
1074# 1105#
1075# USB Device Class drivers 1106# USB Device Class drivers
1076# 1107#
1077CONFIG_USB_BLUETOOTH_TTY=m
1078CONFIG_USB_ACM=m 1108CONFIG_USB_ACM=m
1079CONFIG_USB_PRINTER=m 1109CONFIG_USB_PRINTER=m
1080 1110
1081# 1111#
1082# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 1112# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1113#
1114
1115#
1116# may also be needed; see USB_STORAGE Help for more information
1083# 1117#
1084CONFIG_USB_STORAGE=m 1118CONFIG_USB_STORAGE=m
1085# CONFIG_USB_STORAGE_DEBUG is not set 1119# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1196,6 +1230,7 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1196CONFIG_USB_SERIAL_KLSI=m 1230CONFIG_USB_SERIAL_KLSI=m
1197CONFIG_USB_SERIAL_KOBIL_SCT=m 1231CONFIG_USB_SERIAL_KOBIL_SCT=m
1198CONFIG_USB_SERIAL_MCT_U232=m 1232CONFIG_USB_SERIAL_MCT_U232=m
1233# CONFIG_USB_SERIAL_NOKIA_DKU2 is not set
1199CONFIG_USB_SERIAL_PL2303=m 1234CONFIG_USB_SERIAL_PL2303=m
1200CONFIG_USB_SERIAL_HP4X=m 1235CONFIG_USB_SERIAL_HP4X=m
1201CONFIG_USB_SERIAL_SAFE=m 1236CONFIG_USB_SERIAL_SAFE=m
@@ -1271,7 +1306,7 @@ CONFIG_REISERFS_FS_SECURITY=y
1271CONFIG_FS_POSIX_ACL=y 1306CONFIG_FS_POSIX_ACL=y
1272CONFIG_XFS_FS=m 1307CONFIG_XFS_FS=m
1273CONFIG_XFS_EXPORT=y 1308CONFIG_XFS_EXPORT=y
1274CONFIG_XFS_QUOTA=m 1309CONFIG_XFS_QUOTA=y
1275CONFIG_XFS_SECURITY=y 1310CONFIG_XFS_SECURITY=y
1276# CONFIG_XFS_POSIX_ACL is not set 1311# CONFIG_XFS_POSIX_ACL is not set
1277# CONFIG_XFS_RT is not set 1312# CONFIG_XFS_RT is not set
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 4365d9c8c42e..dc453a1e4806 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:05 2005 4# Mon Nov 7 23:06:43 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -59,6 +59,23 @@ CONFIG_KMOD=y
59CONFIG_STOP_MACHINE=y 59CONFIG_STOP_MACHINE=y
60 60
61# 61#
62# Block layer
63#
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
62# Machine selection 79# Machine selection
63# 80#
64# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -126,8 +143,8 @@ CONFIG_CPU_SB1_PASS_1=y
126# CONFIG_CPU_SB1_PASS_3 is not set 143# CONFIG_CPU_SB1_PASS_3 is not set
127CONFIG_SIBYTE_HAS_LDT=y 144CONFIG_SIBYTE_HAS_LDT=y
128# CONFIG_SIMULATION is not set 145# CONFIG_SIMULATION is not set
129# CONFIG_CONFIG_SB1_CEX_ALWAYS_FATAL is not set 146# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
130# CONFIG_CONFIG_SB1_CERR_STALL is not set 147# CONFIG_SB1_CERR_STALL is not set
131CONFIG_SIBYTE_CFE=y 148CONFIG_SIBYTE_CFE=y
132# CONFIG_SIBYTE_CFE_CONSOLE is not set 149# CONFIG_SIBYTE_CFE_CONSOLE is not set
133# CONFIG_SIBYTE_BUS_WATCHER is not set 150# CONFIG_SIBYTE_BUS_WATCHER is not set
@@ -200,6 +217,7 @@ CONFIG_FLATMEM_MANUAL=y
200CONFIG_FLATMEM=y 217CONFIG_FLATMEM=y
201CONFIG_FLAT_NODE_MEM_MAP=y 218CONFIG_FLAT_NODE_MEM_MAP=y
202# CONFIG_SPARSEMEM_STATIC is not set 219# CONFIG_SPARSEMEM_STATIC is not set
220CONFIG_SPLIT_PTLOCK_CPUS=4
203CONFIG_SMP=y 221CONFIG_SMP=y
204CONFIG_NR_CPUS=2 222CONFIG_NR_CPUS=2
205CONFIG_PREEMPT_NONE=y 223CONFIG_PREEMPT_NONE=y
@@ -295,6 +313,10 @@ CONFIG_TCP_CONG_BIC=y
295# CONFIG_NET_DIVERT is not set 313# CONFIG_NET_DIVERT is not set
296# CONFIG_ECONET is not set 314# CONFIG_ECONET is not set
297# CONFIG_WAN_ROUTER is not set 315# CONFIG_WAN_ROUTER is not set
316
317#
318# QoS and/or fair queueing
319#
298# CONFIG_NET_SCHED is not set 320# CONFIG_NET_SCHED is not set
299# CONFIG_NET_CLS_ROUTE is not set 321# CONFIG_NET_CLS_ROUTE is not set
300 322
@@ -359,14 +381,6 @@ CONFIG_BLK_DEV_INITRD=y
359CONFIG_CDROM_PKTCDVD=m 381CONFIG_CDROM_PKTCDVD=m
360CONFIG_CDROM_PKTCDVD_BUFFERS=8 382CONFIG_CDROM_PKTCDVD_BUFFERS=8
361# CONFIG_CDROM_PKTCDVD_WCACHE is not set 383# CONFIG_CDROM_PKTCDVD_WCACHE is not set
362
363#
364# IO Schedulers
365#
366CONFIG_IOSCHED_NOOP=y
367CONFIG_IOSCHED_AS=y
368CONFIG_IOSCHED_DEADLINE=y
369CONFIG_IOSCHED_CFQ=y
370CONFIG_ATA_OVER_ETH=m 384CONFIG_ATA_OVER_ETH=m
371 385
372# 386#
@@ -441,7 +455,6 @@ CONFIG_NETDEVICES=y
441# PHY device support 455# PHY device support
442# 456#
443CONFIG_PHYLIB=m 457CONFIG_PHYLIB=m
444CONFIG_PHYCONTROL=y
445 458
446# 459#
447# MII PHY device drivers 460# MII PHY device drivers
@@ -459,6 +472,7 @@ CONFIG_NET_ETHERNET=y
459CONFIG_MII=y 472CONFIG_MII=y
460# CONFIG_HAPPYMEAL is not set 473# CONFIG_HAPPYMEAL is not set
461# CONFIG_SUNGEM is not set 474# CONFIG_SUNGEM is not set
475# CONFIG_CASSINI is not set
462# CONFIG_NET_VENDOR_3COM is not set 476# CONFIG_NET_VENDOR_3COM is not set
463 477
464# 478#
@@ -599,6 +613,7 @@ CONFIG_LEGACY_PTY_COUNT=256
599# TPM devices 613# TPM devices
600# 614#
601# CONFIG_TCG_TPM is not set 615# CONFIG_TCG_TPM is not set
616# CONFIG_TELCLOCK is not set
602 617
603# 618#
604# I2C support 619# I2C support
@@ -652,6 +667,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
652# CONFIG_USB is not set 667# CONFIG_USB is not set
653 668
654# 669#
670# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
671#
672
673#
655# USB Gadget Support 674# USB Gadget Support
656# 675#
657# CONFIG_USB_GADGET is not set 676# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig
index d835f6db1f41..aa27d583162d 100644
--- a/arch/mips/configs/sead_defconfig
+++ b/arch/mips/configs/sead_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:07 2005 4# Mon Nov 7 23:06:45 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -48,6 +48,24 @@ CONFIG_BASE_SMALL=0
48# CONFIG_MODULES is not set 48# CONFIG_MODULES is not set
49 49
50# 50#
51# Block layer
52#
53# CONFIG_LBD is not set
54
55#
56# IO Schedulers
57#
58CONFIG_IOSCHED_NOOP=y
59CONFIG_IOSCHED_AS=y
60CONFIG_IOSCHED_DEADLINE=y
61CONFIG_IOSCHED_CFQ=y
62CONFIG_DEFAULT_AS=y
63# CONFIG_DEFAULT_DEADLINE is not set
64# CONFIG_DEFAULT_CFQ is not set
65# CONFIG_DEFAULT_NOOP is not set
66CONFIG_DEFAULT_IOSCHED="anticipatory"
67
68#
51# Machine selection 69# Machine selection
52# 70#
53# CONFIG_MIPS_MTX1 is not set 71# CONFIG_MIPS_MTX1 is not set
@@ -173,6 +191,7 @@ CONFIG_FLATMEM_MANUAL=y
173CONFIG_FLATMEM=y 191CONFIG_FLATMEM=y
174CONFIG_FLAT_NODE_MEM_MAP=y 192CONFIG_FLAT_NODE_MEM_MAP=y
175# CONFIG_SPARSEMEM_STATIC is not set 193# CONFIG_SPARSEMEM_STATIC is not set
194CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_PREEMPT_NONE=y 195CONFIG_PREEMPT_NONE=y
177# CONFIG_PREEMPT_VOLUNTARY is not set 196# CONFIG_PREEMPT_VOLUNTARY is not set
178# CONFIG_PREEMPT is not set 197# CONFIG_PREEMPT is not set
@@ -242,18 +261,9 @@ CONFIG_BLK_DEV_RAM=y
242CONFIG_BLK_DEV_RAM_COUNT=16 261CONFIG_BLK_DEV_RAM_COUNT=16
243CONFIG_BLK_DEV_RAM_SIZE=18432 262CONFIG_BLK_DEV_RAM_SIZE=18432
244CONFIG_BLK_DEV_INITRD=y 263CONFIG_BLK_DEV_INITRD=y
245# CONFIG_LBD is not set
246# CONFIG_CDROM_PKTCDVD is not set 264# CONFIG_CDROM_PKTCDVD is not set
247 265
248# 266#
249# IO Schedulers
250#
251CONFIG_IOSCHED_NOOP=y
252CONFIG_IOSCHED_AS=y
253CONFIG_IOSCHED_DEADLINE=y
254CONFIG_IOSCHED_CFQ=y
255
256#
257# ATA/ATAPI/MFM/RLL support 267# ATA/ATAPI/MFM/RLL support
258# 268#
259# CONFIG_IDE is not set 269# CONFIG_IDE is not set
@@ -353,6 +363,7 @@ CONFIG_LEGACY_PTY_COUNT=256
353# 363#
354# TPM devices 364# TPM devices
355# 365#
366# CONFIG_TELCLOCK is not set
356 367
357# 368#
358# I2C support 369# I2C support
@@ -404,6 +415,10 @@ CONFIG_LEGACY_PTY_COUNT=256
404# CONFIG_USB_ARCH_HAS_OHCI is not set 415# CONFIG_USB_ARCH_HAS_OHCI is not set
405 416
406# 417#
418# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
419#
420
421#
407# USB Gadget Support 422# USB Gadget Support
408# 423#
409# CONFIG_USB_GADGET is not set 424# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index bf60a17de2b0..ddc7e45996f2 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:10 2005 4# Mon Nov 7 23:06:49 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -183,6 +201,7 @@ CONFIG_FLATMEM_MANUAL=y
183CONFIG_FLATMEM=y 201CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y 202CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set 203# CONFIG_SPARSEMEM_STATIC is not set
204CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_PREEMPT_NONE=y 205CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 206# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 207# CONFIG_PREEMPT is not set
@@ -277,6 +296,10 @@ CONFIG_TCP_CONG_BIC=y
277# CONFIG_NET_DIVERT is not set 296# CONFIG_NET_DIVERT is not set
278# CONFIG_ECONET is not set 297# CONFIG_ECONET is not set
279# CONFIG_WAN_ROUTER is not set 298# CONFIG_WAN_ROUTER is not set
299
300#
301# QoS and/or fair queueing
302#
280# CONFIG_NET_SCHED is not set 303# CONFIG_NET_SCHED is not set
281# CONFIG_NET_CLS_ROUTE is not set 304# CONFIG_NET_CLS_ROUTE is not set
282 305
@@ -339,16 +362,7 @@ CONFIG_BLK_DEV_NBD=m
339CONFIG_BLK_DEV_RAM=m 362CONFIG_BLK_DEV_RAM=m
340CONFIG_BLK_DEV_RAM_COUNT=16 363CONFIG_BLK_DEV_RAM_COUNT=16
341CONFIG_BLK_DEV_RAM_SIZE=4096 364CONFIG_BLK_DEV_RAM_SIZE=4096
342# CONFIG_LBD is not set
343# CONFIG_CDROM_PKTCDVD is not set 365# CONFIG_CDROM_PKTCDVD is not set
344
345#
346# IO Schedulers
347#
348CONFIG_IOSCHED_NOOP=y
349CONFIG_IOSCHED_AS=y
350CONFIG_IOSCHED_DEADLINE=y
351CONFIG_IOSCHED_CFQ=y
352CONFIG_ATA_OVER_ETH=m 366CONFIG_ATA_OVER_ETH=m
353 367
354# 368#
@@ -385,12 +399,13 @@ CONFIG_SCSI_MULTI_LUN=y
385# 399#
386# CONFIG_SCSI_SPI_ATTRS is not set 400# CONFIG_SCSI_SPI_ATTRS is not set
387# CONFIG_SCSI_FC_ATTRS is not set 401# CONFIG_SCSI_FC_ATTRS is not set
388# CONFIG_SCSI_ISCSI_ATTRS is not set 402CONFIG_SCSI_ISCSI_ATTRS=m
389# CONFIG_SCSI_SAS_ATTRS is not set 403# CONFIG_SCSI_SAS_ATTRS is not set
390 404
391# 405#
392# SCSI low-level drivers 406# SCSI low-level drivers
393# 407#
408CONFIG_ISCSI_TCP=m
394# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 409# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
395# CONFIG_SCSI_3W_9XXX is not set 410# CONFIG_SCSI_3W_9XXX is not set
396# CONFIG_SCSI_ACARD is not set 411# CONFIG_SCSI_ACARD is not set
@@ -401,6 +416,7 @@ CONFIG_SCSI_MULTI_LUN=y
401# CONFIG_SCSI_DPT_I2O is not set 416# CONFIG_SCSI_DPT_I2O is not set
402# CONFIG_MEGARAID_NEWGEN is not set 417# CONFIG_MEGARAID_NEWGEN is not set
403# CONFIG_MEGARAID_LEGACY is not set 418# CONFIG_MEGARAID_LEGACY is not set
419# CONFIG_MEGARAID_SAS is not set
404# CONFIG_SCSI_SATA is not set 420# CONFIG_SCSI_SATA is not set
405# CONFIG_SCSI_DMX3191D is not set 421# CONFIG_SCSI_DMX3191D is not set
406# CONFIG_SCSI_FUTURE_DOMAIN is not set 422# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -435,6 +451,7 @@ CONFIG_SCSI_QLA2XXX=y
435# CONFIG_FUSION is not set 451# CONFIG_FUSION is not set
436# CONFIG_FUSION_SPI is not set 452# CONFIG_FUSION_SPI is not set
437# CONFIG_FUSION_FC is not set 453# CONFIG_FUSION_FC is not set
454# CONFIG_FUSION_SAS is not set
438 455
439# 456#
440# IEEE 1394 (FireWire) support 457# IEEE 1394 (FireWire) support
@@ -464,7 +481,6 @@ CONFIG_NETDEVICES=y
464# PHY device support 481# PHY device support
465# 482#
466CONFIG_PHYLIB=m 483CONFIG_PHYLIB=m
467CONFIG_PHYCONTROL=y
468 484
469# 485#
470# MII PHY device drivers 486# MII PHY device drivers
@@ -482,6 +498,7 @@ CONFIG_NET_ETHERNET=y
482CONFIG_MII=y 498CONFIG_MII=y
483# CONFIG_HAPPYMEAL is not set 499# CONFIG_HAPPYMEAL is not set
484# CONFIG_SUNGEM is not set 500# CONFIG_SUNGEM is not set
501# CONFIG_CASSINI is not set
485# CONFIG_NET_VENDOR_3COM is not set 502# CONFIG_NET_VENDOR_3COM is not set
486 503
487# 504#
@@ -634,6 +651,7 @@ CONFIG_LEGACY_PTY_COUNT=256
634# CONFIG_WATCHDOG is not set 651# CONFIG_WATCHDOG is not set
635# CONFIG_RTC is not set 652# CONFIG_RTC is not set
636# CONFIG_GEN_RTC is not set 653# CONFIG_GEN_RTC is not set
654# CONFIG_RTC_VR41XX is not set
637# CONFIG_DTLK is not set 655# CONFIG_DTLK is not set
638# CONFIG_R3964 is not set 656# CONFIG_R3964 is not set
639# CONFIG_APPLICOM is not set 657# CONFIG_APPLICOM is not set
@@ -650,6 +668,7 @@ CONFIG_GPIO_VR41XX=y
650# TPM devices 668# TPM devices
651# 669#
652# CONFIG_TCG_TPM is not set 670# CONFIG_TCG_TPM is not set
671# CONFIG_TELCLOCK is not set
653 672
654# 673#
655# I2C support 674# I2C support
@@ -733,12 +752,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
733# 752#
734# USB Device Class drivers 753# USB Device Class drivers
735# 754#
736# CONFIG_USB_BLUETOOTH_TTY is not set
737# CONFIG_USB_ACM is not set 755# CONFIG_USB_ACM is not set
738# CONFIG_USB_PRINTER is not set 756# CONFIG_USB_PRINTER is not set
739 757
740# 758#
741# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 759# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
760#
761
762#
763# may also be needed; see USB_STORAGE Help for more information
742# 764#
743CONFIG_USB_STORAGE=m 765CONFIG_USB_STORAGE=m
744# CONFIG_USB_STORAGE_DEBUG is not set 766# CONFIG_USB_STORAGE_DEBUG is not set
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig
index ac8b64e87b8a..e8c82f011e98 100644
--- a/arch/mips/configs/tb0229_defconfig
+++ b/arch/mips/configs/tb0229_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:13 2005 4# Wed Nov 9 11:11:47 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -183,6 +201,7 @@ CONFIG_FLATMEM_MANUAL=y
183CONFIG_FLATMEM=y 201CONFIG_FLATMEM=y
184CONFIG_FLAT_NODE_MEM_MAP=y 202CONFIG_FLAT_NODE_MEM_MAP=y
185# CONFIG_SPARSEMEM_STATIC is not set 203# CONFIG_SPARSEMEM_STATIC is not set
204CONFIG_SPLIT_PTLOCK_CPUS=4
186CONFIG_PREEMPT_NONE=y 205CONFIG_PREEMPT_NONE=y
187# CONFIG_PREEMPT_VOLUNTARY is not set 206# CONFIG_PREEMPT_VOLUNTARY is not set
188# CONFIG_PREEMPT is not set 207# CONFIG_PREEMPT is not set
@@ -278,6 +297,10 @@ CONFIG_TCP_CONG_BIC=y
278# CONFIG_NET_DIVERT is not set 297# CONFIG_NET_DIVERT is not set
279# CONFIG_ECONET is not set 298# CONFIG_ECONET is not set
280# CONFIG_WAN_ROUTER is not set 299# CONFIG_WAN_ROUTER is not set
300
301#
302# QoS and/or fair queueing
303#
281# CONFIG_NET_SCHED is not set 304# CONFIG_NET_SCHED is not set
282# CONFIG_NET_CLS_ROUTE is not set 305# CONFIG_NET_CLS_ROUTE is not set
283 306
@@ -341,18 +364,9 @@ CONFIG_BLK_DEV_RAM=y
341CONFIG_BLK_DEV_RAM_COUNT=16 364CONFIG_BLK_DEV_RAM_COUNT=16
342CONFIG_BLK_DEV_RAM_SIZE=4096 365CONFIG_BLK_DEV_RAM_SIZE=4096
343# CONFIG_BLK_DEV_INITRD is not set 366# CONFIG_BLK_DEV_INITRD is not set
344# CONFIG_LBD is not set
345CONFIG_CDROM_PKTCDVD=m 367CONFIG_CDROM_PKTCDVD=m
346CONFIG_CDROM_PKTCDVD_BUFFERS=8 368CONFIG_CDROM_PKTCDVD_BUFFERS=8
347# CONFIG_CDROM_PKTCDVD_WCACHE is not set 369# CONFIG_CDROM_PKTCDVD_WCACHE is not set
348
349#
350# IO Schedulers
351#
352CONFIG_IOSCHED_NOOP=y
353CONFIG_IOSCHED_AS=y
354CONFIG_IOSCHED_DEADLINE=y
355CONFIG_IOSCHED_CFQ=y
356CONFIG_ATA_OVER_ETH=m 370CONFIG_ATA_OVER_ETH=m
357 371
358# 372#
@@ -404,7 +418,6 @@ CONFIG_DUMMY=m
404# PHY device support 418# PHY device support
405# 419#
406CONFIG_PHYLIB=m 420CONFIG_PHYLIB=m
407CONFIG_PHYCONTROL=y
408 421
409# 422#
410# MII PHY device drivers 423# MII PHY device drivers
@@ -422,6 +435,7 @@ CONFIG_NET_ETHERNET=y
422CONFIG_MII=y 435CONFIG_MII=y
423# CONFIG_HAPPYMEAL is not set 436# CONFIG_HAPPYMEAL is not set
424# CONFIG_SUNGEM is not set 437# CONFIG_SUNGEM is not set
438# CONFIG_CASSINI is not set
425# CONFIG_NET_VENDOR_3COM is not set 439# CONFIG_NET_VENDOR_3COM is not set
426 440
427# 441#
@@ -504,6 +518,7 @@ CONFIG_PPP_ASYNC=m
504CONFIG_PPP_SYNC_TTY=m 518CONFIG_PPP_SYNC_TTY=m
505CONFIG_PPP_DEFLATE=m 519CONFIG_PPP_DEFLATE=m
506CONFIG_PPP_BSDCOMP=m 520CONFIG_PPP_BSDCOMP=m
521CONFIG_PPP_MPPE=m
507CONFIG_PPPOE=m 522CONFIG_PPPOE=m
508CONFIG_SLIP=m 523CONFIG_SLIP=m
509CONFIG_SLIP_COMPRESSED=y 524CONFIG_SLIP_COMPRESSED=y
@@ -589,6 +604,7 @@ CONFIG_LEGACY_PTY_COUNT=256
589# CONFIG_WATCHDOG is not set 604# CONFIG_WATCHDOG is not set
590# CONFIG_RTC is not set 605# CONFIG_RTC is not set
591# CONFIG_GEN_RTC is not set 606# CONFIG_GEN_RTC is not set
607# CONFIG_RTC_VR41XX is not set
592# CONFIG_DTLK is not set 608# CONFIG_DTLK is not set
593# CONFIG_R3964 is not set 609# CONFIG_R3964 is not set
594# CONFIG_APPLICOM is not set 610# CONFIG_APPLICOM is not set
@@ -605,6 +621,7 @@ CONFIG_GPIO_VR41XX=y
605# TPM devices 621# TPM devices
606# 622#
607# CONFIG_TCG_TPM is not set 623# CONFIG_TCG_TPM is not set
624# CONFIG_TELCLOCK is not set
608 625
609# 626#
610# I2C support 627# I2C support
@@ -688,12 +705,15 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
688# 705#
689# USB Device Class drivers 706# USB Device Class drivers
690# 707#
691# CONFIG_USB_BLUETOOTH_TTY is not set
692# CONFIG_USB_ACM is not set 708# CONFIG_USB_ACM is not set
693# CONFIG_USB_PRINTER is not set 709# CONFIG_USB_PRINTER is not set
694 710
695# 711#
696# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
713#
714
715#
716# may also be needed; see USB_STORAGE Help for more information
697# 717#
698# CONFIG_USB_STORAGE is not set 718# CONFIG_USB_STORAGE is not set
699 719
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index ab13621ef3b9..125b2997abfe 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 22:27:16 2005 4# Tue Nov 15 11:17:02 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -57,6 +57,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
57CONFIG_KMOD=y 57CONFIG_KMOD=y
58 58
59# 59#
60# Block layer
61#
62# CONFIG_LBD is not set
63
64#
65# IO Schedulers
66#
67CONFIG_IOSCHED_NOOP=y
68CONFIG_IOSCHED_AS=y
69CONFIG_IOSCHED_DEADLINE=y
70CONFIG_IOSCHED_CFQ=y
71CONFIG_DEFAULT_AS=y
72# CONFIG_DEFAULT_DEADLINE is not set
73# CONFIG_DEFAULT_CFQ is not set
74# CONFIG_DEFAULT_NOOP is not set
75CONFIG_DEFAULT_IOSCHED="anticipatory"
76
77#
60# Machine selection 78# Machine selection
61# 79#
62# CONFIG_MIPS_MTX1 is not set 80# CONFIG_MIPS_MTX1 is not set
@@ -180,6 +198,7 @@ CONFIG_FLATMEM_MANUAL=y
180CONFIG_FLATMEM=y 198CONFIG_FLATMEM=y
181CONFIG_FLAT_NODE_MEM_MAP=y 199CONFIG_FLAT_NODE_MEM_MAP=y
182# CONFIG_SPARSEMEM_STATIC is not set 200# CONFIG_SPARSEMEM_STATIC is not set
201CONFIG_SPLIT_PTLOCK_CPUS=4
183CONFIG_PREEMPT_NONE=y 202CONFIG_PREEMPT_NONE=y
184# CONFIG_PREEMPT_VOLUNTARY is not set 203# CONFIG_PREEMPT_VOLUNTARY is not set
185# CONFIG_PREEMPT is not set 204# CONFIG_PREEMPT is not set
@@ -273,6 +292,10 @@ CONFIG_TCP_CONG_BIC=y
273# CONFIG_NET_DIVERT is not set 292# CONFIG_NET_DIVERT is not set
274# CONFIG_ECONET is not set 293# CONFIG_ECONET is not set
275# CONFIG_WAN_ROUTER is not set 294# CONFIG_WAN_ROUTER is not set
295
296#
297# QoS and/or fair queueing
298#
276# CONFIG_NET_SCHED is not set 299# CONFIG_NET_SCHED is not set
277# CONFIG_NET_CLS_ROUTE is not set 300# CONFIG_NET_CLS_ROUTE is not set
278 301
@@ -328,16 +351,7 @@ CONFIG_CONNECTOR=m
328# CONFIG_BLK_DEV_NBD is not set 351# CONFIG_BLK_DEV_NBD is not set
329# CONFIG_BLK_DEV_RAM is not set 352# CONFIG_BLK_DEV_RAM is not set
330CONFIG_BLK_DEV_RAM_COUNT=16 353CONFIG_BLK_DEV_RAM_COUNT=16
331# CONFIG_LBD is not set
332# CONFIG_CDROM_PKTCDVD is not set 354# CONFIG_CDROM_PKTCDVD is not set
333
334#
335# IO Schedulers
336#
337CONFIG_IOSCHED_NOOP=y
338CONFIG_IOSCHED_AS=y
339CONFIG_IOSCHED_DEADLINE=y
340CONFIG_IOSCHED_CFQ=y
341CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
342 356
343# 357#
@@ -415,7 +429,6 @@ CONFIG_NETDEVICES=y
415# PHY device support 429# PHY device support
416# 430#
417CONFIG_PHYLIB=m 431CONFIG_PHYLIB=m
418CONFIG_PHYCONTROL=y
419 432
420# 433#
421# MII PHY device drivers 434# MII PHY device drivers
@@ -439,7 +452,6 @@ CONFIG_MII=m
439# CONFIG_HP100 is not set 452# CONFIG_HP100 is not set
440# CONFIG_NET_ISA is not set 453# CONFIG_NET_ISA is not set
441# CONFIG_NET_PCI is not set 454# CONFIG_NET_PCI is not set
442# CONFIG_NET_POCKET is not set
443 455
444# 456#
445# Ethernet (1000 Mbit) 457# Ethernet (1000 Mbit)
@@ -577,6 +589,7 @@ CONFIG_WATCHDOG=y
577# CONFIG_WDT is not set 589# CONFIG_WDT is not set
578# CONFIG_RTC is not set 590# CONFIG_RTC is not set
579# CONFIG_GEN_RTC is not set 591# CONFIG_GEN_RTC is not set
592# CONFIG_RTC_VR41XX is not set
580# CONFIG_DTLK is not set 593# CONFIG_DTLK is not set
581# CONFIG_R3964 is not set 594# CONFIG_R3964 is not set
582 595
@@ -588,12 +601,15 @@ CONFIG_WATCHDOG=y
588# PCMCIA character devices 601# PCMCIA character devices
589# 602#
590# CONFIG_SYNCLINK_CS is not set 603# CONFIG_SYNCLINK_CS is not set
604# CONFIG_CARDMAN_4000 is not set
605# CONFIG_CARDMAN_4040 is not set
591# CONFIG_GPIO_VR41XX is not set 606# CONFIG_GPIO_VR41XX is not set
592# CONFIG_RAW_DRIVER is not set 607# CONFIG_RAW_DRIVER is not set
593 608
594# 609#
595# TPM devices 610# TPM devices
596# 611#
612# CONFIG_TELCLOCK is not set
597 613
598# 614#
599# I2C support 615# I2C support
@@ -653,6 +669,10 @@ CONFIG_DUMMY_CONSOLE=y
653# CONFIG_USB_ARCH_HAS_OHCI is not set 669# CONFIG_USB_ARCH_HAS_OHCI is not set
654 670
655# 671#
672# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
673#
674
675#
656# USB Gadget Support 676# USB Gadget Support
657# 677#
658# CONFIG_USB_GADGET is not set 678# CONFIG_USB_GADGET is not set
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig
index 5b0b7f30e205..d90790b2ab30 100644
--- a/arch/mips/configs/yosemite_defconfig
+++ b/arch/mips/configs/yosemite_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:27:18 2005 4# Mon Nov 7 23:06:59 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_KMOD=y
58CONFIG_STOP_MACHINE=y 58CONFIG_STOP_MACHINE=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -181,6 +199,7 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
181CONFIG_FLATMEM=y 199CONFIG_FLATMEM=y
182CONFIG_FLAT_NODE_MEM_MAP=y 200CONFIG_FLAT_NODE_MEM_MAP=y
183# CONFIG_SPARSEMEM_STATIC is not set 201# CONFIG_SPARSEMEM_STATIC is not set
202CONFIG_SPLIT_PTLOCK_CPUS=4
184CONFIG_SMP=y 203CONFIG_SMP=y
185CONFIG_NR_CPUS=2 204CONFIG_NR_CPUS=2
186CONFIG_PREEMPT_NONE=y 205CONFIG_PREEMPT_NONE=y
@@ -260,6 +279,10 @@ CONFIG_IPV6_TUNNEL=m
260# CONFIG_LLC2 is not set 279# CONFIG_LLC2 is not set
261# CONFIG_IPX is not set 280# CONFIG_IPX is not set
262# CONFIG_ATALK is not set 281# CONFIG_ATALK is not set
282
283#
284# QoS and/or fair queueing
285#
263# CONFIG_NET_SCHED is not set 286# CONFIG_NET_SCHED is not set
264# CONFIG_NET_CLS_ROUTE is not set 287# CONFIG_NET_CLS_ROUTE is not set
265 288
@@ -319,18 +342,9 @@ CONFIG_CONNECTOR=m
319# CONFIG_BLK_DEV_SX8 is not set 342# CONFIG_BLK_DEV_SX8 is not set
320# CONFIG_BLK_DEV_RAM is not set 343# CONFIG_BLK_DEV_RAM is not set
321CONFIG_BLK_DEV_RAM_COUNT=16 344CONFIG_BLK_DEV_RAM_COUNT=16
322# CONFIG_LBD is not set
323CONFIG_CDROM_PKTCDVD=m 345CONFIG_CDROM_PKTCDVD=m
324CONFIG_CDROM_PKTCDVD_BUFFERS=8 346CONFIG_CDROM_PKTCDVD_BUFFERS=8
325# CONFIG_CDROM_PKTCDVD_WCACHE is not set 347# CONFIG_CDROM_PKTCDVD_WCACHE is not set
326
327#
328# IO Schedulers
329#
330CONFIG_IOSCHED_NOOP=y
331CONFIG_IOSCHED_AS=y
332CONFIG_IOSCHED_DEADLINE=y
333CONFIG_IOSCHED_CFQ=y
334CONFIG_ATA_OVER_ETH=m 348CONFIG_ATA_OVER_ETH=m
335 349
336# 350#
@@ -382,7 +396,6 @@ CONFIG_NETDEVICES=y
382# PHY device support 396# PHY device support
383# 397#
384CONFIG_PHYLIB=m 398CONFIG_PHYLIB=m
385CONFIG_PHYCONTROL=y
386 399
387# 400#
388# MII PHY device drivers 401# MII PHY device drivers
@@ -400,6 +413,7 @@ CONFIG_NET_ETHERNET=y
400CONFIG_MII=y 413CONFIG_MII=y
401# CONFIG_HAPPYMEAL is not set 414# CONFIG_HAPPYMEAL is not set
402# CONFIG_SUNGEM is not set 415# CONFIG_SUNGEM is not set
416# CONFIG_CASSINI is not set
403# CONFIG_NET_VENDOR_3COM is not set 417# CONFIG_NET_VENDOR_3COM is not set
404 418
405# 419#
@@ -576,6 +590,10 @@ CONFIG_USB_ARCH_HAS_OHCI=y
576# CONFIG_USB is not set 590# CONFIG_USB is not set
577 591
578# 592#
593# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
594#
595
596#
579# USB Gadget Support 597# USB Gadget Support
580# 598#
581# CONFIG_USB_GADGET is not set 599# CONFIG_USB_GADGET is not set
@@ -690,6 +708,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
690# CONFIG_DEBUG_HIGHMEM is not set 708# CONFIG_DEBUG_HIGHMEM is not set
691# CONFIG_DEBUG_INFO is not set 709# CONFIG_DEBUG_INFO is not set
692# CONFIG_DEBUG_FS is not set 710# CONFIG_DEBUG_FS is not set
711# CONFIG_DEBUG_VM is not set
712# CONFIG_RCU_TORTURE_TEST is not set
693CONFIG_CROSSCOMPILE=y 713CONFIG_CROSSCOMPILE=y
694CONFIG_CMDLINE="" 714CONFIG_CMDLINE=""
695# CONFIG_DEBUG_STACK_USAGE is not set 715# CONFIG_DEBUG_STACK_USAGE is not set
diff --git a/arch/mips/ddb5xxx/ddb5477/lcd44780.c b/arch/mips/ddb5xxx/ddb5477/lcd44780.c
index 35c6c22610c5..9510b9ae6453 100644
--- a/arch/mips/ddb5xxx/ddb5477/lcd44780.c
+++ b/arch/mips/ddb5xxx/ddb5477/lcd44780.c
@@ -55,7 +55,7 @@ void lcd44780_data(unsigned char c)
55 55
56void lcd44780_puts(const char* s) 56void lcd44780_puts(const char* s)
57{ 57{
58 int i,j; 58 int j;
59 int pos = 0; 59 int pos = 0;
60 60
61 lcd44780_command(LCD44780_CLEAR); 61 lcd44780_command(LCD44780_CLEAR);
@@ -76,8 +76,12 @@ void lcd44780_puts(const char* s)
76 } 76 }
77 } 77 }
78#ifdef LCD44780_PUTS_PAUSE 78#ifdef LCD44780_PUTS_PAUSE
79 for(i = 1; i < 2000; i++) 79 {
80 lcd44780_wait(); 80 int i;
81
82 for(i = 1; i < 2000; i++)
83 lcd44780_wait();
84 }
81#endif 85#endif
82} 86}
83 87
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index 4b585e642c2a..e9086da02e48 100644
--- a/arch/mips/defconfig
+++ b/arch/mips/defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc2 3# Linux kernel version: 2.6.14
4# Thu Oct 20 22:25:09 2005 4# Thu Nov 10 12:13:58 2005
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -58,6 +58,24 @@ CONFIG_MODULE_SRCVERSION_ALL=y
58CONFIG_KMOD=y 58CONFIG_KMOD=y
59 59
60# 60#
61# Block layer
62#
63# CONFIG_LBD is not set
64
65#
66# IO Schedulers
67#
68CONFIG_IOSCHED_NOOP=y
69CONFIG_IOSCHED_AS=y
70CONFIG_IOSCHED_DEADLINE=y
71CONFIG_IOSCHED_CFQ=y
72CONFIG_DEFAULT_AS=y
73# CONFIG_DEFAULT_DEADLINE is not set
74# CONFIG_DEFAULT_CFQ is not set
75# CONFIG_DEFAULT_NOOP is not set
76CONFIG_DEFAULT_IOSCHED="anticipatory"
77
78#
61# Machine selection 79# Machine selection
62# 80#
63# CONFIG_MIPS_MTX1 is not set 81# CONFIG_MIPS_MTX1 is not set
@@ -187,6 +205,7 @@ CONFIG_FLATMEM_MANUAL=y
187CONFIG_FLATMEM=y 205CONFIG_FLATMEM=y
188CONFIG_FLAT_NODE_MEM_MAP=y 206CONFIG_FLAT_NODE_MEM_MAP=y
189# CONFIG_SPARSEMEM_STATIC is not set 207# CONFIG_SPARSEMEM_STATIC is not set
208CONFIG_SPLIT_PTLOCK_CPUS=4
190# CONFIG_PREEMPT_NONE is not set 209# CONFIG_PREEMPT_NONE is not set
191CONFIG_PREEMPT_VOLUNTARY=y 210CONFIG_PREEMPT_VOLUNTARY=y
192# CONFIG_PREEMPT is not set 211# CONFIG_PREEMPT is not set
@@ -292,6 +311,10 @@ CONFIG_INET6_TUNNEL=m
292CONFIG_IPV6_TUNNEL=m 311CONFIG_IPV6_TUNNEL=m
293CONFIG_NETFILTER=y 312CONFIG_NETFILTER=y
294# CONFIG_NETFILTER_DEBUG is not set 313# CONFIG_NETFILTER_DEBUG is not set
314
315#
316# Core Netfilter Configuration
317#
295CONFIG_NETFILTER_NETLINK=m 318CONFIG_NETFILTER_NETLINK=m
296CONFIG_NETFILTER_NETLINK_QUEUE=m 319CONFIG_NETFILTER_NETLINK_QUEUE=m
297CONFIG_NETFILTER_NETLINK_LOG=m 320CONFIG_NETFILTER_NETLINK_LOG=m
@@ -345,6 +368,7 @@ CONFIG_IP_NF_TARGET_REJECT=m
345CONFIG_IP_NF_TARGET_LOG=m 368CONFIG_IP_NF_TARGET_LOG=m
346CONFIG_IP_NF_TARGET_ULOG=m 369CONFIG_IP_NF_TARGET_ULOG=m
347CONFIG_IP_NF_TARGET_TCPMSS=m 370CONFIG_IP_NF_TARGET_TCPMSS=m
371CONFIG_IP_NF_TARGET_NFQUEUE=m
348CONFIG_IP_NF_NAT=m 372CONFIG_IP_NF_NAT=m
349CONFIG_IP_NF_NAT_NEEDED=y 373CONFIG_IP_NF_NAT_NEEDED=y
350CONFIG_IP_NF_TARGET_MASQUERADE=m 374CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -393,6 +417,7 @@ CONFIG_IP6_NF_MATCH_EUI64=m
393CONFIG_IP6_NF_FILTER=m 417CONFIG_IP6_NF_FILTER=m
394CONFIG_IP6_NF_TARGET_LOG=m 418CONFIG_IP6_NF_TARGET_LOG=m
395CONFIG_IP6_NF_TARGET_REJECT=m 419CONFIG_IP6_NF_TARGET_REJECT=m
420CONFIG_IP6_NF_TARGET_NFQUEUE=m
396CONFIG_IP6_NF_MANGLE=m 421CONFIG_IP6_NF_MANGLE=m
397CONFIG_IP6_NF_TARGET_MARK=m 422CONFIG_IP6_NF_TARGET_MARK=m
398CONFIG_IP6_NF_TARGET_HL=m 423CONFIG_IP6_NF_TARGET_HL=m
@@ -424,10 +449,18 @@ CONFIG_SCTP_HMAC_MD5=y
424CONFIG_NET_DIVERT=y 449CONFIG_NET_DIVERT=y
425# CONFIG_ECONET is not set 450# CONFIG_ECONET is not set
426# CONFIG_WAN_ROUTER is not set 451# CONFIG_WAN_ROUTER is not set
452
453#
454# QoS and/or fair queueing
455#
427CONFIG_NET_SCHED=y 456CONFIG_NET_SCHED=y
428# CONFIG_NET_SCH_CLK_JIFFIES is not set 457# CONFIG_NET_SCH_CLK_JIFFIES is not set
429CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y 458CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
430# CONFIG_NET_SCH_CLK_CPU is not set 459# CONFIG_NET_SCH_CLK_CPU is not set
460
461#
462# Queueing/Scheduling
463#
431CONFIG_NET_SCH_CBQ=m 464CONFIG_NET_SCH_CBQ=m
432CONFIG_NET_SCH_HTB=m 465CONFIG_NET_SCH_HTB=m
433CONFIG_NET_SCH_HFSC=m 466CONFIG_NET_SCH_HFSC=m
@@ -440,8 +473,10 @@ CONFIG_NET_SCH_GRED=m
440CONFIG_NET_SCH_DSMARK=m 473CONFIG_NET_SCH_DSMARK=m
441CONFIG_NET_SCH_NETEM=m 474CONFIG_NET_SCH_NETEM=m
442CONFIG_NET_SCH_INGRESS=m 475CONFIG_NET_SCH_INGRESS=m
443CONFIG_NET_QOS=y 476
444CONFIG_NET_ESTIMATOR=y 477#
478# Classification
479#
445CONFIG_NET_CLS=y 480CONFIG_NET_CLS=y
446CONFIG_NET_CLS_BASIC=m 481CONFIG_NET_CLS_BASIC=m
447CONFIG_NET_CLS_TCINDEX=m 482CONFIG_NET_CLS_TCINDEX=m
@@ -450,13 +485,14 @@ CONFIG_NET_CLS_ROUTE=y
450CONFIG_NET_CLS_FW=m 485CONFIG_NET_CLS_FW=m
451CONFIG_NET_CLS_U32=m 486CONFIG_NET_CLS_U32=m
452# CONFIG_CLS_U32_PERF is not set 487# CONFIG_CLS_U32_PERF is not set
453# CONFIG_NET_CLS_IND is not set
454# CONFIG_CLS_U32_MARK is not set 488# CONFIG_CLS_U32_MARK is not set
455CONFIG_NET_CLS_RSVP=m 489CONFIG_NET_CLS_RSVP=m
456CONFIG_NET_CLS_RSVP6=m 490CONFIG_NET_CLS_RSVP6=m
457# CONFIG_NET_EMATCH is not set 491# CONFIG_NET_EMATCH is not set
458# CONFIG_NET_CLS_ACT is not set 492# CONFIG_NET_CLS_ACT is not set
459CONFIG_NET_CLS_POLICE=y 493CONFIG_NET_CLS_POLICE=y
494# CONFIG_NET_CLS_IND is not set
495CONFIG_NET_ESTIMATOR=y
460 496
461# 497#
462# Network testing 498# Network testing
@@ -509,18 +545,9 @@ CONFIG_CONNECTOR=m
509# CONFIG_BLK_DEV_NBD is not set 545# CONFIG_BLK_DEV_NBD is not set
510# CONFIG_BLK_DEV_RAM is not set 546# CONFIG_BLK_DEV_RAM is not set
511CONFIG_BLK_DEV_RAM_COUNT=16 547CONFIG_BLK_DEV_RAM_COUNT=16
512# CONFIG_LBD is not set
513CONFIG_CDROM_PKTCDVD=m 548CONFIG_CDROM_PKTCDVD=m
514CONFIG_CDROM_PKTCDVD_BUFFERS=8 549CONFIG_CDROM_PKTCDVD_BUFFERS=8
515# CONFIG_CDROM_PKTCDVD_WCACHE is not set 550# CONFIG_CDROM_PKTCDVD_WCACHE is not set
516
517#
518# IO Schedulers
519#
520CONFIG_IOSCHED_NOOP=y
521CONFIG_IOSCHED_AS=y
522CONFIG_IOSCHED_DEADLINE=y
523CONFIG_IOSCHED_CFQ=y
524CONFIG_ATA_OVER_ETH=m 551CONFIG_ATA_OVER_ETH=m
525 552
526# 553#
@@ -564,6 +591,7 @@ CONFIG_SCSI_SAS_ATTRS=m
564# 591#
565# SCSI low-level drivers 592# SCSI low-level drivers
566# 593#
594CONFIG_ISCSI_TCP=m
567CONFIG_SGIWD93_SCSI=y 595CONFIG_SGIWD93_SCSI=y
568# CONFIG_SCSI_SATA is not set 596# CONFIG_SCSI_SATA is not set
569# CONFIG_SCSI_DEBUG is not set 597# CONFIG_SCSI_DEBUG is not set
@@ -599,7 +627,6 @@ CONFIG_TUN=m
599# PHY device support 627# PHY device support
600# 628#
601CONFIG_PHYLIB=m 629CONFIG_PHYLIB=m
602CONFIG_PHYCONTROL=y
603 630
604# 631#
605# MII PHY device drivers 632# MII PHY device drivers
@@ -752,6 +779,7 @@ CONFIG_MAX_RAW_DEVS=256
752# 779#
753# TPM devices 780# TPM devices
754# 781#
782# CONFIG_TELCLOCK is not set
755 783
756# 784#
757# I2C support 785# I2C support
@@ -821,6 +849,10 @@ CONFIG_LOGO_SGI_CLUT224=y
821# CONFIG_USB_ARCH_HAS_OHCI is not set 849# CONFIG_USB_ARCH_HAS_OHCI is not set
822 850
823# 851#
852# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
853#
854
855#
824# USB Gadget Support 856# USB Gadget Support
825# 857#
826# CONFIG_USB_GADGET is not set 858# CONFIG_USB_GADGET is not set
@@ -856,7 +888,7 @@ CONFIG_FS_MBCACHE=y
856CONFIG_FS_POSIX_ACL=y 888CONFIG_FS_POSIX_ACL=y
857CONFIG_XFS_FS=m 889CONFIG_XFS_FS=m
858CONFIG_XFS_EXPORT=y 890CONFIG_XFS_EXPORT=y
859CONFIG_XFS_QUOTA=m 891CONFIG_XFS_QUOTA=y
860CONFIG_XFS_SECURITY=y 892CONFIG_XFS_SECURITY=y
861# CONFIG_XFS_POSIX_ACL is not set 893# CONFIG_XFS_POSIX_ACL is not set
862# CONFIG_XFS_RT is not set 894# CONFIG_XFS_RT is not set
diff --git a/arch/mips/jmr3927/common/rtc_ds1742.c b/arch/mips/jmr3927/common/rtc_ds1742.c
index 8b407d7dc460..9a8bff153d80 100644
--- a/arch/mips/jmr3927/common/rtc_ds1742.c
+++ b/arch/mips/jmr3927/common/rtc_ds1742.c
@@ -41,11 +41,11 @@
41#include <linux/types.h> 41#include <linux/types.h>
42#include <linux/time.h> 42#include <linux/time.h>
43#include <linux/rtc.h> 43#include <linux/rtc.h>
44#include <linux/ds1742rtc.h>
44 45
45#include <asm/time.h> 46#include <asm/time.h>
46#include <asm/addrspace.h> 47#include <asm/addrspace.h>
47 48
48#include <asm/jmr3927/ds1742rtc.h>
49#include <asm/debug.h> 49#include <asm/debug.h>
50 50
51#define EPOCH 2000 51#define EPOCH 2000
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index 3e2fbdc66097..55ad0a578794 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -357,7 +357,7 @@ static void __init jmr3927_board_init(void)
357 jmr3927_io_dipsw()); 357 jmr3927_io_dipsw());
358} 358}
359 359
360void __init plat_setup(void) 360void __init tx3927_setup(void)
361{ 361{
362 int i; 362 int i;
363 363
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c
index e1dd7e009750..90fda0d9915f 100644
--- a/arch/mips/mips-boards/sead/sead_int.c
+++ b/arch/mips/mips-boards/sead/sead_int.c
@@ -30,19 +30,9 @@
30 30
31extern asmlinkage void mipsIRQ(void); 31extern asmlinkage void mipsIRQ(void);
32 32
33asmlinkage void sead_hw0_irqdispatch(struct pt_regs *regs)
34{
35 do_IRQ(SEADINT_UART0, regs);
36}
37
38asmlinkage void sead_hw1_irqdispatch(struct pt_regs *regs)
39{
40 do_IRQ(SEADINT_UART1, regs);
41}
42
43void __init arch_init_irq(void) 33void __init arch_init_irq(void)
44{ 34{
45 mips_cpu_irq_init(0); 35 mips_cpu_irq_init(MIPSCPU_INT_BASE);
46 36
47 /* Now safe to set the exception vector. */ 37 /* Now safe to set the exception vector. */
48 set_except_vector(0, mipsIRQ); 38 set_except_vector(0, mipsIRQ);
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index de90bec5505e..f966bc161dfa 100644
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -45,7 +45,7 @@ const char *get_system_type(void)
45 return "MIPS SEAD"; 45 return "MIPS SEAD";
46} 46}
47 47
48static void __init sead_setup(void) 48void __init plat_setup(void)
49{ 49{
50 ioport_resource.end = 0x7fffffff; 50 ioport_resource.end = 0x7fffffff;
51 51
@@ -69,7 +69,7 @@ static void __init serial_init(void)
69#else 69#else
70 s.iobase = SEAD_UART0_REGS_BASE+3; 70 s.iobase = SEAD_UART0_REGS_BASE+3;
71#endif 71#endif
72 s.irq = SEADINT_UART0; 72 s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0;
73 s.uartclk = SEAD_BASE_BAUD * 16; 73 s.uartclk = SEAD_BASE_BAUD * 16;
74 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; 74 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
75 s.iotype = 0; 75 s.iotype = 0;
diff --git a/arch/mips/momentum/ocelot_g/gt-irq.c b/arch/mips/momentum/ocelot_g/gt-irq.c
index d0b5c9dd0ea4..e5eceed1beff 100644
--- a/arch/mips/momentum/ocelot_g/gt-irq.c
+++ b/arch/mips/momentum/ocelot_g/gt-irq.c
@@ -178,7 +178,7 @@ void gt64240_time_init(void)
178 timer.name = "timer"; 178 timer.name = "timer";
179 timer.dev_id = NULL; 179 timer.dev_id = NULL;
180 timer.next = NULL; 180 timer.next = NULL;
181 timer.mask = 0; 181 timer.mask = CPU_MASK_NONE;
182 irq_desc[6].action = &timer; 182 irq_desc[6].action = &timer;
183 183
184 enable_irq(6); 184 enable_irq(6);
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 7b7468304022..741e67c9195a 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_MIPS_GT96100) += ops-gt96100.o
15obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o 15obj-$(CONFIG_PCI_MARVELL) += ops-marvell.o
16obj-$(CONFIG_MIPS_MSC) += ops-msc.o 16obj-$(CONFIG_MIPS_MSC) += ops-msc.o
17obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o 17obj-$(CONFIG_MIPS_NILE4) += ops-nile4.o
18obj-$(CONFIG_MIPS_TX3927) += ops-jmr3927.o 18obj-$(CONFIG_MIPS_TX3927) += ops-tx3927.o
19obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o 19obj-$(CONFIG_PCI_VR41XX) += ops-vr41xx.o pci-vr41xx.o
20obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o 20obj-$(CONFIG_NEC_CMBVR4133) += fixup-vr4133.o
21 21
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c
index 0e0daadc303d..42530a0b84b3 100644
--- a/arch/mips/pci/ops-tx3927.c
+++ b/arch/mips/pci/ops-tx3927.c
@@ -72,13 +72,9 @@ static inline int check_abort(void)
72static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn, 72static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
73 int where, int size, u32 * val) 73 int where, int size, u32 * val)
74{ 74{
75 int ret, busno; 75 int ret;
76 76
77 /* check if the bus is top-level */ 77 ret = mkaddr(bus->number, devfn, where);
78 if (bus->parent != NULL)
79 busno = bus->number;
80
81 ret = mkaddr(busno, devfn, where);
82 if (ret) 78 if (ret)
83 return ret; 79 return ret;
84 80
@@ -102,15 +98,9 @@ static int jmr3927_pci_read_config(struct pci_bus *bus, unsigned int devfn,
102static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn, 98static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
103 int where, int size, u32 val) 99 int where, int size, u32 val)
104{ 100{
105 int ret, busno; 101 int ret;
106
107 /* check if the bus is top-level */
108 if (bus->parent != NULL)
109 bus = bus->number;
110 else
111 bus = 0;
112 102
113 ret = mkaddr(busno, devfn, where); 103 ret = mkaddr(bus->number, devfn, where);
114 if (ret) 104 if (ret)
115 return ret; 105 return ret;
116 106
@@ -120,7 +110,7 @@ static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
120 break; 110 break;
121 111
122 case 2: 112 case 2:
123 *(volatile u16 *) (unsigned longulong) & tx3927_pcicptr->icd | (where & 2)) = 113 *(volatile u16 *) ((unsigned long) & tx3927_pcicptr->icd | (where & 2)) =
124 cpu_to_le16(val); 114 cpu_to_le16(val);
125 break; 115 break;
126 116
@@ -137,8 +127,8 @@ static int jmr3927_pci_write_config(struct pci_bus *bus, unsigned int devfn,
137} 127}
138 128
139struct pci_ops jmr3927_pci_ops = { 129struct pci_ops jmr3927_pci_ops = {
140 jmr3927_pcibios_read_config, 130 jmr3927_pci_read_config,
141 jmr3927_pcibios_write_config, 131 jmr3927_pci_write_config,
142}; 132};
143 133
144 134
@@ -159,15 +149,14 @@ unsigned long tc_readl(volatile __u32 * addr)
159{ 149{
160 unsigned long val; 150 unsigned long val;
161 151
162 addr = PHYSADDR(addr); 152 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
163 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 153 (unsigned long) CPHYSADDR(addr);
164 (unsigned long) addr; 154 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
165 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe =
166 (PCI_IPCIBE_ICMD_MEMREAD << PCI_IPCIBE_ICMD_SHIFT) | 155 (PCI_IPCIBE_ICMD_MEMREAD << PCI_IPCIBE_ICMD_SHIFT) |
167 PCI_IPCIBE_IBE_LONG; 156 PCI_IPCIBE_IBE_LONG;
168 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 157 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
169 val = 158 val =
170 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 159 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
171 ipcidata); 160 ipcidata);
172 /* clear by setting */ 161 /* clear by setting */
173 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC; 162 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
@@ -176,12 +165,11 @@ unsigned long tc_readl(volatile __u32 * addr)
176 165
177void tc_writel(unsigned long data, volatile __u32 * addr) 166void tc_writel(unsigned long data, volatile __u32 * addr)
178{ 167{
179 addr = PHYSADDR(addr); 168 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata =
180 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata =
181 cpu_to_le32(data); 169 cpu_to_le32(data);
182 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 170 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
183 (unsigned long) addr; 171 (unsigned long) CPHYSADDR(addr);
184 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 172 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
185 (PCI_IPCIBE_ICMD_MEMWRITE << PCI_IPCIBE_ICMD_SHIFT) | 173 (PCI_IPCIBE_ICMD_MEMWRITE << PCI_IPCIBE_ICMD_SHIFT) |
186 PCI_IPCIBE_IBE_LONG; 174 PCI_IPCIBE_IBE_LONG;
187 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 175 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
@@ -198,21 +186,15 @@ unsigned char tx_ioinb(unsigned char *addr)
198 186
199 ioaddr = (unsigned long) addr; 187 ioaddr = (unsigned long) addr;
200 offset = ioaddr & 0x3; 188 offset = ioaddr & 0x3;
201 if (offset == 0) 189 byte = 0xf & ~(8 >> offset);
202 byte = 0x7; 190
203 else if (offset == 1) 191 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
204 byte = 0xb;
205 else if (offset == 2)
206 byte = 0xd;
207 else if (offset == 3)
208 byte = 0xe;
209 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
210 (unsigned long) ioaddr; 192 (unsigned long) ioaddr;
211 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 193 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
212 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte; 194 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte;
213 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 195 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
214 val = 196 val =
215 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 197 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
216 ipcidata); 198 ipcidata);
217 val = val & 0xff; 199 val = val & 0xff;
218 /* clear by setting */ 200 /* clear by setting */
@@ -229,18 +211,12 @@ void tx_iooutb(unsigned long data, unsigned char *addr)
229 data = data | (data << 8) | (data << 16) | (data << 24); 211 data = data | (data << 8) | (data << 16) | (data << 24);
230 ioaddr = (unsigned long) addr; 212 ioaddr = (unsigned long) addr;
231 offset = ioaddr & 0x3; 213 offset = ioaddr & 0x3;
232 if (offset == 0) 214 byte = 0xf & ~(8 >> offset);
233 byte = 0x7; 215
234 else if (offset == 1) 216 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata = data;
235 byte = 0xb; 217 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
236 else if (offset == 2)
237 byte = 0xd;
238 else if (offset == 3)
239 byte = 0xe;
240 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata = data;
241 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
242 (unsigned long) ioaddr; 218 (unsigned long) ioaddr;
243 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 219 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
244 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte; 220 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte;
245 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 221 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
246 /* clear by setting */ 222 /* clear by setting */
@@ -255,18 +231,16 @@ unsigned short tx_ioinw(unsigned short *addr)
255 int byte; 231 int byte;
256 232
257 ioaddr = (unsigned long) addr; 233 ioaddr = (unsigned long) addr;
258 offset = ioaddr & 0x3; 234 offset = ioaddr & 0x2;
259 if (offset == 0) 235 byte = 3 << offset;
260 byte = 0x3; 236
261 else if (offset == 2) 237 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
262 byte = 0xc;
263 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
264 (unsigned long) ioaddr; 238 (unsigned long) ioaddr;
265 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 239 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
266 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte; 240 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | byte;
267 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 241 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
268 val = 242 val =
269 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 243 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
270 ipcidata); 244 ipcidata);
271 val = val & 0xffff; 245 val = val & 0xffff;
272 /* clear by setting */ 246 /* clear by setting */
@@ -283,15 +257,13 @@ void tx_iooutw(unsigned long data, unsigned short *addr)
283 257
284 data = data | (data << 16); 258 data = data | (data << 16);
285 ioaddr = (unsigned long) addr; 259 ioaddr = (unsigned long) addr;
286 offset = ioaddr & 0x3; 260 offset = ioaddr & 0x2;
287 if (offset == 0) 261 byte = 3 << offset;
288 byte = 0x3; 262
289 else if (offset == 2) 263 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata = data;
290 byte = 0xc; 264 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
291 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata = data;
292 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr =
293 (unsigned long) ioaddr; 265 (unsigned long) ioaddr;
294 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 266 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
295 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte; 267 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | byte;
296 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 268 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
297 /* clear by setting */ 269 /* clear by setting */
@@ -304,14 +276,14 @@ unsigned long tx_ioinl(unsigned int *addr)
304 __u32 ioaddr; 276 __u32 ioaddr;
305 277
306 ioaddr = (unsigned long) addr; 278 ioaddr = (unsigned long) addr;
307 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 279 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
308 (unsigned long) ioaddr; 280 (unsigned long) ioaddr;
309 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 281 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
310 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) | 282 (PCI_IPCIBE_ICMD_IOREAD << PCI_IPCIBE_ICMD_SHIFT) |
311 PCI_IPCIBE_IBE_LONG; 283 PCI_IPCIBE_IBE_LONG;
312 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 284 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
313 val = 285 val =
314 le32_to_cpu(*(volatile u32 *) (ulong) & tx3927_pcicptr-> 286 le32_to_cpu(*(volatile u32 *) (unsigned long) & tx3927_pcicptr->
315 ipcidata); 287 ipcidata);
316 /* clear by setting */ 288 /* clear by setting */
317 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC; 289 tx3927_pcicptr->istat |= PCI_ISTAT_IDICC;
@@ -323,11 +295,11 @@ void tx_iooutl(unsigned long data, unsigned int *addr)
323 __u32 ioaddr; 295 __u32 ioaddr;
324 296
325 ioaddr = (unsigned long) addr; 297 ioaddr = (unsigned long) addr;
326 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcidata = 298 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcidata =
327 cpu_to_le32(data); 299 cpu_to_le32(data);
328 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipciaddr = 300 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipciaddr =
329 (unsigned long) ioaddr; 301 (unsigned long) ioaddr;
330 *(volatile u32 *) (ulong) & tx3927_pcicptr->ipcibe = 302 *(volatile u32 *) (unsigned long) & tx3927_pcicptr->ipcibe =
331 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) | 303 (PCI_IPCIBE_ICMD_IOWRITE << PCI_IPCIBE_ICMD_SHIFT) |
332 PCI_IPCIBE_IBE_LONG; 304 PCI_IPCIBE_IBE_LONG;
333 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC)); 305 while (!(tx3927_pcicptr->istat & PCI_ISTAT_IDICC));
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c
index 95a028769e56..f02ef6e36b02 100644
--- a/arch/mips/pci/pci-jmr3927.c
+++ b/arch/mips/pci/pci-jmr3927.c
@@ -54,5 +54,5 @@ struct pci_controller jmr3927_controller = {
54 .pci_ops = &jmr3927_pci_ops, 54 .pci_ops = &jmr3927_pci_ops,
55 .io_resource = &pci_io_resource, 55 .io_resource = &pci_io_resource,
56 .mem_resource = &pci_mem_resource, 56 .mem_resource = &pci_mem_resource,
57 .mem_offset = JMR3927_PCIMEM; 57 .mem_offset = JMR3927_PCIMEM
58}; 58};
diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c
index eb3a16a04fee..41b5eca1148c 100644
--- a/arch/mips/sgi-ip32/crime.c
+++ b/arch/mips/sgi-ip32/crime.c
@@ -10,6 +10,7 @@
10#include <linux/init.h> 10#include <linux/init.h>
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/interrupt.h> 12#include <linux/interrupt.h>
13#include <linux/module.h>
13#include <asm/bootinfo.h> 14#include <asm/bootinfo.h>
14#include <asm/io.h> 15#include <asm/io.h>
15#include <asm/mipsregs.h> 16#include <asm/mipsregs.h>
@@ -18,8 +19,10 @@
18#include <asm/ip32/crime.h> 19#include <asm/ip32/crime.h>
19#include <asm/ip32/mace.h> 20#include <asm/ip32/mace.h>
20 21
21struct sgi_crime *crime; 22struct sgi_crime __iomem *crime;
22struct sgi_mace *mace; 23struct sgi_mace __iomem *mace;
24
25EXPORT_SYMBOL_GPL(mace);
23 26
24void __init crime_init(void) 27void __init crime_init(void)
25{ 28{
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c
index 988844a169e6..d016d672ec2b 100644
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
@@ -499,8 +499,12 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
499 499
500 dev = create_parisc_device(mod_path); 500 dev = create_parisc_device(mod_path);
501 if (dev->id.hw_type != HPHW_FAULTY) { 501 if (dev->id.hw_type != HPHW_FAULTY) {
502 printk("Two devices have hardware path %s. Please file a bug with HP.\n" 502 printk(KERN_ERR "Two devices have hardware path [%s]. "
503 "In the meantime, you could try rearranging your cards.\n", parisc_pathname(dev)); 503 "IODC data for second device: "
504 "%02x%02x%02x%02x%02x%02x\n"
505 "Rearranging GSC cards sometimes helps\n",
506 parisc_pathname(dev), iodc_data[0], iodc_data[1],
507 iodc_data[3], iodc_data[4], iodc_data[5], iodc_data[6]);
504 return NULL; 508 return NULL;
505 } 509 }
506 510
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index c7e66ee5b083..9af4b22a6d77 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -1846,6 +1846,7 @@ sys_clone_wrapper:
1846 ldo -16(%r30),%r29 /* Reference param save area */ 1846 ldo -16(%r30),%r29 /* Reference param save area */
1847#endif 1847#endif
1848 1848
1849 /* WARNING - Clobbers r19 and r21, userspace must save these! */
1849 STREG %r2,PT_GR19(%r1) /* save for child */ 1850 STREG %r2,PT_GR19(%r1) /* save for child */
1850 STREG %r30,PT_GR21(%r1) 1851 STREG %r30,PT_GR21(%r1)
1851 BL sys_clone,%r2 1852 BL sys_clone,%r2
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c
index 1a1c66422736..8f563871e83c 100644
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
@@ -188,7 +188,7 @@ pat_query_module(ulong pcell_loc, ulong mod_index)
188 temp = pa_pdc_cell.cba; 188 temp = pa_pdc_cell.cba;
189 dev = alloc_pa_dev(PAT_GET_CBA(temp), &pa_pdc_cell.mod_path); 189 dev = alloc_pa_dev(PAT_GET_CBA(temp), &pa_pdc_cell.mod_path);
190 if (!dev) { 190 if (!dev) {
191 return PDC_NE_MOD; 191 return PDC_OK;
192 } 192 }
193 193
194 /* alloc_pa_dev sets dev->hpa */ 194 /* alloc_pa_dev sets dev->hpa */
diff --git a/arch/parisc/kernel/ioctl32.c b/arch/parisc/kernel/ioctl32.c
index 0a331104ad56..4eada1bb27f0 100644
--- a/arch/parisc/kernel/ioctl32.c
+++ b/arch/parisc/kernel/ioctl32.c
@@ -19,536 +19,6 @@
19#define CODE 19#define CODE
20#include "compat_ioctl.c" 20#include "compat_ioctl.c"
21 21
22/* Use this to get at 32-bit user passed pointers.
23 See sys_sparc32.c for description about these. */
24#define A(__x) ((unsigned long)(__x))
25/* The same for use with copy_from_user() and copy_to_user(). */
26#define B(__x) ((void *)(unsigned long)(__x))
27
28#if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE)
29/* This really belongs in include/linux/drm.h -DaveM */
30#include "../../../drivers/char/drm/drm.h"
31
32typedef struct drm32_version {
33 int version_major; /* Major version */
34 int version_minor; /* Minor version */
35 int version_patchlevel;/* Patch level */
36 int name_len; /* Length of name buffer */
37 u32 name; /* Name of driver */
38 int date_len; /* Length of date buffer */
39 u32 date; /* User-space buffer to hold date */
40 int desc_len; /* Length of desc buffer */
41 u32 desc; /* User-space buffer to hold desc */
42} drm32_version_t;
43#define DRM32_IOCTL_VERSION DRM_IOWR(0x00, drm32_version_t)
44
45static int drm32_version(unsigned int fd, unsigned int cmd, unsigned long arg)
46{
47 drm32_version_t *uversion = (drm32_version_t *)arg;
48 char *name_ptr, *date_ptr, *desc_ptr;
49 u32 tmp1, tmp2, tmp3;
50 drm_version_t kversion;
51 mm_segment_t old_fs;
52 int ret;
53
54 memset(&kversion, 0, sizeof(kversion));
55 if (get_user(kversion.name_len, &uversion->name_len) ||
56 get_user(kversion.date_len, &uversion->date_len) ||
57 get_user(kversion.desc_len, &uversion->desc_len) ||
58 get_user(tmp1, &uversion->name) ||
59 get_user(tmp2, &uversion->date) ||
60 get_user(tmp3, &uversion->desc))
61 return -EFAULT;
62
63 name_ptr = (char *) A(tmp1);
64 date_ptr = (char *) A(tmp2);
65 desc_ptr = (char *) A(tmp3);
66
67 ret = -ENOMEM;
68 if (kversion.name_len && name_ptr) {
69 kversion.name = kmalloc(kversion.name_len, GFP_KERNEL);
70 if (!kversion.name)
71 goto out;
72 }
73 if (kversion.date_len && date_ptr) {
74 kversion.date = kmalloc(kversion.date_len, GFP_KERNEL);
75 if (!kversion.date)
76 goto out;
77 }
78 if (kversion.desc_len && desc_ptr) {
79 kversion.desc = kmalloc(kversion.desc_len, GFP_KERNEL);
80 if (!kversion.desc)
81 goto out;
82 }
83
84 old_fs = get_fs();
85 set_fs(KERNEL_DS);
86 ret = sys_ioctl (fd, DRM_IOCTL_VERSION, (unsigned long)&kversion);
87 set_fs(old_fs);
88
89 if (!ret) {
90 if ((kversion.name &&
91 copy_to_user(name_ptr, kversion.name, kversion.name_len)) ||
92 (kversion.date &&
93 copy_to_user(date_ptr, kversion.date, kversion.date_len)) ||
94 (kversion.desc &&
95 copy_to_user(desc_ptr, kversion.desc, kversion.desc_len)))
96 ret = -EFAULT;
97 if (put_user(kversion.version_major, &uversion->version_major) ||
98 put_user(kversion.version_minor, &uversion->version_minor) ||
99 put_user(kversion.version_patchlevel, &uversion->version_patchlevel) ||
100 put_user(kversion.name_len, &uversion->name_len) ||
101 put_user(kversion.date_len, &uversion->date_len) ||
102 put_user(kversion.desc_len, &uversion->desc_len))
103 ret = -EFAULT;
104 }
105
106out:
107 kfree(kversion.name);
108 kfree(kversion.date);
109 kfree(kversion.desc);
110 return ret;
111}
112
113typedef struct drm32_unique {
114 int unique_len; /* Length of unique */
115 u32 unique; /* Unique name for driver instantiation */
116} drm32_unique_t;
117#define DRM32_IOCTL_GET_UNIQUE DRM_IOWR(0x01, drm32_unique_t)
118#define DRM32_IOCTL_SET_UNIQUE DRM_IOW( 0x10, drm32_unique_t)
119
120static int drm32_getsetunique(unsigned int fd, unsigned int cmd, unsigned long arg)
121{
122 drm32_unique_t *uarg = (drm32_unique_t *)arg;
123 drm_unique_t karg;
124 mm_segment_t old_fs;
125 char *uptr;
126 u32 tmp;
127 int ret;
128
129 if (get_user(karg.unique_len, &uarg->unique_len))
130 return -EFAULT;
131 karg.unique = NULL;
132
133 if (get_user(tmp, &uarg->unique))
134 return -EFAULT;
135
136 uptr = (char *) A(tmp);
137
138 if (uptr) {
139 karg.unique = kmalloc(karg.unique_len, GFP_KERNEL);
140 if (!karg.unique)
141 return -ENOMEM;
142 if (cmd == DRM32_IOCTL_SET_UNIQUE &&
143 copy_from_user(karg.unique, uptr, karg.unique_len)) {
144 kfree(karg.unique);
145 return -EFAULT;
146 }
147 }
148
149 old_fs = get_fs();
150 set_fs(KERNEL_DS);
151 if (cmd == DRM32_IOCTL_GET_UNIQUE)
152 ret = sys_ioctl (fd, DRM_IOCTL_GET_UNIQUE, (unsigned long)&karg);
153 else
154 ret = sys_ioctl (fd, DRM_IOCTL_SET_UNIQUE, (unsigned long)&karg);
155 set_fs(old_fs);
156
157 if (!ret) {
158 if (cmd == DRM32_IOCTL_GET_UNIQUE &&
159 uptr != NULL &&
160 copy_to_user(uptr, karg.unique, karg.unique_len))
161 ret = -EFAULT;
162 if (put_user(karg.unique_len, &uarg->unique_len))
163 ret = -EFAULT;
164 }
165
166 kfree(karg.unique);
167 return ret;
168}
169
170typedef struct drm32_map {
171 u32 offset; /* Requested physical address (0 for SAREA)*/
172 u32 size; /* Requested physical size (bytes) */
173 drm_map_type_t type; /* Type of memory to map */
174 drm_map_flags_t flags; /* Flags */
175 u32 handle; /* User-space: "Handle" to pass to mmap */
176 /* Kernel-space: kernel-virtual address */
177 int mtrr; /* MTRR slot used */
178 /* Private data */
179} drm32_map_t;
180#define DRM32_IOCTL_ADD_MAP DRM_IOWR(0x15, drm32_map_t)
181
182static int drm32_addmap(unsigned int fd, unsigned int cmd, unsigned long arg)
183{
184 drm32_map_t *uarg = (drm32_map_t *) arg;
185 drm_map_t karg;
186 mm_segment_t old_fs;
187 u32 tmp;
188 int ret;
189
190 ret = get_user(karg.offset, &uarg->offset);
191 ret |= get_user(karg.size, &uarg->size);
192 ret |= get_user(karg.type, &uarg->type);
193 ret |= get_user(karg.flags, &uarg->flags);
194 ret |= get_user(tmp, &uarg->handle);
195 ret |= get_user(karg.mtrr, &uarg->mtrr);
196 if (ret)
197 return -EFAULT;
198
199 karg.handle = (void *) A(tmp);
200
201 old_fs = get_fs();
202 set_fs(KERNEL_DS);
203 ret = sys_ioctl(fd, DRM_IOCTL_ADD_MAP, (unsigned long) &karg);
204 set_fs(old_fs);
205
206 if (!ret) {
207 ret = put_user(karg.offset, &uarg->offset);
208 ret |= put_user(karg.size, &uarg->size);
209 ret |= put_user(karg.type, &uarg->type);
210 ret |= put_user(karg.flags, &uarg->flags);
211 tmp = (u32) (long)karg.handle;
212 ret |= put_user(tmp, &uarg->handle);
213 ret |= put_user(karg.mtrr, &uarg->mtrr);
214 if (ret)
215 ret = -EFAULT;
216 }
217
218 return ret;
219}
220
221typedef struct drm32_buf_info {
222 int count; /* Entries in list */
223 u32 list; /* (drm_buf_desc_t *) */
224} drm32_buf_info_t;
225#define DRM32_IOCTL_INFO_BUFS DRM_IOWR(0x18, drm32_buf_info_t)
226
227static int drm32_info_bufs(unsigned int fd, unsigned int cmd, unsigned long arg)
228{
229 drm32_buf_info_t *uarg = (drm32_buf_info_t *)arg;
230 drm_buf_desc_t *ulist;
231 drm_buf_info_t karg;
232 mm_segment_t old_fs;
233 int orig_count, ret;
234 u32 tmp;
235
236 if (get_user(karg.count, &uarg->count) ||
237 get_user(tmp, &uarg->list))
238 return -EFAULT;
239
240 ulist = (drm_buf_desc_t *) A(tmp);
241
242 orig_count = karg.count;
243
244 karg.list = kmalloc(karg.count * sizeof(drm_buf_desc_t), GFP_KERNEL);
245 if (!karg.list)
246 return -EFAULT;
247
248 old_fs = get_fs();
249 set_fs(KERNEL_DS);
250 ret = sys_ioctl(fd, DRM_IOCTL_INFO_BUFS, (unsigned long) &karg);
251 set_fs(old_fs);
252
253 if (!ret) {
254 if (karg.count <= orig_count &&
255 (copy_to_user(ulist, karg.list,
256 karg.count * sizeof(drm_buf_desc_t))))
257 ret = -EFAULT;
258 if (put_user(karg.count, &uarg->count))
259 ret = -EFAULT;
260 }
261
262 kfree(karg.list);
263 return ret;
264}
265
266typedef struct drm32_buf_free {
267 int count;
268 u32 list; /* (int *) */
269} drm32_buf_free_t;
270#define DRM32_IOCTL_FREE_BUFS DRM_IOW( 0x1a, drm32_buf_free_t)
271
272static int drm32_free_bufs(unsigned int fd, unsigned int cmd, unsigned long arg)
273{
274 drm32_buf_free_t *uarg = (drm32_buf_free_t *)arg;
275 drm_buf_free_t karg;
276 mm_segment_t old_fs;
277 int *ulist;
278 int ret;
279 u32 tmp;
280
281 if (get_user(karg.count, &uarg->count) ||
282 get_user(tmp, &uarg->list))
283 return -EFAULT;
284
285 ulist = (int *) A(tmp);
286
287 karg.list = kmalloc(karg.count * sizeof(int), GFP_KERNEL);
288 if (!karg.list)
289 return -ENOMEM;
290
291 ret = -EFAULT;
292 if (copy_from_user(karg.list, ulist, (karg.count * sizeof(int))))
293 goto out;
294
295 old_fs = get_fs();
296 set_fs(KERNEL_DS);
297 ret = sys_ioctl(fd, DRM_IOCTL_FREE_BUFS, (unsigned long) &karg);
298 set_fs(old_fs);
299
300out:
301 kfree(karg.list);
302 return ret;
303}
304
305typedef struct drm32_buf_pub {
306 int idx; /* Index into master buflist */
307 int total; /* Buffer size */
308 int used; /* Amount of buffer in use (for DMA) */
309 u32 address; /* Address of buffer (void *) */
310} drm32_buf_pub_t;
311
312typedef struct drm32_buf_map {
313 int count; /* Length of buflist */
314 u32 virtual; /* Mmaped area in user-virtual (void *) */
315 u32 list; /* Buffer information (drm_buf_pub_t *) */
316} drm32_buf_map_t;
317#define DRM32_IOCTL_MAP_BUFS DRM_IOWR(0x19, drm32_buf_map_t)
318
319static int drm32_map_bufs(unsigned int fd, unsigned int cmd, unsigned long arg)
320{
321 drm32_buf_map_t *uarg = (drm32_buf_map_t *)arg;
322 drm32_buf_pub_t *ulist;
323 drm_buf_map_t karg;
324 mm_segment_t old_fs;
325 int orig_count, ret, i;
326 u32 tmp1, tmp2;
327
328 if (get_user(karg.count, &uarg->count) ||
329 get_user(tmp1, &uarg->virtual) ||
330 get_user(tmp2, &uarg->list))
331 return -EFAULT;
332
333 karg.virtual = (void *) A(tmp1);
334 ulist = (drm32_buf_pub_t *) A(tmp2);
335
336 orig_count = karg.count;
337
338 karg.list = kmalloc(karg.count * sizeof(drm_buf_pub_t), GFP_KERNEL);
339 if (!karg.list)
340 return -ENOMEM;
341
342 ret = -EFAULT;
343 for (i = 0; i < karg.count; i++) {
344 if (get_user(karg.list[i].idx, &ulist[i].idx) ||
345 get_user(karg.list[i].total, &ulist[i].total) ||
346 get_user(karg.list[i].used, &ulist[i].used) ||
347 get_user(tmp1, &ulist[i].address))
348 goto out;
349
350 karg.list[i].address = (void *) A(tmp1);
351 }
352
353 old_fs = get_fs();
354 set_fs(KERNEL_DS);
355 ret = sys_ioctl(fd, DRM_IOCTL_MAP_BUFS, (unsigned long) &karg);
356 set_fs(old_fs);
357
358 if (!ret) {
359 for (i = 0; i < orig_count; i++) {
360 tmp1 = (u32) (long) karg.list[i].address;
361 if (put_user(karg.list[i].idx, &ulist[i].idx) ||
362 put_user(karg.list[i].total, &ulist[i].total) ||
363 put_user(karg.list[i].used, &ulist[i].used) ||
364 put_user(tmp1, &ulist[i].address)) {
365 ret = -EFAULT;
366 goto out;
367 }
368 }
369 if (put_user(karg.count, &uarg->count))
370 ret = -EFAULT;
371 }
372
373out:
374 kfree(karg.list);
375 return ret;
376}
377
378typedef struct drm32_dma {
379 /* Indices here refer to the offset into
380 buflist in drm_buf_get_t. */
381 int context; /* Context handle */
382 int send_count; /* Number of buffers to send */
383 u32 send_indices; /* List of handles to buffers (int *) */
384 u32 send_sizes; /* Lengths of data to send (int *) */
385 drm_dma_flags_t flags; /* Flags */
386 int request_count; /* Number of buffers requested */
387 int request_size; /* Desired size for buffers */
388 u32 request_indices; /* Buffer information (int *) */
389 u32 request_sizes; /* (int *) */
390 int granted_count; /* Number of buffers granted */
391} drm32_dma_t;
392#define DRM32_IOCTL_DMA DRM_IOWR(0x29, drm32_dma_t)
393
394/* RED PEN The DRM layer blindly dereferences the send/request
395 * indice/size arrays even though they are userland
396 * pointers. -DaveM
397 */
398static int drm32_dma(unsigned int fd, unsigned int cmd, unsigned long arg)
399{
400 drm32_dma_t *uarg = (drm32_dma_t *) arg;
401 int *u_si, *u_ss, *u_ri, *u_rs;
402 drm_dma_t karg;
403 mm_segment_t old_fs;
404 int ret;
405 u32 tmp1, tmp2, tmp3, tmp4;
406
407 karg.send_indices = karg.send_sizes = NULL;
408 karg.request_indices = karg.request_sizes = NULL;
409
410 if (get_user(karg.context, &uarg->context) ||
411 get_user(karg.send_count, &uarg->send_count) ||
412 get_user(tmp1, &uarg->send_indices) ||
413 get_user(tmp2, &uarg->send_sizes) ||
414 get_user(karg.flags, &uarg->flags) ||
415 get_user(karg.request_count, &uarg->request_count) ||
416 get_user(karg.request_size, &uarg->request_size) ||
417 get_user(tmp3, &uarg->request_indices) ||
418 get_user(tmp4, &uarg->request_sizes) ||
419 get_user(karg.granted_count, &uarg->granted_count))
420 return -EFAULT;
421
422 u_si = (int *) A(tmp1);
423 u_ss = (int *) A(tmp2);
424 u_ri = (int *) A(tmp3);
425 u_rs = (int *) A(tmp4);
426
427 if (karg.send_count) {
428 karg.send_indices = kmalloc(karg.send_count * sizeof(int), GFP_KERNEL);
429 karg.send_sizes = kmalloc(karg.send_count * sizeof(int), GFP_KERNEL);
430
431 ret = -ENOMEM;
432 if (!karg.send_indices || !karg.send_sizes)
433 goto out;
434
435 ret = -EFAULT;
436 if (copy_from_user(karg.send_indices, u_si,
437 (karg.send_count * sizeof(int))) ||
438 copy_from_user(karg.send_sizes, u_ss,
439 (karg.send_count * sizeof(int))))
440 goto out;
441 }
442
443 if (karg.request_count) {
444 karg.request_indices = kmalloc(karg.request_count * sizeof(int), GFP_KERNEL);
445 karg.request_sizes = kmalloc(karg.request_count * sizeof(int), GFP_KERNEL);
446
447 ret = -ENOMEM;
448 if (!karg.request_indices || !karg.request_sizes)
449 goto out;
450
451 ret = -EFAULT;
452 if (copy_from_user(karg.request_indices, u_ri,
453 (karg.request_count * sizeof(int))) ||
454 copy_from_user(karg.request_sizes, u_rs,
455 (karg.request_count * sizeof(int))))
456 goto out;
457 }
458
459 old_fs = get_fs();
460 set_fs(KERNEL_DS);
461 ret = sys_ioctl(fd, DRM_IOCTL_DMA, (unsigned long) &karg);
462 set_fs(old_fs);
463
464 if (!ret) {
465 if (put_user(karg.context, &uarg->context) ||
466 put_user(karg.send_count, &uarg->send_count) ||
467 put_user(karg.flags, &uarg->flags) ||
468 put_user(karg.request_count, &uarg->request_count) ||
469 put_user(karg.request_size, &uarg->request_size) ||
470 put_user(karg.granted_count, &uarg->granted_count))
471 ret = -EFAULT;
472
473 if (karg.send_count) {
474 if (copy_to_user(u_si, karg.send_indices,
475 (karg.send_count * sizeof(int))) ||
476 copy_to_user(u_ss, karg.send_sizes,
477 (karg.send_count * sizeof(int))))
478 ret = -EFAULT;
479 }
480 if (karg.request_count) {
481 if (copy_to_user(u_ri, karg.request_indices,
482 (karg.request_count * sizeof(int))) ||
483 copy_to_user(u_rs, karg.request_sizes,
484 (karg.request_count * sizeof(int))))
485 ret = -EFAULT;
486 }
487 }
488
489out:
490 kfree(karg.send_indices);
491 kfree(karg.send_sizes);
492 kfree(karg.request_indices);
493 kfree(karg.request_sizes);
494 return ret;
495}
496
497typedef struct drm32_ctx_res {
498 int count;
499 u32 contexts; /* (drm_ctx_t *) */
500} drm32_ctx_res_t;
501#define DRM32_IOCTL_RES_CTX DRM_IOWR(0x26, drm32_ctx_res_t)
502
503static int drm32_res_ctx(unsigned int fd, unsigned int cmd, unsigned long arg)
504{
505 drm32_ctx_res_t *uarg = (drm32_ctx_res_t *) arg;
506 drm_ctx_t *ulist;
507 drm_ctx_res_t karg;
508 mm_segment_t old_fs;
509 int orig_count, ret;
510 u32 tmp;
511
512 karg.contexts = NULL;
513 if (get_user(karg.count, &uarg->count) ||
514 get_user(tmp, &uarg->contexts))
515 return -EFAULT;
516
517 ulist = (drm_ctx_t *) A(tmp);
518
519 orig_count = karg.count;
520 if (karg.count && ulist) {
521 karg.contexts = kmalloc((karg.count * sizeof(drm_ctx_t)), GFP_KERNEL);
522 if (!karg.contexts)
523 return -ENOMEM;
524 if (copy_from_user(karg.contexts, ulist,
525 (karg.count * sizeof(drm_ctx_t)))) {
526 kfree(karg.contexts);
527 return -EFAULT;
528 }
529 }
530
531 old_fs = get_fs();
532 set_fs(KERNEL_DS);
533 ret = sys_ioctl(fd, DRM_IOCTL_RES_CTX, (unsigned long) &karg);
534 set_fs(old_fs);
535
536 if (!ret) {
537 if (orig_count) {
538 if (copy_to_user(ulist, karg.contexts,
539 (orig_count * sizeof(drm_ctx_t))))
540 ret = -EFAULT;
541 }
542 if (put_user(karg.count, &uarg->count))
543 ret = -EFAULT;
544 }
545
546 kfree(karg.contexts);
547 return ret;
548}
549
550#endif
551
552#define HANDLE_IOCTL(cmd, handler) { cmd, (ioctl_trans_handler_t)handler, NULL }, 22#define HANDLE_IOCTL(cmd, handler) { cmd, (ioctl_trans_handler_t)handler, NULL },
553#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd, sys_ioctl) 23#define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd, sys_ioctl)
554 24
@@ -561,11 +31,6 @@ IOCTL_TABLE_START
561#define DECLARES 31#define DECLARES
562#include "compat_ioctl.c" 32#include "compat_ioctl.c"
563 33
564/* PA-specific ioctls */
565COMPATIBLE_IOCTL(PA_PERF_ON)
566COMPATIBLE_IOCTL(PA_PERF_OFF)
567COMPATIBLE_IOCTL(PA_PERF_VERSION)
568
569/* And these ioctls need translation */ 34/* And these ioctls need translation */
570HANDLE_IOCTL(SIOCGPPPSTATS, dev_ifsioc) 35HANDLE_IOCTL(SIOCGPPPSTATS, dev_ifsioc)
571HANDLE_IOCTL(SIOCGPPPCSTATS, dev_ifsioc) 36HANDLE_IOCTL(SIOCGPPPCSTATS, dev_ifsioc)
@@ -590,17 +55,6 @@ HANDLE_IOCTL(RTC_EPOCH_READ, w_long)
590COMPATIBLE_IOCTL(RTC_EPOCH_SET) 55COMPATIBLE_IOCTL(RTC_EPOCH_SET)
591#endif 56#endif
592 57
593#if defined(CONFIG_DRM) || defined(CONFIG_DRM_MODULE)
594HANDLE_IOCTL(DRM32_IOCTL_VERSION, drm32_version);
595HANDLE_IOCTL(DRM32_IOCTL_GET_UNIQUE, drm32_getsetunique);
596HANDLE_IOCTL(DRM32_IOCTL_SET_UNIQUE, drm32_getsetunique);
597HANDLE_IOCTL(DRM32_IOCTL_ADD_MAP, drm32_addmap);
598HANDLE_IOCTL(DRM32_IOCTL_INFO_BUFS, drm32_info_bufs);
599HANDLE_IOCTL(DRM32_IOCTL_FREE_BUFS, drm32_free_bufs);
600HANDLE_IOCTL(DRM32_IOCTL_MAP_BUFS, drm32_map_bufs);
601HANDLE_IOCTL(DRM32_IOCTL_DMA, drm32_dma);
602HANDLE_IOCTL(DRM32_IOCTL_RES_CTX, drm32_res_ctx);
603#endif /* DRM */
604IOCTL_TABLE_END 58IOCTL_TABLE_END
605 59
606int ioctl_table_size = ARRAY_SIZE(ioctl_start); 60int ioctl_table_size = ARRAY_SIZE(ioctl_start);
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 006385dbee66..197936d9359a 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -30,6 +30,9 @@
30#include <linux/seq_file.h> 30#include <linux/seq_file.h>
31#include <linux/spinlock.h> 31#include <linux/spinlock.h>
32#include <linux/types.h> 32#include <linux/types.h>
33#include <asm/io.h>
34
35#include <asm/smp.h>
33 36
34#undef PARISC_IRQ_CR16_COUNTS 37#undef PARISC_IRQ_CR16_COUNTS
35 38
@@ -43,26 +46,34 @@ extern irqreturn_t ipi_interrupt(int, void *, struct pt_regs *);
43*/ 46*/
44static volatile unsigned long cpu_eiem = 0; 47static volatile unsigned long cpu_eiem = 0;
45 48
46static void cpu_set_eiem(void *info) 49static void cpu_disable_irq(unsigned int irq)
47{
48 set_eiem((unsigned long) info);
49}
50
51static inline void cpu_disable_irq(unsigned int irq)
52{ 50{
53 unsigned long eirr_bit = EIEM_MASK(irq); 51 unsigned long eirr_bit = EIEM_MASK(irq);
54 52
55 cpu_eiem &= ~eirr_bit; 53 cpu_eiem &= ~eirr_bit;
56 on_each_cpu(cpu_set_eiem, (void *) cpu_eiem, 1, 1); 54 /* Do nothing on the other CPUs. If they get this interrupt,
55 * The & cpu_eiem in the do_cpu_irq_mask() ensures they won't
56 * handle it, and the set_eiem() at the bottom will ensure it
57 * then gets disabled */
57} 58}
58 59
59static void cpu_enable_irq(unsigned int irq) 60static void cpu_enable_irq(unsigned int irq)
60{ 61{
61 unsigned long eirr_bit = EIEM_MASK(irq); 62 unsigned long eirr_bit = EIEM_MASK(irq);
62 63
63 mtctl(eirr_bit, 23); /* clear EIRR bit before unmasking */
64 cpu_eiem |= eirr_bit; 64 cpu_eiem |= eirr_bit;
65 on_each_cpu(cpu_set_eiem, (void *) cpu_eiem, 1, 1); 65
66 /* FIXME: while our interrupts aren't nested, we cannot reset
67 * the eiem mask if we're already in an interrupt. Once we
68 * implement nested interrupts, this can go away
69 */
70 if (!in_interrupt())
71 set_eiem(cpu_eiem);
72
73 /* This is just a simple NOP IPI. But what it does is cause
74 * all the other CPUs to do a set_eiem(cpu_eiem) at the end
75 * of the interrupt handler */
76 smp_send_all_nop();
66} 77}
67 78
68static unsigned int cpu_startup_irq(unsigned int irq) 79static unsigned int cpu_startup_irq(unsigned int irq)
@@ -74,6 +85,35 @@ static unsigned int cpu_startup_irq(unsigned int irq)
74void no_ack_irq(unsigned int irq) { } 85void no_ack_irq(unsigned int irq) { }
75void no_end_irq(unsigned int irq) { } 86void no_end_irq(unsigned int irq) { }
76 87
88#ifdef CONFIG_SMP
89int cpu_check_affinity(unsigned int irq, cpumask_t *dest)
90{
91 int cpu_dest;
92
93 /* timer and ipi have to always be received on all CPUs */
94 if (irq == TIMER_IRQ || irq == IPI_IRQ) {
95 /* Bad linux design decision. The mask has already
96 * been set; we must reset it */
97 irq_affinity[irq] = CPU_MASK_ALL;
98 return -EINVAL;
99 }
100
101 /* whatever mask they set, we just allow one CPU */
102 cpu_dest = first_cpu(*dest);
103 *dest = cpumask_of_cpu(cpu_dest);
104
105 return 0;
106}
107
108static void cpu_set_affinity_irq(unsigned int irq, cpumask_t dest)
109{
110 if (cpu_check_affinity(irq, &dest))
111 return;
112
113 irq_affinity[irq] = dest;
114}
115#endif
116
77static struct hw_interrupt_type cpu_interrupt_type = { 117static struct hw_interrupt_type cpu_interrupt_type = {
78 .typename = "CPU", 118 .typename = "CPU",
79 .startup = cpu_startup_irq, 119 .startup = cpu_startup_irq,
@@ -82,7 +122,9 @@ static struct hw_interrupt_type cpu_interrupt_type = {
82 .disable = cpu_disable_irq, 122 .disable = cpu_disable_irq,
83 .ack = no_ack_irq, 123 .ack = no_ack_irq,
84 .end = no_end_irq, 124 .end = no_end_irq,
85// .set_affinity = cpu_set_affinity_irq, 125#ifdef CONFIG_SMP
126 .set_affinity = cpu_set_affinity_irq,
127#endif
86}; 128};
87 129
88int show_interrupts(struct seq_file *p, void *v) 130int show_interrupts(struct seq_file *p, void *v)
@@ -219,6 +261,17 @@ int txn_alloc_irq(unsigned int bits_wide)
219 return -1; 261 return -1;
220} 262}
221 263
264
265unsigned long txn_affinity_addr(unsigned int irq, int cpu)
266{
267#ifdef CONFIG_SMP
268 irq_affinity[irq] = cpumask_of_cpu(cpu);
269#endif
270
271 return cpu_data[cpu].txn_addr;
272}
273
274
222unsigned long txn_alloc_addr(unsigned int virt_irq) 275unsigned long txn_alloc_addr(unsigned int virt_irq)
223{ 276{
224 static int next_cpu = -1; 277 static int next_cpu = -1;
@@ -233,7 +286,7 @@ unsigned long txn_alloc_addr(unsigned int virt_irq)
233 if (next_cpu >= NR_CPUS) 286 if (next_cpu >= NR_CPUS)
234 next_cpu = 0; /* nothing else, assign monarch */ 287 next_cpu = 0; /* nothing else, assign monarch */
235 288
236 return cpu_data[next_cpu].txn_addr; 289 return txn_affinity_addr(virt_irq, next_cpu);
237} 290}
238 291
239 292
@@ -250,10 +303,11 @@ void do_cpu_irq_mask(struct pt_regs *regs)
250 irq_enter(); 303 irq_enter();
251 304
252 /* 305 /*
253 * Only allow interrupt processing to be interrupted by the 306 * Don't allow TIMER or IPI nested interrupts.
254 * timer tick 307 * Allowing any single interrupt to nest can lead to that CPU
308 * handling interrupts with all enabled interrupts unmasked.
255 */ 309 */
256 set_eiem(EIEM_MASK(TIMER_IRQ)); 310 set_eiem(0UL);
257 311
258 /* 1) only process IRQs that are enabled/unmasked (cpu_eiem) 312 /* 1) only process IRQs that are enabled/unmasked (cpu_eiem)
259 * 2) We loop here on EIRR contents in order to avoid 313 * 2) We loop here on EIRR contents in order to avoid
@@ -267,23 +321,41 @@ void do_cpu_irq_mask(struct pt_regs *regs)
267 if (!eirr_val) 321 if (!eirr_val)
268 break; 322 break;
269 323
270 if (eirr_val & EIEM_MASK(TIMER_IRQ))
271 set_eiem(0);
272
273 mtctl(eirr_val, 23); /* reset bits we are going to process */ 324 mtctl(eirr_val, 23); /* reset bits we are going to process */
274 325
275 /* Work our way from MSb to LSb...same order we alloc EIRs */ 326 /* Work our way from MSb to LSb...same order we alloc EIRs */
276 for (irq = TIMER_IRQ; eirr_val && bit; bit>>=1, irq++) { 327 for (irq = TIMER_IRQ; eirr_val && bit; bit>>=1, irq++) {
328#ifdef CONFIG_SMP
329 cpumask_t dest = irq_affinity[irq];
330#endif
277 if (!(bit & eirr_val)) 331 if (!(bit & eirr_val))
278 continue; 332 continue;
279 333
280 /* clear bit in mask - can exit loop sooner */ 334 /* clear bit in mask - can exit loop sooner */
281 eirr_val &= ~bit; 335 eirr_val &= ~bit;
282 336
337#ifdef CONFIG_SMP
338 /* FIXME: because generic set affinity mucks
339 * with the affinity before sending it to us
340 * we can get the situation where the affinity is
341 * wrong for our CPU type interrupts */
342 if (irq != TIMER_IRQ && irq != IPI_IRQ &&
343 !cpu_isset(smp_processor_id(), dest)) {
344 int cpu = first_cpu(dest);
345
346 printk(KERN_DEBUG "redirecting irq %d from CPU %d to %d\n",
347 irq, smp_processor_id(), cpu);
348 gsc_writel(irq + CPU_IRQ_BASE,
349 cpu_data[cpu].hpa);
350 continue;
351 }
352#endif
353
283 __do_IRQ(irq, regs); 354 __do_IRQ(irq, regs);
284 } 355 }
285 } 356 }
286 set_eiem(cpu_eiem); 357
358 set_eiem(cpu_eiem); /* restore original mask */
287 irq_exit(); 359 irq_exit();
288} 360}
289 361
@@ -291,12 +363,14 @@ void do_cpu_irq_mask(struct pt_regs *regs)
291static struct irqaction timer_action = { 363static struct irqaction timer_action = {
292 .handler = timer_interrupt, 364 .handler = timer_interrupt,
293 .name = "timer", 365 .name = "timer",
366 .flags = SA_INTERRUPT,
294}; 367};
295 368
296#ifdef CONFIG_SMP 369#ifdef CONFIG_SMP
297static struct irqaction ipi_action = { 370static struct irqaction ipi_action = {
298 .handler = ipi_interrupt, 371 .handler = ipi_interrupt,
299 .name = "IPI", 372 .name = "IPI",
373 .flags = SA_INTERRUPT,
300}; 374};
301#endif 375#endif
302 376
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index 44670d6e06f4..f6fec62b6a2f 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -196,8 +196,7 @@ static int perf_open(struct inode *inode, struct file *file);
196static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t *ppos); 196static ssize_t perf_read(struct file *file, char __user *buf, size_t cnt, loff_t *ppos);
197static ssize_t perf_write(struct file *file, const char __user *buf, size_t count, 197static ssize_t perf_write(struct file *file, const char __user *buf, size_t count,
198 loff_t *ppos); 198 loff_t *ppos);
199static int perf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 199static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
200 unsigned long arg);
201static void perf_start_counters(void); 200static void perf_start_counters(void);
202static int perf_stop_counters(uint32_t *raddr); 201static int perf_stop_counters(uint32_t *raddr);
203static struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num); 202static struct rdr_tbl_ent * perf_rdr_get_entry(uint32_t rdr_num);
@@ -438,48 +437,56 @@ static void perf_patch_images(void)
438 * must be running on the processor that you wish to change. 437 * must be running on the processor that you wish to change.
439 */ 438 */
440 439
441static int perf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 440static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
442 unsigned long arg)
443{ 441{
444 long error_start; 442 long error_start;
445 uint32_t raddr[4]; 443 uint32_t raddr[4];
444 int error = 0;
446 445
446 lock_kernel();
447 switch (cmd) { 447 switch (cmd) {
448 448
449 case PA_PERF_ON: 449 case PA_PERF_ON:
450 /* Start the counters */ 450 /* Start the counters */
451 perf_start_counters(); 451 perf_start_counters();
452 return 0; 452 break;
453 453
454 case PA_PERF_OFF: 454 case PA_PERF_OFF:
455 error_start = perf_stop_counters(raddr); 455 error_start = perf_stop_counters(raddr);
456 if (error_start != 0) { 456 if (error_start != 0) {
457 printk(KERN_ERR "perf_off: perf_stop_counters = %ld\n", error_start); 457 printk(KERN_ERR "perf_off: perf_stop_counters = %ld\n", error_start);
458 return -EFAULT; 458 error = -EFAULT;
459 break;
459 } 460 }
460 461
461 /* copy out the Counters */ 462 /* copy out the Counters */
462 if (copy_to_user((void __user *)arg, raddr, 463 if (copy_to_user((void __user *)arg, raddr,
463 sizeof (raddr)) != 0) { 464 sizeof (raddr)) != 0) {
464 return -EFAULT; 465 error = -EFAULT;
466 break;
465 } 467 }
466 return 0; 468 break;
467 469
468 case PA_PERF_VERSION: 470 case PA_PERF_VERSION:
469 /* Return the version # */ 471 /* Return the version # */
470 return put_user(PERF_VERSION, (int *)arg); 472 error = put_user(PERF_VERSION, (int *)arg);
473 break;
471 474
472 default: 475 default:
473 break; 476 error = -ENOTTY;
474 } 477 }
475 return -ENOTTY; 478
479 unlock_kernel();
480
481 return error;
476} 482}
477 483
478static struct file_operations perf_fops = { 484static struct file_operations perf_fops = {
479 .llseek = no_llseek, 485 .llseek = no_llseek,
480 .read = perf_read, 486 .read = perf_read,
481 .write = perf_write, 487 .write = perf_write,
482 .ioctl = perf_ioctl, 488 .unlocked_ioctl = perf_ioctl,
489 .compat_ioctl = perf_ioctl,
483 .open = perf_open, 490 .open = perf_open,
484 .release = perf_release 491 .release = perf_release
485}; 492};
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
index b6fe202a620d..27160e8bf15b 100644
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
@@ -264,6 +264,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
264 * sigkill. perhaps it should be put in the status 264 * sigkill. perhaps it should be put in the status
265 * that it wants to exit. 265 * that it wants to exit.
266 */ 266 */
267 ret = 0;
267 DBG("sys_ptrace(KILL)\n"); 268 DBG("sys_ptrace(KILL)\n");
268 if (child->exit_state == EXIT_ZOMBIE) /* already dead */ 269 if (child->exit_state == EXIT_ZOMBIE) /* already dead */
269 goto out_tsk; 270 goto out_tsk;
@@ -344,11 +345,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
344 345
345 case PTRACE_GETEVENTMSG: 346 case PTRACE_GETEVENTMSG:
346 ret = put_user(child->ptrace_message, (unsigned int __user *) data); 347 ret = put_user(child->ptrace_message, (unsigned int __user *) data);
347 goto out; 348 goto out_tsk;
348 349
349 default: 350 default:
350 ret = ptrace_request(child, request, addr, data); 351 ret = ptrace_request(child, request, addr, data);
351 goto out; 352 goto out_tsk;
352 } 353 }
353 354
354out_wake_notrap: 355out_wake_notrap:
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 82c24e62ab63..3a25a7bd673e 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -296,7 +296,6 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
296 struct rt_sigframe __user *frame; 296 struct rt_sigframe __user *frame;
297 unsigned long rp, usp; 297 unsigned long rp, usp;
298 unsigned long haddr, sigframe_size; 298 unsigned long haddr, sigframe_size;
299 struct siginfo si;
300 int err = 0; 299 int err = 0;
301#ifdef __LP64__ 300#ifdef __LP64__
302 compat_int_t compat_val; 301 compat_int_t compat_val;
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index a9ecf6465784..ce89da0f654d 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -181,12 +181,19 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
181 while (ops) { 181 while (ops) {
182 unsigned long which = ffz(~ops); 182 unsigned long which = ffz(~ops);
183 183
184 ops &= ~(1 << which);
185
184 switch (which) { 186 switch (which) {
187 case IPI_NOP:
188#if (kDEBUG>=100)
189 printk(KERN_DEBUG "CPU%d IPI_NOP\n",this_cpu);
190#endif /* kDEBUG */
191 break;
192
185 case IPI_RESCHEDULE: 193 case IPI_RESCHEDULE:
186#if (kDEBUG>=100) 194#if (kDEBUG>=100)
187 printk(KERN_DEBUG "CPU%d IPI_RESCHEDULE\n",this_cpu); 195 printk(KERN_DEBUG "CPU%d IPI_RESCHEDULE\n",this_cpu);
188#endif /* kDEBUG */ 196#endif /* kDEBUG */
189 ops &= ~(1 << IPI_RESCHEDULE);
190 /* 197 /*
191 * Reschedule callback. Everything to be 198 * Reschedule callback. Everything to be
192 * done is done by the interrupt return path. 199 * done is done by the interrupt return path.
@@ -197,7 +204,6 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
197#if (kDEBUG>=100) 204#if (kDEBUG>=100)
198 printk(KERN_DEBUG "CPU%d IPI_CALL_FUNC\n",this_cpu); 205 printk(KERN_DEBUG "CPU%d IPI_CALL_FUNC\n",this_cpu);
199#endif /* kDEBUG */ 206#endif /* kDEBUG */
200 ops &= ~(1 << IPI_CALL_FUNC);
201 { 207 {
202 volatile struct smp_call_struct *data; 208 volatile struct smp_call_struct *data;
203 void (*func)(void *info); 209 void (*func)(void *info);
@@ -231,7 +237,6 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
231#if (kDEBUG>=100) 237#if (kDEBUG>=100)
232 printk(KERN_DEBUG "CPU%d IPI_CPU_START\n",this_cpu); 238 printk(KERN_DEBUG "CPU%d IPI_CPU_START\n",this_cpu);
233#endif /* kDEBUG */ 239#endif /* kDEBUG */
234 ops &= ~(1 << IPI_CPU_START);
235#ifdef ENTRY_SYS_CPUS 240#ifdef ENTRY_SYS_CPUS
236 p->state = STATE_RUNNING; 241 p->state = STATE_RUNNING;
237#endif 242#endif
@@ -241,7 +246,6 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
241#if (kDEBUG>=100) 246#if (kDEBUG>=100)
242 printk(KERN_DEBUG "CPU%d IPI_CPU_STOP\n",this_cpu); 247 printk(KERN_DEBUG "CPU%d IPI_CPU_STOP\n",this_cpu);
243#endif /* kDEBUG */ 248#endif /* kDEBUG */
244 ops &= ~(1 << IPI_CPU_STOP);
245#ifdef ENTRY_SYS_CPUS 249#ifdef ENTRY_SYS_CPUS
246#else 250#else
247 halt_processor(); 251 halt_processor();
@@ -252,13 +256,11 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs)
252#if (kDEBUG>=100) 256#if (kDEBUG>=100)
253 printk(KERN_DEBUG "CPU%d is alive!\n",this_cpu); 257 printk(KERN_DEBUG "CPU%d is alive!\n",this_cpu);
254#endif /* kDEBUG */ 258#endif /* kDEBUG */
255 ops &= ~(1 << IPI_CPU_TEST);
256 break; 259 break;
257 260
258 default: 261 default:
259 printk(KERN_CRIT "Unknown IPI num on CPU%d: %lu\n", 262 printk(KERN_CRIT "Unknown IPI num on CPU%d: %lu\n",
260 this_cpu, which); 263 this_cpu, which);
261 ops &= ~(1 << which);
262 return IRQ_NONE; 264 return IRQ_NONE;
263 } /* Switch */ 265 } /* Switch */
264 } /* while (ops) */ 266 } /* while (ops) */
@@ -312,6 +314,12 @@ smp_send_start(void) { send_IPI_allbutself(IPI_CPU_START); }
312void 314void
313smp_send_reschedule(int cpu) { send_IPI_single(cpu, IPI_RESCHEDULE); } 315smp_send_reschedule(int cpu) { send_IPI_single(cpu, IPI_RESCHEDULE); }
314 316
317void
318smp_send_all_nop(void)
319{
320 send_IPI_allbutself(IPI_NOP);
321}
322
315 323
316/** 324/**
317 * Run a function on all other CPUs. 325 * Run a function on all other CPUs.
@@ -338,6 +346,10 @@ smp_call_function (void (*func) (void *info), void *info, int retry, int wait)
338 346
339 /* Can deadlock when called with interrupts disabled */ 347 /* Can deadlock when called with interrupts disabled */
340 WARN_ON(irqs_disabled()); 348 WARN_ON(irqs_disabled());
349
350 /* can also deadlock if IPIs are disabled */
351 WARN_ON((get_eiem() & (1UL<<(CPU_IRQ_MAX - IPI_IRQ))) == 0);
352
341 353
342 data.func = func; 354 data.func = func;
343 data.info = info; 355 data.info = info;
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index b29b76b42bb7..d66163492890 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -164,7 +164,7 @@ linux_gateway_entry:
164#endif 164#endif
165 STREG %r2, TASK_PT_GR30(%r1) /* ... and save it */ 165 STREG %r2, TASK_PT_GR30(%r1) /* ... and save it */
166 166
167 STREG %r20, TASK_PT_GR20(%r1) 167 STREG %r20, TASK_PT_GR20(%r1) /* Syscall number */
168 STREG %r21, TASK_PT_GR21(%r1) 168 STREG %r21, TASK_PT_GR21(%r1)
169 STREG %r22, TASK_PT_GR22(%r1) 169 STREG %r22, TASK_PT_GR22(%r1)
170 STREG %r23, TASK_PT_GR23(%r1) /* 4th argument */ 170 STREG %r23, TASK_PT_GR23(%r1) /* 4th argument */
@@ -527,6 +527,7 @@ lws_compare_and_swap:
527 We *must* giveup this call and fail. 527 We *must* giveup this call and fail.
528 */ 528 */
529 ldw 4(%sr2,%r20), %r28 /* Load thread register */ 529 ldw 4(%sr2,%r20), %r28 /* Load thread register */
530 /* WARNING: If cr27 cycles to the same value we have problems */
530 mfctl %cr27, %r21 /* Get current thread register */ 531 mfctl %cr27, %r21 /* Get current thread register */
531 cmpb,<>,n %r21, %r28, cas_lock /* Called recursive? */ 532 cmpb,<>,n %r21, %r28, cas_lock /* Called recursive? */
532 b lws_exit /* Return error! */ 533 b lws_exit /* Return error! */
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 94df74bcc0ee..bb2efdd566a9 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -598,19 +598,6 @@ config ARCH_MEMORY_PROBE
598 def_bool y 598 def_bool y
599 depends on MEMORY_HOTPLUG 599 depends on MEMORY_HOTPLUG
600 600
601# Some NUMA nodes have memory ranges that span
602# other nodes. Even though a pfn is valid and
603# between a node's start and end pfns, it may not
604# reside on that node.
605#
606# This is a relatively temporary hack that should
607# be able to go away when sparsemem is fully in
608# place
609
610config NODES_SPAN_OTHER_NODES
611 def_bool y
612 depends on NEED_MULTIPLE_NODES
613
614config PPC_64K_PAGES 601config PPC_64K_PAGES
615 bool "64k page size" 602 bool "64k page size"
616 depends on PPC64 603 depends on PPC64
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 99dbea8c5c50..98f67c78d1bd 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -33,6 +33,8 @@ endif
33 33
34export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY 34export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY
35 35
36KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
37
36ifeq ($(CONFIG_PPC64),y) 38ifeq ($(CONFIG_PPC64),y)
37OLDARCH := ppc64 39OLDARCH := ppc64
38SZ := 64 40SZ := 64
@@ -111,9 +113,6 @@ cpu-as-$(CONFIG_E200) += -Wa,-me200
111AFLAGS += $(cpu-as-y) 113AFLAGS += $(cpu-as-y)
112CFLAGS += $(cpu-as-y) 114CFLAGS += $(cpu-as-y)
113 115
114# Default to the common case.
115KBUILD_DEFCONFIG := common_defconfig
116
117head-y := arch/powerpc/kernel/head_32.o 116head-y := arch/powerpc/kernel/head_32.o
118head-$(CONFIG_PPC64) := arch/powerpc/kernel/head_64.o 117head-$(CONFIG_PPC64) := arch/powerpc/kernel/head_64.o
119head-$(CONFIG_8xx) := arch/powerpc/kernel/head_8xx.o 118head-$(CONFIG_8xx) := arch/powerpc/kernel/head_8xx.o
@@ -125,11 +124,11 @@ head-$(CONFIG_PPC64) += arch/powerpc/kernel/entry_64.o
125head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o 124head-$(CONFIG_PPC_FPU) += arch/powerpc/kernel/fpu.o
126 125
127core-y += arch/powerpc/kernel/ \ 126core-y += arch/powerpc/kernel/ \
128 arch/$(OLDARCH)/kernel/ \
129 arch/powerpc/mm/ \ 127 arch/powerpc/mm/ \
130 arch/powerpc/lib/ \ 128 arch/powerpc/lib/ \
131 arch/powerpc/sysdev/ \ 129 arch/powerpc/sysdev/ \
132 arch/powerpc/platforms/ 130 arch/powerpc/platforms/
131core-$(CONFIG_PPC32) += arch/ppc/kernel/
133core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/ 132core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/
134core-$(CONFIG_XMON) += arch/powerpc/xmon/ 133core-$(CONFIG_XMON) += arch/powerpc/xmon/
135core-$(CONFIG_APUS) += arch/ppc/amiga/ 134core-$(CONFIG_APUS) += arch/ppc/amiga/
@@ -165,7 +164,7 @@ define archhelp
165 @echo ' (your) ~/bin/installkernel or' 164 @echo ' (your) ~/bin/installkernel or'
166 @echo ' (distribution) /sbin/installkernel or' 165 @echo ' (distribution) /sbin/installkernel or'
167 @echo ' install to $$(INSTALL_PATH) and run lilo' 166 @echo ' install to $$(INSTALL_PATH) and run lilo'
168 @echo ' *_defconfig - Select default config from arch/$(ARCH)/ppc/configs' 167 @echo ' *_defconfig - Select default config from arch/$(ARCH)/configs'
169endef 168endef
170 169
171archclean: 170archclean:
diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S
index 9cc442263939..d2f2ace56cd3 100644
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
@@ -14,43 +14,42 @@
14 .text 14 .text
15 .globl _zimage_start 15 .globl _zimage_start
16_zimage_start: 16_zimage_start:
17 bl reloc_offset 17 bl 1f
18 18
19reloc_offset: 191:
20 mflr r0 20 mflr r0
21 lis r9,reloc_offset@ha 21 lis r9,1b@ha
22 addi r9,r9,reloc_offset@l 22 addi r9,r9,1b@l
23 subf. r0,r9,r0 23 subf. r0,r9,r0
24 beq clear_caches 24 beq 3f
25 25
26reloc_got2:
27 lis r9,__got2_start@ha 26 lis r9,__got2_start@ha
28 addi r9,r9,__got2_start@l 27 addi r9,r9,__got2_start@l
29 lis r8,__got2_end@ha 28 lis r8,__got2_end@ha
30 addi r8,r8,__got2_end@l 29 addi r8,r8,__got2_end@l
31 subf. r8,r9,r8 30 subf. r8,r9,r8
32 beq clear_caches 31 beq 3f
33 srwi. r8,r8,2 32 srwi. r8,r8,2
34 mtctr r8 33 mtctr r8
35 add r9,r0,r9 34 add r9,r0,r9
36reloc_got2_loop: 352:
37 lwz r8,0(r9) 36 lwz r8,0(r9)
38 add r8,r8,r0 37 add r8,r8,r0
39 stw r8,0(r9) 38 stw r8,0(r9)
40 addi r9,r9,4 39 addi r9,r9,4
41 bdnz reloc_got2_loop 40 bdnz 2b
42 41
43clear_caches: 423:
44 lis r9,_start@h 43 lis r9,_start@h
45 add r9,r0,r9 44 add r9,r0,r9
46 lis r8,_etext@ha 45 lis r8,_etext@ha
47 addi r8,r8,_etext@l 46 addi r8,r8,_etext@l
48 add r8,r0,r8 47 add r8,r0,r8
491: dcbf r0,r9 484: dcbf r0,r9
50 icbi r0,r9 49 icbi r0,r9
51 addi r9,r9,0x20 50 addi r9,r9,0x20
52 cmplwi 0,r9,8 51 cmplwi 0,r9,8
53 blt 1b 52 blt 4b
54 sync 53 sync
55 isync 54 isync
56 55
diff --git a/arch/ppc64/defconfig b/arch/powerpc/configs/ppc64_defconfig
index e79fd60bc122..b5ba3bbd96fb 100644
--- a/arch/ppc64/defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,18 +1,33 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc4 3# Linux kernel version: 2.6.15-rc1
4# Thu Oct 20 08:28:33 2005 4# Fri Nov 18 16:23:24 2005
5# 5#
6CONFIG_PPC64=y
6CONFIG_64BIT=y 7CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y
7CONFIG_MMU=y 9CONFIG_MMU=y
10CONFIG_GENERIC_HARDIRQS=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y 11CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y 12CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_GENERIC_ISA_DMA=y 13CONFIG_PPC=y
11CONFIG_EARLY_PRINTK=y 14CONFIG_EARLY_PRINTK=y
12CONFIG_COMPAT=y 15CONFIG_COMPAT=y
16CONFIG_SYSVIPC_COMPAT=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 17CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y 18CONFIG_ARCH_MAY_HAVE_PC_FDC=y
15CONFIG_FORCE_MAX_ZONEORDER=13 19
20#
21# Processor support
22#
23# CONFIG_POWER4_ONLY is not set
24CONFIG_POWER3=y
25CONFIG_POWER4=y
26CONFIG_PPC_FPU=y
27CONFIG_ALTIVEC=y
28CONFIG_PPC_STD_MMU=y
29CONFIG_SMP=y
30CONFIG_NR_CPUS=32
16 31
17# 32#
18# Code maturity level options 33# Code maturity level options
@@ -41,7 +56,7 @@ CONFIG_CPUSETS=y
41CONFIG_INITRAMFS_SOURCE="" 56CONFIG_INITRAMFS_SOURCE=""
42# CONFIG_EMBEDDED is not set 57# CONFIG_EMBEDDED is not set
43CONFIG_KALLSYMS=y 58CONFIG_KALLSYMS=y
44# CONFIG_KALLSYMS_ALL is not set 59CONFIG_KALLSYMS_ALL=y
45# CONFIG_KALLSYMS_EXTRA_PASS is not set 60# CONFIG_KALLSYMS_EXTRA_PASS is not set
46CONFIG_PRINTK=y 61CONFIG_PRINTK=y
47CONFIG_BUG=y 62CONFIG_BUG=y
@@ -67,78 +82,115 @@ CONFIG_MODVERSIONS=y
67CONFIG_MODULE_SRCVERSION_ALL=y 82CONFIG_MODULE_SRCVERSION_ALL=y
68CONFIG_KMOD=y 83CONFIG_KMOD=y
69CONFIG_STOP_MACHINE=y 84CONFIG_STOP_MACHINE=y
70CONFIG_SYSVIPC_COMPAT=y 85
86#
87# Block layer
88#
89
90#
91# IO Schedulers
92#
93CONFIG_IOSCHED_NOOP=y
94CONFIG_IOSCHED_AS=y
95CONFIG_IOSCHED_DEADLINE=y
96CONFIG_IOSCHED_CFQ=y
97CONFIG_DEFAULT_AS=y
98# CONFIG_DEFAULT_DEADLINE is not set
99# CONFIG_DEFAULT_CFQ is not set
100# CONFIG_DEFAULT_NOOP is not set
101CONFIG_DEFAULT_IOSCHED="anticipatory"
71 102
72# 103#
73# Platform support 104# Platform support
74# 105#
75# CONFIG_PPC_ISERIES is not set
76CONFIG_PPC_MULTIPLATFORM=y 106CONFIG_PPC_MULTIPLATFORM=y
107# CONFIG_PPC_ISERIES is not set
108# CONFIG_EMBEDDED6xx is not set
109# CONFIG_APUS is not set
77CONFIG_PPC_PSERIES=y 110CONFIG_PPC_PSERIES=y
78CONFIG_PPC_BPA=y
79CONFIG_PPC_PMAC=y 111CONFIG_PPC_PMAC=y
112CONFIG_PPC_PMAC64=y
80CONFIG_PPC_MAPLE=y 113CONFIG_PPC_MAPLE=y
81CONFIG_PPC=y 114# CONFIG_PPC_CELL is not set
82CONFIG_PPC64=y
83CONFIG_PPC_OF=y 115CONFIG_PPC_OF=y
84CONFIG_XICS=y 116CONFIG_XICS=y
85CONFIG_MPIC=y
86CONFIG_BPA_IIC=y
87CONFIG_ALTIVEC=y
88CONFIG_PPC_SPLPAR=y
89CONFIG_KEXEC=y
90CONFIG_IBMVIO=y
91CONFIG_U3_DART=y 117CONFIG_U3_DART=y
118CONFIG_MPIC=y
119CONFIG_PPC_RTAS=y
120CONFIG_RTAS_ERROR_LOGGING=y
121CONFIG_RTAS_PROC=y
122CONFIG_RTAS_FLASH=m
123# CONFIG_MMIO_NVRAM is not set
92CONFIG_MPIC_BROKEN_U3=y 124CONFIG_MPIC_BROKEN_U3=y
93CONFIG_PPC_PMAC64=y 125CONFIG_IBMVIO=y
94CONFIG_BOOTX_TEXT=y 126# CONFIG_PPC_MPC106 is not set
95# CONFIG_POWER4_ONLY is not set 127CONFIG_GENERIC_TBSYNC=y
128CONFIG_CPU_FREQ=y
129CONFIG_CPU_FREQ_TABLE=y
130# CONFIG_CPU_FREQ_DEBUG is not set
131CONFIG_CPU_FREQ_STAT=y
132# CONFIG_CPU_FREQ_STAT_DETAILS is not set
133CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
134# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
135CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
136CONFIG_CPU_FREQ_GOV_POWERSAVE=y
137CONFIG_CPU_FREQ_GOV_USERSPACE=y
138# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
139# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
140CONFIG_CPU_FREQ_PMAC64=y
141# CONFIG_WANT_EARLY_SERIAL is not set
142
143#
144# Kernel options
145#
146# CONFIG_HZ_100 is not set
147CONFIG_HZ_250=y
148# CONFIG_HZ_1000 is not set
149CONFIG_HZ=250
150CONFIG_PREEMPT_NONE=y
151# CONFIG_PREEMPT_VOLUNTARY is not set
152# CONFIG_PREEMPT is not set
153# CONFIG_PREEMPT_BKL is not set
154CONFIG_BINFMT_ELF=y
155CONFIG_BINFMT_MISC=m
156CONFIG_FORCE_MAX_ZONEORDER=13
96CONFIG_IOMMU_VMERGE=y 157CONFIG_IOMMU_VMERGE=y
97CONFIG_SMP=y 158CONFIG_HOTPLUG_CPU=y
98CONFIG_NR_CPUS=32 159CONFIG_KEXEC=y
160CONFIG_IRQ_ALL_CPUS=y
161CONFIG_PPC_SPLPAR=y
162CONFIG_EEH=y
163CONFIG_SCANLOG=m
164CONFIG_LPARCFG=y
165# CONFIG_NUMA is not set
99CONFIG_ARCH_SELECT_MEMORY_MODEL=y 166CONFIG_ARCH_SELECT_MEMORY_MODEL=y
100CONFIG_ARCH_FLATMEM_ENABLE=y 167CONFIG_ARCH_FLATMEM_ENABLE=y
101CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
102CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
103CONFIG_ARCH_SPARSEMEM_ENABLE=y 168CONFIG_ARCH_SPARSEMEM_ENABLE=y
169CONFIG_ARCH_SPARSEMEM_DEFAULT=y
104CONFIG_SELECT_MEMORY_MODEL=y 170CONFIG_SELECT_MEMORY_MODEL=y
105# CONFIG_FLATMEM_MANUAL is not set 171# CONFIG_FLATMEM_MANUAL is not set
106CONFIG_DISCONTIGMEM_MANUAL=y 172# CONFIG_DISCONTIGMEM_MANUAL is not set
107# CONFIG_SPARSEMEM_MANUAL is not set 173CONFIG_SPARSEMEM_MANUAL=y
108CONFIG_DISCONTIGMEM=y 174CONFIG_SPARSEMEM=y
109CONFIG_FLAT_NODE_MEM_MAP=y 175CONFIG_HAVE_MEMORY_PRESENT=y
110CONFIG_NEED_MULTIPLE_NODES=y
111# CONFIG_SPARSEMEM_STATIC is not set 176# CONFIG_SPARSEMEM_STATIC is not set
112CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 177CONFIG_SPARSEMEM_EXTREME=y
113CONFIG_NODES_SPAN_OTHER_NODES=y 178# CONFIG_MEMORY_HOTPLUG is not set
114# CONFIG_NUMA is not set 179CONFIG_SPLIT_PTLOCK_CPUS=4096
180# CONFIG_PPC_64K_PAGES is not set
115# CONFIG_SCHED_SMT is not set 181# CONFIG_SCHED_SMT is not set
116CONFIG_PREEMPT_NONE=y
117# CONFIG_PREEMPT_VOLUNTARY is not set
118# CONFIG_PREEMPT is not set
119# CONFIG_PREEMPT_BKL is not set
120# CONFIG_HZ_100 is not set
121CONFIG_HZ_250=y
122# CONFIG_HZ_1000 is not set
123CONFIG_HZ=250
124CONFIG_EEH=y
125CONFIG_GENERIC_HARDIRQS=y
126CONFIG_PPC_RTAS=y
127CONFIG_RTAS_PROC=y
128CONFIG_RTAS_FLASH=m
129CONFIG_SCANLOG=m
130CONFIG_LPARCFG=y
131CONFIG_SECCOMP=y
132CONFIG_BINFMT_ELF=y
133CONFIG_BINFMT_MISC=m
134CONFIG_HOTPLUG_CPU=y
135CONFIG_PROC_DEVICETREE=y 182CONFIG_PROC_DEVICETREE=y
136# CONFIG_CMDLINE_BOOL is not set 183# CONFIG_CMDLINE_BOOL is not set
184# CONFIG_PM is not set
185CONFIG_SECCOMP=y
137CONFIG_ISA_DMA_API=y 186CONFIG_ISA_DMA_API=y
138 187
139# 188#
140# Bus Options 189# Bus options
141# 190#
191CONFIG_GENERIC_ISA_DMA=y
192CONFIG_PPC_I8259=y
193# CONFIG_PPC_INDIRECT_PCI is not set
142CONFIG_PCI=y 194CONFIG_PCI=y
143CONFIG_PCI_DOMAINS=y 195CONFIG_PCI_DOMAINS=y
144# CONFIG_PCI_LEGACY_PROC is not set 196# CONFIG_PCI_LEGACY_PROC is not set
@@ -158,6 +210,7 @@ CONFIG_HOTPLUG_PCI=m
158# CONFIG_HOTPLUG_PCI_SHPC is not set 210# CONFIG_HOTPLUG_PCI_SHPC is not set
159CONFIG_HOTPLUG_PCI_RPA=m 211CONFIG_HOTPLUG_PCI_RPA=m
160CONFIG_HOTPLUG_PCI_RPA_DLPAR=m 212CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
213CONFIG_KERNEL_START=0xc000000000000000
161 214
162# 215#
163# Networking 216# Networking
@@ -199,6 +252,10 @@ CONFIG_TCP_CONG_BIC=y
199# CONFIG_IPV6 is not set 252# CONFIG_IPV6 is not set
200CONFIG_NETFILTER=y 253CONFIG_NETFILTER=y
201# CONFIG_NETFILTER_DEBUG is not set 254# CONFIG_NETFILTER_DEBUG is not set
255
256#
257# Core Netfilter Configuration
258#
202CONFIG_NETFILTER_NETLINK=y 259CONFIG_NETFILTER_NETLINK=y
203CONFIG_NETFILTER_NETLINK_QUEUE=m 260CONFIG_NETFILTER_NETLINK_QUEUE=m
204CONFIG_NETFILTER_NETLINK_LOG=m 261CONFIG_NETFILTER_NETLINK_LOG=m
@@ -301,6 +358,10 @@ CONFIG_LLC=y
301# CONFIG_NET_DIVERT is not set 358# CONFIG_NET_DIVERT is not set
302# CONFIG_ECONET is not set 359# CONFIG_ECONET is not set
303# CONFIG_WAN_ROUTER is not set 360# CONFIG_WAN_ROUTER is not set
361
362#
363# QoS and/or fair queueing
364#
304# CONFIG_NET_SCHED is not set 365# CONFIG_NET_SCHED is not set
305CONFIG_NET_CLS_ROUTE=y 366CONFIG_NET_CLS_ROUTE=y
306 367
@@ -338,13 +399,7 @@ CONFIG_FW_LOADER=y
338# 399#
339# Parallel port support 400# Parallel port support
340# 401#
341CONFIG_PARPORT=m 402# CONFIG_PARPORT is not set
342CONFIG_PARPORT_PC=m
343# CONFIG_PARPORT_SERIAL is not set
344# CONFIG_PARPORT_PC_FIFO is not set
345# CONFIG_PARPORT_PC_SUPERIO is not set
346# CONFIG_PARPORT_GSC is not set
347# CONFIG_PARPORT_1284 is not set
348 403
349# 404#
350# Plug and Play support 405# Plug and Play support
@@ -354,7 +409,6 @@ CONFIG_PARPORT_PC=m
354# Block devices 409# Block devices
355# 410#
356CONFIG_BLK_DEV_FD=y 411CONFIG_BLK_DEV_FD=y
357# CONFIG_PARIDE is not set
358# CONFIG_BLK_CPQ_DA is not set 412# CONFIG_BLK_CPQ_DA is not set
359# CONFIG_BLK_CPQ_CISS_DA is not set 413# CONFIG_BLK_CPQ_CISS_DA is not set
360# CONFIG_BLK_DEV_DAC960 is not set 414# CONFIG_BLK_DEV_DAC960 is not set
@@ -370,14 +424,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16
370CONFIG_BLK_DEV_RAM_SIZE=65536 424CONFIG_BLK_DEV_RAM_SIZE=65536
371CONFIG_BLK_DEV_INITRD=y 425CONFIG_BLK_DEV_INITRD=y
372# CONFIG_CDROM_PKTCDVD is not set 426# CONFIG_CDROM_PKTCDVD is not set
373
374#
375# IO Schedulers
376#
377CONFIG_IOSCHED_NOOP=y
378CONFIG_IOSCHED_AS=y
379CONFIG_IOSCHED_DEADLINE=y
380CONFIG_IOSCHED_CFQ=y
381# CONFIG_ATA_OVER_ETH is not set 427# CONFIG_ATA_OVER_ETH is not set
382 428
383# 429#
@@ -407,7 +453,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
407# CONFIG_BLK_DEV_OFFBOARD is not set 453# CONFIG_BLK_DEV_OFFBOARD is not set
408CONFIG_BLK_DEV_GENERIC=y 454CONFIG_BLK_DEV_GENERIC=y
409# CONFIG_BLK_DEV_OPTI621 is not set 455# CONFIG_BLK_DEV_OPTI621 is not set
410CONFIG_BLK_DEV_SL82C105=y 456# CONFIG_BLK_DEV_SL82C105 is not set
411CONFIG_BLK_DEV_IDEDMA_PCI=y 457CONFIG_BLK_DEV_IDEDMA_PCI=y
412# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 458# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
413CONFIG_IDEDMA_PCI_AUTO=y 459CONFIG_IDEDMA_PCI_AUTO=y
@@ -479,6 +525,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m
479# 525#
480# SCSI low-level drivers 526# SCSI low-level drivers
481# 527#
528# CONFIG_ISCSI_TCP is not set
482# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 529# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
483# CONFIG_SCSI_3W_9XXX is not set 530# CONFIG_SCSI_3W_9XXX is not set
484# CONFIG_SCSI_ACARD is not set 531# CONFIG_SCSI_ACARD is not set
@@ -495,10 +542,12 @@ CONFIG_SCSI_SATA_SVW=y
495# CONFIG_SCSI_ATA_PIIX is not set 542# CONFIG_SCSI_ATA_PIIX is not set
496# CONFIG_SCSI_SATA_MV is not set 543# CONFIG_SCSI_SATA_MV is not set
497# CONFIG_SCSI_SATA_NV is not set 544# CONFIG_SCSI_SATA_NV is not set
498# CONFIG_SCSI_SATA_PROMISE is not set 545# CONFIG_SCSI_PDC_ADMA is not set
499# CONFIG_SCSI_SATA_QSTOR is not set 546# CONFIG_SCSI_SATA_QSTOR is not set
547# CONFIG_SCSI_SATA_PROMISE is not set
500# CONFIG_SCSI_SATA_SX4 is not set 548# CONFIG_SCSI_SATA_SX4 is not set
501# CONFIG_SCSI_SATA_SIL is not set 549# CONFIG_SCSI_SATA_SIL is not set
550# CONFIG_SCSI_SATA_SIL24 is not set
502# CONFIG_SCSI_SATA_SIS is not set 551# CONFIG_SCSI_SATA_SIS is not set
503# CONFIG_SCSI_SATA_ULI is not set 552# CONFIG_SCSI_SATA_ULI is not set
504# CONFIG_SCSI_SATA_VIA is not set 553# CONFIG_SCSI_SATA_VIA is not set
@@ -512,8 +561,6 @@ CONFIG_SCSI_SATA_SVW=y
512CONFIG_SCSI_IBMVSCSI=y 561CONFIG_SCSI_IBMVSCSI=y
513# CONFIG_SCSI_INITIO is not set 562# CONFIG_SCSI_INITIO is not set
514# CONFIG_SCSI_INIA100 is not set 563# CONFIG_SCSI_INIA100 is not set
515# CONFIG_SCSI_PPA is not set
516# CONFIG_SCSI_IMM is not set
517CONFIG_SCSI_SYM53C8XX_2=y 564CONFIG_SCSI_SYM53C8XX_2=y
518CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 565CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
519CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 566CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
@@ -608,6 +655,9 @@ CONFIG_IEEE1394_AMDTP=m
608CONFIG_ADB_PMU=y 655CONFIG_ADB_PMU=y
609CONFIG_PMAC_SMU=y 656CONFIG_PMAC_SMU=y
610CONFIG_THERM_PM72=y 657CONFIG_THERM_PM72=y
658CONFIG_WINDFARM=y
659CONFIG_WINDFARM_PM81=y
660CONFIG_WINDFARM_PM91=y
611 661
612# 662#
613# Network device support 663# Network device support
@@ -664,7 +714,6 @@ CONFIG_E100=y
664# CONFIG_EPIC100 is not set 714# CONFIG_EPIC100 is not set
665# CONFIG_SUNDANCE is not set 715# CONFIG_SUNDANCE is not set
666# CONFIG_VIA_RHINE is not set 716# CONFIG_VIA_RHINE is not set
667# CONFIG_NET_POCKET is not set
668 717
669# 718#
670# Ethernet (1000 Mbit) 719# Ethernet (1000 Mbit)
@@ -684,7 +733,6 @@ CONFIG_E1000=y
684# CONFIG_VIA_VELOCITY is not set 733# CONFIG_VIA_VELOCITY is not set
685CONFIG_TIGON3=y 734CONFIG_TIGON3=y
686# CONFIG_BNX2 is not set 735# CONFIG_BNX2 is not set
687# CONFIG_SPIDER_NET is not set
688# CONFIG_MV643XX_ETH is not set 736# CONFIG_MV643XX_ETH is not set
689 737
690# 738#
@@ -714,7 +762,6 @@ CONFIG_IBMOL=y
714# CONFIG_WAN is not set 762# CONFIG_WAN is not set
715# CONFIG_FDDI is not set 763# CONFIG_FDDI is not set
716# CONFIG_HIPPI is not set 764# CONFIG_HIPPI is not set
717# CONFIG_PLIP is not set
718CONFIG_PPP=m 765CONFIG_PPP=m
719# CONFIG_PPP_MULTILINK is not set 766# CONFIG_PPP_MULTILINK is not set
720# CONFIG_PPP_FILTER is not set 767# CONFIG_PPP_FILTER is not set
@@ -722,6 +769,7 @@ CONFIG_PPP_ASYNC=m
722CONFIG_PPP_SYNC_TTY=m 769CONFIG_PPP_SYNC_TTY=m
723CONFIG_PPP_DEFLATE=m 770CONFIG_PPP_DEFLATE=m
724CONFIG_PPP_BSDCOMP=m 771CONFIG_PPP_BSDCOMP=m
772# CONFIG_PPP_MPPE is not set
725CONFIG_PPPOE=m 773CONFIG_PPPOE=m
726# CONFIG_SLIP is not set 774# CONFIG_SLIP is not set
727# CONFIG_NET_FC is not set 775# CONFIG_NET_FC is not set
@@ -784,7 +832,6 @@ CONFIG_INPUT_PCSPKR=m
784CONFIG_SERIO=y 832CONFIG_SERIO=y
785CONFIG_SERIO_I8042=y 833CONFIG_SERIO_I8042=y
786# CONFIG_SERIO_SERPORT is not set 834# CONFIG_SERIO_SERPORT is not set
787# CONFIG_SERIO_PARKBD is not set
788# CONFIG_SERIO_PCIPS2 is not set 835# CONFIG_SERIO_PCIPS2 is not set
789CONFIG_SERIO_LIBPS2=y 836CONFIG_SERIO_LIBPS2=y
790# CONFIG_SERIO_RAW is not set 837# CONFIG_SERIO_RAW is not set
@@ -817,10 +864,6 @@ CONFIG_SERIAL_JSM=m
817CONFIG_UNIX98_PTYS=y 864CONFIG_UNIX98_PTYS=y
818CONFIG_LEGACY_PTYS=y 865CONFIG_LEGACY_PTYS=y
819CONFIG_LEGACY_PTY_COUNT=256 866CONFIG_LEGACY_PTY_COUNT=256
820CONFIG_PRINTER=m
821# CONFIG_LP_CONSOLE is not set
822# CONFIG_PPDEV is not set
823# CONFIG_TIPAR is not set
824CONFIG_HVC_CONSOLE=y 867CONFIG_HVC_CONSOLE=y
825CONFIG_HVCS=m 868CONFIG_HVCS=m
826 869
@@ -834,6 +877,7 @@ CONFIG_HVCS=m
834# 877#
835# CONFIG_WATCHDOG is not set 878# CONFIG_WATCHDOG is not set
836# CONFIG_RTC is not set 879# CONFIG_RTC is not set
880# CONFIG_GEN_RTC is not set
837# CONFIG_DTLK is not set 881# CONFIG_DTLK is not set
838# CONFIG_R3964 is not set 882# CONFIG_R3964 is not set
839# CONFIG_APPLICOM is not set 883# CONFIG_APPLICOM is not set
@@ -851,6 +895,7 @@ CONFIG_MAX_RAW_DEVS=256
851# TPM devices 895# TPM devices
852# 896#
853# CONFIG_TCG_TPM is not set 897# CONFIG_TCG_TPM is not set
898# CONFIG_TELCLOCK is not set
854 899
855# 900#
856# I2C support 901# I2C support
@@ -879,7 +924,6 @@ CONFIG_I2C_AMD8111=y
879CONFIG_I2C_KEYWEST=y 924CONFIG_I2C_KEYWEST=y
880CONFIG_I2C_PMAC_SMU=y 925CONFIG_I2C_PMAC_SMU=y
881# CONFIG_I2C_NFORCE2 is not set 926# CONFIG_I2C_NFORCE2 is not set
882# CONFIG_I2C_PARPORT is not set
883# CONFIG_I2C_PARPORT_LIGHT is not set 927# CONFIG_I2C_PARPORT_LIGHT is not set
884# CONFIG_I2C_PROSAVAGE is not set 928# CONFIG_I2C_PROSAVAGE is not set
885# CONFIG_I2C_SAVAGE4 is not set 929# CONFIG_I2C_SAVAGE4 is not set
@@ -904,6 +948,7 @@ CONFIG_I2C_PMAC_SMU=y
904# CONFIG_SENSORS_PCF8591 is not set 948# CONFIG_SENSORS_PCF8591 is not set
905# CONFIG_SENSORS_RTC8564 is not set 949# CONFIG_SENSORS_RTC8564 is not set
906# CONFIG_SENSORS_MAX6875 is not set 950# CONFIG_SENSORS_MAX6875 is not set
951# CONFIG_RTC_X1205_I2C is not set
907# CONFIG_I2C_DEBUG_CORE is not set 952# CONFIG_I2C_DEBUG_CORE is not set
908# CONFIG_I2C_DEBUG_ALGO is not set 953# CONFIG_I2C_DEBUG_ALGO is not set
909# CONFIG_I2C_DEBUG_BUS is not set 954# CONFIG_I2C_DEBUG_BUS is not set
@@ -945,7 +990,6 @@ CONFIG_FB=y
945CONFIG_FB_CFB_FILLRECT=y 990CONFIG_FB_CFB_FILLRECT=y
946CONFIG_FB_CFB_COPYAREA=y 991CONFIG_FB_CFB_COPYAREA=y
947CONFIG_FB_CFB_IMAGEBLIT=y 992CONFIG_FB_CFB_IMAGEBLIT=y
948CONFIG_FB_SOFT_CURSOR=y
949CONFIG_FB_MACMODES=y 993CONFIG_FB_MACMODES=y
950CONFIG_FB_MODE_HELPERS=y 994CONFIG_FB_MODE_HELPERS=y
951CONFIG_FB_TILEBLITTING=y 995CONFIG_FB_TILEBLITTING=y
@@ -960,6 +1004,7 @@ CONFIG_FB_OF=y
960# CONFIG_FB_ASILIANT is not set 1004# CONFIG_FB_ASILIANT is not set
961# CONFIG_FB_IMSTT is not set 1005# CONFIG_FB_IMSTT is not set
962# CONFIG_FB_VGA16 is not set 1006# CONFIG_FB_VGA16 is not set
1007# CONFIG_FB_S1D13XXX is not set
963# CONFIG_FB_NVIDIA is not set 1008# CONFIG_FB_NVIDIA is not set
964# CONFIG_FB_RIVA is not set 1009# CONFIG_FB_RIVA is not set
965CONFIG_FB_MATROX=y 1010CONFIG_FB_MATROX=y
@@ -983,7 +1028,6 @@ CONFIG_FB_RADEON_I2C=y
983# CONFIG_FB_VOODOO1 is not set 1028# CONFIG_FB_VOODOO1 is not set
984# CONFIG_FB_CYBLA is not set 1029# CONFIG_FB_CYBLA is not set
985# CONFIG_FB_TRIDENT is not set 1030# CONFIG_FB_TRIDENT is not set
986# CONFIG_FB_S1D13XXX is not set
987# CONFIG_FB_VIRTUAL is not set 1031# CONFIG_FB_VIRTUAL is not set
988 1032
989# 1033#
@@ -992,6 +1036,7 @@ CONFIG_FB_RADEON_I2C=y
992# CONFIG_VGA_CONSOLE is not set 1036# CONFIG_VGA_CONSOLE is not set
993CONFIG_DUMMY_CONSOLE=y 1037CONFIG_DUMMY_CONSOLE=y
994CONFIG_FRAMEBUFFER_CONSOLE=y 1038CONFIG_FRAMEBUFFER_CONSOLE=y
1039# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
995# CONFIG_FONTS is not set 1040# CONFIG_FONTS is not set
996CONFIG_FONT_8x8=y 1041CONFIG_FONT_8x8=y
997CONFIG_FONT_8x16=y 1042CONFIG_FONT_8x16=y
@@ -1012,7 +1057,94 @@ CONFIG_LCD_DEVICE=y
1012# 1057#
1013# Sound 1058# Sound
1014# 1059#
1015# CONFIG_SOUND is not set 1060CONFIG_SOUND=m
1061
1062#
1063# Advanced Linux Sound Architecture
1064#
1065CONFIG_SND=m
1066CONFIG_SND_TIMER=m
1067CONFIG_SND_PCM=m
1068CONFIG_SND_SEQUENCER=m
1069CONFIG_SND_SEQ_DUMMY=m
1070CONFIG_SND_OSSEMUL=y
1071CONFIG_SND_MIXER_OSS=m
1072CONFIG_SND_PCM_OSS=m
1073CONFIG_SND_SEQUENCER_OSS=y
1074# CONFIG_SND_VERBOSE_PRINTK is not set
1075# CONFIG_SND_DEBUG is not set
1076CONFIG_SND_GENERIC_DRIVER=y
1077
1078#
1079# Generic devices
1080#
1081# CONFIG_SND_DUMMY is not set
1082# CONFIG_SND_VIRMIDI is not set
1083# CONFIG_SND_MTPAV is not set
1084# CONFIG_SND_SERIAL_U16550 is not set
1085# CONFIG_SND_MPU401 is not set
1086
1087#
1088# PCI devices
1089#
1090# CONFIG_SND_ALI5451 is not set
1091# CONFIG_SND_ATIIXP is not set
1092# CONFIG_SND_ATIIXP_MODEM is not set
1093# CONFIG_SND_AU8810 is not set
1094# CONFIG_SND_AU8820 is not set
1095# CONFIG_SND_AU8830 is not set
1096# CONFIG_SND_AZT3328 is not set
1097# CONFIG_SND_BT87X is not set
1098# CONFIG_SND_CS46XX is not set
1099# CONFIG_SND_CS4281 is not set
1100# CONFIG_SND_EMU10K1 is not set
1101# CONFIG_SND_EMU10K1X is not set
1102# CONFIG_SND_CA0106 is not set
1103# CONFIG_SND_KORG1212 is not set
1104# CONFIG_SND_MIXART is not set
1105# CONFIG_SND_NM256 is not set
1106# CONFIG_SND_RME32 is not set
1107# CONFIG_SND_RME96 is not set
1108# CONFIG_SND_RME9652 is not set
1109# CONFIG_SND_HDSP is not set
1110# CONFIG_SND_HDSPM is not set
1111# CONFIG_SND_TRIDENT is not set
1112# CONFIG_SND_YMFPCI is not set
1113# CONFIG_SND_AD1889 is not set
1114# CONFIG_SND_ALS4000 is not set
1115# CONFIG_SND_CMIPCI is not set
1116# CONFIG_SND_ENS1370 is not set
1117# CONFIG_SND_ENS1371 is not set
1118# CONFIG_SND_ES1938 is not set
1119# CONFIG_SND_ES1968 is not set
1120# CONFIG_SND_MAESTRO3 is not set
1121# CONFIG_SND_FM801 is not set
1122# CONFIG_SND_ICE1712 is not set
1123# CONFIG_SND_ICE1724 is not set
1124# CONFIG_SND_INTEL8X0 is not set
1125# CONFIG_SND_INTEL8X0M is not set
1126# CONFIG_SND_SONICVIBES is not set
1127# CONFIG_SND_VIA82XX is not set
1128# CONFIG_SND_VIA82XX_MODEM is not set
1129# CONFIG_SND_VX222 is not set
1130# CONFIG_SND_HDA_INTEL is not set
1131
1132#
1133# ALSA PowerMac devices
1134#
1135CONFIG_SND_POWERMAC=m
1136CONFIG_SND_POWERMAC_AUTO_DRC=y
1137
1138#
1139# USB devices
1140#
1141# CONFIG_SND_USB_AUDIO is not set
1142# CONFIG_SND_USB_USX2Y is not set
1143
1144#
1145# Open Sound System
1146#
1147# CONFIG_SOUND_PRIME is not set
1016 1148
1017# 1149#
1018# USB support 1150# USB support
@@ -1046,12 +1178,16 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1046# 1178#
1047# USB Device Class drivers 1179# USB Device Class drivers
1048# 1180#
1049# CONFIG_USB_BLUETOOTH_TTY is not set 1181# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
1050# CONFIG_USB_ACM is not set 1182# CONFIG_USB_ACM is not set
1051# CONFIG_USB_PRINTER is not set 1183# CONFIG_USB_PRINTER is not set
1052 1184
1053# 1185#
1054# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information 1186# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1187#
1188
1189#
1190# may also be needed; see USB_STORAGE Help for more information
1055# 1191#
1056CONFIG_USB_STORAGE=m 1192CONFIG_USB_STORAGE=m
1057# CONFIG_USB_STORAGE_DEBUG is not set 1193# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1106,7 +1242,7 @@ CONFIG_USB_HIDDEV=y
1106# 1242#
1107# CONFIG_USB_CATC is not set 1243# CONFIG_USB_CATC is not set
1108# CONFIG_USB_KAWETH is not set 1244# CONFIG_USB_KAWETH is not set
1109CONFIG_USB_PEGASUS=y 1245# CONFIG_USB_PEGASUS is not set
1110# CONFIG_USB_RTL8150 is not set 1246# CONFIG_USB_RTL8150 is not set
1111# CONFIG_USB_USBNET is not set 1247# CONFIG_USB_USBNET is not set
1112# CONFIG_USB_MON is not set 1248# CONFIG_USB_MON is not set
@@ -1114,7 +1250,6 @@ CONFIG_USB_PEGASUS=y
1114# 1250#
1115# USB port drivers 1251# USB port drivers
1116# 1252#
1117# CONFIG_USB_USS720 is not set
1118 1253
1119# 1254#
1120# USB Serial Converter support 1255# USB Serial Converter support
@@ -1163,6 +1298,7 @@ CONFIG_INFINIBAND_MTHCA=m
1163# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1298# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
1164CONFIG_INFINIBAND_IPOIB=m 1299CONFIG_INFINIBAND_IPOIB=m
1165# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1300# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
1301# CONFIG_INFINIBAND_SRP is not set
1166 1302
1167# 1303#
1168# SN Devices 1304# SN Devices
@@ -1358,10 +1494,25 @@ CONFIG_NLS_KOI8_U=m
1358CONFIG_NLS_UTF8=m 1494CONFIG_NLS_UTF8=m
1359 1495
1360# 1496#
1361# Profiling support 1497# Library routines
1498#
1499CONFIG_CRC_CCITT=m
1500# CONFIG_CRC16 is not set
1501CONFIG_CRC32=y
1502CONFIG_LIBCRC32C=m
1503CONFIG_ZLIB_INFLATE=y
1504CONFIG_ZLIB_DEFLATE=m
1505CONFIG_TEXTSEARCH=y
1506CONFIG_TEXTSEARCH_KMP=m
1507CONFIG_TEXTSEARCH_BM=m
1508CONFIG_TEXTSEARCH_FSM=m
1509
1510#
1511# Instrumentation Support
1362# 1512#
1363CONFIG_PROFILING=y 1513CONFIG_PROFILING=y
1364CONFIG_OPROFILE=y 1514CONFIG_OPROFILE=y
1515# CONFIG_KPROBES is not set
1365 1516
1366# 1517#
1367# Kernel hacking 1518# Kernel hacking
@@ -1378,14 +1529,15 @@ CONFIG_DETECT_SOFTLOCKUP=y
1378# CONFIG_DEBUG_KOBJECT is not set 1529# CONFIG_DEBUG_KOBJECT is not set
1379# CONFIG_DEBUG_INFO is not set 1530# CONFIG_DEBUG_INFO is not set
1380CONFIG_DEBUG_FS=y 1531CONFIG_DEBUG_FS=y
1532# CONFIG_DEBUG_VM is not set
1533# CONFIG_RCU_TORTURE_TEST is not set
1381CONFIG_DEBUG_STACKOVERFLOW=y 1534CONFIG_DEBUG_STACKOVERFLOW=y
1382# CONFIG_KPROBES is not set
1383CONFIG_DEBUG_STACK_USAGE=y 1535CONFIG_DEBUG_STACK_USAGE=y
1384CONFIG_DEBUGGER=y 1536CONFIG_DEBUGGER=y
1385CONFIG_XMON=y 1537CONFIG_XMON=y
1386# CONFIG_XMON_DEFAULT is not set 1538# CONFIG_XMON_DEFAULT is not set
1387# CONFIG_PPCDBG is not set
1388CONFIG_IRQSTACKS=y 1539CONFIG_IRQSTACKS=y
1540CONFIG_BOOTX_TEXT=y
1389 1541
1390# 1542#
1391# Security options 1543# Security options
@@ -1425,17 +1577,3 @@ CONFIG_CRYPTO_TEST=m
1425# 1577#
1426# Hardware crypto devices 1578# Hardware crypto devices
1427# 1579#
1428
1429#
1430# Library routines
1431#
1432CONFIG_CRC_CCITT=m
1433# CONFIG_CRC16 is not set
1434CONFIG_CRC32=y
1435CONFIG_LIBCRC32C=m
1436CONFIG_ZLIB_INFLATE=y
1437CONFIG_ZLIB_DEFLATE=m
1438CONFIG_TEXTSEARCH=y
1439CONFIG_TEXTSEARCH_KMP=m
1440CONFIG_TEXTSEARCH_BM=m
1441CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index b4745c918a4a..b589b196eb3f 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -165,7 +165,6 @@ CONFIG_SPARSEMEM_EXTREME=y
165# CONFIG_MEMORY_HOTPLUG is not set 165# CONFIG_MEMORY_HOTPLUG is not set
166CONFIG_SPLIT_PTLOCK_CPUS=4096 166CONFIG_SPLIT_PTLOCK_CPUS=4096
167CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y 167CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
168CONFIG_NODES_SPAN_OTHER_NODES=y
169# CONFIG_PPC_64K_PAGES is not set 168# CONFIG_PPC_64K_PAGES is not set
170CONFIG_SCHED_SMT=y 169CONFIG_SCHED_SMT=y
171CONFIG_PROC_DEVICETREE=y 170CONFIG_PROC_DEVICETREE=y
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 4970e3721a84..9ed551b6c172 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -12,12 +12,12 @@ CFLAGS_btext.o += -fPIC
12endif 12endif
13 13
14obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ 14obj-y := semaphore.o cputable.o ptrace.o syscalls.o \
15 irq.o signal_32.o pmc.o vdso.o 15 irq.o align.o signal_32.o pmc.o vdso.o
16obj-y += vdso32/ 16obj-y += vdso32/
17obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \ 17obj-$(CONFIG_PPC64) += setup_64.o binfmt_elf32.o sys_ppc32.o \
18 signal_64.o ptrace32.o systbl.o \ 18 signal_64.o ptrace32.o systbl.o \
19 paca.o ioctl32.o cpu_setup_power4.o \ 19 paca.o ioctl32.o cpu_setup_power4.o \
20 firmware.o sysfs.o udbg.o 20 firmware.o sysfs.o udbg.o idle_64.o
21obj-$(CONFIG_PPC64) += vdso64/ 21obj-$(CONFIG_PPC64) += vdso64/
22obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o 22obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
23obj-$(CONFIG_POWER4) += idle_power4.o 23obj-$(CONFIG_POWER4) += idle_power4.o
@@ -35,6 +35,7 @@ obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o
35obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o 35obj-$(CONFIG_PPC_MAPLE) += udbg_16550.o
36udbgscc-$(CONFIG_PPC64) := udbg_scc.o 36udbgscc-$(CONFIG_PPC64) := udbg_scc.o
37obj-$(CONFIG_PPC_PMAC) += $(udbgscc-y) 37obj-$(CONFIG_PPC_PMAC) += $(udbgscc-y)
38obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
38 39
39ifeq ($(CONFIG_PPC_MERGE),y) 40ifeq ($(CONFIG_PPC_MERGE),y)
40 41
@@ -78,5 +79,7 @@ smpobj-$(CONFIG_SMP) += smp.o
78 79
79endif 80endif
80 81
82obj-$(CONFIG_PPC64) += $(obj64-y)
83
81extra-$(CONFIG_PPC_FPU) += fpu.o 84extra-$(CONFIG_PPC_FPU) += fpu.o
82extra-$(CONFIG_PPC64) += entry_64.o 85extra-$(CONFIG_PPC64) += entry_64.o
diff --git a/arch/ppc64/kernel/align.c b/arch/powerpc/kernel/align.c
index 256d5b592aa1..faaec9c6f78f 100644
--- a/arch/ppc64/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -7,6 +7,9 @@
7 * PowerPC 403GCX/405GP modifications. 7 * PowerPC 403GCX/405GP modifications.
8 * Copyright (c) 2001-2002 PPC64 team, IBM Corp 8 * Copyright (c) 2001-2002 PPC64 team, IBM Corp
9 * 64-bit and Power4 support 9 * 64-bit and Power4 support
10 * Copyright (c) 2005 Benjamin Herrenschmidt, IBM Corp
11 * <benh@kernel.crashing.org>
12 * Merge ppc32 and ppc64 implementations
10 * 13 *
11 * This program is free software; you can redistribute it and/or 14 * This program is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Public License 15 * modify it under the terms of the GNU General Public License
@@ -38,10 +41,15 @@ struct aligninfo {
38#define F 8 /* to/from fp regs */ 41#define F 8 /* to/from fp regs */
39#define U 0x10 /* update index register */ 42#define U 0x10 /* update index register */
40#define M 0x20 /* multiple load/store */ 43#define M 0x20 /* multiple load/store */
41#define SW 0x40 /* byte swap */ 44#define SW 0x40 /* byte swap int or ... */
45#define S 0x40 /* ... single-precision fp */
46#define SX 0x40 /* byte count in XER */
47#define HARD 0x80 /* string, stwcx. */
42 48
43#define DCBZ 0x5f /* 8xx/82xx dcbz faults when cache not enabled */ 49#define DCBZ 0x5f /* 8xx/82xx dcbz faults when cache not enabled */
44 50
51#define SWAP(a, b) (t = (a), (a) = (b), (b) = t)
52
45/* 53/*
46 * The PowerPC stores certain bits of the instruction that caused the 54 * The PowerPC stores certain bits of the instruction that caused the
47 * alignment exception in the DSISR register. This array maps those 55 * alignment exception in the DSISR register. This array maps those
@@ -57,14 +65,14 @@ static struct aligninfo aligninfo[128] = {
57 { 2, LD+SE }, /* 00 0 0101: lha */ 65 { 2, LD+SE }, /* 00 0 0101: lha */
58 { 2, ST }, /* 00 0 0110: sth */ 66 { 2, ST }, /* 00 0 0110: sth */
59 { 4, LD+M }, /* 00 0 0111: lmw */ 67 { 4, LD+M }, /* 00 0 0111: lmw */
60 { 4, LD+F }, /* 00 0 1000: lfs */ 68 { 4, LD+F+S }, /* 00 0 1000: lfs */
61 { 8, LD+F }, /* 00 0 1001: lfd */ 69 { 8, LD+F }, /* 00 0 1001: lfd */
62 { 4, ST+F }, /* 00 0 1010: stfs */ 70 { 4, ST+F+S }, /* 00 0 1010: stfs */
63 { 8, ST+F }, /* 00 0 1011: stfd */ 71 { 8, ST+F }, /* 00 0 1011: stfd */
64 INVALID, /* 00 0 1100 */ 72 INVALID, /* 00 0 1100 */
65 { 8, LD }, /* 00 0 1101: ld */ 73 { 8, LD }, /* 00 0 1101: ld/ldu/lwa */
66 INVALID, /* 00 0 1110 */ 74 INVALID, /* 00 0 1110 */
67 { 8, ST }, /* 00 0 1111: std */ 75 { 8, ST }, /* 00 0 1111: std/stdu */
68 { 4, LD+U }, /* 00 1 0000: lwzu */ 76 { 4, LD+U }, /* 00 1 0000: lwzu */
69 INVALID, /* 00 1 0001 */ 77 INVALID, /* 00 1 0001 */
70 { 4, ST+U }, /* 00 1 0010: stwu */ 78 { 4, ST+U }, /* 00 1 0010: stwu */
@@ -73,9 +81,9 @@ static struct aligninfo aligninfo[128] = {
73 { 2, LD+SE+U }, /* 00 1 0101: lhau */ 81 { 2, LD+SE+U }, /* 00 1 0101: lhau */
74 { 2, ST+U }, /* 00 1 0110: sthu */ 82 { 2, ST+U }, /* 00 1 0110: sthu */
75 { 4, ST+M }, /* 00 1 0111: stmw */ 83 { 4, ST+M }, /* 00 1 0111: stmw */
76 { 4, LD+F+U }, /* 00 1 1000: lfsu */ 84 { 4, LD+F+S+U }, /* 00 1 1000: lfsu */
77 { 8, LD+F+U }, /* 00 1 1001: lfdu */ 85 { 8, LD+F+U }, /* 00 1 1001: lfdu */
78 { 4, ST+F+U }, /* 00 1 1010: stfsu */ 86 { 4, ST+F+S+U }, /* 00 1 1010: stfsu */
79 { 8, ST+F+U }, /* 00 1 1011: stfdu */ 87 { 8, ST+F+U }, /* 00 1 1011: stfdu */
80 INVALID, /* 00 1 1100 */ 88 INVALID, /* 00 1 1100 */
81 INVALID, /* 00 1 1101 */ 89 INVALID, /* 00 1 1101 */
@@ -89,10 +97,10 @@ static struct aligninfo aligninfo[128] = {
89 { 4, LD+SE }, /* 01 0 0101: lwax */ 97 { 4, LD+SE }, /* 01 0 0101: lwax */
90 INVALID, /* 01 0 0110 */ 98 INVALID, /* 01 0 0110 */
91 INVALID, /* 01 0 0111 */ 99 INVALID, /* 01 0 0111 */
92 { 0, LD }, /* 01 0 1000: lswx */ 100 { 4, LD+M+HARD+SX }, /* 01 0 1000: lswx */
93 { 0, LD }, /* 01 0 1001: lswi */ 101 { 4, LD+M+HARD }, /* 01 0 1001: lswi */
94 { 0, ST }, /* 01 0 1010: stswx */ 102 { 4, ST+M+HARD+SX }, /* 01 0 1010: stswx */
95 { 0, ST }, /* 01 0 1011: stswi */ 103 { 4, ST+M+HARD }, /* 01 0 1011: stswi */
96 INVALID, /* 01 0 1100 */ 104 INVALID, /* 01 0 1100 */
97 { 8, LD+U }, /* 01 0 1101: ldu */ 105 { 8, LD+U }, /* 01 0 1101: ldu */
98 INVALID, /* 01 0 1110 */ 106 INVALID, /* 01 0 1110 */
@@ -115,7 +123,7 @@ static struct aligninfo aligninfo[128] = {
115 INVALID, /* 01 1 1111 */ 123 INVALID, /* 01 1 1111 */
116 INVALID, /* 10 0 0000 */ 124 INVALID, /* 10 0 0000 */
117 INVALID, /* 10 0 0001 */ 125 INVALID, /* 10 0 0001 */
118 { 0, ST }, /* 10 0 0010: stwcx. */ 126 INVALID, /* 10 0 0010: stwcx. */
119 INVALID, /* 10 0 0011 */ 127 INVALID, /* 10 0 0011 */
120 INVALID, /* 10 0 0100 */ 128 INVALID, /* 10 0 0100 */
121 INVALID, /* 10 0 0101 */ 129 INVALID, /* 10 0 0101 */
@@ -144,7 +152,7 @@ static struct aligninfo aligninfo[128] = {
144 INVALID, /* 10 1 1100 */ 152 INVALID, /* 10 1 1100 */
145 INVALID, /* 10 1 1101 */ 153 INVALID, /* 10 1 1101 */
146 INVALID, /* 10 1 1110 */ 154 INVALID, /* 10 1 1110 */
147 { L1_CACHE_BYTES, ST }, /* 10 1 1111: dcbz */ 155 { 0, ST+HARD }, /* 10 1 1111: dcbz */
148 { 4, LD }, /* 11 0 0000: lwzx */ 156 { 4, LD }, /* 11 0 0000: lwzx */
149 INVALID, /* 11 0 0001 */ 157 INVALID, /* 11 0 0001 */
150 { 4, ST }, /* 11 0 0010: stwx */ 158 { 4, ST }, /* 11 0 0010: stwx */
@@ -153,9 +161,9 @@ static struct aligninfo aligninfo[128] = {
153 { 2, LD+SE }, /* 11 0 0101: lhax */ 161 { 2, LD+SE }, /* 11 0 0101: lhax */
154 { 2, ST }, /* 11 0 0110: sthx */ 162 { 2, ST }, /* 11 0 0110: sthx */
155 INVALID, /* 11 0 0111 */ 163 INVALID, /* 11 0 0111 */
156 { 4, LD+F }, /* 11 0 1000: lfsx */ 164 { 4, LD+F+S }, /* 11 0 1000: lfsx */
157 { 8, LD+F }, /* 11 0 1001: lfdx */ 165 { 8, LD+F }, /* 11 0 1001: lfdx */
158 { 4, ST+F }, /* 11 0 1010: stfsx */ 166 { 4, ST+F+S }, /* 11 0 1010: stfsx */
159 { 8, ST+F }, /* 11 0 1011: stfdx */ 167 { 8, ST+F }, /* 11 0 1011: stfdx */
160 INVALID, /* 11 0 1100 */ 168 INVALID, /* 11 0 1100 */
161 { 8, LD+M }, /* 11 0 1101: lmd */ 169 { 8, LD+M }, /* 11 0 1101: lmd */
@@ -169,9 +177,9 @@ static struct aligninfo aligninfo[128] = {
169 { 2, LD+SE+U }, /* 11 1 0101: lhaux */ 177 { 2, LD+SE+U }, /* 11 1 0101: lhaux */
170 { 2, ST+U }, /* 11 1 0110: sthux */ 178 { 2, ST+U }, /* 11 1 0110: sthux */
171 INVALID, /* 11 1 0111 */ 179 INVALID, /* 11 1 0111 */
172 { 4, LD+F+U }, /* 11 1 1000: lfsux */ 180 { 4, LD+F+S+U }, /* 11 1 1000: lfsux */
173 { 8, LD+F+U }, /* 11 1 1001: lfdux */ 181 { 8, LD+F+U }, /* 11 1 1001: lfdux */
174 { 4, ST+F+U }, /* 11 1 1010: stfsux */ 182 { 4, ST+F+S+U }, /* 11 1 1010: stfsux */
175 { 8, ST+F+U }, /* 11 1 1011: stfdux */ 183 { 8, ST+F+U }, /* 11 1 1011: stfdux */
176 INVALID, /* 11 1 1100 */ 184 INVALID, /* 11 1 1100 */
177 INVALID, /* 11 1 1101 */ 185 INVALID, /* 11 1 1101 */
@@ -179,45 +187,175 @@ static struct aligninfo aligninfo[128] = {
179 INVALID, /* 11 1 1111 */ 187 INVALID, /* 11 1 1111 */
180}; 188};
181 189
182#define SWAP(a, b) (t = (a), (a) = (b), (b) = t) 190/*
183 191 * Create a DSISR value from the instruction
192 */
184static inline unsigned make_dsisr(unsigned instr) 193static inline unsigned make_dsisr(unsigned instr)
185{ 194{
186 unsigned dsisr; 195 unsigned dsisr;
187 196
188 /* create a DSISR value from the instruction */ 197
189 dsisr = (instr & 0x03ff0000) >> 16; /* bits 6:15 --> 22:31 */ 198 /* bits 6:15 --> 22:31 */
190 199 dsisr = (instr & 0x03ff0000) >> 16;
191 if ( IS_XFORM(instr) ) { 200
192 dsisr |= (instr & 0x00000006) << 14; /* bits 29:30 --> 15:16 */ 201 if (IS_XFORM(instr)) {
193 dsisr |= (instr & 0x00000040) << 8; /* bit 25 --> 17 */ 202 /* bits 29:30 --> 15:16 */
194 dsisr |= (instr & 0x00000780) << 3; /* bits 21:24 --> 18:21 */ 203 dsisr |= (instr & 0x00000006) << 14;
204 /* bit 25 --> 17 */
205 dsisr |= (instr & 0x00000040) << 8;
206 /* bits 21:24 --> 18:21 */
207 dsisr |= (instr & 0x00000780) << 3;
208 } else {
209 /* bit 5 --> 17 */
210 dsisr |= (instr & 0x04000000) >> 12;
211 /* bits 1: 4 --> 18:21 */
212 dsisr |= (instr & 0x78000000) >> 17;
213 /* bits 30:31 --> 12:13 */
214 if (IS_DSFORM(instr))
215 dsisr |= (instr & 0x00000003) << 18;
195 } 216 }
196 else { 217
197 dsisr |= (instr & 0x04000000) >> 12; /* bit 5 --> 17 */ 218 return dsisr;
198 dsisr |= (instr & 0x78000000) >> 17; /* bits 1: 4 --> 18:21 */ 219}
199 if ( IS_DSFORM(instr) ) { 220
200 dsisr |= (instr & 0x00000003) << 18; /* bits 30:31 --> 12:13 */ 221/*
222 * The dcbz (data cache block zero) instruction
223 * gives an alignment fault if used on non-cacheable
224 * memory. We handle the fault mainly for the
225 * case when we are running with the cache disabled
226 * for debugging.
227 */
228static int emulate_dcbz(struct pt_regs *regs, unsigned char __user *addr)
229{
230 long __user *p;
231 int i, size;
232
233#ifdef __powerpc64__
234 size = ppc64_caches.dline_size;
235#else
236 size = L1_CACHE_BYTES;
237#endif
238 p = (long __user *) (regs->dar & -size);
239 if (user_mode(regs) && !access_ok(VERIFY_WRITE, p, size))
240 return -EFAULT;
241 for (i = 0; i < size / sizeof(long); ++i)
242 if (__put_user(0, p+i))
243 return -EFAULT;
244 return 1;
245}
246
247/*
248 * Emulate load & store multiple instructions
249 * On 64-bit machines, these instructions only affect/use the
250 * bottom 4 bytes of each register, and the loads clear the
251 * top 4 bytes of the affected register.
252 */
253#ifdef CONFIG_PPC64
254#define REG_BYTE(rp, i) *((u8 *)((rp) + ((i) >> 2)) + ((i) & 3) + 4)
255#else
256#define REG_BYTE(rp, i) *((u8 *)(rp) + (i))
257#endif
258
259static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,
260 unsigned int reg, unsigned int nb,
261 unsigned int flags, unsigned int instr)
262{
263 unsigned long *rptr;
264 unsigned int nb0, i;
265
266 /*
267 * We do not try to emulate 8 bytes multiple as they aren't really
268 * available in our operating environments and we don't try to
269 * emulate multiples operations in kernel land as they should never
270 * be used/generated there at least not on unaligned boundaries
271 */
272 if (unlikely((nb > 4) || !user_mode(regs)))
273 return 0;
274
275 /* lmw, stmw, lswi/x, stswi/x */
276 nb0 = 0;
277 if (flags & HARD) {
278 if (flags & SX) {
279 nb = regs->xer & 127;
280 if (nb == 0)
281 return 1;
282 } else {
283 if (__get_user(instr,
284 (unsigned int __user *)regs->nip))
285 return -EFAULT;
286 nb = (instr >> 11) & 0x1f;
287 if (nb == 0)
288 nb = 32;
201 } 289 }
290 if (nb + reg * 4 > 128) {
291 nb0 = nb + reg * 4 - 128;
292 nb = 128 - reg * 4;
293 }
294 } else {
295 /* lwm, stmw */
296 nb = (32 - reg) * 4;
202 } 297 }
203 298
204 return dsisr; 299 if (!access_ok((flags & ST ? VERIFY_WRITE: VERIFY_READ), addr, nb+nb0))
300 return -EFAULT; /* bad address */
301
302 rptr = &regs->gpr[reg];
303 if (flags & LD) {
304 /*
305 * This zeroes the top 4 bytes of the affected registers
306 * in 64-bit mode, and also zeroes out any remaining
307 * bytes of the last register for lsw*.
308 */
309 memset(rptr, 0, ((nb + 3) / 4) * sizeof(unsigned long));
310 if (nb0 > 0)
311 memset(&regs->gpr[0], 0,
312 ((nb0 + 3) / 4) * sizeof(unsigned long));
313
314 for (i = 0; i < nb; ++i)
315 if (__get_user(REG_BYTE(rptr, i), addr + i))
316 return -EFAULT;
317 if (nb0 > 0) {
318 rptr = &regs->gpr[0];
319 addr += nb;
320 for (i = 0; i < nb0; ++i)
321 if (__get_user(REG_BYTE(rptr, i), addr + i))
322 return -EFAULT;
323 }
324
325 } else {
326 for (i = 0; i < nb; ++i)
327 if (__put_user(REG_BYTE(rptr, i), addr + i))
328 return -EFAULT;
329 if (nb0 > 0) {
330 rptr = &regs->gpr[0];
331 addr += nb;
332 for (i = 0; i < nb0; ++i)
333 if (__put_user(REG_BYTE(rptr, i), addr + i))
334 return -EFAULT;
335 }
336 }
337 return 1;
205} 338}
206 339
207int 340
208fix_alignment(struct pt_regs *regs) 341/*
342 * Called on alignment exception. Attempts to fixup
343 *
344 * Return 1 on success
345 * Return 0 if unable to handle the interrupt
346 * Return -EFAULT if data address is bad
347 */
348
349int fix_alignment(struct pt_regs *regs)
209{ 350{
210 unsigned int instr, nb, flags; 351 unsigned int instr, nb, flags;
211 int t; 352 unsigned int reg, areg;
212 unsigned long reg, areg; 353 unsigned int dsisr;
213 unsigned long i;
214 int ret;
215 unsigned dsisr;
216 unsigned char __user *addr; 354 unsigned char __user *addr;
217 unsigned char __user *p; 355 unsigned char __user *p;
218 unsigned long __user *lp; 356 int ret, t;
219 union { 357 union {
220 long ll; 358 u64 ll;
221 double dd; 359 double dd;
222 unsigned char v[8]; 360 unsigned char v[8];
223 struct { 361 struct {
@@ -231,18 +369,22 @@ fix_alignment(struct pt_regs *regs)
231 } data; 369 } data;
232 370
233 /* 371 /*
234 * Return 1 on success 372 * We require a complete register set, if not, then our assembly
235 * Return 0 if unable to handle the interrupt 373 * is broken
236 * Return -EFAULT if data address is bad
237 */ 374 */
375 CHECK_FULL_REGS(regs);
238 376
239 dsisr = regs->dsisr; 377 dsisr = regs->dsisr;
240 378
379 /* Some processors don't provide us with a DSISR we can use here,
380 * let's make one up from the instruction
381 */
241 if (cpu_has_feature(CPU_FTR_NODSISRALIGN)) { 382 if (cpu_has_feature(CPU_FTR_NODSISRALIGN)) {
242 unsigned int real_instr; 383 unsigned int real_instr;
243 if (__get_user(real_instr, (unsigned int __user *)regs->nip)) 384 if (unlikely(__get_user(real_instr,
244 return 0; 385 (unsigned int __user *)regs->nip)))
245 dsisr = make_dsisr(real_instr); 386 return -EFAULT;
387 dsisr = make_dsisr(real_instr);
246 } 388 }
247 389
248 /* extract the operation and registers from the dsisr */ 390 /* extract the operation and registers from the dsisr */
@@ -258,33 +400,37 @@ fix_alignment(struct pt_regs *regs)
258 /* DAR has the operand effective address */ 400 /* DAR has the operand effective address */
259 addr = (unsigned char __user *)regs->dar; 401 addr = (unsigned char __user *)regs->dar;
260 402
261 /* A size of 0 indicates an instruction we don't support */ 403 /* A size of 0 indicates an instruction we don't support, with
262 /* we also don't support the multiples (lmw, stmw, lmd, stmd) */ 404 * the exception of DCBZ which is handled as a special case here
263 if ((nb == 0) || (flags & M))
264 return 0; /* too hard or invalid instruction */
265
266 /*
267 * Special handling for dcbz
268 * dcbz may give an alignment exception for accesses to caching inhibited
269 * storage
270 */ 405 */
271 if (instr == DCBZ) 406 if (instr == DCBZ)
272 addr = (unsigned char __user *) ((unsigned long)addr & -L1_CACHE_BYTES); 407 return emulate_dcbz(regs, addr);
408 if (unlikely(nb == 0))
409 return 0;
410
411 /* Load/Store Multiple instructions are handled in their own
412 * function
413 */
414 if (flags & M)
415 return emulate_multiple(regs, addr, reg, nb, flags, instr);
273 416
274 /* Verify the address of the operand */ 417 /* Verify the address of the operand */
275 if (user_mode(regs)) { 418 if (unlikely(user_mode(regs) &&
276 if (!access_ok((flags & ST? VERIFY_WRITE: VERIFY_READ), addr, nb)) 419 !access_ok((flags & ST ? VERIFY_WRITE : VERIFY_READ),
277 return -EFAULT; /* bad address */ 420 addr, nb)))
278 } 421 return -EFAULT;
279 422
280 /* Force the fprs into the save area so we can reference them */ 423 /* Force the fprs into the save area so we can reference them */
281 if (flags & F) { 424 if (flags & F) {
282 if (!user_mode(regs)) 425 /* userland only */
426 if (unlikely(!user_mode(regs)))
283 return 0; 427 return 0;
284 flush_fp_to_thread(current); 428 flush_fp_to_thread(current);
285 } 429 }
286 430
287 /* If we are loading, get the data from user space */ 431 /* If we are loading, get the data from user space, else
432 * get it from register values
433 */
288 if (flags & LD) { 434 if (flags & LD) {
289 data.ll = 0; 435 data.ll = 0;
290 ret = 0; 436 ret = 0;
@@ -301,75 +447,62 @@ fix_alignment(struct pt_regs *regs)
301 case 2: 447 case 2:
302 ret |= __get_user(data.v[6], p++); 448 ret |= __get_user(data.v[6], p++);
303 ret |= __get_user(data.v[7], p++); 449 ret |= __get_user(data.v[7], p++);
304 if (ret) 450 if (unlikely(ret))
305 return -EFAULT; 451 return -EFAULT;
306 } 452 }
307 } 453 } else if (flags & F)
308 454 data.dd = current->thread.fpr[reg];
309 /* If we are storing, get the data from the saved gpr or fpr */ 455 else
310 if (flags & ST) { 456 data.ll = regs->gpr[reg];
311 if (flags & F) { 457
312 if (nb == 4) { 458 /* Perform other misc operations like sign extension, byteswap,
313 /* Doing stfs, have to convert to single */ 459 * or floating point single precision conversion
314 preempt_disable(); 460 */
315 enable_kernel_fp(); 461 switch (flags & ~U) {
316 cvt_df(&current->thread.fpr[reg], (float *)&data.v[4], &current->thread); 462 case LD+SE: /* sign extend */
317 disable_kernel_fp();
318 preempt_enable();
319 }
320 else
321 data.dd = current->thread.fpr[reg];
322 }
323 else
324 data.ll = regs->gpr[reg];
325 }
326
327 /* Swap bytes as needed */
328 if (flags & SW) {
329 if (nb == 2)
330 SWAP(data.v[6], data.v[7]);
331 else { /* nb must be 4 */
332 SWAP(data.v[4], data.v[7]);
333 SWAP(data.v[5], data.v[6]);
334 }
335 }
336
337 /* Sign extend as needed */
338 if (flags & SE) {
339 if ( nb == 2 ) 463 if ( nb == 2 )
340 data.ll = data.x16.low16; 464 data.ll = data.x16.low16;
341 else /* nb must be 4 */ 465 else /* nb must be 4 */
342 data.ll = data.x32.low32; 466 data.ll = data.x32.low32;
343 } 467 break;
344 468 case LD+S: /* byte-swap */
345 /* If we are loading, move the data to the gpr or fpr */ 469 case ST+S:
346 if (flags & LD) { 470 if (nb == 2) {
347 if (flags & F) { 471 SWAP(data.v[6], data.v[7]);
348 if (nb == 4) { 472 } else {
349 /* Doing lfs, have to convert to double */ 473 SWAP(data.v[4], data.v[7]);
350 preempt_disable(); 474 SWAP(data.v[5], data.v[6]);
351 enable_kernel_fp();
352 cvt_fd((float *)&data.v[4], &current->thread.fpr[reg], &current->thread);
353 disable_kernel_fp();
354 preempt_enable();
355 }
356 else
357 current->thread.fpr[reg] = data.dd;
358 } 475 }
359 else 476 break;
360 regs->gpr[reg] = data.ll; 477
478 /* Single-precision FP load and store require conversions... */
479 case LD+F+S:
480#ifdef CONFIG_PPC_FPU
481 preempt_disable();
482 enable_kernel_fp();
483 cvt_fd((float *)&data.v[4], &data.dd, &current->thread);
484 preempt_enable();
485#else
486 return 0;
487#endif
488 break;
489 case ST+F+S:
490#ifdef CONFIG_PPC_FPU
491 preempt_disable();
492 enable_kernel_fp();
493 cvt_df(&data.dd, (float *)&data.v[4], &current->thread);
494 preempt_enable();
495#else
496 return 0;
497#endif
498 break;
361 } 499 }
362 500
363 /* If we are storing, copy the data to the user */ 501 /* Store result to memory or update registers */
364 if (flags & ST) { 502 if (flags & ST) {
365 ret = 0; 503 ret = 0;
366 p = addr; 504 p = addr;
367 switch (nb) { 505 switch (nb) {
368 case 128: /* Special case - must be dcbz */
369 lp = (unsigned long __user *)p;
370 for (i = 0; i < L1_CACHE_BYTES / sizeof(long); ++i)
371 ret |= __put_user(0, lp++);
372 break;
373 case 8: 506 case 8:
374 ret |= __put_user(data.v[0], p++); 507 ret |= __put_user(data.v[0], p++);
375 ret |= __put_user(data.v[1], p++); 508 ret |= __put_user(data.v[1], p++);
@@ -382,15 +515,16 @@ fix_alignment(struct pt_regs *regs)
382 ret |= __put_user(data.v[6], p++); 515 ret |= __put_user(data.v[6], p++);
383 ret |= __put_user(data.v[7], p++); 516 ret |= __put_user(data.v[7], p++);
384 } 517 }
385 if (ret) 518 if (unlikely(ret))
386 return -EFAULT; 519 return -EFAULT;
387 } 520 } else if (flags & F)
388 521 current->thread.fpr[reg] = data.dd;
522 else
523 regs->gpr[reg] = data.ll;
524
389 /* Update RA as needed */ 525 /* Update RA as needed */
390 if (flags & U) { 526 if (flags & U)
391 regs->gpr[areg] = regs->dar; 527 regs->gpr[areg] = regs->dar;
392 }
393 528
394 return 1; 529 return 1;
395} 530}
396
diff --git a/arch/ppc64/kernel/idle.c b/arch/powerpc/kernel/idle_64.c
index b879d3057ef8..b879d3057ef8 100644
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/powerpc/kernel/idle_64.c
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index f6d84a75ed26..624a983a9676 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -27,14 +27,6 @@
27 27
28 .text 28 .text
29 29
30 .align 5
31_GLOBAL(__delay)
32 cmpwi 0,r3,0
33 mtctr r3
34 beqlr
351: bdnz 1b
36 blr
37
38/* 30/*
39 * This returns the high 64 bits of the product of two 64-bit numbers. 31 * This returns the high 64 bits of the product of two 64-bit numbers.
40 */ 32 */
diff --git a/arch/ppc64/kernel/nvram.c b/arch/powerpc/kernel/nvram_64.c
index c0fcd29918ce..c0fcd29918ce 100644
--- a/arch/ppc64/kernel/nvram.c
+++ b/arch/powerpc/kernel/nvram_64.c
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 5a5b24685081..8b6008ab217d 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -40,7 +40,7 @@
40#endif 40#endif
41 41
42unsigned long pci_probe_only = 1; 42unsigned long pci_probe_only = 1;
43unsigned long pci_assign_all_buses = 0; 43int pci_assign_all_buses = 0;
44 44
45/* 45/*
46 * legal IO pages under MAX_ISA_PORT. This is to ensure we don't touch 46 * legal IO pages under MAX_ISA_PORT. This is to ensure we don't touch
@@ -55,11 +55,6 @@ static void fixup_resource(struct resource *res, struct pci_dev *dev);
55static void do_bus_setup(struct pci_bus *bus); 55static void do_bus_setup(struct pci_bus *bus);
56#endif 56#endif
57 57
58unsigned int pcibios_assign_all_busses(void)
59{
60 return pci_assign_all_buses;
61}
62
63/* pci_io_base -- the base address from which io bars are offsets. 58/* pci_io_base -- the base address from which io bars are offsets.
64 * This is the lowest I/O base address (so bar values are always positive), 59 * This is the lowest I/O base address (so bar values are always positive),
65 * and it *must* be the start of ISA space if an ISA bus exists because 60 * and it *must* be the start of ISA space if an ISA bus exists because
@@ -1186,17 +1181,6 @@ void phbs_remap_io(void)
1186 remap_bus_range(hose->bus); 1181 remap_bus_range(hose->bus);
1187} 1182}
1188 1183
1189/*
1190 * ppc64 can have multifunction devices that do not respond to function 0.
1191 * In this case we must scan all functions.
1192 * XXX this can go now, we use the OF device tree in all the
1193 * cases that caused problems. -- paulus
1194 */
1195int pcibios_scan_all_fns(struct pci_bus *bus, int devfn)
1196{
1197 return 0;
1198}
1199
1200static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev) 1184static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
1201{ 1185{
1202 struct pci_controller *hose = pci_bus_to_host(dev->bus); 1186 struct pci_controller *hose = pci_bus_to_host(dev->bus);
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 59846b40d521..af4d1bc9a2eb 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -146,9 +146,6 @@ EXPORT_SYMBOL(pci_bus_io_base);
146EXPORT_SYMBOL(pci_bus_io_base_phys); 146EXPORT_SYMBOL(pci_bus_io_base_phys);
147EXPORT_SYMBOL(pci_bus_mem_base_phys); 147EXPORT_SYMBOL(pci_bus_mem_base_phys);
148EXPORT_SYMBOL(pci_bus_to_hose); 148EXPORT_SYMBOL(pci_bus_to_hose);
149EXPORT_SYMBOL(pci_resource_to_bus);
150EXPORT_SYMBOL(pci_phys_to_bus);
151EXPORT_SYMBOL(pci_bus_to_phys);
152#endif /* CONFIG_PCI */ 149#endif /* CONFIG_PCI */
153 150
154#ifdef CONFIG_NOT_COHERENT_CACHE 151#ifdef CONFIG_NOT_COHERENT_CACHE
diff --git a/arch/powerpc/kernel/ptrace-common.h b/arch/powerpc/kernel/ptrace-common.h
new file mode 100644
index 000000000000..b1babb729673
--- /dev/null
+++ b/arch/powerpc/kernel/ptrace-common.h
@@ -0,0 +1,164 @@
1/*
2 * linux/arch/ppc64/kernel/ptrace-common.h
3 *
4 * Copyright (c) 2002 Stephen Rothwell, IBM Coproration
5 * Extracted from ptrace.c and ptrace32.c
6 *
7 * This file is subject to the terms and conditions of the GNU General
8 * Public License. See the file README.legal in the main directory of
9 * this archive for more details.
10 */
11
12#ifndef _PPC64_PTRACE_COMMON_H
13#define _PPC64_PTRACE_COMMON_H
14
15#include <linux/config.h>
16#include <asm/system.h>
17
18/*
19 * Set of msr bits that gdb can change on behalf of a process.
20 */
21#define MSR_DEBUGCHANGE (MSR_FE0 | MSR_SE | MSR_BE | MSR_FE1)
22
23/*
24 * Get contents of register REGNO in task TASK.
25 */
26static inline unsigned long get_reg(struct task_struct *task, int regno)
27{
28 unsigned long tmp = 0;
29
30 /*
31 * Put the correct FP bits in, they might be wrong as a result
32 * of our lazy FP restore.
33 */
34 if (regno == PT_MSR) {
35 tmp = ((unsigned long *)task->thread.regs)[PT_MSR];
36 tmp |= task->thread.fpexc_mode;
37 } else if (regno < (sizeof(struct pt_regs) / sizeof(unsigned long))) {
38 tmp = ((unsigned long *)task->thread.regs)[regno];
39 }
40
41 return tmp;
42}
43
44/*
45 * Write contents of register REGNO in task TASK.
46 */
47static inline int put_reg(struct task_struct *task, int regno,
48 unsigned long data)
49{
50 if (regno < PT_SOFTE) {
51 if (regno == PT_MSR)
52 data = (data & MSR_DEBUGCHANGE)
53 | (task->thread.regs->msr & ~MSR_DEBUGCHANGE);
54 ((unsigned long *)task->thread.regs)[regno] = data;
55 return 0;
56 }
57 return -EIO;
58}
59
60static inline void set_single_step(struct task_struct *task)
61{
62 struct pt_regs *regs = task->thread.regs;
63 if (regs != NULL)
64 regs->msr |= MSR_SE;
65 set_ti_thread_flag(task->thread_info, TIF_SINGLESTEP);
66}
67
68static inline void clear_single_step(struct task_struct *task)
69{
70 struct pt_regs *regs = task->thread.regs;
71 if (regs != NULL)
72 regs->msr &= ~MSR_SE;
73 clear_ti_thread_flag(task->thread_info, TIF_SINGLESTEP);
74}
75
76#ifdef CONFIG_ALTIVEC
77/*
78 * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
79 * The transfer totals 34 quadword. Quadwords 0-31 contain the
80 * corresponding vector registers. Quadword 32 contains the vscr as the
81 * last word (offset 12) within that quadword. Quadword 33 contains the
82 * vrsave as the first word (offset 0) within the quadword.
83 *
84 * This definition of the VMX state is compatible with the current PPC32
85 * ptrace interface. This allows signal handling and ptrace to use the
86 * same structures. This also simplifies the implementation of a bi-arch
87 * (combined (32- and 64-bit) gdb.
88 */
89
90/*
91 * Get contents of AltiVec register state in task TASK
92 */
93static inline int get_vrregs(unsigned long __user *data,
94 struct task_struct *task)
95{
96 unsigned long regsize;
97
98 /* copy AltiVec registers VR[0] .. VR[31] */
99 regsize = 32 * sizeof(vector128);
100 if (copy_to_user(data, task->thread.vr, regsize))
101 return -EFAULT;
102 data += (regsize / sizeof(unsigned long));
103
104 /* copy VSCR */
105 regsize = 1 * sizeof(vector128);
106 if (copy_to_user(data, &task->thread.vscr, regsize))
107 return -EFAULT;
108 data += (regsize / sizeof(unsigned long));
109
110 /* copy VRSAVE */
111 if (put_user(task->thread.vrsave, (u32 __user *)data))
112 return -EFAULT;
113
114 return 0;
115}
116
117/*
118 * Write contents of AltiVec register state into task TASK.
119 */
120static inline int set_vrregs(struct task_struct *task,
121 unsigned long __user *data)
122{
123 unsigned long regsize;
124
125 /* copy AltiVec registers VR[0] .. VR[31] */
126 regsize = 32 * sizeof(vector128);
127 if (copy_from_user(task->thread.vr, data, regsize))
128 return -EFAULT;
129 data += (regsize / sizeof(unsigned long));
130
131 /* copy VSCR */
132 regsize = 1 * sizeof(vector128);
133 if (copy_from_user(&task->thread.vscr, data, regsize))
134 return -EFAULT;
135 data += (regsize / sizeof(unsigned long));
136
137 /* copy VRSAVE */
138 if (get_user(task->thread.vrsave, (u32 __user *)data))
139 return -EFAULT;
140
141 return 0;
142}
143#endif
144
145static inline int ptrace_set_debugreg(struct task_struct *task,
146 unsigned long addr, unsigned long data)
147{
148 /* We only support one DABR and no IABRS at the moment */
149 if (addr > 0)
150 return -EINVAL;
151
152 /* The bottom 3 bits are flags */
153 if ((data & ~0x7UL) >= TASK_SIZE)
154 return -EIO;
155
156 /* Ensure translation is on */
157 if (data && !(data & DABR_TRANSLATION))
158 return -EIO;
159
160 task->thread.dabr = data;
161 return 0;
162}
163
164#endif /* _PPC64_PTRACE_COMMON_H */
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 3d2abd95c7ae..400793c71304 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -36,8 +36,9 @@
36#include <asm/page.h> 36#include <asm/page.h>
37#include <asm/pgtable.h> 37#include <asm/pgtable.h>
38#include <asm/system.h> 38#include <asm/system.h>
39
39#ifdef CONFIG_PPC64 40#ifdef CONFIG_PPC64
40#include <asm/ptrace-common.h> 41#include "ptrace-common.h"
41#endif 42#endif
42 43
43#ifdef CONFIG_PPC32 44#ifdef CONFIG_PPC32
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 91eb952e0293..61762640b877 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -33,7 +33,8 @@
33#include <asm/page.h> 33#include <asm/page.h>
34#include <asm/pgtable.h> 34#include <asm/pgtable.h>
35#include <asm/system.h> 35#include <asm/system.h>
36#include <asm/ptrace-common.h> 36
37#include "ptrace-common.h"
37 38
38/* 39/*
39 * does not yet catch signals sent when the child dies. 40 * does not yet catch signals sent when the child dies.
diff --git a/arch/powerpc/kernel/rtas-rtc.c b/arch/powerpc/kernel/rtas-rtc.c
index 7b948662704c..635d3b9a8811 100644
--- a/arch/powerpc/kernel/rtas-rtc.c
+++ b/arch/powerpc/kernel/rtas-rtc.c
@@ -15,7 +15,7 @@ unsigned long __init rtas_get_boot_time(void)
15{ 15{
16 int ret[8]; 16 int ret[8];
17 int error, wait_time; 17 int error, wait_time;
18 unsigned long max_wait_tb; 18 u64 max_wait_tb;
19 19
20 max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; 20 max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;
21 do { 21 do {
@@ -45,7 +45,7 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm)
45{ 45{
46 int ret[8]; 46 int ret[8];
47 int error, wait_time; 47 int error, wait_time;
48 unsigned long max_wait_tb; 48 u64 max_wait_tb;
49 49
50 max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; 50 max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;
51 do { 51 do {
@@ -80,7 +80,7 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm)
80int rtas_set_rtc_time(struct rtc_time *tm) 80int rtas_set_rtc_time(struct rtc_time *tm)
81{ 81{
82 int error, wait_time; 82 int error, wait_time;
83 unsigned long max_wait_tb; 83 u64 max_wait_tb;
84 84
85 max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; 85 max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT;
86 do { 86 do {
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 070b4b458aaf..de8479769bb7 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -130,6 +130,34 @@ unsigned long tb_last_stamp;
130 */ 130 */
131DEFINE_PER_CPU(unsigned long, last_jiffy); 131DEFINE_PER_CPU(unsigned long, last_jiffy);
132 132
133void __delay(unsigned long loops)
134{
135 unsigned long start;
136 int diff;
137
138 if (__USE_RTC()) {
139 start = get_rtcl();
140 do {
141 /* the RTCL register wraps at 1000000000 */
142 diff = get_rtcl() - start;
143 if (diff < 0)
144 diff += 1000000000;
145 } while (diff < loops);
146 } else {
147 start = get_tbl();
148 while (get_tbl() - start < loops)
149 HMT_low();
150 HMT_medium();
151 }
152}
153EXPORT_SYMBOL(__delay);
154
155void udelay(unsigned long usecs)
156{
157 __delay(tb_ticks_per_usec * usecs);
158}
159EXPORT_SYMBOL(udelay);
160
133static __inline__ void timer_check_rtc(void) 161static __inline__ void timer_check_rtc(void)
134{ 162{
135 /* 163 /*
diff --git a/arch/powerpc/mm/imalloc.c b/arch/powerpc/mm/imalloc.c
index f4ca29cf5364..f9587bcc6a48 100644
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
@@ -14,9 +14,10 @@
14#include <asm/pgalloc.h> 14#include <asm/pgalloc.h>
15#include <asm/pgtable.h> 15#include <asm/pgtable.h>
16#include <asm/semaphore.h> 16#include <asm/semaphore.h>
17#include <asm/imalloc.h>
18#include <asm/cacheflush.h> 17#include <asm/cacheflush.h>
19 18
19#include "mmu_decl.h"
20
20static DECLARE_MUTEX(imlist_sem); 21static DECLARE_MUTEX(imlist_sem);
21struct vm_struct * imlist = NULL; 22struct vm_struct * imlist = NULL;
22 23
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 1134f70f231d..81cfb0c2ec58 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -64,7 +64,8 @@
64#include <asm/iommu.h> 64#include <asm/iommu.h>
65#include <asm/abs_addr.h> 65#include <asm/abs_addr.h>
66#include <asm/vdso.h> 66#include <asm/vdso.h>
67#include <asm/imalloc.h> 67
68#include "mmu_decl.h"
68 69
69#ifdef DEBUG 70#ifdef DEBUG
70#define DBG(fmt...) printk(fmt) 71#define DBG(fmt...) printk(fmt)
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
index a4d7a327c0e5..bea2d21ac6f7 100644
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@ -33,7 +33,6 @@ extern void invalidate_tlbcam_entry(int index);
33 33
34extern int __map_without_bats; 34extern int __map_without_bats;
35extern unsigned long ioremap_base; 35extern unsigned long ioremap_base;
36extern unsigned long ioremap_bot;
37extern unsigned int rtas_data, rtas_size; 36extern unsigned int rtas_data, rtas_size;
38 37
39extern PTE *Hash, *Hash_end; 38extern PTE *Hash, *Hash_end;
@@ -42,6 +41,7 @@ extern unsigned long Hash_size, Hash_mask;
42extern unsigned int num_tlbcam_entries; 41extern unsigned int num_tlbcam_entries;
43#endif 42#endif
44 43
44extern unsigned long ioremap_bot;
45extern unsigned long __max_low_memory; 45extern unsigned long __max_low_memory;
46extern unsigned long __initial_memory_limit; 46extern unsigned long __initial_memory_limit;
47extern unsigned long total_memory; 47extern unsigned long total_memory;
@@ -84,4 +84,16 @@ static inline void flush_HPTE(unsigned context, unsigned long va,
84 else 84 else
85 _tlbie(va); 85 _tlbie(va);
86} 86}
87#else /* CONFIG_PPC64 */
88/* imalloc region types */
89#define IM_REGION_UNUSED 0x1
90#define IM_REGION_SUBSET 0x2
91#define IM_REGION_EXISTS 0x4
92#define IM_REGION_OVERLAP 0x8
93#define IM_REGION_SUPERSET 0x10
94
95extern struct vm_struct * im_get_free_area(unsigned long size);
96extern struct vm_struct * im_get_area(unsigned long v_addr, unsigned long size,
97 int region_type);
98extern void im_free(void *addr);
87#endif 99#endif
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index c7f7bb6f30b3..2ffca63602c5 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -64,7 +64,8 @@
64#include <asm/iommu.h> 64#include <asm/iommu.h>
65#include <asm/abs_addr.h> 65#include <asm/abs_addr.h>
66#include <asm/vdso.h> 66#include <asm/vdso.h>
67#include <asm/imalloc.h> 67
68#include "mmu_decl.h"
68 69
69unsigned long ioremap_bot = IMALLOC_BASE; 70unsigned long ioremap_bot = IMALLOC_BASE;
70static unsigned long phbs_io_bot = PHBS_IO_BASE; 71static unsigned long phbs_io_bot = PHBS_IO_BASE;
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 4099ddab9205..dda5f2c72c25 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -257,6 +257,13 @@ void __init chrp_setup_arch(void)
257 if (rtas_token("display-character") >= 0) 257 if (rtas_token("display-character") >= 0)
258 ppc_md.progress = rtas_progress; 258 ppc_md.progress = rtas_progress;
259 259
260 /* use RTAS time-of-day routines if available */
261 if (rtas_token("get-time-of-day") != RTAS_UNKNOWN_SERVICE) {
262 ppc_md.get_boot_time = rtas_get_boot_time;
263 ppc_md.get_rtc_time = rtas_get_rtc_time;
264 ppc_md.set_rtc_time = rtas_set_rtc_time;
265 }
266
260#ifdef CONFIG_BOOTX_TEXT 267#ifdef CONFIG_BOOTX_TEXT
261 if (ppc_md.progress == NULL && boot_text_mapped) 268 if (ppc_md.progress == NULL && boot_text_mapped)
262 ppc_md.progress = btext_progress; 269 ppc_md.progress = btext_progress;
@@ -505,9 +512,11 @@ void __init chrp_init(void)
505 ppc_md.halt = rtas_halt; 512 ppc_md.halt = rtas_halt;
506 513
507 ppc_md.time_init = chrp_time_init; 514 ppc_md.time_init = chrp_time_init;
515 ppc_md.calibrate_decr = chrp_calibrate_decr;
516
517 /* this may get overridden with rtas routines later... */
508 ppc_md.set_rtc_time = chrp_set_rtc_time; 518 ppc_md.set_rtc_time = chrp_set_rtc_time;
509 ppc_md.get_rtc_time = chrp_get_rtc_time; 519 ppc_md.get_rtc_time = chrp_get_rtc_time;
510 ppc_md.calibrate_decr = chrp_calibrate_decr;
511 520
512#ifdef CONFIG_SMP 521#ifdef CONFIG_SMP
513 smp_ops = &chrp_smp_ops; 522 smp_ops = &chrp_smp_ops;
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index bb2315997d45..b616053bc331 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -34,6 +34,7 @@
34#include <asm/machdep.h> 34#include <asm/machdep.h>
35#include <asm/smp.h> 35#include <asm/smp.h>
36#include <asm/mpic.h> 36#include <asm/mpic.h>
37#include <asm/rtas.h>
37 38
38static void __devinit smp_chrp_kick_cpu(int nr) 39static void __devinit smp_chrp_kick_cpu(int nr)
39{ 40{
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c
index 9e53535ddb82..737ee5d9f0aa 100644
--- a/arch/powerpc/platforms/chrp/time.c
+++ b/arch/powerpc/platforms/chrp/time.c
@@ -87,7 +87,6 @@ int chrp_set_rtc_time(struct rtc_time *tmarg)
87 87
88 chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); 88 chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
89 89
90 tm.tm_year -= 1900;
91 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { 90 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
92 BIN_TO_BCD(tm.tm_sec); 91 BIN_TO_BCD(tm.tm_sec);
93 BIN_TO_BCD(tm.tm_min); 92 BIN_TO_BCD(tm.tm_min);
@@ -156,7 +155,7 @@ void chrp_get_rtc_time(struct rtc_time *tm)
156 BCD_TO_BIN(mon); 155 BCD_TO_BIN(mon);
157 BCD_TO_BIN(year); 156 BCD_TO_BIN(year);
158 } 157 }
159 if ((year += 1900) < 1970) 158 if (year < 70)
160 year += 100; 159 year += 100;
161 tm->tm_sec = sec; 160 tm->tm_sec = sec;
162 tm->tm_min = min; 161 tm->tm_min = min;
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 40fc07a8e606..15846cc938ac 100644
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -158,6 +158,11 @@ int maple_set_rtc_time(struct rtc_time *tm)
158 return 0; 158 return 0;
159} 159}
160 160
161static struct resource rtc_iores = {
162 .name = "rtc",
163 .flags = IORESOURCE_BUSY,
164};
165
161unsigned long __init maple_get_boot_time(void) 166unsigned long __init maple_get_boot_time(void)
162{ 167{
163 struct rtc_time tm; 168 struct rtc_time tm;
@@ -172,7 +177,11 @@ unsigned long __init maple_get_boot_time(void)
172 printk(KERN_INFO "Maple: No device node for RTC, assuming " 177 printk(KERN_INFO "Maple: No device node for RTC, assuming "
173 "legacy address (0x%x)\n", maple_rtc_addr); 178 "legacy address (0x%x)\n", maple_rtc_addr);
174 } 179 }
175 180
181 rtc_iores.start = maple_rtc_addr;
182 rtc_iores.end = maple_rtc_addr + 7;
183 request_resource(&ioport_resource, &rtc_iores);
184
176 maple_get_rtc_time(&tm); 185 maple_get_rtc_time(&tm);
177 return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, 186 return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
178 tm.tm_hour, tm.tm_min, tm.tm_sec); 187 tm.tm_hour, tm.tm_min, tm.tm_sec);
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 957b09103422..fb2a7c798e82 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -34,6 +34,7 @@
34#include <linux/errno.h> 34#include <linux/errno.h>
35#include <linux/hardirq.h> 35#include <linux/hardirq.h>
36#include <linux/cpu.h> 36#include <linux/cpu.h>
37#include <linux/compiler.h>
37 38
38#include <asm/ptrace.h> 39#include <asm/ptrace.h>
39#include <asm/atomic.h> 40#include <asm/atomic.h>
@@ -631,8 +632,9 @@ void smp_core99_give_timebase(void)
631 mb(); 632 mb();
632 633
633 /* wait for the secondary to have taken it */ 634 /* wait for the secondary to have taken it */
634 for (t = 100000; t > 0 && sec_tb_reset; --t) 635 /* note: can't use udelay here, since it needs the timebase running */
635 udelay(10); 636 for (t = 10000000; t > 0 && sec_tb_reset; --t)
637 barrier();
636 if (sec_tb_reset) 638 if (sec_tb_reset)
637 /* XXX BUG_ON here? */ 639 /* XXX BUG_ON here? */
638 printk(KERN_WARNING "Timeout waiting sync(2) on second CPU\n"); 640 printk(KERN_WARNING "Timeout waiting sync(2) on second CPU\n");
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 79de2310e70b..c8d2a40dc5b4 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -86,7 +86,8 @@ static int ibm_read_slot_reset_state;
86static int ibm_read_slot_reset_state2; 86static int ibm_read_slot_reset_state2;
87static int ibm_slot_error_detail; 87static int ibm_slot_error_detail;
88 88
89static int eeh_subsystem_enabled; 89int eeh_subsystem_enabled;
90EXPORT_SYMBOL(eeh_subsystem_enabled);
90 91
91/* Lock to avoid races due to multiple reports of an error */ 92/* Lock to avoid races due to multiple reports of an error */
92static DEFINE_SPINLOCK(confirm_error_lock); 93static DEFINE_SPINLOCK(confirm_error_lock);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index b9d9732b2e06..4a465f067ede 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -504,7 +504,7 @@ static void pseries_dedicated_idle(void)
504 lpaca->lppaca.idle = 1; 504 lpaca->lppaca.idle = 1;
505 505
506 if (!need_resched()) { 506 if (!need_resched()) {
507 start_snooze = __get_tb() + 507 start_snooze = get_tb() +
508 *smt_snooze_delay * tb_ticks_per_usec; 508 *smt_snooze_delay * tb_ticks_per_usec;
509 509
510 while (!need_resched() && !cpu_is_offline(cpu)) { 510 while (!need_resched() && !cpu_is_offline(cpu)) {
@@ -518,7 +518,7 @@ static void pseries_dedicated_idle(void)
518 HMT_very_low(); 518 HMT_very_low();
519 519
520 if (*smt_snooze_delay != 0 && 520 if (*smt_snooze_delay != 0 &&
521 __get_tb() > start_snooze) { 521 get_tb() > start_snooze) {
522 HMT_medium(); 522 HMT_medium();
523 dedicated_idle_sleep(cpu); 523 dedicated_idle_sleep(cpu);
524 } 524 }
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 105f05341a41..58d1cc2023c8 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -361,7 +361,8 @@ static void mpic_enable_irq(unsigned int irq)
361 DBG("%p: %s: enable_irq: %d (src %d)\n", mpic, mpic->name, irq, src); 361 DBG("%p: %s: enable_irq: %d (src %d)\n", mpic, mpic->name, irq, src);
362 362
363 mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI, 363 mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI,
364 mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) & ~MPIC_VECPRI_MASK); 364 mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) &
365 ~MPIC_VECPRI_MASK);
365 366
366 /* make sure mask gets to controller before we return to user */ 367 /* make sure mask gets to controller before we return to user */
367 do { 368 do {
@@ -381,7 +382,8 @@ static void mpic_disable_irq(unsigned int irq)
381 DBG("%s: disable_irq: %d (src %d)\n", mpic->name, irq, src); 382 DBG("%s: disable_irq: %d (src %d)\n", mpic->name, irq, src);
382 383
383 mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI, 384 mpic_irq_write(src, MPIC_IRQ_VECTOR_PRI,
384 mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) | MPIC_VECPRI_MASK); 385 mpic_irq_read(src, MPIC_IRQ_VECTOR_PRI) |
386 MPIC_VECPRI_MASK);
385 387
386 /* make sure mask gets to controller before we return to user */ 388 /* make sure mask gets to controller before we return to user */
387 do { 389 do {
@@ -735,12 +737,13 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
735 737
736 spin_lock_irqsave(&mpic_lock, flags); 738 spin_lock_irqsave(&mpic_lock, flags);
737 if (is_ipi) { 739 if (is_ipi) {
738 reg = mpic_ipi_read(irq - mpic->ipi_offset) & MPIC_VECPRI_PRIORITY_MASK; 740 reg = mpic_ipi_read(irq - mpic->ipi_offset) &
741 ~MPIC_VECPRI_PRIORITY_MASK;
739 mpic_ipi_write(irq - mpic->ipi_offset, 742 mpic_ipi_write(irq - mpic->ipi_offset,
740 reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT)); 743 reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
741 } else { 744 } else {
742 reg = mpic_irq_read(irq - mpic->irq_offset, MPIC_IRQ_VECTOR_PRI) 745 reg = mpic_irq_read(irq - mpic->irq_offset,MPIC_IRQ_VECTOR_PRI)
743 & MPIC_VECPRI_PRIORITY_MASK; 746 & ~MPIC_VECPRI_PRIORITY_MASK;
744 mpic_irq_write(irq - mpic->irq_offset, MPIC_IRQ_VECTOR_PRI, 747 mpic_irq_write(irq - mpic->irq_offset, MPIC_IRQ_VECTOR_PRI,
745 reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT)); 748 reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
746 } 749 }
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index 17a4da65e275..0bb23fce4293 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -13,7 +13,7 @@ extra-$(CONFIG_POWER4) += idle_power4.o
13extra-y += vmlinux.lds 13extra-y += vmlinux.lds
14 14
15obj-y := entry.o traps.o idle.o time.o misc.o \ 15obj-y := entry.o traps.o idle.o time.o misc.o \
16 process.o align.o \ 16 process.o \
17 setup.o \ 17 setup.o \
18 ppc_htab.o 18 ppc_htab.o
19obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o 19obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
@@ -38,7 +38,7 @@ endif
38# These are here while we do the architecture merge 38# These are here while we do the architecture merge
39 39
40else 40else
41obj-y := idle.o align.o 41obj-y := idle.o
42obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o 42obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
43obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o 43obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
44obj-$(CONFIG_MODULES) += module.o 44obj-$(CONFIG_MODULES) += module.o
diff --git a/arch/ppc/kernel/align.c b/arch/ppc/kernel/align.c
deleted file mode 100644
index ab398c4b70b6..000000000000
--- a/arch/ppc/kernel/align.c
+++ /dev/null
@@ -1,410 +0,0 @@
1/*
2 * align.c - handle alignment exceptions for the Power PC.
3 *
4 * Copyright (c) 1996 Paul Mackerras <paulus@cs.anu.edu.au>
5 * Copyright (c) 1998-1999 TiVo, Inc.
6 * PowerPC 403GCX modifications.
7 * Copyright (c) 1999 Grant Erickson <grant@lcse.umn.edu>
8 * PowerPC 403GCX/405GP modifications.
9 */
10#include <linux/config.h>
11#include <linux/kernel.h>
12#include <linux/mm.h>
13#include <asm/ptrace.h>
14#include <asm/processor.h>
15#include <asm/uaccess.h>
16#include <asm/system.h>
17#include <asm/cache.h>
18
19struct aligninfo {
20 unsigned char len;
21 unsigned char flags;
22};
23
24#if defined(CONFIG_4xx) || defined(CONFIG_POWER4) || defined(CONFIG_BOOKE)
25#define OPCD(inst) (((inst) & 0xFC000000) >> 26)
26#define RS(inst) (((inst) & 0x03E00000) >> 21)
27#define RA(inst) (((inst) & 0x001F0000) >> 16)
28#define IS_XFORM(code) ((code) == 31)
29#endif
30
31#define INVALID { 0, 0 }
32
33#define LD 1 /* load */
34#define ST 2 /* store */
35#define SE 4 /* sign-extend value */
36#define F 8 /* to/from fp regs */
37#define U 0x10 /* update index register */
38#define M 0x20 /* multiple load/store */
39#define S 0x40 /* single-precision fp, or byte-swap value */
40#define SX 0x40 /* byte count in XER */
41#define HARD 0x80 /* string, stwcx. */
42
43#define DCBZ 0x5f /* 8xx/82xx dcbz faults when cache not enabled */
44
45/*
46 * The PowerPC stores certain bits of the instruction that caused the
47 * alignment exception in the DSISR register. This array maps those
48 * bits to information about the operand length and what the
49 * instruction would do.
50 */
51static struct aligninfo aligninfo[128] = {
52 { 4, LD }, /* 00 0 0000: lwz / lwarx */
53 INVALID, /* 00 0 0001 */
54 { 4, ST }, /* 00 0 0010: stw */
55 INVALID, /* 00 0 0011 */
56 { 2, LD }, /* 00 0 0100: lhz */
57 { 2, LD+SE }, /* 00 0 0101: lha */
58 { 2, ST }, /* 00 0 0110: sth */
59 { 4, LD+M }, /* 00 0 0111: lmw */
60 { 4, LD+F+S }, /* 00 0 1000: lfs */
61 { 8, LD+F }, /* 00 0 1001: lfd */
62 { 4, ST+F+S }, /* 00 0 1010: stfs */
63 { 8, ST+F }, /* 00 0 1011: stfd */
64 INVALID, /* 00 0 1100 */
65 INVALID, /* 00 0 1101: ld/ldu/lwa */
66 INVALID, /* 00 0 1110 */
67 INVALID, /* 00 0 1111: std/stdu */
68 { 4, LD+U }, /* 00 1 0000: lwzu */
69 INVALID, /* 00 1 0001 */
70 { 4, ST+U }, /* 00 1 0010: stwu */
71 INVALID, /* 00 1 0011 */
72 { 2, LD+U }, /* 00 1 0100: lhzu */
73 { 2, LD+SE+U }, /* 00 1 0101: lhau */
74 { 2, ST+U }, /* 00 1 0110: sthu */
75 { 4, ST+M }, /* 00 1 0111: stmw */
76 { 4, LD+F+S+U }, /* 00 1 1000: lfsu */
77 { 8, LD+F+U }, /* 00 1 1001: lfdu */
78 { 4, ST+F+S+U }, /* 00 1 1010: stfsu */
79 { 8, ST+F+U }, /* 00 1 1011: stfdu */
80 INVALID, /* 00 1 1100 */
81 INVALID, /* 00 1 1101 */
82 INVALID, /* 00 1 1110 */
83 INVALID, /* 00 1 1111 */
84 INVALID, /* 01 0 0000: ldx */
85 INVALID, /* 01 0 0001 */
86 INVALID, /* 01 0 0010: stdx */
87 INVALID, /* 01 0 0011 */
88 INVALID, /* 01 0 0100 */
89 INVALID, /* 01 0 0101: lwax */
90 INVALID, /* 01 0 0110 */
91 INVALID, /* 01 0 0111 */
92 { 4, LD+M+HARD+SX }, /* 01 0 1000: lswx */
93 { 4, LD+M+HARD }, /* 01 0 1001: lswi */
94 { 4, ST+M+HARD+SX }, /* 01 0 1010: stswx */
95 { 4, ST+M+HARD }, /* 01 0 1011: stswi */
96 INVALID, /* 01 0 1100 */
97 INVALID, /* 01 0 1101 */
98 INVALID, /* 01 0 1110 */
99 INVALID, /* 01 0 1111 */
100 INVALID, /* 01 1 0000: ldux */
101 INVALID, /* 01 1 0001 */
102 INVALID, /* 01 1 0010: stdux */
103 INVALID, /* 01 1 0011 */
104 INVALID, /* 01 1 0100 */
105 INVALID, /* 01 1 0101: lwaux */
106 INVALID, /* 01 1 0110 */
107 INVALID, /* 01 1 0111 */
108 INVALID, /* 01 1 1000 */
109 INVALID, /* 01 1 1001 */
110 INVALID, /* 01 1 1010 */
111 INVALID, /* 01 1 1011 */
112 INVALID, /* 01 1 1100 */
113 INVALID, /* 01 1 1101 */
114 INVALID, /* 01 1 1110 */
115 INVALID, /* 01 1 1111 */
116 INVALID, /* 10 0 0000 */
117 INVALID, /* 10 0 0001 */
118 { 0, ST+HARD }, /* 10 0 0010: stwcx. */
119 INVALID, /* 10 0 0011 */
120 INVALID, /* 10 0 0100 */
121 INVALID, /* 10 0 0101 */
122 INVALID, /* 10 0 0110 */
123 INVALID, /* 10 0 0111 */
124 { 4, LD+S }, /* 10 0 1000: lwbrx */
125 INVALID, /* 10 0 1001 */
126 { 4, ST+S }, /* 10 0 1010: stwbrx */
127 INVALID, /* 10 0 1011 */
128 { 2, LD+S }, /* 10 0 1100: lhbrx */
129 INVALID, /* 10 0 1101 */
130 { 2, ST+S }, /* 10 0 1110: sthbrx */
131 INVALID, /* 10 0 1111 */
132 INVALID, /* 10 1 0000 */
133 INVALID, /* 10 1 0001 */
134 INVALID, /* 10 1 0010 */
135 INVALID, /* 10 1 0011 */
136 INVALID, /* 10 1 0100 */
137 INVALID, /* 10 1 0101 */
138 INVALID, /* 10 1 0110 */
139 INVALID, /* 10 1 0111 */
140 INVALID, /* 10 1 1000 */
141 INVALID, /* 10 1 1001 */
142 INVALID, /* 10 1 1010 */
143 INVALID, /* 10 1 1011 */
144 INVALID, /* 10 1 1100 */
145 INVALID, /* 10 1 1101 */
146 INVALID, /* 10 1 1110 */
147 { 0, ST+HARD }, /* 10 1 1111: dcbz */
148 { 4, LD }, /* 11 0 0000: lwzx */
149 INVALID, /* 11 0 0001 */
150 { 4, ST }, /* 11 0 0010: stwx */
151 INVALID, /* 11 0 0011 */
152 { 2, LD }, /* 11 0 0100: lhzx */
153 { 2, LD+SE }, /* 11 0 0101: lhax */
154 { 2, ST }, /* 11 0 0110: sthx */
155 INVALID, /* 11 0 0111 */
156 { 4, LD+F+S }, /* 11 0 1000: lfsx */
157 { 8, LD+F }, /* 11 0 1001: lfdx */
158 { 4, ST+F+S }, /* 11 0 1010: stfsx */
159 { 8, ST+F }, /* 11 0 1011: stfdx */
160 INVALID, /* 11 0 1100 */
161 INVALID, /* 11 0 1101: lmd */
162 INVALID, /* 11 0 1110 */
163 INVALID, /* 11 0 1111: stmd */
164 { 4, LD+U }, /* 11 1 0000: lwzux */
165 INVALID, /* 11 1 0001 */
166 { 4, ST+U }, /* 11 1 0010: stwux */
167 INVALID, /* 11 1 0011 */
168 { 2, LD+U }, /* 11 1 0100: lhzux */
169 { 2, LD+SE+U }, /* 11 1 0101: lhaux */
170 { 2, ST+U }, /* 11 1 0110: sthux */
171 INVALID, /* 11 1 0111 */
172 { 4, LD+F+S+U }, /* 11 1 1000: lfsux */
173 { 8, LD+F+U }, /* 11 1 1001: lfdux */
174 { 4, ST+F+S+U }, /* 11 1 1010: stfsux */
175 { 8, ST+F+U }, /* 11 1 1011: stfdux */
176 INVALID, /* 11 1 1100 */
177 INVALID, /* 11 1 1101 */
178 INVALID, /* 11 1 1110 */
179 INVALID, /* 11 1 1111 */
180};
181
182#define SWAP(a, b) (t = (a), (a) = (b), (b) = t)
183
184int
185fix_alignment(struct pt_regs *regs)
186{
187 int instr, nb, flags;
188#if defined(CONFIG_4xx) || defined(CONFIG_POWER4) || defined(CONFIG_BOOKE)
189 int opcode, f1, f2, f3;
190#endif
191 int i, t;
192 int reg, areg;
193 int offset, nb0;
194 unsigned char __user *addr;
195 unsigned char *rptr;
196 union {
197 long l;
198 float f;
199 double d;
200 unsigned char v[8];
201 } data;
202
203 CHECK_FULL_REGS(regs);
204
205#if defined(CONFIG_4xx) || defined(CONFIG_POWER4) || defined(CONFIG_BOOKE)
206 /* The 4xx-family & Book-E processors have no DSISR register,
207 * so we emulate it.
208 * The POWER4 has a DSISR register but doesn't set it on
209 * an alignment fault. -- paulus
210 */
211
212 if (__get_user(instr, (unsigned int __user *) regs->nip))
213 return 0;
214 opcode = OPCD(instr);
215 reg = RS(instr);
216 areg = RA(instr);
217
218 if (!IS_XFORM(opcode)) {
219 f1 = 0;
220 f2 = (instr & 0x04000000) >> 26;
221 f3 = (instr & 0x78000000) >> 27;
222 } else {
223 f1 = (instr & 0x00000006) >> 1;
224 f2 = (instr & 0x00000040) >> 6;
225 f3 = (instr & 0x00000780) >> 7;
226 }
227
228 instr = ((f1 << 5) | (f2 << 4) | f3);
229#else
230 reg = (regs->dsisr >> 5) & 0x1f; /* source/dest register */
231 areg = regs->dsisr & 0x1f; /* register to update */
232 instr = (regs->dsisr >> 10) & 0x7f;
233#endif
234
235 nb = aligninfo[instr].len;
236 if (nb == 0) {
237 long __user *p;
238 int i;
239
240 if (instr != DCBZ)
241 return 0; /* too hard or invalid instruction */
242 /*
243 * The dcbz (data cache block zero) instruction
244 * gives an alignment fault if used on non-cacheable
245 * memory. We handle the fault mainly for the
246 * case when we are running with the cache disabled
247 * for debugging.
248 */
249 p = (long __user *) (regs->dar & -L1_CACHE_BYTES);
250 if (user_mode(regs)
251 && !access_ok(VERIFY_WRITE, p, L1_CACHE_BYTES))
252 return -EFAULT;
253 for (i = 0; i < L1_CACHE_BYTES / sizeof(long); ++i)
254 if (__put_user(0, p+i))
255 return -EFAULT;
256 return 1;
257 }
258
259 flags = aligninfo[instr].flags;
260 if ((flags & (LD|ST)) == 0)
261 return 0;
262
263 /* For the 4xx-family & Book-E processors, the 'dar' field of the
264 * pt_regs structure is overloaded and is really from the DEAR.
265 */
266
267 addr = (unsigned char __user *)regs->dar;
268
269 if (flags & M) {
270 /* lmw, stmw, lswi/x, stswi/x */
271 nb0 = 0;
272 if (flags & HARD) {
273 if (flags & SX) {
274 nb = regs->xer & 127;
275 if (nb == 0)
276 return 1;
277 } else {
278 if (__get_user(instr,
279 (unsigned int __user *)regs->nip))
280 return 0;
281 nb = (instr >> 11) & 0x1f;
282 if (nb == 0)
283 nb = 32;
284 }
285 if (nb + reg * 4 > 128) {
286 nb0 = nb + reg * 4 - 128;
287 nb = 128 - reg * 4;
288 }
289 } else {
290 /* lwm, stmw */
291 nb = (32 - reg) * 4;
292 }
293
294 if (!access_ok((flags & ST? VERIFY_WRITE: VERIFY_READ), addr, nb+nb0))
295 return -EFAULT; /* bad address */
296
297 rptr = (unsigned char *) &regs->gpr[reg];
298 if (flags & LD) {
299 for (i = 0; i < nb; ++i)
300 if (__get_user(rptr[i], addr+i))
301 return -EFAULT;
302 if (nb0 > 0) {
303 rptr = (unsigned char *) &regs->gpr[0];
304 addr += nb;
305 for (i = 0; i < nb0; ++i)
306 if (__get_user(rptr[i], addr+i))
307 return -EFAULT;
308 }
309 for (; (i & 3) != 0; ++i)
310 rptr[i] = 0;
311 } else {
312 for (i = 0; i < nb; ++i)
313 if (__put_user(rptr[i], addr+i))
314 return -EFAULT;
315 if (nb0 > 0) {
316 rptr = (unsigned char *) &regs->gpr[0];
317 addr += nb;
318 for (i = 0; i < nb0; ++i)
319 if (__put_user(rptr[i], addr+i))
320 return -EFAULT;
321 }
322 }
323 return 1;
324 }
325
326 offset = 0;
327 if (nb < 4) {
328 /* read/write the least significant bits */
329 data.l = 0;
330 offset = 4 - nb;
331 }
332
333 /* Verify the address of the operand */
334 if (user_mode(regs)) {
335 if (!access_ok((flags & ST? VERIFY_WRITE: VERIFY_READ), addr, nb))
336 return -EFAULT; /* bad address */
337 }
338
339 if (flags & F) {
340 preempt_disable();
341 if (regs->msr & MSR_FP)
342 giveup_fpu(current);
343 preempt_enable();
344 }
345
346 /* If we read the operand, copy it in, else get register values */
347 if (flags & LD) {
348 for (i = 0; i < nb; ++i)
349 if (__get_user(data.v[offset+i], addr+i))
350 return -EFAULT;
351 } else if (flags & F) {
352 data.d = current->thread.fpr[reg];
353 } else {
354 data.l = regs->gpr[reg];
355 }
356
357 switch (flags & ~U) {
358 case LD+SE: /* sign extend */
359 if (data.v[2] >= 0x80)
360 data.v[0] = data.v[1] = -1;
361 break;
362
363 case LD+S: /* byte-swap */
364 case ST+S:
365 if (nb == 2) {
366 SWAP(data.v[2], data.v[3]);
367 } else {
368 SWAP(data.v[0], data.v[3]);
369 SWAP(data.v[1], data.v[2]);
370 }
371 break;
372
373 /* Single-precision FP load and store require conversions... */
374 case LD+F+S:
375#ifdef CONFIG_PPC_FPU
376 preempt_disable();
377 enable_kernel_fp();
378 cvt_fd(&data.f, &data.d, &current->thread);
379 preempt_enable();
380#else
381 return 0;
382#endif
383 break;
384 case ST+F+S:
385#ifdef CONFIG_PPC_FPU
386 preempt_disable();
387 enable_kernel_fp();
388 cvt_df(&data.d, &data.f, &current->thread);
389 preempt_enable();
390#else
391 return 0;
392#endif
393 break;
394 }
395
396 if (flags & ST) {
397 for (i = 0; i < nb; ++i)
398 if (__put_user(data.v[offset+i], addr+i))
399 return -EFAULT;
400 } else if (flags & F) {
401 current->thread.fpr[reg] = data.d;
402 } else {
403 regs->gpr[reg] = data.l;
404 }
405
406 if (flags & U)
407 regs->gpr[areg] = regs->dar;
408
409 return 1;
410}
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 48ed58f995c0..f7fae5f153b2 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -45,7 +45,6 @@ static void update_bridge_base(struct pci_bus *bus, int i);
45static void pcibios_fixup_resources(struct pci_dev* dev); 45static void pcibios_fixup_resources(struct pci_dev* dev);
46static void fixup_broken_pcnet32(struct pci_dev* dev); 46static void fixup_broken_pcnet32(struct pci_dev* dev);
47static int reparent_resources(struct resource *parent, struct resource *res); 47static int reparent_resources(struct resource *parent, struct resource *res);
48static void fixup_rev1_53c810(struct pci_dev* dev);
49static void fixup_cpc710_pci64(struct pci_dev* dev); 48static void fixup_cpc710_pci64(struct pci_dev* dev);
50#ifdef CONFIG_PPC_OF 49#ifdef CONFIG_PPC_OF
51static u8* pci_to_OF_bus_map; 50static u8* pci_to_OF_bus_map;
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
index 7b26bcc5d10d..198a6a02cde8 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
+++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.h
@@ -25,6 +25,8 @@
25#define BCSR_ADDR ((uint)0xf8000000) 25#define BCSR_ADDR ((uint)0xf8000000)
26#define BCSR_SIZE ((uint)(32 * 1024)) 26#define BCSR_SIZE ((uint)(32 * 1024))
27 27
28struct seq_file;
29
28extern int mpc85xx_ads_show_cpuinfo(struct seq_file *m); 30extern int mpc85xx_ads_show_cpuinfo(struct seq_file *m);
29extern void mpc85xx_ads_init_IRQ(void) __init; 31extern void mpc85xx_ads_init_IRQ(void) __init;
30extern void mpc85xx_ads_map_io(void) __init; 32extern void mpc85xx_ads_map_io(void) __init;
diff --git a/arch/ppc/platforms/85xx/stx_gp3.h b/arch/ppc/platforms/85xx/stx_gp3.h
index 7bcc6c35a417..2f25b5195152 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.h
+++ b/arch/ppc/platforms/85xx/stx_gp3.h
@@ -21,7 +21,6 @@
21 21
22#include <linux/config.h> 22#include <linux/config.h>
23#include <linux/init.h> 23#include <linux/init.h>
24#include <linux/seq_file.h>
25#include <asm/ppcboot.h> 24#include <asm/ppcboot.h>
26 25
27#define BOARD_CCSRBAR ((uint)0xe0000000) 26#define BOARD_CCSRBAR ((uint)0xe0000000)
@@ -43,7 +42,6 @@ extern void mpc85xx_setup_hose(void) __init;
43extern void mpc85xx_restart(char *cmd); 42extern void mpc85xx_restart(char *cmd);
44extern void mpc85xx_power_off(void); 43extern void mpc85xx_power_off(void);
45extern void mpc85xx_halt(void); 44extern void mpc85xx_halt(void);
46extern int mpc85xx_show_cpuinfo(struct seq_file *m);
47extern void mpc85xx_init_IRQ(void) __init; 45extern void mpc85xx_init_IRQ(void) __init;
48extern unsigned long mpc85xx_find_end_of_memory(void) __init; 46extern unsigned long mpc85xx_find_end_of_memory(void) __init;
49extern void mpc85xx_calibrate_decr(void) __init; 47extern void mpc85xx_calibrate_decr(void) __init;
diff --git a/arch/ppc/syslib/mpc83xx_sys.c b/arch/ppc/syslib/mpc83xx_sys.c
index a1523989aff4..82cf3ab77f4a 100644
--- a/arch/ppc/syslib/mpc83xx_sys.c
+++ b/arch/ppc/syslib/mpc83xx_sys.c
@@ -69,9 +69,33 @@ struct ppc_sys_spec ppc_sys_specs[] = {
69 }, 69 },
70 }, 70 },
71 { 71 {
72 .ppc_sys_name = "8343E", 72 .ppc_sys_name = "8347E",
73 .mask = 0xFFFF0000, 73 .mask = 0xFFFF0000,
74 .value = 0x80540000, 74 .value = 0x80540000,
75 .num_devices = 9,
76 .device_list = (enum ppc_sys_devices[])
77 {
78 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
79 MPC83xx_IIC2, MPC83xx_DUART, MPC83xx_SEC2,
80 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
81 },
82 },
83 {
84 .ppc_sys_name = "8347",
85 .mask = 0xFFFF0000,
86 .value = 0x80550000,
87 .num_devices = 8,
88 .device_list = (enum ppc_sys_devices[])
89 {
90 MPC83xx_TSEC1, MPC83xx_TSEC2, MPC83xx_IIC1,
91 MPC83xx_IIC2, MPC83xx_DUART,
92 MPC83xx_USB2_DR, MPC83xx_USB2_MPH, MPC83xx_MDIO
93 },
94 },
95 {
96 .ppc_sys_name = "8343E",
97 .mask = 0xFFFF0000,
98 .value = 0x80560000,
75 .num_devices = 8, 99 .num_devices = 8,
76 .device_list = (enum ppc_sys_devices[]) 100 .device_list = (enum ppc_sys_devices[])
77 { 101 {
@@ -83,7 +107,7 @@ struct ppc_sys_spec ppc_sys_specs[] = {
83 { 107 {
84 .ppc_sys_name = "8343", 108 .ppc_sys_name = "8343",
85 .mask = 0xFFFF0000, 109 .mask = 0xFFFF0000,
86 .value = 0x80550000, 110 .value = 0x80570000,
87 .num_devices = 7, 111 .num_devices = 7,
88 .device_list = (enum ppc_sys_devices[]) 112 .device_list = (enum ppc_sys_devices[])
89 { 113 {
diff --git a/arch/ppc64/Kconfig.debug b/arch/ppc64/Kconfig.debug
deleted file mode 100644
index b258c9314a1b..000000000000
--- a/arch/ppc64/Kconfig.debug
+++ /dev/null
@@ -1,65 +0,0 @@
1menu "Kernel hacking"
2
3source "lib/Kconfig.debug"
4
5config DEBUG_STACKOVERFLOW
6 bool "Check for stack overflows"
7 depends on DEBUG_KERNEL
8 help
9 This option will cause messages to be printed if free stack space
10 drops below a certain limit.
11
12config KPROBES
13 bool "Kprobes"
14 depends on DEBUG_KERNEL
15 help
16 Kprobes allows you to trap at almost any kernel address and
17 execute a callback function. register_kprobe() establishes
18 a probepoint and specifies the callback. Kprobes is useful
19 for kernel debugging, non-intrusive instrumentation and testing.
20 If in doubt, say "N".
21
22config DEBUG_STACK_USAGE
23 bool "Stack utilization instrumentation"
24 depends on DEBUG_KERNEL
25 help
26 Enables the display of the minimum amount of free stack which each
27 task has ever had available in the sysrq-T and sysrq-P debug output.
28
29 This option will slow down process creation somewhat.
30
31config DEBUGGER
32 bool "Enable debugger hooks"
33 depends on DEBUG_KERNEL
34 help
35 Include in-kernel hooks for kernel debuggers. Unless you are
36 intending to debug the kernel, say N here.
37
38config XMON
39 bool "Include xmon kernel debugger"
40 depends on DEBUGGER && !PPC_ISERIES
41 help
42 Include in-kernel hooks for the xmon kernel monitor/debugger.
43 Unless you are intending to debug the kernel, say N here.
44 Make sure to enable also CONFIG_BOOTX_TEXT on Macs. Otherwise
45 nothing will appear on the screen (xmon writes directly to the
46 framebuffer memory).
47 The cmdline option 'xmon' or 'xmon=early' will drop into xmon very
48 early during boot. 'xmon=on' will just enable the xmon debugger hooks.
49 'xmon=off' will disable the debugger hooks if CONFIG_XMON_DEFAULT is set.
50
51config XMON_DEFAULT
52 bool "Enable xmon by default"
53 depends on XMON
54 help
55 xmon is normally disabled unless booted with 'xmon=on'.
56 Use 'xmon=off' to disable xmon init during runtime.
57
58config IRQSTACKS
59 bool "Use separate kernel stacks when processing interrupts"
60 help
61 If you say Y here the kernel will use separate kernel stacks
62 for handling hard and soft interrupts. This can help avoid
63 overflowing the process kernel stacks.
64
65endmenu
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
deleted file mode 100644
index a55a82d145d4..000000000000
--- a/arch/ppc64/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
1# This file is included by the global makefile so that you can add your own
2# architecture-specific flags and dependencies. Remember to do have actions
3# for "archclean" and "archdep" for cleaning up and making dependencies for
4# this architecture
5#
6# This file is subject to the terms and conditions of the GNU General Public
7# License. See the file "COPYING" in the main directory of this archive
8# for more details.
9#
10# Copyright (C) 1994 by Linus Torvalds
11# Changes for PPC by Gary Thomas
12# Rewritten by Cort Dougan and Paul Mackerras
13# Adjusted for PPC64 by Tom Gall
14#
15
16KERNELLOAD := 0xc000000000000000
17
18# Set default 32 bits cross compilers for vdso and boot wrapper
19CROSS32_COMPILE ?=
20
21CROSS32CC := $(CROSS32_COMPILE)gcc
22CROSS32AS := $(CROSS32_COMPILE)as
23CROSS32LD := $(CROSS32_COMPILE)ld
24CROSS32OBJCOPY := $(CROSS32_COMPILE)objcopy
25
26# If we have a biarch compiler, use it for 32 bits cross compile if
27# CROSS32_COMPILE wasn't explicitely defined, and add proper explicit
28# target type to target compilers
29
30HAS_BIARCH := $(call cc-option-yn, -m64)
31ifeq ($(HAS_BIARCH),y)
32ifeq ($(CROSS32_COMPILE),)
33CROSS32CC := $(CC) -m32
34CROSS32AS := $(AS) -a32
35CROSS32LD := $(LD) -m elf32ppc
36CROSS32OBJCOPY := $(OBJCOPY)
37endif
38override AS += -a64
39override LD += -m elf64ppc
40override CC += -m64
41endif
42
43export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY
44
45new_nm := $(shell if $(NM) --help 2>&1 | grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)
46
47ifeq ($(new_nm),y)
48NM := $(NM) --synthetic
49
50endif
51
52CHECKFLAGS += -m64 -D__powerpc__ -D__powerpc64__
53
54LDFLAGS := -m elf64ppc
55LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
56CFLAGS += -msoft-float -pipe -mminimal-toc -mtraceback=none \
57 -mcall-aixdesc
58# Temporary hack until we have migrated to asm-powerpc
59CPPFLAGS += -Iarch/$(ARCH)/include
60
61GCC_VERSION := $(call cc-version)
62GCC_BROKEN_VEC := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
63
64ifeq ($(CONFIG_POWER4_ONLY),y)
65ifeq ($(CONFIG_ALTIVEC),y)
66ifeq ($(GCC_BROKEN_VEC),y)
67 CFLAGS += $(call cc-option,-mcpu=970)
68else
69 CFLAGS += $(call cc-option,-mcpu=power4)
70endif
71else
72 CFLAGS += $(call cc-option,-mcpu=power4)
73endif
74else
75 CFLAGS += $(call cc-option,-mtune=power4)
76endif
77
78# No AltiVec instruction when building kernel
79CFLAGS += $(call cc-option, -mno-altivec)
80
81# Enable unit-at-a-time mode when possible. It shrinks the
82# kernel considerably.
83CFLAGS += $(call cc-option,-funit-at-a-time)
84
85head-y := arch/ppc64/kernel/head.o
86head-y += arch/powerpc/kernel/fpu.o
87head-y += arch/powerpc/kernel/entry_64.o
88
89core-y += arch/ppc64/kernel/ arch/powerpc/kernel/
90core-y += arch/powerpc/mm/
91core-y += arch/powerpc/sysdev/
92core-y += arch/powerpc/platforms/
93core-y += arch/powerpc/lib/
94core-$(CONFIG_XMON) += arch/powerpc/xmon/
95drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
96
97boot := arch/ppc64/boot
98
99boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd
100boottargets-$(CONFIG_PPC_PMAC) += zImage.vmode zImage.initrd.vmode
101boottargets-$(CONFIG_PPC_MAPLE) += zImage zImage.initrd
102boottargets-$(CONFIG_PPC_ISERIES) += vmlinux.sminitrd vmlinux.initrd vmlinux.sm
103boottargets-$(CONFIG_PPC_BPA) += zImage zImage.initrd
104$(boottargets-y): vmlinux
105 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
106
107bootimage-$(CONFIG_PPC_PSERIES) := $(boot)/zImage
108bootimage-$(CONFIG_PPC_PMAC) := vmlinux
109bootimage-$(CONFIG_PPC_MAPLE) := $(boot)/zImage
110bootimage-$(CONFIG_PPC_BPA) := $(boot)/zImage
111bootimage-$(CONFIG_PPC_ISERIES) := vmlinux
112BOOTIMAGE := $(bootimage-y)
113install: vmlinux
114 $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
115
116defaultimage-$(CONFIG_PPC_PSERIES) := zImage
117defaultimage-$(CONFIG_PPC_PMAC) := zImage.vmode
118defaultimage-$(CONFIG_PPC_MAPLE) := zImage
119defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
120KBUILD_IMAGE := $(defaultimage-y)
121all: $(KBUILD_IMAGE)
122
123archclean:
124 $(Q)$(MAKE) $(clean)=$(boot)
125 # Temporary hack until we have migrated to asm-powerpc
126 $(Q)rm -rf arch/$(ARCH)/include
127
128
129# Temporary hack until we have migrated to asm-powerpc
130include/asm: arch/$(ARCH)/include/asm
131arch/$(ARCH)/include/asm:
132 $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
133 $(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
134
135define archhelp
136 echo ' zImage.vmode - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'
137 echo ' zImage.initrd.vmode - Compressed kernel image with initrd attached,'
138 echo ' sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
139 echo ' (arch/$(ARCH)/boot/zImage.initrd.vmode)'
140 echo ' zImage - zImage for pSeries machines'
141 echo ' zImage.initrd - zImage with initrd for pSeries machines'
142endef
diff --git a/arch/ppc64/configs/bpa_defconfig b/arch/ppc64/configs/bpa_defconfig
deleted file mode 100644
index 67ffecbc05cb..000000000000
--- a/arch/ppc64/configs/bpa_defconfig
+++ /dev/null
@@ -1,1024 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc4
4# Thu Oct 20 08:29:10 2005
5#
6CONFIG_64BIT=y
7CONFIG_MMU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_GENERIC_ISA_DMA=y
11CONFIG_EARLY_PRINTK=y
12CONFIG_COMPAT=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y
15CONFIG_FORCE_MAX_ZONEORDER=13
16
17#
18# Code maturity level options
19#
20CONFIG_EXPERIMENTAL=y
21CONFIG_CLEAN_COMPILE=y
22CONFIG_LOCK_KERNEL=y
23CONFIG_INIT_ENV_ARG_LIMIT=32
24
25#
26# General setup
27#
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31CONFIG_SYSVIPC=y
32# CONFIG_POSIX_MQUEUE is not set
33# CONFIG_BSD_PROCESS_ACCT is not set
34CONFIG_SYSCTL=y
35# CONFIG_AUDIT is not set
36CONFIG_HOTPLUG=y
37CONFIG_KOBJECT_UEVENT=y
38# CONFIG_IKCONFIG is not set
39# CONFIG_CPUSETS is not set
40CONFIG_INITRAMFS_SOURCE=""
41# CONFIG_EMBEDDED is not set
42CONFIG_KALLSYMS=y
43# CONFIG_KALLSYMS_ALL is not set
44# CONFIG_KALLSYMS_EXTRA_PASS is not set
45CONFIG_PRINTK=y
46CONFIG_BUG=y
47CONFIG_BASE_FULL=y
48CONFIG_FUTEX=y
49CONFIG_EPOLL=y
50CONFIG_SHMEM=y
51CONFIG_CC_ALIGN_FUNCTIONS=0
52CONFIG_CC_ALIGN_LABELS=0
53CONFIG_CC_ALIGN_LOOPS=0
54CONFIG_CC_ALIGN_JUMPS=0
55# CONFIG_TINY_SHMEM is not set
56CONFIG_BASE_SMALL=0
57
58#
59# Loadable module support
60#
61CONFIG_MODULES=y
62CONFIG_MODULE_UNLOAD=y
63# CONFIG_MODULE_FORCE_UNLOAD is not set
64CONFIG_OBSOLETE_MODPARM=y
65# CONFIG_MODVERSIONS is not set
66# CONFIG_MODULE_SRCVERSION_ALL is not set
67# CONFIG_KMOD is not set
68CONFIG_STOP_MACHINE=y
69CONFIG_SYSVIPC_COMPAT=y
70
71#
72# Platform support
73#
74# CONFIG_PPC_ISERIES is not set
75CONFIG_PPC_MULTIPLATFORM=y
76# CONFIG_PPC_PSERIES is not set
77CONFIG_PPC_BPA=y
78# CONFIG_PPC_PMAC is not set
79# CONFIG_PPC_MAPLE is not set
80CONFIG_PPC=y
81CONFIG_PPC64=y
82CONFIG_PPC_OF=y
83CONFIG_BPA_IIC=y
84CONFIG_ALTIVEC=y
85CONFIG_KEXEC=y
86# CONFIG_U3_DART is not set
87# CONFIG_BOOTX_TEXT is not set
88# CONFIG_POWER4_ONLY is not set
89# CONFIG_IOMMU_VMERGE is not set
90CONFIG_SMP=y
91CONFIG_NR_CPUS=4
92CONFIG_ARCH_SELECT_MEMORY_MODEL=y
93CONFIG_ARCH_FLATMEM_ENABLE=y
94CONFIG_SELECT_MEMORY_MODEL=y
95CONFIG_FLATMEM_MANUAL=y
96# CONFIG_DISCONTIGMEM_MANUAL is not set
97# CONFIG_SPARSEMEM_MANUAL is not set
98CONFIG_FLATMEM=y
99CONFIG_FLAT_NODE_MEM_MAP=y
100# CONFIG_SPARSEMEM_STATIC is not set
101# CONFIG_NUMA is not set
102CONFIG_SCHED_SMT=y
103CONFIG_PREEMPT_NONE=y
104# CONFIG_PREEMPT_VOLUNTARY is not set
105# CONFIG_PREEMPT is not set
106CONFIG_PREEMPT_BKL=y
107# CONFIG_HZ_100 is not set
108CONFIG_HZ_250=y
109# CONFIG_HZ_1000 is not set
110CONFIG_HZ=250
111CONFIG_GENERIC_HARDIRQS=y
112CONFIG_PPC_RTAS=y
113CONFIG_RTAS_PROC=y
114CONFIG_RTAS_FLASH=y
115CONFIG_SECCOMP=y
116CONFIG_BINFMT_ELF=y
117# CONFIG_BINFMT_MISC is not set
118CONFIG_PROC_DEVICETREE=y
119# CONFIG_CMDLINE_BOOL is not set
120CONFIG_ISA_DMA_API=y
121
122#
123# Bus Options
124#
125CONFIG_PCI=y
126CONFIG_PCI_DOMAINS=y
127CONFIG_PCI_LEGACY_PROC=y
128# CONFIG_PCI_DEBUG is not set
129
130#
131# PCCARD (PCMCIA/CardBus) support
132#
133# CONFIG_PCCARD is not set
134
135#
136# PCI Hotplug Support
137#
138# CONFIG_HOTPLUG_PCI is not set
139
140#
141# Networking
142#
143CONFIG_NET=y
144
145#
146# Networking options
147#
148CONFIG_PACKET=y
149# CONFIG_PACKET_MMAP is not set
150CONFIG_UNIX=y
151CONFIG_XFRM=y
152# CONFIG_XFRM_USER is not set
153# CONFIG_NET_KEY is not set
154CONFIG_INET=y
155CONFIG_IP_MULTICAST=y
156# CONFIG_IP_ADVANCED_ROUTER is not set
157CONFIG_IP_FIB_HASH=y
158# CONFIG_IP_PNP is not set
159CONFIG_NET_IPIP=y
160# CONFIG_NET_IPGRE is not set
161# CONFIG_IP_MROUTE is not set
162# CONFIG_ARPD is not set
163CONFIG_SYN_COOKIES=y
164# CONFIG_INET_AH is not set
165# CONFIG_INET_ESP is not set
166# CONFIG_INET_IPCOMP is not set
167CONFIG_INET_TUNNEL=y
168CONFIG_INET_DIAG=y
169CONFIG_INET_TCP_DIAG=y
170# CONFIG_TCP_CONG_ADVANCED is not set
171CONFIG_TCP_CONG_BIC=y
172
173#
174# IP: Virtual Server Configuration
175#
176# CONFIG_IP_VS is not set
177CONFIG_IPV6=y
178# CONFIG_IPV6_PRIVACY is not set
179CONFIG_INET6_AH=m
180CONFIG_INET6_ESP=m
181CONFIG_INET6_IPCOMP=m
182CONFIG_INET6_TUNNEL=m
183CONFIG_IPV6_TUNNEL=m
184CONFIG_NETFILTER=y
185# CONFIG_NETFILTER_DEBUG is not set
186# CONFIG_NETFILTER_NETLINK is not set
187
188#
189# IP: Netfilter Configuration
190#
191CONFIG_IP_NF_CONNTRACK=y
192# CONFIG_IP_NF_CT_ACCT is not set
193# CONFIG_IP_NF_CONNTRACK_MARK is not set
194# CONFIG_IP_NF_CONNTRACK_EVENTS is not set
195CONFIG_IP_NF_CT_PROTO_SCTP=y
196CONFIG_IP_NF_FTP=m
197CONFIG_IP_NF_IRC=m
198# CONFIG_IP_NF_NETBIOS_NS is not set
199CONFIG_IP_NF_TFTP=m
200CONFIG_IP_NF_AMANDA=m
201# CONFIG_IP_NF_PPTP is not set
202CONFIG_IP_NF_QUEUE=m
203CONFIG_IP_NF_IPTABLES=m
204CONFIG_IP_NF_MATCH_LIMIT=m
205CONFIG_IP_NF_MATCH_IPRANGE=m
206CONFIG_IP_NF_MATCH_MAC=m
207CONFIG_IP_NF_MATCH_PKTTYPE=m
208CONFIG_IP_NF_MATCH_MARK=m
209CONFIG_IP_NF_MATCH_MULTIPORT=m
210CONFIG_IP_NF_MATCH_TOS=m
211CONFIG_IP_NF_MATCH_RECENT=m
212CONFIG_IP_NF_MATCH_ECN=m
213CONFIG_IP_NF_MATCH_DSCP=m
214CONFIG_IP_NF_MATCH_AH_ESP=m
215CONFIG_IP_NF_MATCH_LENGTH=m
216CONFIG_IP_NF_MATCH_TTL=m
217CONFIG_IP_NF_MATCH_TCPMSS=m
218CONFIG_IP_NF_MATCH_HELPER=m
219CONFIG_IP_NF_MATCH_STATE=m
220CONFIG_IP_NF_MATCH_CONNTRACK=m
221CONFIG_IP_NF_MATCH_OWNER=m
222CONFIG_IP_NF_MATCH_ADDRTYPE=m
223CONFIG_IP_NF_MATCH_REALM=m
224CONFIG_IP_NF_MATCH_SCTP=m
225# CONFIG_IP_NF_MATCH_DCCP is not set
226CONFIG_IP_NF_MATCH_COMMENT=m
227CONFIG_IP_NF_MATCH_HASHLIMIT=m
228CONFIG_IP_NF_MATCH_STRING=m
229CONFIG_IP_NF_FILTER=m
230CONFIG_IP_NF_TARGET_REJECT=m
231CONFIG_IP_NF_TARGET_LOG=m
232CONFIG_IP_NF_TARGET_ULOG=m
233CONFIG_IP_NF_TARGET_TCPMSS=m
234CONFIG_IP_NF_TARGET_NFQUEUE=m
235CONFIG_IP_NF_NAT=m
236CONFIG_IP_NF_NAT_NEEDED=y
237CONFIG_IP_NF_TARGET_MASQUERADE=m
238CONFIG_IP_NF_TARGET_REDIRECT=m
239CONFIG_IP_NF_TARGET_NETMAP=m
240CONFIG_IP_NF_TARGET_SAME=m
241CONFIG_IP_NF_NAT_SNMP_BASIC=m
242CONFIG_IP_NF_NAT_IRC=m
243CONFIG_IP_NF_NAT_FTP=m
244CONFIG_IP_NF_NAT_TFTP=m
245CONFIG_IP_NF_NAT_AMANDA=m
246CONFIG_IP_NF_MANGLE=m
247CONFIG_IP_NF_TARGET_TOS=m
248CONFIG_IP_NF_TARGET_ECN=m
249CONFIG_IP_NF_TARGET_DSCP=m
250CONFIG_IP_NF_TARGET_MARK=m
251CONFIG_IP_NF_TARGET_CLASSIFY=m
252CONFIG_IP_NF_TARGET_TTL=m
253CONFIG_IP_NF_RAW=m
254CONFIG_IP_NF_TARGET_NOTRACK=m
255CONFIG_IP_NF_ARPTABLES=m
256CONFIG_IP_NF_ARPFILTER=m
257CONFIG_IP_NF_ARP_MANGLE=m
258
259#
260# IPv6: Netfilter Configuration (EXPERIMENTAL)
261#
262# CONFIG_IP6_NF_QUEUE is not set
263# CONFIG_IP6_NF_IPTABLES is not set
264# CONFIG_IP6_NF_TARGET_NFQUEUE is not set
265
266#
267# DCCP Configuration (EXPERIMENTAL)
268#
269# CONFIG_IP_DCCP is not set
270
271#
272# SCTP Configuration (EXPERIMENTAL)
273#
274# CONFIG_IP_SCTP is not set
275# CONFIG_ATM is not set
276# CONFIG_BRIDGE is not set
277# CONFIG_VLAN_8021Q is not set
278# CONFIG_DECNET is not set
279# CONFIG_LLC2 is not set
280# CONFIG_IPX is not set
281# CONFIG_ATALK is not set
282# CONFIG_X25 is not set
283# CONFIG_LAPB is not set
284# CONFIG_NET_DIVERT is not set
285# CONFIG_ECONET is not set
286# CONFIG_WAN_ROUTER is not set
287# CONFIG_NET_SCHED is not set
288CONFIG_NET_CLS_ROUTE=y
289
290#
291# Network testing
292#
293# CONFIG_NET_PKTGEN is not set
294# CONFIG_HAMRADIO is not set
295# CONFIG_IRDA is not set
296# CONFIG_BT is not set
297# CONFIG_IEEE80211 is not set
298
299#
300# Device Drivers
301#
302
303#
304# Generic Driver Options
305#
306CONFIG_STANDALONE=y
307CONFIG_PREVENT_FIRMWARE_BUILD=y
308CONFIG_FW_LOADER=y
309# CONFIG_DEBUG_DRIVER is not set
310
311#
312# Connector - unified userspace <-> kernelspace linker
313#
314# CONFIG_CONNECTOR is not set
315
316#
317# Memory Technology Devices (MTD)
318#
319# CONFIG_MTD is not set
320
321#
322# Parallel port support
323#
324# CONFIG_PARPORT is not set
325
326#
327# Plug and Play support
328#
329
330#
331# Block devices
332#
333# CONFIG_BLK_DEV_FD is not set
334# CONFIG_BLK_CPQ_DA is not set
335# CONFIG_BLK_CPQ_CISS_DA is not set
336# CONFIG_BLK_DEV_DAC960 is not set
337# CONFIG_BLK_DEV_UMEM is not set
338# CONFIG_BLK_DEV_COW_COMMON is not set
339CONFIG_BLK_DEV_LOOP=y
340# CONFIG_BLK_DEV_CRYPTOLOOP is not set
341CONFIG_BLK_DEV_NBD=y
342# CONFIG_BLK_DEV_SX8 is not set
343CONFIG_BLK_DEV_RAM=y
344CONFIG_BLK_DEV_RAM_COUNT=16
345CONFIG_BLK_DEV_RAM_SIZE=131072
346CONFIG_BLK_DEV_INITRD=y
347# CONFIG_CDROM_PKTCDVD is not set
348
349#
350# IO Schedulers
351#
352CONFIG_IOSCHED_NOOP=y
353CONFIG_IOSCHED_AS=y
354CONFIG_IOSCHED_DEADLINE=y
355CONFIG_IOSCHED_CFQ=y
356# CONFIG_ATA_OVER_ETH is not set
357
358#
359# ATA/ATAPI/MFM/RLL support
360#
361CONFIG_IDE=y
362CONFIG_BLK_DEV_IDE=y
363
364#
365# Please see Documentation/ide.txt for help/info on IDE drives
366#
367# CONFIG_BLK_DEV_IDE_SATA is not set
368CONFIG_BLK_DEV_IDEDISK=y
369CONFIG_IDEDISK_MULTI_MODE=y
370# CONFIG_BLK_DEV_IDECD is not set
371# CONFIG_BLK_DEV_IDETAPE is not set
372# CONFIG_BLK_DEV_IDEFLOPPY is not set
373# CONFIG_IDE_TASK_IOCTL is not set
374
375#
376# IDE chipset support/bugfixes
377#
378CONFIG_IDE_GENERIC=y
379CONFIG_BLK_DEV_IDEPCI=y
380CONFIG_IDEPCI_SHARE_IRQ=y
381# CONFIG_BLK_DEV_OFFBOARD is not set
382CONFIG_BLK_DEV_GENERIC=y
383# CONFIG_BLK_DEV_OPTI621 is not set
384# CONFIG_BLK_DEV_SL82C105 is not set
385CONFIG_BLK_DEV_IDEDMA_PCI=y
386# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
387CONFIG_IDEDMA_PCI_AUTO=y
388# CONFIG_IDEDMA_ONLYDISK is not set
389CONFIG_BLK_DEV_AEC62XX=y
390# CONFIG_BLK_DEV_ALI15X3 is not set
391# CONFIG_BLK_DEV_AMD74XX is not set
392# CONFIG_BLK_DEV_CMD64X is not set
393# CONFIG_BLK_DEV_TRIFLEX is not set
394# CONFIG_BLK_DEV_CY82C693 is not set
395# CONFIG_BLK_DEV_CS5520 is not set
396# CONFIG_BLK_DEV_CS5530 is not set
397# CONFIG_BLK_DEV_HPT34X is not set
398# CONFIG_BLK_DEV_HPT366 is not set
399# CONFIG_BLK_DEV_SC1200 is not set
400# CONFIG_BLK_DEV_PIIX is not set
401# CONFIG_BLK_DEV_IT821X is not set
402# CONFIG_BLK_DEV_NS87415 is not set
403# CONFIG_BLK_DEV_PDC202XX_OLD is not set
404# CONFIG_BLK_DEV_PDC202XX_NEW is not set
405# CONFIG_BLK_DEV_SVWKS is not set
406CONFIG_BLK_DEV_SIIMAGE=y
407# CONFIG_BLK_DEV_SLC90E66 is not set
408# CONFIG_BLK_DEV_TRM290 is not set
409# CONFIG_BLK_DEV_VIA82CXXX is not set
410# CONFIG_IDE_ARM is not set
411CONFIG_BLK_DEV_IDEDMA=y
412# CONFIG_IDEDMA_IVB is not set
413CONFIG_IDEDMA_AUTO=y
414# CONFIG_BLK_DEV_HD is not set
415
416#
417# SCSI device support
418#
419# CONFIG_RAID_ATTRS is not set
420# CONFIG_SCSI is not set
421
422#
423# Multi-device support (RAID and LVM)
424#
425# CONFIG_MD is not set
426
427#
428# Fusion MPT device support
429#
430# CONFIG_FUSION is not set
431
432#
433# IEEE 1394 (FireWire) support
434#
435# CONFIG_IEEE1394 is not set
436
437#
438# I2O device support
439#
440# CONFIG_I2O is not set
441
442#
443# Macintosh device drivers
444#
445
446#
447# Network device support
448#
449CONFIG_NETDEVICES=y
450# CONFIG_DUMMY is not set
451# CONFIG_BONDING is not set
452# CONFIG_EQUALIZER is not set
453# CONFIG_TUN is not set
454
455#
456# ARCnet devices
457#
458# CONFIG_ARCNET is not set
459
460#
461# PHY device support
462#
463# CONFIG_PHYLIB is not set
464
465#
466# Ethernet (10 or 100Mbit)
467#
468CONFIG_NET_ETHERNET=y
469CONFIG_MII=y
470# CONFIG_HAPPYMEAL is not set
471# CONFIG_SUNGEM is not set
472# CONFIG_CASSINI is not set
473# CONFIG_NET_VENDOR_3COM is not set
474
475#
476# Tulip family network device support
477#
478# CONFIG_NET_TULIP is not set
479# CONFIG_HP100 is not set
480# CONFIG_NET_PCI is not set
481
482#
483# Ethernet (1000 Mbit)
484#
485# CONFIG_ACENIC is not set
486# CONFIG_DL2K is not set
487CONFIG_E1000=m
488# CONFIG_E1000_NAPI is not set
489# CONFIG_NS83820 is not set
490# CONFIG_HAMACHI is not set
491# CONFIG_YELLOWFIN is not set
492# CONFIG_R8169 is not set
493# CONFIG_SIS190 is not set
494CONFIG_SKGE=m
495# CONFIG_SK98LIN is not set
496# CONFIG_TIGON3 is not set
497# CONFIG_BNX2 is not set
498# CONFIG_SPIDER_NET is not set
499# CONFIG_MV643XX_ETH is not set
500
501#
502# Ethernet (10000 Mbit)
503#
504# CONFIG_CHELSIO_T1 is not set
505# CONFIG_IXGB is not set
506# CONFIG_S2IO is not set
507
508#
509# Token Ring devices
510#
511# CONFIG_TR is not set
512
513#
514# Wireless LAN (non-hamradio)
515#
516# CONFIG_NET_RADIO is not set
517
518#
519# Wan interfaces
520#
521# CONFIG_WAN is not set
522# CONFIG_FDDI is not set
523# CONFIG_HIPPI is not set
524# CONFIG_PPP is not set
525# CONFIG_SLIP is not set
526# CONFIG_SHAPER is not set
527# CONFIG_NETCONSOLE is not set
528# CONFIG_NETPOLL is not set
529# CONFIG_NET_POLL_CONTROLLER is not set
530
531#
532# ISDN subsystem
533#
534# CONFIG_ISDN is not set
535
536#
537# Telephony Support
538#
539# CONFIG_PHONE is not set
540
541#
542# Input device support
543#
544CONFIG_INPUT=y
545
546#
547# Userland interfaces
548#
549CONFIG_INPUT_MOUSEDEV=y
550# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
551CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
552CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
553# CONFIG_INPUT_JOYDEV is not set
554# CONFIG_INPUT_TSDEV is not set
555# CONFIG_INPUT_EVDEV is not set
556# CONFIG_INPUT_EVBUG is not set
557
558#
559# Input Device Drivers
560#
561# CONFIG_INPUT_KEYBOARD is not set
562# CONFIG_INPUT_MOUSE is not set
563# CONFIG_INPUT_JOYSTICK is not set
564# CONFIG_INPUT_TOUCHSCREEN is not set
565# CONFIG_INPUT_MISC is not set
566
567#
568# Hardware I/O ports
569#
570CONFIG_SERIO=y
571# CONFIG_SERIO_I8042 is not set
572CONFIG_SERIO_SERPORT=y
573# CONFIG_SERIO_PCIPS2 is not set
574# CONFIG_SERIO_RAW is not set
575# CONFIG_GAMEPORT is not set
576
577#
578# Character devices
579#
580CONFIG_VT=y
581CONFIG_VT_CONSOLE=y
582CONFIG_HW_CONSOLE=y
583CONFIG_SERIAL_NONSTANDARD=y
584# CONFIG_ROCKETPORT is not set
585# CONFIG_CYCLADES is not set
586# CONFIG_DIGIEPCA is not set
587# CONFIG_MOXA_SMARTIO is not set
588# CONFIG_ISI is not set
589# CONFIG_SYNCLINK is not set
590# CONFIG_SYNCLINKMP is not set
591# CONFIG_N_HDLC is not set
592# CONFIG_SPECIALIX is not set
593# CONFIG_SX is not set
594# CONFIG_STALDRV is not set
595
596#
597# Serial drivers
598#
599CONFIG_SERIAL_8250=y
600CONFIG_SERIAL_8250_CONSOLE=y
601CONFIG_SERIAL_8250_NR_UARTS=4
602# CONFIG_SERIAL_8250_EXTENDED is not set
603
604#
605# Non-8250 serial port support
606#
607CONFIG_SERIAL_CORE=y
608CONFIG_SERIAL_CORE_CONSOLE=y
609# CONFIG_SERIAL_JSM is not set
610CONFIG_UNIX98_PTYS=y
611# CONFIG_LEGACY_PTYS is not set
612
613#
614# IPMI
615#
616# CONFIG_IPMI_HANDLER is not set
617
618#
619# Watchdog Cards
620#
621CONFIG_WATCHDOG=y
622# CONFIG_WATCHDOG_NOWAYOUT is not set
623
624#
625# Watchdog Device Drivers
626#
627# CONFIG_SOFT_WATCHDOG is not set
628CONFIG_WATCHDOG_RTAS=y
629
630#
631# PCI-based Watchdog Cards
632#
633# CONFIG_PCIPCWATCHDOG is not set
634# CONFIG_WDTPCI is not set
635# CONFIG_RTC is not set
636# CONFIG_DTLK is not set
637# CONFIG_R3964 is not set
638# CONFIG_APPLICOM is not set
639
640#
641# Ftape, the floppy tape device driver
642#
643# CONFIG_AGP is not set
644# CONFIG_DRM is not set
645# CONFIG_RAW_DRIVER is not set
646# CONFIG_HANGCHECK_TIMER is not set
647
648#
649# TPM devices
650#
651# CONFIG_TCG_TPM is not set
652
653#
654# I2C support
655#
656CONFIG_I2C=y
657# CONFIG_I2C_CHARDEV is not set
658
659#
660# I2C Algorithms
661#
662CONFIG_I2C_ALGOBIT=y
663# CONFIG_I2C_ALGOPCF is not set
664# CONFIG_I2C_ALGOPCA is not set
665
666#
667# I2C Hardware Bus support
668#
669# CONFIG_I2C_ALI1535 is not set
670# CONFIG_I2C_ALI1563 is not set
671# CONFIG_I2C_ALI15X3 is not set
672# CONFIG_I2C_AMD756 is not set
673# CONFIG_I2C_AMD8111 is not set
674# CONFIG_I2C_I801 is not set
675# CONFIG_I2C_I810 is not set
676# CONFIG_I2C_PIIX4 is not set
677# CONFIG_I2C_NFORCE2 is not set
678# CONFIG_I2C_PARPORT_LIGHT is not set
679# CONFIG_I2C_PROSAVAGE is not set
680# CONFIG_I2C_SAVAGE4 is not set
681# CONFIG_SCx200_ACB is not set
682# CONFIG_I2C_SIS5595 is not set
683# CONFIG_I2C_SIS630 is not set
684# CONFIG_I2C_SIS96X is not set
685# CONFIG_I2C_STUB is not set
686# CONFIG_I2C_VIA is not set
687# CONFIG_I2C_VIAPRO is not set
688# CONFIG_I2C_VOODOO3 is not set
689# CONFIG_I2C_PCA_ISA is not set
690
691#
692# Miscellaneous I2C Chip support
693#
694# CONFIG_SENSORS_DS1337 is not set
695# CONFIG_SENSORS_DS1374 is not set
696# CONFIG_SENSORS_EEPROM is not set
697# CONFIG_SENSORS_PCF8574 is not set
698# CONFIG_SENSORS_PCA9539 is not set
699# CONFIG_SENSORS_PCF8591 is not set
700# CONFIG_SENSORS_RTC8564 is not set
701# CONFIG_SENSORS_MAX6875 is not set
702# CONFIG_I2C_DEBUG_CORE is not set
703# CONFIG_I2C_DEBUG_ALGO is not set
704# CONFIG_I2C_DEBUG_BUS is not set
705# CONFIG_I2C_DEBUG_CHIP is not set
706
707#
708# Dallas's 1-wire bus
709#
710# CONFIG_W1 is not set
711
712#
713# Hardware Monitoring support
714#
715# CONFIG_HWMON is not set
716# CONFIG_HWMON_VID is not set
717
718#
719# Misc devices
720#
721
722#
723# Multimedia Capabilities Port drivers
724#
725
726#
727# Multimedia devices
728#
729# CONFIG_VIDEO_DEV is not set
730
731#
732# Digital Video Broadcasting Devices
733#
734# CONFIG_DVB is not set
735
736#
737# Graphics support
738#
739# CONFIG_FB is not set
740
741#
742# Console display driver support
743#
744# CONFIG_VGA_CONSOLE is not set
745CONFIG_DUMMY_CONSOLE=y
746
747#
748# Sound
749#
750# CONFIG_SOUND is not set
751
752#
753# USB support
754#
755CONFIG_USB_ARCH_HAS_HCD=y
756CONFIG_USB_ARCH_HAS_OHCI=y
757# CONFIG_USB is not set
758
759#
760# USB Gadget Support
761#
762# CONFIG_USB_GADGET is not set
763
764#
765# MMC/SD Card support
766#
767# CONFIG_MMC is not set
768
769#
770# InfiniBand support
771#
772# CONFIG_INFINIBAND is not set
773
774#
775# SN Devices
776#
777
778#
779# File systems
780#
781CONFIG_EXT2_FS=y
782# CONFIG_EXT2_FS_XATTR is not set
783# CONFIG_EXT2_FS_XIP is not set
784CONFIG_EXT3_FS=y
785CONFIG_EXT3_FS_XATTR=y
786# CONFIG_EXT3_FS_POSIX_ACL is not set
787# CONFIG_EXT3_FS_SECURITY is not set
788CONFIG_JBD=y
789# CONFIG_JBD_DEBUG is not set
790CONFIG_FS_MBCACHE=y
791# CONFIG_REISERFS_FS is not set
792# CONFIG_JFS_FS is not set
793CONFIG_FS_POSIX_ACL=y
794# CONFIG_XFS_FS is not set
795# CONFIG_MINIX_FS is not set
796# CONFIG_ROMFS_FS is not set
797CONFIG_INOTIFY=y
798# CONFIG_QUOTA is not set
799CONFIG_DNOTIFY=y
800# CONFIG_AUTOFS_FS is not set
801# CONFIG_AUTOFS4_FS is not set
802# CONFIG_FUSE_FS is not set
803
804#
805# CD-ROM/DVD Filesystems
806#
807CONFIG_ISO9660_FS=m
808CONFIG_JOLIET=y
809# CONFIG_ZISOFS is not set
810CONFIG_UDF_FS=m
811CONFIG_UDF_NLS=y
812
813#
814# DOS/FAT/NT Filesystems
815#
816CONFIG_FAT_FS=m
817CONFIG_MSDOS_FS=m
818CONFIG_VFAT_FS=m
819CONFIG_FAT_DEFAULT_CODEPAGE=437
820CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
821# CONFIG_NTFS_FS is not set
822
823#
824# Pseudo filesystems
825#
826CONFIG_PROC_FS=y
827CONFIG_PROC_KCORE=y
828CONFIG_SYSFS=y
829CONFIG_TMPFS=y
830CONFIG_HUGETLBFS=y
831CONFIG_HUGETLB_PAGE=y
832CONFIG_RAMFS=y
833# CONFIG_RELAYFS_FS is not set
834
835#
836# Miscellaneous filesystems
837#
838# CONFIG_ADFS_FS is not set
839# CONFIG_AFFS_FS is not set
840# CONFIG_HFS_FS is not set
841# CONFIG_HFSPLUS_FS is not set
842# CONFIG_BEFS_FS is not set
843# CONFIG_BFS_FS is not set
844# CONFIG_EFS_FS is not set
845# CONFIG_CRAMFS is not set
846# CONFIG_VXFS_FS is not set
847# CONFIG_HPFS_FS is not set
848# CONFIG_QNX4FS_FS is not set
849# CONFIG_SYSV_FS is not set
850# CONFIG_UFS_FS is not set
851
852#
853# Network File Systems
854#
855CONFIG_NFS_FS=m
856CONFIG_NFS_V3=y
857CONFIG_NFS_V3_ACL=y
858# CONFIG_NFS_V4 is not set
859# CONFIG_NFS_DIRECTIO is not set
860CONFIG_NFSD=m
861CONFIG_NFSD_V2_ACL=y
862CONFIG_NFSD_V3=y
863CONFIG_NFSD_V3_ACL=y
864# CONFIG_NFSD_V4 is not set
865CONFIG_NFSD_TCP=y
866CONFIG_LOCKD=m
867CONFIG_LOCKD_V4=y
868CONFIG_EXPORTFS=m
869CONFIG_NFS_ACL_SUPPORT=m
870CONFIG_NFS_COMMON=y
871CONFIG_SUNRPC=m
872# CONFIG_RPCSEC_GSS_KRB5 is not set
873# CONFIG_RPCSEC_GSS_SPKM3 is not set
874# CONFIG_SMB_FS is not set
875# CONFIG_CIFS is not set
876# CONFIG_NCP_FS is not set
877# CONFIG_CODA_FS is not set
878# CONFIG_AFS_FS is not set
879# CONFIG_9P_FS is not set
880
881#
882# Partition Types
883#
884CONFIG_PARTITION_ADVANCED=y
885# CONFIG_ACORN_PARTITION is not set
886# CONFIG_OSF_PARTITION is not set
887# CONFIG_AMIGA_PARTITION is not set
888# CONFIG_ATARI_PARTITION is not set
889# CONFIG_MAC_PARTITION is not set
890CONFIG_MSDOS_PARTITION=y
891# CONFIG_BSD_DISKLABEL is not set
892# CONFIG_MINIX_SUBPARTITION is not set
893# CONFIG_SOLARIS_X86_PARTITION is not set
894# CONFIG_UNIXWARE_DISKLABEL is not set
895# CONFIG_LDM_PARTITION is not set
896# CONFIG_SGI_PARTITION is not set
897# CONFIG_ULTRIX_PARTITION is not set
898# CONFIG_SUN_PARTITION is not set
899CONFIG_EFI_PARTITION=y
900
901#
902# Native Language Support
903#
904CONFIG_NLS=m
905CONFIG_NLS_DEFAULT="iso8859-1"
906# CONFIG_NLS_CODEPAGE_437 is not set
907# CONFIG_NLS_CODEPAGE_737 is not set
908# CONFIG_NLS_CODEPAGE_775 is not set
909# CONFIG_NLS_CODEPAGE_850 is not set
910# CONFIG_NLS_CODEPAGE_852 is not set
911# CONFIG_NLS_CODEPAGE_855 is not set
912# CONFIG_NLS_CODEPAGE_857 is not set
913# CONFIG_NLS_CODEPAGE_860 is not set
914# CONFIG_NLS_CODEPAGE_861 is not set
915# CONFIG_NLS_CODEPAGE_862 is not set
916# CONFIG_NLS_CODEPAGE_863 is not set
917# CONFIG_NLS_CODEPAGE_864 is not set
918# CONFIG_NLS_CODEPAGE_865 is not set
919# CONFIG_NLS_CODEPAGE_866 is not set
920# CONFIG_NLS_CODEPAGE_869 is not set
921# CONFIG_NLS_CODEPAGE_936 is not set
922# CONFIG_NLS_CODEPAGE_950 is not set
923# CONFIG_NLS_CODEPAGE_932 is not set
924# CONFIG_NLS_CODEPAGE_949 is not set
925# CONFIG_NLS_CODEPAGE_874 is not set
926# CONFIG_NLS_ISO8859_8 is not set
927# CONFIG_NLS_CODEPAGE_1250 is not set
928# CONFIG_NLS_CODEPAGE_1251 is not set
929# CONFIG_NLS_ASCII is not set
930CONFIG_NLS_ISO8859_1=m
931CONFIG_NLS_ISO8859_2=m
932CONFIG_NLS_ISO8859_3=m
933CONFIG_NLS_ISO8859_4=m
934CONFIG_NLS_ISO8859_5=m
935CONFIG_NLS_ISO8859_6=m
936CONFIG_NLS_ISO8859_7=m
937CONFIG_NLS_ISO8859_9=m
938CONFIG_NLS_ISO8859_13=m
939CONFIG_NLS_ISO8859_14=m
940CONFIG_NLS_ISO8859_15=m
941# CONFIG_NLS_KOI8_R is not set
942# CONFIG_NLS_KOI8_U is not set
943# CONFIG_NLS_UTF8 is not set
944
945#
946# Profiling support
947#
948# CONFIG_PROFILING is not set
949
950#
951# Kernel hacking
952#
953# CONFIG_PRINTK_TIME is not set
954CONFIG_DEBUG_KERNEL=y
955CONFIG_MAGIC_SYSRQ=y
956CONFIG_LOG_BUF_SHIFT=15
957CONFIG_DETECT_SOFTLOCKUP=y
958# CONFIG_SCHEDSTATS is not set
959# CONFIG_DEBUG_SLAB is not set
960# CONFIG_DEBUG_SPINLOCK is not set
961CONFIG_DEBUG_SPINLOCK_SLEEP=y
962# CONFIG_DEBUG_KOBJECT is not set
963# CONFIG_DEBUG_INFO is not set
964CONFIG_DEBUG_FS=y
965# CONFIG_DEBUG_STACKOVERFLOW is not set
966# CONFIG_KPROBES is not set
967# CONFIG_DEBUG_STACK_USAGE is not set
968CONFIG_DEBUGGER=y
969# CONFIG_XMON is not set
970# CONFIG_PPCDBG is not set
971CONFIG_IRQSTACKS=y
972
973#
974# Security options
975#
976# CONFIG_KEYS is not set
977# CONFIG_SECURITY is not set
978
979#
980# Cryptographic options
981#
982CONFIG_CRYPTO=y
983CONFIG_CRYPTO_HMAC=y
984# CONFIG_CRYPTO_NULL is not set
985# CONFIG_CRYPTO_MD4 is not set
986CONFIG_CRYPTO_MD5=m
987CONFIG_CRYPTO_SHA1=m
988# CONFIG_CRYPTO_SHA256 is not set
989# CONFIG_CRYPTO_SHA512 is not set
990# CONFIG_CRYPTO_WP512 is not set
991# CONFIG_CRYPTO_TGR192 is not set
992CONFIG_CRYPTO_DES=m
993# CONFIG_CRYPTO_BLOWFISH is not set
994# CONFIG_CRYPTO_TWOFISH is not set
995# CONFIG_CRYPTO_SERPENT is not set
996# CONFIG_CRYPTO_AES is not set
997# CONFIG_CRYPTO_CAST5 is not set
998# CONFIG_CRYPTO_CAST6 is not set
999# CONFIG_CRYPTO_TEA is not set
1000# CONFIG_CRYPTO_ARC4 is not set
1001# CONFIG_CRYPTO_KHAZAD is not set
1002# CONFIG_CRYPTO_ANUBIS is not set
1003CONFIG_CRYPTO_DEFLATE=m
1004# CONFIG_CRYPTO_MICHAEL_MIC is not set
1005# CONFIG_CRYPTO_CRC32C is not set
1006# CONFIG_CRYPTO_TEST is not set
1007
1008#
1009# Hardware crypto devices
1010#
1011
1012#
1013# Library routines
1014#
1015# CONFIG_CRC_CCITT is not set
1016# CONFIG_CRC16 is not set
1017CONFIG_CRC32=y
1018# CONFIG_LIBCRC32C is not set
1019CONFIG_ZLIB_INFLATE=m
1020CONFIG_ZLIB_DEFLATE=m
1021CONFIG_TEXTSEARCH=y
1022CONFIG_TEXTSEARCH_KMP=m
1023CONFIG_TEXTSEARCH_BM=m
1024CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig
deleted file mode 100644
index 6323065fbf2c..000000000000
--- a/arch/ppc64/configs/g5_defconfig
+++ /dev/null
@@ -1,1392 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc4
4# Thu Oct 20 08:30:23 2005
5#
6CONFIG_64BIT=y
7CONFIG_MMU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_GENERIC_ISA_DMA=y
11CONFIG_EARLY_PRINTK=y
12CONFIG_COMPAT=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y
15CONFIG_FORCE_MAX_ZONEORDER=13
16
17#
18# Code maturity level options
19#
20CONFIG_EXPERIMENTAL=y
21CONFIG_CLEAN_COMPILE=y
22CONFIG_LOCK_KERNEL=y
23CONFIG_INIT_ENV_ARG_LIMIT=32
24
25#
26# General setup
27#
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31CONFIG_SYSVIPC=y
32CONFIG_POSIX_MQUEUE=y
33# CONFIG_BSD_PROCESS_ACCT is not set
34CONFIG_SYSCTL=y
35# CONFIG_AUDIT is not set
36CONFIG_HOTPLUG=y
37CONFIG_KOBJECT_UEVENT=y
38CONFIG_IKCONFIG=y
39CONFIG_IKCONFIG_PROC=y
40# CONFIG_CPUSETS is not set
41CONFIG_INITRAMFS_SOURCE=""
42# CONFIG_EMBEDDED is not set
43CONFIG_KALLSYMS=y
44# CONFIG_KALLSYMS_ALL is not set
45# CONFIG_KALLSYMS_EXTRA_PASS is not set
46CONFIG_PRINTK=y
47CONFIG_BUG=y
48CONFIG_BASE_FULL=y
49CONFIG_FUTEX=y
50CONFIG_EPOLL=y
51CONFIG_SHMEM=y
52CONFIG_CC_ALIGN_FUNCTIONS=0
53CONFIG_CC_ALIGN_LABELS=0
54CONFIG_CC_ALIGN_LOOPS=0
55CONFIG_CC_ALIGN_JUMPS=0
56# CONFIG_TINY_SHMEM is not set
57CONFIG_BASE_SMALL=0
58
59#
60# Loadable module support
61#
62CONFIG_MODULES=y
63CONFIG_MODULE_UNLOAD=y
64# CONFIG_MODULE_FORCE_UNLOAD is not set
65CONFIG_OBSOLETE_MODPARM=y
66CONFIG_MODVERSIONS=y
67CONFIG_MODULE_SRCVERSION_ALL=y
68CONFIG_KMOD=y
69CONFIG_STOP_MACHINE=y
70CONFIG_SYSVIPC_COMPAT=y
71
72#
73# Platform support
74#
75# CONFIG_PPC_ISERIES is not set
76CONFIG_PPC_MULTIPLATFORM=y
77# CONFIG_PPC_PSERIES is not set
78# CONFIG_PPC_BPA is not set
79CONFIG_PPC_PMAC=y
80# CONFIG_PPC_MAPLE is not set
81CONFIG_PPC=y
82CONFIG_PPC64=y
83CONFIG_PPC_OF=y
84CONFIG_MPIC=y
85CONFIG_ALTIVEC=y
86CONFIG_KEXEC=y
87CONFIG_U3_DART=y
88CONFIG_PPC_PMAC64=y
89CONFIG_BOOTX_TEXT=y
90CONFIG_POWER4_ONLY=y
91CONFIG_IOMMU_VMERGE=y
92CONFIG_SMP=y
93CONFIG_NR_CPUS=2
94CONFIG_ARCH_SELECT_MEMORY_MODEL=y
95CONFIG_ARCH_FLATMEM_ENABLE=y
96CONFIG_SELECT_MEMORY_MODEL=y
97CONFIG_FLATMEM_MANUAL=y
98# CONFIG_DISCONTIGMEM_MANUAL is not set
99# CONFIG_SPARSEMEM_MANUAL is not set
100CONFIG_FLATMEM=y
101CONFIG_FLAT_NODE_MEM_MAP=y
102# CONFIG_SPARSEMEM_STATIC is not set
103# CONFIG_NUMA is not set
104# CONFIG_SCHED_SMT is not set
105CONFIG_PREEMPT_NONE=y
106# CONFIG_PREEMPT_VOLUNTARY is not set
107# CONFIG_PREEMPT is not set
108# CONFIG_PREEMPT_BKL is not set
109# CONFIG_HZ_100 is not set
110CONFIG_HZ_250=y
111# CONFIG_HZ_1000 is not set
112CONFIG_HZ=250
113CONFIG_GENERIC_HARDIRQS=y
114CONFIG_SECCOMP=y
115CONFIG_BINFMT_ELF=y
116# CONFIG_BINFMT_MISC is not set
117# CONFIG_HOTPLUG_CPU is not set
118CONFIG_PROC_DEVICETREE=y
119# CONFIG_CMDLINE_BOOL is not set
120CONFIG_ISA_DMA_API=y
121
122#
123# Bus Options
124#
125CONFIG_PCI=y
126CONFIG_PCI_DOMAINS=y
127CONFIG_PCI_LEGACY_PROC=y
128# CONFIG_PCI_DEBUG is not set
129
130#
131# PCCARD (PCMCIA/CardBus) support
132#
133# CONFIG_PCCARD is not set
134
135#
136# PCI Hotplug Support
137#
138# CONFIG_HOTPLUG_PCI is not set
139
140#
141# Networking
142#
143CONFIG_NET=y
144
145#
146# Networking options
147#
148CONFIG_PACKET=y
149# CONFIG_PACKET_MMAP is not set
150CONFIG_UNIX=y
151CONFIG_XFRM=y
152CONFIG_XFRM_USER=m
153CONFIG_NET_KEY=m
154CONFIG_INET=y
155CONFIG_IP_MULTICAST=y
156# CONFIG_IP_ADVANCED_ROUTER is not set
157CONFIG_IP_FIB_HASH=y
158# CONFIG_IP_PNP is not set
159CONFIG_NET_IPIP=y
160# CONFIG_NET_IPGRE is not set
161# CONFIG_IP_MROUTE is not set
162# CONFIG_ARPD is not set
163CONFIG_SYN_COOKIES=y
164CONFIG_INET_AH=m
165CONFIG_INET_ESP=m
166CONFIG_INET_IPCOMP=m
167CONFIG_INET_TUNNEL=y
168CONFIG_INET_DIAG=y
169CONFIG_INET_TCP_DIAG=y
170# CONFIG_TCP_CONG_ADVANCED is not set
171CONFIG_TCP_CONG_BIC=y
172
173#
174# IP: Virtual Server Configuration
175#
176# CONFIG_IP_VS is not set
177# CONFIG_IPV6 is not set
178CONFIG_NETFILTER=y
179# CONFIG_NETFILTER_DEBUG is not set
180# CONFIG_NETFILTER_NETLINK is not set
181
182#
183# IP: Netfilter Configuration
184#
185CONFIG_IP_NF_CONNTRACK=m
186CONFIG_IP_NF_CT_ACCT=y
187CONFIG_IP_NF_CONNTRACK_MARK=y
188CONFIG_IP_NF_CONNTRACK_EVENTS=y
189CONFIG_IP_NF_CT_PROTO_SCTP=m
190CONFIG_IP_NF_FTP=m
191CONFIG_IP_NF_IRC=m
192# CONFIG_IP_NF_NETBIOS_NS is not set
193CONFIG_IP_NF_TFTP=m
194CONFIG_IP_NF_AMANDA=m
195# CONFIG_IP_NF_PPTP is not set
196CONFIG_IP_NF_QUEUE=m
197CONFIG_IP_NF_IPTABLES=m
198CONFIG_IP_NF_MATCH_LIMIT=m
199CONFIG_IP_NF_MATCH_IPRANGE=m
200CONFIG_IP_NF_MATCH_MAC=m
201CONFIG_IP_NF_MATCH_PKTTYPE=m
202CONFIG_IP_NF_MATCH_MARK=m
203CONFIG_IP_NF_MATCH_MULTIPORT=m
204CONFIG_IP_NF_MATCH_TOS=m
205CONFIG_IP_NF_MATCH_RECENT=m
206CONFIG_IP_NF_MATCH_ECN=m
207CONFIG_IP_NF_MATCH_DSCP=m
208CONFIG_IP_NF_MATCH_AH_ESP=m
209CONFIG_IP_NF_MATCH_LENGTH=m
210CONFIG_IP_NF_MATCH_TTL=m
211CONFIG_IP_NF_MATCH_TCPMSS=m
212CONFIG_IP_NF_MATCH_HELPER=m
213CONFIG_IP_NF_MATCH_STATE=m
214CONFIG_IP_NF_MATCH_CONNTRACK=m
215CONFIG_IP_NF_MATCH_OWNER=m
216CONFIG_IP_NF_MATCH_ADDRTYPE=m
217CONFIG_IP_NF_MATCH_REALM=m
218CONFIG_IP_NF_MATCH_SCTP=m
219# CONFIG_IP_NF_MATCH_DCCP is not set
220CONFIG_IP_NF_MATCH_COMMENT=m
221CONFIG_IP_NF_MATCH_CONNMARK=m
222CONFIG_IP_NF_MATCH_CONNBYTES=m
223CONFIG_IP_NF_MATCH_HASHLIMIT=m
224CONFIG_IP_NF_MATCH_STRING=m
225CONFIG_IP_NF_FILTER=m
226CONFIG_IP_NF_TARGET_REJECT=m
227CONFIG_IP_NF_TARGET_LOG=m
228CONFIG_IP_NF_TARGET_ULOG=m
229CONFIG_IP_NF_TARGET_TCPMSS=m
230CONFIG_IP_NF_TARGET_NFQUEUE=m
231CONFIG_IP_NF_NAT=m
232CONFIG_IP_NF_NAT_NEEDED=y
233CONFIG_IP_NF_TARGET_MASQUERADE=m
234CONFIG_IP_NF_TARGET_REDIRECT=m
235CONFIG_IP_NF_TARGET_NETMAP=m
236CONFIG_IP_NF_TARGET_SAME=m
237CONFIG_IP_NF_NAT_SNMP_BASIC=m
238CONFIG_IP_NF_NAT_IRC=m
239CONFIG_IP_NF_NAT_FTP=m
240CONFIG_IP_NF_NAT_TFTP=m
241CONFIG_IP_NF_NAT_AMANDA=m
242CONFIG_IP_NF_MANGLE=m
243CONFIG_IP_NF_TARGET_TOS=m
244CONFIG_IP_NF_TARGET_ECN=m
245CONFIG_IP_NF_TARGET_DSCP=m
246CONFIG_IP_NF_TARGET_MARK=m
247CONFIG_IP_NF_TARGET_CLASSIFY=m
248CONFIG_IP_NF_TARGET_TTL=m
249CONFIG_IP_NF_TARGET_CONNMARK=m
250CONFIG_IP_NF_TARGET_CLUSTERIP=m
251CONFIG_IP_NF_RAW=m
252CONFIG_IP_NF_TARGET_NOTRACK=m
253CONFIG_IP_NF_ARPTABLES=m
254CONFIG_IP_NF_ARPFILTER=m
255CONFIG_IP_NF_ARP_MANGLE=m
256
257#
258# DCCP Configuration (EXPERIMENTAL)
259#
260# CONFIG_IP_DCCP is not set
261
262#
263# SCTP Configuration (EXPERIMENTAL)
264#
265# CONFIG_IP_SCTP is not set
266# CONFIG_ATM is not set
267# CONFIG_BRIDGE is not set
268# CONFIG_VLAN_8021Q is not set
269# CONFIG_DECNET is not set
270CONFIG_LLC=y
271# CONFIG_LLC2 is not set
272# CONFIG_IPX is not set
273# CONFIG_ATALK is not set
274# CONFIG_X25 is not set
275# CONFIG_LAPB is not set
276# CONFIG_NET_DIVERT is not set
277# CONFIG_ECONET is not set
278# CONFIG_WAN_ROUTER is not set
279# CONFIG_NET_SCHED is not set
280CONFIG_NET_CLS_ROUTE=y
281
282#
283# Network testing
284#
285# CONFIG_NET_PKTGEN is not set
286# CONFIG_HAMRADIO is not set
287# CONFIG_IRDA is not set
288# CONFIG_BT is not set
289# CONFIG_IEEE80211 is not set
290
291#
292# Device Drivers
293#
294
295#
296# Generic Driver Options
297#
298CONFIG_STANDALONE=y
299CONFIG_PREVENT_FIRMWARE_BUILD=y
300CONFIG_FW_LOADER=y
301# CONFIG_DEBUG_DRIVER is not set
302
303#
304# Connector - unified userspace <-> kernelspace linker
305#
306# CONFIG_CONNECTOR is not set
307
308#
309# Memory Technology Devices (MTD)
310#
311# CONFIG_MTD is not set
312
313#
314# Parallel port support
315#
316# CONFIG_PARPORT is not set
317
318#
319# Plug and Play support
320#
321
322#
323# Block devices
324#
325# CONFIG_BLK_DEV_FD is not set
326# CONFIG_BLK_CPQ_DA is not set
327# CONFIG_BLK_CPQ_CISS_DA is not set
328# CONFIG_BLK_DEV_DAC960 is not set
329# CONFIG_BLK_DEV_UMEM is not set
330# CONFIG_BLK_DEV_COW_COMMON is not set
331CONFIG_BLK_DEV_LOOP=y
332# CONFIG_BLK_DEV_CRYPTOLOOP is not set
333CONFIG_BLK_DEV_NBD=m
334# CONFIG_BLK_DEV_SX8 is not set
335# CONFIG_BLK_DEV_UB is not set
336CONFIG_BLK_DEV_RAM=y
337CONFIG_BLK_DEV_RAM_COUNT=16
338CONFIG_BLK_DEV_RAM_SIZE=65536
339CONFIG_BLK_DEV_INITRD=y
340CONFIG_CDROM_PKTCDVD=m
341CONFIG_CDROM_PKTCDVD_BUFFERS=8
342# CONFIG_CDROM_PKTCDVD_WCACHE is not set
343
344#
345# IO Schedulers
346#
347CONFIG_IOSCHED_NOOP=y
348CONFIG_IOSCHED_AS=y
349CONFIG_IOSCHED_DEADLINE=y
350CONFIG_IOSCHED_CFQ=y
351# CONFIG_ATA_OVER_ETH is not set
352
353#
354# ATA/ATAPI/MFM/RLL support
355#
356CONFIG_IDE=y
357CONFIG_BLK_DEV_IDE=y
358
359#
360# Please see Documentation/ide.txt for help/info on IDE drives
361#
362# CONFIG_BLK_DEV_IDE_SATA is not set
363CONFIG_BLK_DEV_IDEDISK=y
364# CONFIG_IDEDISK_MULTI_MODE is not set
365CONFIG_BLK_DEV_IDECD=y
366# CONFIG_BLK_DEV_IDETAPE is not set
367# CONFIG_BLK_DEV_IDEFLOPPY is not set
368# CONFIG_BLK_DEV_IDESCSI is not set
369# CONFIG_IDE_TASK_IOCTL is not set
370
371#
372# IDE chipset support/bugfixes
373#
374CONFIG_IDE_GENERIC=y
375CONFIG_BLK_DEV_IDEPCI=y
376# CONFIG_IDEPCI_SHARE_IRQ is not set
377# CONFIG_BLK_DEV_OFFBOARD is not set
378# CONFIG_BLK_DEV_GENERIC is not set
379# CONFIG_BLK_DEV_OPTI621 is not set
380# CONFIG_BLK_DEV_SL82C105 is not set
381CONFIG_BLK_DEV_IDEDMA_PCI=y
382# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
383CONFIG_IDEDMA_PCI_AUTO=y
384# CONFIG_IDEDMA_ONLYDISK is not set
385# CONFIG_BLK_DEV_AEC62XX is not set
386# CONFIG_BLK_DEV_ALI15X3 is not set
387# CONFIG_BLK_DEV_AMD74XX is not set
388# CONFIG_BLK_DEV_CMD64X is not set
389# CONFIG_BLK_DEV_TRIFLEX is not set
390# CONFIG_BLK_DEV_CY82C693 is not set
391# CONFIG_BLK_DEV_CS5520 is not set
392# CONFIG_BLK_DEV_CS5530 is not set
393# CONFIG_BLK_DEV_HPT34X is not set
394# CONFIG_BLK_DEV_HPT366 is not set
395# CONFIG_BLK_DEV_SC1200 is not set
396# CONFIG_BLK_DEV_PIIX is not set
397# CONFIG_BLK_DEV_IT821X is not set
398# CONFIG_BLK_DEV_NS87415 is not set
399# CONFIG_BLK_DEV_PDC202XX_OLD is not set
400# CONFIG_BLK_DEV_PDC202XX_NEW is not set
401# CONFIG_BLK_DEV_SVWKS is not set
402# CONFIG_BLK_DEV_SIIMAGE is not set
403# CONFIG_BLK_DEV_SLC90E66 is not set
404# CONFIG_BLK_DEV_TRM290 is not set
405# CONFIG_BLK_DEV_VIA82CXXX is not set
406CONFIG_BLK_DEV_IDE_PMAC=y
407CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
408CONFIG_BLK_DEV_IDEDMA_PMAC=y
409# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set
410# CONFIG_IDE_ARM is not set
411CONFIG_BLK_DEV_IDEDMA=y
412# CONFIG_IDEDMA_IVB is not set
413CONFIG_IDEDMA_AUTO=y
414# CONFIG_BLK_DEV_HD is not set
415
416#
417# SCSI device support
418#
419# CONFIG_RAID_ATTRS is not set
420CONFIG_SCSI=y
421CONFIG_SCSI_PROC_FS=y
422
423#
424# SCSI support type (disk, tape, CD-ROM)
425#
426CONFIG_BLK_DEV_SD=y
427CONFIG_CHR_DEV_ST=y
428# CONFIG_CHR_DEV_OSST is not set
429CONFIG_BLK_DEV_SR=y
430CONFIG_BLK_DEV_SR_VENDOR=y
431CONFIG_CHR_DEV_SG=y
432# CONFIG_CHR_DEV_SCH is not set
433
434#
435# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
436#
437CONFIG_SCSI_MULTI_LUN=y
438CONFIG_SCSI_CONSTANTS=y
439# CONFIG_SCSI_LOGGING is not set
440
441#
442# SCSI Transport Attributes
443#
444CONFIG_SCSI_SPI_ATTRS=y
445# CONFIG_SCSI_FC_ATTRS is not set
446# CONFIG_SCSI_ISCSI_ATTRS is not set
447# CONFIG_SCSI_SAS_ATTRS is not set
448
449#
450# SCSI low-level drivers
451#
452# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
453# CONFIG_SCSI_3W_9XXX is not set
454# CONFIG_SCSI_ACARD is not set
455# CONFIG_SCSI_AACRAID is not set
456# CONFIG_SCSI_AIC7XXX is not set
457# CONFIG_SCSI_AIC7XXX_OLD is not set
458# CONFIG_SCSI_AIC79XX is not set
459# CONFIG_MEGARAID_NEWGEN is not set
460# CONFIG_MEGARAID_LEGACY is not set
461# CONFIG_MEGARAID_SAS is not set
462CONFIG_SCSI_SATA=y
463# CONFIG_SCSI_SATA_AHCI is not set
464CONFIG_SCSI_SATA_SVW=y
465# CONFIG_SCSI_ATA_PIIX is not set
466# CONFIG_SCSI_SATA_MV is not set
467# CONFIG_SCSI_SATA_NV is not set
468# CONFIG_SCSI_SATA_PROMISE is not set
469# CONFIG_SCSI_SATA_QSTOR is not set
470# CONFIG_SCSI_SATA_SX4 is not set
471# CONFIG_SCSI_SATA_SIL is not set
472# CONFIG_SCSI_SATA_SIS is not set
473# CONFIG_SCSI_SATA_ULI is not set
474# CONFIG_SCSI_SATA_VIA is not set
475# CONFIG_SCSI_SATA_VITESSE is not set
476# CONFIG_SCSI_BUSLOGIC is not set
477# CONFIG_SCSI_DMX3191D is not set
478# CONFIG_SCSI_EATA is not set
479# CONFIG_SCSI_FUTURE_DOMAIN is not set
480# CONFIG_SCSI_GDTH is not set
481# CONFIG_SCSI_IPS is not set
482# CONFIG_SCSI_INITIO is not set
483# CONFIG_SCSI_INIA100 is not set
484# CONFIG_SCSI_SYM53C8XX_2 is not set
485# CONFIG_SCSI_IPR is not set
486# CONFIG_SCSI_QLOGIC_FC is not set
487# CONFIG_SCSI_QLOGIC_1280 is not set
488CONFIG_SCSI_QLA2XXX=y
489# CONFIG_SCSI_QLA21XX is not set
490# CONFIG_SCSI_QLA22XX is not set
491# CONFIG_SCSI_QLA2300 is not set
492# CONFIG_SCSI_QLA2322 is not set
493# CONFIG_SCSI_QLA6312 is not set
494# CONFIG_SCSI_QLA24XX is not set
495# CONFIG_SCSI_LPFC is not set
496# CONFIG_SCSI_DC395x is not set
497# CONFIG_SCSI_DC390T is not set
498# CONFIG_SCSI_DEBUG is not set
499
500#
501# Multi-device support (RAID and LVM)
502#
503CONFIG_MD=y
504CONFIG_BLK_DEV_MD=y
505CONFIG_MD_LINEAR=y
506CONFIG_MD_RAID0=y
507CONFIG_MD_RAID1=y
508CONFIG_MD_RAID10=m
509CONFIG_MD_RAID5=y
510CONFIG_MD_RAID6=m
511CONFIG_MD_MULTIPATH=m
512CONFIG_MD_FAULTY=m
513CONFIG_BLK_DEV_DM=y
514CONFIG_DM_CRYPT=m
515CONFIG_DM_SNAPSHOT=m
516CONFIG_DM_MIRROR=m
517CONFIG_DM_ZERO=m
518# CONFIG_DM_MULTIPATH is not set
519
520#
521# Fusion MPT device support
522#
523# CONFIG_FUSION is not set
524# CONFIG_FUSION_SPI is not set
525# CONFIG_FUSION_FC is not set
526# CONFIG_FUSION_SAS is not set
527
528#
529# IEEE 1394 (FireWire) support
530#
531CONFIG_IEEE1394=y
532
533#
534# Subsystem Options
535#
536# CONFIG_IEEE1394_VERBOSEDEBUG is not set
537CONFIG_IEEE1394_OUI_DB=y
538CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
539CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
540# CONFIG_IEEE1394_EXPORT_FULL_API is not set
541
542#
543# Device Drivers
544#
545# CONFIG_IEEE1394_PCILYNX is not set
546CONFIG_IEEE1394_OHCI1394=y
547
548#
549# Protocol Drivers
550#
551CONFIG_IEEE1394_VIDEO1394=m
552CONFIG_IEEE1394_SBP2=m
553# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
554CONFIG_IEEE1394_ETH1394=m
555CONFIG_IEEE1394_DV1394=m
556CONFIG_IEEE1394_RAWIO=y
557# CONFIG_IEEE1394_CMP is not set
558
559#
560# I2O device support
561#
562# CONFIG_I2O is not set
563
564#
565# Macintosh device drivers
566#
567CONFIG_ADB_PMU=y
568CONFIG_PMAC_SMU=y
569CONFIG_THERM_PM72=y
570
571#
572# Network device support
573#
574CONFIG_NETDEVICES=y
575CONFIG_DUMMY=m
576CONFIG_BONDING=m
577# CONFIG_EQUALIZER is not set
578CONFIG_TUN=m
579
580#
581# ARCnet devices
582#
583# CONFIG_ARCNET is not set
584
585#
586# PHY device support
587#
588# CONFIG_PHYLIB is not set
589
590#
591# Ethernet (10 or 100Mbit)
592#
593CONFIG_NET_ETHERNET=y
594CONFIG_MII=y
595# CONFIG_HAPPYMEAL is not set
596CONFIG_SUNGEM=y
597# CONFIG_CASSINI is not set
598# CONFIG_NET_VENDOR_3COM is not set
599
600#
601# Tulip family network device support
602#
603# CONFIG_NET_TULIP is not set
604# CONFIG_HP100 is not set
605# CONFIG_NET_PCI is not set
606
607#
608# Ethernet (1000 Mbit)
609#
610CONFIG_ACENIC=y
611CONFIG_ACENIC_OMIT_TIGON_I=y
612# CONFIG_DL2K is not set
613CONFIG_E1000=y
614# CONFIG_E1000_NAPI is not set
615# CONFIG_NS83820 is not set
616# CONFIG_HAMACHI is not set
617# CONFIG_YELLOWFIN is not set
618# CONFIG_R8169 is not set
619# CONFIG_SIS190 is not set
620# CONFIG_SKGE is not set
621# CONFIG_SK98LIN is not set
622CONFIG_TIGON3=m
623# CONFIG_BNX2 is not set
624# CONFIG_MV643XX_ETH is not set
625
626#
627# Ethernet (10000 Mbit)
628#
629# CONFIG_CHELSIO_T1 is not set
630# CONFIG_IXGB is not set
631# CONFIG_S2IO is not set
632
633#
634# Token Ring devices
635#
636CONFIG_TR=y
637CONFIG_IBMOL=y
638# CONFIG_3C359 is not set
639# CONFIG_TMS380TR is not set
640
641#
642# Wireless LAN (non-hamradio)
643#
644# CONFIG_NET_RADIO is not set
645
646#
647# Wan interfaces
648#
649# CONFIG_WAN is not set
650# CONFIG_FDDI is not set
651# CONFIG_HIPPI is not set
652CONFIG_PPP=m
653# CONFIG_PPP_MULTILINK is not set
654# CONFIG_PPP_FILTER is not set
655CONFIG_PPP_ASYNC=m
656CONFIG_PPP_SYNC_TTY=m
657CONFIG_PPP_DEFLATE=m
658CONFIG_PPP_BSDCOMP=m
659CONFIG_PPPOE=m
660# CONFIG_SLIP is not set
661# CONFIG_NET_FC is not set
662# CONFIG_SHAPER is not set
663# CONFIG_NETCONSOLE is not set
664# CONFIG_NETPOLL is not set
665# CONFIG_NET_POLL_CONTROLLER is not set
666
667#
668# ISDN subsystem
669#
670# CONFIG_ISDN is not set
671
672#
673# Telephony Support
674#
675# CONFIG_PHONE is not set
676
677#
678# Input device support
679#
680CONFIG_INPUT=y
681
682#
683# Userland interfaces
684#
685CONFIG_INPUT_MOUSEDEV=y
686# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
687CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
688CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
689CONFIG_INPUT_JOYDEV=m
690# CONFIG_INPUT_TSDEV is not set
691CONFIG_INPUT_EVDEV=y
692# CONFIG_INPUT_EVBUG is not set
693
694#
695# Input Device Drivers
696#
697CONFIG_INPUT_KEYBOARD=y
698# CONFIG_KEYBOARD_ATKBD is not set
699# CONFIG_KEYBOARD_SUNKBD is not set
700# CONFIG_KEYBOARD_LKKBD is not set
701# CONFIG_KEYBOARD_XTKBD is not set
702# CONFIG_KEYBOARD_NEWTON is not set
703CONFIG_INPUT_MOUSE=y
704# CONFIG_MOUSE_PS2 is not set
705# CONFIG_MOUSE_SERIAL is not set
706# CONFIG_MOUSE_VSXXXAA is not set
707# CONFIG_INPUT_JOYSTICK is not set
708# CONFIG_INPUT_TOUCHSCREEN is not set
709# CONFIG_INPUT_MISC is not set
710
711#
712# Hardware I/O ports
713#
714CONFIG_SERIO=y
715# CONFIG_SERIO_I8042 is not set
716# CONFIG_SERIO_SERPORT is not set
717# CONFIG_SERIO_PCIPS2 is not set
718# CONFIG_SERIO_RAW is not set
719# CONFIG_GAMEPORT is not set
720
721#
722# Character devices
723#
724CONFIG_VT=y
725CONFIG_VT_CONSOLE=y
726CONFIG_HW_CONSOLE=y
727# CONFIG_SERIAL_NONSTANDARD is not set
728
729#
730# Serial drivers
731#
732# CONFIG_SERIAL_8250 is not set
733
734#
735# Non-8250 serial port support
736#
737# CONFIG_SERIAL_PMACZILOG is not set
738# CONFIG_SERIAL_JSM is not set
739CONFIG_UNIX98_PTYS=y
740CONFIG_LEGACY_PTYS=y
741CONFIG_LEGACY_PTY_COUNT=256
742
743#
744# IPMI
745#
746# CONFIG_IPMI_HANDLER is not set
747
748#
749# Watchdog Cards
750#
751# CONFIG_WATCHDOG is not set
752# CONFIG_RTC is not set
753# CONFIG_DTLK is not set
754# CONFIG_R3964 is not set
755# CONFIG_APPLICOM is not set
756
757#
758# Ftape, the floppy tape device driver
759#
760CONFIG_AGP=m
761CONFIG_AGP_UNINORTH=m
762# CONFIG_DRM is not set
763CONFIG_RAW_DRIVER=y
764CONFIG_MAX_RAW_DEVS=256
765# CONFIG_HANGCHECK_TIMER is not set
766
767#
768# TPM devices
769#
770# CONFIG_TCG_TPM is not set
771
772#
773# I2C support
774#
775CONFIG_I2C=y
776CONFIG_I2C_CHARDEV=y
777
778#
779# I2C Algorithms
780#
781CONFIG_I2C_ALGOBIT=y
782# CONFIG_I2C_ALGOPCF is not set
783# CONFIG_I2C_ALGOPCA is not set
784
785#
786# I2C Hardware Bus support
787#
788# CONFIG_I2C_ALI1535 is not set
789# CONFIG_I2C_ALI1563 is not set
790# CONFIG_I2C_ALI15X3 is not set
791# CONFIG_I2C_AMD756 is not set
792# CONFIG_I2C_AMD8111 is not set
793# CONFIG_I2C_I801 is not set
794# CONFIG_I2C_I810 is not set
795# CONFIG_I2C_PIIX4 is not set
796CONFIG_I2C_KEYWEST=y
797CONFIG_I2C_PMAC_SMU=y
798# CONFIG_I2C_NFORCE2 is not set
799# CONFIG_I2C_PARPORT_LIGHT is not set
800# CONFIG_I2C_PROSAVAGE is not set
801# CONFIG_I2C_SAVAGE4 is not set
802# CONFIG_SCx200_ACB is not set
803# CONFIG_I2C_SIS5595 is not set
804# CONFIG_I2C_SIS630 is not set
805# CONFIG_I2C_SIS96X is not set
806# CONFIG_I2C_STUB is not set
807# CONFIG_I2C_VIA is not set
808# CONFIG_I2C_VIAPRO is not set
809# CONFIG_I2C_VOODOO3 is not set
810# CONFIG_I2C_PCA_ISA is not set
811
812#
813# Miscellaneous I2C Chip support
814#
815# CONFIG_SENSORS_DS1337 is not set
816# CONFIG_SENSORS_DS1374 is not set
817# CONFIG_SENSORS_EEPROM is not set
818# CONFIG_SENSORS_PCF8574 is not set
819# CONFIG_SENSORS_PCA9539 is not set
820# CONFIG_SENSORS_PCF8591 is not set
821# CONFIG_SENSORS_RTC8564 is not set
822# CONFIG_SENSORS_MAX6875 is not set
823# CONFIG_I2C_DEBUG_CORE is not set
824# CONFIG_I2C_DEBUG_ALGO is not set
825# CONFIG_I2C_DEBUG_BUS is not set
826# CONFIG_I2C_DEBUG_CHIP is not set
827
828#
829# Dallas's 1-wire bus
830#
831# CONFIG_W1 is not set
832
833#
834# Hardware Monitoring support
835#
836# CONFIG_HWMON is not set
837# CONFIG_HWMON_VID is not set
838
839#
840# Misc devices
841#
842
843#
844# Multimedia Capabilities Port drivers
845#
846
847#
848# Multimedia devices
849#
850# CONFIG_VIDEO_DEV is not set
851
852#
853# Digital Video Broadcasting Devices
854#
855# CONFIG_DVB is not set
856
857#
858# Graphics support
859#
860CONFIG_FB=y
861CONFIG_FB_CFB_FILLRECT=y
862CONFIG_FB_CFB_COPYAREA=y
863CONFIG_FB_CFB_IMAGEBLIT=y
864CONFIG_FB_SOFT_CURSOR=y
865CONFIG_FB_MACMODES=y
866CONFIG_FB_MODE_HELPERS=y
867CONFIG_FB_TILEBLITTING=y
868# CONFIG_FB_CIRRUS is not set
869# CONFIG_FB_PM2 is not set
870# CONFIG_FB_CYBER2000 is not set
871CONFIG_FB_OF=y
872# CONFIG_FB_CONTROL is not set
873# CONFIG_FB_PLATINUM is not set
874# CONFIG_FB_VALKYRIE is not set
875# CONFIG_FB_CT65550 is not set
876# CONFIG_FB_ASILIANT is not set
877# CONFIG_FB_IMSTT is not set
878# CONFIG_FB_VGA16 is not set
879# CONFIG_FB_NVIDIA is not set
880CONFIG_FB_RIVA=y
881# CONFIG_FB_RIVA_I2C is not set
882# CONFIG_FB_RIVA_DEBUG is not set
883# CONFIG_FB_MATROX is not set
884# CONFIG_FB_RADEON_OLD is not set
885CONFIG_FB_RADEON=y
886CONFIG_FB_RADEON_I2C=y
887# CONFIG_FB_RADEON_DEBUG is not set
888# CONFIG_FB_ATY128 is not set
889# CONFIG_FB_ATY is not set
890# CONFIG_FB_SAVAGE is not set
891# CONFIG_FB_SIS is not set
892# CONFIG_FB_NEOMAGIC is not set
893# CONFIG_FB_KYRO is not set
894# CONFIG_FB_3DFX is not set
895# CONFIG_FB_VOODOO1 is not set
896# CONFIG_FB_CYBLA is not set
897# CONFIG_FB_TRIDENT is not set
898# CONFIG_FB_S1D13XXX is not set
899# CONFIG_FB_VIRTUAL is not set
900
901#
902# Console display driver support
903#
904# CONFIG_VGA_CONSOLE is not set
905CONFIG_DUMMY_CONSOLE=y
906CONFIG_FRAMEBUFFER_CONSOLE=y
907# CONFIG_FONTS is not set
908CONFIG_FONT_8x8=y
909CONFIG_FONT_8x16=y
910
911#
912# Logo configuration
913#
914CONFIG_LOGO=y
915CONFIG_LOGO_LINUX_MONO=y
916CONFIG_LOGO_LINUX_VGA16=y
917CONFIG_LOGO_LINUX_CLUT224=y
918CONFIG_BACKLIGHT_LCD_SUPPORT=y
919CONFIG_BACKLIGHT_CLASS_DEVICE=m
920CONFIG_BACKLIGHT_DEVICE=y
921CONFIG_LCD_CLASS_DEVICE=m
922CONFIG_LCD_DEVICE=y
923
924#
925# Sound
926#
927# CONFIG_SOUND is not set
928
929#
930# USB support
931#
932CONFIG_USB_ARCH_HAS_HCD=y
933CONFIG_USB_ARCH_HAS_OHCI=y
934CONFIG_USB=y
935# CONFIG_USB_DEBUG is not set
936
937#
938# Miscellaneous USB options
939#
940CONFIG_USB_DEVICEFS=y
941# CONFIG_USB_BANDWIDTH is not set
942# CONFIG_USB_DYNAMIC_MINORS is not set
943# CONFIG_USB_OTG is not set
944
945#
946# USB Host Controller Drivers
947#
948CONFIG_USB_EHCI_HCD=y
949# CONFIG_USB_EHCI_SPLIT_ISO is not set
950# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
951# CONFIG_USB_ISP116X_HCD is not set
952CONFIG_USB_OHCI_HCD=y
953# CONFIG_USB_OHCI_BIG_ENDIAN is not set
954CONFIG_USB_OHCI_LITTLE_ENDIAN=y
955# CONFIG_USB_UHCI_HCD is not set
956# CONFIG_USB_SL811_HCD is not set
957
958#
959# USB Device Class drivers
960#
961# CONFIG_USB_BLUETOOTH_TTY is not set
962CONFIG_USB_ACM=m
963CONFIG_USB_PRINTER=y
964
965#
966# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
967#
968CONFIG_USB_STORAGE=y
969# CONFIG_USB_STORAGE_DEBUG is not set
970CONFIG_USB_STORAGE_DATAFAB=y
971CONFIG_USB_STORAGE_FREECOM=y
972CONFIG_USB_STORAGE_ISD200=y
973CONFIG_USB_STORAGE_DPCM=y
974# CONFIG_USB_STORAGE_USBAT is not set
975CONFIG_USB_STORAGE_SDDR09=y
976CONFIG_USB_STORAGE_SDDR55=y
977CONFIG_USB_STORAGE_JUMPSHOT=y
978# CONFIG_USB_STORAGE_ONETOUCH is not set
979
980#
981# USB Input Devices
982#
983CONFIG_USB_HID=y
984CONFIG_USB_HIDINPUT=y
985CONFIG_HID_FF=y
986CONFIG_HID_PID=y
987CONFIG_LOGITECH_FF=y
988CONFIG_THRUSTMASTER_FF=y
989CONFIG_USB_HIDDEV=y
990# CONFIG_USB_AIPTEK is not set
991# CONFIG_USB_WACOM is not set
992# CONFIG_USB_ACECAD is not set
993# CONFIG_USB_KBTAB is not set
994# CONFIG_USB_POWERMATE is not set
995# CONFIG_USB_MTOUCH is not set
996# CONFIG_USB_ITMTOUCH is not set
997# CONFIG_USB_EGALAX is not set
998# CONFIG_USB_YEALINK is not set
999# CONFIG_USB_XPAD is not set
1000# CONFIG_USB_ATI_REMOTE is not set
1001# CONFIG_USB_KEYSPAN_REMOTE is not set
1002# CONFIG_USB_APPLETOUCH is not set
1003
1004#
1005# USB Imaging devices
1006#
1007# CONFIG_USB_MDC800 is not set
1008# CONFIG_USB_MICROTEK is not set
1009
1010#
1011# USB Multimedia devices
1012#
1013# CONFIG_USB_DABUSB is not set
1014
1015#
1016# Video4Linux support is needed for USB Multimedia device support
1017#
1018
1019#
1020# USB Network Adapters
1021#
1022CONFIG_USB_CATC=m
1023CONFIG_USB_KAWETH=m
1024CONFIG_USB_PEGASUS=m
1025CONFIG_USB_RTL8150=m
1026CONFIG_USB_USBNET=m
1027# CONFIG_USB_NET_AX8817X is not set
1028CONFIG_USB_NET_CDCETHER=m
1029# CONFIG_USB_NET_GL620A is not set
1030# CONFIG_USB_NET_NET1080 is not set
1031# CONFIG_USB_NET_PLUSB is not set
1032# CONFIG_USB_NET_RNDIS_HOST is not set
1033# CONFIG_USB_NET_CDC_SUBSET is not set
1034# CONFIG_USB_NET_ZAURUS is not set
1035CONFIG_USB_MON=y
1036
1037#
1038# USB port drivers
1039#
1040
1041#
1042# USB Serial Converter support
1043#
1044CONFIG_USB_SERIAL=m
1045CONFIG_USB_SERIAL_GENERIC=y
1046# CONFIG_USB_SERIAL_AIRPRIME is not set
1047CONFIG_USB_SERIAL_BELKIN=m
1048CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
1049# CONFIG_USB_SERIAL_CP2101 is not set
1050CONFIG_USB_SERIAL_CYPRESS_M8=m
1051CONFIG_USB_SERIAL_EMPEG=m
1052CONFIG_USB_SERIAL_FTDI_SIO=m
1053CONFIG_USB_SERIAL_VISOR=m
1054CONFIG_USB_SERIAL_IPAQ=m
1055CONFIG_USB_SERIAL_IR=m
1056CONFIG_USB_SERIAL_EDGEPORT=m
1057CONFIG_USB_SERIAL_EDGEPORT_TI=m
1058CONFIG_USB_SERIAL_GARMIN=m
1059CONFIG_USB_SERIAL_IPW=m
1060CONFIG_USB_SERIAL_KEYSPAN_PDA=m
1061CONFIG_USB_SERIAL_KEYSPAN=m
1062CONFIG_USB_SERIAL_KEYSPAN_MPR=y
1063CONFIG_USB_SERIAL_KEYSPAN_USA28=y
1064CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
1065CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
1066CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
1067CONFIG_USB_SERIAL_KEYSPAN_USA19=y
1068CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
1069CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
1070CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
1071CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
1072CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
1073CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
1074CONFIG_USB_SERIAL_KLSI=m
1075CONFIG_USB_SERIAL_KOBIL_SCT=m
1076CONFIG_USB_SERIAL_MCT_U232=m
1077CONFIG_USB_SERIAL_PL2303=m
1078# CONFIG_USB_SERIAL_HP4X is not set
1079CONFIG_USB_SERIAL_SAFE=m
1080CONFIG_USB_SERIAL_SAFE_PADDED=y
1081CONFIG_USB_SERIAL_TI=m
1082CONFIG_USB_SERIAL_CYBERJACK=m
1083CONFIG_USB_SERIAL_XIRCOM=m
1084CONFIG_USB_SERIAL_OMNINET=m
1085CONFIG_USB_EZUSB=y
1086
1087#
1088# USB Miscellaneous drivers
1089#
1090# CONFIG_USB_EMI62 is not set
1091# CONFIG_USB_EMI26 is not set
1092# CONFIG_USB_AUERSWALD is not set
1093# CONFIG_USB_RIO500 is not set
1094# CONFIG_USB_LEGOTOWER is not set
1095# CONFIG_USB_LCD is not set
1096# CONFIG_USB_LED is not set
1097# CONFIG_USB_CYTHERM is not set
1098# CONFIG_USB_PHIDGETKIT is not set
1099# CONFIG_USB_PHIDGETSERVO is not set
1100# CONFIG_USB_IDMOUSE is not set
1101# CONFIG_USB_SISUSBVGA is not set
1102# CONFIG_USB_LD is not set
1103# CONFIG_USB_TEST is not set
1104
1105#
1106# USB DSL modem support
1107#
1108
1109#
1110# USB Gadget Support
1111#
1112# CONFIG_USB_GADGET is not set
1113
1114#
1115# MMC/SD Card support
1116#
1117# CONFIG_MMC is not set
1118
1119#
1120# InfiniBand support
1121#
1122# CONFIG_INFINIBAND is not set
1123
1124#
1125# SN Devices
1126#
1127
1128#
1129# File systems
1130#
1131CONFIG_EXT2_FS=y
1132CONFIG_EXT2_FS_XATTR=y
1133CONFIG_EXT2_FS_POSIX_ACL=y
1134CONFIG_EXT2_FS_SECURITY=y
1135CONFIG_EXT2_FS_XIP=y
1136CONFIG_FS_XIP=y
1137CONFIG_EXT3_FS=y
1138CONFIG_EXT3_FS_XATTR=y
1139CONFIG_EXT3_FS_POSIX_ACL=y
1140CONFIG_EXT3_FS_SECURITY=y
1141CONFIG_JBD=y
1142# CONFIG_JBD_DEBUG is not set
1143CONFIG_FS_MBCACHE=y
1144CONFIG_REISERFS_FS=y
1145# CONFIG_REISERFS_CHECK is not set
1146# CONFIG_REISERFS_PROC_INFO is not set
1147CONFIG_REISERFS_FS_XATTR=y
1148CONFIG_REISERFS_FS_POSIX_ACL=y
1149CONFIG_REISERFS_FS_SECURITY=y
1150# CONFIG_JFS_FS is not set
1151CONFIG_FS_POSIX_ACL=y
1152CONFIG_XFS_FS=m
1153CONFIG_XFS_EXPORT=y
1154# CONFIG_XFS_QUOTA is not set
1155CONFIG_XFS_SECURITY=y
1156CONFIG_XFS_POSIX_ACL=y
1157# CONFIG_XFS_RT is not set
1158# CONFIG_MINIX_FS is not set
1159# CONFIG_ROMFS_FS is not set
1160CONFIG_INOTIFY=y
1161# CONFIG_QUOTA is not set
1162CONFIG_DNOTIFY=y
1163CONFIG_AUTOFS_FS=m
1164# CONFIG_AUTOFS4_FS is not set
1165# CONFIG_FUSE_FS is not set
1166
1167#
1168# CD-ROM/DVD Filesystems
1169#
1170CONFIG_ISO9660_FS=y
1171CONFIG_JOLIET=y
1172CONFIG_ZISOFS=y
1173CONFIG_ZISOFS_FS=y
1174CONFIG_UDF_FS=m
1175CONFIG_UDF_NLS=y
1176
1177#
1178# DOS/FAT/NT Filesystems
1179#
1180CONFIG_FAT_FS=y
1181CONFIG_MSDOS_FS=y
1182CONFIG_VFAT_FS=y
1183CONFIG_FAT_DEFAULT_CODEPAGE=437
1184CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1185# CONFIG_NTFS_FS is not set
1186
1187#
1188# Pseudo filesystems
1189#
1190CONFIG_PROC_FS=y
1191CONFIG_PROC_KCORE=y
1192CONFIG_SYSFS=y
1193CONFIG_TMPFS=y
1194CONFIG_HUGETLBFS=y
1195CONFIG_HUGETLB_PAGE=y
1196CONFIG_RAMFS=y
1197# CONFIG_RELAYFS_FS is not set
1198
1199#
1200# Miscellaneous filesystems
1201#
1202# CONFIG_ADFS_FS is not set
1203# CONFIG_AFFS_FS is not set
1204CONFIG_HFS_FS=m
1205CONFIG_HFSPLUS_FS=m
1206# CONFIG_BEFS_FS is not set
1207# CONFIG_BFS_FS is not set
1208# CONFIG_EFS_FS is not set
1209CONFIG_CRAMFS=y
1210# CONFIG_VXFS_FS is not set
1211# CONFIG_HPFS_FS is not set
1212# CONFIG_QNX4FS_FS is not set
1213# CONFIG_SYSV_FS is not set
1214# CONFIG_UFS_FS is not set
1215
1216#
1217# Network File Systems
1218#
1219CONFIG_NFS_FS=y
1220CONFIG_NFS_V3=y
1221CONFIG_NFS_V3_ACL=y
1222CONFIG_NFS_V4=y
1223# CONFIG_NFS_DIRECTIO is not set
1224CONFIG_NFSD=y
1225CONFIG_NFSD_V2_ACL=y
1226CONFIG_NFSD_V3=y
1227CONFIG_NFSD_V3_ACL=y
1228CONFIG_NFSD_V4=y
1229CONFIG_NFSD_TCP=y
1230CONFIG_LOCKD=y
1231CONFIG_LOCKD_V4=y
1232CONFIG_EXPORTFS=y
1233CONFIG_NFS_ACL_SUPPORT=y
1234CONFIG_NFS_COMMON=y
1235CONFIG_SUNRPC=y
1236CONFIG_SUNRPC_GSS=y
1237CONFIG_RPCSEC_GSS_KRB5=y
1238# CONFIG_RPCSEC_GSS_SPKM3 is not set
1239# CONFIG_SMB_FS is not set
1240CONFIG_CIFS=m
1241# CONFIG_CIFS_STATS is not set
1242# CONFIG_CIFS_XATTR is not set
1243# CONFIG_CIFS_EXPERIMENTAL is not set
1244# CONFIG_NCP_FS is not set
1245# CONFIG_CODA_FS is not set
1246# CONFIG_AFS_FS is not set
1247# CONFIG_9P_FS is not set
1248
1249#
1250# Partition Types
1251#
1252CONFIG_PARTITION_ADVANCED=y
1253# CONFIG_ACORN_PARTITION is not set
1254# CONFIG_OSF_PARTITION is not set
1255# CONFIG_AMIGA_PARTITION is not set
1256# CONFIG_ATARI_PARTITION is not set
1257CONFIG_MAC_PARTITION=y
1258CONFIG_MSDOS_PARTITION=y
1259# CONFIG_BSD_DISKLABEL is not set
1260# CONFIG_MINIX_SUBPARTITION is not set
1261# CONFIG_SOLARIS_X86_PARTITION is not set
1262# CONFIG_UNIXWARE_DISKLABEL is not set
1263# CONFIG_LDM_PARTITION is not set
1264# CONFIG_SGI_PARTITION is not set
1265# CONFIG_ULTRIX_PARTITION is not set
1266# CONFIG_SUN_PARTITION is not set
1267# CONFIG_EFI_PARTITION is not set
1268
1269#
1270# Native Language Support
1271#
1272CONFIG_NLS=y
1273CONFIG_NLS_DEFAULT="iso8859-1"
1274CONFIG_NLS_CODEPAGE_437=y
1275# CONFIG_NLS_CODEPAGE_737 is not set
1276# CONFIG_NLS_CODEPAGE_775 is not set
1277# CONFIG_NLS_CODEPAGE_850 is not set
1278# CONFIG_NLS_CODEPAGE_852 is not set
1279# CONFIG_NLS_CODEPAGE_855 is not set
1280# CONFIG_NLS_CODEPAGE_857 is not set
1281# CONFIG_NLS_CODEPAGE_860 is not set
1282# CONFIG_NLS_CODEPAGE_861 is not set
1283# CONFIG_NLS_CODEPAGE_862 is not set
1284# CONFIG_NLS_CODEPAGE_863 is not set
1285# CONFIG_NLS_CODEPAGE_864 is not set
1286# CONFIG_NLS_CODEPAGE_865 is not set
1287# CONFIG_NLS_CODEPAGE_866 is not set
1288# CONFIG_NLS_CODEPAGE_869 is not set
1289# CONFIG_NLS_CODEPAGE_936 is not set
1290# CONFIG_NLS_CODEPAGE_950 is not set
1291# CONFIG_NLS_CODEPAGE_932 is not set
1292# CONFIG_NLS_CODEPAGE_949 is not set
1293# CONFIG_NLS_CODEPAGE_874 is not set
1294# CONFIG_NLS_ISO8859_8 is not set
1295CONFIG_NLS_CODEPAGE_1250=y
1296CONFIG_NLS_CODEPAGE_1251=y
1297CONFIG_NLS_ASCII=y
1298CONFIG_NLS_ISO8859_1=y
1299# CONFIG_NLS_ISO8859_2 is not set
1300# CONFIG_NLS_ISO8859_3 is not set
1301# CONFIG_NLS_ISO8859_4 is not set
1302# CONFIG_NLS_ISO8859_5 is not set
1303# CONFIG_NLS_ISO8859_6 is not set
1304# CONFIG_NLS_ISO8859_7 is not set
1305# CONFIG_NLS_ISO8859_9 is not set
1306# CONFIG_NLS_ISO8859_13 is not set
1307# CONFIG_NLS_ISO8859_14 is not set
1308CONFIG_NLS_ISO8859_15=y
1309# CONFIG_NLS_KOI8_R is not set
1310# CONFIG_NLS_KOI8_U is not set
1311CONFIG_NLS_UTF8=y
1312
1313#
1314# Profiling support
1315#
1316CONFIG_PROFILING=y
1317CONFIG_OPROFILE=y
1318
1319#
1320# Kernel hacking
1321#
1322# CONFIG_PRINTK_TIME is not set
1323CONFIG_DEBUG_KERNEL=y
1324CONFIG_MAGIC_SYSRQ=y
1325CONFIG_LOG_BUF_SHIFT=17
1326CONFIG_DETECT_SOFTLOCKUP=y
1327# CONFIG_SCHEDSTATS is not set
1328# CONFIG_DEBUG_SLAB is not set
1329# CONFIG_DEBUG_SPINLOCK is not set
1330# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1331# CONFIG_DEBUG_KOBJECT is not set
1332# CONFIG_DEBUG_INFO is not set
1333CONFIG_DEBUG_FS=y
1334# CONFIG_DEBUG_STACKOVERFLOW is not set
1335# CONFIG_KPROBES is not set
1336# CONFIG_DEBUG_STACK_USAGE is not set
1337# CONFIG_DEBUGGER is not set
1338# CONFIG_PPCDBG is not set
1339CONFIG_IRQSTACKS=y
1340
1341#
1342# Security options
1343#
1344# CONFIG_KEYS is not set
1345# CONFIG_SECURITY is not set
1346
1347#
1348# Cryptographic options
1349#
1350CONFIG_CRYPTO=y
1351CONFIG_CRYPTO_HMAC=y
1352CONFIG_CRYPTO_NULL=m
1353CONFIG_CRYPTO_MD4=m
1354CONFIG_CRYPTO_MD5=y
1355CONFIG_CRYPTO_SHA1=m
1356CONFIG_CRYPTO_SHA256=m
1357CONFIG_CRYPTO_SHA512=m
1358CONFIG_CRYPTO_WP512=m
1359# CONFIG_CRYPTO_TGR192 is not set
1360CONFIG_CRYPTO_DES=y
1361CONFIG_CRYPTO_BLOWFISH=m
1362CONFIG_CRYPTO_TWOFISH=m
1363CONFIG_CRYPTO_SERPENT=m
1364CONFIG_CRYPTO_AES=m
1365CONFIG_CRYPTO_CAST5=m
1366CONFIG_CRYPTO_CAST6=m
1367CONFIG_CRYPTO_TEA=m
1368CONFIG_CRYPTO_ARC4=m
1369CONFIG_CRYPTO_KHAZAD=m
1370CONFIG_CRYPTO_ANUBIS=m
1371CONFIG_CRYPTO_DEFLATE=m
1372CONFIG_CRYPTO_MICHAEL_MIC=m
1373CONFIG_CRYPTO_CRC32C=m
1374CONFIG_CRYPTO_TEST=m
1375
1376#
1377# Hardware crypto devices
1378#
1379
1380#
1381# Library routines
1382#
1383CONFIG_CRC_CCITT=m
1384# CONFIG_CRC16 is not set
1385CONFIG_CRC32=y
1386CONFIG_LIBCRC32C=m
1387CONFIG_ZLIB_INFLATE=y
1388CONFIG_ZLIB_DEFLATE=m
1389CONFIG_TEXTSEARCH=y
1390CONFIG_TEXTSEARCH_KMP=m
1391CONFIG_TEXTSEARCH_BM=m
1392CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig
deleted file mode 100644
index 62e92c7e9e27..000000000000
--- a/arch/ppc64/configs/iSeries_defconfig
+++ /dev/null
@@ -1,998 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc4
4# Thu Oct 20 08:30:56 2005
5#
6CONFIG_64BIT=y
7CONFIG_MMU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_GENERIC_ISA_DMA=y
11CONFIG_EARLY_PRINTK=y
12CONFIG_COMPAT=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y
15CONFIG_FORCE_MAX_ZONEORDER=13
16
17#
18# Code maturity level options
19#
20CONFIG_EXPERIMENTAL=y
21CONFIG_CLEAN_COMPILE=y
22CONFIG_LOCK_KERNEL=y
23CONFIG_INIT_ENV_ARG_LIMIT=32
24
25#
26# General setup
27#
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31CONFIG_SYSVIPC=y
32CONFIG_POSIX_MQUEUE=y
33# CONFIG_BSD_PROCESS_ACCT is not set
34CONFIG_SYSCTL=y
35CONFIG_AUDIT=y
36CONFIG_AUDITSYSCALL=y
37CONFIG_HOTPLUG=y
38CONFIG_KOBJECT_UEVENT=y
39CONFIG_IKCONFIG=y
40CONFIG_IKCONFIG_PROC=y
41# CONFIG_CPUSETS is not set
42CONFIG_INITRAMFS_SOURCE=""
43# CONFIG_EMBEDDED is not set
44CONFIG_KALLSYMS=y
45# CONFIG_KALLSYMS_ALL is not set
46# CONFIG_KALLSYMS_EXTRA_PASS is not set
47CONFIG_PRINTK=y
48CONFIG_BUG=y
49CONFIG_BASE_FULL=y
50CONFIG_FUTEX=y
51CONFIG_EPOLL=y
52CONFIG_SHMEM=y
53CONFIG_CC_ALIGN_FUNCTIONS=0
54CONFIG_CC_ALIGN_LABELS=0
55CONFIG_CC_ALIGN_LOOPS=0
56CONFIG_CC_ALIGN_JUMPS=0
57# CONFIG_TINY_SHMEM is not set
58CONFIG_BASE_SMALL=0
59
60#
61# Loadable module support
62#
63CONFIG_MODULES=y
64CONFIG_MODULE_UNLOAD=y
65# CONFIG_MODULE_FORCE_UNLOAD is not set
66CONFIG_OBSOLETE_MODPARM=y
67CONFIG_MODVERSIONS=y
68CONFIG_MODULE_SRCVERSION_ALL=y
69CONFIG_KMOD=y
70CONFIG_STOP_MACHINE=y
71CONFIG_SYSVIPC_COMPAT=y
72
73#
74# Platform support
75#
76CONFIG_PPC_ISERIES=y
77# CONFIG_PPC_MULTIPLATFORM is not set
78CONFIG_PPC=y
79CONFIG_PPC64=y
80CONFIG_IBMVIO=y
81# CONFIG_POWER4_ONLY is not set
82CONFIG_IOMMU_VMERGE=y
83CONFIG_SMP=y
84CONFIG_NR_CPUS=32
85CONFIG_ARCH_SELECT_MEMORY_MODEL=y
86CONFIG_ARCH_FLATMEM_ENABLE=y
87CONFIG_SELECT_MEMORY_MODEL=y
88CONFIG_FLATMEM_MANUAL=y
89# CONFIG_DISCONTIGMEM_MANUAL is not set
90# CONFIG_SPARSEMEM_MANUAL is not set
91CONFIG_FLATMEM=y
92CONFIG_FLAT_NODE_MEM_MAP=y
93# CONFIG_SPARSEMEM_STATIC is not set
94# CONFIG_NUMA is not set
95# CONFIG_SCHED_SMT is not set
96CONFIG_PREEMPT_NONE=y
97# CONFIG_PREEMPT_VOLUNTARY is not set
98# CONFIG_PREEMPT is not set
99# CONFIG_PREEMPT_BKL is not set
100# CONFIG_HZ_100 is not set
101CONFIG_HZ_250=y
102# CONFIG_HZ_1000 is not set
103CONFIG_HZ=250
104CONFIG_GENERIC_HARDIRQS=y
105CONFIG_LPARCFG=y
106CONFIG_SECCOMP=y
107CONFIG_BINFMT_ELF=y
108# CONFIG_BINFMT_MISC is not set
109CONFIG_ISA_DMA_API=y
110
111#
112# Bus Options
113#
114CONFIG_PCI=y
115CONFIG_PCI_DOMAINS=y
116CONFIG_PCI_LEGACY_PROC=y
117# CONFIG_PCI_DEBUG is not set
118
119#
120# PCCARD (PCMCIA/CardBus) support
121#
122# CONFIG_PCCARD is not set
123
124#
125# PCI Hotplug Support
126#
127# CONFIG_HOTPLUG_PCI is not set
128
129#
130# Networking
131#
132CONFIG_NET=y
133
134#
135# Networking options
136#
137CONFIG_PACKET=y
138# CONFIG_PACKET_MMAP is not set
139CONFIG_UNIX=y
140CONFIG_XFRM=y
141CONFIG_XFRM_USER=m
142CONFIG_NET_KEY=m
143CONFIG_INET=y
144CONFIG_IP_MULTICAST=y
145# CONFIG_IP_ADVANCED_ROUTER is not set
146CONFIG_IP_FIB_HASH=y
147# CONFIG_IP_PNP is not set
148CONFIG_NET_IPIP=y
149# CONFIG_NET_IPGRE is not set
150# CONFIG_IP_MROUTE is not set
151# CONFIG_ARPD is not set
152CONFIG_SYN_COOKIES=y
153CONFIG_INET_AH=m
154CONFIG_INET_ESP=m
155CONFIG_INET_IPCOMP=m
156CONFIG_INET_TUNNEL=y
157CONFIG_INET_DIAG=y
158CONFIG_INET_TCP_DIAG=y
159# CONFIG_TCP_CONG_ADVANCED is not set
160CONFIG_TCP_CONG_BIC=y
161
162#
163# IP: Virtual Server Configuration
164#
165# CONFIG_IP_VS is not set
166# CONFIG_IPV6 is not set
167CONFIG_NETFILTER=y
168# CONFIG_NETFILTER_DEBUG is not set
169# CONFIG_NETFILTER_NETLINK is not set
170
171#
172# IP: Netfilter Configuration
173#
174CONFIG_IP_NF_CONNTRACK=m
175CONFIG_IP_NF_CT_ACCT=y
176CONFIG_IP_NF_CONNTRACK_MARK=y
177CONFIG_IP_NF_CONNTRACK_EVENTS=y
178CONFIG_IP_NF_CT_PROTO_SCTP=m
179CONFIG_IP_NF_FTP=m
180CONFIG_IP_NF_IRC=m
181# CONFIG_IP_NF_NETBIOS_NS is not set
182CONFIG_IP_NF_TFTP=m
183CONFIG_IP_NF_AMANDA=m
184# CONFIG_IP_NF_PPTP is not set
185CONFIG_IP_NF_QUEUE=m
186CONFIG_IP_NF_IPTABLES=m
187CONFIG_IP_NF_MATCH_LIMIT=m
188CONFIG_IP_NF_MATCH_IPRANGE=m
189CONFIG_IP_NF_MATCH_MAC=m
190CONFIG_IP_NF_MATCH_PKTTYPE=m
191CONFIG_IP_NF_MATCH_MARK=m
192CONFIG_IP_NF_MATCH_MULTIPORT=m
193CONFIG_IP_NF_MATCH_TOS=m
194CONFIG_IP_NF_MATCH_RECENT=m
195CONFIG_IP_NF_MATCH_ECN=m
196CONFIG_IP_NF_MATCH_DSCP=m
197CONFIG_IP_NF_MATCH_AH_ESP=m
198CONFIG_IP_NF_MATCH_LENGTH=m
199CONFIG_IP_NF_MATCH_TTL=m
200CONFIG_IP_NF_MATCH_TCPMSS=m
201CONFIG_IP_NF_MATCH_HELPER=m
202CONFIG_IP_NF_MATCH_STATE=m
203CONFIG_IP_NF_MATCH_CONNTRACK=m
204CONFIG_IP_NF_MATCH_OWNER=m
205CONFIG_IP_NF_MATCH_ADDRTYPE=m
206CONFIG_IP_NF_MATCH_REALM=m
207CONFIG_IP_NF_MATCH_SCTP=m
208# CONFIG_IP_NF_MATCH_DCCP is not set
209CONFIG_IP_NF_MATCH_COMMENT=m
210CONFIG_IP_NF_MATCH_CONNMARK=m
211CONFIG_IP_NF_MATCH_CONNBYTES=m
212CONFIG_IP_NF_MATCH_HASHLIMIT=m
213CONFIG_IP_NF_MATCH_STRING=m
214CONFIG_IP_NF_FILTER=m
215CONFIG_IP_NF_TARGET_REJECT=m
216CONFIG_IP_NF_TARGET_LOG=m
217CONFIG_IP_NF_TARGET_ULOG=m
218CONFIG_IP_NF_TARGET_TCPMSS=m
219CONFIG_IP_NF_TARGET_NFQUEUE=m
220CONFIG_IP_NF_NAT=m
221CONFIG_IP_NF_NAT_NEEDED=y
222CONFIG_IP_NF_TARGET_MASQUERADE=m
223CONFIG_IP_NF_TARGET_REDIRECT=m
224CONFIG_IP_NF_TARGET_NETMAP=m
225CONFIG_IP_NF_TARGET_SAME=m
226CONFIG_IP_NF_NAT_SNMP_BASIC=m
227CONFIG_IP_NF_NAT_IRC=m
228CONFIG_IP_NF_NAT_FTP=m
229CONFIG_IP_NF_NAT_TFTP=m
230CONFIG_IP_NF_NAT_AMANDA=m
231CONFIG_IP_NF_MANGLE=m
232CONFIG_IP_NF_TARGET_TOS=m
233CONFIG_IP_NF_TARGET_ECN=m
234CONFIG_IP_NF_TARGET_DSCP=m
235CONFIG_IP_NF_TARGET_MARK=m
236CONFIG_IP_NF_TARGET_CLASSIFY=m
237CONFIG_IP_NF_TARGET_TTL=m
238CONFIG_IP_NF_TARGET_CONNMARK=m
239CONFIG_IP_NF_TARGET_CLUSTERIP=m
240CONFIG_IP_NF_RAW=m
241CONFIG_IP_NF_TARGET_NOTRACK=m
242CONFIG_IP_NF_ARPTABLES=m
243CONFIG_IP_NF_ARPFILTER=m
244CONFIG_IP_NF_ARP_MANGLE=m
245
246#
247# DCCP Configuration (EXPERIMENTAL)
248#
249# CONFIG_IP_DCCP is not set
250
251#
252# SCTP Configuration (EXPERIMENTAL)
253#
254# CONFIG_IP_SCTP is not set
255# CONFIG_ATM is not set
256# CONFIG_BRIDGE is not set
257# CONFIG_VLAN_8021Q is not set
258# CONFIG_DECNET is not set
259CONFIG_LLC=y
260# CONFIG_LLC2 is not set
261# CONFIG_IPX is not set
262# CONFIG_ATALK is not set
263# CONFIG_X25 is not set
264# CONFIG_LAPB is not set
265# CONFIG_NET_DIVERT is not set
266# CONFIG_ECONET is not set
267# CONFIG_WAN_ROUTER is not set
268# CONFIG_NET_SCHED is not set
269CONFIG_NET_CLS_ROUTE=y
270
271#
272# Network testing
273#
274# CONFIG_NET_PKTGEN is not set
275# CONFIG_HAMRADIO is not set
276# CONFIG_IRDA is not set
277# CONFIG_BT is not set
278# CONFIG_IEEE80211 is not set
279
280#
281# Device Drivers
282#
283
284#
285# Generic Driver Options
286#
287CONFIG_STANDALONE=y
288CONFIG_PREVENT_FIRMWARE_BUILD=y
289CONFIG_FW_LOADER=m
290# CONFIG_DEBUG_DRIVER is not set
291
292#
293# Connector - unified userspace <-> kernelspace linker
294#
295# CONFIG_CONNECTOR is not set
296
297#
298# Memory Technology Devices (MTD)
299#
300# CONFIG_MTD is not set
301
302#
303# Parallel port support
304#
305# CONFIG_PARPORT is not set
306
307#
308# Plug and Play support
309#
310
311#
312# Block devices
313#
314# CONFIG_BLK_DEV_FD is not set
315# CONFIG_BLK_CPQ_DA is not set
316# CONFIG_BLK_CPQ_CISS_DA is not set
317# CONFIG_BLK_DEV_DAC960 is not set
318# CONFIG_BLK_DEV_UMEM is not set
319# CONFIG_BLK_DEV_COW_COMMON is not set
320CONFIG_BLK_DEV_LOOP=y
321# CONFIG_BLK_DEV_CRYPTOLOOP is not set
322CONFIG_BLK_DEV_NBD=m
323# CONFIG_BLK_DEV_SX8 is not set
324CONFIG_BLK_DEV_RAM=y
325CONFIG_BLK_DEV_RAM_COUNT=16
326CONFIG_BLK_DEV_RAM_SIZE=65536
327CONFIG_BLK_DEV_INITRD=y
328# CONFIG_CDROM_PKTCDVD is not set
329
330#
331# IO Schedulers
332#
333CONFIG_IOSCHED_NOOP=y
334CONFIG_IOSCHED_AS=y
335CONFIG_IOSCHED_DEADLINE=y
336CONFIG_IOSCHED_CFQ=y
337# CONFIG_ATA_OVER_ETH is not set
338
339#
340# ATA/ATAPI/MFM/RLL support
341#
342# CONFIG_IDE is not set
343
344#
345# SCSI device support
346#
347# CONFIG_RAID_ATTRS is not set
348CONFIG_SCSI=y
349CONFIG_SCSI_PROC_FS=y
350
351#
352# SCSI support type (disk, tape, CD-ROM)
353#
354CONFIG_BLK_DEV_SD=y
355CONFIG_CHR_DEV_ST=y
356# CONFIG_CHR_DEV_OSST is not set
357CONFIG_BLK_DEV_SR=y
358CONFIG_BLK_DEV_SR_VENDOR=y
359CONFIG_CHR_DEV_SG=y
360# CONFIG_CHR_DEV_SCH is not set
361
362#
363# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
364#
365CONFIG_SCSI_MULTI_LUN=y
366CONFIG_SCSI_CONSTANTS=y
367# CONFIG_SCSI_LOGGING is not set
368
369#
370# SCSI Transport Attributes
371#
372CONFIG_SCSI_SPI_ATTRS=y
373CONFIG_SCSI_FC_ATTRS=y
374# CONFIG_SCSI_ISCSI_ATTRS is not set
375# CONFIG_SCSI_SAS_ATTRS is not set
376
377#
378# SCSI low-level drivers
379#
380# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
381# CONFIG_SCSI_3W_9XXX is not set
382# CONFIG_SCSI_ACARD is not set
383# CONFIG_SCSI_AACRAID is not set
384# CONFIG_SCSI_AIC7XXX is not set
385# CONFIG_SCSI_AIC7XXX_OLD is not set
386# CONFIG_SCSI_AIC79XX is not set
387# CONFIG_MEGARAID_NEWGEN is not set
388# CONFIG_MEGARAID_LEGACY is not set
389# CONFIG_MEGARAID_SAS is not set
390# CONFIG_SCSI_SATA is not set
391# CONFIG_SCSI_BUSLOGIC is not set
392# CONFIG_SCSI_DMX3191D is not set
393# CONFIG_SCSI_EATA is not set
394# CONFIG_SCSI_FUTURE_DOMAIN is not set
395# CONFIG_SCSI_GDTH is not set
396# CONFIG_SCSI_IPS is not set
397CONFIG_SCSI_IBMVSCSI=m
398# CONFIG_SCSI_INITIO is not set
399# CONFIG_SCSI_INIA100 is not set
400# CONFIG_SCSI_SYM53C8XX_2 is not set
401# CONFIG_SCSI_IPR is not set
402# CONFIG_SCSI_QLOGIC_FC is not set
403# CONFIG_SCSI_QLOGIC_1280 is not set
404CONFIG_SCSI_QLA2XXX=y
405# CONFIG_SCSI_QLA21XX is not set
406# CONFIG_SCSI_QLA22XX is not set
407# CONFIG_SCSI_QLA2300 is not set
408# CONFIG_SCSI_QLA2322 is not set
409# CONFIG_SCSI_QLA6312 is not set
410# CONFIG_SCSI_QLA24XX is not set
411# CONFIG_SCSI_LPFC is not set
412# CONFIG_SCSI_DC395x is not set
413# CONFIG_SCSI_DC390T is not set
414# CONFIG_SCSI_DEBUG is not set
415
416#
417# Multi-device support (RAID and LVM)
418#
419CONFIG_MD=y
420CONFIG_BLK_DEV_MD=y
421CONFIG_MD_LINEAR=y
422CONFIG_MD_RAID0=y
423CONFIG_MD_RAID1=y
424CONFIG_MD_RAID10=m
425CONFIG_MD_RAID5=y
426CONFIG_MD_RAID6=m
427CONFIG_MD_MULTIPATH=m
428CONFIG_MD_FAULTY=m
429CONFIG_BLK_DEV_DM=y
430CONFIG_DM_CRYPT=m
431CONFIG_DM_SNAPSHOT=m
432CONFIG_DM_MIRROR=m
433CONFIG_DM_ZERO=m
434# CONFIG_DM_MULTIPATH is not set
435
436#
437# Fusion MPT device support
438#
439# CONFIG_FUSION is not set
440# CONFIG_FUSION_SPI is not set
441# CONFIG_FUSION_FC is not set
442# CONFIG_FUSION_SAS is not set
443
444#
445# IEEE 1394 (FireWire) support
446#
447# CONFIG_IEEE1394 is not set
448
449#
450# I2O device support
451#
452# CONFIG_I2O is not set
453
454#
455# Macintosh device drivers
456#
457
458#
459# Network device support
460#
461CONFIG_NETDEVICES=y
462CONFIG_DUMMY=m
463CONFIG_BONDING=m
464# CONFIG_EQUALIZER is not set
465CONFIG_TUN=m
466
467#
468# ARCnet devices
469#
470# CONFIG_ARCNET is not set
471
472#
473# PHY device support
474#
475# CONFIG_PHYLIB is not set
476
477#
478# Ethernet (10 or 100Mbit)
479#
480CONFIG_NET_ETHERNET=y
481CONFIG_MII=y
482# CONFIG_HAPPYMEAL is not set
483# CONFIG_SUNGEM is not set
484# CONFIG_CASSINI is not set
485# CONFIG_NET_VENDOR_3COM is not set
486
487#
488# Tulip family network device support
489#
490# CONFIG_NET_TULIP is not set
491# CONFIG_HP100 is not set
492CONFIG_NET_PCI=y
493CONFIG_PCNET32=y
494# CONFIG_AMD8111_ETH is not set
495# CONFIG_ADAPTEC_STARFIRE is not set
496# CONFIG_B44 is not set
497# CONFIG_FORCEDETH is not set
498# CONFIG_DGRS is not set
499# CONFIG_EEPRO100 is not set
500CONFIG_E100=y
501# CONFIG_FEALNX is not set
502# CONFIG_NATSEMI is not set
503# CONFIG_NE2K_PCI is not set
504# CONFIG_8139CP is not set
505# CONFIG_8139TOO is not set
506# CONFIG_SIS900 is not set
507# CONFIG_EPIC100 is not set
508# CONFIG_SUNDANCE is not set
509# CONFIG_VIA_RHINE is not set
510
511#
512# Ethernet (1000 Mbit)
513#
514CONFIG_ACENIC=m
515# CONFIG_ACENIC_OMIT_TIGON_I is not set
516# CONFIG_DL2K is not set
517CONFIG_E1000=m
518# CONFIG_E1000_NAPI is not set
519# CONFIG_NS83820 is not set
520# CONFIG_HAMACHI is not set
521# CONFIG_YELLOWFIN is not set
522# CONFIG_R8169 is not set
523# CONFIG_SIS190 is not set
524# CONFIG_SKGE is not set
525# CONFIG_SK98LIN is not set
526# CONFIG_VIA_VELOCITY is not set
527# CONFIG_TIGON3 is not set
528# CONFIG_BNX2 is not set
529
530#
531# Ethernet (10000 Mbit)
532#
533# CONFIG_CHELSIO_T1 is not set
534# CONFIG_IXGB is not set
535# CONFIG_S2IO is not set
536
537#
538# Token Ring devices
539#
540CONFIG_TR=y
541CONFIG_IBMOL=y
542# CONFIG_3C359 is not set
543# CONFIG_TMS380TR is not set
544
545#
546# Wireless LAN (non-hamradio)
547#
548# CONFIG_NET_RADIO is not set
549
550#
551# Wan interfaces
552#
553# CONFIG_WAN is not set
554CONFIG_ISERIES_VETH=y
555# CONFIG_FDDI is not set
556# CONFIG_HIPPI is not set
557CONFIG_PPP=m
558# CONFIG_PPP_MULTILINK is not set
559# CONFIG_PPP_FILTER is not set
560CONFIG_PPP_ASYNC=m
561CONFIG_PPP_SYNC_TTY=m
562CONFIG_PPP_DEFLATE=m
563CONFIG_PPP_BSDCOMP=m
564CONFIG_PPPOE=m
565# CONFIG_SLIP is not set
566# CONFIG_NET_FC is not set
567# CONFIG_SHAPER is not set
568CONFIG_NETCONSOLE=y
569CONFIG_NETPOLL=y
570CONFIG_NETPOLL_RX=y
571CONFIG_NETPOLL_TRAP=y
572CONFIG_NET_POLL_CONTROLLER=y
573
574#
575# ISDN subsystem
576#
577# CONFIG_ISDN is not set
578
579#
580# Telephony Support
581#
582# CONFIG_PHONE is not set
583
584#
585# Input device support
586#
587CONFIG_INPUT=y
588
589#
590# Userland interfaces
591#
592CONFIG_INPUT_MOUSEDEV=y
593# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
594CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
595CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
596# CONFIG_INPUT_JOYDEV is not set
597# CONFIG_INPUT_TSDEV is not set
598# CONFIG_INPUT_EVDEV is not set
599# CONFIG_INPUT_EVBUG is not set
600
601#
602# Input Device Drivers
603#
604# CONFIG_INPUT_KEYBOARD is not set
605# CONFIG_INPUT_MOUSE is not set
606# CONFIG_INPUT_JOYSTICK is not set
607# CONFIG_INPUT_TOUCHSCREEN is not set
608# CONFIG_INPUT_MISC is not set
609
610#
611# Hardware I/O ports
612#
613# CONFIG_SERIO is not set
614# CONFIG_GAMEPORT is not set
615
616#
617# Character devices
618#
619# CONFIG_SERIAL_NONSTANDARD is not set
620
621#
622# Serial drivers
623#
624# CONFIG_SERIAL_8250 is not set
625
626#
627# Non-8250 serial port support
628#
629CONFIG_SERIAL_CORE=m
630CONFIG_SERIAL_ICOM=m
631# CONFIG_SERIAL_JSM is not set
632CONFIG_UNIX98_PTYS=y
633CONFIG_LEGACY_PTYS=y
634CONFIG_LEGACY_PTY_COUNT=256
635
636#
637# IPMI
638#
639# CONFIG_IPMI_HANDLER is not set
640
641#
642# Watchdog Cards
643#
644# CONFIG_WATCHDOG is not set
645# CONFIG_RTC is not set
646# CONFIG_DTLK is not set
647# CONFIG_R3964 is not set
648# CONFIG_APPLICOM is not set
649
650#
651# Ftape, the floppy tape device driver
652#
653# CONFIG_AGP is not set
654# CONFIG_DRM is not set
655CONFIG_RAW_DRIVER=y
656CONFIG_MAX_RAW_DEVS=256
657# CONFIG_HANGCHECK_TIMER is not set
658
659#
660# TPM devices
661#
662# CONFIG_TCG_TPM is not set
663
664#
665# I2C support
666#
667# CONFIG_I2C is not set
668
669#
670# Dallas's 1-wire bus
671#
672# CONFIG_W1 is not set
673
674#
675# Hardware Monitoring support
676#
677# CONFIG_HWMON is not set
678# CONFIG_HWMON_VID is not set
679
680#
681# Misc devices
682#
683
684#
685# Multimedia Capabilities Port drivers
686#
687
688#
689# Multimedia devices
690#
691# CONFIG_VIDEO_DEV is not set
692
693#
694# Digital Video Broadcasting Devices
695#
696# CONFIG_DVB is not set
697
698#
699# Graphics support
700#
701# CONFIG_FB is not set
702
703#
704# Sound
705#
706# CONFIG_SOUND is not set
707
708#
709# USB support
710#
711CONFIG_USB_ARCH_HAS_HCD=y
712CONFIG_USB_ARCH_HAS_OHCI=y
713# CONFIG_USB is not set
714
715#
716# USB Gadget Support
717#
718# CONFIG_USB_GADGET is not set
719
720#
721# MMC/SD Card support
722#
723# CONFIG_MMC is not set
724
725#
726# InfiniBand support
727#
728# CONFIG_INFINIBAND is not set
729
730#
731# SN Devices
732#
733
734#
735# File systems
736#
737CONFIG_EXT2_FS=y
738CONFIG_EXT2_FS_XATTR=y
739CONFIG_EXT2_FS_POSIX_ACL=y
740CONFIG_EXT2_FS_SECURITY=y
741CONFIG_EXT2_FS_XIP=y
742CONFIG_FS_XIP=y
743CONFIG_EXT3_FS=y
744CONFIG_EXT3_FS_XATTR=y
745CONFIG_EXT3_FS_POSIX_ACL=y
746CONFIG_EXT3_FS_SECURITY=y
747CONFIG_JBD=y
748# CONFIG_JBD_DEBUG is not set
749CONFIG_FS_MBCACHE=y
750CONFIG_REISERFS_FS=y
751# CONFIG_REISERFS_CHECK is not set
752# CONFIG_REISERFS_PROC_INFO is not set
753CONFIG_REISERFS_FS_XATTR=y
754CONFIG_REISERFS_FS_POSIX_ACL=y
755CONFIG_REISERFS_FS_SECURITY=y
756CONFIG_JFS_FS=m
757CONFIG_JFS_POSIX_ACL=y
758CONFIG_JFS_SECURITY=y
759# CONFIG_JFS_DEBUG is not set
760# CONFIG_JFS_STATISTICS is not set
761CONFIG_FS_POSIX_ACL=y
762CONFIG_XFS_FS=m
763CONFIG_XFS_EXPORT=y
764# CONFIG_XFS_QUOTA is not set
765CONFIG_XFS_SECURITY=y
766CONFIG_XFS_POSIX_ACL=y
767# CONFIG_XFS_RT is not set
768# CONFIG_MINIX_FS is not set
769# CONFIG_ROMFS_FS is not set
770CONFIG_INOTIFY=y
771# CONFIG_QUOTA is not set
772CONFIG_DNOTIFY=y
773CONFIG_AUTOFS_FS=m
774# CONFIG_AUTOFS4_FS is not set
775# CONFIG_FUSE_FS is not set
776
777#
778# CD-ROM/DVD Filesystems
779#
780CONFIG_ISO9660_FS=y
781CONFIG_JOLIET=y
782CONFIG_ZISOFS=y
783CONFIG_ZISOFS_FS=y
784CONFIG_UDF_FS=m
785CONFIG_UDF_NLS=y
786
787#
788# DOS/FAT/NT Filesystems
789#
790CONFIG_FAT_FS=y
791CONFIG_MSDOS_FS=y
792CONFIG_VFAT_FS=y
793CONFIG_FAT_DEFAULT_CODEPAGE=437
794CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
795# CONFIG_NTFS_FS is not set
796
797#
798# Pseudo filesystems
799#
800CONFIG_PROC_FS=y
801CONFIG_PROC_KCORE=y
802CONFIG_SYSFS=y
803CONFIG_TMPFS=y
804# CONFIG_HUGETLBFS is not set
805# CONFIG_HUGETLB_PAGE is not set
806CONFIG_RAMFS=y
807# CONFIG_RELAYFS_FS is not set
808
809#
810# Miscellaneous filesystems
811#
812# CONFIG_ADFS_FS is not set
813# CONFIG_AFFS_FS is not set
814# CONFIG_HFS_FS is not set
815# CONFIG_HFSPLUS_FS is not set
816# CONFIG_BEFS_FS is not set
817# CONFIG_BFS_FS is not set
818# CONFIG_EFS_FS is not set
819CONFIG_CRAMFS=y
820# CONFIG_VXFS_FS is not set
821# CONFIG_HPFS_FS is not set
822# CONFIG_QNX4FS_FS is not set
823# CONFIG_SYSV_FS is not set
824# CONFIG_UFS_FS is not set
825
826#
827# Network File Systems
828#
829CONFIG_NFS_FS=y
830CONFIG_NFS_V3=y
831CONFIG_NFS_V3_ACL=y
832CONFIG_NFS_V4=y
833# CONFIG_NFS_DIRECTIO is not set
834CONFIG_NFSD=m
835CONFIG_NFSD_V2_ACL=y
836CONFIG_NFSD_V3=y
837CONFIG_NFSD_V3_ACL=y
838CONFIG_NFSD_V4=y
839CONFIG_NFSD_TCP=y
840CONFIG_LOCKD=y
841CONFIG_LOCKD_V4=y
842CONFIG_EXPORTFS=m
843CONFIG_NFS_ACL_SUPPORT=y
844CONFIG_NFS_COMMON=y
845CONFIG_SUNRPC=y
846CONFIG_SUNRPC_GSS=y
847CONFIG_RPCSEC_GSS_KRB5=y
848CONFIG_RPCSEC_GSS_SPKM3=m
849# CONFIG_SMB_FS is not set
850CONFIG_CIFS=m
851# CONFIG_CIFS_STATS is not set
852CONFIG_CIFS_XATTR=y
853CONFIG_CIFS_POSIX=y
854# CONFIG_CIFS_EXPERIMENTAL is not set
855# CONFIG_NCP_FS is not set
856# CONFIG_CODA_FS is not set
857# CONFIG_AFS_FS is not set
858# CONFIG_9P_FS is not set
859
860#
861# Partition Types
862#
863# CONFIG_PARTITION_ADVANCED is not set
864CONFIG_MSDOS_PARTITION=y
865
866#
867# Native Language Support
868#
869CONFIG_NLS=y
870CONFIG_NLS_DEFAULT="iso8859-1"
871CONFIG_NLS_CODEPAGE_437=y
872# CONFIG_NLS_CODEPAGE_737 is not set
873# CONFIG_NLS_CODEPAGE_775 is not set
874# CONFIG_NLS_CODEPAGE_850 is not set
875# CONFIG_NLS_CODEPAGE_852 is not set
876# CONFIG_NLS_CODEPAGE_855 is not set
877# CONFIG_NLS_CODEPAGE_857 is not set
878# CONFIG_NLS_CODEPAGE_860 is not set
879# CONFIG_NLS_CODEPAGE_861 is not set
880# CONFIG_NLS_CODEPAGE_862 is not set
881# CONFIG_NLS_CODEPAGE_863 is not set
882# CONFIG_NLS_CODEPAGE_864 is not set
883# CONFIG_NLS_CODEPAGE_865 is not set
884# CONFIG_NLS_CODEPAGE_866 is not set
885# CONFIG_NLS_CODEPAGE_869 is not set
886# CONFIG_NLS_CODEPAGE_936 is not set
887# CONFIG_NLS_CODEPAGE_950 is not set
888# CONFIG_NLS_CODEPAGE_932 is not set
889# CONFIG_NLS_CODEPAGE_949 is not set
890# CONFIG_NLS_CODEPAGE_874 is not set
891# CONFIG_NLS_ISO8859_8 is not set
892# CONFIG_NLS_CODEPAGE_1250 is not set
893# CONFIG_NLS_CODEPAGE_1251 is not set
894CONFIG_NLS_ASCII=y
895CONFIG_NLS_ISO8859_1=y
896# CONFIG_NLS_ISO8859_2 is not set
897# CONFIG_NLS_ISO8859_3 is not set
898# CONFIG_NLS_ISO8859_4 is not set
899# CONFIG_NLS_ISO8859_5 is not set
900# CONFIG_NLS_ISO8859_6 is not set
901# CONFIG_NLS_ISO8859_7 is not set
902# CONFIG_NLS_ISO8859_9 is not set
903# CONFIG_NLS_ISO8859_13 is not set
904# CONFIG_NLS_ISO8859_14 is not set
905# CONFIG_NLS_ISO8859_15 is not set
906# CONFIG_NLS_KOI8_R is not set
907# CONFIG_NLS_KOI8_U is not set
908# CONFIG_NLS_UTF8 is not set
909
910#
911# iSeries device drivers
912#
913CONFIG_VIOCONS=y
914CONFIG_VIODASD=y
915CONFIG_VIOCD=m
916CONFIG_VIOTAPE=m
917CONFIG_VIOPATH=y
918
919#
920# Profiling support
921#
922CONFIG_PROFILING=y
923CONFIG_OPROFILE=y
924
925#
926# Kernel hacking
927#
928# CONFIG_PRINTK_TIME is not set
929CONFIG_DEBUG_KERNEL=y
930CONFIG_MAGIC_SYSRQ=y
931CONFIG_LOG_BUF_SHIFT=17
932CONFIG_DETECT_SOFTLOCKUP=y
933# CONFIG_SCHEDSTATS is not set
934# CONFIG_DEBUG_SLAB is not set
935# CONFIG_DEBUG_SPINLOCK is not set
936# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
937# CONFIG_DEBUG_KOBJECT is not set
938# CONFIG_DEBUG_INFO is not set
939CONFIG_DEBUG_FS=y
940CONFIG_DEBUG_STACKOVERFLOW=y
941# CONFIG_KPROBES is not set
942CONFIG_DEBUG_STACK_USAGE=y
943# CONFIG_DEBUGGER is not set
944# CONFIG_PPCDBG is not set
945CONFIG_IRQSTACKS=y
946
947#
948# Security options
949#
950# CONFIG_KEYS is not set
951# CONFIG_SECURITY is not set
952
953#
954# Cryptographic options
955#
956CONFIG_CRYPTO=y
957CONFIG_CRYPTO_HMAC=y
958CONFIG_CRYPTO_NULL=m
959CONFIG_CRYPTO_MD4=m
960CONFIG_CRYPTO_MD5=y
961CONFIG_CRYPTO_SHA1=m
962CONFIG_CRYPTO_SHA256=m
963CONFIG_CRYPTO_SHA512=m
964CONFIG_CRYPTO_WP512=m
965CONFIG_CRYPTO_TGR192=m
966CONFIG_CRYPTO_DES=y
967CONFIG_CRYPTO_BLOWFISH=m
968CONFIG_CRYPTO_TWOFISH=m
969CONFIG_CRYPTO_SERPENT=m
970CONFIG_CRYPTO_AES=m
971CONFIG_CRYPTO_CAST5=m
972CONFIG_CRYPTO_CAST6=m
973CONFIG_CRYPTO_TEA=m
974CONFIG_CRYPTO_ARC4=m
975CONFIG_CRYPTO_KHAZAD=m
976CONFIG_CRYPTO_ANUBIS=m
977CONFIG_CRYPTO_DEFLATE=m
978CONFIG_CRYPTO_MICHAEL_MIC=m
979CONFIG_CRYPTO_CRC32C=m
980CONFIG_CRYPTO_TEST=m
981
982#
983# Hardware crypto devices
984#
985
986#
987# Library routines
988#
989CONFIG_CRC_CCITT=m
990# CONFIG_CRC16 is not set
991CONFIG_CRC32=y
992CONFIG_LIBCRC32C=m
993CONFIG_ZLIB_INFLATE=y
994CONFIG_ZLIB_DEFLATE=m
995CONFIG_TEXTSEARCH=y
996CONFIG_TEXTSEARCH_KMP=m
997CONFIG_TEXTSEARCH_BM=m
998CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/ppc64/configs/maple_defconfig b/arch/ppc64/configs/maple_defconfig
deleted file mode 100644
index 7b480f3d1406..000000000000
--- a/arch/ppc64/configs/maple_defconfig
+++ /dev/null
@@ -1,1062 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc4
4# Thu Oct 20 08:31:24 2005
5#
6CONFIG_64BIT=y
7CONFIG_MMU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_GENERIC_ISA_DMA=y
11CONFIG_EARLY_PRINTK=y
12CONFIG_COMPAT=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y
15CONFIG_FORCE_MAX_ZONEORDER=13
16
17#
18# Code maturity level options
19#
20CONFIG_EXPERIMENTAL=y
21CONFIG_CLEAN_COMPILE=y
22CONFIG_LOCK_KERNEL=y
23CONFIG_INIT_ENV_ARG_LIMIT=32
24
25#
26# General setup
27#
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31CONFIG_SYSVIPC=y
32CONFIG_POSIX_MQUEUE=y
33# CONFIG_BSD_PROCESS_ACCT is not set
34CONFIG_SYSCTL=y
35# CONFIG_AUDIT is not set
36# CONFIG_HOTPLUG is not set
37CONFIG_KOBJECT_UEVENT=y
38CONFIG_IKCONFIG=y
39CONFIG_IKCONFIG_PROC=y
40# CONFIG_CPUSETS is not set
41CONFIG_INITRAMFS_SOURCE=""
42# CONFIG_EMBEDDED is not set
43CONFIG_KALLSYMS=y
44CONFIG_KALLSYMS_ALL=y
45# CONFIG_KALLSYMS_EXTRA_PASS is not set
46CONFIG_PRINTK=y
47CONFIG_BUG=y
48CONFIG_BASE_FULL=y
49CONFIG_FUTEX=y
50CONFIG_EPOLL=y
51CONFIG_SHMEM=y
52CONFIG_CC_ALIGN_FUNCTIONS=0
53CONFIG_CC_ALIGN_LABELS=0
54CONFIG_CC_ALIGN_LOOPS=0
55CONFIG_CC_ALIGN_JUMPS=0
56# CONFIG_TINY_SHMEM is not set
57CONFIG_BASE_SMALL=0
58
59#
60# Loadable module support
61#
62CONFIG_MODULES=y
63CONFIG_MODULE_UNLOAD=y
64# CONFIG_MODULE_FORCE_UNLOAD is not set
65CONFIG_OBSOLETE_MODPARM=y
66CONFIG_MODVERSIONS=y
67CONFIG_MODULE_SRCVERSION_ALL=y
68CONFIG_KMOD=y
69CONFIG_STOP_MACHINE=y
70CONFIG_SYSVIPC_COMPAT=y
71
72#
73# Platform support
74#
75# CONFIG_PPC_ISERIES is not set
76CONFIG_PPC_MULTIPLATFORM=y
77# CONFIG_PPC_PSERIES is not set
78# CONFIG_PPC_BPA is not set
79# CONFIG_PPC_PMAC is not set
80CONFIG_PPC_MAPLE=y
81CONFIG_PPC=y
82CONFIG_PPC64=y
83CONFIG_PPC_OF=y
84CONFIG_MPIC=y
85# CONFIG_ALTIVEC is not set
86CONFIG_KEXEC=y
87CONFIG_U3_DART=y
88CONFIG_MPIC_BROKEN_U3=y
89CONFIG_BOOTX_TEXT=y
90CONFIG_POWER4_ONLY=y
91CONFIG_IOMMU_VMERGE=y
92CONFIG_SMP=y
93CONFIG_NR_CPUS=2
94CONFIG_ARCH_SELECT_MEMORY_MODEL=y
95CONFIG_ARCH_FLATMEM_ENABLE=y
96CONFIG_SELECT_MEMORY_MODEL=y
97CONFIG_FLATMEM_MANUAL=y
98# CONFIG_DISCONTIGMEM_MANUAL is not set
99# CONFIG_SPARSEMEM_MANUAL is not set
100CONFIG_FLATMEM=y
101CONFIG_FLAT_NODE_MEM_MAP=y
102# CONFIG_SPARSEMEM_STATIC is not set
103# CONFIG_NUMA is not set
104# CONFIG_SCHED_SMT is not set
105CONFIG_PREEMPT_NONE=y
106# CONFIG_PREEMPT_VOLUNTARY is not set
107# CONFIG_PREEMPT is not set
108# CONFIG_PREEMPT_BKL is not set
109# CONFIG_HZ_100 is not set
110CONFIG_HZ_250=y
111# CONFIG_HZ_1000 is not set
112CONFIG_HZ=250
113CONFIG_GENERIC_HARDIRQS=y
114CONFIG_SECCOMP=y
115CONFIG_BINFMT_ELF=y
116# CONFIG_BINFMT_MISC is not set
117CONFIG_PROC_DEVICETREE=y
118# CONFIG_CMDLINE_BOOL is not set
119CONFIG_ISA_DMA_API=y
120
121#
122# Bus Options
123#
124CONFIG_PCI=y
125CONFIG_PCI_DOMAINS=y
126CONFIG_PCI_LEGACY_PROC=y
127# CONFIG_PCI_DEBUG is not set
128
129#
130# PCCARD (PCMCIA/CardBus) support
131#
132# CONFIG_PCCARD is not set
133
134#
135# PCI Hotplug Support
136#
137# CONFIG_HOTPLUG_PCI is not set
138
139#
140# Networking
141#
142CONFIG_NET=y
143
144#
145# Networking options
146#
147CONFIG_PACKET=y
148CONFIG_PACKET_MMAP=y
149CONFIG_UNIX=y
150# CONFIG_NET_KEY is not set
151CONFIG_INET=y
152CONFIG_IP_MULTICAST=y
153# CONFIG_IP_ADVANCED_ROUTER is not set
154CONFIG_IP_FIB_HASH=y
155CONFIG_IP_PNP=y
156CONFIG_IP_PNP_DHCP=y
157# CONFIG_IP_PNP_BOOTP is not set
158# CONFIG_IP_PNP_RARP is not set
159# CONFIG_NET_IPIP is not set
160# CONFIG_NET_IPGRE is not set
161# CONFIG_IP_MROUTE is not set
162# CONFIG_ARPD is not set
163# CONFIG_SYN_COOKIES is not set
164# CONFIG_INET_AH is not set
165# CONFIG_INET_ESP is not set
166# CONFIG_INET_IPCOMP is not set
167# CONFIG_INET_TUNNEL is not set
168CONFIG_INET_DIAG=y
169CONFIG_INET_TCP_DIAG=y
170# CONFIG_TCP_CONG_ADVANCED is not set
171CONFIG_TCP_CONG_BIC=y
172# CONFIG_IPV6 is not set
173# CONFIG_NETFILTER is not set
174
175#
176# DCCP Configuration (EXPERIMENTAL)
177#
178# CONFIG_IP_DCCP is not set
179
180#
181# SCTP Configuration (EXPERIMENTAL)
182#
183# CONFIG_IP_SCTP is not set
184# CONFIG_ATM is not set
185# CONFIG_BRIDGE is not set
186# CONFIG_VLAN_8021Q is not set
187# CONFIG_DECNET is not set
188# CONFIG_LLC2 is not set
189# CONFIG_IPX is not set
190# CONFIG_ATALK is not set
191# CONFIG_X25 is not set
192# CONFIG_LAPB is not set
193# CONFIG_NET_DIVERT is not set
194# CONFIG_ECONET is not set
195# CONFIG_WAN_ROUTER is not set
196# CONFIG_NET_SCHED is not set
197# CONFIG_NET_CLS_ROUTE is not set
198
199#
200# Network testing
201#
202# CONFIG_NET_PKTGEN is not set
203# CONFIG_HAMRADIO is not set
204# CONFIG_IRDA is not set
205# CONFIG_BT is not set
206# CONFIG_IEEE80211 is not set
207
208#
209# Device Drivers
210#
211
212#
213# Generic Driver Options
214#
215CONFIG_STANDALONE=y
216CONFIG_PREVENT_FIRMWARE_BUILD=y
217# CONFIG_FW_LOADER is not set
218# CONFIG_DEBUG_DRIVER is not set
219
220#
221# Connector - unified userspace <-> kernelspace linker
222#
223# CONFIG_CONNECTOR is not set
224
225#
226# Memory Technology Devices (MTD)
227#
228# CONFIG_MTD is not set
229
230#
231# Parallel port support
232#
233# CONFIG_PARPORT is not set
234
235#
236# Plug and Play support
237#
238
239#
240# Block devices
241#
242# CONFIG_BLK_DEV_FD is not set
243# CONFIG_BLK_CPQ_DA is not set
244# CONFIG_BLK_CPQ_CISS_DA is not set
245# CONFIG_BLK_DEV_DAC960 is not set
246# CONFIG_BLK_DEV_UMEM is not set
247# CONFIG_BLK_DEV_COW_COMMON is not set
248# CONFIG_BLK_DEV_LOOP is not set
249# CONFIG_BLK_DEV_NBD is not set
250# CONFIG_BLK_DEV_SX8 is not set
251# CONFIG_BLK_DEV_UB is not set
252CONFIG_BLK_DEV_RAM=y
253CONFIG_BLK_DEV_RAM_COUNT=16
254CONFIG_BLK_DEV_RAM_SIZE=8192
255# CONFIG_BLK_DEV_INITRD is not set
256# CONFIG_CDROM_PKTCDVD is not set
257
258#
259# IO Schedulers
260#
261CONFIG_IOSCHED_NOOP=y
262CONFIG_IOSCHED_AS=y
263CONFIG_IOSCHED_DEADLINE=y
264CONFIG_IOSCHED_CFQ=y
265# CONFIG_ATA_OVER_ETH is not set
266
267#
268# ATA/ATAPI/MFM/RLL support
269#
270CONFIG_IDE=y
271CONFIG_BLK_DEV_IDE=y
272
273#
274# Please see Documentation/ide.txt for help/info on IDE drives
275#
276# CONFIG_BLK_DEV_IDE_SATA is not set
277CONFIG_BLK_DEV_IDEDISK=y
278# CONFIG_IDEDISK_MULTI_MODE is not set
279CONFIG_BLK_DEV_IDECD=y
280# CONFIG_BLK_DEV_IDETAPE is not set
281# CONFIG_BLK_DEV_IDEFLOPPY is not set
282CONFIG_IDE_TASK_IOCTL=y
283
284#
285# IDE chipset support/bugfixes
286#
287CONFIG_IDE_GENERIC=y
288CONFIG_BLK_DEV_IDEPCI=y
289CONFIG_IDEPCI_SHARE_IRQ=y
290# CONFIG_BLK_DEV_OFFBOARD is not set
291CONFIG_BLK_DEV_GENERIC=y
292# CONFIG_BLK_DEV_OPTI621 is not set
293# CONFIG_BLK_DEV_SL82C105 is not set
294CONFIG_BLK_DEV_IDEDMA_PCI=y
295# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
296CONFIG_IDEDMA_PCI_AUTO=y
297# CONFIG_IDEDMA_ONLYDISK is not set
298# CONFIG_BLK_DEV_AEC62XX is not set
299# CONFIG_BLK_DEV_ALI15X3 is not set
300CONFIG_BLK_DEV_AMD74XX=y
301# CONFIG_BLK_DEV_CMD64X is not set
302# CONFIG_BLK_DEV_TRIFLEX is not set
303# CONFIG_BLK_DEV_CY82C693 is not set
304# CONFIG_BLK_DEV_CS5520 is not set
305# CONFIG_BLK_DEV_CS5530 is not set
306# CONFIG_BLK_DEV_HPT34X is not set
307# CONFIG_BLK_DEV_HPT366 is not set
308# CONFIG_BLK_DEV_SC1200 is not set
309# CONFIG_BLK_DEV_PIIX is not set
310# CONFIG_BLK_DEV_IT821X is not set
311# CONFIG_BLK_DEV_NS87415 is not set
312# CONFIG_BLK_DEV_PDC202XX_OLD is not set
313# CONFIG_BLK_DEV_PDC202XX_NEW is not set
314# CONFIG_BLK_DEV_SVWKS is not set
315# CONFIG_BLK_DEV_SIIMAGE is not set
316# CONFIG_BLK_DEV_SLC90E66 is not set
317# CONFIG_BLK_DEV_TRM290 is not set
318# CONFIG_BLK_DEV_VIA82CXXX is not set
319# CONFIG_IDE_ARM is not set
320CONFIG_BLK_DEV_IDEDMA=y
321# CONFIG_IDEDMA_IVB is not set
322CONFIG_IDEDMA_AUTO=y
323# CONFIG_BLK_DEV_HD is not set
324
325#
326# SCSI device support
327#
328# CONFIG_RAID_ATTRS is not set
329# CONFIG_SCSI is not set
330
331#
332# Multi-device support (RAID and LVM)
333#
334# CONFIG_MD is not set
335
336#
337# Fusion MPT device support
338#
339# CONFIG_FUSION is not set
340
341#
342# IEEE 1394 (FireWire) support
343#
344# CONFIG_IEEE1394 is not set
345
346#
347# I2O device support
348#
349# CONFIG_I2O is not set
350
351#
352# Macintosh device drivers
353#
354
355#
356# Network device support
357#
358CONFIG_NETDEVICES=y
359# CONFIG_DUMMY is not set
360# CONFIG_BONDING is not set
361# CONFIG_EQUALIZER is not set
362# CONFIG_TUN is not set
363
364#
365# ARCnet devices
366#
367# CONFIG_ARCNET is not set
368
369#
370# PHY device support
371#
372# CONFIG_PHYLIB is not set
373
374#
375# Ethernet (10 or 100Mbit)
376#
377CONFIG_NET_ETHERNET=y
378CONFIG_MII=y
379# CONFIG_HAPPYMEAL is not set
380# CONFIG_SUNGEM is not set
381# CONFIG_CASSINI is not set
382# CONFIG_NET_VENDOR_3COM is not set
383
384#
385# Tulip family network device support
386#
387# CONFIG_NET_TULIP is not set
388# CONFIG_HP100 is not set
389CONFIG_NET_PCI=y
390# CONFIG_PCNET32 is not set
391CONFIG_AMD8111_ETH=y
392# CONFIG_AMD8111E_NAPI is not set
393# CONFIG_ADAPTEC_STARFIRE is not set
394# CONFIG_B44 is not set
395# CONFIG_FORCEDETH is not set
396# CONFIG_DGRS is not set
397# CONFIG_EEPRO100 is not set
398# CONFIG_E100 is not set
399# CONFIG_FEALNX is not set
400# CONFIG_NATSEMI is not set
401# CONFIG_NE2K_PCI is not set
402# CONFIG_8139CP is not set
403# CONFIG_8139TOO is not set
404# CONFIG_SIS900 is not set
405# CONFIG_EPIC100 is not set
406# CONFIG_SUNDANCE is not set
407# CONFIG_VIA_RHINE is not set
408
409#
410# Ethernet (1000 Mbit)
411#
412# CONFIG_ACENIC is not set
413# CONFIG_DL2K is not set
414CONFIG_E1000=y
415# CONFIG_E1000_NAPI is not set
416# CONFIG_NS83820 is not set
417# CONFIG_HAMACHI is not set
418# CONFIG_YELLOWFIN is not set
419# CONFIG_R8169 is not set
420# CONFIG_SIS190 is not set
421# CONFIG_SKGE is not set
422# CONFIG_SK98LIN is not set
423# CONFIG_VIA_VELOCITY is not set
424# CONFIG_TIGON3 is not set
425# CONFIG_BNX2 is not set
426# CONFIG_MV643XX_ETH is not set
427
428#
429# Ethernet (10000 Mbit)
430#
431# CONFIG_CHELSIO_T1 is not set
432# CONFIG_IXGB is not set
433# CONFIG_S2IO is not set
434
435#
436# Token Ring devices
437#
438# CONFIG_TR is not set
439
440#
441# Wireless LAN (non-hamradio)
442#
443# CONFIG_NET_RADIO is not set
444
445#
446# Wan interfaces
447#
448# CONFIG_WAN is not set
449# CONFIG_FDDI is not set
450# CONFIG_HIPPI is not set
451# CONFIG_PPP is not set
452# CONFIG_SLIP is not set
453# CONFIG_SHAPER is not set
454# CONFIG_NETCONSOLE is not set
455# CONFIG_NETPOLL is not set
456# CONFIG_NET_POLL_CONTROLLER is not set
457
458#
459# ISDN subsystem
460#
461# CONFIG_ISDN is not set
462
463#
464# Telephony Support
465#
466# CONFIG_PHONE is not set
467
468#
469# Input device support
470#
471CONFIG_INPUT=y
472
473#
474# Userland interfaces
475#
476CONFIG_INPUT_MOUSEDEV=y
477# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
478CONFIG_INPUT_MOUSEDEV_SCREEN_X=1600
479CONFIG_INPUT_MOUSEDEV_SCREEN_Y=1200
480# CONFIG_INPUT_JOYDEV is not set
481# CONFIG_INPUT_TSDEV is not set
482# CONFIG_INPUT_EVDEV is not set
483# CONFIG_INPUT_EVBUG is not set
484
485#
486# Input Device Drivers
487#
488# CONFIG_INPUT_KEYBOARD is not set
489# CONFIG_INPUT_MOUSE is not set
490# CONFIG_INPUT_JOYSTICK is not set
491# CONFIG_INPUT_TOUCHSCREEN is not set
492# CONFIG_INPUT_MISC is not set
493
494#
495# Hardware I/O ports
496#
497# CONFIG_SERIO is not set
498# CONFIG_GAMEPORT is not set
499
500#
501# Character devices
502#
503CONFIG_VT=y
504CONFIG_VT_CONSOLE=y
505CONFIG_HW_CONSOLE=y
506# CONFIG_SERIAL_NONSTANDARD is not set
507
508#
509# Serial drivers
510#
511CONFIG_SERIAL_8250=y
512CONFIG_SERIAL_8250_CONSOLE=y
513CONFIG_SERIAL_8250_NR_UARTS=4
514# CONFIG_SERIAL_8250_EXTENDED is not set
515
516#
517# Non-8250 serial port support
518#
519CONFIG_SERIAL_CORE=y
520CONFIG_SERIAL_CORE_CONSOLE=y
521# CONFIG_SERIAL_JSM is not set
522CONFIG_UNIX98_PTYS=y
523CONFIG_LEGACY_PTYS=y
524CONFIG_LEGACY_PTY_COUNT=256
525
526#
527# IPMI
528#
529# CONFIG_IPMI_HANDLER is not set
530
531#
532# Watchdog Cards
533#
534# CONFIG_WATCHDOG is not set
535# CONFIG_RTC is not set
536# CONFIG_DTLK is not set
537# CONFIG_R3964 is not set
538# CONFIG_APPLICOM is not set
539
540#
541# Ftape, the floppy tape device driver
542#
543# CONFIG_AGP is not set
544# CONFIG_DRM is not set
545# CONFIG_RAW_DRIVER is not set
546# CONFIG_HANGCHECK_TIMER is not set
547
548#
549# TPM devices
550#
551# CONFIG_TCG_TPM is not set
552
553#
554# I2C support
555#
556CONFIG_I2C=y
557CONFIG_I2C_CHARDEV=y
558
559#
560# I2C Algorithms
561#
562CONFIG_I2C_ALGOBIT=y
563# CONFIG_I2C_ALGOPCF is not set
564# CONFIG_I2C_ALGOPCA is not set
565
566#
567# I2C Hardware Bus support
568#
569# CONFIG_I2C_ALI1535 is not set
570# CONFIG_I2C_ALI1563 is not set
571# CONFIG_I2C_ALI15X3 is not set
572# CONFIG_I2C_AMD756 is not set
573CONFIG_I2C_AMD8111=y
574# CONFIG_I2C_I801 is not set
575# CONFIG_I2C_I810 is not set
576# CONFIG_I2C_PIIX4 is not set
577# CONFIG_I2C_NFORCE2 is not set
578# CONFIG_I2C_PARPORT_LIGHT is not set
579# CONFIG_I2C_PROSAVAGE is not set
580# CONFIG_I2C_SAVAGE4 is not set
581# CONFIG_SCx200_ACB is not set
582# CONFIG_I2C_SIS5595 is not set
583# CONFIG_I2C_SIS630 is not set
584# CONFIG_I2C_SIS96X is not set
585# CONFIG_I2C_STUB is not set
586# CONFIG_I2C_VIA is not set
587# CONFIG_I2C_VIAPRO is not set
588# CONFIG_I2C_VOODOO3 is not set
589# CONFIG_I2C_PCA_ISA is not set
590
591#
592# Miscellaneous I2C Chip support
593#
594# CONFIG_SENSORS_DS1337 is not set
595# CONFIG_SENSORS_DS1374 is not set
596# CONFIG_SENSORS_EEPROM is not set
597# CONFIG_SENSORS_PCF8574 is not set
598# CONFIG_SENSORS_PCA9539 is not set
599# CONFIG_SENSORS_PCF8591 is not set
600# CONFIG_SENSORS_RTC8564 is not set
601# CONFIG_SENSORS_MAX6875 is not set
602# CONFIG_I2C_DEBUG_CORE is not set
603# CONFIG_I2C_DEBUG_ALGO is not set
604# CONFIG_I2C_DEBUG_BUS is not set
605# CONFIG_I2C_DEBUG_CHIP is not set
606
607#
608# Dallas's 1-wire bus
609#
610# CONFIG_W1 is not set
611
612#
613# Hardware Monitoring support
614#
615# CONFIG_HWMON is not set
616# CONFIG_HWMON_VID is not set
617
618#
619# Misc devices
620#
621
622#
623# Multimedia Capabilities Port drivers
624#
625
626#
627# Multimedia devices
628#
629# CONFIG_VIDEO_DEV is not set
630
631#
632# Digital Video Broadcasting Devices
633#
634# CONFIG_DVB is not set
635
636#
637# Graphics support
638#
639# CONFIG_FB is not set
640
641#
642# Console display driver support
643#
644# CONFIG_VGA_CONSOLE is not set
645CONFIG_DUMMY_CONSOLE=y
646
647#
648# Sound
649#
650# CONFIG_SOUND is not set
651
652#
653# USB support
654#
655CONFIG_USB_ARCH_HAS_HCD=y
656CONFIG_USB_ARCH_HAS_OHCI=y
657CONFIG_USB=y
658# CONFIG_USB_DEBUG is not set
659
660#
661# Miscellaneous USB options
662#
663CONFIG_USB_DEVICEFS=y
664# CONFIG_USB_BANDWIDTH is not set
665# CONFIG_USB_DYNAMIC_MINORS is not set
666# CONFIG_USB_OTG is not set
667
668#
669# USB Host Controller Drivers
670#
671CONFIG_USB_EHCI_HCD=y
672CONFIG_USB_EHCI_SPLIT_ISO=y
673CONFIG_USB_EHCI_ROOT_HUB_TT=y
674# CONFIG_USB_ISP116X_HCD is not set
675CONFIG_USB_OHCI_HCD=y
676# CONFIG_USB_OHCI_BIG_ENDIAN is not set
677CONFIG_USB_OHCI_LITTLE_ENDIAN=y
678CONFIG_USB_UHCI_HCD=y
679# CONFIG_USB_SL811_HCD is not set
680
681#
682# USB Device Class drivers
683#
684# CONFIG_USB_BLUETOOTH_TTY is not set
685# CONFIG_USB_ACM is not set
686# CONFIG_USB_PRINTER is not set
687
688#
689# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
690#
691# CONFIG_USB_STORAGE is not set
692
693#
694# USB Input Devices
695#
696CONFIG_USB_HID=y
697CONFIG_USB_HIDINPUT=y
698# CONFIG_HID_FF is not set
699# CONFIG_USB_HIDDEV is not set
700# CONFIG_USB_AIPTEK is not set
701# CONFIG_USB_WACOM is not set
702# CONFIG_USB_ACECAD is not set
703# CONFIG_USB_KBTAB is not set
704# CONFIG_USB_POWERMATE is not set
705# CONFIG_USB_MTOUCH is not set
706# CONFIG_USB_ITMTOUCH is not set
707# CONFIG_USB_EGALAX is not set
708# CONFIG_USB_YEALINK is not set
709# CONFIG_USB_XPAD is not set
710# CONFIG_USB_ATI_REMOTE is not set
711# CONFIG_USB_KEYSPAN_REMOTE is not set
712# CONFIG_USB_APPLETOUCH is not set
713
714#
715# USB Imaging devices
716#
717# CONFIG_USB_MDC800 is not set
718
719#
720# USB Multimedia devices
721#
722# CONFIG_USB_DABUSB is not set
723
724#
725# Video4Linux support is needed for USB Multimedia device support
726#
727
728#
729# USB Network Adapters
730#
731# CONFIG_USB_CATC is not set
732# CONFIG_USB_KAWETH is not set
733CONFIG_USB_PEGASUS=y
734# CONFIG_USB_RTL8150 is not set
735# CONFIG_USB_USBNET is not set
736CONFIG_USB_MON=y
737
738#
739# USB port drivers
740#
741
742#
743# USB Serial Converter support
744#
745CONFIG_USB_SERIAL=y
746# CONFIG_USB_SERIAL_CONSOLE is not set
747CONFIG_USB_SERIAL_GENERIC=y
748# CONFIG_USB_SERIAL_AIRPRIME is not set
749# CONFIG_USB_SERIAL_BELKIN is not set
750# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
751# CONFIG_USB_SERIAL_CP2101 is not set
752CONFIG_USB_SERIAL_CYPRESS_M8=m
753# CONFIG_USB_SERIAL_EMPEG is not set
754# CONFIG_USB_SERIAL_FTDI_SIO is not set
755# CONFIG_USB_SERIAL_VISOR is not set
756# CONFIG_USB_SERIAL_IPAQ is not set
757# CONFIG_USB_SERIAL_IR is not set
758# CONFIG_USB_SERIAL_EDGEPORT is not set
759# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
760CONFIG_USB_SERIAL_GARMIN=m
761CONFIG_USB_SERIAL_IPW=m
762# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
763CONFIG_USB_SERIAL_KEYSPAN=y
764CONFIG_USB_SERIAL_KEYSPAN_MPR=y
765CONFIG_USB_SERIAL_KEYSPAN_USA28=y
766CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
767CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
768CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
769CONFIG_USB_SERIAL_KEYSPAN_USA19=y
770CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
771CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
772CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
773CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
774CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
775CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
776# CONFIG_USB_SERIAL_KLSI is not set
777# CONFIG_USB_SERIAL_KOBIL_SCT is not set
778# CONFIG_USB_SERIAL_MCT_U232 is not set
779# CONFIG_USB_SERIAL_PL2303 is not set
780# CONFIG_USB_SERIAL_HP4X is not set
781# CONFIG_USB_SERIAL_SAFE is not set
782CONFIG_USB_SERIAL_TI=m
783# CONFIG_USB_SERIAL_CYBERJACK is not set
784# CONFIG_USB_SERIAL_XIRCOM is not set
785# CONFIG_USB_SERIAL_OMNINET is not set
786CONFIG_USB_EZUSB=y
787
788#
789# USB Miscellaneous drivers
790#
791# CONFIG_USB_EMI62 is not set
792# CONFIG_USB_EMI26 is not set
793# CONFIG_USB_AUERSWALD is not set
794# CONFIG_USB_RIO500 is not set
795# CONFIG_USB_LEGOTOWER is not set
796# CONFIG_USB_LCD is not set
797# CONFIG_USB_LED is not set
798# CONFIG_USB_CYTHERM is not set
799# CONFIG_USB_PHIDGETKIT is not set
800# CONFIG_USB_PHIDGETSERVO is not set
801# CONFIG_USB_IDMOUSE is not set
802# CONFIG_USB_SISUSBVGA is not set
803# CONFIG_USB_LD is not set
804# CONFIG_USB_TEST is not set
805
806#
807# USB DSL modem support
808#
809
810#
811# USB Gadget Support
812#
813# CONFIG_USB_GADGET is not set
814
815#
816# MMC/SD Card support
817#
818# CONFIG_MMC is not set
819
820#
821# InfiniBand support
822#
823# CONFIG_INFINIBAND is not set
824
825#
826# SN Devices
827#
828
829#
830# File systems
831#
832CONFIG_EXT2_FS=y
833# CONFIG_EXT2_FS_XATTR is not set
834CONFIG_EXT2_FS_XIP=y
835CONFIG_FS_XIP=y
836CONFIG_EXT3_FS=y
837# CONFIG_EXT3_FS_XATTR is not set
838CONFIG_JBD=y
839# CONFIG_JBD_DEBUG is not set
840# CONFIG_REISERFS_FS is not set
841# CONFIG_JFS_FS is not set
842CONFIG_FS_POSIX_ACL=y
843# CONFIG_XFS_FS is not set
844# CONFIG_MINIX_FS is not set
845# CONFIG_ROMFS_FS is not set
846CONFIG_INOTIFY=y
847# CONFIG_QUOTA is not set
848CONFIG_DNOTIFY=y
849# CONFIG_AUTOFS_FS is not set
850# CONFIG_AUTOFS4_FS is not set
851# CONFIG_FUSE_FS is not set
852
853#
854# CD-ROM/DVD Filesystems
855#
856# CONFIG_ISO9660_FS is not set
857# CONFIG_UDF_FS is not set
858
859#
860# DOS/FAT/NT Filesystems
861#
862CONFIG_FAT_FS=y
863CONFIG_MSDOS_FS=y
864CONFIG_VFAT_FS=y
865CONFIG_FAT_DEFAULT_CODEPAGE=437
866CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
867# CONFIG_NTFS_FS is not set
868
869#
870# Pseudo filesystems
871#
872CONFIG_PROC_FS=y
873CONFIG_PROC_KCORE=y
874CONFIG_SYSFS=y
875CONFIG_TMPFS=y
876CONFIG_HUGETLBFS=y
877CONFIG_HUGETLB_PAGE=y
878CONFIG_RAMFS=y
879# CONFIG_RELAYFS_FS is not set
880
881#
882# Miscellaneous filesystems
883#
884# CONFIG_ADFS_FS is not set
885# CONFIG_AFFS_FS is not set
886# CONFIG_HFS_FS is not set
887# CONFIG_HFSPLUS_FS is not set
888# CONFIG_BEFS_FS is not set
889# CONFIG_BFS_FS is not set
890# CONFIG_EFS_FS is not set
891CONFIG_CRAMFS=y
892# CONFIG_VXFS_FS is not set
893# CONFIG_HPFS_FS is not set
894# CONFIG_QNX4FS_FS is not set
895# CONFIG_SYSV_FS is not set
896# CONFIG_UFS_FS is not set
897
898#
899# Network File Systems
900#
901CONFIG_NFS_FS=y
902CONFIG_NFS_V3=y
903CONFIG_NFS_V3_ACL=y
904CONFIG_NFS_V4=y
905# CONFIG_NFS_DIRECTIO is not set
906# CONFIG_NFSD is not set
907CONFIG_ROOT_NFS=y
908CONFIG_LOCKD=y
909CONFIG_LOCKD_V4=y
910CONFIG_NFS_ACL_SUPPORT=y
911CONFIG_NFS_COMMON=y
912CONFIG_SUNRPC=y
913CONFIG_SUNRPC_GSS=y
914CONFIG_RPCSEC_GSS_KRB5=y
915# CONFIG_RPCSEC_GSS_SPKM3 is not set
916# CONFIG_SMB_FS is not set
917# CONFIG_CIFS is not set
918# CONFIG_NCP_FS is not set
919# CONFIG_CODA_FS is not set
920# CONFIG_AFS_FS is not set
921# CONFIG_9P_FS is not set
922
923#
924# Partition Types
925#
926CONFIG_PARTITION_ADVANCED=y
927# CONFIG_ACORN_PARTITION is not set
928# CONFIG_OSF_PARTITION is not set
929# CONFIG_AMIGA_PARTITION is not set
930# CONFIG_ATARI_PARTITION is not set
931CONFIG_MAC_PARTITION=y
932CONFIG_MSDOS_PARTITION=y
933# CONFIG_BSD_DISKLABEL is not set
934# CONFIG_MINIX_SUBPARTITION is not set
935# CONFIG_SOLARIS_X86_PARTITION is not set
936# CONFIG_UNIXWARE_DISKLABEL is not set
937# CONFIG_LDM_PARTITION is not set
938# CONFIG_SGI_PARTITION is not set
939# CONFIG_ULTRIX_PARTITION is not set
940# CONFIG_SUN_PARTITION is not set
941# CONFIG_EFI_PARTITION is not set
942
943#
944# Native Language Support
945#
946CONFIG_NLS=y
947CONFIG_NLS_DEFAULT="utf-8"
948# CONFIG_NLS_CODEPAGE_437 is not set
949# CONFIG_NLS_CODEPAGE_737 is not set
950# CONFIG_NLS_CODEPAGE_775 is not set
951# CONFIG_NLS_CODEPAGE_850 is not set
952# CONFIG_NLS_CODEPAGE_852 is not set
953# CONFIG_NLS_CODEPAGE_855 is not set
954# CONFIG_NLS_CODEPAGE_857 is not set
955# CONFIG_NLS_CODEPAGE_860 is not set
956# CONFIG_NLS_CODEPAGE_861 is not set
957# CONFIG_NLS_CODEPAGE_862 is not set
958# CONFIG_NLS_CODEPAGE_863 is not set
959# CONFIG_NLS_CODEPAGE_864 is not set
960# CONFIG_NLS_CODEPAGE_865 is not set
961# CONFIG_NLS_CODEPAGE_866 is not set
962# CONFIG_NLS_CODEPAGE_869 is not set
963# CONFIG_NLS_CODEPAGE_936 is not set
964# CONFIG_NLS_CODEPAGE_950 is not set
965# CONFIG_NLS_CODEPAGE_932 is not set
966# CONFIG_NLS_CODEPAGE_949 is not set
967# CONFIG_NLS_CODEPAGE_874 is not set
968# CONFIG_NLS_ISO8859_8 is not set
969# CONFIG_NLS_CODEPAGE_1250 is not set
970# CONFIG_NLS_CODEPAGE_1251 is not set
971# CONFIG_NLS_ASCII is not set
972# CONFIG_NLS_ISO8859_1 is not set
973# CONFIG_NLS_ISO8859_2 is not set
974# CONFIG_NLS_ISO8859_3 is not set
975# CONFIG_NLS_ISO8859_4 is not set
976# CONFIG_NLS_ISO8859_5 is not set
977# CONFIG_NLS_ISO8859_6 is not set
978# CONFIG_NLS_ISO8859_7 is not set
979# CONFIG_NLS_ISO8859_9 is not set
980# CONFIG_NLS_ISO8859_13 is not set
981# CONFIG_NLS_ISO8859_14 is not set
982# CONFIG_NLS_ISO8859_15 is not set
983# CONFIG_NLS_KOI8_R is not set
984# CONFIG_NLS_KOI8_U is not set
985CONFIG_NLS_UTF8=y
986
987#
988# Profiling support
989#
990# CONFIG_PROFILING is not set
991
992#
993# Kernel hacking
994#
995# CONFIG_PRINTK_TIME is not set
996CONFIG_DEBUG_KERNEL=y
997CONFIG_MAGIC_SYSRQ=y
998CONFIG_LOG_BUF_SHIFT=17
999CONFIG_DETECT_SOFTLOCKUP=y
1000# CONFIG_SCHEDSTATS is not set
1001CONFIG_DEBUG_SLAB=y
1002# CONFIG_DEBUG_SPINLOCK is not set
1003CONFIG_DEBUG_SPINLOCK_SLEEP=y
1004# CONFIG_DEBUG_KOBJECT is not set
1005# CONFIG_DEBUG_INFO is not set
1006CONFIG_DEBUG_FS=y
1007CONFIG_DEBUG_STACKOVERFLOW=y
1008# CONFIG_KPROBES is not set
1009CONFIG_DEBUG_STACK_USAGE=y
1010CONFIG_DEBUGGER=y
1011CONFIG_XMON=y
1012CONFIG_XMON_DEFAULT=y
1013# CONFIG_PPCDBG is not set
1014# CONFIG_IRQSTACKS is not set
1015
1016#
1017# Security options
1018#
1019# CONFIG_KEYS is not set
1020# CONFIG_SECURITY is not set
1021
1022#
1023# Cryptographic options
1024#
1025CONFIG_CRYPTO=y
1026# CONFIG_CRYPTO_HMAC is not set
1027# CONFIG_CRYPTO_NULL is not set
1028# CONFIG_CRYPTO_MD4 is not set
1029CONFIG_CRYPTO_MD5=y
1030# CONFIG_CRYPTO_SHA1 is not set
1031# CONFIG_CRYPTO_SHA256 is not set
1032# CONFIG_CRYPTO_SHA512 is not set
1033# CONFIG_CRYPTO_WP512 is not set
1034# CONFIG_CRYPTO_TGR192 is not set
1035CONFIG_CRYPTO_DES=y
1036# CONFIG_CRYPTO_BLOWFISH is not set
1037# CONFIG_CRYPTO_TWOFISH is not set
1038# CONFIG_CRYPTO_SERPENT is not set
1039# CONFIG_CRYPTO_AES is not set
1040# CONFIG_CRYPTO_CAST5 is not set
1041# CONFIG_CRYPTO_CAST6 is not set
1042# CONFIG_CRYPTO_TEA is not set
1043# CONFIG_CRYPTO_ARC4 is not set
1044# CONFIG_CRYPTO_KHAZAD is not set
1045# CONFIG_CRYPTO_ANUBIS is not set
1046# CONFIG_CRYPTO_DEFLATE is not set
1047# CONFIG_CRYPTO_MICHAEL_MIC is not set
1048# CONFIG_CRYPTO_CRC32C is not set
1049# CONFIG_CRYPTO_TEST is not set
1050
1051#
1052# Hardware crypto devices
1053#
1054
1055#
1056# Library routines
1057#
1058CONFIG_CRC_CCITT=y
1059# CONFIG_CRC16 is not set
1060CONFIG_CRC32=y
1061# CONFIG_LIBCRC32C is not set
1062CONFIG_ZLIB_INFLATE=y
diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig
deleted file mode 100644
index 9f09dff9e11a..000000000000
--- a/arch/ppc64/configs/pSeries_defconfig
+++ /dev/null
@@ -1,1371 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.14-rc4
4# Thu Oct 20 08:32:17 2005
5#
6CONFIG_64BIT=y
7CONFIG_MMU=y
8CONFIG_RWSEM_XCHGADD_ALGORITHM=y
9CONFIG_GENERIC_CALIBRATE_DELAY=y
10CONFIG_GENERIC_ISA_DMA=y
11CONFIG_EARLY_PRINTK=y
12CONFIG_COMPAT=y
13CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
14CONFIG_ARCH_MAY_HAVE_PC_FDC=y
15CONFIG_FORCE_MAX_ZONEORDER=13
16
17#
18# Code maturity level options
19#
20CONFIG_EXPERIMENTAL=y
21CONFIG_CLEAN_COMPILE=y
22CONFIG_LOCK_KERNEL=y
23CONFIG_INIT_ENV_ARG_LIMIT=32
24
25#
26# General setup
27#
28CONFIG_LOCALVERSION=""
29CONFIG_LOCALVERSION_AUTO=y
30CONFIG_SWAP=y
31CONFIG_SYSVIPC=y
32CONFIG_POSIX_MQUEUE=y
33# CONFIG_BSD_PROCESS_ACCT is not set
34CONFIG_SYSCTL=y
35CONFIG_AUDIT=y
36CONFIG_AUDITSYSCALL=y
37CONFIG_HOTPLUG=y
38CONFIG_KOBJECT_UEVENT=y
39CONFIG_IKCONFIG=y
40CONFIG_IKCONFIG_PROC=y
41CONFIG_CPUSETS=y
42CONFIG_INITRAMFS_SOURCE=""
43# CONFIG_EMBEDDED is not set
44CONFIG_KALLSYMS=y
45CONFIG_KALLSYMS_ALL=y
46# CONFIG_KALLSYMS_EXTRA_PASS is not set
47CONFIG_PRINTK=y
48CONFIG_BUG=y
49CONFIG_BASE_FULL=y
50CONFIG_FUTEX=y
51CONFIG_EPOLL=y
52CONFIG_SHMEM=y
53CONFIG_CC_ALIGN_FUNCTIONS=0
54CONFIG_CC_ALIGN_LABELS=0
55CONFIG_CC_ALIGN_LOOPS=0
56CONFIG_CC_ALIGN_JUMPS=0
57# CONFIG_TINY_SHMEM is not set
58CONFIG_BASE_SMALL=0
59
60#
61# Loadable module support
62#
63CONFIG_MODULES=y
64CONFIG_MODULE_UNLOAD=y
65# CONFIG_MODULE_FORCE_UNLOAD is not set
66CONFIG_OBSOLETE_MODPARM=y
67CONFIG_MODVERSIONS=y
68CONFIG_MODULE_SRCVERSION_ALL=y
69CONFIG_KMOD=y
70CONFIG_STOP_MACHINE=y
71CONFIG_SYSVIPC_COMPAT=y
72
73#
74# Platform support
75#
76# CONFIG_PPC_ISERIES is not set
77CONFIG_PPC_MULTIPLATFORM=y
78CONFIG_PPC_PSERIES=y
79# CONFIG_PPC_BPA is not set
80# CONFIG_PPC_PMAC is not set
81# CONFIG_PPC_MAPLE is not set
82CONFIG_PPC=y
83CONFIG_PPC64=y
84CONFIG_PPC_OF=y
85CONFIG_XICS=y
86CONFIG_MPIC=y
87CONFIG_ALTIVEC=y
88CONFIG_PPC_SPLPAR=y
89CONFIG_KEXEC=y
90CONFIG_IBMVIO=y
91# CONFIG_U3_DART is not set
92# CONFIG_BOOTX_TEXT is not set
93# CONFIG_POWER4_ONLY is not set
94CONFIG_IOMMU_VMERGE=y
95CONFIG_SMP=y
96CONFIG_NR_CPUS=128
97CONFIG_ARCH_SELECT_MEMORY_MODEL=y
98CONFIG_ARCH_FLATMEM_ENABLE=y
99CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
100CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
101CONFIG_ARCH_SPARSEMEM_ENABLE=y
102CONFIG_SELECT_MEMORY_MODEL=y
103# CONFIG_FLATMEM_MANUAL is not set
104CONFIG_DISCONTIGMEM_MANUAL=y
105# CONFIG_SPARSEMEM_MANUAL is not set
106CONFIG_DISCONTIGMEM=y
107CONFIG_FLAT_NODE_MEM_MAP=y
108CONFIG_NEED_MULTIPLE_NODES=y
109# CONFIG_SPARSEMEM_STATIC is not set
110CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
111CONFIG_NODES_SPAN_OTHER_NODES=y
112CONFIG_NUMA=y
113CONFIG_SCHED_SMT=y
114CONFIG_PREEMPT_NONE=y
115# CONFIG_PREEMPT_VOLUNTARY is not set
116# CONFIG_PREEMPT is not set
117# CONFIG_PREEMPT_BKL is not set
118# CONFIG_HZ_100 is not set
119CONFIG_HZ_250=y
120# CONFIG_HZ_1000 is not set
121CONFIG_HZ=250
122CONFIG_EEH=y
123CONFIG_GENERIC_HARDIRQS=y
124CONFIG_PPC_RTAS=y
125CONFIG_RTAS_PROC=y
126CONFIG_RTAS_FLASH=m
127CONFIG_SCANLOG=m
128CONFIG_LPARCFG=y
129CONFIG_SECCOMP=y
130CONFIG_BINFMT_ELF=y
131# CONFIG_BINFMT_MISC is not set
132CONFIG_HOTPLUG_CPU=y
133CONFIG_PROC_DEVICETREE=y
134# CONFIG_CMDLINE_BOOL is not set
135CONFIG_ISA_DMA_API=y
136
137#
138# Bus Options
139#
140CONFIG_PCI=y
141CONFIG_PCI_DOMAINS=y
142CONFIG_PCI_LEGACY_PROC=y
143# CONFIG_PCI_DEBUG is not set
144
145#
146# PCCARD (PCMCIA/CardBus) support
147#
148# CONFIG_PCCARD is not set
149
150#
151# PCI Hotplug Support
152#
153CONFIG_HOTPLUG_PCI=m
154# CONFIG_HOTPLUG_PCI_FAKE is not set
155# CONFIG_HOTPLUG_PCI_CPCI is not set
156# CONFIG_HOTPLUG_PCI_SHPC is not set
157CONFIG_HOTPLUG_PCI_RPA=m
158CONFIG_HOTPLUG_PCI_RPA_DLPAR=m
159
160#
161# Networking
162#
163CONFIG_NET=y
164
165#
166# Networking options
167#
168CONFIG_PACKET=y
169# CONFIG_PACKET_MMAP is not set
170CONFIG_UNIX=y
171CONFIG_XFRM=y
172CONFIG_XFRM_USER=m
173CONFIG_NET_KEY=m
174CONFIG_INET=y
175CONFIG_IP_MULTICAST=y
176# CONFIG_IP_ADVANCED_ROUTER is not set
177CONFIG_IP_FIB_HASH=y
178# CONFIG_IP_PNP is not set
179CONFIG_NET_IPIP=y
180# CONFIG_NET_IPGRE is not set
181# CONFIG_IP_MROUTE is not set
182# CONFIG_ARPD is not set
183CONFIG_SYN_COOKIES=y
184CONFIG_INET_AH=m
185CONFIG_INET_ESP=m
186CONFIG_INET_IPCOMP=m
187CONFIG_INET_TUNNEL=y
188CONFIG_INET_DIAG=y
189CONFIG_INET_TCP_DIAG=y
190# CONFIG_TCP_CONG_ADVANCED is not set
191CONFIG_TCP_CONG_BIC=y
192
193#
194# IP: Virtual Server Configuration
195#
196# CONFIG_IP_VS is not set
197# CONFIG_IPV6 is not set
198CONFIG_NETFILTER=y
199# CONFIG_NETFILTER_DEBUG is not set
200CONFIG_NETFILTER_NETLINK=y
201CONFIG_NETFILTER_NETLINK_QUEUE=m
202CONFIG_NETFILTER_NETLINK_LOG=m
203
204#
205# IP: Netfilter Configuration
206#
207CONFIG_IP_NF_CONNTRACK=m
208CONFIG_IP_NF_CT_ACCT=y
209CONFIG_IP_NF_CONNTRACK_MARK=y
210CONFIG_IP_NF_CONNTRACK_EVENTS=y
211CONFIG_IP_NF_CONNTRACK_NETLINK=m
212CONFIG_IP_NF_CT_PROTO_SCTP=m
213CONFIG_IP_NF_FTP=m
214CONFIG_IP_NF_IRC=m
215# CONFIG_IP_NF_NETBIOS_NS is not set
216CONFIG_IP_NF_TFTP=m
217CONFIG_IP_NF_AMANDA=m
218# CONFIG_IP_NF_PPTP is not set
219CONFIG_IP_NF_QUEUE=m
220CONFIG_IP_NF_IPTABLES=m
221CONFIG_IP_NF_MATCH_LIMIT=m
222CONFIG_IP_NF_MATCH_IPRANGE=m
223CONFIG_IP_NF_MATCH_MAC=m
224CONFIG_IP_NF_MATCH_PKTTYPE=m
225CONFIG_IP_NF_MATCH_MARK=m
226CONFIG_IP_NF_MATCH_MULTIPORT=m
227CONFIG_IP_NF_MATCH_TOS=m
228CONFIG_IP_NF_MATCH_RECENT=m
229CONFIG_IP_NF_MATCH_ECN=m
230CONFIG_IP_NF_MATCH_DSCP=m
231CONFIG_IP_NF_MATCH_AH_ESP=m
232CONFIG_IP_NF_MATCH_LENGTH=m
233CONFIG_IP_NF_MATCH_TTL=m
234CONFIG_IP_NF_MATCH_TCPMSS=m
235CONFIG_IP_NF_MATCH_HELPER=m
236CONFIG_IP_NF_MATCH_STATE=m
237CONFIG_IP_NF_MATCH_CONNTRACK=m
238CONFIG_IP_NF_MATCH_OWNER=m
239CONFIG_IP_NF_MATCH_ADDRTYPE=m
240CONFIG_IP_NF_MATCH_REALM=m
241CONFIG_IP_NF_MATCH_SCTP=m
242# CONFIG_IP_NF_MATCH_DCCP is not set
243CONFIG_IP_NF_MATCH_COMMENT=m
244CONFIG_IP_NF_MATCH_CONNMARK=m
245CONFIG_IP_NF_MATCH_CONNBYTES=m
246CONFIG_IP_NF_MATCH_HASHLIMIT=m
247CONFIG_IP_NF_MATCH_STRING=m
248CONFIG_IP_NF_FILTER=m
249CONFIG_IP_NF_TARGET_REJECT=m
250CONFIG_IP_NF_TARGET_LOG=m
251CONFIG_IP_NF_TARGET_ULOG=m
252CONFIG_IP_NF_TARGET_TCPMSS=m
253CONFIG_IP_NF_TARGET_NFQUEUE=m
254CONFIG_IP_NF_NAT=m
255CONFIG_IP_NF_NAT_NEEDED=y
256CONFIG_IP_NF_TARGET_MASQUERADE=m
257CONFIG_IP_NF_TARGET_REDIRECT=m
258CONFIG_IP_NF_TARGET_NETMAP=m
259CONFIG_IP_NF_TARGET_SAME=m
260CONFIG_IP_NF_NAT_SNMP_BASIC=m
261CONFIG_IP_NF_NAT_IRC=m
262CONFIG_IP_NF_NAT_FTP=m
263CONFIG_IP_NF_NAT_TFTP=m
264CONFIG_IP_NF_NAT_AMANDA=m
265CONFIG_IP_NF_MANGLE=m
266CONFIG_IP_NF_TARGET_TOS=m
267CONFIG_IP_NF_TARGET_ECN=m
268CONFIG_IP_NF_TARGET_DSCP=m
269CONFIG_IP_NF_TARGET_MARK=m
270CONFIG_IP_NF_TARGET_CLASSIFY=m
271CONFIG_IP_NF_TARGET_TTL=m
272CONFIG_IP_NF_TARGET_CONNMARK=m
273CONFIG_IP_NF_TARGET_CLUSTERIP=m
274CONFIG_IP_NF_RAW=m
275CONFIG_IP_NF_TARGET_NOTRACK=m
276CONFIG_IP_NF_ARPTABLES=m
277CONFIG_IP_NF_ARPFILTER=m
278CONFIG_IP_NF_ARP_MANGLE=m
279
280#
281# DCCP Configuration (EXPERIMENTAL)
282#
283# CONFIG_IP_DCCP is not set
284
285#
286# SCTP Configuration (EXPERIMENTAL)
287#
288# CONFIG_IP_SCTP is not set
289# CONFIG_ATM is not set
290# CONFIG_BRIDGE is not set
291# CONFIG_VLAN_8021Q is not set
292# CONFIG_DECNET is not set
293CONFIG_LLC=y
294# CONFIG_LLC2 is not set
295# CONFIG_IPX is not set
296# CONFIG_ATALK is not set
297# CONFIG_X25 is not set
298# CONFIG_LAPB is not set
299# CONFIG_NET_DIVERT is not set
300# CONFIG_ECONET is not set
301# CONFIG_WAN_ROUTER is not set
302# CONFIG_NET_SCHED is not set
303CONFIG_NET_CLS_ROUTE=y
304
305#
306# Network testing
307#
308# CONFIG_NET_PKTGEN is not set
309# CONFIG_HAMRADIO is not set
310# CONFIG_IRDA is not set
311# CONFIG_BT is not set
312# CONFIG_IEEE80211 is not set
313
314#
315# Device Drivers
316#
317
318#
319# Generic Driver Options
320#
321CONFIG_STANDALONE=y
322CONFIG_PREVENT_FIRMWARE_BUILD=y
323CONFIG_FW_LOADER=y
324# CONFIG_DEBUG_DRIVER is not set
325
326#
327# Connector - unified userspace <-> kernelspace linker
328#
329# CONFIG_CONNECTOR is not set
330
331#
332# Memory Technology Devices (MTD)
333#
334# CONFIG_MTD is not set
335
336#
337# Parallel port support
338#
339CONFIG_PARPORT=m
340CONFIG_PARPORT_PC=m
341# CONFIG_PARPORT_SERIAL is not set
342# CONFIG_PARPORT_PC_FIFO is not set
343# CONFIG_PARPORT_PC_SUPERIO is not set
344# CONFIG_PARPORT_GSC is not set
345# CONFIG_PARPORT_1284 is not set
346
347#
348# Plug and Play support
349#
350
351#
352# Block devices
353#
354CONFIG_BLK_DEV_FD=m
355# CONFIG_PARIDE is not set
356# CONFIG_BLK_CPQ_DA is not set
357# CONFIG_BLK_CPQ_CISS_DA is not set
358# CONFIG_BLK_DEV_DAC960 is not set
359# CONFIG_BLK_DEV_UMEM is not set
360# CONFIG_BLK_DEV_COW_COMMON is not set
361CONFIG_BLK_DEV_LOOP=y
362# CONFIG_BLK_DEV_CRYPTOLOOP is not set
363CONFIG_BLK_DEV_NBD=m
364# CONFIG_BLK_DEV_SX8 is not set
365# CONFIG_BLK_DEV_UB is not set
366CONFIG_BLK_DEV_RAM=y
367CONFIG_BLK_DEV_RAM_COUNT=16
368CONFIG_BLK_DEV_RAM_SIZE=65536
369CONFIG_BLK_DEV_INITRD=y
370# CONFIG_CDROM_PKTCDVD is not set
371
372#
373# IO Schedulers
374#
375CONFIG_IOSCHED_NOOP=y
376CONFIG_IOSCHED_AS=y
377CONFIG_IOSCHED_DEADLINE=y
378CONFIG_IOSCHED_CFQ=y
379# CONFIG_ATA_OVER_ETH is not set
380
381#
382# ATA/ATAPI/MFM/RLL support
383#
384CONFIG_IDE=y
385CONFIG_BLK_DEV_IDE=y
386
387#
388# Please see Documentation/ide.txt for help/info on IDE drives
389#
390# CONFIG_BLK_DEV_IDE_SATA is not set
391CONFIG_BLK_DEV_IDEDISK=y
392# CONFIG_IDEDISK_MULTI_MODE is not set
393CONFIG_BLK_DEV_IDECD=y
394# CONFIG_BLK_DEV_IDETAPE is not set
395# CONFIG_BLK_DEV_IDEFLOPPY is not set
396# CONFIG_BLK_DEV_IDESCSI is not set
397# CONFIG_IDE_TASK_IOCTL is not set
398
399#
400# IDE chipset support/bugfixes
401#
402CONFIG_IDE_GENERIC=y
403CONFIG_BLK_DEV_IDEPCI=y
404CONFIG_IDEPCI_SHARE_IRQ=y
405# CONFIG_BLK_DEV_OFFBOARD is not set
406CONFIG_BLK_DEV_GENERIC=y
407# CONFIG_BLK_DEV_OPTI621 is not set
408CONFIG_BLK_DEV_SL82C105=y
409CONFIG_BLK_DEV_IDEDMA_PCI=y
410# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
411CONFIG_IDEDMA_PCI_AUTO=y
412# CONFIG_IDEDMA_ONLYDISK is not set
413# CONFIG_BLK_DEV_AEC62XX is not set
414# CONFIG_BLK_DEV_ALI15X3 is not set
415CONFIG_BLK_DEV_AMD74XX=y
416# CONFIG_BLK_DEV_CMD64X is not set
417# CONFIG_BLK_DEV_TRIFLEX is not set
418# CONFIG_BLK_DEV_CY82C693 is not set
419# CONFIG_BLK_DEV_CS5520 is not set
420# CONFIG_BLK_DEV_CS5530 is not set
421# CONFIG_BLK_DEV_HPT34X is not set
422# CONFIG_BLK_DEV_HPT366 is not set
423# CONFIG_BLK_DEV_SC1200 is not set
424# CONFIG_BLK_DEV_PIIX is not set
425# CONFIG_BLK_DEV_IT821X is not set
426# CONFIG_BLK_DEV_NS87415 is not set
427# CONFIG_BLK_DEV_PDC202XX_OLD is not set
428# CONFIG_BLK_DEV_PDC202XX_NEW is not set
429# CONFIG_BLK_DEV_SVWKS is not set
430# CONFIG_BLK_DEV_SIIMAGE is not set
431# CONFIG_BLK_DEV_SLC90E66 is not set
432# CONFIG_BLK_DEV_TRM290 is not set
433# CONFIG_BLK_DEV_VIA82CXXX is not set
434# CONFIG_IDE_ARM is not set
435CONFIG_BLK_DEV_IDEDMA=y
436# CONFIG_IDEDMA_IVB is not set
437CONFIG_IDEDMA_AUTO=y
438# CONFIG_BLK_DEV_HD is not set
439
440#
441# SCSI device support
442#
443# CONFIG_RAID_ATTRS is not set
444CONFIG_SCSI=y
445CONFIG_SCSI_PROC_FS=y
446
447#
448# SCSI support type (disk, tape, CD-ROM)
449#
450CONFIG_BLK_DEV_SD=y
451CONFIG_CHR_DEV_ST=y
452# CONFIG_CHR_DEV_OSST is not set
453CONFIG_BLK_DEV_SR=y
454CONFIG_BLK_DEV_SR_VENDOR=y
455CONFIG_CHR_DEV_SG=y
456# CONFIG_CHR_DEV_SCH is not set
457
458#
459# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
460#
461CONFIG_SCSI_MULTI_LUN=y
462CONFIG_SCSI_CONSTANTS=y
463# CONFIG_SCSI_LOGGING is not set
464
465#
466# SCSI Transport Attributes
467#
468CONFIG_SCSI_SPI_ATTRS=y
469CONFIG_SCSI_FC_ATTRS=y
470CONFIG_SCSI_ISCSI_ATTRS=m
471# CONFIG_SCSI_SAS_ATTRS is not set
472
473#
474# SCSI low-level drivers
475#
476# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
477# CONFIG_SCSI_3W_9XXX is not set
478# CONFIG_SCSI_ACARD is not set
479# CONFIG_SCSI_AACRAID is not set
480# CONFIG_SCSI_AIC7XXX is not set
481# CONFIG_SCSI_AIC7XXX_OLD is not set
482# CONFIG_SCSI_AIC79XX is not set
483# CONFIG_MEGARAID_NEWGEN is not set
484# CONFIG_MEGARAID_LEGACY is not set
485# CONFIG_MEGARAID_SAS is not set
486# CONFIG_SCSI_SATA is not set
487# CONFIG_SCSI_BUSLOGIC is not set
488# CONFIG_SCSI_DMX3191D is not set
489# CONFIG_SCSI_EATA is not set
490# CONFIG_SCSI_FUTURE_DOMAIN is not set
491# CONFIG_SCSI_GDTH is not set
492# CONFIG_SCSI_IPS is not set
493CONFIG_SCSI_IBMVSCSI=y
494# CONFIG_SCSI_INITIO is not set
495# CONFIG_SCSI_INIA100 is not set
496# CONFIG_SCSI_PPA is not set
497# CONFIG_SCSI_IMM is not set
498CONFIG_SCSI_SYM53C8XX_2=y
499CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
500CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
501CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
502# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
503CONFIG_SCSI_IPR=y
504CONFIG_SCSI_IPR_TRACE=y
505CONFIG_SCSI_IPR_DUMP=y
506# CONFIG_SCSI_QLOGIC_FC is not set
507# CONFIG_SCSI_QLOGIC_1280 is not set
508CONFIG_SCSI_QLA2XXX=y
509CONFIG_SCSI_QLA21XX=m
510CONFIG_SCSI_QLA22XX=m
511CONFIG_SCSI_QLA2300=m
512CONFIG_SCSI_QLA2322=m
513CONFIG_SCSI_QLA6312=m
514CONFIG_SCSI_QLA24XX=m
515CONFIG_SCSI_LPFC=m
516# CONFIG_SCSI_DC395x is not set
517# CONFIG_SCSI_DC390T is not set
518# CONFIG_SCSI_DEBUG is not set
519
520#
521# Multi-device support (RAID and LVM)
522#
523CONFIG_MD=y
524CONFIG_BLK_DEV_MD=y
525CONFIG_MD_LINEAR=y
526CONFIG_MD_RAID0=y
527CONFIG_MD_RAID1=y
528CONFIG_MD_RAID10=m
529CONFIG_MD_RAID5=y
530CONFIG_MD_RAID6=m
531CONFIG_MD_MULTIPATH=m
532CONFIG_MD_FAULTY=m
533CONFIG_BLK_DEV_DM=y
534CONFIG_DM_CRYPT=m
535CONFIG_DM_SNAPSHOT=m
536CONFIG_DM_MIRROR=m
537CONFIG_DM_ZERO=m
538CONFIG_DM_MULTIPATH=m
539CONFIG_DM_MULTIPATH_EMC=m
540
541#
542# Fusion MPT device support
543#
544# CONFIG_FUSION is not set
545# CONFIG_FUSION_SPI is not set
546# CONFIG_FUSION_FC is not set
547# CONFIG_FUSION_SAS is not set
548
549#
550# IEEE 1394 (FireWire) support
551#
552# CONFIG_IEEE1394 is not set
553
554#
555# I2O device support
556#
557# CONFIG_I2O is not set
558
559#
560# Macintosh device drivers
561#
562
563#
564# Network device support
565#
566CONFIG_NETDEVICES=y
567CONFIG_DUMMY=m
568CONFIG_BONDING=m
569# CONFIG_EQUALIZER is not set
570CONFIG_TUN=m
571
572#
573# ARCnet devices
574#
575# CONFIG_ARCNET is not set
576
577#
578# PHY device support
579#
580# CONFIG_PHYLIB is not set
581
582#
583# Ethernet (10 or 100Mbit)
584#
585CONFIG_NET_ETHERNET=y
586CONFIG_MII=y
587# CONFIG_HAPPYMEAL is not set
588# CONFIG_SUNGEM is not set
589# CONFIG_CASSINI is not set
590CONFIG_NET_VENDOR_3COM=y
591CONFIG_VORTEX=y
592# CONFIG_TYPHOON is not set
593
594#
595# Tulip family network device support
596#
597# CONFIG_NET_TULIP is not set
598# CONFIG_HP100 is not set
599CONFIG_IBMVETH=y
600CONFIG_NET_PCI=y
601CONFIG_PCNET32=y
602# CONFIG_AMD8111_ETH is not set
603# CONFIG_ADAPTEC_STARFIRE is not set
604# CONFIG_B44 is not set
605# CONFIG_FORCEDETH is not set
606# CONFIG_DGRS is not set
607# CONFIG_EEPRO100 is not set
608CONFIG_E100=y
609# CONFIG_FEALNX is not set
610# CONFIG_NATSEMI is not set
611# CONFIG_NE2K_PCI is not set
612# CONFIG_8139CP is not set
613# CONFIG_8139TOO is not set
614# CONFIG_SIS900 is not set
615# CONFIG_EPIC100 is not set
616# CONFIG_SUNDANCE is not set
617# CONFIG_VIA_RHINE is not set
618# CONFIG_NET_POCKET is not set
619
620#
621# Ethernet (1000 Mbit)
622#
623CONFIG_ACENIC=y
624CONFIG_ACENIC_OMIT_TIGON_I=y
625# CONFIG_DL2K is not set
626CONFIG_E1000=y
627# CONFIG_E1000_NAPI is not set
628# CONFIG_NS83820 is not set
629# CONFIG_HAMACHI is not set
630# CONFIG_YELLOWFIN is not set
631# CONFIG_R8169 is not set
632# CONFIG_SIS190 is not set
633# CONFIG_SKGE is not set
634# CONFIG_SK98LIN is not set
635# CONFIG_VIA_VELOCITY is not set
636CONFIG_TIGON3=y
637# CONFIG_BNX2 is not set
638# CONFIG_MV643XX_ETH is not set
639
640#
641# Ethernet (10000 Mbit)
642#
643# CONFIG_CHELSIO_T1 is not set
644CONFIG_IXGB=m
645# CONFIG_IXGB_NAPI is not set
646CONFIG_S2IO=m
647# CONFIG_S2IO_NAPI is not set
648# CONFIG_2BUFF_MODE is not set
649
650#
651# Token Ring devices
652#
653CONFIG_TR=y
654CONFIG_IBMOL=y
655# CONFIG_3C359 is not set
656# CONFIG_TMS380TR is not set
657
658#
659# Wireless LAN (non-hamradio)
660#
661# CONFIG_NET_RADIO is not set
662
663#
664# Wan interfaces
665#
666# CONFIG_WAN is not set
667# CONFIG_FDDI is not set
668# CONFIG_HIPPI is not set
669# CONFIG_PLIP is not set
670CONFIG_PPP=m
671# CONFIG_PPP_MULTILINK is not set
672# CONFIG_PPP_FILTER is not set
673CONFIG_PPP_ASYNC=m
674CONFIG_PPP_SYNC_TTY=m
675CONFIG_PPP_DEFLATE=m
676CONFIG_PPP_BSDCOMP=m
677CONFIG_PPPOE=m
678# CONFIG_SLIP is not set
679# CONFIG_NET_FC is not set
680# CONFIG_SHAPER is not set
681CONFIG_NETCONSOLE=y
682CONFIG_NETPOLL=y
683CONFIG_NETPOLL_RX=y
684CONFIG_NETPOLL_TRAP=y
685CONFIG_NET_POLL_CONTROLLER=y
686
687#
688# ISDN subsystem
689#
690# CONFIG_ISDN is not set
691
692#
693# Telephony Support
694#
695# CONFIG_PHONE is not set
696
697#
698# Input device support
699#
700CONFIG_INPUT=y
701
702#
703# Userland interfaces
704#
705CONFIG_INPUT_MOUSEDEV=y
706# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
707CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
708CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
709# CONFIG_INPUT_JOYDEV is not set
710# CONFIG_INPUT_TSDEV is not set
711# CONFIG_INPUT_EVDEV is not set
712# CONFIG_INPUT_EVBUG is not set
713
714#
715# Input Device Drivers
716#
717CONFIG_INPUT_KEYBOARD=y
718CONFIG_KEYBOARD_ATKBD=y
719# CONFIG_KEYBOARD_SUNKBD is not set
720# CONFIG_KEYBOARD_LKKBD is not set
721# CONFIG_KEYBOARD_XTKBD is not set
722# CONFIG_KEYBOARD_NEWTON is not set
723CONFIG_INPUT_MOUSE=y
724CONFIG_MOUSE_PS2=y
725# CONFIG_MOUSE_SERIAL is not set
726# CONFIG_MOUSE_VSXXXAA is not set
727# CONFIG_INPUT_JOYSTICK is not set
728# CONFIG_INPUT_TOUCHSCREEN is not set
729CONFIG_INPUT_MISC=y
730CONFIG_INPUT_PCSPKR=m
731# CONFIG_INPUT_UINPUT is not set
732
733#
734# Hardware I/O ports
735#
736CONFIG_SERIO=y
737CONFIG_SERIO_I8042=y
738# CONFIG_SERIO_SERPORT is not set
739# CONFIG_SERIO_PARKBD is not set
740# CONFIG_SERIO_PCIPS2 is not set
741CONFIG_SERIO_LIBPS2=y
742# CONFIG_SERIO_RAW is not set
743# CONFIG_GAMEPORT is not set
744
745#
746# Character devices
747#
748CONFIG_VT=y
749CONFIG_VT_CONSOLE=y
750CONFIG_HW_CONSOLE=y
751# CONFIG_SERIAL_NONSTANDARD is not set
752
753#
754# Serial drivers
755#
756CONFIG_SERIAL_8250=y
757CONFIG_SERIAL_8250_CONSOLE=y
758CONFIG_SERIAL_8250_NR_UARTS=4
759# CONFIG_SERIAL_8250_EXTENDED is not set
760
761#
762# Non-8250 serial port support
763#
764CONFIG_SERIAL_CORE=y
765CONFIG_SERIAL_CORE_CONSOLE=y
766CONFIG_SERIAL_ICOM=m
767# CONFIG_SERIAL_JSM is not set
768CONFIG_UNIX98_PTYS=y
769CONFIG_LEGACY_PTYS=y
770CONFIG_LEGACY_PTY_COUNT=256
771# CONFIG_PRINTER is not set
772# CONFIG_PPDEV is not set
773# CONFIG_TIPAR is not set
774CONFIG_HVC_CONSOLE=y
775CONFIG_HVCS=m
776
777#
778# IPMI
779#
780# CONFIG_IPMI_HANDLER is not set
781
782#
783# Watchdog Cards
784#
785# CONFIG_WATCHDOG is not set
786# CONFIG_RTC is not set
787# CONFIG_DTLK is not set
788# CONFIG_R3964 is not set
789# CONFIG_APPLICOM is not set
790
791#
792# Ftape, the floppy tape device driver
793#
794# CONFIG_AGP is not set
795# CONFIG_DRM is not set
796CONFIG_RAW_DRIVER=y
797CONFIG_MAX_RAW_DEVS=1024
798# CONFIG_HANGCHECK_TIMER is not set
799
800#
801# TPM devices
802#
803# CONFIG_TCG_TPM is not set
804
805#
806# I2C support
807#
808CONFIG_I2C=y
809# CONFIG_I2C_CHARDEV is not set
810
811#
812# I2C Algorithms
813#
814CONFIG_I2C_ALGOBIT=y
815# CONFIG_I2C_ALGOPCF is not set
816# CONFIG_I2C_ALGOPCA is not set
817
818#
819# I2C Hardware Bus support
820#
821# CONFIG_I2C_ALI1535 is not set
822# CONFIG_I2C_ALI1563 is not set
823# CONFIG_I2C_ALI15X3 is not set
824# CONFIG_I2C_AMD756 is not set
825# CONFIG_I2C_AMD8111 is not set
826# CONFIG_I2C_I801 is not set
827# CONFIG_I2C_I810 is not set
828# CONFIG_I2C_PIIX4 is not set
829# CONFIG_I2C_NFORCE2 is not set
830# CONFIG_I2C_PARPORT is not set
831# CONFIG_I2C_PARPORT_LIGHT is not set
832# CONFIG_I2C_PROSAVAGE is not set
833# CONFIG_I2C_SAVAGE4 is not set
834# CONFIG_SCx200_ACB is not set
835# CONFIG_I2C_SIS5595 is not set
836# CONFIG_I2C_SIS630 is not set
837# CONFIG_I2C_SIS96X is not set
838# CONFIG_I2C_STUB is not set
839# CONFIG_I2C_VIA is not set
840# CONFIG_I2C_VIAPRO is not set
841# CONFIG_I2C_VOODOO3 is not set
842# CONFIG_I2C_PCA_ISA is not set
843
844#
845# Miscellaneous I2C Chip support
846#
847# CONFIG_SENSORS_DS1337 is not set
848# CONFIG_SENSORS_DS1374 is not set
849# CONFIG_SENSORS_EEPROM is not set
850# CONFIG_SENSORS_PCF8574 is not set
851# CONFIG_SENSORS_PCA9539 is not set
852# CONFIG_SENSORS_PCF8591 is not set
853# CONFIG_SENSORS_RTC8564 is not set
854# CONFIG_SENSORS_MAX6875 is not set
855# CONFIG_I2C_DEBUG_CORE is not set
856# CONFIG_I2C_DEBUG_ALGO is not set
857# CONFIG_I2C_DEBUG_BUS is not set
858# CONFIG_I2C_DEBUG_CHIP is not set
859
860#
861# Dallas's 1-wire bus
862#
863# CONFIG_W1 is not set
864
865#
866# Hardware Monitoring support
867#
868# CONFIG_HWMON is not set
869# CONFIG_HWMON_VID is not set
870
871#
872# Misc devices
873#
874
875#
876# Multimedia Capabilities Port drivers
877#
878
879#
880# Multimedia devices
881#
882# CONFIG_VIDEO_DEV is not set
883
884#
885# Digital Video Broadcasting Devices
886#
887# CONFIG_DVB is not set
888
889#
890# Graphics support
891#
892CONFIG_FB=y
893CONFIG_FB_CFB_FILLRECT=y
894CONFIG_FB_CFB_COPYAREA=y
895CONFIG_FB_CFB_IMAGEBLIT=y
896CONFIG_FB_SOFT_CURSOR=y
897CONFIG_FB_MACMODES=y
898CONFIG_FB_MODE_HELPERS=y
899CONFIG_FB_TILEBLITTING=y
900# CONFIG_FB_CIRRUS is not set
901# CONFIG_FB_PM2 is not set
902# CONFIG_FB_CYBER2000 is not set
903CONFIG_FB_OF=y
904# CONFIG_FB_CT65550 is not set
905# CONFIG_FB_ASILIANT is not set
906# CONFIG_FB_IMSTT is not set
907# CONFIG_FB_VGA16 is not set
908# CONFIG_FB_NVIDIA is not set
909# CONFIG_FB_RIVA is not set
910CONFIG_FB_MATROX=y
911CONFIG_FB_MATROX_MILLENIUM=y
912CONFIG_FB_MATROX_MYSTIQUE=y
913CONFIG_FB_MATROX_G=y
914# CONFIG_FB_MATROX_I2C is not set
915CONFIG_FB_MATROX_MULTIHEAD=y
916# CONFIG_FB_RADEON_OLD is not set
917CONFIG_FB_RADEON=y
918CONFIG_FB_RADEON_I2C=y
919# CONFIG_FB_RADEON_DEBUG is not set
920# CONFIG_FB_ATY128 is not set
921# CONFIG_FB_ATY is not set
922# CONFIG_FB_SAVAGE is not set
923# CONFIG_FB_SIS is not set
924# CONFIG_FB_NEOMAGIC is not set
925# CONFIG_FB_KYRO is not set
926# CONFIG_FB_3DFX is not set
927# CONFIG_FB_VOODOO1 is not set
928# CONFIG_FB_CYBLA is not set
929# CONFIG_FB_TRIDENT is not set
930# CONFIG_FB_S1D13XXX is not set
931# CONFIG_FB_VIRTUAL is not set
932
933#
934# Console display driver support
935#
936# CONFIG_VGA_CONSOLE is not set
937CONFIG_DUMMY_CONSOLE=y
938CONFIG_FRAMEBUFFER_CONSOLE=y
939# CONFIG_FONTS is not set
940CONFIG_FONT_8x8=y
941CONFIG_FONT_8x16=y
942
943#
944# Logo configuration
945#
946CONFIG_LOGO=y
947CONFIG_LOGO_LINUX_MONO=y
948CONFIG_LOGO_LINUX_VGA16=y
949CONFIG_LOGO_LINUX_CLUT224=y
950CONFIG_BACKLIGHT_LCD_SUPPORT=y
951CONFIG_BACKLIGHT_CLASS_DEVICE=m
952CONFIG_BACKLIGHT_DEVICE=y
953CONFIG_LCD_CLASS_DEVICE=m
954CONFIG_LCD_DEVICE=y
955
956#
957# Sound
958#
959# CONFIG_SOUND is not set
960
961#
962# USB support
963#
964CONFIG_USB_ARCH_HAS_HCD=y
965CONFIG_USB_ARCH_HAS_OHCI=y
966CONFIG_USB=y
967# CONFIG_USB_DEBUG is not set
968
969#
970# Miscellaneous USB options
971#
972CONFIG_USB_DEVICEFS=y
973# CONFIG_USB_BANDWIDTH is not set
974# CONFIG_USB_DYNAMIC_MINORS is not set
975# CONFIG_USB_OTG is not set
976
977#
978# USB Host Controller Drivers
979#
980CONFIG_USB_EHCI_HCD=y
981# CONFIG_USB_EHCI_SPLIT_ISO is not set
982# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
983# CONFIG_USB_ISP116X_HCD is not set
984CONFIG_USB_OHCI_HCD=y
985# CONFIG_USB_OHCI_BIG_ENDIAN is not set
986CONFIG_USB_OHCI_LITTLE_ENDIAN=y
987# CONFIG_USB_UHCI_HCD is not set
988# CONFIG_USB_SL811_HCD is not set
989
990#
991# USB Device Class drivers
992#
993# CONFIG_USB_BLUETOOTH_TTY is not set
994# CONFIG_USB_ACM is not set
995# CONFIG_USB_PRINTER is not set
996
997#
998# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
999#
1000CONFIG_USB_STORAGE=y
1001# CONFIG_USB_STORAGE_DEBUG is not set
1002# CONFIG_USB_STORAGE_DATAFAB is not set
1003# CONFIG_USB_STORAGE_FREECOM is not set
1004# CONFIG_USB_STORAGE_ISD200 is not set
1005# CONFIG_USB_STORAGE_DPCM is not set
1006# CONFIG_USB_STORAGE_USBAT is not set
1007# CONFIG_USB_STORAGE_SDDR09 is not set
1008# CONFIG_USB_STORAGE_SDDR55 is not set
1009# CONFIG_USB_STORAGE_JUMPSHOT is not set
1010
1011#
1012# USB Input Devices
1013#
1014CONFIG_USB_HID=y
1015CONFIG_USB_HIDINPUT=y
1016# CONFIG_HID_FF is not set
1017CONFIG_USB_HIDDEV=y
1018# CONFIG_USB_AIPTEK is not set
1019# CONFIG_USB_WACOM is not set
1020# CONFIG_USB_ACECAD is not set
1021# CONFIG_USB_KBTAB is not set
1022# CONFIG_USB_POWERMATE is not set
1023# CONFIG_USB_MTOUCH is not set
1024# CONFIG_USB_ITMTOUCH is not set
1025# CONFIG_USB_EGALAX is not set
1026# CONFIG_USB_YEALINK is not set
1027# CONFIG_USB_XPAD is not set
1028# CONFIG_USB_ATI_REMOTE is not set
1029# CONFIG_USB_KEYSPAN_REMOTE is not set
1030# CONFIG_USB_APPLETOUCH is not set
1031
1032#
1033# USB Imaging devices
1034#
1035# CONFIG_USB_MDC800 is not set
1036# CONFIG_USB_MICROTEK is not set
1037
1038#
1039# USB Multimedia devices
1040#
1041# CONFIG_USB_DABUSB is not set
1042
1043#
1044# Video4Linux support is needed for USB Multimedia device support
1045#
1046
1047#
1048# USB Network Adapters
1049#
1050# CONFIG_USB_CATC is not set
1051# CONFIG_USB_KAWETH is not set
1052# CONFIG_USB_PEGASUS is not set
1053# CONFIG_USB_RTL8150 is not set
1054# CONFIG_USB_USBNET is not set
1055CONFIG_USB_MON=y
1056
1057#
1058# USB port drivers
1059#
1060# CONFIG_USB_USS720 is not set
1061
1062#
1063# USB Serial Converter support
1064#
1065# CONFIG_USB_SERIAL is not set
1066
1067#
1068# USB Miscellaneous drivers
1069#
1070# CONFIG_USB_EMI62 is not set
1071# CONFIG_USB_EMI26 is not set
1072# CONFIG_USB_AUERSWALD is not set
1073# CONFIG_USB_RIO500 is not set
1074# CONFIG_USB_LEGOTOWER is not set
1075# CONFIG_USB_LCD is not set
1076# CONFIG_USB_LED is not set
1077# CONFIG_USB_CYTHERM is not set
1078# CONFIG_USB_PHIDGETKIT is not set
1079# CONFIG_USB_PHIDGETSERVO is not set
1080# CONFIG_USB_IDMOUSE is not set
1081# CONFIG_USB_SISUSBVGA is not set
1082# CONFIG_USB_LD is not set
1083# CONFIG_USB_TEST is not set
1084
1085#
1086# USB DSL modem support
1087#
1088
1089#
1090# USB Gadget Support
1091#
1092# CONFIG_USB_GADGET is not set
1093
1094#
1095# MMC/SD Card support
1096#
1097# CONFIG_MMC is not set
1098
1099#
1100# InfiniBand support
1101#
1102CONFIG_INFINIBAND=m
1103# CONFIG_INFINIBAND_USER_MAD is not set
1104# CONFIG_INFINIBAND_USER_ACCESS is not set
1105CONFIG_INFINIBAND_MTHCA=m
1106# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
1107CONFIG_INFINIBAND_IPOIB=m
1108# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
1109
1110#
1111# SN Devices
1112#
1113
1114#
1115# File systems
1116#
1117CONFIG_EXT2_FS=y
1118CONFIG_EXT2_FS_XATTR=y
1119CONFIG_EXT2_FS_POSIX_ACL=y
1120CONFIG_EXT2_FS_SECURITY=y
1121CONFIG_EXT2_FS_XIP=y
1122CONFIG_FS_XIP=y
1123CONFIG_EXT3_FS=y
1124CONFIG_EXT3_FS_XATTR=y
1125CONFIG_EXT3_FS_POSIX_ACL=y
1126CONFIG_EXT3_FS_SECURITY=y
1127CONFIG_JBD=y
1128# CONFIG_JBD_DEBUG is not set
1129CONFIG_FS_MBCACHE=y
1130CONFIG_REISERFS_FS=y
1131# CONFIG_REISERFS_CHECK is not set
1132# CONFIG_REISERFS_PROC_INFO is not set
1133CONFIG_REISERFS_FS_XATTR=y
1134CONFIG_REISERFS_FS_POSIX_ACL=y
1135CONFIG_REISERFS_FS_SECURITY=y
1136CONFIG_JFS_FS=m
1137CONFIG_JFS_POSIX_ACL=y
1138CONFIG_JFS_SECURITY=y
1139# CONFIG_JFS_DEBUG is not set
1140# CONFIG_JFS_STATISTICS is not set
1141CONFIG_FS_POSIX_ACL=y
1142CONFIG_XFS_FS=m
1143CONFIG_XFS_EXPORT=y
1144# CONFIG_XFS_QUOTA is not set
1145CONFIG_XFS_SECURITY=y
1146CONFIG_XFS_POSIX_ACL=y
1147# CONFIG_XFS_RT is not set
1148# CONFIG_MINIX_FS is not set
1149# CONFIG_ROMFS_FS is not set
1150CONFIG_INOTIFY=y
1151# CONFIG_QUOTA is not set
1152CONFIG_DNOTIFY=y
1153CONFIG_AUTOFS_FS=m
1154# CONFIG_AUTOFS4_FS is not set
1155# CONFIG_FUSE_FS is not set
1156
1157#
1158# CD-ROM/DVD Filesystems
1159#
1160CONFIG_ISO9660_FS=y
1161CONFIG_JOLIET=y
1162CONFIG_ZISOFS=y
1163CONFIG_ZISOFS_FS=y
1164CONFIG_UDF_FS=m
1165CONFIG_UDF_NLS=y
1166
1167#
1168# DOS/FAT/NT Filesystems
1169#
1170CONFIG_FAT_FS=y
1171CONFIG_MSDOS_FS=y
1172CONFIG_VFAT_FS=y
1173CONFIG_FAT_DEFAULT_CODEPAGE=437
1174CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1175# CONFIG_NTFS_FS is not set
1176
1177#
1178# Pseudo filesystems
1179#
1180CONFIG_PROC_FS=y
1181CONFIG_PROC_KCORE=y
1182CONFIG_SYSFS=y
1183CONFIG_TMPFS=y
1184CONFIG_HUGETLBFS=y
1185CONFIG_HUGETLB_PAGE=y
1186CONFIG_RAMFS=y
1187# CONFIG_RELAYFS_FS is not set
1188
1189#
1190# Miscellaneous filesystems
1191#
1192# CONFIG_ADFS_FS is not set
1193# CONFIG_AFFS_FS is not set
1194# CONFIG_HFS_FS is not set
1195# CONFIG_HFSPLUS_FS is not set
1196# CONFIG_BEFS_FS is not set
1197# CONFIG_BFS_FS is not set
1198# CONFIG_EFS_FS is not set
1199CONFIG_CRAMFS=y
1200# CONFIG_VXFS_FS is not set
1201# CONFIG_HPFS_FS is not set
1202# CONFIG_QNX4FS_FS is not set
1203# CONFIG_SYSV_FS is not set
1204# CONFIG_UFS_FS is not set
1205
1206#
1207# Network File Systems
1208#
1209CONFIG_NFS_FS=y
1210CONFIG_NFS_V3=y
1211CONFIG_NFS_V3_ACL=y
1212CONFIG_NFS_V4=y
1213# CONFIG_NFS_DIRECTIO is not set
1214CONFIG_NFSD=y
1215CONFIG_NFSD_V2_ACL=y
1216CONFIG_NFSD_V3=y
1217CONFIG_NFSD_V3_ACL=y
1218CONFIG_NFSD_V4=y
1219CONFIG_NFSD_TCP=y
1220CONFIG_LOCKD=y
1221CONFIG_LOCKD_V4=y
1222CONFIG_EXPORTFS=y
1223CONFIG_NFS_ACL_SUPPORT=y
1224CONFIG_NFS_COMMON=y
1225CONFIG_SUNRPC=y
1226CONFIG_SUNRPC_GSS=y
1227CONFIG_RPCSEC_GSS_KRB5=y
1228CONFIG_RPCSEC_GSS_SPKM3=m
1229# CONFIG_SMB_FS is not set
1230CONFIG_CIFS=m
1231# CONFIG_CIFS_STATS is not set
1232CONFIG_CIFS_XATTR=y
1233CONFIG_CIFS_POSIX=y
1234# CONFIG_CIFS_EXPERIMENTAL is not set
1235# CONFIG_NCP_FS is not set
1236# CONFIG_CODA_FS is not set
1237# CONFIG_AFS_FS is not set
1238# CONFIG_9P_FS is not set
1239
1240#
1241# Partition Types
1242#
1243# CONFIG_PARTITION_ADVANCED is not set
1244CONFIG_MSDOS_PARTITION=y
1245
1246#
1247# Native Language Support
1248#
1249CONFIG_NLS=y
1250CONFIG_NLS_DEFAULT="iso8859-1"
1251CONFIG_NLS_CODEPAGE_437=y
1252# CONFIG_NLS_CODEPAGE_737 is not set
1253# CONFIG_NLS_CODEPAGE_775 is not set
1254# CONFIG_NLS_CODEPAGE_850 is not set
1255# CONFIG_NLS_CODEPAGE_852 is not set
1256# CONFIG_NLS_CODEPAGE_855 is not set
1257# CONFIG_NLS_CODEPAGE_857 is not set
1258# CONFIG_NLS_CODEPAGE_860 is not set
1259# CONFIG_NLS_CODEPAGE_861 is not set
1260# CONFIG_NLS_CODEPAGE_862 is not set
1261# CONFIG_NLS_CODEPAGE_863 is not set
1262# CONFIG_NLS_CODEPAGE_864 is not set
1263# CONFIG_NLS_CODEPAGE_865 is not set
1264# CONFIG_NLS_CODEPAGE_866 is not set
1265# CONFIG_NLS_CODEPAGE_869 is not set
1266# CONFIG_NLS_CODEPAGE_936 is not set
1267# CONFIG_NLS_CODEPAGE_950 is not set
1268# CONFIG_NLS_CODEPAGE_932 is not set
1269# CONFIG_NLS_CODEPAGE_949 is not set
1270# CONFIG_NLS_CODEPAGE_874 is not set
1271# CONFIG_NLS_ISO8859_8 is not set
1272# CONFIG_NLS_CODEPAGE_1250 is not set
1273# CONFIG_NLS_CODEPAGE_1251 is not set
1274CONFIG_NLS_ASCII=y
1275CONFIG_NLS_ISO8859_1=y
1276# CONFIG_NLS_ISO8859_2 is not set
1277# CONFIG_NLS_ISO8859_3 is not set
1278# CONFIG_NLS_ISO8859_4 is not set
1279# CONFIG_NLS_ISO8859_5 is not set
1280# CONFIG_NLS_ISO8859_6 is not set
1281# CONFIG_NLS_ISO8859_7 is not set
1282# CONFIG_NLS_ISO8859_9 is not set
1283# CONFIG_NLS_ISO8859_13 is not set
1284# CONFIG_NLS_ISO8859_14 is not set
1285# CONFIG_NLS_ISO8859_15 is not set
1286# CONFIG_NLS_KOI8_R is not set
1287# CONFIG_NLS_KOI8_U is not set
1288# CONFIG_NLS_UTF8 is not set
1289
1290#
1291# Profiling support
1292#
1293CONFIG_PROFILING=y
1294CONFIG_OPROFILE=y
1295
1296#
1297# Kernel hacking
1298#
1299# CONFIG_PRINTK_TIME is not set
1300CONFIG_DEBUG_KERNEL=y
1301CONFIG_MAGIC_SYSRQ=y
1302CONFIG_LOG_BUF_SHIFT=17
1303CONFIG_DETECT_SOFTLOCKUP=y
1304# CONFIG_SCHEDSTATS is not set
1305# CONFIG_DEBUG_SLAB is not set
1306# CONFIG_DEBUG_SPINLOCK is not set
1307# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1308# CONFIG_DEBUG_KOBJECT is not set
1309# CONFIG_DEBUG_INFO is not set
1310CONFIG_DEBUG_FS=y
1311CONFIG_DEBUG_STACKOVERFLOW=y
1312# CONFIG_KPROBES is not set
1313CONFIG_DEBUG_STACK_USAGE=y
1314CONFIG_DEBUGGER=y
1315CONFIG_XMON=y
1316CONFIG_XMON_DEFAULT=y
1317# CONFIG_PPCDBG is not set
1318CONFIG_IRQSTACKS=y
1319
1320#
1321# Security options
1322#
1323# CONFIG_KEYS is not set
1324# CONFIG_SECURITY is not set
1325
1326#
1327# Cryptographic options
1328#
1329CONFIG_CRYPTO=y
1330CONFIG_CRYPTO_HMAC=y
1331CONFIG_CRYPTO_NULL=m
1332CONFIG_CRYPTO_MD4=m
1333CONFIG_CRYPTO_MD5=y
1334CONFIG_CRYPTO_SHA1=m
1335CONFIG_CRYPTO_SHA256=m
1336CONFIG_CRYPTO_SHA512=m
1337CONFIG_CRYPTO_WP512=m
1338CONFIG_CRYPTO_TGR192=m
1339CONFIG_CRYPTO_DES=y
1340CONFIG_CRYPTO_BLOWFISH=m
1341CONFIG_CRYPTO_TWOFISH=m
1342CONFIG_CRYPTO_SERPENT=m
1343CONFIG_CRYPTO_AES=m
1344CONFIG_CRYPTO_CAST5=m
1345CONFIG_CRYPTO_CAST6=m
1346CONFIG_CRYPTO_TEA=m
1347CONFIG_CRYPTO_ARC4=m
1348CONFIG_CRYPTO_KHAZAD=m
1349CONFIG_CRYPTO_ANUBIS=m
1350CONFIG_CRYPTO_DEFLATE=m
1351CONFIG_CRYPTO_MICHAEL_MIC=m
1352CONFIG_CRYPTO_CRC32C=m
1353CONFIG_CRYPTO_TEST=m
1354
1355#
1356# Hardware crypto devices
1357#
1358
1359#
1360# Library routines
1361#
1362CONFIG_CRC_CCITT=m
1363# CONFIG_CRC16 is not set
1364CONFIG_CRC32=y
1365CONFIG_LIBCRC32C=m
1366CONFIG_ZLIB_INFLATE=y
1367CONFIG_ZLIB_DEFLATE=m
1368CONFIG_TEXTSEARCH=y
1369CONFIG_TEXTSEARCH_KMP=m
1370CONFIG_TEXTSEARCH_BM=m
1371CONFIG_TEXTSEARCH_FSM=m
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile
deleted file mode 100644
index e876c213f5ce..000000000000
--- a/arch/ppc64/kernel/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
1#
2# Makefile for the linux ppc64 kernel.
3#
4
5obj-y += idle.o align.o
6
7obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-26 09:18:43 -0500