aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MAINTAINERS6
-rw-r--r--arch/mips/Kconfig32
-rw-r--r--arch/mips/au1000/Kconfig1
-rw-r--r--arch/mips/au1000/common/gpio.c12
-rw-r--r--arch/mips/configs/bigsur_defconfig4
-rw-r--r--arch/mips/configs/capcella_defconfig417
-rw-r--r--arch/mips/configs/cobalt_defconfig341
-rw-r--r--arch/mips/configs/e55_defconfig319
-rw-r--r--arch/mips/configs/ip22_defconfig373
-rw-r--r--arch/mips/configs/ip27_defconfig394
-rw-r--r--arch/mips/configs/jmr3927_defconfig396
-rw-r--r--arch/mips/configs/malta_defconfig426
-rw-r--r--arch/mips/configs/mpc30x_defconfig572
-rw-r--r--arch/mips/configs/rbhma4200_defconfig332
-rw-r--r--arch/mips/configs/rbhma4500_defconfig239
-rw-r--r--arch/mips/configs/sb1250-swarm_defconfig4
-rw-r--r--arch/mips/configs/tb0219_defconfig504
-rw-r--r--arch/mips/configs/tb0226_defconfig548
-rw-r--r--arch/mips/configs/tb0287_defconfig592
-rw-r--r--arch/mips/configs/workpad_defconfig507
-rw-r--r--arch/mips/defconfig373
-rw-r--r--arch/mips/jmr3927/rbhma3100/irq.c48
-rw-r--r--arch/mips/jmr3927/rbhma3100/setup.c13
-rw-r--r--arch/mips/kernel/Makefile1
-rw-r--r--arch/mips/kernel/asm-offsets.c4
-rw-r--r--arch/mips/kernel/cpu-bugs64.c2
-rw-r--r--arch/mips/kernel/irixsig.c2
-rw-r--r--arch/mips/kernel/irq_txx9.c192
-rw-r--r--arch/mips/kernel/machine_kexec.c5
-rw-r--r--arch/mips/kernel/mips-mt.c7
-rw-r--r--arch/mips/kernel/smp-mt.c6
-rw-r--r--arch/mips/kernel/smtc.c2
-rw-r--r--arch/mips/kernel/traps.c31
-rw-r--r--arch/mips/kernel/vmlinux.lds.S7
-rw-r--r--arch/mips/lib/Makefile2
-rw-r--r--arch/mips/lib/cmpdi2.c27
-rw-r--r--arch/mips/mips-boards/malta/malta_smtc.c16
-rw-r--r--arch/mips/mips-boards/sim/sim_int.c88
-rw-r--r--arch/mips/mipssim/sim_smp.c6
-rw-r--r--arch/mips/mm/init.c9
-rw-r--r--arch/mips/pci/pci.c9
-rw-r--r--arch/mips/philips/pnx8550/common/Kconfig1
-rw-r--r--arch/mips/pmc-sierra/yosemite/smp.c6
-rw-r--r--arch/mips/qemu/q-smp.c6
-rw-r--r--arch/mips/sgi-ip22/ip22-mc.c2
-rw-r--r--arch/mips/sgi-ip22/ip22-setup.c1
-rw-r--r--arch/mips/sgi-ip27/ip27-irq.c8
-rw-r--r--arch/mips/sgi-ip27/ip27-smp.c4
-rw-r--r--arch/mips/sibyte/bcm1480/irq.c4
-rw-r--r--arch/mips/sibyte/cfe/console.c2
-rw-r--r--arch/mips/sibyte/cfe/smp.c6
-rw-r--r--arch/mips/sibyte/sb1250/irq.c4
-rw-r--r--arch/mips/sni/pcimt_scache.c37
-rw-r--r--arch/mips/sni/reset.c4
-rw-r--r--arch/mips/sni/setup.c2
-rw-r--r--arch/mips/tx4927/common/Makefile2
-rw-r--r--arch/mips/tx4927/common/tx4927_irq.c395
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/Makefile2
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c171
-rw-r--r--arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c11
-rw-r--r--arch/mips/tx4938/common/Makefile1
-rw-r--r--arch/mips/tx4938/common/irq.c279
-rw-r--r--arch/mips/tx4938/toshiba_rbtx4938/Makefile2
-rw-r--r--arch/mips/tx4938/toshiba_rbtx4938/irq.c2
-rw-r--r--arch/mips/tx4938/toshiba_rbtx4938/setup.c11
-rw-r--r--arch/parisc/kernel/sys_parisc32.c141
-rw-r--r--arch/parisc/kernel/syscall_table.S4
-rw-r--r--arch/parisc/kernel/vmlinux.lds.S2
-rw-r--r--arch/powerpc/configs/cell_defconfig220
-rw-r--r--arch/powerpc/mm/slb.c36
-rw-r--r--arch/powerpc/platforms/cell/cbe_regs.h8
-rw-r--r--arch/powerpc/platforms/cell/cbe_thermal.c6
-rw-r--r--arch/powerpc/platforms/cell/pervasive.c26
-rw-r--r--arch/powerpc/platforms/cell/spu_manage.c2
-rw-r--r--arch/powerpc/platforms/pasemi/iommu.c6
-rw-r--r--arch/powerpc/sysdev/axonram.c46
-rw-r--r--drivers/acpi/Kconfig6
-rw-r--r--drivers/char/lcd.c1
-rw-r--r--drivers/dma/ioatdma.c18
-rw-r--r--drivers/isdn/i4l/isdn_bsdcomp.c5
-rw-r--r--drivers/isdn/i4l/isdn_common.c2
-rw-r--r--drivers/macintosh/adb.c4
-rw-r--r--drivers/macintosh/via-pmu.c34
-rw-r--r--drivers/net/bsd_comp.c6
-rw-r--r--drivers/net/eql.c2
-rw-r--r--drivers/net/irda/kingsun-sir.c4
-rw-r--r--drivers/net/slip.c2
-rw-r--r--drivers/rtc/rtc-rs5c348.c2
-rw-r--r--drivers/video/console/Kconfig2
-rw-r--r--drivers/video/console/sticore.c14
-rw-r--r--include/asm-mips/bcache.h1
-rw-r--r--include/asm-mips/edac.h17
-rw-r--r--include/asm-mips/gt64240.h1235
-rw-r--r--include/asm-mips/jmr3927/jmr3927.h3
-rw-r--r--include/asm-mips/jmr3927/tx3927.h36
-rw-r--r--include/asm-mips/mach-generic/ide.h76
-rw-r--r--include/asm-mips/marvell.h59
-rw-r--r--include/asm-mips/pgtable-32.h16
-rw-r--r--include/asm-mips/pgtable.h12
-rw-r--r--include/asm-mips/smtc.h10
-rw-r--r--include/asm-mips/stacktrace.h6
-rw-r--r--include/asm-mips/tx4927/toshiba_rbtx4927.h2
-rw-r--r--include/asm-mips/tx4927/tx4927.h49
-rw-r--r--include/asm-mips/tx4927/tx4927_pci.h23
-rw-r--r--include/asm-mips/tx4938/rbtx4938.h25
-rw-r--r--include/asm-mips/tx4938/tx4938.h41
-rw-r--r--include/asm-mips/txx9irq.h30
-rw-r--r--include/asm-parisc/io.h10
-rw-r--r--include/asm-parisc/vga.h6
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/if_pppol2tp.h4
-rw-r--r--include/linux/pmu.h2
-rw-r--r--init/main.c2
-rw-r--r--kernel/workqueue.c2
-rw-r--r--net/8021q/vlan_dev.c12
-rw-r--r--net/bridge/br_netfilter.c12
-rw-r--r--net/core/dev_mcast.c14
-rw-r--r--net/core/neighbour.c3
-rw-r--r--net/ipv4/ah4.c2
-rw-r--r--net/ipv4/ip_sockglue.c4
-rw-r--r--net/ipv4/tcp_input.c10
-rw-r--r--net/ipv6/ipv6_sockglue.c4
122 files changed, 2584 insertions, 7576 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 10a6f57776b2..48ca8b47150d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2661,6 +2661,12 @@ L: netdev@vger.kernel.org
2661T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git 2661T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
2662S: Maintained 2662S: Maintained
2663 2663
2664NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
2665P: Paul Moore
2666M: paul.moore@hp.com
2667L: netdev@vger.kernel.org
2668S: Maintained
2669
2664NETWORKING [WIRELESS] 2670NETWORKING [WIRELESS]
2665P: John W. Linville 2671P: John W. Linville
2666M: linville@tuxdriver.com 2672M: linville@tuxdriver.com
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3b404b7dfa39..04797b289c21 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -28,7 +28,6 @@ config BASLER_EXCITE
28 select MIPS_RM9122 28 select MIPS_RM9122
29 select SYS_HAS_CPU_RM9000 29 select SYS_HAS_CPU_RM9000
30 select SYS_SUPPORTS_32BIT_KERNEL 30 select SYS_SUPPORTS_32BIT_KERNEL
31 select SYS_SUPPORTS_64BIT_KERNEL
32 select SYS_SUPPORTS_BIG_ENDIAN 31 select SYS_SUPPORTS_BIG_ENDIAN
33 select SYS_SUPPORTS_KGDB 32 select SYS_SUPPORTS_KGDB
34 help 33 help
@@ -126,6 +125,7 @@ config LEMOTE_FULONG
126 select SYS_SUPPORTS_HIGHMEM 125 select SYS_SUPPORTS_HIGHMEM
127 select SYS_HAS_EARLY_PRINTK 126 select SYS_HAS_EARLY_PRINTK
128 select GENERIC_HARDIRQS_NO__DO_IRQ 127 select GENERIC_HARDIRQS_NO__DO_IRQ
128 select GENERIC_ISA_DMA_SUPPORT_BROKEN
129 select CPU_HAS_WB 129 select CPU_HAS_WB
130 help 130 help
131 Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and 131 Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and
@@ -192,8 +192,7 @@ config MIPS_MALTA
192 board. 192 board.
193 193
194config MIPS_SEAD 194config MIPS_SEAD
195 bool "MIPS SEAD board (EXPERIMENTAL)" 195 bool "MIPS SEAD board"
196 depends on EXPERIMENTAL
197 select IRQ_CPU 196 select IRQ_CPU
198 select DMA_NONCOHERENT 197 select DMA_NONCOHERENT
199 select SYS_HAS_EARLY_PRINTK 198 select SYS_HAS_EARLY_PRINTK
@@ -528,6 +527,7 @@ config TOSHIBA_JMR3927
528 select DMA_NONCOHERENT 527 select DMA_NONCOHERENT
529 select HW_HAS_PCI 528 select HW_HAS_PCI
530 select MIPS_TX3927 529 select MIPS_TX3927
530 select IRQ_TXX9
531 select SWAP_IO_SPACE 531 select SWAP_IO_SPACE
532 select SYS_HAS_CPU_TX39XX 532 select SYS_HAS_CPU_TX39XX
533 select SYS_SUPPORTS_32BIT_KERNEL 533 select SYS_SUPPORTS_32BIT_KERNEL
@@ -540,7 +540,9 @@ config TOSHIBA_RBTX4927
540 select DMA_NONCOHERENT 540 select DMA_NONCOHERENT
541 select HAS_TXX9_SERIAL 541 select HAS_TXX9_SERIAL
542 select HW_HAS_PCI 542 select HW_HAS_PCI
543 select I8259 543 select IRQ_CPU
544 select IRQ_TXX9
545 select I8259 if TOSHIBA_FPCIB0
544 select SWAP_IO_SPACE 546 select SWAP_IO_SPACE
545 select SYS_HAS_CPU_TX49XX 547 select SYS_HAS_CPU_TX49XX
546 select SYS_SUPPORTS_32BIT_KERNEL 548 select SYS_SUPPORTS_32BIT_KERNEL
@@ -555,12 +557,11 @@ config TOSHIBA_RBTX4927
555 557
556config TOSHIBA_RBTX4938 558config TOSHIBA_RBTX4938
557 bool "Toshiba RBTX4938 board" 559 bool "Toshiba RBTX4938 board"
558 select HAVE_STD_PC_SERIAL_PORT
559 select DMA_NONCOHERENT 560 select DMA_NONCOHERENT
560 select GENERIC_ISA_DMA
561 select HAS_TXX9_SERIAL 561 select HAS_TXX9_SERIAL
562 select HW_HAS_PCI 562 select HW_HAS_PCI
563 select I8259 563 select IRQ_CPU
564 select IRQ_TXX9
564 select SWAP_IO_SPACE 565 select SWAP_IO_SPACE
565 select SYS_HAS_CPU_TX49XX 566 select SYS_HAS_CPU_TX49XX
566 select SYS_SUPPORTS_32BIT_KERNEL 567 select SYS_SUPPORTS_32BIT_KERNEL
@@ -604,7 +605,6 @@ source "arch/mips/sibyte/Kconfig"
604source "arch/mips/tx4927/Kconfig" 605source "arch/mips/tx4927/Kconfig"
605source "arch/mips/tx4938/Kconfig" 606source "arch/mips/tx4938/Kconfig"
606source "arch/mips/vr41xx/Kconfig" 607source "arch/mips/vr41xx/Kconfig"
607source "arch/mips/philips/pnx8550/common/Kconfig"
608 608
609endmenu 609endmenu
610 610
@@ -693,9 +693,9 @@ config EARLY_PRINTK
693config SYS_HAS_EARLY_PRINTK 693config SYS_HAS_EARLY_PRINTK
694 bool 694 bool
695 695
696config GENERIC_ISA_DMA 696config HOTPLUG_CPU
697 bool 697 bool
698 select ZONE_DMA 698 default n
699 699
700config I8259 700config I8259
701 bool 701 bool
@@ -712,9 +712,13 @@ config MIPS_DISABLE_OBSOLETE_IDE
712config NO_IOPORT 712config NO_IOPORT
713 def_bool n 713 def_bool n
714 714
715config GENERIC_ISA_DMA
716 bool
717 select ZONE_DMA if GENERIC_ISA_DMA_SUPPORT_BROKEN=n
718
715config GENERIC_ISA_DMA_SUPPORT_BROKEN 719config GENERIC_ISA_DMA_SUPPORT_BROKEN
716 bool 720 bool
717 select ZONE_DMA 721 select GENERIC_ISA_DMA
718 722
719config GENERIC_GPIO 723config GENERIC_GPIO
720 bool 724 bool
@@ -768,6 +772,9 @@ config IRQ_MSP_SLP
768config IRQ_MSP_CIC 772config IRQ_MSP_CIC
769 bool 773 bool
770 774
775config IRQ_TXX9
776 bool
777
771config MIPS_BOARDS_GEN 778config MIPS_BOARDS_GEN
772 bool 779 bool
773 780
@@ -1427,8 +1434,7 @@ config SB1_PASS_2_1_WORKAROUNDS
1427 default y 1434 default y
1428 1435
1429config 64BIT_PHYS_ADDR 1436config 64BIT_PHYS_ADDR
1430 bool "Support for 64-bit physical address space" 1437 bool
1431 depends on (CPU_R4X00 || CPU_R5000 || CPU_RM7000 || CPU_RM9000 || CPU_R10000 || CPU_SB1 || CPU_MIPS32 || CPU_MIPS64) && 32BIT
1432 1438
1433config CPU_HAS_LLSC 1439config CPU_HAS_LLSC
1434 bool 1440 bool
diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig
index abea88098253..29c95d97217d 100644
--- a/arch/mips/au1000/Kconfig
+++ b/arch/mips/au1000/Kconfig
@@ -136,6 +136,7 @@ config SOC_AU1200
136 136
137config SOC_AU1X00 137config SOC_AU1X00
138 bool 138 bool
139 select 64BIT_PHYS_ADDR
139 select SYS_HAS_CPU_MIPS32_R1 140 select SYS_HAS_CPU_MIPS32_R1
140 select SYS_SUPPORTS_32BIT_KERNEL 141 select SYS_SUPPORTS_32BIT_KERNEL
141 select SYS_SUPPORTS_APM_EMULATION 142 select SYS_SUPPORTS_APM_EMULATION
diff --git a/arch/mips/au1000/common/gpio.c b/arch/mips/au1000/common/gpio.c
index 7abe42099439..8527856aec45 100644
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -131,12 +131,12 @@ int au1xxx_gpio_direction_input(unsigned gpio)
131{ 131{
132 if (gpio >= AU1XXX_GPIO_BASE) 132 if (gpio >= AU1XXX_GPIO_BASE)
133#if defined(CONFIG_SOC_AU1000) 133#if defined(CONFIG_SOC_AU1000)
134 ; 134 return -ENODEV;
135#else 135#else
136 return au1xxx_gpio2_direction_input(gpio); 136 return au1xxx_gpio2_direction_input(gpio);
137#endif 137#endif
138 else 138
139 return au1xxx_gpio1_direction_input(gpio); 139 return au1xxx_gpio1_direction_input(gpio);
140} 140}
141 141
142EXPORT_SYMBOL(au1xxx_gpio_direction_input); 142EXPORT_SYMBOL(au1xxx_gpio_direction_input);
@@ -145,12 +145,12 @@ int au1xxx_gpio_direction_output(unsigned gpio, int value)
145{ 145{
146 if (gpio >= AU1XXX_GPIO_BASE) 146 if (gpio >= AU1XXX_GPIO_BASE)
147#if defined(CONFIG_SOC_AU1000) 147#if defined(CONFIG_SOC_AU1000)
148 ; 148 return -ENODEV;
149#else 149#else
150 return au1xxx_gpio2_direction_output(gpio, value); 150 return au1xxx_gpio2_direction_output(gpio, value);
151#endif 151#endif
152 else 152
153 return au1xxx_gpio1_direction_output(gpio, value); 153 return au1xxx_gpio1_direction_output(gpio, value);
154} 154}
155 155
156EXPORT_SYMBOL(au1xxx_gpio_direction_output); 156EXPORT_SYMBOL(au1xxx_gpio_direction_output);
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 67a80f4c7d87..700a3a2d688e 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -663,8 +663,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
663# CONFIG_SX is not set 663# CONFIG_SX is not set
664# CONFIG_RIO is not set 664# CONFIG_RIO is not set
665# CONFIG_STALDRV is not set 665# CONFIG_STALDRV is not set
666CONFIG_SIBYTE_SB1250_DUART=y 666CONFIG_SERIAL_SB1250_DUART=y
667CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y 667CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
668 668
669# 669#
670# Serial drivers 670# Serial drivers
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig
index 4dc3197e2e9f..8ecbbb226c76 100644
--- a/arch/mips/configs/capcella_defconfig
+++ b/arch/mips/configs/capcella_defconfig
@@ -1,60 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:22 2007 4# Wed Aug 8 10:23:16 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58# CONFIG_CASIO_E55 is not set 45# CONFIG_CASIO_E55 is not set
59# CONFIG_IBM_WORKPAD is not set 46# CONFIG_IBM_WORKPAD is not set
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 60CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
74CONFIG_DMA_NONCOHERENT=y 61CONFIG_DMA_NONCOHERENT=y
75CONFIG_DMA_NEED_PCI_MAP_STATE=y 62CONFIG_DMA_NEED_PCI_MAP_STATE=y
63# CONFIG_HOTPLUG_CPU is not set
64# CONFIG_NO_IOPORT is not set
76# CONFIG_CPU_BIG_ENDIAN is not set 65# CONFIG_CPU_BIG_ENDIAN is not set
77CONFIG_CPU_LITTLE_ENDIAN=y 66CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 67CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
82# 71#
83# CPU selection 72# CPU selection
84# 73#
74# CONFIG_CPU_LOONGSON2 is not set
85# CONFIG_CPU_MIPS32_R1 is not set 75# CONFIG_CPU_MIPS32_R1 is not set
86# CONFIG_CPU_MIPS32_R2 is not set 76# CONFIG_CPU_MIPS32_R2 is not set
87# CONFIG_CPU_MIPS64_R1 is not set 77# CONFIG_CPU_MIPS64_R1 is not set
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y
103# CONFIG_CPU_SB1 is not set 93# CONFIG_CPU_SB1 is not set
104CONFIG_SYS_HAS_CPU_VR41XX=y 94CONFIG_SYS_HAS_CPU_VR41XX=y
105CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 95CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
106CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 96CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
108CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 97CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
109 98
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y
119CONFIG_MIPS_MT_DISABLED=y 108CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMP is not set 109# CONFIG_MIPS_MT_SMP is not set
121# CONFIG_MIPS_MT_SMTC is not set 110# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_SYNC=y 111CONFIG_CPU_HAS_SYNC=y
124CONFIG_GENERIC_HARDIRQS=y 112CONFIG_GENERIC_HARDIRQS=y
125CONFIG_GENERIC_IRQ_PROBE=y 113CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 121# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4 122CONFIG_SPLIT_PTLOCK_CPUS=4
135# CONFIG_RESOURCES_64BIT is not set 123# CONFIG_RESOURCES_64BIT is not set
136CONFIG_ZONE_DMA_FLAG=1 124CONFIG_ZONE_DMA_FLAG=0
125CONFIG_VIRT_TO_BUS=y
137# CONFIG_HZ_48 is not set 126# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 127# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 128# CONFIG_HZ_128 is not set
140# CONFIG_HZ_250 is not set 129CONFIG_HZ_250=y
141# CONFIG_HZ_256 is not set 130# CONFIG_HZ_256 is not set
142CONFIG_HZ_1000=y 131# CONFIG_HZ_1000 is not set
143# CONFIG_HZ_1024 is not set 132# CONFIG_HZ_1024 is not set
144CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 133CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
145CONFIG_HZ=1000 134CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y 135CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 136# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
149# CONFIG_KEXEC is not set 138# CONFIG_KEXEC is not set
139CONFIG_SECCOMP=y
150CONFIG_LOCKDEP_SUPPORT=y 140CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 141CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 142CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
153 143
154# 144#
155# Code maturity level options 145# General setup
156# 146#
157CONFIG_EXPERIMENTAL=y 147CONFIG_EXPERIMENTAL=y
158CONFIG_BROKEN_ON_SMP=y 148CONFIG_BROKEN_ON_SMP=y
159CONFIG_INIT_ENV_ARG_LIMIT=32 149CONFIG_INIT_ENV_ARG_LIMIT=32
160
161#
162# General setup
163#
164CONFIG_LOCALVERSION="" 150CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 151CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 152CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 153CONFIG_SYSVIPC=y
168# CONFIG_IPC_NS is not set
169CONFIG_SYSVIPC_SYSCTL=y 154CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 155# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 156# CONFIG_BSD_PROCESS_ACCT is not set
172# CONFIG_TASKSTATS is not set 157# CONFIG_TASKSTATS is not set
173# CONFIG_UTS_NS is not set 158# CONFIG_USER_NS is not set
174# CONFIG_AUDIT is not set 159# CONFIG_AUDIT is not set
175# CONFIG_IKCONFIG is not set 160# CONFIG_IKCONFIG is not set
161CONFIG_LOG_BUF_SHIFT=14
176CONFIG_SYSFS_DEPRECATED=y 162CONFIG_SYSFS_DEPRECATED=y
177# CONFIG_RELAY is not set 163# CONFIG_RELAY is not set
164# CONFIG_BLK_DEV_INITRD is not set
178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
179CONFIG_SYSCTL=y 166CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 167CONFIG_EMBEDDED=y
@@ -187,32 +174,30 @@ CONFIG_BUG=y
187CONFIG_ELF_CORE=y 174CONFIG_ELF_CORE=y
188CONFIG_BASE_FULL=y 175CONFIG_BASE_FULL=y
189CONFIG_FUTEX=y 176CONFIG_FUTEX=y
177CONFIG_ANON_INODES=y
190CONFIG_EPOLL=y 178CONFIG_EPOLL=y
179CONFIG_SIGNALFD=y
180CONFIG_TIMERFD=y
181CONFIG_EVENTFD=y
191CONFIG_SHMEM=y 182CONFIG_SHMEM=y
192CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 183CONFIG_VM_EVENT_COUNTERS=y
184CONFIG_SLAB=y
185# CONFIG_SLUB is not set
186# CONFIG_SLOB is not set
194CONFIG_RT_MUTEXES=y 187CONFIG_RT_MUTEXES=y
195# CONFIG_TINY_SHMEM is not set 188# CONFIG_TINY_SHMEM is not set
196CONFIG_BASE_SMALL=0 189CONFIG_BASE_SMALL=0
197# CONFIG_SLOB is not set
198
199#
200# Loadable module support
201#
202CONFIG_MODULES=y 190CONFIG_MODULES=y
203CONFIG_MODULE_UNLOAD=y 191CONFIG_MODULE_UNLOAD=y
204# CONFIG_MODULE_FORCE_UNLOAD is not set 192CONFIG_MODULE_FORCE_UNLOAD=y
205CONFIG_MODVERSIONS=y 193CONFIG_MODVERSIONS=y
206CONFIG_MODULE_SRCVERSION_ALL=y 194CONFIG_MODULE_SRCVERSION_ALL=y
207CONFIG_KMOD=y 195CONFIG_KMOD=y
208
209#
210# Block layer
211#
212CONFIG_BLOCK=y 196CONFIG_BLOCK=y
213# CONFIG_LBD is not set 197# CONFIG_LBD is not set
214# CONFIG_BLK_DEV_IO_TRACE is not set 198# CONFIG_BLK_DEV_IO_TRACE is not set
215# CONFIG_LSF is not set 199# CONFIG_LSF is not set
200# CONFIG_BLK_DEV_BSG is not set
216 201
217# 202#
218# IO Schedulers 203# IO Schedulers
@@ -232,16 +217,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
232# 217#
233CONFIG_HW_HAS_PCI=y 218CONFIG_HW_HAS_PCI=y
234CONFIG_PCI=y 219CONFIG_PCI=y
220# CONFIG_ARCH_SUPPORTS_MSI is not set
235CONFIG_MMU=y 221CONFIG_MMU=y
236 222
237# 223#
238# PCCARD (PCMCIA/CardBus) support 224# PCCARD (PCMCIA/CardBus) support
239# 225#
240# CONFIG_PCCARD is not set 226# CONFIG_PCCARD is not set
241
242#
243# PCI Hotplug Support
244#
245# CONFIG_HOTPLUG_PCI is not set 227# CONFIG_HOTPLUG_PCI is not set
246 228
247# 229#
@@ -254,10 +236,7 @@ CONFIG_TRAD_SIGNALS=y
254# 236#
255# Power management options 237# Power management options
256# 238#
257CONFIG_PM=y 239# CONFIG_PM is not set
258# CONFIG_PM_LEGACY is not set
259# CONFIG_PM_DEBUG is not set
260# CONFIG_PM_SYSFS_DEPRECATED is not set
261 240
262# 241#
263# Networking 242# Networking
@@ -267,7 +246,6 @@ CONFIG_NET=y
267# 246#
268# Networking options 247# Networking options
269# 248#
270# CONFIG_NETDEBUG is not set
271CONFIG_PACKET=y 249CONFIG_PACKET=y
272CONFIG_PACKET_MMAP=y 250CONFIG_PACKET_MMAP=y
273CONFIG_UNIX=y 251CONFIG_UNIX=y
@@ -309,20 +287,13 @@ CONFIG_TCP_MD5SIG=y
309# CONFIG_INET6_TUNNEL is not set 287# CONFIG_INET6_TUNNEL is not set
310CONFIG_NETWORK_SECMARK=y 288CONFIG_NETWORK_SECMARK=y
311# CONFIG_NETFILTER is not set 289# CONFIG_NETFILTER is not set
312
313#
314# DCCP Configuration (EXPERIMENTAL)
315#
316# CONFIG_IP_DCCP is not set 290# CONFIG_IP_DCCP is not set
317 291CONFIG_IP_SCTP=m
318# 292# CONFIG_SCTP_DBG_MSG is not set
319# SCTP Configuration (EXPERIMENTAL) 293# CONFIG_SCTP_DBG_OBJCNT is not set
320# 294# CONFIG_SCTP_HMAC_NONE is not set
321# CONFIG_IP_SCTP is not set 295# CONFIG_SCTP_HMAC_SHA1 is not set
322 296CONFIG_SCTP_HMAC_MD5=y
323#
324# TIPC Configuration (EXPERIMENTAL)
325#
326# CONFIG_TIPC is not set 297# CONFIG_TIPC is not set
327# CONFIG_ATM is not set 298# CONFIG_ATM is not set
328# CONFIG_BRIDGE is not set 299# CONFIG_BRIDGE is not set
@@ -348,7 +319,17 @@ CONFIG_NETWORK_SECMARK=y
348# CONFIG_HAMRADIO is not set 319# CONFIG_HAMRADIO is not set
349# CONFIG_IRDA is not set 320# CONFIG_IRDA is not set
350# CONFIG_BT is not set 321# CONFIG_BT is not set
322# CONFIG_AF_RXRPC is not set
323
324#
325# Wireless
326#
327# CONFIG_CFG80211 is not set
328# CONFIG_WIRELESS_EXT is not set
329# CONFIG_MAC80211 is not set
351# CONFIG_IEEE80211 is not set 330# CONFIG_IEEE80211 is not set
331# CONFIG_RFKILL is not set
332# CONFIG_NET_9P is not set
352 333
353# 334#
354# Device Drivers 335# Device Drivers
@@ -361,30 +342,10 @@ CONFIG_STANDALONE=y
361CONFIG_PREVENT_FIRMWARE_BUILD=y 342CONFIG_PREVENT_FIRMWARE_BUILD=y
362CONFIG_FW_LOADER=m 343CONFIG_FW_LOADER=m
363# CONFIG_SYS_HYPERVISOR is not set 344# CONFIG_SYS_HYPERVISOR is not set
364 345# CONFIG_CONNECTOR is not set
365#
366# Connector - unified userspace <-> kernelspace linker
367#
368CONFIG_CONNECTOR=m
369
370#
371# Memory Technology Devices (MTD)
372#
373# CONFIG_MTD is not set 346# CONFIG_MTD is not set
374
375#
376# Parallel port support
377#
378# CONFIG_PARPORT is not set 347# CONFIG_PARPORT is not set
379 348CONFIG_BLK_DEV=y
380#
381# Plug and Play support
382#
383# CONFIG_PNPACPI is not set
384
385#
386# Block devices
387#
388# CONFIG_BLK_CPQ_DA is not set 349# CONFIG_BLK_CPQ_DA is not set
389# CONFIG_BLK_CPQ_CISS_DA is not set 350# CONFIG_BLK_CPQ_CISS_DA is not set
390# CONFIG_BLK_DEV_DAC960 is not set 351# CONFIG_BLK_DEV_DAC960 is not set
@@ -397,19 +358,9 @@ CONFIG_BLK_DEV_RAM=y
397CONFIG_BLK_DEV_RAM_COUNT=16 358CONFIG_BLK_DEV_RAM_COUNT=16
398CONFIG_BLK_DEV_RAM_SIZE=4096 359CONFIG_BLK_DEV_RAM_SIZE=4096
399CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 360CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
400# CONFIG_BLK_DEV_INITRD is not set
401# CONFIG_CDROM_PKTCDVD is not set 361# CONFIG_CDROM_PKTCDVD is not set
402# CONFIG_ATA_OVER_ETH is not set 362# CONFIG_ATA_OVER_ETH is not set
403 363# CONFIG_MISC_DEVICES is not set
404#
405# Misc devices
406#
407CONFIG_SGI_IOC4=m
408# CONFIG_TIFM_CORE is not set
409
410#
411# ATA/ATAPI/MFM/RLL support
412#
413CONFIG_IDE=y 364CONFIG_IDE=y
414CONFIG_IDE_MAX_HWIFS=4 365CONFIG_IDE_MAX_HWIFS=4
415CONFIG_BLK_DEV_IDE=y 366CONFIG_BLK_DEV_IDE=y
@@ -424,15 +375,16 @@ CONFIG_BLK_DEV_IDEDISK=y
424# CONFIG_BLK_DEV_IDETAPE is not set 375# CONFIG_BLK_DEV_IDETAPE is not set
425# CONFIG_BLK_DEV_IDEFLOPPY is not set 376# CONFIG_BLK_DEV_IDEFLOPPY is not set
426# CONFIG_IDE_TASK_IOCTL is not set 377# CONFIG_IDE_TASK_IOCTL is not set
378CONFIG_IDE_PROC_FS=y
427 379
428# 380#
429# IDE chipset support/bugfixes 381# IDE chipset support/bugfixes
430# 382#
431CONFIG_IDE_GENERIC=y 383CONFIG_IDE_GENERIC=y
432# CONFIG_BLK_DEV_IDEPCI is not set 384# CONFIG_BLK_DEV_IDEPCI is not set
385# CONFIG_IDEPCI_PCIBUS_ORDER is not set
433# CONFIG_IDE_ARM is not set 386# CONFIG_IDE_ARM is not set
434# CONFIG_BLK_DEV_IDEDMA is not set 387# CONFIG_BLK_DEV_IDEDMA is not set
435# CONFIG_IDEDMA_AUTO is not set
436# CONFIG_BLK_DEV_HD is not set 388# CONFIG_BLK_DEV_HD is not set
437 389
438# 390#
@@ -440,16 +392,9 @@ CONFIG_IDE_GENERIC=y
440# 392#
441# CONFIG_RAID_ATTRS is not set 393# CONFIG_RAID_ATTRS is not set
442# CONFIG_SCSI is not set 394# CONFIG_SCSI is not set
395# CONFIG_SCSI_DMA is not set
443# CONFIG_SCSI_NETLINK is not set 396# CONFIG_SCSI_NETLINK is not set
444
445#
446# Serial ATA (prod) and Parallel ATA (experimental) drivers
447#
448# CONFIG_ATA is not set 397# CONFIG_ATA is not set
449
450#
451# Multi-device support (RAID and LVM)
452#
453# CONFIG_MD is not set 398# CONFIG_MD is not set
454 399
455# 400#
@@ -460,30 +405,17 @@ CONFIG_IDE_GENERIC=y
460# 405#
461# IEEE 1394 (FireWire) support 406# IEEE 1394 (FireWire) support
462# 407#
408# CONFIG_FIREWIRE is not set
463# CONFIG_IEEE1394 is not set 409# CONFIG_IEEE1394 is not set
464
465#
466# I2O device support
467#
468# CONFIG_I2O is not set 410# CONFIG_I2O is not set
469
470#
471# Network device support
472#
473CONFIG_NETDEVICES=y 411CONFIG_NETDEVICES=y
412# CONFIG_NETDEVICES_MULTIQUEUE is not set
474# CONFIG_DUMMY is not set 413# CONFIG_DUMMY is not set
475# CONFIG_BONDING is not set 414# CONFIG_BONDING is not set
415# CONFIG_MACVLAN is not set
476# CONFIG_EQUALIZER is not set 416# CONFIG_EQUALIZER is not set
477# CONFIG_TUN is not set 417# CONFIG_TUN is not set
478
479#
480# ARCnet devices
481#
482# CONFIG_ARCNET is not set 418# CONFIG_ARCNET is not set
483
484#
485# PHY device support
486#
487CONFIG_PHYLIB=m 419CONFIG_PHYLIB=m
488 420
489# 421#
@@ -497,22 +429,16 @@ CONFIG_CICADA_PHY=m
497CONFIG_VITESSE_PHY=m 429CONFIG_VITESSE_PHY=m
498CONFIG_SMSC_PHY=m 430CONFIG_SMSC_PHY=m
499# CONFIG_BROADCOM_PHY is not set 431# CONFIG_BROADCOM_PHY is not set
432# CONFIG_ICPLUS_PHY is not set
500# CONFIG_FIXED_PHY is not set 433# CONFIG_FIXED_PHY is not set
501
502#
503# Ethernet (10 or 100Mbit)
504#
505CONFIG_NET_ETHERNET=y 434CONFIG_NET_ETHERNET=y
506CONFIG_MII=y 435CONFIG_MII=y
436# CONFIG_AX88796 is not set
507# CONFIG_HAPPYMEAL is not set 437# CONFIG_HAPPYMEAL is not set
508# CONFIG_SUNGEM is not set 438# CONFIG_SUNGEM is not set
509# CONFIG_CASSINI is not set 439# CONFIG_CASSINI is not set
510# CONFIG_NET_VENDOR_3COM is not set 440# CONFIG_NET_VENDOR_3COM is not set
511# CONFIG_DM9000 is not set 441# CONFIG_DM9000 is not set
512
513#
514# Tulip family network device support
515#
516# CONFIG_NET_TULIP is not set 442# CONFIG_NET_TULIP is not set
517# CONFIG_HP100 is not set 443# CONFIG_HP100 is not set
518CONFIG_NET_PCI=y 444CONFIG_NET_PCI=y
@@ -521,6 +447,7 @@ CONFIG_NET_PCI=y
521# CONFIG_ADAPTEC_STARFIRE is not set 447# CONFIG_ADAPTEC_STARFIRE is not set
522# CONFIG_B44 is not set 448# CONFIG_B44 is not set
523# CONFIG_FORCEDETH is not set 449# CONFIG_FORCEDETH is not set
450# CONFIG_TC35815 is not set
524# CONFIG_DGRS is not set 451# CONFIG_DGRS is not set
525# CONFIG_EEPRO100 is not set 452# CONFIG_EEPRO100 is not set
526# CONFIG_E100 is not set 453# CONFIG_E100 is not set
@@ -539,50 +466,15 @@ CONFIG_8139TOO_PIO=y
539# CONFIG_TLAN is not set 466# CONFIG_TLAN is not set
540# CONFIG_VIA_RHINE is not set 467# CONFIG_VIA_RHINE is not set
541# CONFIG_SC92031 is not set 468# CONFIG_SC92031 is not set
542 469# CONFIG_NETDEV_1000 is not set
543# 470# CONFIG_NETDEV_10000 is not set
544# Ethernet (1000 Mbit)
545#
546# CONFIG_ACENIC is not set
547# CONFIG_DL2K is not set
548# CONFIG_E1000 is not set
549# CONFIG_NS83820 is not set
550# CONFIG_HAMACHI is not set
551# CONFIG_YELLOWFIN is not set
552# CONFIG_R8169 is not set
553# CONFIG_SIS190 is not set
554# CONFIG_SKGE is not set
555# CONFIG_SKY2 is not set
556# CONFIG_SK98LIN is not set
557# CONFIG_VIA_VELOCITY is not set
558# CONFIG_TIGON3 is not set
559# CONFIG_BNX2 is not set
560CONFIG_QLA3XXX=m
561# CONFIG_ATL1 is not set
562
563#
564# Ethernet (10000 Mbit)
565#
566# CONFIG_CHELSIO_T1 is not set
567CONFIG_CHELSIO_T3=m
568# CONFIG_IXGB is not set
569# CONFIG_S2IO is not set
570# CONFIG_MYRI10GE is not set
571CONFIG_NETXEN_NIC=m
572
573#
574# Token Ring devices
575#
576# CONFIG_TR is not set 471# CONFIG_TR is not set
577 472
578# 473#
579# Wireless LAN (non-hamradio) 474# Wireless LAN
580#
581# CONFIG_NET_RADIO is not set
582
583#
584# Wan interfaces
585# 475#
476# CONFIG_WLAN_PRE80211 is not set
477# CONFIG_WLAN_80211 is not set
586# CONFIG_WAN is not set 478# CONFIG_WAN is not set
587# CONFIG_FDDI is not set 479# CONFIG_FDDI is not set
588# CONFIG_HIPPI is not set 480# CONFIG_HIPPI is not set
@@ -592,15 +484,7 @@ CONFIG_NETXEN_NIC=m
592# CONFIG_NETCONSOLE is not set 484# CONFIG_NETCONSOLE is not set
593# CONFIG_NETPOLL is not set 485# CONFIG_NETPOLL is not set
594# CONFIG_NET_POLL_CONTROLLER is not set 486# CONFIG_NET_POLL_CONTROLLER is not set
595
596#
597# ISDN subsystem
598#
599# CONFIG_ISDN is not set 487# CONFIG_ISDN is not set
600
601#
602# Telephony Support
603#
604# CONFIG_PHONE is not set 488# CONFIG_PHONE is not set
605 489
606# 490#
@@ -608,6 +492,7 @@ CONFIG_NETXEN_NIC=m
608# 492#
609CONFIG_INPUT=y 493CONFIG_INPUT=y
610# CONFIG_INPUT_FF_MEMLESS is not set 494# CONFIG_INPUT_FF_MEMLESS is not set
495# CONFIG_INPUT_POLLDEV is not set
611 496
612# 497#
613# Userland interfaces 498# Userland interfaces
@@ -624,6 +509,7 @@ CONFIG_INPUT=y
624# CONFIG_INPUT_KEYBOARD is not set 509# CONFIG_INPUT_KEYBOARD is not set
625# CONFIG_INPUT_MOUSE is not set 510# CONFIG_INPUT_MOUSE is not set
626# CONFIG_INPUT_JOYSTICK is not set 511# CONFIG_INPUT_JOYSTICK is not set
512# CONFIG_INPUT_TABLET is not set
627# CONFIG_INPUT_TOUCHSCREEN is not set 513# CONFIG_INPUT_TOUCHSCREEN is not set
628# CONFIG_INPUT_MISC is not set 514# CONFIG_INPUT_MISC is not set
629 515
@@ -658,34 +544,17 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
658CONFIG_UNIX98_PTYS=y 544CONFIG_UNIX98_PTYS=y
659CONFIG_LEGACY_PTYS=y 545CONFIG_LEGACY_PTYS=y
660CONFIG_LEGACY_PTY_COUNT=256 546CONFIG_LEGACY_PTY_COUNT=256
661
662#
663# IPMI
664#
665# CONFIG_IPMI_HANDLER is not set 547# CONFIG_IPMI_HANDLER is not set
666
667#
668# Watchdog Cards
669#
670# CONFIG_WATCHDOG is not set 548# CONFIG_WATCHDOG is not set
671# CONFIG_HW_RANDOM is not set 549# CONFIG_HW_RANDOM is not set
672# CONFIG_RTC is not set 550# CONFIG_RTC is not set
673# CONFIG_GEN_RTC is not set
674# CONFIG_DTLK is not set
675# CONFIG_R3964 is not set 551# CONFIG_R3964 is not set
676# CONFIG_APPLICOM is not set 552# CONFIG_APPLICOM is not set
677# CONFIG_DRM is not set 553# CONFIG_DRM is not set
678CONFIG_GPIO_VR41XX=y 554CONFIG_GPIO_VR41XX=y
679# CONFIG_RAW_DRIVER is not set 555# CONFIG_RAW_DRIVER is not set
680
681#
682# TPM devices
683#
684# CONFIG_TCG_TPM is not set 556# CONFIG_TCG_TPM is not set
685 557CONFIG_DEVPORT=y
686#
687# I2C support
688#
689# CONFIG_I2C is not set 558# CONFIG_I2C is not set
690 559
691# 560#
@@ -693,32 +562,33 @@ CONFIG_GPIO_VR41XX=y
693# 562#
694# CONFIG_SPI is not set 563# CONFIG_SPI is not set
695# CONFIG_SPI_MASTER is not set 564# CONFIG_SPI_MASTER is not set
696
697#
698# Dallas's 1-wire bus
699#
700# CONFIG_W1 is not set 565# CONFIG_W1 is not set
566# CONFIG_POWER_SUPPLY is not set
567# CONFIG_HWMON is not set
701 568
702# 569#
703# Hardware Monitoring support 570# Multifunction device drivers
704# 571#
705# CONFIG_HWMON is not set 572# CONFIG_MFD_SM501 is not set
706# CONFIG_HWMON_VID is not set
707 573
708# 574#
709# Multimedia devices 575# Multimedia devices
710# 576#
711# CONFIG_VIDEO_DEV is not set 577# CONFIG_VIDEO_DEV is not set
578# CONFIG_DVB_CORE is not set
579# CONFIG_DAB is not set
712 580
713# 581#
714# Digital Video Broadcasting Devices 582# Graphics support
715# 583#
716# CONFIG_DVB is not set 584# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
717 585
718# 586#
719# Graphics support 587# Display device support
720# 588#
721# CONFIG_FIRMWARE_EDID is not set 589# CONFIG_DISPLAY_SUPPORT is not set
590# CONFIG_VGASTATE is not set
591# CONFIG_VIDEO_OUTPUT_CONTROL is not set
722# CONFIG_FB is not set 592# CONFIG_FB is not set
723 593
724# 594#
@@ -726,65 +596,16 @@ CONFIG_GPIO_VR41XX=y
726# 596#
727# CONFIG_VGA_CONSOLE is not set 597# CONFIG_VGA_CONSOLE is not set
728CONFIG_DUMMY_CONSOLE=y 598CONFIG_DUMMY_CONSOLE=y
729# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
730 599
731# 600#
732# Sound 601# Sound
733# 602#
734# CONFIG_SOUND is not set 603# CONFIG_SOUND is not set
735 604# CONFIG_HID_SUPPORT is not set
736# 605# CONFIG_USB_SUPPORT is not set
737# HID Devices
738#
739# CONFIG_HID is not set
740
741#
742# USB support
743#
744CONFIG_USB_ARCH_HAS_HCD=y
745CONFIG_USB_ARCH_HAS_OHCI=y
746CONFIG_USB_ARCH_HAS_EHCI=y
747# CONFIG_USB is not set
748
749#
750# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
751#
752
753#
754# USB Gadget Support
755#
756# CONFIG_USB_GADGET is not set
757
758#
759# MMC/SD Card support
760#
761# CONFIG_MMC is not set 606# CONFIG_MMC is not set
762
763#
764# LED devices
765#
766# CONFIG_NEW_LEDS is not set 607# CONFIG_NEW_LEDS is not set
767
768#
769# LED drivers
770#
771
772#
773# LED Triggers
774#
775
776#
777# InfiniBand support
778#
779# CONFIG_INFINIBAND is not set 608# CONFIG_INFINIBAND is not set
780
781#
782# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
783#
784
785#
786# Real Time Clock
787#
788CONFIG_RTC_LIB=y 609CONFIG_RTC_LIB=y
789CONFIG_RTC_CLASS=y 610CONFIG_RTC_CLASS=y
790CONFIG_RTC_HCTOSYS=y 611CONFIG_RTC_HCTOSYS=y
@@ -798,18 +619,29 @@ CONFIG_RTC_INTF_SYSFS=y
798CONFIG_RTC_INTF_PROC=y 619CONFIG_RTC_INTF_PROC=y
799CONFIG_RTC_INTF_DEV=y 620CONFIG_RTC_INTF_DEV=y
800# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 621# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
622# CONFIG_RTC_DRV_TEST is not set
623
624#
625# SPI RTC drivers
626#
801 627
802# 628#
803# RTC drivers 629# Platform RTC drivers
804# 630#
631# CONFIG_RTC_DRV_CMOS is not set
805# CONFIG_RTC_DRV_DS1553 is not set 632# CONFIG_RTC_DRV_DS1553 is not set
633# CONFIG_RTC_DRV_STK17TA8 is not set
806# CONFIG_RTC_DRV_DS1742 is not set 634# CONFIG_RTC_DRV_DS1742 is not set
807# CONFIG_RTC_DRV_M48T86 is not set 635# CONFIG_RTC_DRV_M48T86 is not set
808CONFIG_RTC_DRV_VR41XX=y 636# CONFIG_RTC_DRV_M48T59 is not set
809# CONFIG_RTC_DRV_TEST is not set
810# CONFIG_RTC_DRV_V3020 is not set 637# CONFIG_RTC_DRV_V3020 is not set
811 638
812# 639#
640# on-CPU RTC drivers
641#
642CONFIG_RTC_DRV_VR41XX=y
643
644#
813# DMA Engine support 645# DMA Engine support
814# 646#
815# CONFIG_DMA_ENGINE is not set 647# CONFIG_DMA_ENGINE is not set
@@ -823,12 +655,9 @@ CONFIG_RTC_DRV_VR41XX=y
823# 655#
824 656
825# 657#
826# Auxiliary Display support 658# Userspace I/O
827#
828
829#
830# Virtualization
831# 659#
660# CONFIG_UIO is not set
832 661
833# 662#
834# File systems 663# File systems
@@ -836,8 +665,14 @@ CONFIG_RTC_DRV_VR41XX=y
836CONFIG_EXT2_FS=y 665CONFIG_EXT2_FS=y
837# CONFIG_EXT2_FS_XATTR is not set 666# CONFIG_EXT2_FS_XATTR is not set
838# CONFIG_EXT2_FS_XIP is not set 667# CONFIG_EXT2_FS_XIP is not set
839# CONFIG_EXT3_FS is not set 668CONFIG_EXT3_FS=y
669CONFIG_EXT3_FS_XATTR=y
670# CONFIG_EXT3_FS_POSIX_ACL is not set
671# CONFIG_EXT3_FS_SECURITY is not set
840# CONFIG_EXT4DEV_FS is not set 672# CONFIG_EXT4DEV_FS is not set
673CONFIG_JBD=y
674# CONFIG_JBD_DEBUG is not set
675CONFIG_FS_MBCACHE=y
841# CONFIG_REISERFS_FS is not set 676# CONFIG_REISERFS_FS is not set
842# CONFIG_JFS_FS is not set 677# CONFIG_JFS_FS is not set
843CONFIG_FS_POSIX_ACL=y 678CONFIG_FS_POSIX_ACL=y
@@ -852,7 +687,7 @@ CONFIG_INOTIFY_USER=y
852CONFIG_DNOTIFY=y 687CONFIG_DNOTIFY=y
853# CONFIG_AUTOFS_FS is not set 688# CONFIG_AUTOFS_FS is not set
854CONFIG_AUTOFS4_FS=y 689CONFIG_AUTOFS4_FS=y
855CONFIG_FUSE_FS=m 690# CONFIG_FUSE_FS is not set
856CONFIG_GENERIC_ACL=y 691CONFIG_GENERIC_ACL=y
857 692
858# 693#
@@ -879,7 +714,7 @@ CONFIG_TMPFS=y
879CONFIG_TMPFS_POSIX_ACL=y 714CONFIG_TMPFS_POSIX_ACL=y
880# CONFIG_HUGETLB_PAGE is not set 715# CONFIG_HUGETLB_PAGE is not set
881CONFIG_RAMFS=y 716CONFIG_RAMFS=y
882CONFIG_CONFIGFS_FS=m 717# CONFIG_CONFIGFS_FS is not set
883 718
884# 719#
885# Miscellaneous filesystems 720# Miscellaneous filesystems
@@ -905,14 +740,12 @@ CONFIG_NFS_FS=y
905# CONFIG_NFS_V3 is not set 740# CONFIG_NFS_V3 is not set
906# CONFIG_NFS_V4 is not set 741# CONFIG_NFS_V4 is not set
907# CONFIG_NFS_DIRECTIO is not set 742# CONFIG_NFS_DIRECTIO is not set
908CONFIG_NFSD=y 743# CONFIG_NFSD is not set
909# CONFIG_NFSD_V3 is not set
910# CONFIG_NFSD_TCP is not set
911CONFIG_ROOT_NFS=y 744CONFIG_ROOT_NFS=y
912CONFIG_LOCKD=y 745CONFIG_LOCKD=y
913CONFIG_EXPORTFS=y
914CONFIG_NFS_COMMON=y 746CONFIG_NFS_COMMON=y
915CONFIG_SUNRPC=y 747CONFIG_SUNRPC=y
748# CONFIG_SUNRPC_BIND34 is not set
916# CONFIG_RPCSEC_GSS_KRB5 is not set 749# CONFIG_RPCSEC_GSS_KRB5 is not set
917# CONFIG_RPCSEC_GSS_SPKM3 is not set 750# CONFIG_RPCSEC_GSS_SPKM3 is not set
918# CONFIG_SMB_FS is not set 751# CONFIG_SMB_FS is not set
@@ -920,7 +753,6 @@ CONFIG_SUNRPC=y
920# CONFIG_NCP_FS is not set 753# CONFIG_NCP_FS is not set
921# CONFIG_CODA_FS is not set 754# CONFIG_CODA_FS is not set
922# CONFIG_AFS_FS is not set 755# CONFIG_AFS_FS is not set
923# CONFIG_9P_FS is not set
924 756
925# 757#
926# Partition Types 758# Partition Types
@@ -936,10 +768,7 @@ CONFIG_MSDOS_PARTITION=y
936# 768#
937# Distributed Lock Manager 769# Distributed Lock Manager
938# 770#
939CONFIG_DLM=m 771# CONFIG_DLM is not set
940CONFIG_DLM_TCP=y
941# CONFIG_DLM_SCTP is not set
942# CONFIG_DLM_DEBUG is not set
943 772
944# 773#
945# Profiling support 774# Profiling support
@@ -957,7 +786,6 @@ CONFIG_ENABLE_MUST_CHECK=y
957# CONFIG_DEBUG_FS is not set 786# CONFIG_DEBUG_FS is not set
958# CONFIG_HEADERS_CHECK is not set 787# CONFIG_HEADERS_CHECK is not set
959# CONFIG_DEBUG_KERNEL is not set 788# CONFIG_DEBUG_KERNEL is not set
960CONFIG_LOG_BUF_SHIFT=14
961CONFIG_CROSSCOMPILE=y 789CONFIG_CROSSCOMPILE=y
962CONFIG_CMDLINE="mem=32M console=ttyVR0,38400" 790CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
963 791
@@ -966,10 +794,6 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,38400"
966# 794#
967# CONFIG_KEYS is not set 795# CONFIG_KEYS is not set
968# CONFIG_SECURITY is not set 796# CONFIG_SECURITY is not set
969
970#
971# Cryptographic options
972#
973CONFIG_CRYPTO=y 797CONFIG_CRYPTO=y
974CONFIG_CRYPTO_ALGAPI=y 798CONFIG_CRYPTO_ALGAPI=y
975CONFIG_CRYPTO_BLKCIPHER=m 799CONFIG_CRYPTO_BLKCIPHER=m
@@ -990,6 +814,7 @@ CONFIG_CRYPTO_ECB=m
990CONFIG_CRYPTO_CBC=m 814CONFIG_CRYPTO_CBC=m
991CONFIG_CRYPTO_PCBC=m 815CONFIG_CRYPTO_PCBC=m
992CONFIG_CRYPTO_LRW=m 816CONFIG_CRYPTO_LRW=m
817# CONFIG_CRYPTO_CRYPTD is not set
993CONFIG_CRYPTO_DES=m 818CONFIG_CRYPTO_DES=m
994CONFIG_CRYPTO_FCRYPT=m 819CONFIG_CRYPTO_FCRYPT=m
995CONFIG_CRYPTO_BLOWFISH=m 820CONFIG_CRYPTO_BLOWFISH=m
@@ -1008,10 +833,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1008# CONFIG_CRYPTO_CRC32C is not set 833# CONFIG_CRYPTO_CRC32C is not set
1009CONFIG_CRYPTO_CAMELLIA=m 834CONFIG_CRYPTO_CAMELLIA=m
1010# CONFIG_CRYPTO_TEST is not set 835# CONFIG_CRYPTO_TEST is not set
1011 836# CONFIG_CRYPTO_HW is not set
1012#
1013# Hardware crypto devices
1014#
1015 837
1016# 838#
1017# Library routines 839# Library routines
@@ -1019,10 +841,13 @@ CONFIG_CRYPTO_CAMELLIA=m
1019CONFIG_BITREVERSE=y 841CONFIG_BITREVERSE=y
1020# CONFIG_CRC_CCITT is not set 842# CONFIG_CRC_CCITT is not set
1021# CONFIG_CRC16 is not set 843# CONFIG_CRC16 is not set
844# CONFIG_CRC_ITU_T is not set
1022CONFIG_CRC32=y 845CONFIG_CRC32=y
846# CONFIG_CRC7 is not set
1023# CONFIG_LIBCRC32C is not set 847# CONFIG_LIBCRC32C is not set
1024CONFIG_ZLIB_INFLATE=m 848CONFIG_ZLIB_INFLATE=m
1025CONFIG_ZLIB_DEFLATE=m 849CONFIG_ZLIB_DEFLATE=m
1026CONFIG_PLIST=y 850CONFIG_PLIST=y
1027CONFIG_HAS_IOMEM=y 851CONFIG_HAS_IOMEM=y
1028CONFIG_HAS_IOPORT=y 852CONFIG_HAS_IOPORT=y
853CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index 6d6a01b9a817..ebcb7ad8814b 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.22-rc2 3# Linux kernel version: 2.6.23-rc2
4# Fri May 25 11:17:29 2007 4# Tue Aug 7 22:12:54 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -13,33 +13,35 @@ CONFIG_MIPS=y
13CONFIG_MIPS_COBALT=y 13CONFIG_MIPS_COBALT=y
14# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
15# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
16# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
17# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
18# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
19# CONFIG_WR_PPMC is not set
20# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
21# CONFIG_MARKEINS is not set
22# CONFIG_MACH_VR41XX is not set
21# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
22# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
23# CONFIG_MACH_VR41XX is not set 25# CONFIG_PMC_MSP is not set
24# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
25# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
26# CONFIG_MARKEINS is not set
27# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
28# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
29# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
30# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
31# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
32# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
33# CONFIG_SIBYTE_RHONE is not set
34# CONFIG_SIBYTE_CARMEL is not set
35# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
37# CONFIG_SIBYTE_CRHINE is not set
38# CONFIG_SIBYTE_CRHONE is not set
39# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
40# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
41# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
42# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
43CONFIG_RWSEM_GENERIC_SPINLOCK=y 45CONFIG_RWSEM_GENERIC_SPINLOCK=y
44# CONFIG_ARCH_HAS_ILOG2_U32 is not set 46# CONFIG_ARCH_HAS_ILOG2_U32 is not set
45# CONFIG_ARCH_HAS_ILOG2_U64 is not set 47# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -54,6 +56,7 @@ CONFIG_DMA_NEED_PCI_MAP_STATE=y
54CONFIG_EARLY_PRINTK=y 56CONFIG_EARLY_PRINTK=y
55CONFIG_SYS_HAS_EARLY_PRINTK=y 57CONFIG_SYS_HAS_EARLY_PRINTK=y
56CONFIG_I8259=y 58CONFIG_I8259=y
59# CONFIG_NO_IOPORT is not set
57# CONFIG_CPU_BIG_ENDIAN is not set 60# CONFIG_CPU_BIG_ENDIAN is not set
58CONFIG_CPU_LITTLE_ENDIAN=y 61CONFIG_CPU_LITTLE_ENDIAN=y
59CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 62CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -64,6 +67,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
64# 67#
65# CPU selection 68# CPU selection
66# 69#
70# CONFIG_CPU_LOONGSON2 is not set
67# CONFIG_CPU_MIPS32_R1 is not set 71# CONFIG_CPU_MIPS32_R1 is not set
68# CONFIG_CPU_MIPS32_R2 is not set 72# CONFIG_CPU_MIPS32_R2 is not set
69# CONFIG_CPU_MIPS64_R1 is not set 73# CONFIG_CPU_MIPS64_R1 is not set
@@ -101,7 +105,6 @@ CONFIG_PAGE_SIZE_4KB=y
101CONFIG_MIPS_MT_DISABLED=y 105CONFIG_MIPS_MT_DISABLED=y
102# CONFIG_MIPS_MT_SMP is not set 106# CONFIG_MIPS_MT_SMP is not set
103# CONFIG_MIPS_MT_SMTC is not set 107# CONFIG_MIPS_MT_SMTC is not set
104# CONFIG_MIPS_VPE_LOADER is not set
105CONFIG_CPU_HAS_LLSC=y 108CONFIG_CPU_HAS_LLSC=y
106CONFIG_CPU_HAS_SYNC=y 109CONFIG_CPU_HAS_SYNC=y
107CONFIG_GENERIC_HARDIRQS=y 110CONFIG_GENERIC_HARDIRQS=y
@@ -117,43 +120,40 @@ CONFIG_FLAT_NODE_MEM_MAP=y
117CONFIG_SPLIT_PTLOCK_CPUS=4 120CONFIG_SPLIT_PTLOCK_CPUS=4
118# CONFIG_RESOURCES_64BIT is not set 121# CONFIG_RESOURCES_64BIT is not set
119CONFIG_ZONE_DMA_FLAG=0 122CONFIG_ZONE_DMA_FLAG=0
123CONFIG_VIRT_TO_BUS=y
120# CONFIG_HZ_48 is not set 124# CONFIG_HZ_48 is not set
121# CONFIG_HZ_100 is not set 125# CONFIG_HZ_100 is not set
122# CONFIG_HZ_128 is not set 126# CONFIG_HZ_128 is not set
123# CONFIG_HZ_250 is not set 127CONFIG_HZ_250=y
124# CONFIG_HZ_256 is not set 128# CONFIG_HZ_256 is not set
125CONFIG_HZ_1000=y 129# CONFIG_HZ_1000 is not set
126# CONFIG_HZ_1024 is not set 130# CONFIG_HZ_1024 is not set
127CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 131CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
128CONFIG_HZ=1000 132CONFIG_HZ=250
129CONFIG_PREEMPT_NONE=y 133CONFIG_PREEMPT_NONE=y
130# CONFIG_PREEMPT_VOLUNTARY is not set 134# CONFIG_PREEMPT_VOLUNTARY is not set
131# CONFIG_PREEMPT is not set 135# CONFIG_PREEMPT is not set
132# CONFIG_KEXEC is not set 136# CONFIG_KEXEC is not set
137CONFIG_SECCOMP=y
133CONFIG_LOCKDEP_SUPPORT=y 138CONFIG_LOCKDEP_SUPPORT=y
134CONFIG_STACKTRACE_SUPPORT=y 139CONFIG_STACKTRACE_SUPPORT=y
135CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 140CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
136 141
137# 142#
138# Code maturity level options 143# General setup
139# 144#
140CONFIG_EXPERIMENTAL=y 145CONFIG_EXPERIMENTAL=y
141CONFIG_BROKEN_ON_SMP=y 146CONFIG_BROKEN_ON_SMP=y
142CONFIG_INIT_ENV_ARG_LIMIT=32 147CONFIG_INIT_ENV_ARG_LIMIT=32
143
144#
145# General setup
146#
147CONFIG_LOCALVERSION="" 148CONFIG_LOCALVERSION=""
148CONFIG_LOCALVERSION_AUTO=y 149CONFIG_LOCALVERSION_AUTO=y
149CONFIG_SWAP=y 150CONFIG_SWAP=y
150CONFIG_SYSVIPC=y 151CONFIG_SYSVIPC=y
151# CONFIG_IPC_NS is not set
152CONFIG_SYSVIPC_SYSCTL=y 152CONFIG_SYSVIPC_SYSCTL=y
153# CONFIG_POSIX_MQUEUE is not set 153# CONFIG_POSIX_MQUEUE is not set
154# CONFIG_BSD_PROCESS_ACCT is not set 154# CONFIG_BSD_PROCESS_ACCT is not set
155# CONFIG_TASKSTATS is not set 155# CONFIG_TASKSTATS is not set
156# CONFIG_UTS_NS is not set 156# CONFIG_USER_NS is not set
157# CONFIG_AUDIT is not set 157# CONFIG_AUDIT is not set
158# CONFIG_IKCONFIG is not set 158# CONFIG_IKCONFIG is not set
159CONFIG_LOG_BUF_SHIFT=14 159CONFIG_LOG_BUF_SHIFT=14
@@ -185,19 +185,17 @@ CONFIG_SLAB=y
185CONFIG_RT_MUTEXES=y 185CONFIG_RT_MUTEXES=y
186# CONFIG_TINY_SHMEM is not set 186# CONFIG_TINY_SHMEM is not set
187CONFIG_BASE_SMALL=0 187CONFIG_BASE_SMALL=0
188 188CONFIG_MODULES=y
189# 189CONFIG_MODULE_UNLOAD=y
190# Loadable module support 190# CONFIG_MODULE_FORCE_UNLOAD is not set
191# 191# CONFIG_MODVERSIONS is not set
192# CONFIG_MODULES is not set 192# CONFIG_MODULE_SRCVERSION_ALL is not set
193 193# CONFIG_KMOD is not set
194#
195# Block layer
196#
197CONFIG_BLOCK=y 194CONFIG_BLOCK=y
198# CONFIG_LBD is not set 195# CONFIG_LBD is not set
199# CONFIG_BLK_DEV_IO_TRACE is not set 196# CONFIG_BLK_DEV_IO_TRACE is not set
200# CONFIG_LSF is not set 197# CONFIG_LSF is not set
198# CONFIG_BLK_DEV_BSG is not set
201 199
202# 200#
203# IO Schedulers 201# IO Schedulers
@@ -236,10 +234,7 @@ CONFIG_TRAD_SIGNALS=y
236# 234#
237# Power management options 235# Power management options
238# 236#
239CONFIG_PM=y 237# CONFIG_PM is not set
240# CONFIG_PM_LEGACY is not set
241# CONFIG_PM_DEBUG is not set
242# CONFIG_PM_SYSFS_DEPRECATED is not set
243 238
244# 239#
245# Networking 240# Networking
@@ -286,20 +281,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
286# CONFIG_INET6_TUNNEL is not set 281# CONFIG_INET6_TUNNEL is not set
287# CONFIG_NETWORK_SECMARK is not set 282# CONFIG_NETWORK_SECMARK is not set
288# CONFIG_NETFILTER is not set 283# CONFIG_NETFILTER is not set
289
290#
291# DCCP Configuration (EXPERIMENTAL)
292#
293# CONFIG_IP_DCCP is not set 284# CONFIG_IP_DCCP is not set
294
295#
296# SCTP Configuration (EXPERIMENTAL)
297#
298# CONFIG_IP_SCTP is not set 285# CONFIG_IP_SCTP is not set
299
300#
301# TIPC Configuration (EXPERIMENTAL)
302#
303# CONFIG_TIPC is not set 286# CONFIG_TIPC is not set
304# CONFIG_ATM is not set 287# CONFIG_ATM is not set
305# CONFIG_BRIDGE is not set 288# CONFIG_BRIDGE is not set
@@ -335,6 +318,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
335# CONFIG_MAC80211 is not set 318# CONFIG_MAC80211 is not set
336# CONFIG_IEEE80211 is not set 319# CONFIG_IEEE80211 is not set
337# CONFIG_RFKILL is not set 320# CONFIG_RFKILL is not set
321# CONFIG_NET_9P is not set
338 322
339# 323#
340# Device Drivers 324# Device Drivers
@@ -347,12 +331,7 @@ CONFIG_STANDALONE=y
347CONFIG_PREVENT_FIRMWARE_BUILD=y 331CONFIG_PREVENT_FIRMWARE_BUILD=y
348CONFIG_FW_LOADER=y 332CONFIG_FW_LOADER=y
349# CONFIG_SYS_HYPERVISOR is not set 333# CONFIG_SYS_HYPERVISOR is not set
350 334# CONFIG_CONNECTOR is not set
351#
352# Connector - unified userspace <-> kernelspace linker
353#
354CONFIG_CONNECTOR=y
355CONFIG_PROC_EVENTS=y
356CONFIG_MTD=y 335CONFIG_MTD=y
357# CONFIG_MTD_DEBUG is not set 336# CONFIG_MTD_DEBUG is not set
358# CONFIG_MTD_CONCAT is not set 337# CONFIG_MTD_CONCAT is not set
@@ -430,20 +409,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
430# UBI - Unsorted block images 409# UBI - Unsorted block images
431# 410#
432# CONFIG_MTD_UBI is not set 411# CONFIG_MTD_UBI is not set
433
434#
435# Parallel port support
436#
437# CONFIG_PARPORT is not set 412# CONFIG_PARPORT is not set
438 413CONFIG_BLK_DEV=y
439#
440# Plug and Play support
441#
442# CONFIG_PNPACPI is not set
443
444#
445# Block devices
446#
447# CONFIG_BLK_CPQ_DA is not set 414# CONFIG_BLK_CPQ_DA is not set
448# CONFIG_BLK_CPQ_CISS_DA is not set 415# CONFIG_BLK_CPQ_CISS_DA is not set
449# CONFIG_BLK_DEV_DAC960 is not set 416# CONFIG_BLK_DEV_DAC960 is not set
@@ -453,17 +420,11 @@ CONFIG_BLK_DEV_LOOP=y
453# CONFIG_BLK_DEV_CRYPTOLOOP is not set 420# CONFIG_BLK_DEV_CRYPTOLOOP is not set
454# CONFIG_BLK_DEV_NBD is not set 421# CONFIG_BLK_DEV_NBD is not set
455# CONFIG_BLK_DEV_SX8 is not set 422# CONFIG_BLK_DEV_SX8 is not set
423# CONFIG_BLK_DEV_UB is not set
456# CONFIG_BLK_DEV_RAM is not set 424# CONFIG_BLK_DEV_RAM is not set
457# CONFIG_CDROM_PKTCDVD is not set 425# CONFIG_CDROM_PKTCDVD is not set
458# CONFIG_ATA_OVER_ETH is not set 426# CONFIG_ATA_OVER_ETH is not set
459 427# CONFIG_MISC_DEVICES is not set
460#
461# Misc devices
462#
463# CONFIG_PHANTOM is not set
464# CONFIG_SGI_IOC4 is not set
465# CONFIG_TIFM_CORE is not set
466# CONFIG_BLINK is not set
467# CONFIG_IDE is not set 428# CONFIG_IDE is not set
468 429
469# 430#
@@ -471,6 +432,7 @@ CONFIG_BLK_DEV_LOOP=y
471# 432#
472CONFIG_RAID_ATTRS=y 433CONFIG_RAID_ATTRS=y
473CONFIG_SCSI=y 434CONFIG_SCSI=y
435CONFIG_SCSI_DMA=y
474# CONFIG_SCSI_TGT is not set 436# CONFIG_SCSI_TGT is not set
475# CONFIG_SCSI_NETLINK is not set 437# CONFIG_SCSI_NETLINK is not set
476CONFIG_SCSI_PROC_FS=y 438CONFIG_SCSI_PROC_FS=y
@@ -492,6 +454,7 @@ CONFIG_BLK_DEV_SD=y
492# CONFIG_SCSI_CONSTANTS is not set 454# CONFIG_SCSI_CONSTANTS is not set
493# CONFIG_SCSI_LOGGING is not set 455# CONFIG_SCSI_LOGGING is not set
494# CONFIG_SCSI_SCAN_ASYNC is not set 456# CONFIG_SCSI_SCAN_ASYNC is not set
457CONFIG_SCSI_WAIT_SCAN=m
495 458
496# 459#
497# SCSI Transports 460# SCSI Transports
@@ -499,45 +462,8 @@ CONFIG_BLK_DEV_SD=y
499# CONFIG_SCSI_SPI_ATTRS is not set 462# CONFIG_SCSI_SPI_ATTRS is not set
500# CONFIG_SCSI_FC_ATTRS is not set 463# CONFIG_SCSI_FC_ATTRS is not set
501# CONFIG_SCSI_ISCSI_ATTRS is not set 464# CONFIG_SCSI_ISCSI_ATTRS is not set
502# CONFIG_SCSI_SAS_ATTRS is not set
503# CONFIG_SCSI_SAS_LIBSAS is not set 465# CONFIG_SCSI_SAS_LIBSAS is not set
504 466# CONFIG_SCSI_LOWLEVEL is not set
505#
506# SCSI low-level drivers
507#
508# CONFIG_ISCSI_TCP is not set
509# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
510# CONFIG_SCSI_3W_9XXX is not set
511# CONFIG_SCSI_ACARD is not set
512# CONFIG_SCSI_AACRAID is not set
513# CONFIG_SCSI_AIC7XXX is not set
514# CONFIG_SCSI_AIC7XXX_OLD is not set
515# CONFIG_SCSI_AIC79XX is not set
516# CONFIG_SCSI_AIC94XX is not set
517# CONFIG_SCSI_DPT_I2O is not set
518# CONFIG_SCSI_ARCMSR is not set
519# CONFIG_MEGARAID_NEWGEN is not set
520# CONFIG_MEGARAID_LEGACY is not set
521# CONFIG_MEGARAID_SAS is not set
522# CONFIG_SCSI_HPTIOP is not set
523# CONFIG_SCSI_DMX3191D is not set
524# CONFIG_SCSI_FUTURE_DOMAIN is not set
525# CONFIG_SCSI_IPS is not set
526# CONFIG_SCSI_INITIO is not set
527# CONFIG_SCSI_INIA100 is not set
528# CONFIG_SCSI_STEX is not set
529# CONFIG_SCSI_SYM53C8XX_2 is not set
530# CONFIG_SCSI_IPR is not set
531# CONFIG_SCSI_QLOGIC_1280 is not set
532# CONFIG_SCSI_QLA_FC is not set
533# CONFIG_SCSI_QLA_ISCSI is not set
534# CONFIG_SCSI_LPFC is not set
535# CONFIG_SCSI_DC395x is not set
536# CONFIG_SCSI_DC390T is not set
537# CONFIG_SCSI_NSP32 is not set
538# CONFIG_SCSI_DEBUG is not set
539# CONFIG_SCSI_ESP_CORE is not set
540# CONFIG_SCSI_SRP is not set
541CONFIG_ATA=y 467CONFIG_ATA=y
542# CONFIG_ATA_NONSTANDARD is not set 468# CONFIG_ATA_NONSTANDARD is not set
543# CONFIG_SATA_AHCI is not set 469# CONFIG_SATA_AHCI is not set
@@ -593,10 +519,6 @@ CONFIG_ATA=y
593CONFIG_PATA_VIA=y 519CONFIG_PATA_VIA=y
594# CONFIG_PATA_WINBOND is not set 520# CONFIG_PATA_WINBOND is not set
595# CONFIG_PATA_PLATFORM is not set 521# CONFIG_PATA_PLATFORM is not set
596
597#
598# Multi-device support (RAID and LVM)
599#
600# CONFIG_MD is not set 522# CONFIG_MD is not set
601 523
602# 524#
@@ -612,41 +534,24 @@ CONFIG_PATA_VIA=y
612# 534#
613# CONFIG_FIREWIRE is not set 535# CONFIG_FIREWIRE is not set
614# CONFIG_IEEE1394 is not set 536# CONFIG_IEEE1394 is not set
615
616#
617# I2O device support
618#
619# CONFIG_I2O is not set 537# CONFIG_I2O is not set
620
621#
622# Network device support
623#
624CONFIG_NETDEVICES=y 538CONFIG_NETDEVICES=y
539# CONFIG_NETDEVICES_MULTIQUEUE is not set
625# CONFIG_DUMMY is not set 540# CONFIG_DUMMY is not set
626# CONFIG_BONDING is not set 541# CONFIG_BONDING is not set
542# CONFIG_MACVLAN is not set
627# CONFIG_EQUALIZER is not set 543# CONFIG_EQUALIZER is not set
628# CONFIG_TUN is not set 544# CONFIG_TUN is not set
629
630#
631# ARCnet devices
632#
633# CONFIG_ARCNET is not set 545# CONFIG_ARCNET is not set
634# CONFIG_PHYLIB is not set 546# CONFIG_PHYLIB is not set
635
636#
637# Ethernet (10 or 100Mbit)
638#
639CONFIG_NET_ETHERNET=y 547CONFIG_NET_ETHERNET=y
640# CONFIG_MII is not set 548# CONFIG_MII is not set
549# CONFIG_AX88796 is not set
641# CONFIG_HAPPYMEAL is not set 550# CONFIG_HAPPYMEAL is not set
642# CONFIG_SUNGEM is not set 551# CONFIG_SUNGEM is not set
643# CONFIG_CASSINI is not set 552# CONFIG_CASSINI is not set
644# CONFIG_NET_VENDOR_3COM is not set 553# CONFIG_NET_VENDOR_3COM is not set
645# CONFIG_DM9000 is not set 554# CONFIG_DM9000 is not set
646
647#
648# Tulip family network device support
649#
650CONFIG_NET_TULIP=y 555CONFIG_NET_TULIP=y
651CONFIG_DE2104X=y 556CONFIG_DE2104X=y
652CONFIG_TULIP=y 557CONFIG_TULIP=y
@@ -661,10 +566,6 @@ CONFIG_TULIP=y
661# CONFIG_NET_PCI is not set 566# CONFIG_NET_PCI is not set
662# CONFIG_NETDEV_1000 is not set 567# CONFIG_NETDEV_1000 is not set
663# CONFIG_NETDEV_10000 is not set 568# CONFIG_NETDEV_10000 is not set
664
665#
666# Token Ring devices
667#
668# CONFIG_TR is not set 569# CONFIG_TR is not set
669 570
670# 571#
@@ -672,6 +573,16 @@ CONFIG_TULIP=y
672# 573#
673# CONFIG_WLAN_PRE80211 is not set 574# CONFIG_WLAN_PRE80211 is not set
674# CONFIG_WLAN_80211 is not set 575# CONFIG_WLAN_80211 is not set
576
577#
578# USB Network Adapters
579#
580# CONFIG_USB_CATC is not set
581# CONFIG_USB_KAWETH is not set
582# CONFIG_USB_PEGASUS is not set
583# CONFIG_USB_RTL8150 is not set
584# CONFIG_USB_USBNET_MII is not set
585# CONFIG_USB_USBNET is not set
675# CONFIG_WAN is not set 586# CONFIG_WAN is not set
676# CONFIG_FDDI is not set 587# CONFIG_FDDI is not set
677# CONFIG_HIPPI is not set 588# CONFIG_HIPPI is not set
@@ -682,15 +593,7 @@ CONFIG_TULIP=y
682# CONFIG_NETCONSOLE is not set 593# CONFIG_NETCONSOLE is not set
683# CONFIG_NETPOLL is not set 594# CONFIG_NETPOLL is not set
684# CONFIG_NET_POLL_CONTROLLER is not set 595# CONFIG_NET_POLL_CONTROLLER is not set
685
686#
687# ISDN subsystem
688#
689# CONFIG_ISDN is not set 596# CONFIG_ISDN is not set
690
691#
692# Telephony Support
693#
694# CONFIG_PHONE is not set 597# CONFIG_PHONE is not set
695 598
696# 599#
@@ -698,6 +601,7 @@ CONFIG_TULIP=y
698# 601#
699CONFIG_INPUT=y 602CONFIG_INPUT=y
700# CONFIG_INPUT_FF_MEMLESS is not set 603# CONFIG_INPUT_FF_MEMLESS is not set
604CONFIG_INPUT_POLLDEV=y
701 605
702# 606#
703# Userland interfaces 607# Userland interfaces
@@ -705,7 +609,7 @@ CONFIG_INPUT=y
705# CONFIG_INPUT_MOUSEDEV is not set 609# CONFIG_INPUT_MOUSEDEV is not set
706# CONFIG_INPUT_JOYDEV is not set 610# CONFIG_INPUT_JOYDEV is not set
707# CONFIG_INPUT_TSDEV is not set 611# CONFIG_INPUT_TSDEV is not set
708# CONFIG_INPUT_EVDEV is not set 612CONFIG_INPUT_EVDEV=y
709# CONFIG_INPUT_EVBUG is not set 613# CONFIG_INPUT_EVBUG is not set
710 614
711# 615#
@@ -725,7 +629,6 @@ CONFIG_INPUT_COBALT_BTNS=y
725# CONFIG_INPUT_POWERMATE is not set 629# CONFIG_INPUT_POWERMATE is not set
726# CONFIG_INPUT_YEALINK is not set 630# CONFIG_INPUT_YEALINK is not set
727# CONFIG_INPUT_UINPUT is not set 631# CONFIG_INPUT_UINPUT is not set
728CONFIG_INPUT_POLLDEV=y
729 632
730# 633#
731# Hardware I/O ports 634# Hardware I/O ports
@@ -761,24 +664,15 @@ CONFIG_SERIAL_CORE_CONSOLE=y
761CONFIG_UNIX98_PTYS=y 664CONFIG_UNIX98_PTYS=y
762CONFIG_LEGACY_PTYS=y 665CONFIG_LEGACY_PTYS=y
763CONFIG_LEGACY_PTY_COUNT=256 666CONFIG_LEGACY_PTY_COUNT=256
764
765#
766# IPMI
767#
768# CONFIG_IPMI_HANDLER is not set 667# CONFIG_IPMI_HANDLER is not set
769# CONFIG_WATCHDOG is not set 668# CONFIG_WATCHDOG is not set
770# CONFIG_HW_RANDOM is not set 669# CONFIG_HW_RANDOM is not set
771# CONFIG_RTC is not set 670# CONFIG_RTC is not set
772# CONFIG_GEN_RTC is not set
773CONFIG_COBALT_LCD=y 671CONFIG_COBALT_LCD=y
774# CONFIG_R3964 is not set 672# CONFIG_R3964 is not set
775# CONFIG_APPLICOM is not set 673# CONFIG_APPLICOM is not set
776# CONFIG_DRM is not set 674# CONFIG_DRM is not set
777# CONFIG_RAW_DRIVER is not set 675# CONFIG_RAW_DRIVER is not set
778
779#
780# TPM devices
781#
782# CONFIG_TCG_TPM is not set 676# CONFIG_TCG_TPM is not set
783CONFIG_DEVPORT=y 677CONFIG_DEVPORT=y
784# CONFIG_I2C is not set 678# CONFIG_I2C is not set
@@ -788,11 +682,8 @@ CONFIG_DEVPORT=y
788# 682#
789# CONFIG_SPI is not set 683# CONFIG_SPI is not set
790# CONFIG_SPI_MASTER is not set 684# CONFIG_SPI_MASTER is not set
791
792#
793# Dallas's 1-wire bus
794#
795# CONFIG_W1 is not set 685# CONFIG_W1 is not set
686# CONFIG_POWER_SUPPLY is not set
796# CONFIG_HWMON is not set 687# CONFIG_HWMON is not set
797 688
798# 689#
@@ -817,6 +708,7 @@ CONFIG_DEVPORT=y
817# 708#
818# CONFIG_DISPLAY_SUPPORT is not set 709# CONFIG_DISPLAY_SUPPORT is not set
819# CONFIG_VGASTATE is not set 710# CONFIG_VGASTATE is not set
711# CONFIG_VIDEO_OUTPUT_CONTROL is not set
820# CONFIG_FB is not set 712# CONFIG_FB is not set
821 713
822# 714#
@@ -829,55 +721,131 @@ CONFIG_DUMMY_CONSOLE=y
829# Sound 721# Sound
830# 722#
831# CONFIG_SOUND is not set 723# CONFIG_SOUND is not set
724CONFIG_HID_SUPPORT=y
725CONFIG_HID=m
726# CONFIG_HID_DEBUG is not set
832 727
833# 728#
834# HID Devices 729# USB Input Devices
835# 730#
836# CONFIG_HID is not set 731CONFIG_USB_HID=m
732# CONFIG_USB_HIDINPUT_POWERBOOK is not set
733# CONFIG_HID_FF is not set
734# CONFIG_USB_HIDDEV is not set
837 735
838# 736#
839# USB support 737# USB HID Boot Protocol drivers
840# 738#
739# CONFIG_USB_KBD is not set
740# CONFIG_USB_MOUSE is not set
741CONFIG_USB_SUPPORT=y
841CONFIG_USB_ARCH_HAS_HCD=y 742CONFIG_USB_ARCH_HAS_HCD=y
842CONFIG_USB_ARCH_HAS_OHCI=y 743CONFIG_USB_ARCH_HAS_OHCI=y
843CONFIG_USB_ARCH_HAS_EHCI=y 744CONFIG_USB_ARCH_HAS_EHCI=y
844# CONFIG_USB is not set 745CONFIG_USB=m
746# CONFIG_USB_DEBUG is not set
747
748#
749# Miscellaneous USB options
750#
751# CONFIG_USB_DEVICEFS is not set
752# CONFIG_USB_DEVICE_CLASS is not set
753# CONFIG_USB_DYNAMIC_MINORS is not set
754# CONFIG_USB_OTG is not set
755
756#
757# USB Host Controller Drivers
758#
759CONFIG_USB_EHCI_HCD=m
760# CONFIG_USB_EHCI_SPLIT_ISO is not set
761# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
762# CONFIG_USB_EHCI_TT_NEWSCHED is not set
763# CONFIG_USB_ISP116X_HCD is not set
764CONFIG_USB_OHCI_HCD=m
765# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
766# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
767CONFIG_USB_OHCI_LITTLE_ENDIAN=y
768# CONFIG_USB_UHCI_HCD is not set
769# CONFIG_USB_SL811_HCD is not set
770# CONFIG_USB_R8A66597_HCD is not set
771
772#
773# USB Device Class drivers
774#
775# CONFIG_USB_ACM is not set
776# CONFIG_USB_PRINTER is not set
845 777
846# 778#
847# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 779# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
848# 780#
849 781
850# 782#
851# USB Gadget Support 783# may also be needed; see USB_STORAGE Help for more information
852# 784#
853# CONFIG_USB_GADGET is not set 785CONFIG_USB_STORAGE=m
854# CONFIG_MMC is not set 786# CONFIG_USB_STORAGE_DEBUG is not set
787# CONFIG_USB_STORAGE_DATAFAB is not set
788# CONFIG_USB_STORAGE_FREECOM is not set
789# CONFIG_USB_STORAGE_DPCM is not set
790# CONFIG_USB_STORAGE_USBAT is not set
791# CONFIG_USB_STORAGE_SDDR09 is not set
792# CONFIG_USB_STORAGE_SDDR55 is not set
793# CONFIG_USB_STORAGE_JUMPSHOT is not set
794# CONFIG_USB_STORAGE_ALAUDA is not set
795# CONFIG_USB_STORAGE_ONETOUCH is not set
796# CONFIG_USB_STORAGE_KARMA is not set
797# CONFIG_USB_LIBUSUAL is not set
855 798
856# 799#
857# LED devices 800# USB Imaging devices
858# 801#
859# CONFIG_NEW_LEDS is not set 802# CONFIG_USB_MDC800 is not set
803# CONFIG_USB_MICROTEK is not set
804CONFIG_USB_MON=y
860 805
861# 806#
862# LED drivers 807# USB port drivers
863# 808#
864 809
865# 810#
866# LED Triggers 811# USB Serial Converter support
867# 812#
813# CONFIG_USB_SERIAL is not set
868 814
869# 815#
870# InfiniBand support 816# USB Miscellaneous drivers
871# 817#
872# CONFIG_INFINIBAND is not set 818# CONFIG_USB_EMI62 is not set
819# CONFIG_USB_EMI26 is not set
820# CONFIG_USB_ADUTUX is not set
821# CONFIG_USB_AUERSWALD is not set
822# CONFIG_USB_RIO500 is not set
823# CONFIG_USB_LEGOTOWER is not set
824# CONFIG_USB_LCD is not set
825# CONFIG_USB_BERRY_CHARGE is not set
826# CONFIG_USB_LED is not set
827# CONFIG_USB_CYPRESS_CY7C63 is not set
828# CONFIG_USB_CYTHERM is not set
829# CONFIG_USB_PHIDGET is not set
830# CONFIG_USB_IDMOUSE is not set
831# CONFIG_USB_FTDI_ELAN is not set
832# CONFIG_USB_APPLEDISPLAY is not set
833# CONFIG_USB_SISUSBVGA is not set
834# CONFIG_USB_LD is not set
835# CONFIG_USB_TRANCEVIBRATOR is not set
836# CONFIG_USB_IOWARRIOR is not set
873 837
874# 838#
875# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 839# USB DSL modem support
876# 840#
877 841
878# 842#
879# Real Time Clock 843# USB Gadget Support
880# 844#
845# CONFIG_USB_GADGET is not set
846# CONFIG_MMC is not set
847# CONFIG_NEW_LEDS is not set
848# CONFIG_INFINIBAND is not set
881CONFIG_RTC_LIB=y 849CONFIG_RTC_LIB=y
882CONFIG_RTC_CLASS=y 850CONFIG_RTC_CLASS=y
883CONFIG_RTC_HCTOSYS=y 851CONFIG_RTC_HCTOSYS=y
@@ -894,10 +862,6 @@ CONFIG_RTC_INTF_DEV=y
894# CONFIG_RTC_DRV_TEST is not set 862# CONFIG_RTC_DRV_TEST is not set
895 863
896# 864#
897# I2C RTC drivers
898#
899
900#
901# SPI RTC drivers 865# SPI RTC drivers
902# 866#
903 867
@@ -906,8 +870,10 @@ CONFIG_RTC_INTF_DEV=y
906# 870#
907CONFIG_RTC_DRV_CMOS=y 871CONFIG_RTC_DRV_CMOS=y
908# CONFIG_RTC_DRV_DS1553 is not set 872# CONFIG_RTC_DRV_DS1553 is not set
873# CONFIG_RTC_DRV_STK17TA8 is not set
909# CONFIG_RTC_DRV_DS1742 is not set 874# CONFIG_RTC_DRV_DS1742 is not set
910# CONFIG_RTC_DRV_M48T86 is not set 875# CONFIG_RTC_DRV_M48T86 is not set
876# CONFIG_RTC_DRV_M48T59 is not set
911# CONFIG_RTC_DRV_V3020 is not set 877# CONFIG_RTC_DRV_V3020 is not set
912 878
913# 879#
@@ -928,6 +894,11 @@ CONFIG_RTC_DRV_CMOS=y
928# 894#
929 895
930# 896#
897# Userspace I/O
898#
899# CONFIG_UIO is not set
900
901#
931# File systems 902# File systems
932# 903#
933CONFIG_EXT2_FS=y 904CONFIG_EXT2_FS=y
@@ -1032,7 +1003,6 @@ CONFIG_SUNRPC=y
1032# CONFIG_NCP_FS is not set 1003# CONFIG_NCP_FS is not set
1033# CONFIG_CODA_FS is not set 1004# CONFIG_CODA_FS is not set
1034# CONFIG_AFS_FS is not set 1005# CONFIG_AFS_FS is not set
1035# CONFIG_9P_FS is not set
1036 1006
1037# 1007#
1038# Partition Types 1008# Partition Types
@@ -1074,10 +1044,6 @@ CONFIG_CMDLINE=""
1074# 1044#
1075# CONFIG_KEYS is not set 1045# CONFIG_KEYS is not set
1076# CONFIG_SECURITY is not set 1046# CONFIG_SECURITY is not set
1077
1078#
1079# Cryptographic options
1080#
1081# CONFIG_CRYPTO is not set 1047# CONFIG_CRYPTO is not set
1082 1048
1083# 1049#
@@ -1088,6 +1054,7 @@ CONFIG_BITREVERSE=y
1088# CONFIG_CRC16 is not set 1054# CONFIG_CRC16 is not set
1089# CONFIG_CRC_ITU_T is not set 1055# CONFIG_CRC_ITU_T is not set
1090CONFIG_CRC32=y 1056CONFIG_CRC32=y
1057# CONFIG_CRC7 is not set
1091CONFIG_LIBCRC32C=y 1058CONFIG_LIBCRC32C=y
1092CONFIG_PLIST=y 1059CONFIG_PLIST=y
1093CONFIG_HAS_IOMEM=y 1060CONFIG_HAS_IOMEM=y
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig
index 5467d750b6eb..d0d07faeb844 100644
--- a/arch/mips/configs/e55_defconfig
+++ b/arch/mips/configs/e55_defconfig
@@ -1,60 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:28 2007 4# Wed Aug 8 10:36:25 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58CONFIG_CASIO_E55=y 45CONFIG_CASIO_E55=y
59# CONFIG_IBM_WORKPAD is not set 46# CONFIG_IBM_WORKPAD is not set
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
72CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 59CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
73CONFIG_DMA_NONCOHERENT=y 60CONFIG_DMA_NONCOHERENT=y
74CONFIG_DMA_NEED_PCI_MAP_STATE=y 61CONFIG_DMA_NEED_PCI_MAP_STATE=y
62# CONFIG_HOTPLUG_CPU is not set
63# CONFIG_NO_IOPORT is not set
75# CONFIG_CPU_BIG_ENDIAN is not set 64# CONFIG_CPU_BIG_ENDIAN is not set
76CONFIG_CPU_LITTLE_ENDIAN=y 65CONFIG_CPU_LITTLE_ENDIAN=y
77CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 66CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
81# 70#
82# CPU selection 71# CPU selection
83# 72#
73# CONFIG_CPU_LOONGSON2 is not set
84# CONFIG_CPU_MIPS32_R1 is not set 74# CONFIG_CPU_MIPS32_R1 is not set
85# CONFIG_CPU_MIPS32_R2 is not set 75# CONFIG_CPU_MIPS32_R2 is not set
86# CONFIG_CPU_MIPS64_R1 is not set 76# CONFIG_CPU_MIPS64_R1 is not set
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y
102# CONFIG_CPU_SB1 is not set 92# CONFIG_CPU_SB1 is not set
103CONFIG_SYS_HAS_CPU_VR41XX=y 93CONFIG_SYS_HAS_CPU_VR41XX=y
104CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 94CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
105CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
106CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 95CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 96CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
108 97
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y
118CONFIG_MIPS_MT_DISABLED=y 107CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMP is not set 108# CONFIG_MIPS_MT_SMP is not set
120# CONFIG_MIPS_MT_SMTC is not set 109# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_CPU_HAS_SYNC=y 110CONFIG_CPU_HAS_SYNC=y
123CONFIG_GENERIC_HARDIRQS=y 111CONFIG_GENERIC_HARDIRQS=y
124CONFIG_GENERIC_IRQ_PROBE=y 112CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,45 +120,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y
132# CONFIG_SPARSEMEM_STATIC is not set 120# CONFIG_SPARSEMEM_STATIC is not set
133CONFIG_SPLIT_PTLOCK_CPUS=4 121CONFIG_SPLIT_PTLOCK_CPUS=4
134# CONFIG_RESOURCES_64BIT is not set 122# CONFIG_RESOURCES_64BIT is not set
135CONFIG_ZONE_DMA_FLAG=1 123CONFIG_ZONE_DMA_FLAG=0
124CONFIG_VIRT_TO_BUS=y
136# CONFIG_HZ_48 is not set 125# CONFIG_HZ_48 is not set
137# CONFIG_HZ_100 is not set 126# CONFIG_HZ_100 is not set
138# CONFIG_HZ_128 is not set 127# CONFIG_HZ_128 is not set
139# CONFIG_HZ_250 is not set 128CONFIG_HZ_250=y
140# CONFIG_HZ_256 is not set 129# CONFIG_HZ_256 is not set
141CONFIG_HZ_1000=y 130# CONFIG_HZ_1000 is not set
142# CONFIG_HZ_1024 is not set 131# CONFIG_HZ_1024 is not set
143CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 132CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
144CONFIG_HZ=1000 133CONFIG_HZ=250
145CONFIG_PREEMPT_NONE=y 134CONFIG_PREEMPT_NONE=y
146# CONFIG_PREEMPT_VOLUNTARY is not set 135# CONFIG_PREEMPT_VOLUNTARY is not set
147# CONFIG_PREEMPT is not set 136# CONFIG_PREEMPT is not set
148# CONFIG_KEXEC is not set 137# CONFIG_KEXEC is not set
138CONFIG_SECCOMP=y
149CONFIG_LOCKDEP_SUPPORT=y 139CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 140CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 141CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
152 142
153# 143#
154# Code maturity level options 144# General setup
155# 145#
156CONFIG_EXPERIMENTAL=y 146CONFIG_EXPERIMENTAL=y
157CONFIG_BROKEN_ON_SMP=y 147CONFIG_BROKEN_ON_SMP=y
158CONFIG_INIT_ENV_ARG_LIMIT=32 148CONFIG_INIT_ENV_ARG_LIMIT=32
159
160#
161# General setup
162#
163CONFIG_LOCALVERSION="" 149CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y 150CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 151CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 152CONFIG_SYSVIPC=y
167# CONFIG_IPC_NS is not set
168CONFIG_SYSVIPC_SYSCTL=y 153CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_BSD_PROCESS_ACCT is not set 154# CONFIG_BSD_PROCESS_ACCT is not set
170# CONFIG_UTS_NS is not set 155# CONFIG_USER_NS is not set
171# CONFIG_IKCONFIG is not set 156# CONFIG_IKCONFIG is not set
157CONFIG_LOG_BUF_SHIFT=14
172CONFIG_SYSFS_DEPRECATED=y 158CONFIG_SYSFS_DEPRECATED=y
173# CONFIG_RELAY is not set 159# CONFIG_RELAY is not set
160# CONFIG_BLK_DEV_INITRD is not set
174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 161# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
175CONFIG_SYSCTL=y 162CONFIG_SYSCTL=y
176CONFIG_EMBEDDED=y 163CONFIG_EMBEDDED=y
@@ -183,32 +170,30 @@ CONFIG_BUG=y
183CONFIG_ELF_CORE=y 170CONFIG_ELF_CORE=y
184CONFIG_BASE_FULL=y 171CONFIG_BASE_FULL=y
185CONFIG_FUTEX=y 172CONFIG_FUTEX=y
173CONFIG_ANON_INODES=y
186CONFIG_EPOLL=y 174CONFIG_EPOLL=y
175CONFIG_SIGNALFD=y
176CONFIG_TIMERFD=y
177CONFIG_EVENTFD=y
187CONFIG_SHMEM=y 178CONFIG_SHMEM=y
188CONFIG_SLAB=y
189CONFIG_VM_EVENT_COUNTERS=y 179CONFIG_VM_EVENT_COUNTERS=y
180CONFIG_SLAB=y
181# CONFIG_SLUB is not set
182# CONFIG_SLOB is not set
190CONFIG_RT_MUTEXES=y 183CONFIG_RT_MUTEXES=y
191# CONFIG_TINY_SHMEM is not set 184# CONFIG_TINY_SHMEM is not set
192CONFIG_BASE_SMALL=0 185CONFIG_BASE_SMALL=0
193# CONFIG_SLOB is not set
194
195#
196# Loadable module support
197#
198CONFIG_MODULES=y 186CONFIG_MODULES=y
199CONFIG_MODULE_UNLOAD=y 187CONFIG_MODULE_UNLOAD=y
200# CONFIG_MODULE_FORCE_UNLOAD is not set 188CONFIG_MODULE_FORCE_UNLOAD=y
201CONFIG_MODVERSIONS=y 189CONFIG_MODVERSIONS=y
202CONFIG_MODULE_SRCVERSION_ALL=y 190CONFIG_MODULE_SRCVERSION_ALL=y
203CONFIG_KMOD=y 191CONFIG_KMOD=y
204
205#
206# Block layer
207#
208CONFIG_BLOCK=y 192CONFIG_BLOCK=y
209# CONFIG_LBD is not set 193# CONFIG_LBD is not set
210# CONFIG_BLK_DEV_IO_TRACE is not set 194# CONFIG_BLK_DEV_IO_TRACE is not set
211# CONFIG_LSF is not set 195# CONFIG_LSF is not set
196# CONFIG_BLK_DEV_BSG is not set
212 197
213# 198#
214# IO Schedulers 199# IO Schedulers
@@ -226,6 +211,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
226# 211#
227# Bus options (PCI, PCMCIA, EISA, ISA, TC) 212# Bus options (PCI, PCMCIA, EISA, ISA, TC)
228# 213#
214# CONFIG_ARCH_SUPPORTS_MSI is not set
229CONFIG_ISA=y 215CONFIG_ISA=y
230CONFIG_MMU=y 216CONFIG_MMU=y
231 217
@@ -234,10 +220,6 @@ CONFIG_MMU=y
234# 220#
235 221
236# 222#
237# PCI Hotplug Support
238#
239
240#
241# Executable file formats 223# Executable file formats
242# 224#
243CONFIG_BINFMT_ELF=y 225CONFIG_BINFMT_ELF=y
@@ -247,10 +229,7 @@ CONFIG_TRAD_SIGNALS=y
247# 229#
248# Power management options 230# Power management options
249# 231#
250CONFIG_PM=y 232# CONFIG_PM is not set
251# CONFIG_PM_LEGACY is not set
252# CONFIG_PM_DEBUG is not set
253# CONFIG_PM_SYSFS_DEPRECATED is not set
254 233
255# 234#
256# Networking 235# Networking
@@ -267,46 +246,18 @@ CONFIG_PM=y
267CONFIG_STANDALONE=y 246CONFIG_STANDALONE=y
268CONFIG_PREVENT_FIRMWARE_BUILD=y 247CONFIG_PREVENT_FIRMWARE_BUILD=y
269# CONFIG_SYS_HYPERVISOR is not set 248# CONFIG_SYS_HYPERVISOR is not set
270
271#
272# Connector - unified userspace <-> kernelspace linker
273#
274
275#
276# Memory Technology Devices (MTD)
277#
278# CONFIG_MTD is not set 249# CONFIG_MTD is not set
279
280#
281# Parallel port support
282#
283# CONFIG_PARPORT is not set 250# CONFIG_PARPORT is not set
284
285#
286# Plug and Play support
287#
288# CONFIG_PNP is not set 251# CONFIG_PNP is not set
289# CONFIG_PNPACPI is not set 252CONFIG_BLK_DEV=y
290
291#
292# Block devices
293#
294# CONFIG_BLK_DEV_COW_COMMON is not set 253# CONFIG_BLK_DEV_COW_COMMON is not set
295# CONFIG_BLK_DEV_LOOP is not set 254# CONFIG_BLK_DEV_LOOP is not set
296CONFIG_BLK_DEV_RAM=m 255CONFIG_BLK_DEV_RAM=y
297CONFIG_BLK_DEV_RAM_COUNT=16 256CONFIG_BLK_DEV_RAM_COUNT=16
298CONFIG_BLK_DEV_RAM_SIZE=4096 257CONFIG_BLK_DEV_RAM_SIZE=4096
299CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 258CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
300# CONFIG_BLK_DEV_INITRD is not set
301# CONFIG_CDROM_PKTCDVD is not set 259# CONFIG_CDROM_PKTCDVD is not set
302 260# CONFIG_MISC_DEVICES is not set
303#
304# Misc devices
305#
306
307#
308# ATA/ATAPI/MFM/RLL support
309#
310CONFIG_IDE=y 261CONFIG_IDE=y
311CONFIG_IDE_MAX_HWIFS=4 262CONFIG_IDE_MAX_HWIFS=4
312CONFIG_BLK_DEV_IDE=y 263CONFIG_BLK_DEV_IDE=y
@@ -321,15 +272,16 @@ CONFIG_BLK_DEV_IDEDISK=y
321# CONFIG_BLK_DEV_IDETAPE is not set 272# CONFIG_BLK_DEV_IDETAPE is not set
322# CONFIG_BLK_DEV_IDEFLOPPY is not set 273# CONFIG_BLK_DEV_IDEFLOPPY is not set
323# CONFIG_IDE_TASK_IOCTL is not set 274# CONFIG_IDE_TASK_IOCTL is not set
275CONFIG_IDE_PROC_FS=y
324 276
325# 277#
326# IDE chipset support/bugfixes 278# IDE chipset support/bugfixes
327# 279#
328CONFIG_IDE_GENERIC=y 280CONFIG_IDE_GENERIC=y
281# CONFIG_IDEPCI_PCIBUS_ORDER is not set
329# CONFIG_IDE_ARM is not set 282# CONFIG_IDE_ARM is not set
330# CONFIG_IDE_CHIPSETS is not set 283# CONFIG_IDE_CHIPSETS is not set
331# CONFIG_BLK_DEV_IDEDMA is not set 284# CONFIG_BLK_DEV_IDEDMA is not set
332# CONFIG_IDEDMA_AUTO is not set
333# CONFIG_BLK_DEV_HD is not set 285# CONFIG_BLK_DEV_HD is not set
334 286
335# 287#
@@ -337,43 +289,10 @@ CONFIG_IDE_GENERIC=y
337# 289#
338# CONFIG_RAID_ATTRS is not set 290# CONFIG_RAID_ATTRS is not set
339# CONFIG_SCSI is not set 291# CONFIG_SCSI is not set
292# CONFIG_SCSI_DMA is not set
340# CONFIG_SCSI_NETLINK is not set 293# CONFIG_SCSI_NETLINK is not set
341
342#
343# Serial ATA (prod) and Parallel ATA (experimental) drivers
344#
345# CONFIG_ATA is not set 294# CONFIG_ATA is not set
346
347#
348# Old CD-ROM drivers (not SCSI, not IDE)
349#
350# CONFIG_CD_NO_IDESCSI is not set
351
352#
353# Multi-device support (RAID and LVM)
354#
355# CONFIG_MD is not set 295# CONFIG_MD is not set
356
357#
358# Fusion MPT device support
359#
360# CONFIG_FUSION is not set
361
362#
363# IEEE 1394 (FireWire) support
364#
365
366#
367# I2O device support
368#
369
370#
371# ISDN subsystem
372#
373
374#
375# Telephony Support
376#
377# CONFIG_PHONE is not set 296# CONFIG_PHONE is not set
378 297
379# 298#
@@ -381,14 +300,12 @@ CONFIG_IDE_GENERIC=y
381# 300#
382CONFIG_INPUT=y 301CONFIG_INPUT=y
383# CONFIG_INPUT_FF_MEMLESS is not set 302# CONFIG_INPUT_FF_MEMLESS is not set
303# CONFIG_INPUT_POLLDEV is not set
384 304
385# 305#
386# Userland interfaces 306# Userland interfaces
387# 307#
388CONFIG_INPUT_MOUSEDEV=y 308# CONFIG_INPUT_MOUSEDEV is not set
389CONFIG_INPUT_MOUSEDEV_PSAUX=y
390CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
391CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
392# CONFIG_INPUT_JOYDEV is not set 309# CONFIG_INPUT_JOYDEV is not set
393# CONFIG_INPUT_TSDEV is not set 310# CONFIG_INPUT_TSDEV is not set
394# CONFIG_INPUT_EVDEV is not set 311# CONFIG_INPUT_EVDEV is not set
@@ -400,6 +317,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
400# CONFIG_INPUT_KEYBOARD is not set 317# CONFIG_INPUT_KEYBOARD is not set
401# CONFIG_INPUT_MOUSE is not set 318# CONFIG_INPUT_MOUSE is not set
402# CONFIG_INPUT_JOYSTICK is not set 319# CONFIG_INPUT_JOYSTICK is not set
320# CONFIG_INPUT_TABLET is not set
403# CONFIG_INPUT_TOUCHSCREEN is not set 321# CONFIG_INPUT_TOUCHSCREEN is not set
404# CONFIG_INPUT_MISC is not set 322# CONFIG_INPUT_MISC is not set
405 323
@@ -433,45 +351,16 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
433CONFIG_UNIX98_PTYS=y 351CONFIG_UNIX98_PTYS=y
434CONFIG_LEGACY_PTYS=y 352CONFIG_LEGACY_PTYS=y
435CONFIG_LEGACY_PTY_COUNT=256 353CONFIG_LEGACY_PTY_COUNT=256
436
437#
438# IPMI
439#
440# CONFIG_IPMI_HANDLER is not set 354# CONFIG_IPMI_HANDLER is not set
441 355# CONFIG_WATCHDOG is not set
442#
443# Watchdog Cards
444#
445CONFIG_WATCHDOG=y
446# CONFIG_WATCHDOG_NOWAYOUT is not set
447
448#
449# Watchdog Device Drivers
450#
451# CONFIG_SOFT_WATCHDOG is not set
452
453#
454# ISA-based Watchdog Cards
455#
456# CONFIG_PCWATCHDOG is not set
457# CONFIG_MIXCOMWD is not set
458# CONFIG_WDT is not set
459# CONFIG_HW_RANDOM is not set 356# CONFIG_HW_RANDOM is not set
460# CONFIG_RTC is not set 357# CONFIG_RTC is not set
461# CONFIG_GEN_RTC is not set
462# CONFIG_DTLK is not set 358# CONFIG_DTLK is not set
463# CONFIG_R3964 is not set 359# CONFIG_R3964 is not set
464CONFIG_GPIO_VR41XX=y 360CONFIG_GPIO_VR41XX=y
465# CONFIG_RAW_DRIVER is not set 361# CONFIG_RAW_DRIVER is not set
466
467#
468# TPM devices
469#
470# CONFIG_TCG_TPM is not set 362# CONFIG_TCG_TPM is not set
471 363CONFIG_DEVPORT=y
472#
473# I2C support
474#
475# CONFIG_I2C is not set 364# CONFIG_I2C is not set
476 365
477# 366#
@@ -479,31 +368,32 @@ CONFIG_GPIO_VR41XX=y
479# 368#
480# CONFIG_SPI is not set 369# CONFIG_SPI is not set
481# CONFIG_SPI_MASTER is not set 370# CONFIG_SPI_MASTER is not set
482
483#
484# Dallas's 1-wire bus
485#
486# CONFIG_W1 is not set 371# CONFIG_W1 is not set
372# CONFIG_POWER_SUPPLY is not set
373# CONFIG_HWMON is not set
487 374
488# 375#
489# Hardware Monitoring support 376# Multifunction device drivers
490# 377#
491# CONFIG_HWMON is not set 378# CONFIG_MFD_SM501 is not set
492# CONFIG_HWMON_VID is not set
493 379
494# 380#
495# Multimedia devices 381# Multimedia devices
496# 382#
497# CONFIG_VIDEO_DEV is not set 383# CONFIG_VIDEO_DEV is not set
384# CONFIG_DAB is not set
498 385
499# 386#
500# Digital Video Broadcasting Devices 387# Graphics support
501# 388#
389# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
502 390
503# 391#
504# Graphics support 392# Display device support
505# 393#
506# CONFIG_FIRMWARE_EDID is not set 394# CONFIG_DISPLAY_SUPPORT is not set
395# CONFIG_VGASTATE is not set
396# CONFIG_VIDEO_OUTPUT_CONTROL is not set
507# CONFIG_FB is not set 397# CONFIG_FB is not set
508 398
509# 399#
@@ -512,65 +402,49 @@ CONFIG_GPIO_VR41XX=y
512# CONFIG_VGA_CONSOLE is not set 402# CONFIG_VGA_CONSOLE is not set
513# CONFIG_MDA_CONSOLE is not set 403# CONFIG_MDA_CONSOLE is not set
514CONFIG_DUMMY_CONSOLE=y 404CONFIG_DUMMY_CONSOLE=y
515# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
516 405
517# 406#
518# Sound 407# Sound
519# 408#
520# CONFIG_SOUND is not set 409# CONFIG_SOUND is not set
521 410# CONFIG_HID_SUPPORT is not set
522# 411# CONFIG_USB_SUPPORT is not set
523# HID Devices
524#
525CONFIG_HID=y
526# CONFIG_HID_DEBUG is not set
527
528#
529# USB support
530#
531# CONFIG_USB_ARCH_HAS_HCD is not set
532# CONFIG_USB_ARCH_HAS_OHCI is not set
533# CONFIG_USB_ARCH_HAS_EHCI is not set
534
535#
536# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
537#
538
539#
540# USB Gadget Support
541#
542# CONFIG_USB_GADGET is not set
543
544#
545# MMC/SD Card support
546#
547# CONFIG_MMC is not set 412# CONFIG_MMC is not set
548
549#
550# LED devices
551#
552# CONFIG_NEW_LEDS is not set 413# CONFIG_NEW_LEDS is not set
414CONFIG_RTC_LIB=y
415CONFIG_RTC_CLASS=y
416CONFIG_RTC_HCTOSYS=y
417CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
418# CONFIG_RTC_DEBUG is not set
553 419
554# 420#
555# LED drivers 421# RTC interfaces
556# 422#
423CONFIG_RTC_INTF_SYSFS=y
424CONFIG_RTC_INTF_PROC=y
425CONFIG_RTC_INTF_DEV=y
426# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
427# CONFIG_RTC_DRV_TEST is not set
557 428
558# 429#
559# LED Triggers 430# SPI RTC drivers
560# 431#
561 432
562# 433#
563# InfiniBand support 434# Platform RTC drivers
564# 435#
436# CONFIG_RTC_DRV_CMOS is not set
437# CONFIG_RTC_DRV_DS1553 is not set
438# CONFIG_RTC_DRV_STK17TA8 is not set
439# CONFIG_RTC_DRV_DS1742 is not set
440# CONFIG_RTC_DRV_M48T86 is not set
441# CONFIG_RTC_DRV_M48T59 is not set
442# CONFIG_RTC_DRV_V3020 is not set
565 443
566# 444#
567# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 445# on-CPU RTC drivers
568# 446#
569 447CONFIG_RTC_DRV_VR41XX=y
570#
571# Real Time Clock
572#
573# CONFIG_RTC_CLASS is not set
574 448
575# 449#
576# DMA Engine support 450# DMA Engine support
@@ -586,12 +460,9 @@ CONFIG_HID=y
586# 460#
587 461
588# 462#
589# Auxiliary Display support 463# Userspace I/O
590#
591
592#
593# Virtualization
594# 464#
465# CONFIG_UIO is not set
595 466
596# 467#
597# File systems 468# File systems
@@ -599,8 +470,14 @@ CONFIG_HID=y
599CONFIG_EXT2_FS=y 470CONFIG_EXT2_FS=y
600# CONFIG_EXT2_FS_XATTR is not set 471# CONFIG_EXT2_FS_XATTR is not set
601# CONFIG_EXT2_FS_XIP is not set 472# CONFIG_EXT2_FS_XIP is not set
602# CONFIG_EXT3_FS is not set 473CONFIG_EXT3_FS=y
474CONFIG_EXT3_FS_XATTR=y
475# CONFIG_EXT3_FS_POSIX_ACL is not set
476# CONFIG_EXT3_FS_SECURITY is not set
603# CONFIG_EXT4DEV_FS is not set 477# CONFIG_EXT4DEV_FS is not set
478CONFIG_JBD=y
479# CONFIG_JBD_DEBUG is not set
480CONFIG_FS_MBCACHE=y
604# CONFIG_REISERFS_FS is not set 481# CONFIG_REISERFS_FS is not set
605# CONFIG_JFS_FS is not set 482# CONFIG_JFS_FS is not set
606CONFIG_FS_POSIX_ACL=y 483CONFIG_FS_POSIX_ACL=y
@@ -614,7 +491,7 @@ CONFIG_INOTIFY_USER=y
614CONFIG_DNOTIFY=y 491CONFIG_DNOTIFY=y
615# CONFIG_AUTOFS_FS is not set 492# CONFIG_AUTOFS_FS is not set
616CONFIG_AUTOFS4_FS=y 493CONFIG_AUTOFS4_FS=y
617CONFIG_FUSE_FS=m 494# CONFIG_FUSE_FS is not set
618CONFIG_GENERIC_ACL=y 495CONFIG_GENERIC_ACL=y
619 496
620# 497#
@@ -687,7 +564,6 @@ CONFIG_ENABLE_MUST_CHECK=y
687# CONFIG_DEBUG_FS is not set 564# CONFIG_DEBUG_FS is not set
688# CONFIG_HEADERS_CHECK is not set 565# CONFIG_HEADERS_CHECK is not set
689# CONFIG_DEBUG_KERNEL is not set 566# CONFIG_DEBUG_KERNEL is not set
690CONFIG_LOG_BUF_SHIFT=14
691CONFIG_CROSSCOMPILE=y 567CONFIG_CROSSCOMPILE=y
692CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" 568CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
693 569
@@ -696,10 +572,6 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
696# 572#
697# CONFIG_KEYS is not set 573# CONFIG_KEYS is not set
698# CONFIG_SECURITY is not set 574# CONFIG_SECURITY is not set
699
700#
701# Cryptographic options
702#
703# CONFIG_CRYPTO is not set 575# CONFIG_CRYPTO is not set
704 576
705# 577#
@@ -707,8 +579,11 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M"
707# 579#
708# CONFIG_CRC_CCITT is not set 580# CONFIG_CRC_CCITT is not set
709# CONFIG_CRC16 is not set 581# CONFIG_CRC16 is not set
582# CONFIG_CRC_ITU_T is not set
710# CONFIG_CRC32 is not set 583# CONFIG_CRC32 is not set
584# CONFIG_CRC7 is not set
711# CONFIG_LIBCRC32C is not set 585# CONFIG_LIBCRC32C is not set
712CONFIG_PLIST=y 586CONFIG_PLIST=y
713CONFIG_HAS_IOMEM=y 587CONFIG_HAS_IOMEM=y
714CONFIG_HAS_IOPORT=y 588CONFIG_HAS_IOPORT=y
589CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index 934d8a008936..670039bb1a7c 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.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:32 2007 4# Tue Aug 7 12:39:49 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -9,52 +9,40 @@ CONFIG_MIPS=y
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11CONFIG_ZONE_DMA=y
12# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MACH_ALCHEMY is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 13# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 14# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 15# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 16# CONFIG_MACH_JAZZ is not set
17# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 18# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 19# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 20# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 21# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 22# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 23# CONFIG_MACH_VR41XX is not set
36# CONFIG_PNX8550_JBS is not set 24# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 25# CONFIG_PNX8550_STB810 is not set
38# CONFIG_MACH_VR41XX is not set 26# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 27# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 28# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42CONFIG_SGI_IP22=y 29CONFIG_SGI_IP22=y
43# CONFIG_SGI_IP27 is not set 30# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 31# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 32# CONFIG_SIBYTE_CRHINE is not set
33# CONFIG_SIBYTE_CARMEL is not set
34# CONFIG_SIBYTE_CRHONE is not set
35# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 36# CONFIG_SIBYTE_SWARM is not set
37# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 38# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 39# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 40# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 41# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 42# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 43# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 44# CONFIG_TOSHIBA_RBTX4938 is not set
45# CONFIG_WR_PPMC is not set
58CONFIG_RWSEM_GENERIC_SPINLOCK=y 46CONFIG_RWSEM_GENERIC_SPINLOCK=y
59# CONFIG_ARCH_HAS_ILOG2_U32 is not set 47# CONFIG_ARCH_HAS_ILOG2_U32 is not set
60# CONFIG_ARCH_HAS_ILOG2_U64 is not set 48# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -67,6 +55,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
67CONFIG_ARC=y 55CONFIG_ARC=y
68CONFIG_DMA_NONCOHERENT=y 56CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 57CONFIG_DMA_NEED_PCI_MAP_STATE=y
58CONFIG_EARLY_PRINTK=y
59CONFIG_SYS_HAS_EARLY_PRINTK=y
60# CONFIG_NO_IOPORT is not set
70CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y 61CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
71CONFIG_CPU_BIG_ENDIAN=y 62CONFIG_CPU_BIG_ENDIAN=y
72# CONFIG_CPU_LITTLE_ENDIAN is not set 63# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -82,6 +73,7 @@ CONFIG_ARC_PROMLIB=y
82# 73#
83# CPU selection 74# CPU selection
84# 75#
76# CONFIG_CPU_LOONGSON2 is not set
85# CONFIG_CPU_MIPS32_R1 is not set 77# CONFIG_CPU_MIPS32_R1 is not set
86# CONFIG_CPU_MIPS32_R2 is not set 78# CONFIG_CPU_MIPS32_R2 is not set
87# CONFIG_CPU_MIPS64_R1 is not set 79# CONFIG_CPU_MIPS64_R1 is not set
@@ -122,8 +114,6 @@ CONFIG_IP22_CPU_SCACHE=y
122CONFIG_MIPS_MT_DISABLED=y 114CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMP is not set 115# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set 116# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set
126# CONFIG_64BIT_PHYS_ADDR is not set
127CONFIG_CPU_HAS_LLSC=y 117CONFIG_CPU_HAS_LLSC=y
128CONFIG_CPU_HAS_SYNC=y 118CONFIG_CPU_HAS_SYNC=y
129CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +129,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139CONFIG_SPLIT_PTLOCK_CPUS=4 129CONFIG_SPLIT_PTLOCK_CPUS=4
140# CONFIG_RESOURCES_64BIT is not set 130# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1 131CONFIG_ZONE_DMA_FLAG=1
132CONFIG_BOUNCE=y
133CONFIG_VIRT_TO_BUS=y
142# CONFIG_HZ_48 is not set 134# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 135# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 136# CONFIG_HZ_128 is not set
@@ -152,35 +144,33 @@ CONFIG_HZ=1000
152CONFIG_PREEMPT_VOLUNTARY=y 144CONFIG_PREEMPT_VOLUNTARY=y
153# CONFIG_PREEMPT is not set 145# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set 146# CONFIG_KEXEC is not set
147CONFIG_SECCOMP=y
155CONFIG_LOCKDEP_SUPPORT=y 148CONFIG_LOCKDEP_SUPPORT=y
156CONFIG_STACKTRACE_SUPPORT=y 149CONFIG_STACKTRACE_SUPPORT=y
157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 150CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
158 151
159# 152#
160# Code maturity level options 153# General setup
161# 154#
162CONFIG_EXPERIMENTAL=y 155CONFIG_EXPERIMENTAL=y
163CONFIG_BROKEN_ON_SMP=y 156CONFIG_BROKEN_ON_SMP=y
164CONFIG_INIT_ENV_ARG_LIMIT=32 157CONFIG_INIT_ENV_ARG_LIMIT=32
165
166#
167# General setup
168#
169CONFIG_LOCALVERSION="" 158CONFIG_LOCALVERSION=""
170CONFIG_LOCALVERSION_AUTO=y 159CONFIG_LOCALVERSION_AUTO=y
171CONFIG_SWAP=y 160CONFIG_SWAP=y
172CONFIG_SYSVIPC=y 161CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y 162CONFIG_SYSVIPC_SYSCTL=y
175# CONFIG_POSIX_MQUEUE is not set 163# CONFIG_POSIX_MQUEUE is not set
176# CONFIG_BSD_PROCESS_ACCT is not set 164# CONFIG_BSD_PROCESS_ACCT is not set
177# CONFIG_TASKSTATS is not set 165# CONFIG_TASKSTATS is not set
178# CONFIG_UTS_NS is not set 166# CONFIG_USER_NS is not set
179# CONFIG_AUDIT is not set 167# CONFIG_AUDIT is not set
180CONFIG_IKCONFIG=y 168CONFIG_IKCONFIG=y
181CONFIG_IKCONFIG_PROC=y 169CONFIG_IKCONFIG_PROC=y
170CONFIG_LOG_BUF_SHIFT=14
182CONFIG_SYSFS_DEPRECATED=y 171CONFIG_SYSFS_DEPRECATED=y
183CONFIG_RELAY=y 172CONFIG_RELAY=y
173# CONFIG_BLK_DEV_INITRD is not set
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y 175CONFIG_SYSCTL=y
186CONFIG_EMBEDDED=y 176CONFIG_EMBEDDED=y
@@ -193,32 +183,30 @@ CONFIG_BUG=y
193CONFIG_ELF_CORE=y 183CONFIG_ELF_CORE=y
194CONFIG_BASE_FULL=y 184CONFIG_BASE_FULL=y
195CONFIG_FUTEX=y 185CONFIG_FUTEX=y
186CONFIG_ANON_INODES=y
196CONFIG_EPOLL=y 187CONFIG_EPOLL=y
188CONFIG_SIGNALFD=y
189CONFIG_TIMERFD=y
190CONFIG_EVENTFD=y
197CONFIG_SHMEM=y 191CONFIG_SHMEM=y
198CONFIG_SLAB=y
199CONFIG_VM_EVENT_COUNTERS=y 192CONFIG_VM_EVENT_COUNTERS=y
193CONFIG_SLAB=y
194# CONFIG_SLUB is not set
195# CONFIG_SLOB is not set
200CONFIG_RT_MUTEXES=y 196CONFIG_RT_MUTEXES=y
201# CONFIG_TINY_SHMEM is not set 197# CONFIG_TINY_SHMEM is not set
202CONFIG_BASE_SMALL=0 198CONFIG_BASE_SMALL=0
203# CONFIG_SLOB is not set
204
205#
206# Loadable module support
207#
208CONFIG_MODULES=y 199CONFIG_MODULES=y
209CONFIG_MODULE_UNLOAD=y 200CONFIG_MODULE_UNLOAD=y
210# CONFIG_MODULE_FORCE_UNLOAD is not set 201# CONFIG_MODULE_FORCE_UNLOAD is not set
211CONFIG_MODVERSIONS=y 202CONFIG_MODVERSIONS=y
212CONFIG_MODULE_SRCVERSION_ALL=y 203CONFIG_MODULE_SRCVERSION_ALL=y
213CONFIG_KMOD=y 204CONFIG_KMOD=y
214
215#
216# Block layer
217#
218CONFIG_BLOCK=y 205CONFIG_BLOCK=y
219# CONFIG_LBD is not set 206# CONFIG_LBD is not set
220# CONFIG_BLK_DEV_IO_TRACE is not set 207# CONFIG_BLK_DEV_IO_TRACE is not set
221# CONFIG_LSF is not set 208# CONFIG_LSF is not set
209# CONFIG_BLK_DEV_BSG is not set
222 210
223# 211#
224# IO Schedulers 212# IO Schedulers
@@ -237,6 +225,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
237# Bus options (PCI, PCMCIA, EISA, ISA, TC) 225# Bus options (PCI, PCMCIA, EISA, ISA, TC)
238# 226#
239CONFIG_HW_HAS_EISA=y 227CONFIG_HW_HAS_EISA=y
228# CONFIG_ARCH_SUPPORTS_MSI is not set
240# CONFIG_EISA is not set 229# CONFIG_EISA is not set
241CONFIG_MMU=y 230CONFIG_MMU=y
242 231
@@ -245,10 +234,6 @@ CONFIG_MMU=y
245# 234#
246 235
247# 236#
248# PCI Hotplug Support
249#
250
251#
252# Executable file formats 237# Executable file formats
253# 238#
254CONFIG_BINFMT_ELF=y 239CONFIG_BINFMT_ELF=y
@@ -261,7 +246,7 @@ CONFIG_TRAD_SIGNALS=y
261CONFIG_PM=y 246CONFIG_PM=y
262# CONFIG_PM_LEGACY is not set 247# CONFIG_PM_LEGACY is not set
263# CONFIG_PM_DEBUG is not set 248# CONFIG_PM_DEBUG is not set
264# CONFIG_PM_SYSFS_DEPRECATED is not set 249# CONFIG_SUSPEND is not set
265 250
266# 251#
267# Networking 252# Networking
@@ -271,7 +256,6 @@ CONFIG_NET=y
271# 256#
272# Networking options 257# Networking options
273# 258#
274# CONFIG_NETDEBUG is not set
275CONFIG_PACKET=y 259CONFIG_PACKET=y
276CONFIG_PACKET_MMAP=y 260CONFIG_PACKET_MMAP=y
277CONFIG_UNIX=y 261CONFIG_UNIX=y
@@ -308,10 +292,6 @@ CONFIG_INET_TCP_DIAG=y
308CONFIG_TCP_CONG_CUBIC=y 292CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic" 293CONFIG_DEFAULT_TCP_CONG="cubic"
310CONFIG_TCP_MD5SIG=y 294CONFIG_TCP_MD5SIG=y
311
312#
313# IP: Virtual Server Configuration
314#
315CONFIG_IP_VS=m 295CONFIG_IP_VS=m
316# CONFIG_IP_VS_DEBUG is not set 296# CONFIG_IP_VS_DEBUG is not set
317CONFIG_IP_VS_TAB_BITS=12 297CONFIG_IP_VS_TAB_BITS=12
@@ -346,10 +326,11 @@ CONFIG_IPV6=m
346CONFIG_IPV6_PRIVACY=y 326CONFIG_IPV6_PRIVACY=y
347CONFIG_IPV6_ROUTER_PREF=y 327CONFIG_IPV6_ROUTER_PREF=y
348CONFIG_IPV6_ROUTE_INFO=y 328CONFIG_IPV6_ROUTE_INFO=y
329CONFIG_IPV6_OPTIMISTIC_DAD=y
349CONFIG_INET6_AH=m 330CONFIG_INET6_AH=m
350CONFIG_INET6_ESP=m 331CONFIG_INET6_ESP=m
351CONFIG_INET6_IPCOMP=m 332CONFIG_INET6_IPCOMP=m
352CONFIG_IPV6_MIP6=y 333CONFIG_IPV6_MIP6=m
353CONFIG_INET6_XFRM_TUNNEL=m 334CONFIG_INET6_XFRM_TUNNEL=m
354CONFIG_INET6_TUNNEL=m 335CONFIG_INET6_TUNNEL=m
355CONFIG_INET6_XFRM_MODE_TRANSPORT=m 336CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -371,8 +352,6 @@ CONFIG_NETFILTER_NETLINK=m
371CONFIG_NETFILTER_NETLINK_QUEUE=m 352CONFIG_NETFILTER_NETLINK_QUEUE=m
372CONFIG_NETFILTER_NETLINK_LOG=m 353CONFIG_NETFILTER_NETLINK_LOG=m
373CONFIG_NF_CONNTRACK_ENABLED=m 354CONFIG_NF_CONNTRACK_ENABLED=m
374CONFIG_NF_CONNTRACK_SUPPORT=y
375# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
376CONFIG_NF_CONNTRACK=m 355CONFIG_NF_CONNTRACK=m
377CONFIG_NF_CT_ACCT=y 356CONFIG_NF_CT_ACCT=y
378CONFIG_NF_CONNTRACK_MARK=y 357CONFIG_NF_CONNTRACK_MARK=y
@@ -380,6 +359,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y
380CONFIG_NF_CONNTRACK_EVENTS=y 359CONFIG_NF_CONNTRACK_EVENTS=y
381CONFIG_NF_CT_PROTO_GRE=m 360CONFIG_NF_CT_PROTO_GRE=m
382CONFIG_NF_CT_PROTO_SCTP=m 361CONFIG_NF_CT_PROTO_SCTP=m
362CONFIG_NF_CT_PROTO_UDPLITE=m
383CONFIG_NF_CONNTRACK_AMANDA=m 363CONFIG_NF_CONNTRACK_AMANDA=m
384CONFIG_NF_CONNTRACK_FTP=m 364CONFIG_NF_CONNTRACK_FTP=m
385CONFIG_NF_CONNTRACK_H323=m 365CONFIG_NF_CONNTRACK_H323=m
@@ -398,11 +378,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
398CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 378CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
399CONFIG_NETFILTER_XT_TARGET_NFLOG=m 379CONFIG_NETFILTER_XT_TARGET_NFLOG=m
400CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 380CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
381CONFIG_NETFILTER_XT_TARGET_TRACE=m
401CONFIG_NETFILTER_XT_TARGET_SECMARK=m 382CONFIG_NETFILTER_XT_TARGET_SECMARK=m
402CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 383CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
403CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 384CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
404CONFIG_NETFILTER_XT_MATCH_COMMENT=m 385CONFIG_NETFILTER_XT_MATCH_COMMENT=m
405CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 386CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
387CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
406CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 388CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
407CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 389CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
408CONFIG_NETFILTER_XT_MATCH_DCCP=m 390CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -423,6 +405,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
423CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 405CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
424CONFIG_NETFILTER_XT_MATCH_STRING=m 406CONFIG_NETFILTER_XT_MATCH_STRING=m
425CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 407CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
408CONFIG_NETFILTER_XT_MATCH_U32=m
426CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 409CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
427 410
428# 411#
@@ -490,25 +473,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m
490CONFIG_IP6_NF_MANGLE=m 473CONFIG_IP6_NF_MANGLE=m
491CONFIG_IP6_NF_TARGET_HL=m 474CONFIG_IP6_NF_TARGET_HL=m
492CONFIG_IP6_NF_RAW=m 475CONFIG_IP6_NF_RAW=m
493
494#
495# DCCP Configuration (EXPERIMENTAL)
496#
497# CONFIG_IP_DCCP is not set 476# CONFIG_IP_DCCP is not set
498
499#
500# SCTP Configuration (EXPERIMENTAL)
501#
502CONFIG_IP_SCTP=m 477CONFIG_IP_SCTP=m
503# CONFIG_SCTP_DBG_MSG is not set 478# CONFIG_SCTP_DBG_MSG is not set
504# CONFIG_SCTP_DBG_OBJCNT is not set 479# CONFIG_SCTP_DBG_OBJCNT is not set
505# CONFIG_SCTP_HMAC_NONE is not set 480# CONFIG_SCTP_HMAC_NONE is not set
506# CONFIG_SCTP_HMAC_SHA1 is not set 481# CONFIG_SCTP_HMAC_SHA1 is not set
507CONFIG_SCTP_HMAC_MD5=y 482CONFIG_SCTP_HMAC_MD5=y
508
509#
510# TIPC Configuration (EXPERIMENTAL)
511#
512# CONFIG_TIPC is not set 483# CONFIG_TIPC is not set
513# CONFIG_ATM is not set 484# CONFIG_ATM is not set
514# CONFIG_BRIDGE is not set 485# CONFIG_BRIDGE is not set
@@ -527,9 +498,6 @@ CONFIG_SCTP_HMAC_MD5=y
527# 498#
528CONFIG_NET_SCHED=y 499CONFIG_NET_SCHED=y
529CONFIG_NET_SCH_FIFO=y 500CONFIG_NET_SCH_FIFO=y
530# CONFIG_NET_SCH_CLK_JIFFIES is not set
531CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
532# CONFIG_NET_SCH_CLK_CPU is not set
533 501
534# 502#
535# Queueing/Scheduling 503# Queueing/Scheduling
@@ -538,6 +506,7 @@ CONFIG_NET_SCH_CBQ=m
538CONFIG_NET_SCH_HTB=m 506CONFIG_NET_SCH_HTB=m
539CONFIG_NET_SCH_HFSC=m 507CONFIG_NET_SCH_HFSC=m
540CONFIG_NET_SCH_PRIO=m 508CONFIG_NET_SCH_PRIO=m
509CONFIG_NET_SCH_RR=m
541CONFIG_NET_SCH_RED=m 510CONFIG_NET_SCH_RED=m
542CONFIG_NET_SCH_SFQ=m 511CONFIG_NET_SCH_SFQ=m
543CONFIG_NET_SCH_TEQL=m 512CONFIG_NET_SCH_TEQL=m
@@ -562,10 +531,16 @@ CONFIG_NET_CLS_U32=m
562CONFIG_NET_CLS_RSVP=m 531CONFIG_NET_CLS_RSVP=m
563CONFIG_NET_CLS_RSVP6=m 532CONFIG_NET_CLS_RSVP6=m
564# CONFIG_NET_EMATCH is not set 533# CONFIG_NET_EMATCH is not set
565# CONFIG_NET_CLS_ACT is not set 534CONFIG_NET_CLS_ACT=y
535CONFIG_NET_ACT_POLICE=y
536CONFIG_NET_ACT_GACT=m
537CONFIG_GACT_PROB=y
538CONFIG_NET_ACT_MIRRED=m
539CONFIG_NET_ACT_IPT=m
540CONFIG_NET_ACT_PEDIT=m
541CONFIG_NET_ACT_SIMP=m
566CONFIG_NET_CLS_POLICE=y 542CONFIG_NET_CLS_POLICE=y
567# CONFIG_NET_CLS_IND is not set 543# CONFIG_NET_CLS_IND is not set
568CONFIG_NET_ESTIMATOR=y
569 544
570# 545#
571# Network testing 546# Network testing
@@ -574,14 +549,26 @@ CONFIG_NET_ESTIMATOR=y
574# CONFIG_HAMRADIO is not set 549# CONFIG_HAMRADIO is not set
575# CONFIG_IRDA is not set 550# CONFIG_IRDA is not set
576# CONFIG_BT is not set 551# CONFIG_BT is not set
552# CONFIG_AF_RXRPC is not set
553CONFIG_FIB_RULES=y
554
555#
556# Wireless
557#
558CONFIG_CFG80211=m
559CONFIG_WIRELESS_EXT=y
560CONFIG_MAC80211=m
561# CONFIG_MAC80211_DEBUG is not set
577CONFIG_IEEE80211=m 562CONFIG_IEEE80211=m
578# CONFIG_IEEE80211_DEBUG is not set 563# CONFIG_IEEE80211_DEBUG is not set
579CONFIG_IEEE80211_CRYPT_WEP=m 564CONFIG_IEEE80211_CRYPT_WEP=m
580CONFIG_IEEE80211_CRYPT_CCMP=m 565CONFIG_IEEE80211_CRYPT_CCMP=m
566CONFIG_IEEE80211_CRYPT_TKIP=m
581CONFIG_IEEE80211_SOFTMAC=m 567CONFIG_IEEE80211_SOFTMAC=m
582# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 568# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
583CONFIG_WIRELESS_EXT=y 569CONFIG_RFKILL=m
584CONFIG_FIB_RULES=y 570CONFIG_RFKILL_INPUT=m
571# CONFIG_NET_9P is not set
585 572
586# 573#
587# Device Drivers 574# Device Drivers
@@ -593,47 +580,19 @@ CONFIG_FIB_RULES=y
593CONFIG_STANDALONE=y 580CONFIG_STANDALONE=y
594CONFIG_PREVENT_FIRMWARE_BUILD=y 581CONFIG_PREVENT_FIRMWARE_BUILD=y
595# CONFIG_SYS_HYPERVISOR is not set 582# CONFIG_SYS_HYPERVISOR is not set
596
597#
598# Connector - unified userspace <-> kernelspace linker
599#
600CONFIG_CONNECTOR=m 583CONFIG_CONNECTOR=m
601
602#
603# Memory Technology Devices (MTD)
604#
605# CONFIG_MTD is not set 584# CONFIG_MTD is not set
606
607#
608# Parallel port support
609#
610# CONFIG_PARPORT is not set 585# CONFIG_PARPORT is not set
611 586CONFIG_BLK_DEV=y
612#
613# Plug and Play support
614#
615# CONFIG_PNPACPI is not set
616
617#
618# Block devices
619#
620# CONFIG_BLK_DEV_COW_COMMON is not set 587# CONFIG_BLK_DEV_COW_COMMON is not set
621# CONFIG_BLK_DEV_LOOP is not set 588# CONFIG_BLK_DEV_LOOP is not set
622# CONFIG_BLK_DEV_NBD is not set 589# CONFIG_BLK_DEV_NBD is not set
623# CONFIG_BLK_DEV_RAM is not set 590# CONFIG_BLK_DEV_RAM is not set
624# CONFIG_BLK_DEV_INITRD is not set
625CONFIG_CDROM_PKTCDVD=m 591CONFIG_CDROM_PKTCDVD=m
626CONFIG_CDROM_PKTCDVD_BUFFERS=8 592CONFIG_CDROM_PKTCDVD_BUFFERS=8
627# CONFIG_CDROM_PKTCDVD_WCACHE is not set 593# CONFIG_CDROM_PKTCDVD_WCACHE is not set
628CONFIG_ATA_OVER_ETH=m 594CONFIG_ATA_OVER_ETH=m
629 595# CONFIG_MISC_DEVICES is not set
630#
631# Misc devices
632#
633
634#
635# ATA/ATAPI/MFM/RLL support
636#
637# CONFIG_IDE is not set 596# CONFIG_IDE is not set
638 597
639# 598#
@@ -641,6 +600,7 @@ CONFIG_ATA_OVER_ETH=m
641# 600#
642CONFIG_RAID_ATTRS=m 601CONFIG_RAID_ATTRS=m
643CONFIG_SCSI=y 602CONFIG_SCSI=y
603CONFIG_SCSI_DMA=y
644CONFIG_SCSI_TGT=m 604CONFIG_SCSI_TGT=m
645# CONFIG_SCSI_NETLINK is not set 605# CONFIG_SCSI_NETLINK is not set
646CONFIG_SCSI_PROC_FS=y 606CONFIG_SCSI_PROC_FS=y
@@ -663,6 +623,7 @@ CONFIG_CHR_DEV_SCH=m
663CONFIG_SCSI_CONSTANTS=y 623CONFIG_SCSI_CONSTANTS=y
664# CONFIG_SCSI_LOGGING is not set 624# CONFIG_SCSI_LOGGING is not set
665CONFIG_SCSI_SCAN_ASYNC=y 625CONFIG_SCSI_SCAN_ASYNC=y
626CONFIG_SCSI_WAIT_SCAN=m
666 627
667# 628#
668# SCSI Transports 629# SCSI Transports
@@ -670,51 +631,21 @@ CONFIG_SCSI_SCAN_ASYNC=y
670CONFIG_SCSI_SPI_ATTRS=m 631CONFIG_SCSI_SPI_ATTRS=m
671# CONFIG_SCSI_FC_ATTRS is not set 632# CONFIG_SCSI_FC_ATTRS is not set
672CONFIG_SCSI_ISCSI_ATTRS=m 633CONFIG_SCSI_ISCSI_ATTRS=m
673CONFIG_SCSI_SAS_ATTRS=m
674# CONFIG_SCSI_SAS_LIBSAS is not set 634# CONFIG_SCSI_SAS_LIBSAS is not set
675 635CONFIG_SCSI_LOWLEVEL=y
676#
677# SCSI low-level drivers
678#
679CONFIG_ISCSI_TCP=m 636CONFIG_ISCSI_TCP=m
680CONFIG_SGIWD93_SCSI=y 637CONFIG_SGIWD93_SCSI=y
681# CONFIG_SCSI_DEBUG is not set 638# CONFIG_SCSI_DEBUG is not set
682
683#
684# Serial ATA (prod) and Parallel ATA (experimental) drivers
685#
686# CONFIG_ATA is not set 639# CONFIG_ATA is not set
687
688#
689# Multi-device support (RAID and LVM)
690#
691# CONFIG_MD is not set 640# CONFIG_MD is not set
692
693#
694# Fusion MPT device support
695#
696# CONFIG_FUSION is not set
697
698#
699# IEEE 1394 (FireWire) support
700#
701
702#
703# I2O device support
704#
705
706#
707# Network device support
708#
709CONFIG_NETDEVICES=y 641CONFIG_NETDEVICES=y
642# CONFIG_NETDEVICES_MULTIQUEUE is not set
643# CONFIG_IFB is not set
710CONFIG_DUMMY=m 644CONFIG_DUMMY=m
711CONFIG_BONDING=m 645CONFIG_BONDING=m
646CONFIG_MACVLAN=m
712CONFIG_EQUALIZER=m 647CONFIG_EQUALIZER=m
713CONFIG_TUN=m 648CONFIG_TUN=m
714
715#
716# PHY device support
717#
718CONFIG_PHYLIB=m 649CONFIG_PHYLIB=m
719 650
720# 651#
@@ -728,36 +659,25 @@ CONFIG_CICADA_PHY=m
728# CONFIG_VITESSE_PHY is not set 659# CONFIG_VITESSE_PHY is not set
729# CONFIG_SMSC_PHY is not set 660# CONFIG_SMSC_PHY is not set
730# CONFIG_BROADCOM_PHY is not set 661# CONFIG_BROADCOM_PHY is not set
662# CONFIG_ICPLUS_PHY is not set
731# CONFIG_FIXED_PHY is not set 663# CONFIG_FIXED_PHY is not set
732
733#
734# Ethernet (10 or 100Mbit)
735#
736CONFIG_NET_ETHERNET=y 664CONFIG_NET_ETHERNET=y
737# CONFIG_MII is not set 665# CONFIG_MII is not set
666# CONFIG_AX88796 is not set
738# CONFIG_DM9000 is not set 667# CONFIG_DM9000 is not set
739CONFIG_SGISEEQ=y 668CONFIG_SGISEEQ=y
669# CONFIG_NETDEV_1000 is not set
670# CONFIG_NETDEV_10000 is not set
740 671
741# 672#
742# Ethernet (1000 Mbit) 673# Wireless LAN
743#
744
745#
746# Ethernet (10000 Mbit)
747#
748
749#
750# Token Ring devices
751#
752
753#
754# Wireless LAN (non-hamradio)
755#
756# CONFIG_NET_RADIO is not set
757
758#
759# Wan interfaces
760# 674#
675CONFIG_WLAN_PRE80211=y
676CONFIG_STRIP=m
677CONFIG_WLAN_80211=y
678# CONFIG_LIBERTAS is not set
679CONFIG_HOSTAP=m
680# CONFIG_HOSTAP_FIRMWARE is not set
761# CONFIG_WAN is not set 681# CONFIG_WAN is not set
762# CONFIG_PPP is not set 682# CONFIG_PPP is not set
763# CONFIG_SLIP is not set 683# CONFIG_SLIP is not set
@@ -765,15 +685,7 @@ CONFIG_SGISEEQ=y
765# CONFIG_NETCONSOLE is not set 685# CONFIG_NETCONSOLE is not set
766# CONFIG_NETPOLL is not set 686# CONFIG_NETPOLL is not set
767# CONFIG_NET_POLL_CONTROLLER is not set 687# CONFIG_NET_POLL_CONTROLLER is not set
768
769#
770# ISDN subsystem
771#
772# CONFIG_ISDN is not set 688# CONFIG_ISDN is not set
773
774#
775# Telephony Support
776#
777# CONFIG_PHONE is not set 689# CONFIG_PHONE is not set
778 690
779# 691#
@@ -781,6 +693,7 @@ CONFIG_SGISEEQ=y
781# 693#
782CONFIG_INPUT=y 694CONFIG_INPUT=y
783# CONFIG_INPUT_FF_MEMLESS is not set 695# CONFIG_INPUT_FF_MEMLESS is not set
696# CONFIG_INPUT_POLLDEV is not set
784 697
785# 698#
786# Userland interfaces 699# Userland interfaces
@@ -806,9 +719,16 @@ CONFIG_KEYBOARD_ATKBD=y
806# CONFIG_KEYBOARD_STOWAWAY is not set 719# CONFIG_KEYBOARD_STOWAWAY is not set
807CONFIG_INPUT_MOUSE=y 720CONFIG_INPUT_MOUSE=y
808CONFIG_MOUSE_PS2=m 721CONFIG_MOUSE_PS2=m
722# CONFIG_MOUSE_PS2_ALPS is not set
723CONFIG_MOUSE_PS2_LOGIPS2PP=y
724# CONFIG_MOUSE_PS2_SYNAPTICS is not set
725# CONFIG_MOUSE_PS2_LIFEBOOK is not set
726CONFIG_MOUSE_PS2_TRACKPOINT=y
727# CONFIG_MOUSE_PS2_TOUCHKIT is not set
809CONFIG_MOUSE_SERIAL=m 728CONFIG_MOUSE_SERIAL=m
810# CONFIG_MOUSE_VSXXXAA is not set 729# CONFIG_MOUSE_VSXXXAA is not set
811# CONFIG_INPUT_JOYSTICK is not set 730# CONFIG_INPUT_JOYSTICK is not set
731# CONFIG_INPUT_TABLET is not set
812# CONFIG_INPUT_TOUCHSCREEN is not set 732# CONFIG_INPUT_TOUCHSCREEN is not set
813# CONFIG_INPUT_MISC is not set 733# CONFIG_INPUT_MISC is not set
814 734
@@ -844,15 +764,7 @@ CONFIG_SERIAL_CORE=m
844CONFIG_UNIX98_PTYS=y 764CONFIG_UNIX98_PTYS=y
845CONFIG_LEGACY_PTYS=y 765CONFIG_LEGACY_PTYS=y
846CONFIG_LEGACY_PTY_COUNT=256 766CONFIG_LEGACY_PTY_COUNT=256
847
848#
849# IPMI
850#
851# CONFIG_IPMI_HANDLER is not set 767# CONFIG_IPMI_HANDLER is not set
852
853#
854# Watchdog Cards
855#
856CONFIG_WATCHDOG=y 768CONFIG_WATCHDOG=y
857# CONFIG_WATCHDOG_NOWAYOUT is not set 769# CONFIG_WATCHDOG_NOWAYOUT is not set
858 770
@@ -864,20 +776,10 @@ CONFIG_INDYDOG=m
864# CONFIG_HW_RANDOM is not set 776# CONFIG_HW_RANDOM is not set
865# CONFIG_RTC is not set 777# CONFIG_RTC is not set
866CONFIG_SGI_DS1286=m 778CONFIG_SGI_DS1286=m
867# CONFIG_GEN_RTC is not set
868# CONFIG_DTLK is not set
869# CONFIG_R3964 is not set 779# CONFIG_R3964 is not set
870CONFIG_RAW_DRIVER=m 780CONFIG_RAW_DRIVER=m
871CONFIG_MAX_RAW_DEVS=256 781CONFIG_MAX_RAW_DEVS=256
872
873#
874# TPM devices
875#
876# CONFIG_TCG_TPM is not set 782# CONFIG_TCG_TPM is not set
877
878#
879# I2C support
880#
881# CONFIG_I2C is not set 783# CONFIG_I2C is not set
882 784
883# 785#
@@ -885,32 +787,33 @@ CONFIG_MAX_RAW_DEVS=256
885# 787#
886# CONFIG_SPI is not set 788# CONFIG_SPI is not set
887# CONFIG_SPI_MASTER is not set 789# CONFIG_SPI_MASTER is not set
888
889#
890# Dallas's 1-wire bus
891#
892# CONFIG_W1 is not set 790# CONFIG_W1 is not set
791# CONFIG_POWER_SUPPLY is not set
792# CONFIG_HWMON is not set
893 793
894# 794#
895# Hardware Monitoring support 795# Multifunction device drivers
896# 796#
897# CONFIG_HWMON is not set 797# CONFIG_MFD_SM501 is not set
898# CONFIG_HWMON_VID is not set
899 798
900# 799#
901# Multimedia devices 800# Multimedia devices
902# 801#
903# CONFIG_VIDEO_DEV is not set 802# CONFIG_VIDEO_DEV is not set
803# CONFIG_DVB_CORE is not set
804# CONFIG_DAB is not set
904 805
905# 806#
906# Digital Video Broadcasting Devices 807# Graphics support
907# 808#
908# CONFIG_DVB is not set 809# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
909 810
910# 811#
911# Graphics support 812# Display device support
912# 813#
913CONFIG_FIRMWARE_EDID=y 814# CONFIG_DISPLAY_SUPPORT is not set
815# CONFIG_VGASTATE is not set
816# CONFIG_VIDEO_OUTPUT_CONTROL is not set
914# CONFIG_FB is not set 817# CONFIG_FB is not set
915 818
916# 819#
@@ -920,31 +823,20 @@ CONFIG_FIRMWARE_EDID=y
920CONFIG_SGI_NEWPORT_CONSOLE=y 823CONFIG_SGI_NEWPORT_CONSOLE=y
921CONFIG_DUMMY_CONSOLE=y 824CONFIG_DUMMY_CONSOLE=y
922CONFIG_FONT_8x16=y 825CONFIG_FONT_8x16=y
923
924#
925# Logo configuration
926#
927CONFIG_LOGO=y 826CONFIG_LOGO=y
928# CONFIG_LOGO_LINUX_MONO is not set 827# CONFIG_LOGO_LINUX_MONO is not set
929# CONFIG_LOGO_LINUX_VGA16 is not set 828# CONFIG_LOGO_LINUX_VGA16 is not set
930# CONFIG_LOGO_LINUX_CLUT224 is not set 829# CONFIG_LOGO_LINUX_CLUT224 is not set
931CONFIG_LOGO_SGI_CLUT224=y 830CONFIG_LOGO_SGI_CLUT224=y
932# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
933 831
934# 832#
935# Sound 833# Sound
936# 834#
937# CONFIG_SOUND is not set 835# CONFIG_SOUND is not set
938 836CONFIG_HID_SUPPORT=y
939#
940# HID Devices
941#
942CONFIG_HID=y 837CONFIG_HID=y
943# CONFIG_HID_DEBUG is not set 838# CONFIG_HID_DEBUG is not set
944 839CONFIG_USB_SUPPORT=y
945#
946# USB support
947#
948# CONFIG_USB_ARCH_HAS_HCD is not set 840# CONFIG_USB_ARCH_HAS_HCD is not set
949# CONFIG_USB_ARCH_HAS_OHCI is not set 841# CONFIG_USB_ARCH_HAS_OHCI is not set
950# CONFIG_USB_ARCH_HAS_EHCI is not set 842# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -957,36 +849,8 @@ CONFIG_HID=y
957# USB Gadget Support 849# USB Gadget Support
958# 850#
959# CONFIG_USB_GADGET is not set 851# CONFIG_USB_GADGET is not set
960
961#
962# MMC/SD Card support
963#
964# CONFIG_MMC is not set 852# CONFIG_MMC is not set
965
966#
967# LED devices
968#
969# CONFIG_NEW_LEDS is not set 853# CONFIG_NEW_LEDS is not set
970
971#
972# LED drivers
973#
974
975#
976# LED Triggers
977#
978
979#
980# InfiniBand support
981#
982
983#
984# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
985#
986
987#
988# Real Time Clock
989#
990# CONFIG_RTC_CLASS is not set 854# CONFIG_RTC_CLASS is not set
991 855
992# 856#
@@ -1003,12 +867,9 @@ CONFIG_HID=y
1003# 867#
1004 868
1005# 869#
1006# Auxiliary Display support 870# Userspace I/O
1007#
1008
1009#
1010# Virtualization
1011# 871#
872# CONFIG_UIO is not set
1012 873
1013# 874#
1014# File systems 875# File systems
@@ -1121,6 +982,7 @@ CONFIG_NFS_ACL_SUPPORT=m
1121CONFIG_NFS_COMMON=y 982CONFIG_NFS_COMMON=y
1122CONFIG_SUNRPC=m 983CONFIG_SUNRPC=m
1123CONFIG_SUNRPC_GSS=m 984CONFIG_SUNRPC_GSS=m
985# CONFIG_SUNRPC_BIND34 is not set
1124CONFIG_RPCSEC_GSS_KRB5=m 986CONFIG_RPCSEC_GSS_KRB5=m
1125# CONFIG_RPCSEC_GSS_SPKM3 is not set 987# CONFIG_RPCSEC_GSS_SPKM3 is not set
1126CONFIG_SMB_FS=m 988CONFIG_SMB_FS=m
@@ -1136,7 +998,6 @@ CONFIG_CIFS=m
1136CONFIG_CODA_FS=m 998CONFIG_CODA_FS=m
1137# CONFIG_CODA_FS_OLD_API is not set 999# CONFIG_CODA_FS_OLD_API is not set
1138# CONFIG_AFS_FS is not set 1000# CONFIG_AFS_FS is not set
1139# CONFIG_9P_FS is not set
1140 1001
1141# 1002#
1142# Partition Types 1003# Partition Types
@@ -1158,6 +1019,7 @@ CONFIG_SGI_PARTITION=y
1158# CONFIG_SUN_PARTITION is not set 1019# CONFIG_SUN_PARTITION is not set
1159# CONFIG_KARMA_PARTITION is not set 1020# CONFIG_KARMA_PARTITION is not set
1160# CONFIG_EFI_PARTITION is not set 1021# CONFIG_EFI_PARTITION is not set
1022# CONFIG_SYSV68_PARTITION is not set
1161 1023
1162# 1024#
1163# Native Language Support 1025# Native Language Support
@@ -1207,8 +1069,6 @@ CONFIG_NLS_UTF8=m
1207# Distributed Lock Manager 1069# Distributed Lock Manager
1208# 1070#
1209CONFIG_DLM=m 1071CONFIG_DLM=m
1210CONFIG_DLM_TCP=y
1211# CONFIG_DLM_SCTP is not set
1212# CONFIG_DLM_DEBUG is not set 1072# CONFIG_DLM_DEBUG is not set
1213 1073
1214# 1074#
@@ -1227,7 +1087,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1227# CONFIG_DEBUG_FS is not set 1087# CONFIG_DEBUG_FS is not set
1228# CONFIG_HEADERS_CHECK is not set 1088# CONFIG_HEADERS_CHECK is not set
1229# CONFIG_DEBUG_KERNEL is not set 1089# CONFIG_DEBUG_KERNEL is not set
1230CONFIG_LOG_BUF_SHIFT=14
1231CONFIG_CROSSCOMPILE=y 1090CONFIG_CROSSCOMPILE=y
1232CONFIG_CMDLINE="" 1091CONFIG_CMDLINE=""
1233 1092
@@ -1237,12 +1096,9 @@ CONFIG_CMDLINE=""
1237CONFIG_KEYS=y 1096CONFIG_KEYS=y
1238CONFIG_KEYS_DEBUG_PROC_KEYS=y 1097CONFIG_KEYS_DEBUG_PROC_KEYS=y
1239# CONFIG_SECURITY is not set 1098# CONFIG_SECURITY is not set
1240
1241#
1242# Cryptographic options
1243#
1244CONFIG_CRYPTO=y 1099CONFIG_CRYPTO=y
1245CONFIG_CRYPTO_ALGAPI=y 1100CONFIG_CRYPTO_ALGAPI=y
1101CONFIG_CRYPTO_ABLKCIPHER=m
1246CONFIG_CRYPTO_BLKCIPHER=m 1102CONFIG_CRYPTO_BLKCIPHER=m
1247CONFIG_CRYPTO_HASH=y 1103CONFIG_CRYPTO_HASH=y
1248CONFIG_CRYPTO_MANAGER=y 1104CONFIG_CRYPTO_MANAGER=y
@@ -1261,6 +1117,7 @@ CONFIG_CRYPTO_ECB=m
1261CONFIG_CRYPTO_CBC=m 1117CONFIG_CRYPTO_CBC=m
1262CONFIG_CRYPTO_PCBC=m 1118CONFIG_CRYPTO_PCBC=m
1263CONFIG_CRYPTO_LRW=m 1119CONFIG_CRYPTO_LRW=m
1120CONFIG_CRYPTO_CRYPTD=m
1264CONFIG_CRYPTO_DES=m 1121CONFIG_CRYPTO_DES=m
1265CONFIG_CRYPTO_FCRYPT=m 1122CONFIG_CRYPTO_FCRYPT=m
1266CONFIG_CRYPTO_BLOWFISH=m 1123CONFIG_CRYPTO_BLOWFISH=m
@@ -1279,10 +1136,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1279CONFIG_CRYPTO_CRC32C=m 1136CONFIG_CRYPTO_CRC32C=m
1280CONFIG_CRYPTO_CAMELLIA=m 1137CONFIG_CRYPTO_CAMELLIA=m
1281# CONFIG_CRYPTO_TEST is not set 1138# CONFIG_CRYPTO_TEST is not set
1282 1139# CONFIG_CRYPTO_HW is not set
1283#
1284# Hardware crypto devices
1285#
1286 1140
1287# 1141#
1288# Library routines 1142# Library routines
@@ -1290,7 +1144,9 @@ CONFIG_CRYPTO_CAMELLIA=m
1290CONFIG_BITREVERSE=m 1144CONFIG_BITREVERSE=m
1291# CONFIG_CRC_CCITT is not set 1145# CONFIG_CRC_CCITT is not set
1292CONFIG_CRC16=m 1146CONFIG_CRC16=m
1147# CONFIG_CRC_ITU_T is not set
1293CONFIG_CRC32=m 1148CONFIG_CRC32=m
1149# CONFIG_CRC7 is not set
1294CONFIG_LIBCRC32C=m 1150CONFIG_LIBCRC32C=m
1295CONFIG_ZLIB_INFLATE=m 1151CONFIG_ZLIB_INFLATE=m
1296CONFIG_ZLIB_DEFLATE=m 1152CONFIG_ZLIB_DEFLATE=m
@@ -1301,3 +1157,4 @@ CONFIG_TEXTSEARCH_FSM=m
1301CONFIG_PLIST=y 1157CONFIG_PLIST=y
1302CONFIG_HAS_IOMEM=y 1158CONFIG_HAS_IOMEM=y
1303CONFIG_HAS_IOPORT=y 1159CONFIG_HAS_IOPORT=y
1160CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index eb35f7518d06..49bcc58929ba 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -1,66 +1,52 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:32 2007 4# Tue Aug 7 13:04:24 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22# CONFIG_MACH_VR41XX is not set
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38# CONFIG_MACH_VR41XX is not set 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43CONFIG_SGI_IP27=y 29CONFIG_SGI_IP27=y
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58CONFIG_SGI_SN_M_MODE=y 45CONFIG_SGI_SN_M_MODE=y
59# CONFIG_SGI_SN_N_MODE is not set 46# CONFIG_SGI_SN_N_MODE is not set
60# CONFIG_MAPPED_KERNEL is not set 47# CONFIG_MAPPED_KERNEL is not set
61# CONFIG_REPLICATE_KTEXT is not set 48# CONFIG_REPLICATE_KTEXT is not set
62# CONFIG_REPLICATE_EXHANDLERS is not set 49# CONFIG_REPLICATE_EXHANDLERS is not set
63CONFIG_EARLY_PRINTK=y
64CONFIG_RWSEM_GENERIC_SPINLOCK=y 50CONFIG_RWSEM_GENERIC_SPINLOCK=y
65# CONFIG_ARCH_HAS_ILOG2_U32 is not set 51# CONFIG_ARCH_HAS_ILOG2_U32 is not set
66# CONFIG_ARCH_HAS_ILOG2_U64 is not set 52# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -72,6 +58,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
72CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 58CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
73CONFIG_ARC=y 59CONFIG_ARC=y
74CONFIG_DMA_IP27=y 60CONFIG_DMA_IP27=y
61CONFIG_EARLY_PRINTK=y
62CONFIG_SYS_HAS_EARLY_PRINTK=y
63# CONFIG_NO_IOPORT is not set
75CONFIG_CPU_BIG_ENDIAN=y 64CONFIG_CPU_BIG_ENDIAN=y
76# CONFIG_CPU_LITTLE_ENDIAN is not set 65# CONFIG_CPU_LITTLE_ENDIAN is not set
77CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 66CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_BOOT_ELF64=y
82# 71#
83# CPU selection 72# CPU selection
84# 73#
74# CONFIG_CPU_LOONGSON2 is not set
85# CONFIG_CPU_MIPS32_R1 is not set 75# CONFIG_CPU_MIPS32_R1 is not set
86# CONFIG_CPU_MIPS32_R2 is not set 76# CONFIG_CPU_MIPS32_R2 is not set
87# CONFIG_CPU_MIPS64_R1 is not set 77# CONFIG_CPU_MIPS64_R1 is not set
@@ -119,7 +109,6 @@ CONFIG_CPU_HAS_PREFETCH=y
119CONFIG_MIPS_MT_DISABLED=y 109CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMP is not set 110# CONFIG_MIPS_MT_SMP is not set
121# CONFIG_MIPS_MT_SMTC is not set 111# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_LLSC=y 112CONFIG_CPU_HAS_LLSC=y
124CONFIG_CPU_HAS_SYNC=y 113CONFIG_CPU_HAS_SYNC=y
125CONFIG_GENERIC_HARDIRQS=y 114CONFIG_GENERIC_HARDIRQS=y
@@ -141,7 +130,8 @@ CONFIG_NEED_MULTIPLE_NODES=y
141CONFIG_SPLIT_PTLOCK_CPUS=4 130CONFIG_SPLIT_PTLOCK_CPUS=4
142CONFIG_MIGRATION=y 131CONFIG_MIGRATION=y
143CONFIG_RESOURCES_64BIT=y 132CONFIG_RESOURCES_64BIT=y
144CONFIG_ZONE_DMA_FLAG=1 133CONFIG_ZONE_DMA_FLAG=0
134CONFIG_VIRT_TO_BUS=y
145CONFIG_SMP=y 135CONFIG_SMP=y
146CONFIG_SYS_SUPPORTS_SMP=y 136CONFIG_SYS_SUPPORTS_SMP=y
147CONFIG_NR_CPUS_DEFAULT_64=y 137CONFIG_NR_CPUS_DEFAULT_64=y
@@ -161,36 +151,34 @@ CONFIG_PREEMPT_NONE=y
161CONFIG_PREEMPT_BKL=y 151CONFIG_PREEMPT_BKL=y
162# CONFIG_MIPS_INSANE_LARGE is not set 152# CONFIG_MIPS_INSANE_LARGE is not set
163# CONFIG_KEXEC is not set 153# CONFIG_KEXEC is not set
154CONFIG_SECCOMP=y
164CONFIG_LOCKDEP_SUPPORT=y 155CONFIG_LOCKDEP_SUPPORT=y
165CONFIG_STACKTRACE_SUPPORT=y 156CONFIG_STACKTRACE_SUPPORT=y
166CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
167 158
168# 159#
169# Code maturity level options 160# General setup
170# 161#
171CONFIG_EXPERIMENTAL=y 162CONFIG_EXPERIMENTAL=y
172CONFIG_LOCK_KERNEL=y 163CONFIG_LOCK_KERNEL=y
173CONFIG_INIT_ENV_ARG_LIMIT=32 164CONFIG_INIT_ENV_ARG_LIMIT=32
174
175#
176# General setup
177#
178CONFIG_LOCALVERSION="" 165CONFIG_LOCALVERSION=""
179CONFIG_LOCALVERSION_AUTO=y 166CONFIG_LOCALVERSION_AUTO=y
180CONFIG_SWAP=y 167CONFIG_SWAP=y
181CONFIG_SYSVIPC=y 168CONFIG_SYSVIPC=y
182# CONFIG_IPC_NS is not set
183CONFIG_SYSVIPC_SYSCTL=y 169CONFIG_SYSVIPC_SYSCTL=y
184CONFIG_POSIX_MQUEUE=y 170CONFIG_POSIX_MQUEUE=y
185# CONFIG_BSD_PROCESS_ACCT is not set 171# CONFIG_BSD_PROCESS_ACCT is not set
186# CONFIG_TASKSTATS is not set 172# CONFIG_TASKSTATS is not set
187# CONFIG_UTS_NS is not set 173# CONFIG_USER_NS is not set
188# CONFIG_AUDIT is not set 174# CONFIG_AUDIT is not set
189CONFIG_IKCONFIG=y 175CONFIG_IKCONFIG=y
190CONFIG_IKCONFIG_PROC=y 176CONFIG_IKCONFIG_PROC=y
177CONFIG_LOG_BUF_SHIFT=15
191CONFIG_CPUSETS=y 178CONFIG_CPUSETS=y
192CONFIG_SYSFS_DEPRECATED=y 179CONFIG_SYSFS_DEPRECATED=y
193CONFIG_RELAY=y 180CONFIG_RELAY=y
181# CONFIG_BLK_DEV_INITRD is not set
194# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 182# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
195CONFIG_SYSCTL=y 183CONFIG_SYSCTL=y
196CONFIG_EMBEDDED=y 184CONFIG_EMBEDDED=y
@@ -203,18 +191,19 @@ CONFIG_BUG=y
203CONFIG_ELF_CORE=y 191CONFIG_ELF_CORE=y
204CONFIG_BASE_FULL=y 192CONFIG_BASE_FULL=y
205CONFIG_FUTEX=y 193CONFIG_FUTEX=y
194CONFIG_ANON_INODES=y
206CONFIG_EPOLL=y 195CONFIG_EPOLL=y
196CONFIG_SIGNALFD=y
197CONFIG_TIMERFD=y
198CONFIG_EVENTFD=y
207CONFIG_SHMEM=y 199CONFIG_SHMEM=y
208CONFIG_SLAB=y
209CONFIG_VM_EVENT_COUNTERS=y 200CONFIG_VM_EVENT_COUNTERS=y
201CONFIG_SLAB=y
202# CONFIG_SLUB is not set
203# CONFIG_SLOB is not set
210CONFIG_RT_MUTEXES=y 204CONFIG_RT_MUTEXES=y
211# CONFIG_TINY_SHMEM is not set 205# CONFIG_TINY_SHMEM is not set
212CONFIG_BASE_SMALL=0 206CONFIG_BASE_SMALL=0
213# CONFIG_SLOB is not set
214
215#
216# Loadable module support
217#
218CONFIG_MODULES=y 207CONFIG_MODULES=y
219CONFIG_MODULE_UNLOAD=y 208CONFIG_MODULE_UNLOAD=y
220# CONFIG_MODULE_FORCE_UNLOAD is not set 209# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -222,12 +211,9 @@ CONFIG_MODULE_UNLOAD=y
222CONFIG_MODULE_SRCVERSION_ALL=y 211CONFIG_MODULE_SRCVERSION_ALL=y
223CONFIG_KMOD=y 212CONFIG_KMOD=y
224CONFIG_STOP_MACHINE=y 213CONFIG_STOP_MACHINE=y
225
226#
227# Block layer
228#
229CONFIG_BLOCK=y 214CONFIG_BLOCK=y
230# CONFIG_BLK_DEV_IO_TRACE is not set 215# CONFIG_BLK_DEV_IO_TRACE is not set
216# CONFIG_BLK_DEV_BSG is not set
231 217
232# 218#
233# IO Schedulers 219# IO Schedulers
@@ -248,16 +234,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
248CONFIG_HW_HAS_PCI=y 234CONFIG_HW_HAS_PCI=y
249CONFIG_PCI=y 235CONFIG_PCI=y
250CONFIG_PCI_DOMAINS=y 236CONFIG_PCI_DOMAINS=y
237# CONFIG_ARCH_SUPPORTS_MSI is not set
251CONFIG_MMU=y 238CONFIG_MMU=y
252 239
253# 240#
254# PCCARD (PCMCIA/CardBus) support 241# PCCARD (PCMCIA/CardBus) support
255# 242#
256# CONFIG_PCCARD is not set 243# CONFIG_PCCARD is not set
257
258#
259# PCI Hotplug Support
260#
261# CONFIG_HOTPLUG_PCI is not set 244# CONFIG_HOTPLUG_PCI is not set
262 245
263# 246#
@@ -279,7 +262,6 @@ CONFIG_BINFMT_ELF32=y
279CONFIG_PM=y 262CONFIG_PM=y
280# CONFIG_PM_LEGACY is not set 263# CONFIG_PM_LEGACY is not set
281# CONFIG_PM_DEBUG is not set 264# CONFIG_PM_DEBUG is not set
282# CONFIG_PM_SYSFS_DEPRECATED is not set
283 265
284# 266#
285# Networking 267# Networking
@@ -289,7 +271,6 @@ CONFIG_NET=y
289# 271#
290# Networking options 272# Networking options
291# 273#
292# CONFIG_NETDEBUG is not set
293CONFIG_PACKET=y 274CONFIG_PACKET=y
294CONFIG_PACKET_MMAP=y 275CONFIG_PACKET_MMAP=y
295CONFIG_UNIX=y 276CONFIG_UNIX=y
@@ -331,20 +312,13 @@ CONFIG_TCP_MD5SIG=y
331# CONFIG_INET6_TUNNEL is not set 312# CONFIG_INET6_TUNNEL is not set
332CONFIG_NETWORK_SECMARK=y 313CONFIG_NETWORK_SECMARK=y
333# CONFIG_NETFILTER is not set 314# CONFIG_NETFILTER is not set
334
335#
336# DCCP Configuration (EXPERIMENTAL)
337#
338# CONFIG_IP_DCCP is not set 315# CONFIG_IP_DCCP is not set
339 316CONFIG_IP_SCTP=m
340# 317# CONFIG_SCTP_DBG_MSG is not set
341# SCTP Configuration (EXPERIMENTAL) 318# CONFIG_SCTP_DBG_OBJCNT is not set
342# 319# CONFIG_SCTP_HMAC_NONE is not set
343# CONFIG_IP_SCTP is not set 320# CONFIG_SCTP_HMAC_SHA1 is not set
344 321CONFIG_SCTP_HMAC_MD5=y
345#
346# TIPC Configuration (EXPERIMENTAL)
347#
348# CONFIG_TIPC is not set 322# CONFIG_TIPC is not set
349# CONFIG_ATM is not set 323# CONFIG_ATM is not set
350# CONFIG_BRIDGE is not set 324# CONFIG_BRIDGE is not set
@@ -363,9 +337,6 @@ CONFIG_NETWORK_SECMARK=y
363# 337#
364CONFIG_NET_SCHED=y 338CONFIG_NET_SCHED=y
365CONFIG_NET_SCH_FIFO=y 339CONFIG_NET_SCH_FIFO=y
366# CONFIG_NET_SCH_CLK_JIFFIES is not set
367CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
368# CONFIG_NET_SCH_CLK_CPU is not set
369 340
370# 341#
371# Queueing/Scheduling 342# Queueing/Scheduling
@@ -374,6 +345,7 @@ CONFIG_NET_SCH_CBQ=m
374CONFIG_NET_SCH_HTB=m 345CONFIG_NET_SCH_HTB=m
375CONFIG_NET_SCH_HFSC=m 346CONFIG_NET_SCH_HFSC=m
376CONFIG_NET_SCH_PRIO=m 347CONFIG_NET_SCH_PRIO=m
348CONFIG_NET_SCH_RR=m
377CONFIG_NET_SCH_RED=m 349CONFIG_NET_SCH_RED=m
378CONFIG_NET_SCH_SFQ=m 350CONFIG_NET_SCH_SFQ=m
379CONFIG_NET_SCH_TEQL=m 351CONFIG_NET_SCH_TEQL=m
@@ -398,10 +370,15 @@ CONFIG_CLS_U32_MARK=y
398CONFIG_NET_CLS_RSVP=m 370CONFIG_NET_CLS_RSVP=m
399CONFIG_NET_CLS_RSVP6=m 371CONFIG_NET_CLS_RSVP6=m
400# CONFIG_NET_EMATCH is not set 372# CONFIG_NET_EMATCH is not set
401# CONFIG_NET_CLS_ACT is not set 373CONFIG_NET_CLS_ACT=y
374CONFIG_NET_ACT_POLICE=y
375CONFIG_NET_ACT_GACT=m
376CONFIG_GACT_PROB=y
377CONFIG_NET_ACT_MIRRED=m
378CONFIG_NET_ACT_PEDIT=m
379# CONFIG_NET_ACT_SIMP is not set
402CONFIG_NET_CLS_POLICE=y 380CONFIG_NET_CLS_POLICE=y
403# CONFIG_NET_CLS_IND is not set 381# CONFIG_NET_CLS_IND is not set
404CONFIG_NET_ESTIMATOR=y
405 382
406# 383#
407# Network testing 384# Network testing
@@ -410,13 +387,24 @@ CONFIG_NET_ESTIMATOR=y
410# CONFIG_HAMRADIO is not set 387# CONFIG_HAMRADIO is not set
411# CONFIG_IRDA is not set 388# CONFIG_IRDA is not set
412# CONFIG_BT is not set 389# CONFIG_BT is not set
390# CONFIG_AF_RXRPC is not set
391
392#
393# Wireless
394#
395CONFIG_CFG80211=m
396CONFIG_WIRELESS_EXT=y
397CONFIG_MAC80211=m
398# CONFIG_MAC80211_DEBUG is not set
413CONFIG_IEEE80211=m 399CONFIG_IEEE80211=m
414# CONFIG_IEEE80211_DEBUG is not set 400# CONFIG_IEEE80211_DEBUG is not set
415CONFIG_IEEE80211_CRYPT_WEP=m 401CONFIG_IEEE80211_CRYPT_WEP=m
416CONFIG_IEEE80211_CRYPT_CCMP=m 402CONFIG_IEEE80211_CRYPT_CCMP=m
403CONFIG_IEEE80211_CRYPT_TKIP=m
417CONFIG_IEEE80211_SOFTMAC=m 404CONFIG_IEEE80211_SOFTMAC=m
418# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 405# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
419CONFIG_WIRELESS_EXT=y 406CONFIG_RFKILL=m
407# CONFIG_NET_9P is not set
420 408
421# 409#
422# Device Drivers 410# Device Drivers
@@ -429,30 +417,10 @@ CONFIG_STANDALONE=y
429CONFIG_PREVENT_FIRMWARE_BUILD=y 417CONFIG_PREVENT_FIRMWARE_BUILD=y
430CONFIG_FW_LOADER=y 418CONFIG_FW_LOADER=y
431# CONFIG_SYS_HYPERVISOR is not set 419# CONFIG_SYS_HYPERVISOR is not set
432
433#
434# Connector - unified userspace <-> kernelspace linker
435#
436CONFIG_CONNECTOR=m 420CONFIG_CONNECTOR=m
437
438#
439# Memory Technology Devices (MTD)
440#
441# CONFIG_MTD is not set 421# CONFIG_MTD is not set
442
443#
444# Parallel port support
445#
446# CONFIG_PARPORT is not set 422# CONFIG_PARPORT is not set
447 423CONFIG_BLK_DEV=y
448#
449# Plug and Play support
450#
451# CONFIG_PNPACPI is not set
452
453#
454# Block devices
455#
456# CONFIG_BLK_CPQ_DA is not set 424# CONFIG_BLK_CPQ_DA is not set
457# CONFIG_BLK_CPQ_CISS_DA is not set 425# CONFIG_BLK_CPQ_CISS_DA is not set
458# CONFIG_BLK_DEV_DAC960 is not set 426# CONFIG_BLK_DEV_DAC960 is not set
@@ -463,21 +431,11 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
463# CONFIG_BLK_DEV_NBD is not set 431# CONFIG_BLK_DEV_NBD is not set
464# CONFIG_BLK_DEV_SX8 is not set 432# CONFIG_BLK_DEV_SX8 is not set
465# CONFIG_BLK_DEV_RAM is not set 433# CONFIG_BLK_DEV_RAM is not set
466# CONFIG_BLK_DEV_INITRD is not set
467CONFIG_CDROM_PKTCDVD=m 434CONFIG_CDROM_PKTCDVD=m
468CONFIG_CDROM_PKTCDVD_BUFFERS=8 435CONFIG_CDROM_PKTCDVD_BUFFERS=8
469# CONFIG_CDROM_PKTCDVD_WCACHE is not set 436# CONFIG_CDROM_PKTCDVD_WCACHE is not set
470CONFIG_ATA_OVER_ETH=m 437CONFIG_ATA_OVER_ETH=m
471 438# CONFIG_MISC_DEVICES is not set
472#
473# Misc devices
474#
475CONFIG_SGI_IOC4=m
476# CONFIG_TIFM_CORE is not set
477
478#
479# ATA/ATAPI/MFM/RLL support
480#
481# CONFIG_IDE is not set 439# CONFIG_IDE is not set
482 440
483# 441#
@@ -485,6 +443,7 @@ CONFIG_SGI_IOC4=m
485# 443#
486CONFIG_RAID_ATTRS=m 444CONFIG_RAID_ATTRS=m
487CONFIG_SCSI=y 445CONFIG_SCSI=y
446CONFIG_SCSI_DMA=y
488CONFIG_SCSI_TGT=m 447CONFIG_SCSI_TGT=m
489CONFIG_SCSI_NETLINK=y 448CONFIG_SCSI_NETLINK=y
490CONFIG_SCSI_PROC_FS=y 449CONFIG_SCSI_PROC_FS=y
@@ -507,6 +466,7 @@ CONFIG_CHR_DEV_SCH=m
507CONFIG_SCSI_CONSTANTS=y 466CONFIG_SCSI_CONSTANTS=y
508CONFIG_SCSI_LOGGING=y 467CONFIG_SCSI_LOGGING=y
509CONFIG_SCSI_SCAN_ASYNC=y 468CONFIG_SCSI_SCAN_ASYNC=y
469CONFIG_SCSI_WAIT_SCAN=m
510 470
511# 471#
512# SCSI Transports 472# SCSI Transports
@@ -517,10 +477,7 @@ CONFIG_SCSI_ISCSI_ATTRS=m
517CONFIG_SCSI_SAS_ATTRS=m 477CONFIG_SCSI_SAS_ATTRS=m
518CONFIG_SCSI_SAS_LIBSAS=m 478CONFIG_SCSI_SAS_LIBSAS=m
519# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 479# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
520 480CONFIG_SCSI_LOWLEVEL=y
521#
522# SCSI low-level drivers
523#
524# CONFIG_ISCSI_TCP is not set 481# CONFIG_ISCSI_TCP is not set
525# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 482# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
526# CONFIG_SCSI_3W_9XXX is not set 483# CONFIG_SCSI_3W_9XXX is not set
@@ -551,15 +508,7 @@ CONFIG_SCSI_QLOGIC_1280=y
551# CONFIG_SCSI_DC390T is not set 508# CONFIG_SCSI_DC390T is not set
552# CONFIG_SCSI_DEBUG is not set 509# CONFIG_SCSI_DEBUG is not set
553# CONFIG_SCSI_SRP is not set 510# CONFIG_SCSI_SRP is not set
554
555#
556# Serial ATA (prod) and Parallel ATA (experimental) drivers
557#
558# CONFIG_ATA is not set 511# CONFIG_ATA is not set
559
560#
561# Multi-device support (RAID and LVM)
562#
563CONFIG_MD=y 512CONFIG_MD=y
564CONFIG_BLK_DEV_MD=y 513CONFIG_BLK_DEV_MD=y
565CONFIG_MD_LINEAR=m 514CONFIG_MD_LINEAR=m
@@ -578,6 +527,8 @@ CONFIG_DM_MIRROR=m
578CONFIG_DM_ZERO=m 527CONFIG_DM_ZERO=m
579CONFIG_DM_MULTIPATH=m 528CONFIG_DM_MULTIPATH=m
580CONFIG_DM_MULTIPATH_EMC=m 529CONFIG_DM_MULTIPATH_EMC=m
530CONFIG_DM_MULTIPATH_RDAC=m
531# CONFIG_DM_DELAY is not set
581 532
582# 533#
583# Fusion MPT device support 534# Fusion MPT device support
@@ -590,30 +541,18 @@ CONFIG_DM_MULTIPATH_EMC=m
590# 541#
591# IEEE 1394 (FireWire) support 542# IEEE 1394 (FireWire) support
592# 543#
544# CONFIG_FIREWIRE is not set
593# CONFIG_IEEE1394 is not set 545# CONFIG_IEEE1394 is not set
594
595#
596# I2O device support
597#
598# CONFIG_I2O is not set 546# CONFIG_I2O is not set
599
600#
601# Network device support
602#
603CONFIG_NETDEVICES=y 547CONFIG_NETDEVICES=y
548CONFIG_NETDEVICES_MULTIQUEUE=y
549CONFIG_IFB=m
604# CONFIG_DUMMY is not set 550# CONFIG_DUMMY is not set
605# CONFIG_BONDING is not set 551# CONFIG_BONDING is not set
552CONFIG_MACVLAN=m
606# CONFIG_EQUALIZER is not set 553# CONFIG_EQUALIZER is not set
607# CONFIG_TUN is not set 554# CONFIG_TUN is not set
608
609#
610# ARCnet devices
611#
612# CONFIG_ARCNET is not set 555# CONFIG_ARCNET is not set
613
614#
615# PHY device support
616#
617CONFIG_PHYLIB=m 556CONFIG_PHYLIB=m
618 557
619# 558#
@@ -627,30 +566,21 @@ CONFIG_CICADA_PHY=m
627CONFIG_VITESSE_PHY=m 566CONFIG_VITESSE_PHY=m
628CONFIG_SMSC_PHY=m 567CONFIG_SMSC_PHY=m
629# CONFIG_BROADCOM_PHY is not set 568# CONFIG_BROADCOM_PHY is not set
569CONFIG_ICPLUS_PHY=m
630# CONFIG_FIXED_PHY is not set 570# CONFIG_FIXED_PHY is not set
631
632#
633# Ethernet (10 or 100Mbit)
634#
635CONFIG_NET_ETHERNET=y 571CONFIG_NET_ETHERNET=y
636CONFIG_MII=y 572CONFIG_MII=y
573CONFIG_AX88796=m
637CONFIG_SGI_IOC3_ETH=y 574CONFIG_SGI_IOC3_ETH=y
638# CONFIG_HAPPYMEAL is not set 575# CONFIG_HAPPYMEAL is not set
639# CONFIG_SUNGEM is not set 576# CONFIG_SUNGEM is not set
640# CONFIG_CASSINI is not set 577# CONFIG_CASSINI is not set
641# CONFIG_NET_VENDOR_3COM is not set 578# CONFIG_NET_VENDOR_3COM is not set
642# CONFIG_DM9000 is not set 579# CONFIG_DM9000 is not set
643
644#
645# Tulip family network device support
646#
647# CONFIG_NET_TULIP is not set 580# CONFIG_NET_TULIP is not set
648# CONFIG_HP100 is not set 581# CONFIG_HP100 is not set
649# CONFIG_NET_PCI is not set 582# CONFIG_NET_PCI is not set
650 583CONFIG_NETDEV_1000=y
651#
652# Ethernet (1000 Mbit)
653#
654# CONFIG_ACENIC is not set 584# CONFIG_ACENIC is not set
655# CONFIG_DL2K is not set 585# CONFIG_DL2K is not set
656# CONFIG_E1000 is not set 586# CONFIG_E1000 is not set
@@ -661,35 +591,57 @@ CONFIG_SGI_IOC3_ETH=y
661# CONFIG_SIS190 is not set 591# CONFIG_SIS190 is not set
662# CONFIG_SKGE is not set 592# CONFIG_SKGE is not set
663# CONFIG_SKY2 is not set 593# CONFIG_SKY2 is not set
664# CONFIG_SK98LIN is not set 594CONFIG_VIA_VELOCITY=m
665# CONFIG_TIGON3 is not set 595# CONFIG_TIGON3 is not set
666# CONFIG_BNX2 is not set 596# CONFIG_BNX2 is not set
667CONFIG_QLA3XXX=m 597CONFIG_QLA3XXX=m
668# CONFIG_ATL1 is not set 598# CONFIG_ATL1 is not set
669 599CONFIG_NETDEV_10000=y
670#
671# Ethernet (10000 Mbit)
672#
673# CONFIG_CHELSIO_T1 is not set 600# CONFIG_CHELSIO_T1 is not set
674CONFIG_CHELSIO_T3=m 601CONFIG_CHELSIO_T3=m
675# CONFIG_IXGB is not set 602# CONFIG_IXGB is not set
676# CONFIG_S2IO is not set 603# CONFIG_S2IO is not set
677# CONFIG_MYRI10GE is not set 604# CONFIG_MYRI10GE is not set
678CONFIG_NETXEN_NIC=m 605CONFIG_NETXEN_NIC=m
679 606# CONFIG_MLX4_CORE is not set
680#
681# Token Ring devices
682#
683# CONFIG_TR is not set 607# CONFIG_TR is not set
684 608
685# 609#
686# Wireless LAN (non-hamradio) 610# Wireless LAN
687# 611#
688# CONFIG_NET_RADIO is not set 612# CONFIG_WLAN_PRE80211 is not set
689 613CONFIG_WLAN_80211=y
690# 614CONFIG_IPW2100=m
691# Wan interfaces 615CONFIG_IPW2100_MONITOR=y
692# 616CONFIG_IPW2100_DEBUG=y
617CONFIG_IPW2200=m
618CONFIG_IPW2200_MONITOR=y
619CONFIG_IPW2200_RADIOTAP=y
620CONFIG_IPW2200_PROMISCUOUS=y
621CONFIG_IPW2200_QOS=y
622CONFIG_IPW2200_DEBUG=y
623CONFIG_LIBERTAS=m
624# CONFIG_LIBERTAS_DEBUG is not set
625CONFIG_HERMES=m
626CONFIG_PLX_HERMES=m
627CONFIG_TMD_HERMES=m
628CONFIG_NORTEL_HERMES=m
629CONFIG_PCI_HERMES=m
630CONFIG_ATMEL=m
631CONFIG_PCI_ATMEL=m
632CONFIG_PRISM54=m
633CONFIG_HOSTAP=m
634CONFIG_HOSTAP_FIRMWARE=y
635CONFIG_HOSTAP_FIRMWARE_NVRAM=y
636CONFIG_HOSTAP_PLX=m
637CONFIG_HOSTAP_PCI=m
638CONFIG_BCM43XX=m
639CONFIG_BCM43XX_DEBUG=y
640CONFIG_BCM43XX_DMA=y
641CONFIG_BCM43XX_PIO=y
642CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
643# CONFIG_BCM43XX_DMA_MODE is not set
644# CONFIG_BCM43XX_PIO_MODE is not set
693# CONFIG_WAN is not set 645# CONFIG_WAN is not set
694# CONFIG_FDDI is not set 646# CONFIG_FDDI is not set
695# CONFIG_HIPPI is not set 647# CONFIG_HIPPI is not set
@@ -700,15 +652,7 @@ CONFIG_NETXEN_NIC=m
700# CONFIG_NETCONSOLE is not set 652# CONFIG_NETCONSOLE is not set
701# CONFIG_NETPOLL is not set 653# CONFIG_NETPOLL is not set
702# CONFIG_NET_POLL_CONTROLLER is not set 654# CONFIG_NET_POLL_CONTROLLER is not set
703
704#
705# ISDN subsystem
706#
707# CONFIG_ISDN is not set 655# CONFIG_ISDN is not set
708
709#
710# Telephony Support
711#
712# CONFIG_PHONE is not set 656# CONFIG_PHONE is not set
713 657
714# 658#
@@ -756,34 +700,17 @@ CONFIG_SERIAL_CORE_CONSOLE=y
756CONFIG_UNIX98_PTYS=y 700CONFIG_UNIX98_PTYS=y
757CONFIG_LEGACY_PTYS=y 701CONFIG_LEGACY_PTYS=y
758CONFIG_LEGACY_PTY_COUNT=256 702CONFIG_LEGACY_PTY_COUNT=256
759
760#
761# IPMI
762#
763# CONFIG_IPMI_HANDLER is not set 703# CONFIG_IPMI_HANDLER is not set
764
765#
766# Watchdog Cards
767#
768# CONFIG_WATCHDOG is not set 704# CONFIG_WATCHDOG is not set
769# CONFIG_HW_RANDOM is not set 705CONFIG_HW_RANDOM=m
770# CONFIG_RTC is not set 706# CONFIG_RTC is not set
771CONFIG_SGI_IP27_RTC=y 707CONFIG_SGI_IP27_RTC=y
772# CONFIG_GEN_RTC is not set
773# CONFIG_DTLK is not set
774# CONFIG_R3964 is not set 708# CONFIG_R3964 is not set
775# CONFIG_APPLICOM is not set 709# CONFIG_APPLICOM is not set
776# CONFIG_DRM is not set 710# CONFIG_DRM is not set
777# CONFIG_RAW_DRIVER is not set 711# CONFIG_RAW_DRIVER is not set
778
779#
780# TPM devices
781#
782# CONFIG_TCG_TPM is not set 712# CONFIG_TCG_TPM is not set
783 713CONFIG_DEVPORT=y
784#
785# I2C support
786#
787# CONFIG_I2C is not set 714# CONFIG_I2C is not set
788 715
789# 716#
@@ -791,43 +718,40 @@ CONFIG_SGI_IP27_RTC=y
791# 718#
792# CONFIG_SPI is not set 719# CONFIG_SPI is not set
793# CONFIG_SPI_MASTER is not set 720# CONFIG_SPI_MASTER is not set
794
795#
796# Dallas's 1-wire bus
797#
798# CONFIG_W1 is not set 721# CONFIG_W1 is not set
722# CONFIG_POWER_SUPPLY is not set
723# CONFIG_HWMON is not set
799 724
800# 725#
801# Hardware Monitoring support 726# Multifunction device drivers
802# 727#
803# CONFIG_HWMON is not set 728# CONFIG_MFD_SM501 is not set
804# CONFIG_HWMON_VID is not set
805 729
806# 730#
807# Multimedia devices 731# Multimedia devices
808# 732#
809# CONFIG_VIDEO_DEV is not set 733# CONFIG_VIDEO_DEV is not set
734# CONFIG_DVB_CORE is not set
735# CONFIG_DAB is not set
810 736
811# 737#
812# Digital Video Broadcasting Devices 738# Graphics support
813# 739#
814# CONFIG_DVB is not set 740# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
815 741
816# 742#
817# Graphics support 743# Display device support
818# 744#
819# CONFIG_FIRMWARE_EDID is not set 745# CONFIG_DISPLAY_SUPPORT is not set
746# CONFIG_VGASTATE is not set
747# CONFIG_VIDEO_OUTPUT_CONTROL is not set
820# CONFIG_FB is not set 748# CONFIG_FB is not set
821# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
822 749
823# 750#
824# Sound 751# Sound
825# 752#
826# CONFIG_SOUND is not set 753# CONFIG_SOUND is not set
827 754CONFIG_USB_SUPPORT=y
828#
829# USB support
830#
831CONFIG_USB_ARCH_HAS_HCD=y 755CONFIG_USB_ARCH_HAS_HCD=y
832CONFIG_USB_ARCH_HAS_OHCI=y 756CONFIG_USB_ARCH_HAS_OHCI=y
833CONFIG_USB_ARCH_HAS_EHCI=y 757CONFIG_USB_ARCH_HAS_EHCI=y
@@ -841,37 +765,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
841# USB Gadget Support 765# USB Gadget Support
842# 766#
843# CONFIG_USB_GADGET is not set 767# CONFIG_USB_GADGET is not set
844
845#
846# MMC/SD Card support
847#
848# CONFIG_MMC is not set 768# CONFIG_MMC is not set
849
850#
851# LED devices
852#
853# CONFIG_NEW_LEDS is not set 769# CONFIG_NEW_LEDS is not set
854
855#
856# LED drivers
857#
858
859#
860# LED Triggers
861#
862
863#
864# InfiniBand support
865#
866# CONFIG_INFINIBAND is not set 770# CONFIG_INFINIBAND is not set
867
868#
869# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
870#
871
872#
873# Real Time Clock
874#
875# CONFIG_RTC_CLASS is not set 771# CONFIG_RTC_CLASS is not set
876 772
877# 773#
@@ -888,12 +784,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
888# 784#
889 785
890# 786#
891# Auxiliary Display support 787# Userspace I/O
892#
893
894#
895# Virtualization
896# 788#
789CONFIG_UIO=y
790# CONFIG_UIO_CIF is not set
897 791
898# 792#
899# File systems 793# File systems
@@ -992,6 +886,7 @@ CONFIG_LOCKD_V4=y
992CONFIG_NFS_COMMON=y 886CONFIG_NFS_COMMON=y
993CONFIG_SUNRPC=y 887CONFIG_SUNRPC=y
994CONFIG_SUNRPC_GSS=y 888CONFIG_SUNRPC_GSS=y
889# CONFIG_SUNRPC_BIND34 is not set
995CONFIG_RPCSEC_GSS_KRB5=y 890CONFIG_RPCSEC_GSS_KRB5=y
996# CONFIG_RPCSEC_GSS_SPKM3 is not set 891# CONFIG_RPCSEC_GSS_SPKM3 is not set
997# CONFIG_SMB_FS is not set 892# CONFIG_SMB_FS is not set
@@ -999,7 +894,6 @@ CONFIG_RPCSEC_GSS_KRB5=y
999# CONFIG_NCP_FS is not set 894# CONFIG_NCP_FS is not set
1000# CONFIG_CODA_FS is not set 895# CONFIG_CODA_FS is not set
1001# CONFIG_AFS_FS is not set 896# CONFIG_AFS_FS is not set
1002# CONFIG_9P_FS is not set
1003 897
1004# 898#
1005# Partition Types 899# Partition Types
@@ -1021,6 +915,7 @@ CONFIG_SGI_PARTITION=y
1021# CONFIG_SUN_PARTITION is not set 915# CONFIG_SUN_PARTITION is not set
1022# CONFIG_KARMA_PARTITION is not set 916# CONFIG_KARMA_PARTITION is not set
1023# CONFIG_EFI_PARTITION is not set 917# CONFIG_EFI_PARTITION is not set
918# CONFIG_SYSV68_PARTITION is not set
1024 919
1025# 920#
1026# Native Language Support 921# Native Language Support
@@ -1031,8 +926,6 @@ CONFIG_SGI_PARTITION=y
1031# Distributed Lock Manager 926# Distributed Lock Manager
1032# 927#
1033CONFIG_DLM=m 928CONFIG_DLM=m
1034CONFIG_DLM_TCP=y
1035# CONFIG_DLM_SCTP is not set
1036# CONFIG_DLM_DEBUG is not set 929# CONFIG_DLM_DEBUG is not set
1037 930
1038# 931#
@@ -1051,7 +944,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1051# CONFIG_DEBUG_FS is not set 944# CONFIG_DEBUG_FS is not set
1052# CONFIG_HEADERS_CHECK is not set 945# CONFIG_HEADERS_CHECK is not set
1053# CONFIG_DEBUG_KERNEL is not set 946# CONFIG_DEBUG_KERNEL is not set
1054CONFIG_LOG_BUF_SHIFT=15
1055CONFIG_CROSSCOMPILE=y 947CONFIG_CROSSCOMPILE=y
1056CONFIG_CMDLINE="" 948CONFIG_CMDLINE=""
1057CONFIG_SYS_SUPPORTS_KGDB=y 949CONFIG_SYS_SUPPORTS_KGDB=y
@@ -1062,12 +954,13 @@ CONFIG_SYS_SUPPORTS_KGDB=y
1062CONFIG_KEYS=y 954CONFIG_KEYS=y
1063CONFIG_KEYS_DEBUG_PROC_KEYS=y 955CONFIG_KEYS_DEBUG_PROC_KEYS=y
1064# CONFIG_SECURITY is not set 956# CONFIG_SECURITY is not set
1065 957CONFIG_XOR_BLOCKS=m
1066# 958CONFIG_ASYNC_CORE=m
1067# Cryptographic options 959CONFIG_ASYNC_MEMCPY=m
1068# 960CONFIG_ASYNC_XOR=m
1069CONFIG_CRYPTO=y 961CONFIG_CRYPTO=y
1070CONFIG_CRYPTO_ALGAPI=y 962CONFIG_CRYPTO_ALGAPI=y
963CONFIG_CRYPTO_ABLKCIPHER=m
1071CONFIG_CRYPTO_BLKCIPHER=y 964CONFIG_CRYPTO_BLKCIPHER=y
1072CONFIG_CRYPTO_HASH=y 965CONFIG_CRYPTO_HASH=y
1073CONFIG_CRYPTO_MANAGER=y 966CONFIG_CRYPTO_MANAGER=y
@@ -1086,6 +979,7 @@ CONFIG_CRYPTO_ECB=m
1086CONFIG_CRYPTO_CBC=y 979CONFIG_CRYPTO_CBC=y
1087CONFIG_CRYPTO_PCBC=m 980CONFIG_CRYPTO_PCBC=m
1088CONFIG_CRYPTO_LRW=m 981CONFIG_CRYPTO_LRW=m
982CONFIG_CRYPTO_CRYPTD=m
1089CONFIG_CRYPTO_DES=y 983CONFIG_CRYPTO_DES=y
1090CONFIG_CRYPTO_FCRYPT=m 984CONFIG_CRYPTO_FCRYPT=m
1091CONFIG_CRYPTO_BLOWFISH=m 985CONFIG_CRYPTO_BLOWFISH=m
@@ -1104,21 +998,21 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1104CONFIG_CRYPTO_CRC32C=m 998CONFIG_CRYPTO_CRC32C=m
1105CONFIG_CRYPTO_CAMELLIA=m 999CONFIG_CRYPTO_CAMELLIA=m
1106# CONFIG_CRYPTO_TEST is not set 1000# CONFIG_CRYPTO_TEST is not set
1107 1001CONFIG_CRYPTO_HW=y
1108#
1109# Hardware crypto devices
1110#
1111 1002
1112# 1003#
1113# Library routines 1004# Library routines
1114# 1005#
1115CONFIG_BITREVERSE=y 1006CONFIG_BITREVERSE=y
1116# CONFIG_CRC_CCITT is not set 1007CONFIG_CRC_CCITT=m
1117CONFIG_CRC16=m 1008# CONFIG_CRC16 is not set
1009# CONFIG_CRC_ITU_T is not set
1118CONFIG_CRC32=y 1010CONFIG_CRC32=y
1011# CONFIG_CRC7 is not set
1119CONFIG_LIBCRC32C=m 1012CONFIG_LIBCRC32C=m
1120CONFIG_ZLIB_INFLATE=m 1013CONFIG_ZLIB_INFLATE=m
1121CONFIG_ZLIB_DEFLATE=m 1014CONFIG_ZLIB_DEFLATE=m
1122CONFIG_PLIST=y 1015CONFIG_PLIST=y
1123CONFIG_HAS_IOMEM=y 1016CONFIG_HAS_IOMEM=y
1124CONFIG_HAS_IOPORT=y 1017CONFIG_HAS_IOPORT=y
1018CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig
index 95a72d2750ef..eb96791c33ea 100644
--- a/arch/mips/configs/jmr3927_defconfig
+++ b/arch/mips/configs/jmr3927_defconfig
@@ -1,60 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-rc3 3# Linux kernel version: 2.6.23-rc1
4# Thu Mar 15 00:40:40 2007 4# Thu Aug 2 23:07:36 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22# CONFIG_MACH_VR41XX is not set
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38# CONFIG_MACH_VR41XX is not set 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55CONFIG_TOSHIBA_JMR3927=y 41CONFIG_TOSHIBA_JMR3927=y
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58CONFIG_RWSEM_GENERIC_SPINLOCK=y 45CONFIG_RWSEM_GENERIC_SPINLOCK=y
59# CONFIG_ARCH_HAS_ILOG2_U32 is not set 46# CONFIG_ARCH_HAS_ILOG2_U32 is not set
60# CONFIG_ARCH_HAS_ILOG2_U64 is not set 47# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -66,10 +53,12 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
66CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 53CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
67CONFIG_DMA_NONCOHERENT=y 54CONFIG_DMA_NONCOHERENT=y
68CONFIG_DMA_NEED_PCI_MAP_STATE=y 55CONFIG_DMA_NEED_PCI_MAP_STATE=y
56# CONFIG_NO_IOPORT is not set
69CONFIG_CPU_BIG_ENDIAN=y 57CONFIG_CPU_BIG_ENDIAN=y
70# CONFIG_CPU_LITTLE_ENDIAN is not set 58# CONFIG_CPU_LITTLE_ENDIAN is not set
71CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 59CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
72CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 60CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
61CONFIG_IRQ_TXX9=y
73CONFIG_MIPS_TX3927=y 62CONFIG_MIPS_TX3927=y
74CONFIG_SWAP_IO_SPACE=y 63CONFIG_SWAP_IO_SPACE=y
75CONFIG_MIPS_L1_CACHE_SHIFT=5 64CONFIG_MIPS_L1_CACHE_SHIFT=5
@@ -77,6 +66,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
77# 66#
78# CPU selection 67# CPU selection
79# 68#
69# CONFIG_CPU_LOONGSON2 is not set
80# CONFIG_CPU_MIPS32_R1 is not set 70# CONFIG_CPU_MIPS32_R1 is not set
81# CONFIG_CPU_MIPS32_R2 is not set 71# CONFIG_CPU_MIPS32_R2 is not set
82# CONFIG_CPU_MIPS64_R1 is not set 72# CONFIG_CPU_MIPS64_R1 is not set
@@ -112,21 +102,17 @@ CONFIG_PAGE_SIZE_4KB=y
112CONFIG_MIPS_MT_DISABLED=y 102CONFIG_MIPS_MT_DISABLED=y
113# CONFIG_MIPS_MT_SMP is not set 103# CONFIG_MIPS_MT_SMP is not set
114# CONFIG_MIPS_MT_SMTC is not set 104# CONFIG_MIPS_MT_SMTC is not set
115# CONFIG_MIPS_VPE_LOADER is not set
116CONFIG_CPU_HAS_SYNC=y 105CONFIG_CPU_HAS_SYNC=y
117CONFIG_GENERIC_HARDIRQS=y 106CONFIG_GENERIC_HARDIRQS=y
118CONFIG_GENERIC_IRQ_PROBE=y 107CONFIG_GENERIC_IRQ_PROBE=y
119CONFIG_ARCH_FLATMEM_ENABLE=y 108CONFIG_ARCH_FLATMEM_ENABLE=y
120CONFIG_SELECT_MEMORY_MODEL=y
121CONFIG_FLATMEM_MANUAL=y
122# CONFIG_DISCONTIGMEM_MANUAL is not set
123# CONFIG_SPARSEMEM_MANUAL is not set
124CONFIG_FLATMEM=y 109CONFIG_FLATMEM=y
125CONFIG_FLAT_NODE_MEM_MAP=y 110CONFIG_FLAT_NODE_MEM_MAP=y
126# CONFIG_SPARSEMEM_STATIC is not set 111# CONFIG_SPARSEMEM_STATIC is not set
127CONFIG_SPLIT_PTLOCK_CPUS=4 112CONFIG_SPLIT_PTLOCK_CPUS=4
128# CONFIG_RESOURCES_64BIT is not set 113# CONFIG_RESOURCES_64BIT is not set
129CONFIG_ZONE_DMA_FLAG=1 114CONFIG_ZONE_DMA_FLAG=0
115CONFIG_VIRT_TO_BUS=y
130# CONFIG_HZ_48 is not set 116# CONFIG_HZ_48 is not set
131# CONFIG_HZ_100 is not set 117# CONFIG_HZ_100 is not set
132# CONFIG_HZ_128 is not set 118# CONFIG_HZ_128 is not set
@@ -139,37 +125,30 @@ CONFIG_HZ=250
139CONFIG_PREEMPT_NONE=y 125CONFIG_PREEMPT_NONE=y
140# CONFIG_PREEMPT_VOLUNTARY is not set 126# CONFIG_PREEMPT_VOLUNTARY is not set
141# CONFIG_PREEMPT is not set 127# CONFIG_PREEMPT is not set
142# CONFIG_KEXEC is not set 128# CONFIG_SECCOMP is not set
143CONFIG_LOCKDEP_SUPPORT=y 129CONFIG_LOCKDEP_SUPPORT=y
144CONFIG_STACKTRACE_SUPPORT=y 130CONFIG_STACKTRACE_SUPPORT=y
145CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 131CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
146 132
147# 133#
148# Code maturity level options 134# General setup
149# 135#
150CONFIG_EXPERIMENTAL=y 136# CONFIG_EXPERIMENTAL is not set
151CONFIG_BROKEN_ON_SMP=y 137CONFIG_BROKEN_ON_SMP=y
152CONFIG_INIT_ENV_ARG_LIMIT=32 138CONFIG_INIT_ENV_ARG_LIMIT=32
153
154#
155# General setup
156#
157CONFIG_LOCALVERSION="" 139CONFIG_LOCALVERSION=""
158CONFIG_LOCALVERSION_AUTO=y 140CONFIG_LOCALVERSION_AUTO=y
159CONFIG_SWAP=y 141CONFIG_SWAP=y
160CONFIG_SYSVIPC=y 142CONFIG_SYSVIPC=y
161# CONFIG_IPC_NS is not set
162CONFIG_SYSVIPC_SYSCTL=y 143CONFIG_SYSVIPC_SYSCTL=y
163# CONFIG_POSIX_MQUEUE is not set
164# CONFIG_BSD_PROCESS_ACCT is not set 144# CONFIG_BSD_PROCESS_ACCT is not set
165# CONFIG_TASKSTATS is not set 145# CONFIG_TASKSTATS is not set
166# CONFIG_UTS_NS is not set
167# CONFIG_AUDIT is not set 146# CONFIG_AUDIT is not set
168# CONFIG_IKCONFIG is not set 147# CONFIG_IKCONFIG is not set
148CONFIG_LOG_BUF_SHIFT=14
169CONFIG_SYSFS_DEPRECATED=y 149CONFIG_SYSFS_DEPRECATED=y
170# CONFIG_RELAY is not set 150# CONFIG_RELAY is not set
171# CONFIG_BLK_DEV_INITRD is not set 151# CONFIG_BLK_DEV_INITRD is not set
172# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
173CONFIG_SYSCTL=y 152CONFIG_SYSCTL=y
174CONFIG_EMBEDDED=y 153CONFIG_EMBEDDED=y
175CONFIG_SYSCTL_SYSCALL=y 154CONFIG_SYSCTL_SYSCALL=y
@@ -181,23 +160,20 @@ CONFIG_BUG=y
181CONFIG_ELF_CORE=y 160CONFIG_ELF_CORE=y
182CONFIG_BASE_FULL=y 161CONFIG_BASE_FULL=y
183CONFIG_FUTEX=y 162CONFIG_FUTEX=y
163CONFIG_ANON_INODES=y
184CONFIG_EPOLL=y 164CONFIG_EPOLL=y
165CONFIG_SIGNALFD=y
166CONFIG_TIMERFD=y
167CONFIG_EVENTFD=y
185CONFIG_SHMEM=y 168CONFIG_SHMEM=y
186CONFIG_SLAB=y
187CONFIG_VM_EVENT_COUNTERS=y 169CONFIG_VM_EVENT_COUNTERS=y
170CONFIG_SLAB=y
171# CONFIG_SLUB is not set
172# CONFIG_SLOB is not set
188CONFIG_RT_MUTEXES=y 173CONFIG_RT_MUTEXES=y
189# CONFIG_TINY_SHMEM is not set 174# CONFIG_TINY_SHMEM is not set
190CONFIG_BASE_SMALL=0 175CONFIG_BASE_SMALL=0
191# CONFIG_SLOB is not set
192
193#
194# Loadable module support
195#
196# CONFIG_MODULES is not set 176# CONFIG_MODULES is not set
197
198#
199# Block layer
200#
201CONFIG_BLOCK=y 177CONFIG_BLOCK=y
202# CONFIG_LBD is not set 178# CONFIG_LBD is not set
203# CONFIG_BLK_DEV_IO_TRACE is not set 179# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -221,6 +197,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
221# 197#
222CONFIG_HW_HAS_PCI=y 198CONFIG_HW_HAS_PCI=y
223CONFIG_PCI=y 199CONFIG_PCI=y
200# CONFIG_ARCH_SUPPORTS_MSI is not set
224CONFIG_MMU=y 201CONFIG_MMU=y
225 202
226# 203#
@@ -228,10 +205,6 @@ CONFIG_MMU=y
228# 205#
229 206
230# 207#
231# PCI Hotplug Support
232#
233
234#
235# Executable file formats 208# Executable file formats
236# 209#
237CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
@@ -251,7 +224,6 @@ CONFIG_NET=y
251# 224#
252# Networking options 225# Networking options
253# 226#
254# CONFIG_NETDEBUG is not set
255CONFIG_PACKET=y 227CONFIG_PACKET=y
256# CONFIG_PACKET_MMAP is not set 228# CONFIG_PACKET_MMAP is not set
257CONFIG_UNIX=y 229CONFIG_UNIX=y
@@ -266,7 +238,6 @@ CONFIG_IP_PNP_BOOTP=y
266# CONFIG_IP_PNP_RARP is not set 238# CONFIG_IP_PNP_RARP is not set
267# CONFIG_NET_IPIP is not set 239# CONFIG_NET_IPIP is not set
268# CONFIG_NET_IPGRE is not set 240# CONFIG_NET_IPGRE is not set
269# CONFIG_ARPD is not set
270# CONFIG_SYN_COOKIES is not set 241# CONFIG_SYN_COOKIES is not set
271# CONFIG_INET_AH is not set 242# CONFIG_INET_AH is not set
272# CONFIG_INET_ESP is not set 243# CONFIG_INET_ESP is not set
@@ -280,38 +251,17 @@ CONFIG_IP_PNP_BOOTP=y
280# CONFIG_TCP_CONG_ADVANCED is not set 251# CONFIG_TCP_CONG_ADVANCED is not set
281CONFIG_TCP_CONG_CUBIC=y 252CONFIG_TCP_CONG_CUBIC=y
282CONFIG_DEFAULT_TCP_CONG="cubic" 253CONFIG_DEFAULT_TCP_CONG="cubic"
283# CONFIG_TCP_MD5SIG is not set
284# CONFIG_IPV6 is not set 254# CONFIG_IPV6 is not set
285# CONFIG_INET6_XFRM_TUNNEL is not set 255# CONFIG_INET6_XFRM_TUNNEL is not set
286# CONFIG_INET6_TUNNEL is not set 256# CONFIG_INET6_TUNNEL is not set
287# CONFIG_NETWORK_SECMARK is not set 257# CONFIG_NETWORK_SECMARK is not set
288# CONFIG_NETFILTER is not set 258# CONFIG_NETFILTER is not set
289
290#
291# DCCP Configuration (EXPERIMENTAL)
292#
293# CONFIG_IP_DCCP is not set
294
295#
296# SCTP Configuration (EXPERIMENTAL)
297#
298# CONFIG_IP_SCTP is not set
299
300#
301# TIPC Configuration (EXPERIMENTAL)
302#
303# CONFIG_TIPC is not set
304# CONFIG_ATM is not set
305# CONFIG_BRIDGE is not set 259# CONFIG_BRIDGE is not set
306# CONFIG_VLAN_8021Q is not set 260# CONFIG_VLAN_8021Q is not set
307# CONFIG_DECNET is not set 261# CONFIG_DECNET is not set
308# CONFIG_LLC2 is not set 262# CONFIG_LLC2 is not set
309# CONFIG_IPX is not set 263# CONFIG_IPX is not set
310# CONFIG_ATALK is not set 264# CONFIG_ATALK is not set
311# CONFIG_X25 is not set
312# CONFIG_LAPB is not set
313# CONFIG_ECONET is not set
314# CONFIG_WAN_ROUTER is not set
315 265
316# 266#
317# QoS and/or fair queueing 267# QoS and/or fair queueing
@@ -325,7 +275,14 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_HAMRADIO is not set 275# CONFIG_HAMRADIO is not set
326# CONFIG_IRDA is not set 276# CONFIG_IRDA is not set
327# CONFIG_BT is not set 277# CONFIG_BT is not set
278
279#
280# Wireless
281#
282# CONFIG_CFG80211 is not set
283# CONFIG_WIRELESS_EXT is not set
328# CONFIG_IEEE80211 is not set 284# CONFIG_IEEE80211 is not set
285# CONFIG_RFKILL is not set
329 286
330# 287#
331# Device Drivers 288# Device Drivers
@@ -337,34 +294,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
337CONFIG_STANDALONE=y 294CONFIG_STANDALONE=y
338CONFIG_PREVENT_FIRMWARE_BUILD=y 295CONFIG_PREVENT_FIRMWARE_BUILD=y
339# CONFIG_SYS_HYPERVISOR is not set 296# CONFIG_SYS_HYPERVISOR is not set
340
341#
342# Connector - unified userspace <-> kernelspace linker
343#
344# CONFIG_CONNECTOR is not set 297# CONFIG_CONNECTOR is not set
345
346#
347# Memory Technology Devices (MTD)
348#
349# CONFIG_MTD is not set 298# CONFIG_MTD is not set
350
351#
352# Parallel port support
353#
354# CONFIG_PARPORT is not set 299# CONFIG_PARPORT is not set
355 300CONFIG_BLK_DEV=y
356#
357# Plug and Play support
358#
359# CONFIG_PNPACPI is not set
360
361#
362# Block devices
363#
364# CONFIG_BLK_CPQ_DA is not set 301# CONFIG_BLK_CPQ_DA is not set
365# CONFIG_BLK_CPQ_CISS_DA is not set 302# CONFIG_BLK_CPQ_CISS_DA is not set
366# CONFIG_BLK_DEV_DAC960 is not set 303# CONFIG_BLK_DEV_DAC960 is not set
367# CONFIG_BLK_DEV_UMEM is not set
368# CONFIG_BLK_DEV_COW_COMMON is not set 304# CONFIG_BLK_DEV_COW_COMMON is not set
369# CONFIG_BLK_DEV_LOOP is not set 305# CONFIG_BLK_DEV_LOOP is not set
370# CONFIG_BLK_DEV_NBD is not set 306# CONFIG_BLK_DEV_NBD is not set
@@ -372,16 +308,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
372# CONFIG_BLK_DEV_RAM is not set 308# CONFIG_BLK_DEV_RAM is not set
373# CONFIG_CDROM_PKTCDVD is not set 309# CONFIG_CDROM_PKTCDVD is not set
374# CONFIG_ATA_OVER_ETH is not set 310# CONFIG_ATA_OVER_ETH is not set
375 311# CONFIG_MISC_DEVICES is not set
376#
377# Misc devices
378#
379# CONFIG_SGI_IOC4 is not set
380# CONFIG_TIFM_CORE is not set
381
382#
383# ATA/ATAPI/MFM/RLL support
384#
385# CONFIG_IDE is not set 312# CONFIG_IDE is not set
386 313
387# 314#
@@ -389,16 +316,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
389# 316#
390# CONFIG_RAID_ATTRS is not set 317# CONFIG_RAID_ATTRS is not set
391# CONFIG_SCSI is not set 318# CONFIG_SCSI is not set
319# CONFIG_SCSI_DMA is not set
392# CONFIG_SCSI_NETLINK is not set 320# CONFIG_SCSI_NETLINK is not set
393
394#
395# Serial ATA (prod) and Parallel ATA (experimental) drivers
396#
397# CONFIG_ATA is not set 321# CONFIG_ATA is not set
398
399#
400# Multi-device support (RAID and LVM)
401#
402# CONFIG_MD is not set 322# CONFIG_MD is not set
403 323
404# 324#
@@ -409,46 +329,28 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
409# 329#
410# IEEE 1394 (FireWire) support 330# IEEE 1394 (FireWire) support
411# 331#
412# CONFIG_IEEE1394 is not set
413 332
414# 333#
415# I2O device support 334# An alternative FireWire stack is available with EXPERIMENTAL=y
416# 335#
336# CONFIG_IEEE1394 is not set
417# CONFIG_I2O is not set 337# CONFIG_I2O is not set
418
419#
420# Network device support
421#
422CONFIG_NETDEVICES=y 338CONFIG_NETDEVICES=y
339# CONFIG_NETDEVICES_MULTIQUEUE is not set
423# CONFIG_DUMMY is not set 340# CONFIG_DUMMY is not set
424# CONFIG_BONDING is not set 341# CONFIG_BONDING is not set
425# CONFIG_EQUALIZER is not set 342# CONFIG_EQUALIZER is not set
426# CONFIG_TUN is not set 343# CONFIG_TUN is not set
427
428#
429# ARCnet devices
430#
431# CONFIG_ARCNET is not set 344# CONFIG_ARCNET is not set
432
433#
434# PHY device support
435#
436# CONFIG_PHYLIB is not set 345# CONFIG_PHYLIB is not set
437
438#
439# Ethernet (10 or 100Mbit)
440#
441CONFIG_NET_ETHERNET=y 346CONFIG_NET_ETHERNET=y
442CONFIG_MII=y 347CONFIG_MII=y
348# CONFIG_AX88796 is not set
443# CONFIG_HAPPYMEAL is not set 349# CONFIG_HAPPYMEAL is not set
444# CONFIG_SUNGEM is not set 350# CONFIG_SUNGEM is not set
445# CONFIG_CASSINI is not set 351# CONFIG_CASSINI is not set
446# CONFIG_NET_VENDOR_3COM is not set 352# CONFIG_NET_VENDOR_3COM is not set
447# CONFIG_DM9000 is not set 353# CONFIG_DM9000 is not set
448
449#
450# Tulip family network device support
451#
452# CONFIG_NET_TULIP is not set 354# CONFIG_NET_TULIP is not set
453# CONFIG_HP100 is not set 355# CONFIG_HP100 is not set
454CONFIG_NET_PCI=y 356CONFIG_NET_PCI=y
@@ -464,76 +366,28 @@ CONFIG_TC35815=y
464# CONFIG_FEALNX is not set 366# CONFIG_FEALNX is not set
465# CONFIG_NATSEMI is not set 367# CONFIG_NATSEMI is not set
466# CONFIG_NE2K_PCI is not set 368# CONFIG_NE2K_PCI is not set
467# CONFIG_8139CP is not set
468# CONFIG_8139TOO is not set 369# CONFIG_8139TOO is not set
469# CONFIG_SIS900 is not set 370# CONFIG_SIS900 is not set
470# CONFIG_EPIC100 is not set 371# CONFIG_EPIC100 is not set
471# CONFIG_SUNDANCE is not set 372# CONFIG_SUNDANCE is not set
472# CONFIG_TLAN is not set 373# CONFIG_TLAN is not set
473# CONFIG_VIA_RHINE is not set 374# CONFIG_VIA_RHINE is not set
474# CONFIG_SC92031 is not set 375# CONFIG_NETDEV_1000 is not set
475 376# CONFIG_NETDEV_10000 is not set
476#
477# Ethernet (1000 Mbit)
478#
479# CONFIG_ACENIC is not set
480# CONFIG_DL2K is not set
481# CONFIG_E1000 is not set
482# CONFIG_NS83820 is not set
483# CONFIG_HAMACHI is not set
484# CONFIG_YELLOWFIN is not set
485# CONFIG_R8169 is not set
486# CONFIG_SIS190 is not set
487# CONFIG_SKGE is not set
488# CONFIG_SKY2 is not set
489# CONFIG_SK98LIN is not set
490# CONFIG_VIA_VELOCITY is not set
491# CONFIG_TIGON3 is not set
492# CONFIG_BNX2 is not set
493# CONFIG_QLA3XXX is not set
494# CONFIG_ATL1 is not set
495
496#
497# Ethernet (10000 Mbit)
498#
499# CONFIG_CHELSIO_T1 is not set
500# CONFIG_CHELSIO_T3 is not set
501# CONFIG_IXGB is not set
502# CONFIG_S2IO is not set
503# CONFIG_MYRI10GE is not set
504# CONFIG_NETXEN_NIC is not set
505
506#
507# Token Ring devices
508#
509# CONFIG_TR is not set 377# CONFIG_TR is not set
510 378
511# 379#
512# Wireless LAN (non-hamradio) 380# Wireless LAN
513#
514# CONFIG_NET_RADIO is not set
515
516#
517# Wan interfaces
518# 381#
382# CONFIG_WLAN_PRE80211 is not set
383# CONFIG_WLAN_80211 is not set
519# CONFIG_WAN is not set 384# CONFIG_WAN is not set
520# CONFIG_FDDI is not set 385# CONFIG_FDDI is not set
521# CONFIG_HIPPI is not set
522# CONFIG_PPP is not set 386# CONFIG_PPP is not set
523# CONFIG_SLIP is not set 387# CONFIG_SLIP is not set
524# CONFIG_SHAPER is not set
525# CONFIG_NETCONSOLE is not set
526# CONFIG_NETPOLL is not set 388# CONFIG_NETPOLL is not set
527# CONFIG_NET_POLL_CONTROLLER is not set 389# CONFIG_NET_POLL_CONTROLLER is not set
528
529#
530# ISDN subsystem
531#
532# CONFIG_ISDN is not set 390# CONFIG_ISDN is not set
533
534#
535# Telephony Support
536#
537# CONFIG_PHONE is not set 391# CONFIG_PHONE is not set
538 392
539# 393#
@@ -541,6 +395,7 @@ CONFIG_TC35815=y
541# 395#
542CONFIG_INPUT=y 396CONFIG_INPUT=y
543# CONFIG_INPUT_FF_MEMLESS is not set 397# CONFIG_INPUT_FF_MEMLESS is not set
398# CONFIG_INPUT_POLLDEV is not set
544 399
545# 400#
546# Userland interfaces 401# Userland interfaces
@@ -557,6 +412,7 @@ CONFIG_INPUT=y
557# CONFIG_INPUT_KEYBOARD is not set 412# CONFIG_INPUT_KEYBOARD is not set
558# CONFIG_INPUT_MOUSE is not set 413# CONFIG_INPUT_MOUSE is not set
559# CONFIG_INPUT_JOYSTICK is not set 414# CONFIG_INPUT_JOYSTICK is not set
415# CONFIG_INPUT_TABLET is not set
560# CONFIG_INPUT_TOUCHSCREEN is not set 416# CONFIG_INPUT_TOUCHSCREEN is not set
561# CONFIG_INPUT_MISC is not set 417# CONFIG_INPUT_MISC is not set
562 418
@@ -607,33 +463,15 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y
607# CONFIG_UNIX98_PTYS is not set 463# CONFIG_UNIX98_PTYS is not set
608CONFIG_LEGACY_PTYS=y 464CONFIG_LEGACY_PTYS=y
609CONFIG_LEGACY_PTY_COUNT=256 465CONFIG_LEGACY_PTY_COUNT=256
610
611#
612# IPMI
613#
614# CONFIG_IPMI_HANDLER is not set 466# CONFIG_IPMI_HANDLER is not set
615
616#
617# Watchdog Cards
618#
619# CONFIG_WATCHDOG is not set 467# CONFIG_WATCHDOG is not set
620# CONFIG_HW_RANDOM is not set 468# CONFIG_HW_RANDOM is not set
621# CONFIG_RTC is not set 469# CONFIG_RTC is not set
622# CONFIG_GEN_RTC is not set
623# CONFIG_DTLK is not set
624# CONFIG_R3964 is not set 470# CONFIG_R3964 is not set
625# CONFIG_APPLICOM is not set 471# CONFIG_APPLICOM is not set
626# CONFIG_DRM is not set 472# CONFIG_DRM is not set
627# CONFIG_RAW_DRIVER is not set 473# CONFIG_RAW_DRIVER is not set
628 474CONFIG_DEVPORT=y
629#
630# TPM devices
631#
632# CONFIG_TCG_TPM is not set
633
634#
635# I2C support
636#
637# CONFIG_I2C is not set 475# CONFIG_I2C is not set
638 476
639# 477#
@@ -641,17 +479,9 @@ CONFIG_LEGACY_PTY_COUNT=256
641# 479#
642# CONFIG_SPI is not set 480# CONFIG_SPI is not set
643# CONFIG_SPI_MASTER is not set 481# CONFIG_SPI_MASTER is not set
644
645#
646# Dallas's 1-wire bus
647#
648# CONFIG_W1 is not set 482# CONFIG_W1 is not set
649 483# CONFIG_POWER_SUPPLY is not set
650#
651# Hardware Monitoring support
652#
653# CONFIG_HWMON is not set 484# CONFIG_HWMON is not set
654# CONFIG_HWMON_VID is not set
655 485
656# 486#
657# Multifunction device drivers 487# Multifunction device drivers
@@ -662,75 +492,31 @@ CONFIG_LEGACY_PTY_COUNT=256
662# Multimedia devices 492# Multimedia devices
663# 493#
664# CONFIG_VIDEO_DEV is not set 494# CONFIG_VIDEO_DEV is not set
495# CONFIG_DVB_CORE is not set
496# CONFIG_DAB is not set
665 497
666# 498#
667# Digital Video Broadcasting Devices 499# Graphics support
668# 500#
669# CONFIG_DVB is not set 501# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
670 502
671# 503#
672# Graphics support 504# Display device support
673# 505#
674# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 506# CONFIG_DISPLAY_SUPPORT is not set
507# CONFIG_VGASTATE is not set
508# CONFIG_VIDEO_OUTPUT_CONTROL is not set
675# CONFIG_FB is not set 509# CONFIG_FB is not set
676 510
677# 511#
678# Sound 512# Sound
679# 513#
680# CONFIG_SOUND is not set 514# CONFIG_SOUND is not set
681 515# CONFIG_HID_SUPPORT is not set
682# 516# CONFIG_USB_SUPPORT is not set
683# HID Devices
684#
685# CONFIG_HID is not set
686
687#
688# USB support
689#
690CONFIG_USB_ARCH_HAS_HCD=y
691CONFIG_USB_ARCH_HAS_OHCI=y
692CONFIG_USB_ARCH_HAS_EHCI=y
693# CONFIG_USB is not set
694
695#
696# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
697#
698
699#
700# USB Gadget Support
701#
702# CONFIG_USB_GADGET is not set
703
704#
705# MMC/SD Card support
706#
707# CONFIG_MMC is not set 517# CONFIG_MMC is not set
708
709#
710# LED devices
711#
712# CONFIG_NEW_LEDS is not set 518# CONFIG_NEW_LEDS is not set
713
714#
715# LED drivers
716#
717
718#
719# LED Triggers
720#
721
722#
723# InfiniBand support
724#
725# CONFIG_INFINIBAND is not set 519# CONFIG_INFINIBAND is not set
726
727#
728# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
729#
730
731#
732# Real Time Clock
733#
734CONFIG_RTC_LIB=y 520CONFIG_RTC_LIB=y
735CONFIG_RTC_CLASS=y 521CONFIG_RTC_CLASS=y
736CONFIG_RTC_HCTOSYS=y 522CONFIG_RTC_HCTOSYS=y
@@ -744,17 +530,28 @@ CONFIG_RTC_INTF_SYSFS=y
744CONFIG_RTC_INTF_PROC=y 530CONFIG_RTC_INTF_PROC=y
745CONFIG_RTC_INTF_DEV=y 531CONFIG_RTC_INTF_DEV=y
746# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 532# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
533# CONFIG_RTC_DRV_TEST is not set
534
535#
536# SPI RTC drivers
537#
747 538
748# 539#
749# RTC drivers 540# Platform RTC drivers
750# 541#
542# CONFIG_RTC_DRV_CMOS is not set
751# CONFIG_RTC_DRV_DS1553 is not set 543# CONFIG_RTC_DRV_DS1553 is not set
544# CONFIG_RTC_DRV_STK17TA8 is not set
752CONFIG_RTC_DRV_DS1742=y 545CONFIG_RTC_DRV_DS1742=y
753# CONFIG_RTC_DRV_M48T86 is not set 546# CONFIG_RTC_DRV_M48T86 is not set
754# CONFIG_RTC_DRV_TEST is not set 547# CONFIG_RTC_DRV_M48T59 is not set
755# CONFIG_RTC_DRV_V3020 is not set 548# CONFIG_RTC_DRV_V3020 is not set
756 549
757# 550#
551# on-CPU RTC drivers
552#
553
554#
758# DMA Engine support 555# DMA Engine support
759# 556#
760# CONFIG_DMA_ENGINE is not set 557# CONFIG_DMA_ENGINE is not set
@@ -768,24 +565,19 @@ CONFIG_RTC_DRV_DS1742=y
768# 565#
769 566
770# 567#
771# Auxiliary Display support 568# Userspace I/O
772#
773
774#
775# Virtualization
776# 569#
570# CONFIG_UIO is not set
777 571
778# 572#
779# File systems 573# File systems
780# 574#
781# CONFIG_EXT2_FS is not set 575# CONFIG_EXT2_FS is not set
782# CONFIG_EXT3_FS is not set 576# CONFIG_EXT3_FS is not set
783# CONFIG_EXT4DEV_FS is not set
784# CONFIG_REISERFS_FS is not set 577# CONFIG_REISERFS_FS is not set
785# CONFIG_JFS_FS is not set 578# CONFIG_JFS_FS is not set
786# CONFIG_FS_POSIX_ACL is not set 579# CONFIG_FS_POSIX_ACL is not set
787# CONFIG_XFS_FS is not set 580# CONFIG_XFS_FS is not set
788# CONFIG_GFS2_FS is not set
789# CONFIG_OCFS2_FS is not set 581# CONFIG_OCFS2_FS is not set
790# CONFIG_MINIX_FS is not set 582# CONFIG_MINIX_FS is not set
791# CONFIG_ROMFS_FS is not set 583# CONFIG_ROMFS_FS is not set
@@ -820,18 +612,11 @@ CONFIG_SYSFS=y
820# CONFIG_TMPFS is not set 612# CONFIG_TMPFS is not set
821# CONFIG_HUGETLB_PAGE is not set 613# CONFIG_HUGETLB_PAGE is not set
822CONFIG_RAMFS=y 614CONFIG_RAMFS=y
823# CONFIG_CONFIGFS_FS is not set
824 615
825# 616#
826# Miscellaneous filesystems 617# Miscellaneous filesystems
827# 618#
828# CONFIG_ADFS_FS is not set
829# CONFIG_AFFS_FS is not set
830# CONFIG_HFS_FS is not set
831# CONFIG_HFSPLUS_FS is not set 619# CONFIG_HFSPLUS_FS is not set
832# CONFIG_BEFS_FS is not set
833# CONFIG_BFS_FS is not set
834# CONFIG_EFS_FS is not set
835# CONFIG_CRAMFS is not set 620# CONFIG_CRAMFS is not set
836# CONFIG_VXFS_FS is not set 621# CONFIG_VXFS_FS is not set
837# CONFIG_HPFS_FS is not set 622# CONFIG_HPFS_FS is not set
@@ -844,21 +629,16 @@ CONFIG_RAMFS=y
844# 629#
845CONFIG_NFS_FS=y 630CONFIG_NFS_FS=y
846# CONFIG_NFS_V3 is not set 631# CONFIG_NFS_V3 is not set
847# CONFIG_NFS_V4 is not set
848# CONFIG_NFS_DIRECTIO is not set 632# CONFIG_NFS_DIRECTIO is not set
849# CONFIG_NFSD is not set 633# CONFIG_NFSD is not set
850CONFIG_ROOT_NFS=y 634CONFIG_ROOT_NFS=y
851CONFIG_LOCKD=y 635CONFIG_LOCKD=y
852CONFIG_NFS_COMMON=y 636CONFIG_NFS_COMMON=y
853CONFIG_SUNRPC=y 637CONFIG_SUNRPC=y
854# CONFIG_RPCSEC_GSS_KRB5 is not set
855# CONFIG_RPCSEC_GSS_SPKM3 is not set
856# CONFIG_SMB_FS is not set 638# CONFIG_SMB_FS is not set
857# CONFIG_CIFS is not set 639# CONFIG_CIFS is not set
858# CONFIG_NCP_FS is not set 640# CONFIG_NCP_FS is not set
859# CONFIG_CODA_FS is not set 641# CONFIG_CODA_FS is not set
860# CONFIG_AFS_FS is not set
861# CONFIG_9P_FS is not set
862 642
863# 643#
864# Partition Types 644# Partition Types
@@ -872,16 +652,6 @@ CONFIG_MSDOS_PARTITION=y
872# CONFIG_NLS is not set 652# CONFIG_NLS is not set
873 653
874# 654#
875# Distributed Lock Manager
876#
877# CONFIG_DLM is not set
878
879#
880# Profiling support
881#
882# CONFIG_PROFILING is not set
883
884#
885# Kernel hacking 655# Kernel hacking
886# 656#
887CONFIG_TRACE_IRQFLAGS_SUPPORT=y 657CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -892,7 +662,6 @@ CONFIG_ENABLE_MUST_CHECK=y
892# CONFIG_DEBUG_FS is not set 662# CONFIG_DEBUG_FS is not set
893# CONFIG_HEADERS_CHECK is not set 663# CONFIG_HEADERS_CHECK is not set
894# CONFIG_DEBUG_KERNEL is not set 664# CONFIG_DEBUG_KERNEL is not set
895CONFIG_LOG_BUF_SHIFT=14
896CONFIG_CROSSCOMPILE=y 665CONFIG_CROSSCOMPILE=y
897CONFIG_CMDLINE="" 666CONFIG_CMDLINE=""
898 667
@@ -901,10 +670,6 @@ CONFIG_CMDLINE=""
901# 670#
902# CONFIG_KEYS is not set 671# CONFIG_KEYS is not set
903# CONFIG_SECURITY is not set 672# CONFIG_SECURITY is not set
904
905#
906# Cryptographic options
907#
908# CONFIG_CRYPTO is not set 673# CONFIG_CRYPTO is not set
909 674
910# 675#
@@ -913,8 +678,11 @@ CONFIG_CMDLINE=""
913CONFIG_BITREVERSE=y 678CONFIG_BITREVERSE=y
914# CONFIG_CRC_CCITT is not set 679# CONFIG_CRC_CCITT is not set
915# CONFIG_CRC16 is not set 680# CONFIG_CRC16 is not set
681# CONFIG_CRC_ITU_T is not set
916CONFIG_CRC32=y 682CONFIG_CRC32=y
683# CONFIG_CRC7 is not set
917# CONFIG_LIBCRC32C is not set 684# CONFIG_LIBCRC32C is not set
918CONFIG_PLIST=y 685CONFIG_PLIST=y
919CONFIG_HAS_IOMEM=y 686CONFIG_HAS_IOMEM=y
920CONFIG_HAS_IOPORT=y 687CONFIG_HAS_IOPORT=y
688CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index fbfa5685887c..fbd2d802fdfd 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.20 3# Linux kernel version: 2.6.23-rc2
4# Sun Feb 18 21:27:55 2007 4# Tue Aug 7 12:59:29 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -9,52 +9,40 @@ CONFIG_MIPS=y
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11CONFIG_ZONE_DMA=y
12# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MACH_ALCHEMY is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 13# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 14# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 15# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 16# CONFIG_MACH_JAZZ is not set
17# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 18# CONFIG_MIPS_ATLAS is not set
30CONFIG_MIPS_MALTA=y 19CONFIG_MIPS_MALTA=y
31# CONFIG_MIPS_SEAD is not set 20# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 21# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 22# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 23# CONFIG_MACH_VR41XX is not set
36# CONFIG_PNX8550_JBS is not set 24# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 25# CONFIG_PNX8550_STB810 is not set
38# CONFIG_MACH_VR41XX is not set 26# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 27# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 28# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 29# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 30# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 31# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 32# CONFIG_SIBYTE_CRHINE is not set
33# CONFIG_SIBYTE_CARMEL is not set
34# CONFIG_SIBYTE_CRHONE is not set
35# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 36# CONFIG_SIBYTE_SWARM is not set
37# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 38# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 39# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 40# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 41# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 42# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 43# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 44# CONFIG_TOSHIBA_RBTX4938 is not set
45# CONFIG_WR_PPMC is not set
58CONFIG_RWSEM_GENERIC_SPINLOCK=y 46CONFIG_RWSEM_GENERIC_SPINLOCK=y
59# CONFIG_ARCH_HAS_ILOG2_U32 is not set 47# CONFIG_ARCH_HAS_ILOG2_U32 is not set
60# CONFIG_ARCH_HAS_ILOG2_U64 is not set 48# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -67,25 +55,28 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
67CONFIG_ARCH_MAY_HAVE_PC_FDC=y 55CONFIG_ARCH_MAY_HAVE_PC_FDC=y
68CONFIG_DMA_NONCOHERENT=y 56CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 57CONFIG_DMA_NEED_PCI_MAP_STATE=y
58CONFIG_EARLY_PRINTK=y
59CONFIG_SYS_HAS_EARLY_PRINTK=y
70CONFIG_GENERIC_ISA_DMA=y 60CONFIG_GENERIC_ISA_DMA=y
71CONFIG_I8259=y 61CONFIG_I8259=y
72CONFIG_MIPS_BONITO64=y 62CONFIG_MIPS_BONITO64=y
73CONFIG_MIPS_MSC=y 63CONFIG_MIPS_MSC=y
64# CONFIG_NO_IOPORT is not set
74# CONFIG_CPU_BIG_ENDIAN is not set 65# CONFIG_CPU_BIG_ENDIAN is not set
75CONFIG_CPU_LITTLE_ENDIAN=y 66CONFIG_CPU_LITTLE_ENDIAN=y
76CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 67CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
77CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 68CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
78CONFIG_IRQ_CPU=y 69CONFIG_IRQ_CPU=y
79CONFIG_MIPS_BOARDS_GEN=y 70CONFIG_MIPS_BOARDS_GEN=y
80CONFIG_MIPS_GT64120=y 71CONFIG_PCI_GT64XXX_PCI0=y
81CONFIG_SWAP_IO_SPACE=y 72CONFIG_SWAP_IO_SPACE=y
82CONFIG_BOOT_ELF32=y 73CONFIG_BOOT_ELF32=y
83CONFIG_MIPS_L1_CACHE_SHIFT=5 74CONFIG_MIPS_L1_CACHE_SHIFT=5
84CONFIG_HAVE_STD_PC_SERIAL_PORT=y
85 75
86# 76#
87# CPU selection 77# CPU selection
88# 78#
79# CONFIG_CPU_LOONGSON2 is not set
89# CONFIG_CPU_MIPS32_R1 is not set 80# CONFIG_CPU_MIPS32_R1 is not set
90CONFIG_CPU_MIPS32_R2=y 81CONFIG_CPU_MIPS32_R2=y
91# CONFIG_CPU_MIPS64_R1 is not set 82# CONFIG_CPU_MIPS64_R1 is not set
@@ -131,14 +122,14 @@ CONFIG_CPU_HAS_PREFETCH=y
131# CONFIG_MIPS_MT_DISABLED is not set 122# CONFIG_MIPS_MT_DISABLED is not set
132CONFIG_MIPS_MT_SMP=y 123CONFIG_MIPS_MT_SMP=y
133# CONFIG_MIPS_MT_SMTC is not set 124# CONFIG_MIPS_MT_SMTC is not set
134# CONFIG_MIPS_VPE_LOADER is not set
135CONFIG_MIPS_MT=y 125CONFIG_MIPS_MT=y
136CONFIG_SYS_SUPPORTS_MULTITHREADING=y 126CONFIG_SYS_SUPPORTS_MULTITHREADING=y
137CONFIG_MIPS_MT_FPAFF=y 127CONFIG_MIPS_MT_FPAFF=y
138# CONFIG_64BIT_PHYS_ADDR is not set 128# CONFIG_MIPS_VPE_LOADER is not set
139CONFIG_CPU_HAS_LLSC=y 129CONFIG_CPU_HAS_LLSC=y
140# CONFIG_CPU_HAS_SMARTMIPS is not set 130# CONFIG_CPU_HAS_SMARTMIPS is not set
141CONFIG_CPU_MIPSR2_IRQ_VI=y 131CONFIG_CPU_MIPSR2_IRQ_VI=y
132CONFIG_CPU_MIPSR2_IRQ_EI=y
142CONFIG_CPU_MIPSR2_SRS=y 133CONFIG_CPU_MIPSR2_SRS=y
143CONFIG_CPU_HAS_SYNC=y 134CONFIG_CPU_HAS_SYNC=y
144CONFIG_GENERIC_HARDIRQS=y 135CONFIG_GENERIC_HARDIRQS=y
@@ -157,8 +148,11 @@ CONFIG_FLAT_NODE_MEM_MAP=y
157CONFIG_SPLIT_PTLOCK_CPUS=4 148CONFIG_SPLIT_PTLOCK_CPUS=4
158# CONFIG_RESOURCES_64BIT is not set 149# CONFIG_RESOURCES_64BIT is not set
159CONFIG_ZONE_DMA_FLAG=1 150CONFIG_ZONE_DMA_FLAG=1
151CONFIG_BOUNCE=y
152CONFIG_VIRT_TO_BUS=y
160CONFIG_SMP=y 153CONFIG_SMP=y
161CONFIG_SYS_SUPPORTS_SMP=y 154CONFIG_SYS_SUPPORTS_SMP=y
155CONFIG_NR_CPUS_DEFAULT_2=y
162CONFIG_NR_CPUS=2 156CONFIG_NR_CPUS=2
163# CONFIG_HZ_48 is not set 157# CONFIG_HZ_48 is not set
164CONFIG_HZ_100=y 158CONFIG_HZ_100=y
@@ -174,35 +168,33 @@ CONFIG_PREEMPT_NONE=y
174# CONFIG_PREEMPT is not set 168# CONFIG_PREEMPT is not set
175CONFIG_PREEMPT_BKL=y 169CONFIG_PREEMPT_BKL=y
176# CONFIG_KEXEC is not set 170# CONFIG_KEXEC is not set
171CONFIG_SECCOMP=y
177CONFIG_LOCKDEP_SUPPORT=y 172CONFIG_LOCKDEP_SUPPORT=y
178CONFIG_STACKTRACE_SUPPORT=y 173CONFIG_STACKTRACE_SUPPORT=y
179CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 174CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
180 175
181# 176#
182# Code maturity level options 177# General setup
183# 178#
184CONFIG_EXPERIMENTAL=y 179CONFIG_EXPERIMENTAL=y
185CONFIG_LOCK_KERNEL=y 180CONFIG_LOCK_KERNEL=y
186CONFIG_INIT_ENV_ARG_LIMIT=32 181CONFIG_INIT_ENV_ARG_LIMIT=32
187
188#
189# General setup
190#
191CONFIG_LOCALVERSION="" 182CONFIG_LOCALVERSION=""
192CONFIG_LOCALVERSION_AUTO=y 183CONFIG_LOCALVERSION_AUTO=y
193CONFIG_SWAP=y 184CONFIG_SWAP=y
194CONFIG_SYSVIPC=y 185CONFIG_SYSVIPC=y
195# CONFIG_IPC_NS is not set
196CONFIG_SYSVIPC_SYSCTL=y 186CONFIG_SYSVIPC_SYSCTL=y
197# CONFIG_POSIX_MQUEUE is not set 187# CONFIG_POSIX_MQUEUE is not set
198# CONFIG_BSD_PROCESS_ACCT is not set 188# CONFIG_BSD_PROCESS_ACCT is not set
199# CONFIG_TASKSTATS is not set 189# CONFIG_TASKSTATS is not set
200# CONFIG_UTS_NS is not set 190# CONFIG_USER_NS is not set
201# CONFIG_AUDIT is not set 191# CONFIG_AUDIT is not set
202# CONFIG_IKCONFIG is not set 192# CONFIG_IKCONFIG is not set
193CONFIG_LOG_BUF_SHIFT=15
203# CONFIG_CPUSETS is not set 194# CONFIG_CPUSETS is not set
204CONFIG_SYSFS_DEPRECATED=y 195CONFIG_SYSFS_DEPRECATED=y
205CONFIG_RELAY=y 196CONFIG_RELAY=y
197# CONFIG_BLK_DEV_INITRD is not set
206# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 198# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
207CONFIG_SYSCTL=y 199CONFIG_SYSCTL=y
208CONFIG_EMBEDDED=y 200CONFIG_EMBEDDED=y
@@ -215,18 +207,19 @@ CONFIG_BUG=y
215CONFIG_ELF_CORE=y 207CONFIG_ELF_CORE=y
216CONFIG_BASE_FULL=y 208CONFIG_BASE_FULL=y
217CONFIG_FUTEX=y 209CONFIG_FUTEX=y
210CONFIG_ANON_INODES=y
218CONFIG_EPOLL=y 211CONFIG_EPOLL=y
212CONFIG_SIGNALFD=y
213CONFIG_TIMERFD=y
214CONFIG_EVENTFD=y
219CONFIG_SHMEM=y 215CONFIG_SHMEM=y
220CONFIG_SLAB=y
221CONFIG_VM_EVENT_COUNTERS=y 216CONFIG_VM_EVENT_COUNTERS=y
217CONFIG_SLAB=y
218# CONFIG_SLUB is not set
219# CONFIG_SLOB is not set
222CONFIG_RT_MUTEXES=y 220CONFIG_RT_MUTEXES=y
223# CONFIG_TINY_SHMEM is not set 221# CONFIG_TINY_SHMEM is not set
224CONFIG_BASE_SMALL=0 222CONFIG_BASE_SMALL=0
225# CONFIG_SLOB is not set
226
227#
228# Loadable module support
229#
230CONFIG_MODULES=y 223CONFIG_MODULES=y
231CONFIG_MODULE_UNLOAD=y 224CONFIG_MODULE_UNLOAD=y
232# CONFIG_MODULE_FORCE_UNLOAD is not set 225# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -234,14 +227,11 @@ CONFIG_MODVERSIONS=y
234CONFIG_MODULE_SRCVERSION_ALL=y 227CONFIG_MODULE_SRCVERSION_ALL=y
235CONFIG_KMOD=y 228CONFIG_KMOD=y
236CONFIG_STOP_MACHINE=y 229CONFIG_STOP_MACHINE=y
237
238#
239# Block layer
240#
241CONFIG_BLOCK=y 230CONFIG_BLOCK=y
242# CONFIG_LBD is not set 231# CONFIG_LBD is not set
243# CONFIG_BLK_DEV_IO_TRACE is not set 232# CONFIG_BLK_DEV_IO_TRACE is not set
244# CONFIG_LSF is not set 233# CONFIG_LSF is not set
234# CONFIG_BLK_DEV_BSG is not set
245 235
246# 236#
247# IO Schedulers 237# IO Schedulers
@@ -261,16 +251,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
261# 251#
262CONFIG_HW_HAS_PCI=y 252CONFIG_HW_HAS_PCI=y
263CONFIG_PCI=y 253CONFIG_PCI=y
254# CONFIG_ARCH_SUPPORTS_MSI is not set
264CONFIG_MMU=y 255CONFIG_MMU=y
265 256
266# 257#
267# PCCARD (PCMCIA/CardBus) support 258# PCCARD (PCMCIA/CardBus) support
268# 259#
269# CONFIG_PCCARD is not set 260# CONFIG_PCCARD is not set
270
271#
272# PCI Hotplug Support
273#
274# CONFIG_HOTPLUG_PCI is not set 261# CONFIG_HOTPLUG_PCI is not set
275 262
276# 263#
@@ -286,7 +273,6 @@ CONFIG_TRAD_SIGNALS=y
286CONFIG_PM=y 273CONFIG_PM=y
287# CONFIG_PM_LEGACY is not set 274# CONFIG_PM_LEGACY is not set
288# CONFIG_PM_DEBUG is not set 275# CONFIG_PM_DEBUG is not set
289# CONFIG_PM_SYSFS_DEPRECATED is not set
290 276
291# 277#
292# Networking 278# Networking
@@ -296,7 +282,6 @@ CONFIG_NET=y
296# 282#
297# Networking options 283# Networking options
298# 284#
299# CONFIG_NETDEBUG is not set
300CONFIG_PACKET=y 285CONFIG_PACKET=y
301CONFIG_PACKET_MMAP=y 286CONFIG_PACKET_MMAP=y
302CONFIG_UNIX=y 287CONFIG_UNIX=y
@@ -314,7 +299,6 @@ CONFIG_ASK_IP_FIB_HASH=y
314CONFIG_IP_FIB_HASH=y 299CONFIG_IP_FIB_HASH=y
315CONFIG_IP_MULTIPLE_TABLES=y 300CONFIG_IP_MULTIPLE_TABLES=y
316CONFIG_IP_ROUTE_MULTIPATH=y 301CONFIG_IP_ROUTE_MULTIPATH=y
317# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
318CONFIG_IP_ROUTE_VERBOSE=y 302CONFIG_IP_ROUTE_VERBOSE=y
319CONFIG_IP_PNP=y 303CONFIG_IP_PNP=y
320CONFIG_IP_PNP_DHCP=y 304CONFIG_IP_PNP_DHCP=y
@@ -342,10 +326,6 @@ CONFIG_INET_TCP_DIAG=y
342CONFIG_TCP_CONG_CUBIC=y 326CONFIG_TCP_CONG_CUBIC=y
343CONFIG_DEFAULT_TCP_CONG="cubic" 327CONFIG_DEFAULT_TCP_CONG="cubic"
344CONFIG_TCP_MD5SIG=y 328CONFIG_TCP_MD5SIG=y
345
346#
347# IP: Virtual Server Configuration
348#
349CONFIG_IP_VS=m 329CONFIG_IP_VS=m
350# CONFIG_IP_VS_DEBUG is not set 330# CONFIG_IP_VS_DEBUG is not set
351CONFIG_IP_VS_TAB_BITS=12 331CONFIG_IP_VS_TAB_BITS=12
@@ -380,6 +360,7 @@ CONFIG_IPV6=m
380CONFIG_IPV6_PRIVACY=y 360CONFIG_IPV6_PRIVACY=y
381CONFIG_IPV6_ROUTER_PREF=y 361CONFIG_IPV6_ROUTER_PREF=y
382CONFIG_IPV6_ROUTE_INFO=y 362CONFIG_IPV6_ROUTE_INFO=y
363CONFIG_IPV6_OPTIMISTIC_DAD=y
383CONFIG_INET6_AH=m 364CONFIG_INET6_AH=m
384CONFIG_INET6_ESP=m 365CONFIG_INET6_ESP=m
385CONFIG_INET6_IPCOMP=m 366CONFIG_INET6_IPCOMP=m
@@ -405,8 +386,6 @@ CONFIG_NETFILTER_NETLINK=m
405CONFIG_NETFILTER_NETLINK_QUEUE=m 386CONFIG_NETFILTER_NETLINK_QUEUE=m
406CONFIG_NETFILTER_NETLINK_LOG=m 387CONFIG_NETFILTER_NETLINK_LOG=m
407CONFIG_NF_CONNTRACK_ENABLED=m 388CONFIG_NF_CONNTRACK_ENABLED=m
408CONFIG_NF_CONNTRACK_SUPPORT=y
409# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
410CONFIG_NF_CONNTRACK=m 389CONFIG_NF_CONNTRACK=m
411CONFIG_NF_CT_ACCT=y 390CONFIG_NF_CT_ACCT=y
412CONFIG_NF_CONNTRACK_MARK=y 391CONFIG_NF_CONNTRACK_MARK=y
@@ -414,6 +393,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y
414CONFIG_NF_CONNTRACK_EVENTS=y 393CONFIG_NF_CONNTRACK_EVENTS=y
415CONFIG_NF_CT_PROTO_GRE=m 394CONFIG_NF_CT_PROTO_GRE=m
416CONFIG_NF_CT_PROTO_SCTP=m 395CONFIG_NF_CT_PROTO_SCTP=m
396CONFIG_NF_CT_PROTO_UDPLITE=m
417CONFIG_NF_CONNTRACK_AMANDA=m 397CONFIG_NF_CONNTRACK_AMANDA=m
418CONFIG_NF_CONNTRACK_FTP=m 398CONFIG_NF_CONNTRACK_FTP=m
419CONFIG_NF_CONNTRACK_H323=m 399CONFIG_NF_CONNTRACK_H323=m
@@ -432,11 +412,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
432CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 412CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
433CONFIG_NETFILTER_XT_TARGET_NFLOG=m 413CONFIG_NETFILTER_XT_TARGET_NFLOG=m
434CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 414CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
415CONFIG_NETFILTER_XT_TARGET_TRACE=m
435CONFIG_NETFILTER_XT_TARGET_SECMARK=m 416CONFIG_NETFILTER_XT_TARGET_SECMARK=m
436# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set 417# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set
437CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 418CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
438CONFIG_NETFILTER_XT_MATCH_COMMENT=m 419CONFIG_NETFILTER_XT_MATCH_COMMENT=m
439CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 420CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
421CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
440CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 422CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
441CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 423CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
442CONFIG_NETFILTER_XT_MATCH_DCCP=m 424CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -458,6 +440,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
458CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 440CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
459CONFIG_NETFILTER_XT_MATCH_STRING=m 441CONFIG_NETFILTER_XT_MATCH_STRING=m
460CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 442CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
443CONFIG_NETFILTER_XT_MATCH_U32=m
461CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 444CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
462 445
463# 446#
@@ -549,25 +532,13 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
549CONFIG_BRIDGE_EBT_SNAT=m 532CONFIG_BRIDGE_EBT_SNAT=m
550CONFIG_BRIDGE_EBT_LOG=m 533CONFIG_BRIDGE_EBT_LOG=m
551CONFIG_BRIDGE_EBT_ULOG=m 534CONFIG_BRIDGE_EBT_ULOG=m
552
553#
554# DCCP Configuration (EXPERIMENTAL)
555#
556# CONFIG_IP_DCCP is not set 535# CONFIG_IP_DCCP is not set
557
558#
559# SCTP Configuration (EXPERIMENTAL)
560#
561CONFIG_IP_SCTP=m 536CONFIG_IP_SCTP=m
562# CONFIG_SCTP_DBG_MSG is not set 537# CONFIG_SCTP_DBG_MSG is not set
563# CONFIG_SCTP_DBG_OBJCNT is not set 538# CONFIG_SCTP_DBG_OBJCNT is not set
564# CONFIG_SCTP_HMAC_NONE is not set 539# CONFIG_SCTP_HMAC_NONE is not set
565# CONFIG_SCTP_HMAC_SHA1 is not set 540# CONFIG_SCTP_HMAC_SHA1 is not set
566CONFIG_SCTP_HMAC_MD5=y 541CONFIG_SCTP_HMAC_MD5=y
567
568#
569# TIPC Configuration (EXPERIMENTAL)
570#
571# CONFIG_TIPC is not set 542# CONFIG_TIPC is not set
572# CONFIG_ATM is not set 543# CONFIG_ATM is not set
573CONFIG_BRIDGE=m 544CONFIG_BRIDGE=m
@@ -591,9 +562,6 @@ CONFIG_IPDDP_DECAP=y
591# 562#
592CONFIG_NET_SCHED=y 563CONFIG_NET_SCHED=y
593CONFIG_NET_SCH_FIFO=y 564CONFIG_NET_SCH_FIFO=y
594CONFIG_NET_SCH_CLK_JIFFIES=y
595# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
596# CONFIG_NET_SCH_CLK_CPU is not set
597 565
598# 566#
599# Queueing/Scheduling 567# Queueing/Scheduling
@@ -602,6 +570,7 @@ CONFIG_NET_SCH_CBQ=m
602CONFIG_NET_SCH_HTB=m 570CONFIG_NET_SCH_HTB=m
603CONFIG_NET_SCH_HFSC=m 571CONFIG_NET_SCH_HFSC=m
604CONFIG_NET_SCH_PRIO=m 572CONFIG_NET_SCH_PRIO=m
573CONFIG_NET_SCH_RR=m
605CONFIG_NET_SCH_RED=m 574CONFIG_NET_SCH_RED=m
606CONFIG_NET_SCH_SFQ=m 575CONFIG_NET_SCH_SFQ=m
607CONFIG_NET_SCH_TEQL=m 576CONFIG_NET_SCH_TEQL=m
@@ -626,10 +595,16 @@ CONFIG_NET_CLS_U32=m
626CONFIG_NET_CLS_RSVP=m 595CONFIG_NET_CLS_RSVP=m
627CONFIG_NET_CLS_RSVP6=m 596CONFIG_NET_CLS_RSVP6=m
628# CONFIG_NET_EMATCH is not set 597# CONFIG_NET_EMATCH is not set
629# CONFIG_NET_CLS_ACT is not set 598CONFIG_NET_CLS_ACT=y
599CONFIG_NET_ACT_POLICE=y
600CONFIG_NET_ACT_GACT=m
601CONFIG_GACT_PROB=y
602CONFIG_NET_ACT_MIRRED=m
603CONFIG_NET_ACT_IPT=m
604CONFIG_NET_ACT_PEDIT=m
605CONFIG_NET_ACT_SIMP=m
630CONFIG_NET_CLS_POLICE=y 606CONFIG_NET_CLS_POLICE=y
631CONFIG_NET_CLS_IND=y 607CONFIG_NET_CLS_IND=y
632CONFIG_NET_ESTIMATOR=y
633 608
634# 609#
635# Network testing 610# Network testing
@@ -638,14 +613,26 @@ CONFIG_NET_ESTIMATOR=y
638# CONFIG_HAMRADIO is not set 613# CONFIG_HAMRADIO is not set
639# CONFIG_IRDA is not set 614# CONFIG_IRDA is not set
640# CONFIG_BT is not set 615# CONFIG_BT is not set
616# CONFIG_AF_RXRPC is not set
617CONFIG_FIB_RULES=y
618
619#
620# Wireless
621#
622CONFIG_CFG80211=m
623CONFIG_WIRELESS_EXT=y
624CONFIG_MAC80211=m
625# CONFIG_MAC80211_DEBUG is not set
641CONFIG_IEEE80211=m 626CONFIG_IEEE80211=m
642# CONFIG_IEEE80211_DEBUG is not set 627# CONFIG_IEEE80211_DEBUG is not set
643CONFIG_IEEE80211_CRYPT_WEP=m 628CONFIG_IEEE80211_CRYPT_WEP=m
644CONFIG_IEEE80211_CRYPT_CCMP=m 629CONFIG_IEEE80211_CRYPT_CCMP=m
630CONFIG_IEEE80211_CRYPT_TKIP=m
645CONFIG_IEEE80211_SOFTMAC=m 631CONFIG_IEEE80211_SOFTMAC=m
646# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 632# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
647CONFIG_WIRELESS_EXT=y 633CONFIG_RFKILL=m
648CONFIG_FIB_RULES=y 634CONFIG_RFKILL_INPUT=m
635# CONFIG_NET_9P is not set
649 636
650# 637#
651# Device Drivers 638# Device Drivers
@@ -658,15 +645,7 @@ CONFIG_STANDALONE=y
658CONFIG_PREVENT_FIRMWARE_BUILD=y 645CONFIG_PREVENT_FIRMWARE_BUILD=y
659CONFIG_FW_LOADER=y 646CONFIG_FW_LOADER=y
660# CONFIG_SYS_HYPERVISOR is not set 647# CONFIG_SYS_HYPERVISOR is not set
661
662#
663# Connector - unified userspace <-> kernelspace linker
664#
665CONFIG_CONNECTOR=m 648CONFIG_CONNECTOR=m
666
667#
668# Memory Technology Devices (MTD)
669#
670CONFIG_MTD=y 649CONFIG_MTD=y
671# CONFIG_MTD_DEBUG is not set 650# CONFIG_MTD_DEBUG is not set
672# CONFIG_MTD_CONCAT is not set 651# CONFIG_MTD_CONCAT is not set
@@ -710,7 +689,6 @@ CONFIG_MTD_CFI_UTIL=y
710# CONFIG_MTD_RAM is not set 689# CONFIG_MTD_RAM is not set
711# CONFIG_MTD_ROM is not set 690# CONFIG_MTD_ROM is not set
712# CONFIG_MTD_ABSENT is not set 691# CONFIG_MTD_ABSENT is not set
713# CONFIG_MTD_OBSOLETE_CHIPS is not set
714 692
715# 693#
716# Mapping drivers for chip access 694# Mapping drivers for chip access
@@ -737,30 +715,23 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=0
737# CONFIG_MTD_DOC2000 is not set 715# CONFIG_MTD_DOC2000 is not set
738# CONFIG_MTD_DOC2001 is not set 716# CONFIG_MTD_DOC2001 is not set
739# CONFIG_MTD_DOC2001PLUS is not set 717# CONFIG_MTD_DOC2001PLUS is not set
740
741#
742# NAND Flash Device Drivers
743#
744# CONFIG_MTD_NAND is not set 718# CONFIG_MTD_NAND is not set
745# CONFIG_MTD_NAND_CAFE is not set
746
747#
748# OneNAND Flash Device Drivers
749#
750# CONFIG_MTD_ONENAND is not set 719# CONFIG_MTD_ONENAND is not set
751 720
752# 721#
753# Parallel port support 722# UBI - Unsorted block images
754#
755# CONFIG_PARPORT is not set
756
757#
758# Plug and Play support
759# 723#
724CONFIG_MTD_UBI=m
725CONFIG_MTD_UBI_WL_THRESHOLD=4096
726CONFIG_MTD_UBI_BEB_RESERVE=1
727CONFIG_MTD_UBI_GLUEBI=y
760 728
761# 729#
762# Block devices 730# UBI debugging options
763# 731#
732# CONFIG_MTD_UBI_DEBUG is not set
733# CONFIG_PARPORT is not set
734CONFIG_BLK_DEV=y
764CONFIG_BLK_DEV_FD=m 735CONFIG_BLK_DEV_FD=m
765# CONFIG_BLK_CPQ_DA is not set 736# CONFIG_BLK_CPQ_DA is not set
766# CONFIG_BLK_CPQ_CISS_DA is not set 737# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -775,21 +746,11 @@ CONFIG_BLK_DEV_RAM=y
775CONFIG_BLK_DEV_RAM_COUNT=16 746CONFIG_BLK_DEV_RAM_COUNT=16
776CONFIG_BLK_DEV_RAM_SIZE=4096 747CONFIG_BLK_DEV_RAM_SIZE=4096
777CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 748CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
778# CONFIG_BLK_DEV_INITRD is not set
779CONFIG_CDROM_PKTCDVD=m 749CONFIG_CDROM_PKTCDVD=m
780CONFIG_CDROM_PKTCDVD_BUFFERS=8 750CONFIG_CDROM_PKTCDVD_BUFFERS=8
781# CONFIG_CDROM_PKTCDVD_WCACHE is not set 751# CONFIG_CDROM_PKTCDVD_WCACHE is not set
782CONFIG_ATA_OVER_ETH=m 752CONFIG_ATA_OVER_ETH=m
783 753# CONFIG_MISC_DEVICES is not set
784#
785# Misc devices
786#
787CONFIG_SGI_IOC4=m
788# CONFIG_TIFM_CORE is not set
789
790#
791# ATA/ATAPI/MFM/RLL support
792#
793CONFIG_IDE=y 754CONFIG_IDE=y
794CONFIG_IDE_MAX_HWIFS=4 755CONFIG_IDE_MAX_HWIFS=4
795CONFIG_BLK_DEV_IDE=y 756CONFIG_BLK_DEV_IDE=y
@@ -805,6 +766,7 @@ CONFIG_BLK_DEV_IDECD=y
805# CONFIG_BLK_DEV_IDEFLOPPY is not set 766# CONFIG_BLK_DEV_IDEFLOPPY is not set
806# CONFIG_BLK_DEV_IDESCSI is not set 767# CONFIG_BLK_DEV_IDESCSI is not set
807# CONFIG_IDE_TASK_IOCTL is not set 768# CONFIG_IDE_TASK_IOCTL is not set
769CONFIG_IDE_PROC_FS=y
808 770
809# 771#
810# IDE chipset support/bugfixes 772# IDE chipset support/bugfixes
@@ -812,12 +774,12 @@ CONFIG_BLK_DEV_IDECD=y
812CONFIG_IDE_GENERIC=y 774CONFIG_IDE_GENERIC=y
813CONFIG_BLK_DEV_IDEPCI=y 775CONFIG_BLK_DEV_IDEPCI=y
814# CONFIG_IDEPCI_SHARE_IRQ is not set 776# CONFIG_IDEPCI_SHARE_IRQ is not set
777CONFIG_IDEPCI_PCIBUS_ORDER=y
815# CONFIG_BLK_DEV_OFFBOARD is not set 778# CONFIG_BLK_DEV_OFFBOARD is not set
816CONFIG_BLK_DEV_GENERIC=y 779CONFIG_BLK_DEV_GENERIC=y
817# CONFIG_BLK_DEV_OPTI621 is not set 780# CONFIG_BLK_DEV_OPTI621 is not set
818CONFIG_BLK_DEV_IDEDMA_PCI=y 781CONFIG_BLK_DEV_IDEDMA_PCI=y
819# CONFIG_BLK_DEV_IDEDMA_FORCED is not set 782# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
820CONFIG_IDEDMA_PCI_AUTO=y
821# CONFIG_IDEDMA_ONLYDISK is not set 783# CONFIG_IDEDMA_ONLYDISK is not set
822# CONFIG_BLK_DEV_AEC62XX is not set 784# CONFIG_BLK_DEV_AEC62XX is not set
823# CONFIG_BLK_DEV_ALI15X3 is not set 785# CONFIG_BLK_DEV_ALI15X3 is not set
@@ -846,7 +808,6 @@ CONFIG_BLK_DEV_TC86C001=m
846# CONFIG_IDE_ARM is not set 808# CONFIG_IDE_ARM is not set
847CONFIG_BLK_DEV_IDEDMA=y 809CONFIG_BLK_DEV_IDEDMA=y
848# CONFIG_IDEDMA_IVB is not set 810# CONFIG_IDEDMA_IVB is not set
849CONFIG_IDEDMA_AUTO=y
850# CONFIG_BLK_DEV_HD is not set 811# CONFIG_BLK_DEV_HD is not set
851 812
852# 813#
@@ -854,6 +815,7 @@ CONFIG_IDEDMA_AUTO=y
854# 815#
855CONFIG_RAID_ATTRS=m 816CONFIG_RAID_ATTRS=m
856CONFIG_SCSI=m 817CONFIG_SCSI=m
818CONFIG_SCSI_DMA=y
857CONFIG_SCSI_TGT=m 819CONFIG_SCSI_TGT=m
858CONFIG_SCSI_NETLINK=y 820CONFIG_SCSI_NETLINK=y
859CONFIG_SCSI_PROC_FS=y 821CONFIG_SCSI_PROC_FS=y
@@ -876,6 +838,7 @@ CONFIG_SCSI_MULTI_LUN=y
876CONFIG_SCSI_CONSTANTS=y 838CONFIG_SCSI_CONSTANTS=y
877CONFIG_SCSI_LOGGING=y 839CONFIG_SCSI_LOGGING=y
878CONFIG_SCSI_SCAN_ASYNC=y 840CONFIG_SCSI_SCAN_ASYNC=y
841CONFIG_SCSI_WAIT_SCAN=m
879 842
880# 843#
881# SCSI Transports 844# SCSI Transports
@@ -883,12 +846,8 @@ CONFIG_SCSI_SCAN_ASYNC=y
883CONFIG_SCSI_SPI_ATTRS=m 846CONFIG_SCSI_SPI_ATTRS=m
884CONFIG_SCSI_FC_ATTRS=m 847CONFIG_SCSI_FC_ATTRS=m
885CONFIG_SCSI_ISCSI_ATTRS=m 848CONFIG_SCSI_ISCSI_ATTRS=m
886CONFIG_SCSI_SAS_ATTRS=m
887# CONFIG_SCSI_SAS_LIBSAS is not set 849# CONFIG_SCSI_SAS_LIBSAS is not set
888 850CONFIG_SCSI_LOWLEVEL=y
889#
890# SCSI low-level drivers
891#
892CONFIG_ISCSI_TCP=m 851CONFIG_ISCSI_TCP=m
893CONFIG_BLK_DEV_3W_XXXX_RAID=m 852CONFIG_BLK_DEV_3W_XXXX_RAID=m
894CONFIG_SCSI_3W_9XXX=m 853CONFIG_SCSI_3W_9XXX=m
@@ -925,15 +884,7 @@ CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
925# CONFIG_SCSI_NSP32 is not set 884# CONFIG_SCSI_NSP32 is not set
926# CONFIG_SCSI_DEBUG is not set 885# CONFIG_SCSI_DEBUG is not set
927# CONFIG_SCSI_SRP is not set 886# CONFIG_SCSI_SRP is not set
928
929#
930# Serial ATA (prod) and Parallel ATA (experimental) drivers
931#
932# CONFIG_ATA is not set 887# CONFIG_ATA is not set
933
934#
935# Multi-device support (RAID and LVM)
936#
937CONFIG_MD=y 888CONFIG_MD=y
938CONFIG_BLK_DEV_MD=m 889CONFIG_BLK_DEV_MD=m
939CONFIG_MD_LINEAR=m 890CONFIG_MD_LINEAR=m
@@ -952,6 +903,8 @@ CONFIG_DM_MIRROR=m
952CONFIG_DM_ZERO=m 903CONFIG_DM_ZERO=m
953CONFIG_DM_MULTIPATH=m 904CONFIG_DM_MULTIPATH=m
954CONFIG_DM_MULTIPATH_EMC=m 905CONFIG_DM_MULTIPATH_EMC=m
906CONFIG_DM_MULTIPATH_RDAC=m
907# CONFIG_DM_DELAY is not set
955 908
956# 909#
957# Fusion MPT device support 910# Fusion MPT device support
@@ -964,30 +917,18 @@ CONFIG_DM_MULTIPATH_EMC=m
964# 917#
965# IEEE 1394 (FireWire) support 918# IEEE 1394 (FireWire) support
966# 919#
920# CONFIG_FIREWIRE is not set
967# CONFIG_IEEE1394 is not set 921# CONFIG_IEEE1394 is not set
968
969#
970# I2O device support
971#
972# CONFIG_I2O is not set 922# CONFIG_I2O is not set
973
974#
975# Network device support
976#
977CONFIG_NETDEVICES=y 923CONFIG_NETDEVICES=y
924CONFIG_NETDEVICES_MULTIQUEUE=y
925CONFIG_IFB=m
978CONFIG_DUMMY=m 926CONFIG_DUMMY=m
979CONFIG_BONDING=m 927CONFIG_BONDING=m
928CONFIG_MACVLAN=m
980CONFIG_EQUALIZER=m 929CONFIG_EQUALIZER=m
981CONFIG_TUN=m 930CONFIG_TUN=m
982
983#
984# ARCnet devices
985#
986# CONFIG_ARCNET is not set 931# CONFIG_ARCNET is not set
987
988#
989# PHY device support
990#
991CONFIG_PHYLIB=m 932CONFIG_PHYLIB=m
992 933
993# 934#
@@ -1000,23 +941,17 @@ CONFIG_LXT_PHY=m
1000CONFIG_CICADA_PHY=m 941CONFIG_CICADA_PHY=m
1001CONFIG_VITESSE_PHY=m 942CONFIG_VITESSE_PHY=m
1002CONFIG_SMSC_PHY=m 943CONFIG_SMSC_PHY=m
1003# CONFIG_BROADCOM_PHY is not set 944CONFIG_BROADCOM_PHY=m
945CONFIG_ICPLUS_PHY=m
1004# CONFIG_FIXED_PHY is not set 946# CONFIG_FIXED_PHY is not set
1005
1006#
1007# Ethernet (10 or 100Mbit)
1008#
1009CONFIG_NET_ETHERNET=y 947CONFIG_NET_ETHERNET=y
1010CONFIG_MII=y 948CONFIG_MII=y
949CONFIG_AX88796=m
1011# CONFIG_HAPPYMEAL is not set 950# CONFIG_HAPPYMEAL is not set
1012# CONFIG_SUNGEM is not set 951# CONFIG_SUNGEM is not set
1013# CONFIG_CASSINI is not set 952# CONFIG_CASSINI is not set
1014# CONFIG_NET_VENDOR_3COM is not set 953# CONFIG_NET_VENDOR_3COM is not set
1015# CONFIG_DM9000 is not set 954# CONFIG_DM9000 is not set
1016
1017#
1018# Tulip family network device support
1019#
1020# CONFIG_NET_TULIP is not set 955# CONFIG_NET_TULIP is not set
1021# CONFIG_HP100 is not set 956# CONFIG_HP100 is not set
1022CONFIG_NET_PCI=y 957CONFIG_NET_PCI=y
@@ -1026,6 +961,7 @@ CONFIG_PCNET32=y
1026# CONFIG_ADAPTEC_STARFIRE is not set 961# CONFIG_ADAPTEC_STARFIRE is not set
1027# CONFIG_B44 is not set 962# CONFIG_B44 is not set
1028# CONFIG_FORCEDETH is not set 963# CONFIG_FORCEDETH is not set
964CONFIG_TC35815=m
1029# CONFIG_DGRS is not set 965# CONFIG_DGRS is not set
1030# CONFIG_EEPRO100 is not set 966# CONFIG_EEPRO100 is not set
1031# CONFIG_E100 is not set 967# CONFIG_E100 is not set
@@ -1040,10 +976,7 @@ CONFIG_PCNET32=y
1040# CONFIG_TLAN is not set 976# CONFIG_TLAN is not set
1041# CONFIG_VIA_RHINE is not set 977# CONFIG_VIA_RHINE is not set
1042# CONFIG_SC92031 is not set 978# CONFIG_SC92031 is not set
1043 979CONFIG_NETDEV_1000=y
1044#
1045# Ethernet (1000 Mbit)
1046#
1047# CONFIG_ACENIC is not set 980# CONFIG_ACENIC is not set
1048# CONFIG_DL2K is not set 981# CONFIG_DL2K is not set
1049# CONFIG_E1000 is not set 982# CONFIG_E1000 is not set
@@ -1054,36 +987,58 @@ CONFIG_PCNET32=y
1054# CONFIG_SIS190 is not set 987# CONFIG_SIS190 is not set
1055# CONFIG_SKGE is not set 988# CONFIG_SKGE is not set
1056# CONFIG_SKY2 is not set 989# CONFIG_SKY2 is not set
1057# CONFIG_SK98LIN is not set
1058# CONFIG_VIA_VELOCITY is not set 990# CONFIG_VIA_VELOCITY is not set
1059# CONFIG_TIGON3 is not set 991# CONFIG_TIGON3 is not set
1060# CONFIG_BNX2 is not set 992# CONFIG_BNX2 is not set
1061# CONFIG_QLA3XXX is not set 993# CONFIG_QLA3XXX is not set
1062# CONFIG_ATL1 is not set 994# CONFIG_ATL1 is not set
1063 995CONFIG_NETDEV_10000=y
1064#
1065# Ethernet (10000 Mbit)
1066#
1067# CONFIG_CHELSIO_T1 is not set 996# CONFIG_CHELSIO_T1 is not set
1068CONFIG_CHELSIO_T3=m 997CONFIG_CHELSIO_T3=m
1069# CONFIG_IXGB is not set 998# CONFIG_IXGB is not set
1070# CONFIG_S2IO is not set 999# CONFIG_S2IO is not set
1071# CONFIG_MYRI10GE is not set 1000# CONFIG_MYRI10GE is not set
1072CONFIG_NETXEN_NIC=m 1001CONFIG_NETXEN_NIC=m
1073 1002# CONFIG_MLX4_CORE is not set
1074#
1075# Token Ring devices
1076#
1077# CONFIG_TR is not set 1003# CONFIG_TR is not set
1078 1004
1079# 1005#
1080# Wireless LAN (non-hamradio) 1006# Wireless LAN
1081# 1007#
1082# CONFIG_NET_RADIO is not set 1008CONFIG_WLAN_PRE80211=y
1083 1009CONFIG_STRIP=m
1084# 1010CONFIG_WLAN_80211=y
1085# Wan interfaces 1011CONFIG_IPW2100=m
1086# 1012CONFIG_IPW2100_MONITOR=y
1013# CONFIG_IPW2100_DEBUG is not set
1014CONFIG_IPW2200=m
1015CONFIG_IPW2200_MONITOR=y
1016CONFIG_IPW2200_RADIOTAP=y
1017CONFIG_IPW2200_PROMISCUOUS=y
1018CONFIG_IPW2200_QOS=y
1019# CONFIG_IPW2200_DEBUG is not set
1020CONFIG_LIBERTAS=m
1021# CONFIG_LIBERTAS_DEBUG is not set
1022CONFIG_HERMES=m
1023CONFIG_PLX_HERMES=m
1024CONFIG_TMD_HERMES=m
1025CONFIG_NORTEL_HERMES=m
1026CONFIG_PCI_HERMES=m
1027CONFIG_ATMEL=m
1028CONFIG_PCI_ATMEL=m
1029CONFIG_PRISM54=m
1030CONFIG_HOSTAP=m
1031CONFIG_HOSTAP_FIRMWARE=y
1032CONFIG_HOSTAP_FIRMWARE_NVRAM=y
1033CONFIG_HOSTAP_PLX=m
1034CONFIG_HOSTAP_PCI=m
1035CONFIG_BCM43XX=m
1036CONFIG_BCM43XX_DEBUG=y
1037CONFIG_BCM43XX_DMA=y
1038CONFIG_BCM43XX_PIO=y
1039CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
1040# CONFIG_BCM43XX_DMA_MODE is not set
1041# CONFIG_BCM43XX_PIO_MODE is not set
1087# CONFIG_WAN is not set 1042# CONFIG_WAN is not set
1088# CONFIG_FDDI is not set 1043# CONFIG_FDDI is not set
1089# CONFIG_HIPPI is not set 1044# CONFIG_HIPPI is not set
@@ -1094,15 +1049,7 @@ CONFIG_NETXEN_NIC=m
1094# CONFIG_NETCONSOLE is not set 1049# CONFIG_NETCONSOLE is not set
1095# CONFIG_NETPOLL is not set 1050# CONFIG_NETPOLL is not set
1096# CONFIG_NET_POLL_CONTROLLER is not set 1051# CONFIG_NET_POLL_CONTROLLER is not set
1097
1098#
1099# ISDN subsystem
1100#
1101# CONFIG_ISDN is not set 1052# CONFIG_ISDN is not set
1102
1103#
1104# Telephony Support
1105#
1106# CONFIG_PHONE is not set 1053# CONFIG_PHONE is not set
1107 1054
1108# 1055#
@@ -1110,6 +1057,7 @@ CONFIG_NETXEN_NIC=m
1110# 1057#
1111CONFIG_INPUT=y 1058CONFIG_INPUT=y
1112# CONFIG_INPUT_FF_MEMLESS is not set 1059# CONFIG_INPUT_FF_MEMLESS is not set
1060# CONFIG_INPUT_POLLDEV is not set
1113 1061
1114# 1062#
1115# Userland interfaces 1063# Userland interfaces
@@ -1129,6 +1077,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
1129# CONFIG_INPUT_KEYBOARD is not set 1077# CONFIG_INPUT_KEYBOARD is not set
1130# CONFIG_INPUT_MOUSE is not set 1078# CONFIG_INPUT_MOUSE is not set
1131# CONFIG_INPUT_JOYSTICK is not set 1079# CONFIG_INPUT_JOYSTICK is not set
1080# CONFIG_INPUT_TABLET is not set
1132# CONFIG_INPUT_TOUCHSCREEN is not set 1081# CONFIG_INPUT_TOUCHSCREEN is not set
1133# CONFIG_INPUT_MISC is not set 1082# CONFIG_INPUT_MISC is not set
1134 1083
@@ -1171,32 +1120,16 @@ CONFIG_SERIAL_CORE_CONSOLE=y
1171CONFIG_UNIX98_PTYS=y 1120CONFIG_UNIX98_PTYS=y
1172CONFIG_LEGACY_PTYS=y 1121CONFIG_LEGACY_PTYS=y
1173CONFIG_LEGACY_PTY_COUNT=256 1122CONFIG_LEGACY_PTY_COUNT=256
1174
1175#
1176# IPMI
1177#
1178# CONFIG_IPMI_HANDLER is not set 1123# CONFIG_IPMI_HANDLER is not set
1179
1180#
1181# Watchdog Cards
1182#
1183# CONFIG_WATCHDOG is not set 1124# CONFIG_WATCHDOG is not set
1184# CONFIG_HW_RANDOM is not set 1125CONFIG_HW_RANDOM=m
1185CONFIG_RTC=y 1126CONFIG_RTC=y
1186# CONFIG_DTLK is not set
1187# CONFIG_R3964 is not set 1127# CONFIG_R3964 is not set
1188# CONFIG_APPLICOM is not set 1128# CONFIG_APPLICOM is not set
1189# CONFIG_DRM is not set 1129# CONFIG_DRM is not set
1190# CONFIG_RAW_DRIVER is not set 1130# CONFIG_RAW_DRIVER is not set
1191
1192#
1193# TPM devices
1194#
1195# CONFIG_TCG_TPM is not set 1131# CONFIG_TCG_TPM is not set
1196 1132CONFIG_DEVPORT=y
1197#
1198# I2C support
1199#
1200# CONFIG_I2C is not set 1133# CONFIG_I2C is not set
1201 1134
1202# 1135#
@@ -1204,32 +1137,33 @@ CONFIG_RTC=y
1204# 1137#
1205# CONFIG_SPI is not set 1138# CONFIG_SPI is not set
1206# CONFIG_SPI_MASTER is not set 1139# CONFIG_SPI_MASTER is not set
1207
1208#
1209# Dallas's 1-wire bus
1210#
1211# CONFIG_W1 is not set 1140# CONFIG_W1 is not set
1141# CONFIG_POWER_SUPPLY is not set
1142# CONFIG_HWMON is not set
1212 1143
1213# 1144#
1214# Hardware Monitoring support 1145# Multifunction device drivers
1215# 1146#
1216# CONFIG_HWMON is not set 1147# CONFIG_MFD_SM501 is not set
1217# CONFIG_HWMON_VID is not set
1218 1148
1219# 1149#
1220# Multimedia devices 1150# Multimedia devices
1221# 1151#
1222# CONFIG_VIDEO_DEV is not set 1152# CONFIG_VIDEO_DEV is not set
1153# CONFIG_DVB_CORE is not set
1154# CONFIG_DAB is not set
1223 1155
1224# 1156#
1225# Digital Video Broadcasting Devices 1157# Graphics support
1226# 1158#
1227# CONFIG_DVB is not set 1159# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1228 1160
1229# 1161#
1230# Graphics support 1162# Display device support
1231# 1163#
1232# CONFIG_FIRMWARE_EDID is not set 1164# CONFIG_DISPLAY_SUPPORT is not set
1165# CONFIG_VGASTATE is not set
1166# CONFIG_VIDEO_OUTPUT_CONTROL is not set
1233# CONFIG_FB is not set 1167# CONFIG_FB is not set
1234 1168
1235# 1169#
@@ -1237,22 +1171,15 @@ CONFIG_RTC=y
1237# 1171#
1238# CONFIG_VGA_CONSOLE is not set 1172# CONFIG_VGA_CONSOLE is not set
1239CONFIG_DUMMY_CONSOLE=y 1173CONFIG_DUMMY_CONSOLE=y
1240# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1241 1174
1242# 1175#
1243# Sound 1176# Sound
1244# 1177#
1245# CONFIG_SOUND is not set 1178# CONFIG_SOUND is not set
1246 1179CONFIG_HID_SUPPORT=y
1247#
1248# HID Devices
1249#
1250CONFIG_HID=m 1180CONFIG_HID=m
1251# CONFIG_HID_DEBUG is not set 1181# CONFIG_HID_DEBUG is not set
1252 1182CONFIG_USB_SUPPORT=y
1253#
1254# USB support
1255#
1256CONFIG_USB_ARCH_HAS_HCD=y 1183CONFIG_USB_ARCH_HAS_HCD=y
1257CONFIG_USB_ARCH_HAS_OHCI=y 1184CONFIG_USB_ARCH_HAS_OHCI=y
1258CONFIG_USB_ARCH_HAS_EHCI=y 1185CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1266,37 +1193,9 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1266# USB Gadget Support 1193# USB Gadget Support
1267# 1194#
1268# CONFIG_USB_GADGET is not set 1195# CONFIG_USB_GADGET is not set
1269
1270#
1271# MMC/SD Card support
1272#
1273# CONFIG_MMC is not set 1196# CONFIG_MMC is not set
1274
1275#
1276# LED devices
1277#
1278# CONFIG_NEW_LEDS is not set 1197# CONFIG_NEW_LEDS is not set
1279
1280#
1281# LED drivers
1282#
1283
1284#
1285# LED Triggers
1286#
1287
1288#
1289# InfiniBand support
1290#
1291# CONFIG_INFINIBAND is not set 1198# CONFIG_INFINIBAND is not set
1292
1293#
1294# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1295#
1296
1297#
1298# Real Time Clock
1299#
1300# CONFIG_RTC_CLASS is not set 1199# CONFIG_RTC_CLASS is not set
1301 1200
1302# 1201#
@@ -1313,12 +1212,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1313# 1212#
1314 1213
1315# 1214#
1316# Auxiliary Display support 1215# Userspace I/O
1317#
1318
1319#
1320# Virtualization
1321# 1216#
1217CONFIG_UIO=m
1218CONFIG_UIO_CIF=m
1322 1219
1323# 1220#
1324# File systems 1221# File systems
@@ -1451,6 +1348,7 @@ CONFIG_LOCKD_V4=y
1451CONFIG_EXPORTFS=y 1348CONFIG_EXPORTFS=y
1452CONFIG_NFS_COMMON=y 1349CONFIG_NFS_COMMON=y
1453CONFIG_SUNRPC=y 1350CONFIG_SUNRPC=y
1351# CONFIG_SUNRPC_BIND34 is not set
1454# CONFIG_RPCSEC_GSS_KRB5 is not set 1352# CONFIG_RPCSEC_GSS_KRB5 is not set
1455# CONFIG_RPCSEC_GSS_SPKM3 is not set 1353# CONFIG_RPCSEC_GSS_SPKM3 is not set
1456# CONFIG_SMB_FS is not set 1354# CONFIG_SMB_FS is not set
@@ -1458,7 +1356,6 @@ CONFIG_SUNRPC=y
1458# CONFIG_NCP_FS is not set 1356# CONFIG_NCP_FS is not set
1459# CONFIG_CODA_FS is not set 1357# CONFIG_CODA_FS is not set
1460# CONFIG_AFS_FS is not set 1358# CONFIG_AFS_FS is not set
1461# CONFIG_9P_FS is not set
1462 1359
1463# 1360#
1464# Partition Types 1361# Partition Types
@@ -1531,7 +1428,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1531# CONFIG_DEBUG_FS is not set 1428# CONFIG_DEBUG_FS is not set
1532# CONFIG_HEADERS_CHECK is not set 1429# CONFIG_HEADERS_CHECK is not set
1533# CONFIG_DEBUG_KERNEL is not set 1430# CONFIG_DEBUG_KERNEL is not set
1534CONFIG_LOG_BUF_SHIFT=15
1535CONFIG_CROSSCOMPILE=y 1431CONFIG_CROSSCOMPILE=y
1536CONFIG_CMDLINE="" 1432CONFIG_CMDLINE=""
1537 1433
@@ -1540,12 +1436,13 @@ CONFIG_CMDLINE=""
1540# 1436#
1541# CONFIG_KEYS is not set 1437# CONFIG_KEYS is not set
1542# CONFIG_SECURITY is not set 1438# CONFIG_SECURITY is not set
1543 1439CONFIG_XOR_BLOCKS=m
1544# 1440CONFIG_ASYNC_CORE=m
1545# Cryptographic options 1441CONFIG_ASYNC_MEMCPY=m
1546# 1442CONFIG_ASYNC_XOR=m
1547CONFIG_CRYPTO=y 1443CONFIG_CRYPTO=y
1548CONFIG_CRYPTO_ALGAPI=y 1444CONFIG_CRYPTO_ALGAPI=y
1445CONFIG_CRYPTO_ABLKCIPHER=m
1549CONFIG_CRYPTO_BLKCIPHER=m 1446CONFIG_CRYPTO_BLKCIPHER=m
1550CONFIG_CRYPTO_HASH=y 1447CONFIG_CRYPTO_HASH=y
1551CONFIG_CRYPTO_MANAGER=y 1448CONFIG_CRYPTO_MANAGER=y
@@ -1564,6 +1461,7 @@ CONFIG_CRYPTO_ECB=m
1564CONFIG_CRYPTO_CBC=m 1461CONFIG_CRYPTO_CBC=m
1565CONFIG_CRYPTO_PCBC=m 1462CONFIG_CRYPTO_PCBC=m
1566CONFIG_CRYPTO_LRW=m 1463CONFIG_CRYPTO_LRW=m
1464CONFIG_CRYPTO_CRYPTD=m
1567CONFIG_CRYPTO_DES=m 1465CONFIG_CRYPTO_DES=m
1568CONFIG_CRYPTO_FCRYPT=m 1466CONFIG_CRYPTO_FCRYPT=m
1569CONFIG_CRYPTO_BLOWFISH=m 1467CONFIG_CRYPTO_BLOWFISH=m
@@ -1582,10 +1480,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1582CONFIG_CRYPTO_CRC32C=m 1480CONFIG_CRYPTO_CRC32C=m
1583CONFIG_CRYPTO_CAMELLIA=m 1481CONFIG_CRYPTO_CAMELLIA=m
1584# CONFIG_CRYPTO_TEST is not set 1482# CONFIG_CRYPTO_TEST is not set
1585 1483CONFIG_CRYPTO_HW=y
1586#
1587# Hardware crypto devices
1588#
1589 1484
1590# 1485#
1591# Library routines 1486# Library routines
@@ -1593,7 +1488,9 @@ CONFIG_CRYPTO_CAMELLIA=m
1593CONFIG_BITREVERSE=y 1488CONFIG_BITREVERSE=y
1594# CONFIG_CRC_CCITT is not set 1489# CONFIG_CRC_CCITT is not set
1595CONFIG_CRC16=m 1490CONFIG_CRC16=m
1491# CONFIG_CRC_ITU_T is not set
1596CONFIG_CRC32=y 1492CONFIG_CRC32=y
1493# CONFIG_CRC7 is not set
1597CONFIG_LIBCRC32C=m 1494CONFIG_LIBCRC32C=m
1598CONFIG_ZLIB_INFLATE=m 1495CONFIG_ZLIB_INFLATE=m
1599CONFIG_ZLIB_DEFLATE=m 1496CONFIG_ZLIB_DEFLATE=m
@@ -1604,3 +1501,4 @@ CONFIG_TEXTSEARCH_FSM=m
1604CONFIG_PLIST=y 1501CONFIG_PLIST=y
1605CONFIG_HAS_IOMEM=y 1502CONFIG_HAS_IOMEM=y
1606CONFIG_HAS_IOPORT=y 1503CONFIG_HAS_IOPORT=y
1504CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig
index 239810b6c88d..8334350d7229 100644
--- a/arch/mips/configs/mpc30x_defconfig
+++ b/arch/mips/configs/mpc30x_defconfig
@@ -1,60 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:35 2007 4# Wed Aug 8 15:09:51 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58# CONFIG_CASIO_E55 is not set 45# CONFIG_CASIO_E55 is not set
59# CONFIG_IBM_WORKPAD is not set 46# CONFIG_IBM_WORKPAD is not set
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
@@ -73,6 +60,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
73CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 60CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
74CONFIG_DMA_NONCOHERENT=y 61CONFIG_DMA_NONCOHERENT=y
75CONFIG_DMA_NEED_PCI_MAP_STATE=y 62CONFIG_DMA_NEED_PCI_MAP_STATE=y
63# CONFIG_HOTPLUG_CPU is not set
64# CONFIG_NO_IOPORT is not set
76# CONFIG_CPU_BIG_ENDIAN is not set 65# CONFIG_CPU_BIG_ENDIAN is not set
77CONFIG_CPU_LITTLE_ENDIAN=y 66CONFIG_CPU_LITTLE_ENDIAN=y
78CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 67CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -82,6 +71,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
82# 71#
83# CPU selection 72# CPU selection
84# 73#
74# CONFIG_CPU_LOONGSON2 is not set
85# CONFIG_CPU_MIPS32_R1 is not set 75# CONFIG_CPU_MIPS32_R1 is not set
86# CONFIG_CPU_MIPS32_R2 is not set 76# CONFIG_CPU_MIPS32_R2 is not set
87# CONFIG_CPU_MIPS64_R1 is not set 77# CONFIG_CPU_MIPS64_R1 is not set
@@ -103,7 +93,6 @@ CONFIG_CPU_VR41XX=y
103# CONFIG_CPU_SB1 is not set 93# CONFIG_CPU_SB1 is not set
104CONFIG_SYS_HAS_CPU_VR41XX=y 94CONFIG_SYS_HAS_CPU_VR41XX=y
105CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 95CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
106CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 96CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
108CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 97CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
109 98
@@ -119,7 +108,6 @@ CONFIG_PAGE_SIZE_4KB=y
119CONFIG_MIPS_MT_DISABLED=y 108CONFIG_MIPS_MT_DISABLED=y
120# CONFIG_MIPS_MT_SMP is not set 109# CONFIG_MIPS_MT_SMP is not set
121# CONFIG_MIPS_MT_SMTC is not set 110# CONFIG_MIPS_MT_SMTC is not set
122# CONFIG_MIPS_VPE_LOADER is not set
123CONFIG_CPU_HAS_SYNC=y 111CONFIG_CPU_HAS_SYNC=y
124CONFIG_GENERIC_HARDIRQS=y 112CONFIG_GENERIC_HARDIRQS=y
125CONFIG_GENERIC_IRQ_PROBE=y 113CONFIG_GENERIC_IRQ_PROBE=y
@@ -133,48 +121,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
133# CONFIG_SPARSEMEM_STATIC is not set 121# CONFIG_SPARSEMEM_STATIC is not set
134CONFIG_SPLIT_PTLOCK_CPUS=4 122CONFIG_SPLIT_PTLOCK_CPUS=4
135# CONFIG_RESOURCES_64BIT is not set 123# CONFIG_RESOURCES_64BIT is not set
136CONFIG_ZONE_DMA_FLAG=1 124CONFIG_ZONE_DMA_FLAG=0
125CONFIG_VIRT_TO_BUS=y
137# CONFIG_HZ_48 is not set 126# CONFIG_HZ_48 is not set
138# CONFIG_HZ_100 is not set 127# CONFIG_HZ_100 is not set
139# CONFIG_HZ_128 is not set 128# CONFIG_HZ_128 is not set
140# CONFIG_HZ_250 is not set 129CONFIG_HZ_250=y
141# CONFIG_HZ_256 is not set 130# CONFIG_HZ_256 is not set
142CONFIG_HZ_1000=y 131# CONFIG_HZ_1000 is not set
143# CONFIG_HZ_1024 is not set 132# CONFIG_HZ_1024 is not set
144CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 133CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
145CONFIG_HZ=1000 134CONFIG_HZ=250
146CONFIG_PREEMPT_NONE=y 135CONFIG_PREEMPT_NONE=y
147# CONFIG_PREEMPT_VOLUNTARY is not set 136# CONFIG_PREEMPT_VOLUNTARY is not set
148# CONFIG_PREEMPT is not set 137# CONFIG_PREEMPT is not set
149# CONFIG_KEXEC is not set 138# CONFIG_KEXEC is not set
139CONFIG_SECCOMP=y
150CONFIG_LOCKDEP_SUPPORT=y 140CONFIG_LOCKDEP_SUPPORT=y
151CONFIG_STACKTRACE_SUPPORT=y 141CONFIG_STACKTRACE_SUPPORT=y
152CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 142CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
153 143
154# 144#
155# Code maturity level options 145# General setup
156# 146#
157CONFIG_EXPERIMENTAL=y 147CONFIG_EXPERIMENTAL=y
158CONFIG_BROKEN_ON_SMP=y 148CONFIG_BROKEN_ON_SMP=y
159CONFIG_INIT_ENV_ARG_LIMIT=32 149CONFIG_INIT_ENV_ARG_LIMIT=32
160
161#
162# General setup
163#
164CONFIG_LOCALVERSION="" 150CONFIG_LOCALVERSION=""
165CONFIG_LOCALVERSION_AUTO=y 151CONFIG_LOCALVERSION_AUTO=y
166CONFIG_SWAP=y 152CONFIG_SWAP=y
167CONFIG_SYSVIPC=y 153CONFIG_SYSVIPC=y
168# CONFIG_IPC_NS is not set
169CONFIG_SYSVIPC_SYSCTL=y 154CONFIG_SYSVIPC_SYSCTL=y
170# CONFIG_POSIX_MQUEUE is not set 155# CONFIG_POSIX_MQUEUE is not set
171# CONFIG_BSD_PROCESS_ACCT is not set 156# CONFIG_BSD_PROCESS_ACCT is not set
172# CONFIG_TASKSTATS is not set 157# CONFIG_TASKSTATS is not set
173# CONFIG_UTS_NS is not set 158# CONFIG_USER_NS is not set
174# CONFIG_AUDIT is not set 159# CONFIG_AUDIT is not set
175# CONFIG_IKCONFIG is not set 160# CONFIG_IKCONFIG is not set
161CONFIG_LOG_BUF_SHIFT=14
176CONFIG_SYSFS_DEPRECATED=y 162CONFIG_SYSFS_DEPRECATED=y
177CONFIG_RELAY=y 163CONFIG_RELAY=y
164# CONFIG_BLK_DEV_INITRD is not set
178# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 165# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
179CONFIG_SYSCTL=y 166CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 167CONFIG_EMBEDDED=y
@@ -187,32 +174,30 @@ CONFIG_BUG=y
187CONFIG_ELF_CORE=y 174CONFIG_ELF_CORE=y
188CONFIG_BASE_FULL=y 175CONFIG_BASE_FULL=y
189CONFIG_FUTEX=y 176CONFIG_FUTEX=y
177CONFIG_ANON_INODES=y
190CONFIG_EPOLL=y 178CONFIG_EPOLL=y
179CONFIG_SIGNALFD=y
180CONFIG_TIMERFD=y
181CONFIG_EVENTFD=y
191CONFIG_SHMEM=y 182CONFIG_SHMEM=y
192CONFIG_SLAB=y
193CONFIG_VM_EVENT_COUNTERS=y 183CONFIG_VM_EVENT_COUNTERS=y
184CONFIG_SLAB=y
185# CONFIG_SLUB is not set
186# CONFIG_SLOB is not set
194CONFIG_RT_MUTEXES=y 187CONFIG_RT_MUTEXES=y
195# CONFIG_TINY_SHMEM is not set 188# CONFIG_TINY_SHMEM is not set
196CONFIG_BASE_SMALL=0 189CONFIG_BASE_SMALL=0
197# CONFIG_SLOB is not set
198
199#
200# Loadable module support
201#
202CONFIG_MODULES=y 190CONFIG_MODULES=y
203CONFIG_MODULE_UNLOAD=y 191CONFIG_MODULE_UNLOAD=y
204# CONFIG_MODULE_FORCE_UNLOAD is not set 192# CONFIG_MODULE_FORCE_UNLOAD is not set
205CONFIG_MODVERSIONS=y 193CONFIG_MODVERSIONS=y
206CONFIG_MODULE_SRCVERSION_ALL=y 194CONFIG_MODULE_SRCVERSION_ALL=y
207CONFIG_KMOD=y 195CONFIG_KMOD=y
208
209#
210# Block layer
211#
212CONFIG_BLOCK=y 196CONFIG_BLOCK=y
213# CONFIG_LBD is not set 197# CONFIG_LBD is not set
214# CONFIG_BLK_DEV_IO_TRACE is not set 198# CONFIG_BLK_DEV_IO_TRACE is not set
215# CONFIG_LSF is not set 199# CONFIG_LSF is not set
200# CONFIG_BLK_DEV_BSG is not set
216 201
217# 202#
218# IO Schedulers 203# IO Schedulers
@@ -232,29 +217,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
232# 217#
233CONFIG_HW_HAS_PCI=y 218CONFIG_HW_HAS_PCI=y
234CONFIG_PCI=y 219CONFIG_PCI=y
220# CONFIG_ARCH_SUPPORTS_MSI is not set
235CONFIG_MMU=y 221CONFIG_MMU=y
236 222
237# 223#
238# PCCARD (PCMCIA/CardBus) support 224# PCCARD (PCMCIA/CardBus) support
239# 225#
240CONFIG_PCCARD=y 226# CONFIG_PCCARD is not set
241# CONFIG_PCMCIA_DEBUG is not set
242CONFIG_PCMCIA=y
243CONFIG_PCMCIA_LOAD_CIS=y
244CONFIG_PCMCIA_IOCTL=y
245# CONFIG_CARDBUS is not set
246
247#
248# PC-card bridges
249#
250# CONFIG_YENTA is not set
251# CONFIG_PD6729 is not set
252# CONFIG_I82092 is not set
253# CONFIG_PCMCIA_VRC4173 is not set
254
255#
256# PCI Hotplug Support
257#
258# CONFIG_HOTPLUG_PCI is not set 227# CONFIG_HOTPLUG_PCI is not set
259 228
260# 229#
@@ -267,10 +236,7 @@ CONFIG_TRAD_SIGNALS=y
267# 236#
268# Power management options 237# Power management options
269# 238#
270CONFIG_PM=y 239# CONFIG_PM is not set
271# CONFIG_PM_LEGACY is not set
272# CONFIG_PM_DEBUG is not set
273# CONFIG_PM_SYSFS_DEPRECATED is not set
274 240
275# 241#
276# Networking 242# Networking
@@ -280,7 +246,6 @@ CONFIG_NET=y
280# 246#
281# Networking options 247# Networking options
282# 248#
283# CONFIG_NETDEBUG is not set
284CONFIG_PACKET=y 249CONFIG_PACKET=y
285CONFIG_PACKET_MMAP=y 250CONFIG_PACKET_MMAP=y
286CONFIG_UNIX=y 251CONFIG_UNIX=y
@@ -313,26 +278,17 @@ CONFIG_INET_TCP_DIAG=y
313# CONFIG_TCP_CONG_ADVANCED is not set 278# CONFIG_TCP_CONG_ADVANCED is not set
314CONFIG_TCP_CONG_CUBIC=y 279CONFIG_TCP_CONG_CUBIC=y
315CONFIG_DEFAULT_TCP_CONG="cubic" 280CONFIG_DEFAULT_TCP_CONG="cubic"
316CONFIG_TCP_MD5SIG=y 281# CONFIG_TCP_MD5SIG is not set
317# CONFIG_IPV6 is not set 282# CONFIG_IPV6 is not set
318# CONFIG_INET6_XFRM_TUNNEL is not set 283# CONFIG_INET6_XFRM_TUNNEL is not set
319# CONFIG_INET6_TUNNEL is not set 284# CONFIG_INET6_TUNNEL is not set
320CONFIG_NETWORK_SECMARK=y 285CONFIG_NETWORK_SECMARK=y
321# CONFIG_NETFILTER is not set 286# CONFIG_NETFILTER is not set
322
323#
324# DCCP Configuration (EXPERIMENTAL)
325#
326# CONFIG_IP_DCCP is not set 287# CONFIG_IP_DCCP is not set
327
328#
329# SCTP Configuration (EXPERIMENTAL)
330#
331# CONFIG_IP_SCTP is not set 288# CONFIG_IP_SCTP is not set
332 289# CONFIG_SCTP_HMAC_NONE is not set
333# 290# CONFIG_SCTP_HMAC_SHA1 is not set
334# TIPC Configuration (EXPERIMENTAL) 291# CONFIG_SCTP_HMAC_MD5 is not set
335#
336# CONFIG_TIPC is not set 292# CONFIG_TIPC is not set
337# CONFIG_ATM is not set 293# CONFIG_ATM is not set
338# CONFIG_BRIDGE is not set 294# CONFIG_BRIDGE is not set
@@ -358,14 +314,17 @@ CONFIG_NETWORK_SECMARK=y
358# CONFIG_HAMRADIO is not set 314# CONFIG_HAMRADIO is not set
359# CONFIG_IRDA is not set 315# CONFIG_IRDA is not set
360# CONFIG_BT is not set 316# CONFIG_BT is not set
361CONFIG_IEEE80211=m 317# CONFIG_AF_RXRPC is not set
362# CONFIG_IEEE80211_DEBUG is not set 318
363CONFIG_IEEE80211_CRYPT_WEP=m 319#
364CONFIG_IEEE80211_CRYPT_CCMP=m 320# Wireless
365CONFIG_IEEE80211_CRYPT_TKIP=m 321#
366CONFIG_IEEE80211_SOFTMAC=m 322# CONFIG_CFG80211 is not set
367# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 323# CONFIG_WIRELESS_EXT is not set
368CONFIG_WIRELESS_EXT=y 324# CONFIG_MAC80211 is not set
325# CONFIG_IEEE80211 is not set
326# CONFIG_RFKILL is not set
327# CONFIG_NET_9P is not set
369 328
370# 329#
371# Device Drivers 330# Device Drivers
@@ -378,30 +337,10 @@ CONFIG_STANDALONE=y
378CONFIG_PREVENT_FIRMWARE_BUILD=y 337CONFIG_PREVENT_FIRMWARE_BUILD=y
379CONFIG_FW_LOADER=y 338CONFIG_FW_LOADER=y
380# CONFIG_SYS_HYPERVISOR is not set 339# CONFIG_SYS_HYPERVISOR is not set
381
382#
383# Connector - unified userspace <-> kernelspace linker
384#
385CONFIG_CONNECTOR=m 340CONFIG_CONNECTOR=m
386
387#
388# Memory Technology Devices (MTD)
389#
390# CONFIG_MTD is not set 341# CONFIG_MTD is not set
391
392#
393# Parallel port support
394#
395# CONFIG_PARPORT is not set 342# CONFIG_PARPORT is not set
396 343CONFIG_BLK_DEV=y
397#
398# Plug and Play support
399#
400# CONFIG_PNPACPI is not set
401
402#
403# Block devices
404#
405# CONFIG_BLK_CPQ_DA is not set 344# CONFIG_BLK_CPQ_DA is not set
406# CONFIG_BLK_CPQ_CISS_DA is not set 345# CONFIG_BLK_CPQ_CISS_DA is not set
407# CONFIG_BLK_DEV_DAC960 is not set 346# CONFIG_BLK_DEV_DAC960 is not set
@@ -412,19 +351,9 @@ CONFIG_CONNECTOR=m
412# CONFIG_BLK_DEV_SX8 is not set 351# CONFIG_BLK_DEV_SX8 is not set
413# CONFIG_BLK_DEV_UB is not set 352# CONFIG_BLK_DEV_UB is not set
414# CONFIG_BLK_DEV_RAM is not set 353# CONFIG_BLK_DEV_RAM is not set
415# CONFIG_BLK_DEV_INITRD is not set
416# CONFIG_CDROM_PKTCDVD is not set 354# CONFIG_CDROM_PKTCDVD is not set
417CONFIG_ATA_OVER_ETH=m 355CONFIG_ATA_OVER_ETH=m
418 356# CONFIG_MISC_DEVICES is not set
419#
420# Misc devices
421#
422CONFIG_SGI_IOC4=m
423# CONFIG_TIFM_CORE is not set
424
425#
426# ATA/ATAPI/MFM/RLL support
427#
428CONFIG_IDE=y 357CONFIG_IDE=y
429CONFIG_IDE_MAX_HWIFS=4 358CONFIG_IDE_MAX_HWIFS=4
430CONFIG_BLK_DEV_IDE=y 359CONFIG_BLK_DEV_IDE=y
@@ -435,20 +364,20 @@ CONFIG_BLK_DEV_IDE=y
435# CONFIG_BLK_DEV_IDE_SATA is not set 364# CONFIG_BLK_DEV_IDE_SATA is not set
436CONFIG_BLK_DEV_IDEDISK=y 365CONFIG_BLK_DEV_IDEDISK=y
437# CONFIG_IDEDISK_MULTI_MODE is not set 366# CONFIG_IDEDISK_MULTI_MODE is not set
438CONFIG_BLK_DEV_IDECS=m
439# CONFIG_BLK_DEV_IDECD is not set 367# CONFIG_BLK_DEV_IDECD is not set
440# CONFIG_BLK_DEV_IDETAPE is not set 368# CONFIG_BLK_DEV_IDETAPE is not set
441# CONFIG_BLK_DEV_IDEFLOPPY is not set 369# CONFIG_BLK_DEV_IDEFLOPPY is not set
442# CONFIG_IDE_TASK_IOCTL is not set 370# CONFIG_IDE_TASK_IOCTL is not set
371CONFIG_IDE_PROC_FS=y
443 372
444# 373#
445# IDE chipset support/bugfixes 374# IDE chipset support/bugfixes
446# 375#
447CONFIG_IDE_GENERIC=y 376CONFIG_IDE_GENERIC=y
448# CONFIG_BLK_DEV_IDEPCI is not set 377# CONFIG_BLK_DEV_IDEPCI is not set
378# CONFIG_IDEPCI_PCIBUS_ORDER is not set
449# CONFIG_IDE_ARM is not set 379# CONFIG_IDE_ARM is not set
450# CONFIG_BLK_DEV_IDEDMA is not set 380# CONFIG_BLK_DEV_IDEDMA is not set
451# CONFIG_IDEDMA_AUTO is not set
452# CONFIG_BLK_DEV_HD is not set 381# CONFIG_BLK_DEV_HD is not set
453 382
454# 383#
@@ -456,16 +385,9 @@ CONFIG_IDE_GENERIC=y
456# 385#
457# CONFIG_RAID_ATTRS is not set 386# CONFIG_RAID_ATTRS is not set
458# CONFIG_SCSI is not set 387# CONFIG_SCSI is not set
388# CONFIG_SCSI_DMA is not set
459# CONFIG_SCSI_NETLINK is not set 389# CONFIG_SCSI_NETLINK is not set
460
461#
462# Serial ATA (prod) and Parallel ATA (experimental) drivers
463#
464# CONFIG_ATA is not set 390# CONFIG_ATA is not set
465
466#
467# Multi-device support (RAID and LVM)
468#
469# CONFIG_MD is not set 391# CONFIG_MD is not set
470 392
471# 393#
@@ -476,135 +398,38 @@ CONFIG_IDE_GENERIC=y
476# 398#
477# IEEE 1394 (FireWire) support 399# IEEE 1394 (FireWire) support
478# 400#
401# CONFIG_FIREWIRE is not set
479# CONFIG_IEEE1394 is not set 402# CONFIG_IEEE1394 is not set
480
481#
482# I2O device support
483#
484# CONFIG_I2O is not set 403# CONFIG_I2O is not set
485
486#
487# Network device support
488#
489CONFIG_NETDEVICES=y 404CONFIG_NETDEVICES=y
405# CONFIG_NETDEVICES_MULTIQUEUE is not set
490# CONFIG_DUMMY is not set 406# CONFIG_DUMMY is not set
491# CONFIG_BONDING is not set 407# CONFIG_BONDING is not set
408# CONFIG_MACVLAN is not set
492# CONFIG_EQUALIZER is not set 409# CONFIG_EQUALIZER is not set
493# CONFIG_TUN is not set 410# CONFIG_TUN is not set
494
495#
496# ARCnet devices
497#
498# CONFIG_ARCNET is not set 411# CONFIG_ARCNET is not set
499
500#
501# PHY device support
502#
503
504#
505# Ethernet (10 or 100Mbit)
506#
507# CONFIG_NET_ETHERNET is not set 412# CONFIG_NET_ETHERNET is not set
508CONFIG_MII=m 413CONFIG_MII=m
509 414# CONFIG_NETDEV_1000 is not set
510# 415# CONFIG_NETDEV_10000 is not set
511# Ethernet (1000 Mbit)
512#
513# CONFIG_ACENIC is not set
514# CONFIG_DL2K is not set
515# CONFIG_E1000 is not set
516# CONFIG_NS83820 is not set
517# CONFIG_HAMACHI is not set
518# CONFIG_YELLOWFIN is not set
519# CONFIG_R8169 is not set
520# CONFIG_SIS190 is not set
521# CONFIG_SKGE is not set
522# CONFIG_SKY2 is not set
523# CONFIG_SK98LIN is not set
524# CONFIG_TIGON3 is not set
525# CONFIG_BNX2 is not set
526CONFIG_QLA3XXX=m
527# CONFIG_ATL1 is not set
528
529#
530# Ethernet (10000 Mbit)
531#
532# CONFIG_CHELSIO_T1 is not set
533CONFIG_CHELSIO_T3=m
534# CONFIG_IXGB is not set
535# CONFIG_S2IO is not set
536# CONFIG_MYRI10GE is not set
537CONFIG_NETXEN_NIC=m
538
539#
540# Token Ring devices
541#
542# CONFIG_TR is not set 416# CONFIG_TR is not set
543 417
544# 418#
545# Wireless LAN (non-hamradio) 419# Wireless LAN
546# 420#
547CONFIG_NET_RADIO=y 421# CONFIG_WLAN_PRE80211 is not set
548# CONFIG_NET_WIRELESS_RTNETLINK is not set 422# CONFIG_WLAN_80211 is not set
549 423
550# 424#
551# Obsolete Wireless cards support (pre-802.11) 425# USB Network Adapters
552#
553# CONFIG_STRIP is not set
554# CONFIG_PCMCIA_WAVELAN is not set
555# CONFIG_PCMCIA_NETWAVE is not set
556
557#
558# Wireless 802.11 Frequency Hopping cards support
559#
560# CONFIG_PCMCIA_RAYCS is not set
561
562#
563# Wireless 802.11b ISA/PCI cards support
564#
565# CONFIG_IPW2100 is not set
566# CONFIG_IPW2200 is not set
567CONFIG_HERMES=m
568# CONFIG_PLX_HERMES is not set
569# CONFIG_TMD_HERMES is not set
570# CONFIG_NORTEL_HERMES is not set
571# CONFIG_PCI_HERMES is not set
572# CONFIG_ATMEL is not set
573
574#
575# Wireless 802.11b Pcmcia/Cardbus cards support
576#
577CONFIG_PCMCIA_HERMES=m
578# CONFIG_PCMCIA_SPECTRUM is not set
579# CONFIG_AIRO_CS is not set
580# CONFIG_PCMCIA_WL3501 is not set
581
582#
583# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
584#
585# CONFIG_PRISM54 is not set
586# CONFIG_USB_ZD1201 is not set
587# CONFIG_HOSTAP is not set
588# CONFIG_BCM43XX is not set
589# CONFIG_ZD1211RW is not set
590CONFIG_NET_WIRELESS=y
591
592#
593# PCMCIA network device support
594#
595CONFIG_NET_PCMCIA=y
596CONFIG_PCMCIA_3C589=m
597CONFIG_PCMCIA_3C574=m
598CONFIG_PCMCIA_FMVJ18X=m
599CONFIG_PCMCIA_PCNET=m
600CONFIG_PCMCIA_NMCLAN=m
601CONFIG_PCMCIA_SMC91C92=m
602CONFIG_PCMCIA_XIRC2PS=m
603CONFIG_PCMCIA_AXNET=m
604
605#
606# Wan interfaces
607# 426#
427# CONFIG_USB_CATC is not set
428# CONFIG_USB_KAWETH is not set
429CONFIG_USB_PEGASUS=m
430# CONFIG_USB_RTL8150 is not set
431# CONFIG_USB_USBNET_MII is not set
432# CONFIG_USB_USBNET is not set
608# CONFIG_WAN is not set 433# CONFIG_WAN is not set
609# CONFIG_FDDI is not set 434# CONFIG_FDDI is not set
610# CONFIG_HIPPI is not set 435# CONFIG_HIPPI is not set
@@ -614,15 +439,7 @@ CONFIG_PCMCIA_AXNET=m
614# CONFIG_NETCONSOLE is not set 439# CONFIG_NETCONSOLE is not set
615# CONFIG_NETPOLL is not set 440# CONFIG_NETPOLL is not set
616# CONFIG_NET_POLL_CONTROLLER is not set 441# CONFIG_NET_POLL_CONTROLLER is not set
617
618#
619# ISDN subsystem
620#
621# CONFIG_ISDN is not set 442# CONFIG_ISDN is not set
622
623#
624# Telephony Support
625#
626# CONFIG_PHONE is not set 443# CONFIG_PHONE is not set
627 444
628# 445#
@@ -630,14 +447,12 @@ CONFIG_PCMCIA_AXNET=m
630# 447#
631CONFIG_INPUT=y 448CONFIG_INPUT=y
632# CONFIG_INPUT_FF_MEMLESS is not set 449# CONFIG_INPUT_FF_MEMLESS is not set
450# CONFIG_INPUT_POLLDEV is not set
633 451
634# 452#
635# Userland interfaces 453# Userland interfaces
636# 454#
637CONFIG_INPUT_MOUSEDEV=y 455# CONFIG_INPUT_MOUSEDEV is not set
638CONFIG_INPUT_MOUSEDEV_PSAUX=y
639CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
640CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
641# CONFIG_INPUT_JOYDEV is not set 456# CONFIG_INPUT_JOYDEV is not set
642# CONFIG_INPUT_TSDEV is not set 457# CONFIG_INPUT_TSDEV is not set
643# CONFIG_INPUT_EVDEV is not set 458# CONFIG_INPUT_EVDEV is not set
@@ -649,18 +464,14 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
649# CONFIG_INPUT_KEYBOARD is not set 464# CONFIG_INPUT_KEYBOARD is not set
650# CONFIG_INPUT_MOUSE is not set 465# CONFIG_INPUT_MOUSE is not set
651# CONFIG_INPUT_JOYSTICK is not set 466# CONFIG_INPUT_JOYSTICK is not set
467# CONFIG_INPUT_TABLET is not set
652# CONFIG_INPUT_TOUCHSCREEN is not set 468# CONFIG_INPUT_TOUCHSCREEN is not set
653# CONFIG_INPUT_MISC is not set 469# CONFIG_INPUT_MISC is not set
654 470
655# 471#
656# Hardware I/O ports 472# Hardware I/O ports
657# 473#
658CONFIG_SERIO=y 474# CONFIG_SERIO is not set
659# CONFIG_SERIO_I8042 is not set
660CONFIG_SERIO_SERPORT=y
661# CONFIG_SERIO_PCIPS2 is not set
662# CONFIG_SERIO_LIBPS2 is not set
663CONFIG_SERIO_RAW=m
664# CONFIG_GAMEPORT is not set 475# CONFIG_GAMEPORT is not set
665 476
666# 477#
@@ -680,46 +491,25 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
680# 491#
681# Non-8250 serial port support 492# Non-8250 serial port support
682# 493#
683# CONFIG_SERIAL_VR41XX is not set 494CONFIG_SERIAL_CORE=y
495CONFIG_SERIAL_CORE_CONSOLE=y
496CONFIG_SERIAL_VR41XX=y
497CONFIG_SERIAL_VR41XX_CONSOLE=y
684# CONFIG_SERIAL_JSM is not set 498# CONFIG_SERIAL_JSM is not set
685CONFIG_UNIX98_PTYS=y 499CONFIG_UNIX98_PTYS=y
686CONFIG_LEGACY_PTYS=y 500CONFIG_LEGACY_PTYS=y
687CONFIG_LEGACY_PTY_COUNT=256 501CONFIG_LEGACY_PTY_COUNT=256
688
689#
690# IPMI
691#
692# CONFIG_IPMI_HANDLER is not set 502# CONFIG_IPMI_HANDLER is not set
693
694#
695# Watchdog Cards
696#
697# CONFIG_WATCHDOG is not set 503# CONFIG_WATCHDOG is not set
698# CONFIG_HW_RANDOM is not set 504# CONFIG_HW_RANDOM is not set
699# CONFIG_RTC is not set 505# CONFIG_RTC is not set
700# CONFIG_GEN_RTC is not set
701# CONFIG_DTLK is not set
702# CONFIG_R3964 is not set 506# CONFIG_R3964 is not set
703# CONFIG_APPLICOM is not set 507# CONFIG_APPLICOM is not set
704# CONFIG_DRM is not set 508# CONFIG_DRM is not set
705 509CONFIG_GPIO_VR41XX=y
706#
707# PCMCIA character devices
708#
709# CONFIG_SYNCLINK_CS is not set
710# CONFIG_CARDMAN_4000 is not set
711# CONFIG_CARDMAN_4040 is not set
712# CONFIG_GPIO_VR41XX is not set
713# CONFIG_RAW_DRIVER is not set 510# CONFIG_RAW_DRIVER is not set
714
715#
716# TPM devices
717#
718# CONFIG_TCG_TPM is not set 511# CONFIG_TCG_TPM is not set
719 512CONFIG_DEVPORT=y
720#
721# I2C support
722#
723# CONFIG_I2C is not set 513# CONFIG_I2C is not set
724 514
725# 515#
@@ -727,33 +517,33 @@ CONFIG_LEGACY_PTY_COUNT=256
727# 517#
728# CONFIG_SPI is not set 518# CONFIG_SPI is not set
729# CONFIG_SPI_MASTER is not set 519# CONFIG_SPI_MASTER is not set
730
731#
732# Dallas's 1-wire bus
733#
734# CONFIG_W1 is not set 520# CONFIG_W1 is not set
521# CONFIG_POWER_SUPPLY is not set
522# CONFIG_HWMON is not set
735 523
736# 524#
737# Hardware Monitoring support 525# Multifunction device drivers
738# 526#
739# CONFIG_HWMON is not set 527# CONFIG_MFD_SM501 is not set
740# CONFIG_HWMON_VID is not set
741 528
742# 529#
743# Multimedia devices 530# Multimedia devices
744# 531#
745# CONFIG_VIDEO_DEV is not set 532# CONFIG_VIDEO_DEV is not set
533# CONFIG_DVB_CORE is not set
534# CONFIG_DAB is not set
746 535
747# 536#
748# Digital Video Broadcasting Devices 537# Graphics support
749# 538#
750# CONFIG_DVB is not set 539# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
751# CONFIG_USB_DABUSB is not set
752 540
753# 541#
754# Graphics support 542# Display device support
755# 543#
756# CONFIG_FIRMWARE_EDID is not set 544# CONFIG_DISPLAY_SUPPORT is not set
545# CONFIG_VGASTATE is not set
546# CONFIG_VIDEO_OUTPUT_CONTROL is not set
757# CONFIG_FB is not set 547# CONFIG_FB is not set
758 548
759# 549#
@@ -761,22 +551,13 @@ CONFIG_LEGACY_PTY_COUNT=256
761# 551#
762# CONFIG_VGA_CONSOLE is not set 552# CONFIG_VGA_CONSOLE is not set
763CONFIG_DUMMY_CONSOLE=y 553CONFIG_DUMMY_CONSOLE=y
764# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
765 554
766# 555#
767# Sound 556# Sound
768# 557#
769# CONFIG_SOUND is not set 558# CONFIG_SOUND is not set
770 559# CONFIG_HID_SUPPORT is not set
771# 560CONFIG_USB_SUPPORT=y
772# HID Devices
773#
774CONFIG_HID=y
775# CONFIG_HID_DEBUG is not set
776
777#
778# USB support
779#
780CONFIG_USB_ARCH_HAS_HCD=y 561CONFIG_USB_ARCH_HAS_HCD=y
781CONFIG_USB_ARCH_HAS_OHCI=y 562CONFIG_USB_ARCH_HAS_OHCI=y
782CONFIG_USB_ARCH_HAS_EHCI=y 563CONFIG_USB_ARCH_HAS_EHCI=y
@@ -787,8 +568,8 @@ CONFIG_USB=m
787# Miscellaneous USB options 568# Miscellaneous USB options
788# 569#
789CONFIG_USB_DEVICEFS=y 570CONFIG_USB_DEVICEFS=y
571CONFIG_USB_DEVICE_CLASS=y
790# CONFIG_USB_DYNAMIC_MINORS is not set 572# CONFIG_USB_DYNAMIC_MINORS is not set
791# CONFIG_USB_SUSPEND is not set
792# CONFIG_USB_OTG is not set 573# CONFIG_USB_OTG is not set
793 574
794# 575#
@@ -802,6 +583,7 @@ CONFIG_USB_OHCI_HCD=m
802CONFIG_USB_OHCI_LITTLE_ENDIAN=y 583CONFIG_USB_OHCI_LITTLE_ENDIAN=y
803# CONFIG_USB_UHCI_HCD is not set 584# CONFIG_USB_UHCI_HCD is not set
804# CONFIG_USB_SL811_HCD is not set 585# CONFIG_USB_SL811_HCD is not set
586# CONFIG_USB_R8A66597_HCD is not set
805 587
806# 588#
807# USB Device Class drivers 589# USB Device Class drivers
@@ -819,43 +601,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
819# CONFIG_USB_LIBUSUAL is not set 601# CONFIG_USB_LIBUSUAL is not set
820 602
821# 603#
822# USB Input Devices
823#
824# CONFIG_USB_HID is not set
825
826#
827# USB HID Boot Protocol drivers
828#
829# CONFIG_USB_KBD is not set
830# CONFIG_USB_MOUSE is not set
831# CONFIG_USB_AIPTEK is not set
832# CONFIG_USB_WACOM is not set
833# CONFIG_USB_ACECAD is not set
834# CONFIG_USB_KBTAB is not set
835# CONFIG_USB_POWERMATE is not set
836# CONFIG_USB_TOUCHSCREEN is not set
837# CONFIG_USB_YEALINK is not set
838# CONFIG_USB_XPAD is not set
839# CONFIG_USB_ATI_REMOTE is not set
840# CONFIG_USB_ATI_REMOTE2 is not set
841# CONFIG_USB_KEYSPAN_REMOTE is not set
842# CONFIG_USB_APPLETOUCH is not set
843# CONFIG_USB_GTCO is not set
844
845#
846# USB Imaging devices 604# USB Imaging devices
847# 605#
848# CONFIG_USB_MDC800 is not set 606# CONFIG_USB_MDC800 is not set
849
850#
851# USB Network Adapters
852#
853# CONFIG_USB_CATC is not set
854# CONFIG_USB_KAWETH is not set
855CONFIG_USB_PEGASUS=m
856# CONFIG_USB_RTL8150 is not set
857# CONFIG_USB_USBNET_MII is not set
858# CONFIG_USB_USBNET is not set
859# CONFIG_USB_MON is not set 607# CONFIG_USB_MON is not set
860 608
861# 609#
@@ -887,6 +635,7 @@ CONFIG_USB_PEGASUS=m
887# CONFIG_USB_APPLEDISPLAY is not set 635# CONFIG_USB_APPLEDISPLAY is not set
888# CONFIG_USB_LD is not set 636# CONFIG_USB_LD is not set
889# CONFIG_USB_TRANCEVIBRATOR is not set 637# CONFIG_USB_TRANCEVIBRATOR is not set
638# CONFIG_USB_IOWARRIOR is not set
890# CONFIG_USB_TEST is not set 639# CONFIG_USB_TEST is not set
891 640
892# 641#
@@ -897,38 +646,43 @@ CONFIG_USB_PEGASUS=m
897# USB Gadget Support 646# USB Gadget Support
898# 647#
899# CONFIG_USB_GADGET is not set 648# CONFIG_USB_GADGET is not set
900
901#
902# MMC/SD Card support
903#
904# CONFIG_MMC is not set 649# CONFIG_MMC is not set
905
906#
907# LED devices
908#
909# CONFIG_NEW_LEDS is not set 650# CONFIG_NEW_LEDS is not set
651# CONFIG_INFINIBAND is not set
652CONFIG_RTC_LIB=y
653CONFIG_RTC_CLASS=y
654CONFIG_RTC_HCTOSYS=y
655CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
656# CONFIG_RTC_DEBUG is not set
910 657
911# 658#
912# LED drivers 659# RTC interfaces
913#
914
915#
916# LED Triggers
917# 660#
661CONFIG_RTC_INTF_SYSFS=y
662CONFIG_RTC_INTF_PROC=y
663CONFIG_RTC_INTF_DEV=y
664# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
665# CONFIG_RTC_DRV_TEST is not set
918 666
919# 667#
920# InfiniBand support 668# SPI RTC drivers
921# 669#
922# CONFIG_INFINIBAND is not set
923 670
924# 671#
925# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 672# Platform RTC drivers
926# 673#
674# CONFIG_RTC_DRV_CMOS is not set
675# CONFIG_RTC_DRV_DS1553 is not set
676# CONFIG_RTC_DRV_STK17TA8 is not set
677# CONFIG_RTC_DRV_DS1742 is not set
678# CONFIG_RTC_DRV_M48T86 is not set
679# CONFIG_RTC_DRV_M48T59 is not set
680# CONFIG_RTC_DRV_V3020 is not set
927 681
928# 682#
929# Real Time Clock 683# on-CPU RTC drivers
930# 684#
931# CONFIG_RTC_CLASS is not set 685CONFIG_RTC_DRV_VR41XX=y
932 686
933# 687#
934# DMA Engine support 688# DMA Engine support
@@ -944,12 +698,9 @@ CONFIG_USB_PEGASUS=m
944# 698#
945 699
946# 700#
947# Auxiliary Display support 701# Userspace I/O
948#
949
950#
951# Virtualization
952# 702#
703# CONFIG_UIO is not set
953 704
954# 705#
955# File systems 706# File systems
@@ -973,7 +724,7 @@ CONFIG_INOTIFY_USER=y
973CONFIG_DNOTIFY=y 724CONFIG_DNOTIFY=y
974CONFIG_AUTOFS_FS=y 725CONFIG_AUTOFS_FS=y
975CONFIG_AUTOFS4_FS=y 726CONFIG_AUTOFS4_FS=y
976CONFIG_FUSE_FS=m 727# CONFIG_FUSE_FS is not set
977 728
978# 729#
979# CD-ROM/DVD Filesystems 730# CD-ROM/DVD Filesystems
@@ -1005,7 +756,6 @@ CONFIG_CONFIGFS_FS=m
1005# 756#
1006# CONFIG_ADFS_FS is not set 757# CONFIG_ADFS_FS is not set
1007# CONFIG_AFFS_FS is not set 758# CONFIG_AFFS_FS is not set
1008# CONFIG_ECRYPT_FS is not set
1009# CONFIG_HFS_FS is not set 759# CONFIG_HFS_FS is not set
1010# CONFIG_HFSPLUS_FS is not set 760# CONFIG_HFSPLUS_FS is not set
1011# CONFIG_BEFS_FS is not set 761# CONFIG_BEFS_FS is not set
@@ -1029,6 +779,7 @@ CONFIG_NFS_FS=y
1029CONFIG_LOCKD=y 779CONFIG_LOCKD=y
1030CONFIG_NFS_COMMON=y 780CONFIG_NFS_COMMON=y
1031CONFIG_SUNRPC=y 781CONFIG_SUNRPC=y
782# CONFIG_SUNRPC_BIND34 is not set
1032# CONFIG_RPCSEC_GSS_KRB5 is not set 783# CONFIG_RPCSEC_GSS_KRB5 is not set
1033# CONFIG_RPCSEC_GSS_SPKM3 is not set 784# CONFIG_RPCSEC_GSS_SPKM3 is not set
1034# CONFIG_SMB_FS is not set 785# CONFIG_SMB_FS is not set
@@ -1036,7 +787,6 @@ CONFIG_SUNRPC=y
1036# CONFIG_NCP_FS is not set 787# CONFIG_NCP_FS is not set
1037# CONFIG_CODA_FS is not set 788# CONFIG_CODA_FS is not set
1038# CONFIG_AFS_FS is not set 789# CONFIG_AFS_FS is not set
1039# CONFIG_9P_FS is not set
1040 790
1041# 791#
1042# Partition Types 792# Partition Types
@@ -1052,10 +802,7 @@ CONFIG_MSDOS_PARTITION=y
1052# 802#
1053# Distributed Lock Manager 803# Distributed Lock Manager
1054# 804#
1055CONFIG_DLM=m 805# CONFIG_DLM is not set
1056CONFIG_DLM_TCP=y
1057# CONFIG_DLM_SCTP is not set
1058# CONFIG_DLM_DEBUG is not set
1059 806
1060# 807#
1061# Profiling support 808# Profiling support
@@ -1073,73 +820,26 @@ CONFIG_ENABLE_MUST_CHECK=y
1073# CONFIG_DEBUG_FS is not set 820# CONFIG_DEBUG_FS is not set
1074# CONFIG_HEADERS_CHECK is not set 821# CONFIG_HEADERS_CHECK is not set
1075# CONFIG_DEBUG_KERNEL is not set 822# CONFIG_DEBUG_KERNEL is not set
1076CONFIG_LOG_BUF_SHIFT=14
1077CONFIG_CROSSCOMPILE=y 823CONFIG_CROSSCOMPILE=y
1078CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73" 824CONFIG_CMDLINE="mem=32M console=ttyVR0,19200 ide0=0x170,0x376,73"
1079 825
1080# 826#
1081# Security options 827# Security options
1082# 828#
1083CONFIG_KEYS=y 829# CONFIG_KEYS is not set
1084CONFIG_KEYS_DEBUG_PROC_KEYS=y
1085# CONFIG_SECURITY is not set 830# CONFIG_SECURITY is not set
1086 831# CONFIG_CRYPTO is not set
1087#
1088# Cryptographic options
1089#
1090CONFIG_CRYPTO=y
1091CONFIG_CRYPTO_ALGAPI=y
1092CONFIG_CRYPTO_BLKCIPHER=m
1093CONFIG_CRYPTO_HASH=y
1094CONFIG_CRYPTO_MANAGER=y
1095CONFIG_CRYPTO_HMAC=y
1096CONFIG_CRYPTO_XCBC=m
1097CONFIG_CRYPTO_NULL=m
1098CONFIG_CRYPTO_MD4=m
1099CONFIG_CRYPTO_MD5=y
1100CONFIG_CRYPTO_SHA1=m
1101CONFIG_CRYPTO_SHA256=m
1102CONFIG_CRYPTO_SHA512=m
1103CONFIG_CRYPTO_WP512=m
1104CONFIG_CRYPTO_TGR192=m
1105CONFIG_CRYPTO_GF128MUL=m
1106CONFIG_CRYPTO_ECB=m
1107CONFIG_CRYPTO_CBC=m
1108CONFIG_CRYPTO_PCBC=m
1109CONFIG_CRYPTO_LRW=m
1110CONFIG_CRYPTO_DES=m
1111CONFIG_CRYPTO_FCRYPT=m
1112CONFIG_CRYPTO_BLOWFISH=m
1113CONFIG_CRYPTO_TWOFISH=m
1114CONFIG_CRYPTO_TWOFISH_COMMON=m
1115CONFIG_CRYPTO_SERPENT=m
1116CONFIG_CRYPTO_AES=m
1117CONFIG_CRYPTO_CAST5=m
1118CONFIG_CRYPTO_CAST6=m
1119CONFIG_CRYPTO_TEA=m
1120CONFIG_CRYPTO_ARC4=m
1121CONFIG_CRYPTO_KHAZAD=m
1122CONFIG_CRYPTO_ANUBIS=m
1123CONFIG_CRYPTO_DEFLATE=m
1124CONFIG_CRYPTO_MICHAEL_MIC=m
1125CONFIG_CRYPTO_CRC32C=m
1126CONFIG_CRYPTO_CAMELLIA=m
1127# CONFIG_CRYPTO_TEST is not set
1128
1129#
1130# Hardware crypto devices
1131#
1132 832
1133# 833#
1134# Library routines 834# Library routines
1135# 835#
1136CONFIG_BITREVERSE=y
1137# CONFIG_CRC_CCITT is not set 836# CONFIG_CRC_CCITT is not set
1138CONFIG_CRC16=m 837# CONFIG_CRC16 is not set
1139CONFIG_CRC32=y 838# CONFIG_CRC_ITU_T is not set
1140CONFIG_LIBCRC32C=m 839# CONFIG_CRC32 is not set
1141CONFIG_ZLIB_INFLATE=m 840# CONFIG_CRC7 is not set
1142CONFIG_ZLIB_DEFLATE=m 841# CONFIG_LIBCRC32C is not set
1143CONFIG_PLIST=y 842CONFIG_PLIST=y
1144CONFIG_HAS_IOMEM=y 843CONFIG_HAS_IOMEM=y
1145CONFIG_HAS_IOPORT=y 844CONFIG_HAS_IOPORT=y
845CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/rbhma4200_defconfig b/arch/mips/configs/rbhma4200_defconfig
index 9913980add21..9383a598094b 100644
--- a/arch/mips/configs/rbhma4200_defconfig
+++ b/arch/mips/configs/rbhma4200_defconfig
@@ -1,58 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21 3# Linux kernel version: 2.6.23-rc1
4# Wed May 9 23:44:19 2007 4# Thu Aug 2 22:55:57 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11# CONFIG_MIPS_MTX1 is not set 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_BOSPORUS is not set
13# CONFIG_MIPS_PB1000 is not set
14# CONFIG_MIPS_PB1100 is not set
15# CONFIG_MIPS_PB1500 is not set
16# CONFIG_MIPS_PB1550 is not set
17# CONFIG_MIPS_PB1200 is not set
18# CONFIG_MIPS_DB1000 is not set
19# CONFIG_MIPS_DB1100 is not set
20# CONFIG_MIPS_DB1500 is not set
21# CONFIG_MIPS_DB1550 is not set
22# CONFIG_MIPS_DB1200 is not set
23# CONFIG_MIPS_MIRAGE is not set
24# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
25# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
26# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
27# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
28# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
29# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
30# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
31# CONFIG_WR_PPMC is not set
32# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
33# CONFIG_MIPS_XXS1500 is not set 21# CONFIG_MARKEINS is not set
22# CONFIG_MACH_VR41XX is not set
34# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
35# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
36# CONFIG_MACH_VR41XX is not set 25# CONFIG_PMC_MSP is not set
37# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
38# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
39# CONFIG_MARKEINS is not set
40# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
41# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
42# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
43# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
44# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
45# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
46# CONFIG_SIBYTE_RHONE is not set
47# CONFIG_SIBYTE_CARMEL is not set
48# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
49# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
50# CONFIG_SIBYTE_CRHINE is not set
51# CONFIG_SIBYTE_CRHONE is not set
52# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
53# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
54CONFIG_TOSHIBA_RBTX4927=y 42CONFIG_TOSHIBA_RBTX4927=y
55# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
56# CONFIG_TOSHIBA_FPCIB0 is not set 45# CONFIG_TOSHIBA_FPCIB0 is not set
57CONFIG_RWSEM_GENERIC_SPINLOCK=y 46CONFIG_RWSEM_GENERIC_SPINLOCK=y
58# CONFIG_ARCH_HAS_ILOG2_U32 is not set 47# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -65,17 +54,20 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
65CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 54CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
66CONFIG_DMA_NONCOHERENT=y 55CONFIG_DMA_NONCOHERENT=y
67CONFIG_DMA_NEED_PCI_MAP_STATE=y 56CONFIG_DMA_NEED_PCI_MAP_STATE=y
68CONFIG_I8259=y 57# CONFIG_NO_IOPORT is not set
69CONFIG_CPU_BIG_ENDIAN=y 58CONFIG_CPU_BIG_ENDIAN=y
70# CONFIG_CPU_LITTLE_ENDIAN is not set 59# CONFIG_CPU_LITTLE_ENDIAN is not set
71CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 60CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
72CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 61CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
62CONFIG_IRQ_CPU=y
63CONFIG_IRQ_TXX9=y
73CONFIG_SWAP_IO_SPACE=y 64CONFIG_SWAP_IO_SPACE=y
74CONFIG_MIPS_L1_CACHE_SHIFT=5 65CONFIG_MIPS_L1_CACHE_SHIFT=5
75 66
76# 67#
77# CPU selection 68# CPU selection
78# 69#
70# CONFIG_CPU_LOONGSON2 is not set
79# CONFIG_CPU_MIPS32_R1 is not set 71# CONFIG_CPU_MIPS32_R1 is not set
80# CONFIG_CPU_MIPS32_R2 is not set 72# CONFIG_CPU_MIPS32_R2 is not set
81# CONFIG_CPU_MIPS64_R1 is not set 73# CONFIG_CPU_MIPS64_R1 is not set
@@ -114,22 +106,18 @@ CONFIG_CPU_HAS_PREFETCH=y
114CONFIG_MIPS_MT_DISABLED=y 106CONFIG_MIPS_MT_DISABLED=y
115# CONFIG_MIPS_MT_SMP is not set 107# CONFIG_MIPS_MT_SMP is not set
116# CONFIG_MIPS_MT_SMTC is not set 108# CONFIG_MIPS_MT_SMTC is not set
117# CONFIG_MIPS_VPE_LOADER is not set
118CONFIG_CPU_HAS_LLSC=y 109CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 110CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 111CONFIG_GENERIC_HARDIRQS=y
121CONFIG_GENERIC_IRQ_PROBE=y 112CONFIG_GENERIC_IRQ_PROBE=y
122CONFIG_ARCH_FLATMEM_ENABLE=y 113CONFIG_ARCH_FLATMEM_ENABLE=y
123CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y
125# CONFIG_DISCONTIGMEM_MANUAL is not set
126# CONFIG_SPARSEMEM_MANUAL is not set
127CONFIG_FLATMEM=y 114CONFIG_FLATMEM=y
128CONFIG_FLAT_NODE_MEM_MAP=y 115CONFIG_FLAT_NODE_MEM_MAP=y
129# CONFIG_SPARSEMEM_STATIC is not set 116# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4 117CONFIG_SPLIT_PTLOCK_CPUS=4
131# CONFIG_RESOURCES_64BIT is not set 118# CONFIG_RESOURCES_64BIT is not set
132CONFIG_ZONE_DMA_FLAG=0 119CONFIG_ZONE_DMA_FLAG=0
120CONFIG_VIRT_TO_BUS=y
133# CONFIG_HZ_48 is not set 121# CONFIG_HZ_48 is not set
134# CONFIG_HZ_100 is not set 122# CONFIG_HZ_100 is not set
135# CONFIG_HZ_128 is not set 123# CONFIG_HZ_128 is not set
@@ -142,31 +130,24 @@ CONFIG_HZ=250
142CONFIG_PREEMPT_NONE=y 130CONFIG_PREEMPT_NONE=y
143# CONFIG_PREEMPT_VOLUNTARY is not set 131# CONFIG_PREEMPT_VOLUNTARY is not set
144# CONFIG_PREEMPT is not set 132# CONFIG_PREEMPT is not set
145# CONFIG_KEXEC is not set 133# CONFIG_SECCOMP is not set
146CONFIG_LOCKDEP_SUPPORT=y 134CONFIG_LOCKDEP_SUPPORT=y
147CONFIG_STACKTRACE_SUPPORT=y 135CONFIG_STACKTRACE_SUPPORT=y
148CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 136CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
149 137
150# 138#
151# Code maturity level options 139# General setup
152# 140#
153CONFIG_EXPERIMENTAL=y 141# CONFIG_EXPERIMENTAL is not set
154CONFIG_BROKEN_ON_SMP=y 142CONFIG_BROKEN_ON_SMP=y
155CONFIG_INIT_ENV_ARG_LIMIT=32 143CONFIG_INIT_ENV_ARG_LIMIT=32
156
157#
158# General setup
159#
160CONFIG_LOCALVERSION="" 144CONFIG_LOCALVERSION=""
161CONFIG_LOCALVERSION_AUTO=y 145CONFIG_LOCALVERSION_AUTO=y
162CONFIG_SWAP=y 146CONFIG_SWAP=y
163CONFIG_SYSVIPC=y 147CONFIG_SYSVIPC=y
164# CONFIG_IPC_NS is not set
165CONFIG_SYSVIPC_SYSCTL=y 148CONFIG_SYSVIPC_SYSCTL=y
166# CONFIG_POSIX_MQUEUE is not set
167# CONFIG_BSD_PROCESS_ACCT is not set 149# CONFIG_BSD_PROCESS_ACCT is not set
168# CONFIG_TASKSTATS is not set 150# CONFIG_TASKSTATS is not set
169# CONFIG_UTS_NS is not set
170# CONFIG_AUDIT is not set 151# CONFIG_AUDIT is not set
171CONFIG_IKCONFIG=y 152CONFIG_IKCONFIG=y
172CONFIG_IKCONFIG_PROC=y 153CONFIG_IKCONFIG_PROC=y
@@ -175,7 +156,6 @@ CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 156# CONFIG_RELAY is not set
176CONFIG_BLK_DEV_INITRD=y 157CONFIG_BLK_DEV_INITRD=y
177CONFIG_INITRAMFS_SOURCE="" 158CONFIG_INITRAMFS_SOURCE=""
178CONFIG_CC_OPTIMIZE_FOR_SIZE=y
179CONFIG_SYSCTL=y 159CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 160CONFIG_EMBEDDED=y
181CONFIG_SYSCTL_SYSCALL=y 161CONFIG_SYSCTL_SYSCALL=y
@@ -187,7 +167,11 @@ CONFIG_BUG=y
187CONFIG_ELF_CORE=y 167CONFIG_ELF_CORE=y
188CONFIG_BASE_FULL=y 168CONFIG_BASE_FULL=y
189# CONFIG_FUTEX is not set 169# CONFIG_FUTEX is not set
170CONFIG_ANON_INODES=y
190# CONFIG_EPOLL is not set 171# CONFIG_EPOLL is not set
172CONFIG_SIGNALFD=y
173CONFIG_TIMERFD=y
174CONFIG_EVENTFD=y
191CONFIG_SHMEM=y 175CONFIG_SHMEM=y
192CONFIG_VM_EVENT_COUNTERS=y 176CONFIG_VM_EVENT_COUNTERS=y
193CONFIG_SLAB=y 177CONFIG_SLAB=y
@@ -195,19 +179,11 @@ CONFIG_SLAB=y
195# CONFIG_SLOB is not set 179# CONFIG_SLOB is not set
196# CONFIG_TINY_SHMEM is not set 180# CONFIG_TINY_SHMEM is not set
197CONFIG_BASE_SMALL=0 181CONFIG_BASE_SMALL=0
198
199#
200# Loadable module support
201#
202CONFIG_MODULES=y 182CONFIG_MODULES=y
203# CONFIG_MODULE_UNLOAD is not set 183# CONFIG_MODULE_UNLOAD is not set
204# CONFIG_MODVERSIONS is not set 184# CONFIG_MODVERSIONS is not set
205# CONFIG_MODULE_SRCVERSION_ALL is not set 185# CONFIG_MODULE_SRCVERSION_ALL is not set
206CONFIG_KMOD=y 186CONFIG_KMOD=y
207
208#
209# Block layer
210#
211CONFIG_BLOCK=y 187CONFIG_BLOCK=y
212# CONFIG_LBD is not set 188# CONFIG_LBD is not set
213# CONFIG_BLK_DEV_IO_TRACE is not set 189# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -273,7 +249,6 @@ CONFIG_IP_PNP=y
273# CONFIG_NET_IPIP is not set 249# CONFIG_NET_IPIP is not set
274# CONFIG_NET_IPGRE is not set 250# CONFIG_NET_IPGRE is not set
275# CONFIG_IP_MROUTE is not set 251# CONFIG_IP_MROUTE is not set
276# CONFIG_ARPD is not set
277# CONFIG_SYN_COOKIES is not set 252# CONFIG_SYN_COOKIES is not set
278# CONFIG_INET_AH is not set 253# CONFIG_INET_AH is not set
279# CONFIG_INET_ESP is not set 254# CONFIG_INET_ESP is not set
@@ -288,38 +263,17 @@ CONFIG_INET_TCP_DIAG=y
288# CONFIG_TCP_CONG_ADVANCED is not set 263# CONFIG_TCP_CONG_ADVANCED is not set
289CONFIG_TCP_CONG_CUBIC=y 264CONFIG_TCP_CONG_CUBIC=y
290CONFIG_DEFAULT_TCP_CONG="cubic" 265CONFIG_DEFAULT_TCP_CONG="cubic"
291# CONFIG_TCP_MD5SIG is not set
292# CONFIG_IPV6 is not set 266# CONFIG_IPV6 is not set
293# CONFIG_INET6_XFRM_TUNNEL is not set 267# CONFIG_INET6_XFRM_TUNNEL is not set
294# CONFIG_INET6_TUNNEL is not set 268# CONFIG_INET6_TUNNEL is not set
295# CONFIG_NETWORK_SECMARK is not set 269# CONFIG_NETWORK_SECMARK is not set
296# CONFIG_NETFILTER is not set 270# CONFIG_NETFILTER is not set
297
298#
299# DCCP Configuration (EXPERIMENTAL)
300#
301# CONFIG_IP_DCCP is not set
302
303#
304# SCTP Configuration (EXPERIMENTAL)
305#
306# CONFIG_IP_SCTP is not set
307
308#
309# TIPC Configuration (EXPERIMENTAL)
310#
311# CONFIG_TIPC is not set
312# CONFIG_ATM is not set
313# CONFIG_BRIDGE is not set 271# CONFIG_BRIDGE is not set
314# CONFIG_VLAN_8021Q is not set 272# CONFIG_VLAN_8021Q is not set
315# CONFIG_DECNET is not set 273# CONFIG_DECNET is not set
316# CONFIG_LLC2 is not set 274# CONFIG_LLC2 is not set
317# CONFIG_IPX is not set 275# CONFIG_IPX is not set
318# CONFIG_ATALK is not set 276# CONFIG_ATALK is not set
319# CONFIG_X25 is not set
320# CONFIG_LAPB is not set
321# CONFIG_ECONET is not set
322# CONFIG_WAN_ROUTER is not set
323 277
324# 278#
325# QoS and/or fair queueing 279# QoS and/or fair queueing
@@ -333,14 +287,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_HAMRADIO is not set 287# CONFIG_HAMRADIO is not set
334# CONFIG_IRDA is not set 288# CONFIG_IRDA is not set
335# CONFIG_BT is not set 289# CONFIG_BT is not set
336# CONFIG_AF_RXRPC is not set
337 290
338# 291#
339# Wireless 292# Wireless
340# 293#
341# CONFIG_CFG80211 is not set 294# CONFIG_CFG80211 is not set
342# CONFIG_WIRELESS_EXT is not set 295# CONFIG_WIRELESS_EXT is not set
343# CONFIG_MAC80211 is not set
344# CONFIG_IEEE80211 is not set 296# CONFIG_IEEE80211 is not set
345# CONFIG_RFKILL is not set 297# CONFIG_RFKILL is not set
346 298
@@ -354,30 +306,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
354CONFIG_STANDALONE=y 306CONFIG_STANDALONE=y
355CONFIG_PREVENT_FIRMWARE_BUILD=y 307CONFIG_PREVENT_FIRMWARE_BUILD=y
356# CONFIG_SYS_HYPERVISOR is not set 308# CONFIG_SYS_HYPERVISOR is not set
357
358#
359# Connector - unified userspace <-> kernelspace linker
360#
361# CONFIG_CONNECTOR is not set 309# CONFIG_CONNECTOR is not set
362# CONFIG_MTD is not set 310# CONFIG_MTD is not set
363
364#
365# Parallel port support
366#
367# CONFIG_PARPORT is not set 311# CONFIG_PARPORT is not set
368 312CONFIG_BLK_DEV=y
369#
370# Plug and Play support
371#
372# CONFIG_PNPACPI is not set
373
374#
375# Block devices
376#
377# CONFIG_BLK_CPQ_DA is not set 313# CONFIG_BLK_CPQ_DA is not set
378# CONFIG_BLK_CPQ_CISS_DA is not set 314# CONFIG_BLK_CPQ_CISS_DA is not set
379# CONFIG_BLK_DEV_DAC960 is not set 315# CONFIG_BLK_DEV_DAC960 is not set
380# CONFIG_BLK_DEV_UMEM is not set
381# CONFIG_BLK_DEV_COW_COMMON is not set 316# CONFIG_BLK_DEV_COW_COMMON is not set
382CONFIG_BLK_DEV_LOOP=y 317CONFIG_BLK_DEV_LOOP=y
383# CONFIG_BLK_DEV_CRYPTOLOOP is not set 318# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -389,18 +324,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
389CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 324CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
390# CONFIG_CDROM_PKTCDVD is not set 325# CONFIG_CDROM_PKTCDVD is not set
391# CONFIG_ATA_OVER_ETH is not set 326# CONFIG_ATA_OVER_ETH is not set
392 327# CONFIG_MISC_DEVICES is not set
393#
394# Misc devices
395#
396# CONFIG_PHANTOM is not set
397# CONFIG_SGI_IOC4 is not set
398# CONFIG_TIFM_CORE is not set
399# CONFIG_BLINK is not set
400
401#
402# ATA/ATAPI/MFM/RLL support
403#
404# CONFIG_IDE is not set 328# CONFIG_IDE is not set
405 329
406# 330#
@@ -408,16 +332,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
408# 332#
409# CONFIG_RAID_ATTRS is not set 333# CONFIG_RAID_ATTRS is not set
410# CONFIG_SCSI is not set 334# CONFIG_SCSI is not set
335# CONFIG_SCSI_DMA is not set
411# CONFIG_SCSI_NETLINK is not set 336# CONFIG_SCSI_NETLINK is not set
412
413#
414# Serial ATA (prod) and Parallel ATA (experimental) drivers
415#
416# CONFIG_ATA is not set 337# CONFIG_ATA is not set
417
418#
419# Multi-device support (RAID and LVM)
420#
421# CONFIG_MD is not set 338# CONFIG_MD is not set
422 339
423# 340#
@@ -428,83 +345,34 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
428# 345#
429# IEEE 1394 (FireWire) support 346# IEEE 1394 (FireWire) support
430# 347#
431# CONFIG_IEEE1394 is not set
432 348
433# 349#
434# I2O device support 350# An alternative FireWire stack is available with EXPERIMENTAL=y
435# 351#
352# CONFIG_IEEE1394 is not set
436# CONFIG_I2O is not set 353# CONFIG_I2O is not set
437
438#
439# Network device support
440#
441CONFIG_NETDEVICES=y 354CONFIG_NETDEVICES=y
355# CONFIG_NETDEVICES_MULTIQUEUE is not set
442# CONFIG_DUMMY is not set 356# CONFIG_DUMMY is not set
443# CONFIG_BONDING is not set 357# CONFIG_BONDING is not set
444# CONFIG_EQUALIZER is not set 358# CONFIG_EQUALIZER is not set
445# CONFIG_TUN is not set 359# CONFIG_TUN is not set
446
447#
448# ARCnet devices
449#
450# CONFIG_ARCNET is not set 360# CONFIG_ARCNET is not set
451
452#
453# PHY device support
454#
455# CONFIG_PHYLIB is not set 361# CONFIG_PHYLIB is not set
456
457#
458# Ethernet (10 or 100Mbit)
459#
460CONFIG_NET_ETHERNET=y 362CONFIG_NET_ETHERNET=y
461# CONFIG_MII is not set 363# CONFIG_MII is not set
364# CONFIG_AX88796 is not set
462# CONFIG_HAPPYMEAL is not set 365# CONFIG_HAPPYMEAL is not set
463# CONFIG_SUNGEM is not set 366# CONFIG_SUNGEM is not set
464# CONFIG_CASSINI is not set 367# CONFIG_CASSINI is not set
465# CONFIG_NET_VENDOR_3COM is not set 368# CONFIG_NET_VENDOR_3COM is not set
466# CONFIG_DM9000 is not set 369# CONFIG_DM9000 is not set
467
468#
469# Tulip family network device support
470#
471# CONFIG_NET_TULIP is not set 370# CONFIG_NET_TULIP is not set
472# CONFIG_HP100 is not set 371# CONFIG_HP100 is not set
473CONFIG_NE2000=y 372CONFIG_NE2000=y
474# CONFIG_NET_PCI is not set 373# CONFIG_NET_PCI is not set
475 374# CONFIG_NETDEV_1000 is not set
476# 375# CONFIG_NETDEV_10000 is not set
477# Ethernet (1000 Mbit)
478#
479# CONFIG_ACENIC is not set
480# CONFIG_DL2K is not set
481# CONFIG_E1000 is not set
482# CONFIG_NS83820 is not set
483# CONFIG_HAMACHI is not set
484# CONFIG_YELLOWFIN is not set
485# CONFIG_R8169 is not set
486# CONFIG_SIS190 is not set
487# CONFIG_SKGE is not set
488# CONFIG_SKY2 is not set
489# CONFIG_SK98LIN is not set
490# CONFIG_TIGON3 is not set
491# CONFIG_BNX2 is not set
492# CONFIG_QLA3XXX is not set
493# CONFIG_ATL1 is not set
494
495#
496# Ethernet (10000 Mbit)
497#
498# CONFIG_CHELSIO_T1 is not set
499# CONFIG_CHELSIO_T3 is not set
500# CONFIG_IXGB is not set
501# CONFIG_S2IO is not set
502# CONFIG_MYRI10GE is not set
503# CONFIG_NETXEN_NIC is not set
504
505#
506# Token Ring devices
507#
508# CONFIG_TR is not set 376# CONFIG_TR is not set
509 377
510# 378#
@@ -512,28 +380,13 @@ CONFIG_NE2000=y
512# 380#
513# CONFIG_WLAN_PRE80211 is not set 381# CONFIG_WLAN_PRE80211 is not set
514# CONFIG_WLAN_80211 is not set 382# CONFIG_WLAN_80211 is not set
515
516#
517# Wan interfaces
518#
519# CONFIG_WAN is not set 383# CONFIG_WAN is not set
520# CONFIG_FDDI is not set 384# CONFIG_FDDI is not set
521# CONFIG_HIPPI is not set
522# CONFIG_PPP is not set 385# CONFIG_PPP is not set
523# CONFIG_SLIP is not set 386# CONFIG_SLIP is not set
524# CONFIG_SHAPER is not set
525# CONFIG_NETCONSOLE is not set
526# CONFIG_NETPOLL is not set 387# CONFIG_NETPOLL is not set
527# CONFIG_NET_POLL_CONTROLLER is not set 388# CONFIG_NET_POLL_CONTROLLER is not set
528
529#
530# ISDN subsystem
531#
532# CONFIG_ISDN is not set 389# CONFIG_ISDN is not set
533
534#
535# Telephony Support
536#
537# CONFIG_PHONE is not set 390# CONFIG_PHONE is not set
538 391
539# 392#
@@ -577,29 +430,14 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y
577CONFIG_UNIX98_PTYS=y 430CONFIG_UNIX98_PTYS=y
578CONFIG_LEGACY_PTYS=y 431CONFIG_LEGACY_PTYS=y
579CONFIG_LEGACY_PTY_COUNT=256 432CONFIG_LEGACY_PTY_COUNT=256
580
581#
582# IPMI
583#
584# CONFIG_IPMI_HANDLER is not set 433# CONFIG_IPMI_HANDLER is not set
585
586#
587# Watchdog Cards
588#
589# CONFIG_WATCHDOG is not set 434# CONFIG_WATCHDOG is not set
590# CONFIG_HW_RANDOM is not set 435# CONFIG_HW_RANDOM is not set
591# CONFIG_RTC is not set 436# CONFIG_RTC is not set
592# CONFIG_GEN_RTC is not set
593# CONFIG_DTLK is not set
594# CONFIG_R3964 is not set 437# CONFIG_R3964 is not set
595# CONFIG_APPLICOM is not set 438# CONFIG_APPLICOM is not set
596# CONFIG_DRM is not set 439# CONFIG_DRM is not set
597# CONFIG_RAW_DRIVER is not set 440# CONFIG_RAW_DRIVER is not set
598
599#
600# TPM devices
601#
602# CONFIG_TCG_TPM is not set
603CONFIG_DEVPORT=y 441CONFIG_DEVPORT=y
604# CONFIG_I2C is not set 442# CONFIG_I2C is not set
605 443
@@ -608,11 +446,8 @@ CONFIG_DEVPORT=y
608# 446#
609# CONFIG_SPI is not set 447# CONFIG_SPI is not set
610# CONFIG_SPI_MASTER is not set 448# CONFIG_SPI_MASTER is not set
611
612#
613# Dallas's 1-wire bus
614#
615# CONFIG_W1 is not set 449# CONFIG_W1 is not set
450# CONFIG_POWER_SUPPLY is not set
616# CONFIG_HWMON is not set 451# CONFIG_HWMON is not set
617 452
618# 453#
@@ -624,11 +459,8 @@ CONFIG_DEVPORT=y
624# Multimedia devices 459# Multimedia devices
625# 460#
626# CONFIG_VIDEO_DEV is not set 461# CONFIG_VIDEO_DEV is not set
627 462# CONFIG_DVB_CORE is not set
628# 463# CONFIG_DAB is not set
629# Digital Video Broadcasting Devices
630#
631# CONFIG_DVB is not set
632 464
633# 465#
634# Graphics support 466# Graphics support
@@ -640,56 +472,17 @@ CONFIG_DEVPORT=y
640# 472#
641# CONFIG_DISPLAY_SUPPORT is not set 473# CONFIG_DISPLAY_SUPPORT is not set
642# CONFIG_VGASTATE is not set 474# CONFIG_VGASTATE is not set
475# CONFIG_VIDEO_OUTPUT_CONTROL is not set
643# CONFIG_FB is not set 476# CONFIG_FB is not set
644 477
645# 478#
646# Sound 479# Sound
647# 480#
648# CONFIG_SOUND is not set 481# CONFIG_SOUND is not set
649 482# CONFIG_USB_SUPPORT is not set
650#
651# USB support
652#
653CONFIG_USB_ARCH_HAS_HCD=y
654CONFIG_USB_ARCH_HAS_OHCI=y
655CONFIG_USB_ARCH_HAS_EHCI=y
656# CONFIG_USB is not set
657
658#
659# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
660#
661
662#
663# USB Gadget Support
664#
665# CONFIG_USB_GADGET is not set
666# CONFIG_MMC is not set 483# CONFIG_MMC is not set
667
668#
669# LED devices
670#
671# CONFIG_NEW_LEDS is not set 484# CONFIG_NEW_LEDS is not set
672
673#
674# LED drivers
675#
676
677#
678# LED Triggers
679#
680
681#
682# InfiniBand support
683#
684# CONFIG_INFINIBAND is not set 485# CONFIG_INFINIBAND is not set
685
686#
687# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
688#
689
690#
691# Real Time Clock
692#
693CONFIG_RTC_LIB=y 486CONFIG_RTC_LIB=y
694CONFIG_RTC_CLASS=y 487CONFIG_RTC_CLASS=y
695CONFIG_RTC_HCTOSYS=y 488CONFIG_RTC_HCTOSYS=y
@@ -706,19 +499,18 @@ CONFIG_RTC_INTF_DEV=y
706# CONFIG_RTC_DRV_TEST is not set 499# CONFIG_RTC_DRV_TEST is not set
707 500
708# 501#
709# I2C RTC drivers
710#
711
712#
713# SPI RTC drivers 502# SPI RTC drivers
714# 503#
715 504
716# 505#
717# Platform RTC drivers 506# Platform RTC drivers
718# 507#
508# CONFIG_RTC_DRV_CMOS is not set
719# CONFIG_RTC_DRV_DS1553 is not set 509# CONFIG_RTC_DRV_DS1553 is not set
510# CONFIG_RTC_DRV_STK17TA8 is not set
720CONFIG_RTC_DRV_DS1742=y 511CONFIG_RTC_DRV_DS1742=y
721# CONFIG_RTC_DRV_M48T86 is not set 512# CONFIG_RTC_DRV_M48T86 is not set
513# CONFIG_RTC_DRV_M48T59 is not set
722# CONFIG_RTC_DRV_V3020 is not set 514# CONFIG_RTC_DRV_V3020 is not set
723 515
724# 516#
@@ -739,24 +531,19 @@ CONFIG_RTC_DRV_DS1742=y
739# 531#
740 532
741# 533#
742# Auxiliary Display support 534# Userspace I/O
743#
744
745#
746# Virtualization
747# 535#
536# CONFIG_UIO is not set
748 537
749# 538#
750# File systems 539# File systems
751# 540#
752# CONFIG_EXT2_FS is not set 541# CONFIG_EXT2_FS is not set
753# CONFIG_EXT3_FS is not set 542# CONFIG_EXT3_FS is not set
754# CONFIG_EXT4DEV_FS is not set
755# CONFIG_REISERFS_FS is not set 543# CONFIG_REISERFS_FS is not set
756# CONFIG_JFS_FS is not set 544# CONFIG_JFS_FS is not set
757CONFIG_FS_POSIX_ACL=y 545CONFIG_FS_POSIX_ACL=y
758# CONFIG_XFS_FS is not set 546# CONFIG_XFS_FS is not set
759# CONFIG_GFS2_FS is not set
760# CONFIG_OCFS2_FS is not set 547# CONFIG_OCFS2_FS is not set
761# CONFIG_MINIX_FS is not set 548# CONFIG_MINIX_FS is not set
762# CONFIG_ROMFS_FS is not set 549# CONFIG_ROMFS_FS is not set
@@ -793,18 +580,11 @@ CONFIG_TMPFS=y
793CONFIG_TMPFS_POSIX_ACL=y 580CONFIG_TMPFS_POSIX_ACL=y
794# CONFIG_HUGETLB_PAGE is not set 581# CONFIG_HUGETLB_PAGE is not set
795CONFIG_RAMFS=y 582CONFIG_RAMFS=y
796# CONFIG_CONFIGFS_FS is not set
797 583
798# 584#
799# Miscellaneous filesystems 585# Miscellaneous filesystems
800# 586#
801# CONFIG_ADFS_FS is not set
802# CONFIG_AFFS_FS is not set
803# CONFIG_HFS_FS is not set
804# CONFIG_HFSPLUS_FS is not set 587# CONFIG_HFSPLUS_FS is not set
805# CONFIG_BEFS_FS is not set
806# CONFIG_BFS_FS is not set
807# CONFIG_EFS_FS is not set
808# CONFIG_CRAMFS is not set 588# CONFIG_CRAMFS is not set
809# CONFIG_VXFS_FS is not set 589# CONFIG_VXFS_FS is not set
810# CONFIG_HPFS_FS is not set 590# CONFIG_HPFS_FS is not set
@@ -818,7 +598,6 @@ CONFIG_RAMFS=y
818CONFIG_NFS_FS=y 598CONFIG_NFS_FS=y
819CONFIG_NFS_V3=y 599CONFIG_NFS_V3=y
820# CONFIG_NFS_V3_ACL is not set 600# CONFIG_NFS_V3_ACL is not set
821# CONFIG_NFS_V4 is not set
822# CONFIG_NFS_DIRECTIO is not set 601# CONFIG_NFS_DIRECTIO is not set
823# CONFIG_NFSD is not set 602# CONFIG_NFSD is not set
824CONFIG_ROOT_NFS=y 603CONFIG_ROOT_NFS=y
@@ -826,15 +605,10 @@ CONFIG_LOCKD=y
826CONFIG_LOCKD_V4=y 605CONFIG_LOCKD_V4=y
827CONFIG_NFS_COMMON=y 606CONFIG_NFS_COMMON=y
828CONFIG_SUNRPC=y 607CONFIG_SUNRPC=y
829# CONFIG_SUNRPC_BIND34 is not set
830# CONFIG_RPCSEC_GSS_KRB5 is not set
831# CONFIG_RPCSEC_GSS_SPKM3 is not set
832# CONFIG_SMB_FS is not set 608# CONFIG_SMB_FS is not set
833# CONFIG_CIFS is not set 609# CONFIG_CIFS is not set
834# CONFIG_NCP_FS is not set 610# CONFIG_NCP_FS is not set
835# CONFIG_CODA_FS is not set 611# CONFIG_CODA_FS is not set
836# CONFIG_AFS_FS is not set
837# CONFIG_9P_FS is not set
838 612
839# 613#
840# Partition Types 614# Partition Types
@@ -848,16 +622,6 @@ CONFIG_MSDOS_PARTITION=y
848# CONFIG_NLS is not set 622# CONFIG_NLS is not set
849 623
850# 624#
851# Distributed Lock Manager
852#
853# CONFIG_DLM is not set
854
855#
856# Profiling support
857#
858# CONFIG_PROFILING is not set
859
860#
861# Kernel hacking 625# Kernel hacking
862# 626#
863CONFIG_TRACE_IRQFLAGS_SUPPORT=y 627CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -877,10 +641,6 @@ CONFIG_SYS_SUPPORTS_KGDB=y
877# 641#
878# CONFIG_KEYS is not set 642# CONFIG_KEYS is not set
879# CONFIG_SECURITY is not set 643# CONFIG_SECURITY is not set
880
881#
882# Cryptographic options
883#
884# CONFIG_CRYPTO is not set 644# CONFIG_CRYPTO is not set
885 645
886# 646#
@@ -889,7 +649,9 @@ CONFIG_SYS_SUPPORTS_KGDB=y
889CONFIG_BITREVERSE=y 649CONFIG_BITREVERSE=y
890# CONFIG_CRC_CCITT is not set 650# CONFIG_CRC_CCITT is not set
891# CONFIG_CRC16 is not set 651# CONFIG_CRC16 is not set
652# CONFIG_CRC_ITU_T is not set
892CONFIG_CRC32=y 653CONFIG_CRC32=y
654# CONFIG_CRC7 is not set
893# CONFIG_LIBCRC32C is not set 655# CONFIG_LIBCRC32C is not set
894CONFIG_HAS_IOMEM=y 656CONFIG_HAS_IOMEM=y
895CONFIG_HAS_IOPORT=y 657CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig
index 40453cd7c70e..d1b56cc0fd7c 100644
--- a/arch/mips/configs/rbhma4500_defconfig
+++ b/arch/mips/configs/rbhma4500_defconfig
@@ -1,48 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc5 3# Linux kernel version: 2.6.23-rc1
4# Fri Jun 22 21:39:45 2007 4# Thu Aug 2 22:59:53 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y
12# CONFIG_LEMOTE_FULONG is not set
13# CONFIG_MACH_ALCHEMY is not set 11# CONFIG_MACH_ALCHEMY is not set
14# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
15# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
16# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
17# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
18# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
19# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
20# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
21# CONFIG_WR_PPMC is not set
22# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
21# CONFIG_MARKEINS is not set
22# CONFIG_MACH_VR41XX is not set
23# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
24# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
25# CONFIG_MACH_VR41XX is not set
26# CONFIG_PMC_MSP is not set 25# CONFIG_PMC_MSP is not set
27# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
28# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
29# CONFIG_MARKEINS is not set
30# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
31# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
32# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
33# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
34# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
35# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
36# CONFIG_SIBYTE_RHONE is not set
37# CONFIG_SIBYTE_CARMEL is not set
38# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
39# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
40# CONFIG_SIBYTE_CRHINE is not set
41# CONFIG_SIBYTE_CRHONE is not set
42# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
43# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
44# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
45CONFIG_TOSHIBA_RBTX4938=y 43CONFIG_TOSHIBA_RBTX4938=y
44# CONFIG_WR_PPMC is not set
46 45
47# 46#
48# Multiplex Pin Select 47# Multiplex Pin Select
@@ -61,17 +60,16 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
61CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 60CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
62CONFIG_DMA_NONCOHERENT=y 61CONFIG_DMA_NONCOHERENT=y
63CONFIG_DMA_NEED_PCI_MAP_STATE=y 62CONFIG_DMA_NEED_PCI_MAP_STATE=y
64CONFIG_GENERIC_ISA_DMA=y
65CONFIG_I8259=y
66# CONFIG_NO_IOPORT is not set 63# CONFIG_NO_IOPORT is not set
67CONFIG_GENERIC_GPIO=y 64CONFIG_GENERIC_GPIO=y
68# CONFIG_CPU_BIG_ENDIAN is not set 65# CONFIG_CPU_BIG_ENDIAN is not set
69CONFIG_CPU_LITTLE_ENDIAN=y 66CONFIG_CPU_LITTLE_ENDIAN=y
70CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y 67CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
71CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 68CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
69CONFIG_IRQ_CPU=y
70CONFIG_IRQ_TXX9=y
72CONFIG_SWAP_IO_SPACE=y 71CONFIG_SWAP_IO_SPACE=y
73CONFIG_MIPS_L1_CACHE_SHIFT=5 72CONFIG_MIPS_L1_CACHE_SHIFT=5
74CONFIG_HAVE_STD_PC_SERIAL_PORT=y
75 73
76# 74#
77# CPU selection 75# CPU selection
@@ -114,22 +112,18 @@ CONFIG_CPU_HAS_PREFETCH=y
114CONFIG_MIPS_MT_DISABLED=y 112CONFIG_MIPS_MT_DISABLED=y
115# CONFIG_MIPS_MT_SMP is not set 113# CONFIG_MIPS_MT_SMP is not set
116# CONFIG_MIPS_MT_SMTC is not set 114# CONFIG_MIPS_MT_SMTC is not set
117# CONFIG_MIPS_VPE_LOADER is not set
118CONFIG_CPU_HAS_LLSC=y 115CONFIG_CPU_HAS_LLSC=y
119CONFIG_CPU_HAS_SYNC=y 116CONFIG_CPU_HAS_SYNC=y
120CONFIG_GENERIC_HARDIRQS=y 117CONFIG_GENERIC_HARDIRQS=y
121CONFIG_GENERIC_IRQ_PROBE=y 118CONFIG_GENERIC_IRQ_PROBE=y
122CONFIG_ARCH_FLATMEM_ENABLE=y 119CONFIG_ARCH_FLATMEM_ENABLE=y
123CONFIG_SELECT_MEMORY_MODEL=y
124CONFIG_FLATMEM_MANUAL=y
125# CONFIG_DISCONTIGMEM_MANUAL is not set
126# CONFIG_SPARSEMEM_MANUAL is not set
127CONFIG_FLATMEM=y 120CONFIG_FLATMEM=y
128CONFIG_FLAT_NODE_MEM_MAP=y 121CONFIG_FLAT_NODE_MEM_MAP=y
129# CONFIG_SPARSEMEM_STATIC is not set 122# CONFIG_SPARSEMEM_STATIC is not set
130CONFIG_SPLIT_PTLOCK_CPUS=4 123CONFIG_SPLIT_PTLOCK_CPUS=4
131# CONFIG_RESOURCES_64BIT is not set 124# CONFIG_RESOURCES_64BIT is not set
132CONFIG_ZONE_DMA_FLAG=1 125CONFIG_ZONE_DMA_FLAG=0
126CONFIG_VIRT_TO_BUS=y
133# CONFIG_HZ_48 is not set 127# CONFIG_HZ_48 is not set
134# CONFIG_HZ_100 is not set 128# CONFIG_HZ_100 is not set
135# CONFIG_HZ_128 is not set 129# CONFIG_HZ_128 is not set
@@ -142,31 +136,24 @@ CONFIG_HZ=250
142CONFIG_PREEMPT_NONE=y 136CONFIG_PREEMPT_NONE=y
143# CONFIG_PREEMPT_VOLUNTARY is not set 137# CONFIG_PREEMPT_VOLUNTARY is not set
144# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
145# CONFIG_KEXEC is not set 139# CONFIG_SECCOMP is not set
146CONFIG_LOCKDEP_SUPPORT=y 140CONFIG_LOCKDEP_SUPPORT=y
147CONFIG_STACKTRACE_SUPPORT=y 141CONFIG_STACKTRACE_SUPPORT=y
148CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 142CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
149 143
150# 144#
151# Code maturity level options 145# General setup
152# 146#
153CONFIG_EXPERIMENTAL=y 147# CONFIG_EXPERIMENTAL is not set
154CONFIG_BROKEN_ON_SMP=y 148CONFIG_BROKEN_ON_SMP=y
155CONFIG_INIT_ENV_ARG_LIMIT=32 149CONFIG_INIT_ENV_ARG_LIMIT=32
156
157#
158# General setup
159#
160CONFIG_LOCALVERSION="" 150CONFIG_LOCALVERSION=""
161CONFIG_LOCALVERSION_AUTO=y 151CONFIG_LOCALVERSION_AUTO=y
162CONFIG_SWAP=y 152CONFIG_SWAP=y
163CONFIG_SYSVIPC=y 153CONFIG_SYSVIPC=y
164# CONFIG_IPC_NS is not set
165CONFIG_SYSVIPC_SYSCTL=y 154CONFIG_SYSVIPC_SYSCTL=y
166# CONFIG_POSIX_MQUEUE is not set
167# CONFIG_BSD_PROCESS_ACCT is not set 155# CONFIG_BSD_PROCESS_ACCT is not set
168# CONFIG_TASKSTATS is not set 156# CONFIG_TASKSTATS is not set
169# CONFIG_UTS_NS is not set
170# CONFIG_AUDIT is not set 157# CONFIG_AUDIT is not set
171CONFIG_IKCONFIG=y 158CONFIG_IKCONFIG=y
172CONFIG_IKCONFIG_PROC=y 159CONFIG_IKCONFIG_PROC=y
@@ -175,7 +162,6 @@ CONFIG_SYSFS_DEPRECATED=y
175# CONFIG_RELAY is not set 162# CONFIG_RELAY is not set
176CONFIG_BLK_DEV_INITRD=y 163CONFIG_BLK_DEV_INITRD=y
177CONFIG_INITRAMFS_SOURCE="" 164CONFIG_INITRAMFS_SOURCE=""
178CONFIG_CC_OPTIMIZE_FOR_SIZE=y
179CONFIG_SYSCTL=y 165CONFIG_SYSCTL=y
180CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
181CONFIG_SYSCTL_SYSCALL=y 167CONFIG_SYSCTL_SYSCALL=y
@@ -199,19 +185,11 @@ CONFIG_SLAB=y
199# CONFIG_SLOB is not set 185# CONFIG_SLOB is not set
200# CONFIG_TINY_SHMEM is not set 186# CONFIG_TINY_SHMEM is not set
201CONFIG_BASE_SMALL=0 187CONFIG_BASE_SMALL=0
202
203#
204# Loadable module support
205#
206CONFIG_MODULES=y 188CONFIG_MODULES=y
207# CONFIG_MODULE_UNLOAD is not set 189# CONFIG_MODULE_UNLOAD is not set
208# CONFIG_MODVERSIONS is not set 190# CONFIG_MODVERSIONS is not set
209# CONFIG_MODULE_SRCVERSION_ALL is not set 191# CONFIG_MODULE_SRCVERSION_ALL is not set
210CONFIG_KMOD=y 192CONFIG_KMOD=y
211
212#
213# Block layer
214#
215CONFIG_BLOCK=y 193CONFIG_BLOCK=y
216# CONFIG_LBD is not set 194# CONFIG_LBD is not set
217# CONFIG_BLK_DEV_IO_TRACE is not set 195# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -277,7 +255,6 @@ CONFIG_IP_PNP=y
277# CONFIG_NET_IPIP is not set 255# CONFIG_NET_IPIP is not set
278# CONFIG_NET_IPGRE is not set 256# CONFIG_NET_IPGRE is not set
279# CONFIG_IP_MROUTE is not set 257# CONFIG_IP_MROUTE is not set
280# CONFIG_ARPD is not set
281# CONFIG_SYN_COOKIES is not set 258# CONFIG_SYN_COOKIES is not set
282# CONFIG_INET_AH is not set 259# CONFIG_INET_AH is not set
283# CONFIG_INET_ESP is not set 260# CONFIG_INET_ESP is not set
@@ -292,26 +269,17 @@ CONFIG_INET_TCP_DIAG=y
292# CONFIG_TCP_CONG_ADVANCED is not set 269# CONFIG_TCP_CONG_ADVANCED is not set
293CONFIG_TCP_CONG_CUBIC=y 270CONFIG_TCP_CONG_CUBIC=y
294CONFIG_DEFAULT_TCP_CONG="cubic" 271CONFIG_DEFAULT_TCP_CONG="cubic"
295# CONFIG_TCP_MD5SIG is not set
296# CONFIG_IPV6 is not set 272# CONFIG_IPV6 is not set
297# CONFIG_INET6_XFRM_TUNNEL is not set 273# CONFIG_INET6_XFRM_TUNNEL is not set
298# CONFIG_INET6_TUNNEL is not set 274# CONFIG_INET6_TUNNEL is not set
299# CONFIG_NETWORK_SECMARK is not set 275# CONFIG_NETWORK_SECMARK is not set
300# CONFIG_NETFILTER is not set 276# CONFIG_NETFILTER is not set
301# CONFIG_IP_DCCP is not set
302# CONFIG_IP_SCTP is not set
303# CONFIG_TIPC is not set
304# CONFIG_ATM is not set
305# CONFIG_BRIDGE is not set 277# CONFIG_BRIDGE is not set
306# CONFIG_VLAN_8021Q is not set 278# CONFIG_VLAN_8021Q is not set
307# CONFIG_DECNET is not set 279# CONFIG_DECNET is not set
308# CONFIG_LLC2 is not set 280# CONFIG_LLC2 is not set
309# CONFIG_IPX is not set 281# CONFIG_IPX is not set
310# CONFIG_ATALK is not set 282# CONFIG_ATALK is not set
311# CONFIG_X25 is not set
312# CONFIG_LAPB is not set
313# CONFIG_ECONET is not set
314# CONFIG_WAN_ROUTER is not set
315 283
316# 284#
317# QoS and/or fair queueing 285# QoS and/or fair queueing
@@ -325,14 +293,12 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_HAMRADIO is not set 293# CONFIG_HAMRADIO is not set
326# CONFIG_IRDA is not set 294# CONFIG_IRDA is not set
327# CONFIG_BT is not set 295# CONFIG_BT is not set
328# CONFIG_AF_RXRPC is not set
329 296
330# 297#
331# Wireless 298# Wireless
332# 299#
333# CONFIG_CFG80211 is not set 300# CONFIG_CFG80211 is not set
334# CONFIG_WIRELESS_EXT is not set 301# CONFIG_WIRELESS_EXT is not set
335# CONFIG_MAC80211 is not set
336# CONFIG_IEEE80211 is not set 302# CONFIG_IEEE80211 is not set
337# CONFIG_RFKILL is not set 303# CONFIG_RFKILL is not set
338 304
@@ -346,30 +312,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
346CONFIG_STANDALONE=y 312CONFIG_STANDALONE=y
347CONFIG_PREVENT_FIRMWARE_BUILD=y 313CONFIG_PREVENT_FIRMWARE_BUILD=y
348# CONFIG_SYS_HYPERVISOR is not set 314# CONFIG_SYS_HYPERVISOR is not set
349
350#
351# Connector - unified userspace <-> kernelspace linker
352#
353# CONFIG_CONNECTOR is not set 315# CONFIG_CONNECTOR is not set
354# CONFIG_MTD is not set 316# CONFIG_MTD is not set
355
356#
357# Parallel port support
358#
359# CONFIG_PARPORT is not set 317# CONFIG_PARPORT is not set
360 318CONFIG_BLK_DEV=y
361#
362# Plug and Play support
363#
364# CONFIG_PNPACPI is not set
365
366#
367# Block devices
368#
369# CONFIG_BLK_CPQ_DA is not set 319# CONFIG_BLK_CPQ_DA is not set
370# CONFIG_BLK_CPQ_CISS_DA is not set 320# CONFIG_BLK_CPQ_CISS_DA is not set
371# CONFIG_BLK_DEV_DAC960 is not set 321# CONFIG_BLK_DEV_DAC960 is not set
372# CONFIG_BLK_DEV_UMEM is not set
373# CONFIG_BLK_DEV_COW_COMMON is not set 322# CONFIG_BLK_DEV_COW_COMMON is not set
374CONFIG_BLK_DEV_LOOP=y 323CONFIG_BLK_DEV_LOOP=y
375# CONFIG_BLK_DEV_CRYPTOLOOP is not set 324# CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -381,14 +330,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
381CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 330CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
382# CONFIG_CDROM_PKTCDVD is not set 331# CONFIG_CDROM_PKTCDVD is not set
383# CONFIG_ATA_OVER_ETH is not set 332# CONFIG_ATA_OVER_ETH is not set
384 333# CONFIG_MISC_DEVICES is not set
385#
386# Misc devices
387#
388# CONFIG_PHANTOM is not set
389# CONFIG_SGI_IOC4 is not set
390# CONFIG_TIFM_CORE is not set
391# CONFIG_BLINK is not set
392# CONFIG_IDE is not set 334# CONFIG_IDE is not set
393 335
394# 336#
@@ -396,12 +338,9 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
396# 338#
397# CONFIG_RAID_ATTRS is not set 339# CONFIG_RAID_ATTRS is not set
398# CONFIG_SCSI is not set 340# CONFIG_SCSI is not set
341# CONFIG_SCSI_DMA is not set
399# CONFIG_SCSI_NETLINK is not set 342# CONFIG_SCSI_NETLINK is not set
400# CONFIG_ATA is not set 343# CONFIG_ATA is not set
401
402#
403# Multi-device support (RAID and LVM)
404#
405# CONFIG_MD is not set 344# CONFIG_MD is not set
406 345
407# 346#
@@ -412,39 +351,28 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
412# 351#
413# IEEE 1394 (FireWire) support 352# IEEE 1394 (FireWire) support
414# 353#
415# CONFIG_FIREWIRE is not set
416# CONFIG_IEEE1394 is not set
417 354
418# 355#
419# I2O device support 356# An alternative FireWire stack is available with EXPERIMENTAL=y
420# 357#
358# CONFIG_IEEE1394 is not set
421# CONFIG_I2O is not set 359# CONFIG_I2O is not set
422
423#
424# Network device support
425#
426CONFIG_NETDEVICES=y 360CONFIG_NETDEVICES=y
361# CONFIG_NETDEVICES_MULTIQUEUE is not set
427# CONFIG_DUMMY is not set 362# CONFIG_DUMMY is not set
428# CONFIG_BONDING is not set 363# CONFIG_BONDING is not set
429# CONFIG_EQUALIZER is not set 364# CONFIG_EQUALIZER is not set
430# CONFIG_TUN is not set 365# CONFIG_TUN is not set
431# CONFIG_ARCNET is not set 366# CONFIG_ARCNET is not set
432# CONFIG_PHYLIB is not set 367# CONFIG_PHYLIB is not set
433
434#
435# Ethernet (10 or 100Mbit)
436#
437CONFIG_NET_ETHERNET=y 368CONFIG_NET_ETHERNET=y
438CONFIG_MII=y 369CONFIG_MII=y
370# CONFIG_AX88796 is not set
439# CONFIG_HAPPYMEAL is not set 371# CONFIG_HAPPYMEAL is not set
440# CONFIG_SUNGEM is not set 372# CONFIG_SUNGEM is not set
441# CONFIG_CASSINI is not set 373# CONFIG_CASSINI is not set
442# CONFIG_NET_VENDOR_3COM is not set 374# CONFIG_NET_VENDOR_3COM is not set
443# CONFIG_DM9000 is not set 375# CONFIG_DM9000 is not set
444
445#
446# Tulip family network device support
447#
448# CONFIG_NET_TULIP is not set 376# CONFIG_NET_TULIP is not set
449# CONFIG_HP100 is not set 377# CONFIG_HP100 is not set
450CONFIG_NE2000=y 378CONFIG_NE2000=y
@@ -461,14 +389,12 @@ CONFIG_TC35815=y
461# CONFIG_FEALNX is not set 389# CONFIG_FEALNX is not set
462# CONFIG_NATSEMI is not set 390# CONFIG_NATSEMI is not set
463# CONFIG_NE2K_PCI is not set 391# CONFIG_NE2K_PCI is not set
464# CONFIG_8139CP is not set
465# CONFIG_8139TOO is not set 392# CONFIG_8139TOO is not set
466# CONFIG_SIS900 is not set 393# CONFIG_SIS900 is not set
467# CONFIG_EPIC100 is not set 394# CONFIG_EPIC100 is not set
468# CONFIG_SUNDANCE is not set 395# CONFIG_SUNDANCE is not set
469# CONFIG_TLAN is not set 396# CONFIG_TLAN is not set
470# CONFIG_VIA_RHINE is not set 397# CONFIG_VIA_RHINE is not set
471# CONFIG_SC92031 is not set
472# CONFIG_NETDEV_1000 is not set 398# CONFIG_NETDEV_1000 is not set
473# CONFIG_NETDEV_10000 is not set 399# CONFIG_NETDEV_10000 is not set
474# CONFIG_TR is not set 400# CONFIG_TR is not set
@@ -480,22 +406,11 @@ CONFIG_TC35815=y
480# CONFIG_WLAN_80211 is not set 406# CONFIG_WLAN_80211 is not set
481# CONFIG_WAN is not set 407# CONFIG_WAN is not set
482# CONFIG_FDDI is not set 408# CONFIG_FDDI is not set
483# CONFIG_HIPPI is not set
484# CONFIG_PPP is not set 409# CONFIG_PPP is not set
485# CONFIG_SLIP is not set 410# CONFIG_SLIP is not set
486# CONFIG_SHAPER is not set
487# CONFIG_NETCONSOLE is not set
488# CONFIG_NETPOLL is not set 411# CONFIG_NETPOLL is not set
489# CONFIG_NET_POLL_CONTROLLER is not set 412# CONFIG_NET_POLL_CONTROLLER is not set
490
491#
492# ISDN subsystem
493#
494# CONFIG_ISDN is not set 413# CONFIG_ISDN is not set
495
496#
497# Telephony Support
498#
499# CONFIG_PHONE is not set 414# CONFIG_PHONE is not set
500 415
501# 416#
@@ -534,24 +449,14 @@ CONFIG_SERIAL_TXX9_STDSERIAL=y
534CONFIG_UNIX98_PTYS=y 449CONFIG_UNIX98_PTYS=y
535CONFIG_LEGACY_PTYS=y 450CONFIG_LEGACY_PTYS=y
536CONFIG_LEGACY_PTY_COUNT=256 451CONFIG_LEGACY_PTY_COUNT=256
537
538#
539# IPMI
540#
541# CONFIG_IPMI_HANDLER is not set 452# CONFIG_IPMI_HANDLER is not set
542# CONFIG_WATCHDOG is not set 453# CONFIG_WATCHDOG is not set
543# CONFIG_HW_RANDOM is not set 454# CONFIG_HW_RANDOM is not set
544# CONFIG_RTC is not set 455# CONFIG_RTC is not set
545# CONFIG_GEN_RTC is not set
546# CONFIG_R3964 is not set 456# CONFIG_R3964 is not set
547# CONFIG_APPLICOM is not set 457# CONFIG_APPLICOM is not set
548# CONFIG_DRM is not set 458# CONFIG_DRM is not set
549# CONFIG_RAW_DRIVER is not set 459# CONFIG_RAW_DRIVER is not set
550
551#
552# TPM devices
553#
554# CONFIG_TCG_TPM is not set
555CONFIG_DEVPORT=y 460CONFIG_DEVPORT=y
556# CONFIG_I2C is not set 461# CONFIG_I2C is not set
557 462
@@ -564,19 +469,15 @@ CONFIG_SPI_MASTER=y
564# 469#
565# SPI Master Controller Drivers 470# SPI Master Controller Drivers
566# 471#
567# CONFIG_SPI_BITBANG is not set
568CONFIG_SPI_TXX9=y 472CONFIG_SPI_TXX9=y
569 473
570# 474#
571# SPI Protocol Masters 475# SPI Protocol Masters
572# 476#
573CONFIG_SPI_AT25=y 477CONFIG_SPI_AT25=y
574# CONFIG_SPI_SPIDEV is not set 478# CONFIG_SPI_TLE62X0 is not set
575
576#
577# Dallas's 1-wire bus
578#
579# CONFIG_W1 is not set 479# CONFIG_W1 is not set
480# CONFIG_POWER_SUPPLY is not set
580# CONFIG_HWMON is not set 481# CONFIG_HWMON is not set
581 482
582# 483#
@@ -601,56 +502,17 @@ CONFIG_SPI_AT25=y
601# 502#
602# CONFIG_DISPLAY_SUPPORT is not set 503# CONFIG_DISPLAY_SUPPORT is not set
603# CONFIG_VGASTATE is not set 504# CONFIG_VGASTATE is not set
505# CONFIG_VIDEO_OUTPUT_CONTROL is not set
604# CONFIG_FB is not set 506# CONFIG_FB is not set
605 507
606# 508#
607# Sound 509# Sound
608# 510#
609# CONFIG_SOUND is not set 511# CONFIG_SOUND is not set
610 512# CONFIG_USB_SUPPORT is not set
611#
612# USB support
613#
614CONFIG_USB_ARCH_HAS_HCD=y
615CONFIG_USB_ARCH_HAS_OHCI=y
616CONFIG_USB_ARCH_HAS_EHCI=y
617# CONFIG_USB is not set
618
619#
620# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
621#
622
623#
624# USB Gadget Support
625#
626# CONFIG_USB_GADGET is not set
627# CONFIG_MMC is not set 513# CONFIG_MMC is not set
628
629#
630# LED devices
631#
632# CONFIG_NEW_LEDS is not set 514# CONFIG_NEW_LEDS is not set
633
634#
635# LED drivers
636#
637
638#
639# LED Triggers
640#
641
642#
643# InfiniBand support
644#
645# CONFIG_INFINIBAND is not set 515# CONFIG_INFINIBAND is not set
646
647#
648# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
649#
650
651#
652# Real Time Clock
653#
654CONFIG_RTC_LIB=y 516CONFIG_RTC_LIB=y
655CONFIG_RTC_CLASS=y 517CONFIG_RTC_CLASS=y
656CONFIG_RTC_HCTOSYS=y 518CONFIG_RTC_HCTOSYS=y
@@ -667,10 +529,6 @@ CONFIG_RTC_INTF_DEV_UIE_EMUL=y
667# CONFIG_RTC_DRV_TEST is not set 529# CONFIG_RTC_DRV_TEST is not set
668 530
669# 531#
670# I2C RTC drivers
671#
672
673#
674# SPI RTC drivers 532# SPI RTC drivers
675# 533#
676CONFIG_RTC_DRV_RS5C348=y 534CONFIG_RTC_DRV_RS5C348=y
@@ -681,8 +539,10 @@ CONFIG_RTC_DRV_RS5C348=y
681# 539#
682# CONFIG_RTC_DRV_CMOS is not set 540# CONFIG_RTC_DRV_CMOS is not set
683# CONFIG_RTC_DRV_DS1553 is not set 541# CONFIG_RTC_DRV_DS1553 is not set
542# CONFIG_RTC_DRV_STK17TA8 is not set
684# CONFIG_RTC_DRV_DS1742 is not set 543# CONFIG_RTC_DRV_DS1742 is not set
685# CONFIG_RTC_DRV_M48T86 is not set 544# CONFIG_RTC_DRV_M48T86 is not set
545# CONFIG_RTC_DRV_M48T59 is not set
686# CONFIG_RTC_DRV_V3020 is not set 546# CONFIG_RTC_DRV_V3020 is not set
687 547
688# 548#
@@ -703,16 +563,19 @@ CONFIG_RTC_DRV_RS5C348=y
703# 563#
704 564
705# 565#
566# Userspace I/O
567#
568# CONFIG_UIO is not set
569
570#
706# File systems 571# File systems
707# 572#
708# CONFIG_EXT2_FS is not set 573# CONFIG_EXT2_FS is not set
709# CONFIG_EXT3_FS is not set 574# CONFIG_EXT3_FS is not set
710# CONFIG_EXT4DEV_FS is not set
711# CONFIG_REISERFS_FS is not set 575# CONFIG_REISERFS_FS is not set
712# CONFIG_JFS_FS is not set 576# CONFIG_JFS_FS is not set
713CONFIG_FS_POSIX_ACL=y 577CONFIG_FS_POSIX_ACL=y
714# CONFIG_XFS_FS is not set 578# CONFIG_XFS_FS is not set
715# CONFIG_GFS2_FS is not set
716# CONFIG_OCFS2_FS is not set 579# CONFIG_OCFS2_FS is not set
717# CONFIG_MINIX_FS is not set 580# CONFIG_MINIX_FS is not set
718# CONFIG_ROMFS_FS is not set 581# CONFIG_ROMFS_FS is not set
@@ -749,18 +612,11 @@ CONFIG_TMPFS=y
749CONFIG_TMPFS_POSIX_ACL=y 612CONFIG_TMPFS_POSIX_ACL=y
750# CONFIG_HUGETLB_PAGE is not set 613# CONFIG_HUGETLB_PAGE is not set
751CONFIG_RAMFS=y 614CONFIG_RAMFS=y
752# CONFIG_CONFIGFS_FS is not set
753 615
754# 616#
755# Miscellaneous filesystems 617# Miscellaneous filesystems
756# 618#
757# CONFIG_ADFS_FS is not set
758# CONFIG_AFFS_FS is not set
759# CONFIG_HFS_FS is not set
760# CONFIG_HFSPLUS_FS is not set 619# CONFIG_HFSPLUS_FS is not set
761# CONFIG_BEFS_FS is not set
762# CONFIG_BFS_FS is not set
763# CONFIG_EFS_FS is not set
764# CONFIG_CRAMFS is not set 620# CONFIG_CRAMFS is not set
765# CONFIG_VXFS_FS is not set 621# CONFIG_VXFS_FS is not set
766# CONFIG_HPFS_FS is not set 622# CONFIG_HPFS_FS is not set
@@ -774,7 +630,6 @@ CONFIG_RAMFS=y
774CONFIG_NFS_FS=y 630CONFIG_NFS_FS=y
775CONFIG_NFS_V3=y 631CONFIG_NFS_V3=y
776# CONFIG_NFS_V3_ACL is not set 632# CONFIG_NFS_V3_ACL is not set
777# CONFIG_NFS_V4 is not set
778# CONFIG_NFS_DIRECTIO is not set 633# CONFIG_NFS_DIRECTIO is not set
779# CONFIG_NFSD is not set 634# CONFIG_NFSD is not set
780CONFIG_ROOT_NFS=y 635CONFIG_ROOT_NFS=y
@@ -782,15 +637,10 @@ CONFIG_LOCKD=y
782CONFIG_LOCKD_V4=y 637CONFIG_LOCKD_V4=y
783CONFIG_NFS_COMMON=y 638CONFIG_NFS_COMMON=y
784CONFIG_SUNRPC=y 639CONFIG_SUNRPC=y
785# CONFIG_SUNRPC_BIND34 is not set
786# CONFIG_RPCSEC_GSS_KRB5 is not set
787# CONFIG_RPCSEC_GSS_SPKM3 is not set
788# CONFIG_SMB_FS is not set 640# CONFIG_SMB_FS is not set
789# CONFIG_CIFS is not set 641# CONFIG_CIFS is not set
790# CONFIG_NCP_FS is not set 642# CONFIG_NCP_FS is not set
791# CONFIG_CODA_FS is not set 643# CONFIG_CODA_FS is not set
792# CONFIG_AFS_FS is not set
793# CONFIG_9P_FS is not set
794 644
795# 645#
796# Partition Types 646# Partition Types
@@ -804,16 +654,6 @@ CONFIG_MSDOS_PARTITION=y
804# CONFIG_NLS is not set 654# CONFIG_NLS is not set
805 655
806# 656#
807# Distributed Lock Manager
808#
809# CONFIG_DLM is not set
810
811#
812# Profiling support
813#
814# CONFIG_PROFILING is not set
815
816#
817# Kernel hacking 657# Kernel hacking
818# 658#
819CONFIG_TRACE_IRQFLAGS_SUPPORT=y 659CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -833,10 +673,6 @@ CONFIG_SYS_SUPPORTS_KGDB=y
833# 673#
834# CONFIG_KEYS is not set 674# CONFIG_KEYS is not set
835# CONFIG_SECURITY is not set 675# CONFIG_SECURITY is not set
836
837#
838# Cryptographic options
839#
840# CONFIG_CRYPTO is not set 676# CONFIG_CRYPTO is not set
841 677
842# 678#
@@ -847,6 +683,7 @@ CONFIG_BITREVERSE=y
847# CONFIG_CRC16 is not set 683# CONFIG_CRC16 is not set
848# CONFIG_CRC_ITU_T is not set 684# CONFIG_CRC_ITU_T is not set
849CONFIG_CRC32=y 685CONFIG_CRC32=y
686# CONFIG_CRC7 is not set
850# CONFIG_LIBCRC32C is not set 687# CONFIG_LIBCRC32C is not set
851CONFIG_HAS_IOMEM=y 688CONFIG_HAS_IOMEM=y
852CONFIG_HAS_IOPORT=y 689CONFIG_HAS_IOPORT=y
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index e72fdf36b3fe..93f9e8331ad7 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -655,8 +655,8 @@ CONFIG_MOXA_SMARTIO_NEW=m
655# CONFIG_SX is not set 655# CONFIG_SX is not set
656# CONFIG_RIO is not set 656# CONFIG_RIO is not set
657# CONFIG_STALDRV is not set 657# CONFIG_STALDRV is not set
658CONFIG_SIBYTE_SB1250_DUART=y 658CONFIG_SERIAL_SB1250_DUART=y
659CONFIG_SIBYTE_SB1250_DUART_CONSOLE=y 659CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
660 660
661# 661#
662# Serial drivers 662# Serial drivers
diff --git a/arch/mips/configs/tb0219_defconfig b/arch/mips/configs/tb0219_defconfig
index e9f2cef4c716..326aa7aa40ea 100644
--- a/arch/mips/configs/tb0219_defconfig
+++ b/arch/mips/configs/tb0219_defconfig
@@ -1,60 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-rc6 3# Linux kernel version: 2.6.23-rc2
4# Sun Apr 15 01:06:01 2007 4# Wed Aug 8 16:11:47 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58# CONFIG_CASIO_E55 is not set 45# CONFIG_CASIO_E55 is not set
59# CONFIG_IBM_WORKPAD is not set 46# CONFIG_IBM_WORKPAD is not set
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
@@ -76,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
76CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 63CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
77CONFIG_DMA_NONCOHERENT=y 64CONFIG_DMA_NONCOHERENT=y
78CONFIG_DMA_NEED_PCI_MAP_STATE=y 65CONFIG_DMA_NEED_PCI_MAP_STATE=y
66# CONFIG_HOTPLUG_CPU is not set
67# CONFIG_NO_IOPORT is not set
79# CONFIG_CPU_BIG_ENDIAN is not set 68# CONFIG_CPU_BIG_ENDIAN is not set
80CONFIG_CPU_LITTLE_ENDIAN=y 69CONFIG_CPU_LITTLE_ENDIAN=y
81CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 70CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -85,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
85# 74#
86# CPU selection 75# CPU selection
87# 76#
77# CONFIG_CPU_LOONGSON2 is not set
88# CONFIG_CPU_MIPS32_R1 is not set 78# CONFIG_CPU_MIPS32_R1 is not set
89# CONFIG_CPU_MIPS32_R2 is not set 79# CONFIG_CPU_MIPS32_R2 is not set
90# CONFIG_CPU_MIPS64_R1 is not set 80# CONFIG_CPU_MIPS64_R1 is not set
@@ -106,7 +96,6 @@ CONFIG_CPU_VR41XX=y
106# CONFIG_CPU_SB1 is not set 96# CONFIG_CPU_SB1 is not set
107CONFIG_SYS_HAS_CPU_VR41XX=y 97CONFIG_SYS_HAS_CPU_VR41XX=y
108CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 98CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
109CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 99CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
111CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 100CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
112 101
@@ -122,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
122CONFIG_MIPS_MT_DISABLED=y 111CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMP is not set 112# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set 113# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set
126CONFIG_CPU_HAS_SYNC=y 114CONFIG_CPU_HAS_SYNC=y
127CONFIG_GENERIC_HARDIRQS=y 115CONFIG_GENERIC_HARDIRQS=y
128CONFIG_GENERIC_IRQ_PROBE=y 116CONFIG_GENERIC_IRQ_PROBE=y
@@ -136,46 +124,44 @@ CONFIG_FLAT_NODE_MEM_MAP=y
136# CONFIG_SPARSEMEM_STATIC is not set 124# CONFIG_SPARSEMEM_STATIC is not set
137CONFIG_SPLIT_PTLOCK_CPUS=4 125CONFIG_SPLIT_PTLOCK_CPUS=4
138# CONFIG_RESOURCES_64BIT is not set 126# CONFIG_RESOURCES_64BIT is not set
139CONFIG_ZONE_DMA_FLAG=1 127CONFIG_ZONE_DMA_FLAG=0
128CONFIG_VIRT_TO_BUS=y
140# CONFIG_HZ_48 is not set 129# CONFIG_HZ_48 is not set
141# CONFIG_HZ_100 is not set 130# CONFIG_HZ_100 is not set
142# CONFIG_HZ_128 is not set 131# CONFIG_HZ_128 is not set
143# CONFIG_HZ_250 is not set 132CONFIG_HZ_250=y
144# CONFIG_HZ_256 is not set 133# CONFIG_HZ_256 is not set
145CONFIG_HZ_1000=y 134# CONFIG_HZ_1000 is not set
146# CONFIG_HZ_1024 is not set 135# CONFIG_HZ_1024 is not set
147CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 136CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
148CONFIG_HZ=1000 137CONFIG_HZ=250
149CONFIG_PREEMPT_NONE=y 138CONFIG_PREEMPT_NONE=y
150# CONFIG_PREEMPT_VOLUNTARY is not set 139# CONFIG_PREEMPT_VOLUNTARY is not set
151# CONFIG_PREEMPT is not set 140# CONFIG_PREEMPT is not set
152# CONFIG_KEXEC is not set 141# CONFIG_KEXEC is not set
142CONFIG_SECCOMP=y
153CONFIG_LOCKDEP_SUPPORT=y 143CONFIG_LOCKDEP_SUPPORT=y
154CONFIG_STACKTRACE_SUPPORT=y 144CONFIG_STACKTRACE_SUPPORT=y
155CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 145CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
156 146
157# 147#
158# Code maturity level options 148# General setup
159# 149#
160CONFIG_EXPERIMENTAL=y 150CONFIG_EXPERIMENTAL=y
161CONFIG_BROKEN_ON_SMP=y 151CONFIG_BROKEN_ON_SMP=y
162CONFIG_INIT_ENV_ARG_LIMIT=32 152CONFIG_INIT_ENV_ARG_LIMIT=32
163
164#
165# General setup
166#
167CONFIG_LOCALVERSION="" 153CONFIG_LOCALVERSION=""
168CONFIG_LOCALVERSION_AUTO=y 154CONFIG_LOCALVERSION_AUTO=y
169CONFIG_SWAP=y 155CONFIG_SWAP=y
170CONFIG_SYSVIPC=y 156CONFIG_SYSVIPC=y
171# CONFIG_IPC_NS is not set
172CONFIG_SYSVIPC_SYSCTL=y 157CONFIG_SYSVIPC_SYSCTL=y
173# CONFIG_POSIX_MQUEUE is not set 158# CONFIG_POSIX_MQUEUE is not set
174# CONFIG_BSD_PROCESS_ACCT is not set 159# CONFIG_BSD_PROCESS_ACCT is not set
175# CONFIG_TASKSTATS is not set 160# CONFIG_TASKSTATS is not set
176# CONFIG_UTS_NS is not set 161# CONFIG_USER_NS is not set
177# CONFIG_AUDIT is not set 162# CONFIG_AUDIT is not set
178# CONFIG_IKCONFIG is not set 163# CONFIG_IKCONFIG is not set
164CONFIG_LOG_BUF_SHIFT=14
179CONFIG_SYSFS_DEPRECATED=y 165CONFIG_SYSFS_DEPRECATED=y
180# CONFIG_RELAY is not set 166# CONFIG_RELAY is not set
181# CONFIG_BLK_DEV_INITRD is not set 167# CONFIG_BLK_DEV_INITRD is not set
@@ -191,32 +177,30 @@ CONFIG_BUG=y
191CONFIG_ELF_CORE=y 177CONFIG_ELF_CORE=y
192CONFIG_BASE_FULL=y 178CONFIG_BASE_FULL=y
193CONFIG_FUTEX=y 179CONFIG_FUTEX=y
180CONFIG_ANON_INODES=y
194CONFIG_EPOLL=y 181CONFIG_EPOLL=y
182CONFIG_SIGNALFD=y
183CONFIG_TIMERFD=y
184CONFIG_EVENTFD=y
195CONFIG_SHMEM=y 185CONFIG_SHMEM=y
196CONFIG_SLAB=y
197CONFIG_VM_EVENT_COUNTERS=y 186CONFIG_VM_EVENT_COUNTERS=y
187CONFIG_SLAB=y
188# CONFIG_SLUB is not set
189# CONFIG_SLOB is not set
198CONFIG_RT_MUTEXES=y 190CONFIG_RT_MUTEXES=y
199# CONFIG_TINY_SHMEM is not set 191# CONFIG_TINY_SHMEM is not set
200CONFIG_BASE_SMALL=0 192CONFIG_BASE_SMALL=0
201# CONFIG_SLOB is not set
202
203#
204# Loadable module support
205#
206CONFIG_MODULES=y 193CONFIG_MODULES=y
207CONFIG_MODULE_UNLOAD=y 194CONFIG_MODULE_UNLOAD=y
208# CONFIG_MODULE_FORCE_UNLOAD is not set 195CONFIG_MODULE_FORCE_UNLOAD=y
209CONFIG_MODVERSIONS=y 196CONFIG_MODVERSIONS=y
210CONFIG_MODULE_SRCVERSION_ALL=y 197CONFIG_MODULE_SRCVERSION_ALL=y
211CONFIG_KMOD=y 198CONFIG_KMOD=y
212
213#
214# Block layer
215#
216CONFIG_BLOCK=y 199CONFIG_BLOCK=y
217# CONFIG_LBD is not set 200# CONFIG_LBD is not set
218# CONFIG_BLK_DEV_IO_TRACE is not set 201# CONFIG_BLK_DEV_IO_TRACE is not set
219# CONFIG_LSF is not set 202# CONFIG_LSF is not set
203# CONFIG_BLK_DEV_BSG is not set
220 204
221# 205#
222# IO Schedulers 206# IO Schedulers
@@ -236,16 +220,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
236# 220#
237CONFIG_HW_HAS_PCI=y 221CONFIG_HW_HAS_PCI=y
238CONFIG_PCI=y 222CONFIG_PCI=y
223# CONFIG_ARCH_SUPPORTS_MSI is not set
239CONFIG_MMU=y 224CONFIG_MMU=y
240 225
241# 226#
242# PCCARD (PCMCIA/CardBus) support 227# PCCARD (PCMCIA/CardBus) support
243# 228#
244# CONFIG_PCCARD is not set 229# CONFIG_PCCARD is not set
245
246#
247# PCI Hotplug Support
248#
249# CONFIG_HOTPLUG_PCI is not set 230# CONFIG_HOTPLUG_PCI is not set
250 231
251# 232#
@@ -258,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y
258# 239#
259# Power management options 240# Power management options
260# 241#
261CONFIG_PM=y 242# CONFIG_PM is not set
262# CONFIG_PM_LEGACY is not set
263# CONFIG_PM_DEBUG is not set
264# CONFIG_PM_SYSFS_DEPRECATED is not set
265 243
266# 244#
267# Networking 245# Networking
@@ -271,14 +249,9 @@ CONFIG_NET=y
271# 249#
272# Networking options 250# Networking options
273# 251#
274# CONFIG_NETDEBUG is not set
275CONFIG_PACKET=y 252CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 253# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 254CONFIG_UNIX=y
278CONFIG_XFRM=y
279# CONFIG_XFRM_USER is not set
280# CONFIG_XFRM_SUB_POLICY is not set
281CONFIG_XFRM_MIGRATE=y
282# CONFIG_NET_KEY is not set 255# CONFIG_NET_KEY is not set
283CONFIG_INET=y 256CONFIG_INET=y
284CONFIG_IP_MULTICAST=y 257CONFIG_IP_MULTICAST=y
@@ -288,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y
288CONFIG_IP_FIB_HASH=y 261CONFIG_IP_FIB_HASH=y
289CONFIG_IP_MULTIPLE_TABLES=y 262CONFIG_IP_MULTIPLE_TABLES=y
290CONFIG_IP_ROUTE_MULTIPATH=y 263CONFIG_IP_ROUTE_MULTIPATH=y
291# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
292CONFIG_IP_ROUTE_VERBOSE=y 264CONFIG_IP_ROUTE_VERBOSE=y
293CONFIG_IP_PNP=y 265CONFIG_IP_PNP=y
294# CONFIG_IP_PNP_DHCP is not set 266# CONFIG_IP_PNP_DHCP is not set
@@ -305,34 +277,25 @@ CONFIG_SYN_COOKIES=y
305# CONFIG_INET_IPCOMP is not set 277# CONFIG_INET_IPCOMP is not set
306# CONFIG_INET_XFRM_TUNNEL is not set 278# CONFIG_INET_XFRM_TUNNEL is not set
307CONFIG_INET_TUNNEL=m 279CONFIG_INET_TUNNEL=m
308CONFIG_INET_XFRM_MODE_TRANSPORT=m 280# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
309CONFIG_INET_XFRM_MODE_TUNNEL=m 281# CONFIG_INET_XFRM_MODE_TUNNEL is not set
310CONFIG_INET_XFRM_MODE_BEET=m 282# CONFIG_INET_XFRM_MODE_BEET is not set
311CONFIG_INET_DIAG=y 283CONFIG_INET_DIAG=y
312CONFIG_INET_TCP_DIAG=y 284CONFIG_INET_TCP_DIAG=y
313# CONFIG_TCP_CONG_ADVANCED is not set 285# CONFIG_TCP_CONG_ADVANCED is not set
314CONFIG_TCP_CONG_CUBIC=y 286CONFIG_TCP_CONG_CUBIC=y
315CONFIG_DEFAULT_TCP_CONG="cubic" 287CONFIG_DEFAULT_TCP_CONG="cubic"
316CONFIG_TCP_MD5SIG=y 288# CONFIG_TCP_MD5SIG is not set
317# CONFIG_IPV6 is not set 289# CONFIG_IPV6 is not set
318# CONFIG_INET6_XFRM_TUNNEL is not set 290# CONFIG_INET6_XFRM_TUNNEL is not set
319# CONFIG_INET6_TUNNEL is not set 291# CONFIG_INET6_TUNNEL is not set
320CONFIG_NETWORK_SECMARK=y 292CONFIG_NETWORK_SECMARK=y
321# CONFIG_NETFILTER is not set 293# CONFIG_NETFILTER is not set
322
323#
324# DCCP Configuration (EXPERIMENTAL)
325#
326# CONFIG_IP_DCCP is not set 294# CONFIG_IP_DCCP is not set
327
328#
329# SCTP Configuration (EXPERIMENTAL)
330#
331# CONFIG_IP_SCTP is not set 295# CONFIG_IP_SCTP is not set
332 296# CONFIG_SCTP_HMAC_NONE is not set
333# 297# CONFIG_SCTP_HMAC_SHA1 is not set
334# TIPC Configuration (EXPERIMENTAL) 298# CONFIG_SCTP_HMAC_MD5 is not set
335#
336# CONFIG_TIPC is not set 299# CONFIG_TIPC is not set
337# CONFIG_ATM is not set 300# CONFIG_ATM is not set
338# CONFIG_BRIDGE is not set 301# CONFIG_BRIDGE is not set
@@ -358,10 +321,20 @@ CONFIG_NETWORK_SECMARK=y
358# CONFIG_HAMRADIO is not set 321# CONFIG_HAMRADIO is not set
359# CONFIG_IRDA is not set 322# CONFIG_IRDA is not set
360# CONFIG_BT is not set 323# CONFIG_BT is not set
361# CONFIG_IEEE80211 is not set 324# CONFIG_AF_RXRPC is not set
362CONFIG_FIB_RULES=y 325CONFIG_FIB_RULES=y
363 326
364# 327#
328# Wireless
329#
330# CONFIG_CFG80211 is not set
331# CONFIG_WIRELESS_EXT is not set
332# CONFIG_MAC80211 is not set
333# CONFIG_IEEE80211 is not set
334# CONFIG_RFKILL is not set
335# CONFIG_NET_9P is not set
336
337#
365# Device Drivers 338# Device Drivers
366# 339#
367 340
@@ -372,30 +345,10 @@ CONFIG_STANDALONE=y
372CONFIG_PREVENT_FIRMWARE_BUILD=y 345CONFIG_PREVENT_FIRMWARE_BUILD=y
373CONFIG_FW_LOADER=m 346CONFIG_FW_LOADER=m
374# CONFIG_SYS_HYPERVISOR is not set 347# CONFIG_SYS_HYPERVISOR is not set
375
376#
377# Connector - unified userspace <-> kernelspace linker
378#
379# CONFIG_CONNECTOR is not set 348# CONFIG_CONNECTOR is not set
380
381#
382# Memory Technology Devices (MTD)
383#
384# CONFIG_MTD is not set 349# CONFIG_MTD is not set
385
386#
387# Parallel port support
388#
389# CONFIG_PARPORT is not set 350# CONFIG_PARPORT is not set
390 351CONFIG_BLK_DEV=y
391#
392# Plug and Play support
393#
394# CONFIG_PNPACPI is not set
395
396#
397# Block devices
398#
399# CONFIG_BLK_CPQ_DA is not set 352# CONFIG_BLK_CPQ_DA is not set
400# CONFIG_BLK_CPQ_CISS_DA is not set 353# CONFIG_BLK_CPQ_CISS_DA is not set
401# CONFIG_BLK_DEV_DAC960 is not set 354# CONFIG_BLK_DEV_DAC960 is not set
@@ -412,16 +365,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
412CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 365CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
413# CONFIG_CDROM_PKTCDVD is not set 366# CONFIG_CDROM_PKTCDVD is not set
414# CONFIG_ATA_OVER_ETH is not set 367# CONFIG_ATA_OVER_ETH is not set
415 368# CONFIG_MISC_DEVICES is not set
416#
417# Misc devices
418#
419CONFIG_SGI_IOC4=m
420# CONFIG_TIFM_CORE is not set
421
422#
423# ATA/ATAPI/MFM/RLL support
424#
425# CONFIG_IDE is not set 369# CONFIG_IDE is not set
426 370
427# 371#
@@ -429,16 +373,9 @@ CONFIG_SGI_IOC4=m
429# 373#
430# CONFIG_RAID_ATTRS is not set 374# CONFIG_RAID_ATTRS is not set
431# CONFIG_SCSI is not set 375# CONFIG_SCSI is not set
376# CONFIG_SCSI_DMA is not set
432# CONFIG_SCSI_NETLINK is not set 377# CONFIG_SCSI_NETLINK is not set
433
434#
435# Serial ATA (prod) and Parallel ATA (experimental) drivers
436#
437# CONFIG_ATA is not set 378# CONFIG_ATA is not set
438
439#
440# Multi-device support (RAID and LVM)
441#
442# CONFIG_MD is not set 379# CONFIG_MD is not set
443 380
444# 381#
@@ -449,30 +386,17 @@ CONFIG_SGI_IOC4=m
449# 386#
450# IEEE 1394 (FireWire) support 387# IEEE 1394 (FireWire) support
451# 388#
389# CONFIG_FIREWIRE is not set
452# CONFIG_IEEE1394 is not set 390# CONFIG_IEEE1394 is not set
453
454#
455# I2O device support
456#
457# CONFIG_I2O is not set 391# CONFIG_I2O is not set
458
459#
460# Network device support
461#
462CONFIG_NETDEVICES=y 392CONFIG_NETDEVICES=y
463CONFIG_DUMMY=m 393# CONFIG_NETDEVICES_MULTIQUEUE is not set
394# CONFIG_DUMMY is not set
464# CONFIG_BONDING is not set 395# CONFIG_BONDING is not set
396# CONFIG_MACVLAN is not set
465# CONFIG_EQUALIZER is not set 397# CONFIG_EQUALIZER is not set
466# CONFIG_TUN is not set 398# CONFIG_TUN is not set
467
468#
469# ARCnet devices
470#
471# CONFIG_ARCNET is not set 399# CONFIG_ARCNET is not set
472
473#
474# PHY device support
475#
476CONFIG_PHYLIB=m 400CONFIG_PHYLIB=m
477 401
478# 402#
@@ -486,29 +410,46 @@ CONFIG_CICADA_PHY=m
486CONFIG_VITESSE_PHY=m 410CONFIG_VITESSE_PHY=m
487CONFIG_SMSC_PHY=m 411CONFIG_SMSC_PHY=m
488# CONFIG_BROADCOM_PHY is not set 412# CONFIG_BROADCOM_PHY is not set
413# CONFIG_ICPLUS_PHY is not set
489# CONFIG_FIXED_PHY is not set 414# CONFIG_FIXED_PHY is not set
490
491#
492# Ethernet (10 or 100Mbit)
493#
494CONFIG_NET_ETHERNET=y 415CONFIG_NET_ETHERNET=y
495CONFIG_MII=y 416CONFIG_MII=y
417# CONFIG_AX88796 is not set
496# CONFIG_HAPPYMEAL is not set 418# CONFIG_HAPPYMEAL is not set
497# CONFIG_SUNGEM is not set 419# CONFIG_SUNGEM is not set
498# CONFIG_CASSINI is not set 420# CONFIG_CASSINI is not set
499# CONFIG_NET_VENDOR_3COM is not set 421# CONFIG_NET_VENDOR_3COM is not set
500# CONFIG_DM9000 is not set 422# CONFIG_DM9000 is not set
501
502#
503# Tulip family network device support
504#
505# CONFIG_NET_TULIP is not set 423# CONFIG_NET_TULIP is not set
506# CONFIG_HP100 is not set 424# CONFIG_HP100 is not set
507# CONFIG_NET_PCI is not set 425CONFIG_NET_PCI=y
508 426# CONFIG_PCNET32 is not set
509# 427# CONFIG_AMD8111_ETH is not set
510# Ethernet (1000 Mbit) 428# CONFIG_ADAPTEC_STARFIRE is not set
511# 429# CONFIG_B44 is not set
430# CONFIG_FORCEDETH is not set
431# CONFIG_TC35815 is not set
432# CONFIG_DGRS is not set
433# CONFIG_EEPRO100 is not set
434# CONFIG_E100 is not set
435# CONFIG_FEALNX is not set
436# CONFIG_NATSEMI is not set
437# CONFIG_NE2K_PCI is not set
438# CONFIG_8139CP is not set
439CONFIG_8139TOO=y
440CONFIG_8139TOO_PIO=y
441# CONFIG_8139TOO_TUNE_TWISTER is not set
442# CONFIG_8139TOO_8129 is not set
443# CONFIG_8139_OLD_RX_RESET is not set
444# CONFIG_SIS900 is not set
445# CONFIG_EPIC100 is not set
446# CONFIG_SUNDANCE is not set
447# CONFIG_TLAN is not set
448CONFIG_VIA_RHINE=y
449CONFIG_VIA_RHINE_MMIO=y
450# CONFIG_VIA_RHINE_NAPI is not set
451# CONFIG_SC92031 is not set
452CONFIG_NETDEV_1000=y
512# CONFIG_ACENIC is not set 453# CONFIG_ACENIC is not set
513# CONFIG_DL2K is not set 454# CONFIG_DL2K is not set
514# CONFIG_E1000 is not set 455# CONFIG_E1000 is not set
@@ -520,35 +461,29 @@ CONFIG_R8169=y
520# CONFIG_SIS190 is not set 461# CONFIG_SIS190 is not set
521# CONFIG_SKGE is not set 462# CONFIG_SKGE is not set
522# CONFIG_SKY2 is not set 463# CONFIG_SKY2 is not set
523# CONFIG_SK98LIN is not set 464CONFIG_VIA_VELOCITY=y
524# CONFIG_TIGON3 is not set 465# CONFIG_TIGON3 is not set
525# CONFIG_BNX2 is not set 466# CONFIG_BNX2 is not set
526CONFIG_QLA3XXX=m 467# CONFIG_QLA3XXX is not set
527# CONFIG_ATL1 is not set 468# CONFIG_ATL1 is not set
528 469# CONFIG_NETDEV_10000 is not set
529#
530# Ethernet (10000 Mbit)
531#
532# CONFIG_CHELSIO_T1 is not set
533CONFIG_CHELSIO_T3=m
534# CONFIG_IXGB is not set
535# CONFIG_S2IO is not set
536# CONFIG_MYRI10GE is not set
537CONFIG_NETXEN_NIC=m
538
539#
540# Token Ring devices
541#
542# CONFIG_TR is not set 470# CONFIG_TR is not set
543 471
544# 472#
545# Wireless LAN (non-hamradio) 473# Wireless LAN
546# 474#
547# CONFIG_NET_RADIO is not set 475# CONFIG_WLAN_PRE80211 is not set
476# CONFIG_WLAN_80211 is not set
548 477
549# 478#
550# Wan interfaces 479# USB Network Adapters
551# 480#
481# CONFIG_USB_CATC is not set
482# CONFIG_USB_KAWETH is not set
483# CONFIG_USB_PEGASUS is not set
484# CONFIG_USB_RTL8150 is not set
485# CONFIG_USB_USBNET_MII is not set
486# CONFIG_USB_USBNET is not set
552# CONFIG_WAN is not set 487# CONFIG_WAN is not set
553# CONFIG_FDDI is not set 488# CONFIG_FDDI is not set
554# CONFIG_HIPPI is not set 489# CONFIG_HIPPI is not set
@@ -558,15 +493,7 @@ CONFIG_NETXEN_NIC=m
558# CONFIG_NETCONSOLE is not set 493# CONFIG_NETCONSOLE is not set
559# CONFIG_NETPOLL is not set 494# CONFIG_NETPOLL is not set
560# CONFIG_NET_POLL_CONTROLLER is not set 495# CONFIG_NET_POLL_CONTROLLER is not set
561
562#
563# ISDN subsystem
564#
565# CONFIG_ISDN is not set 496# CONFIG_ISDN is not set
566
567#
568# Telephony Support
569#
570# CONFIG_PHONE is not set 497# CONFIG_PHONE is not set
571 498
572# 499#
@@ -574,6 +501,7 @@ CONFIG_NETXEN_NIC=m
574# 501#
575CONFIG_INPUT=y 502CONFIG_INPUT=y
576# CONFIG_INPUT_FF_MEMLESS is not set 503# CONFIG_INPUT_FF_MEMLESS is not set
504# CONFIG_INPUT_POLLDEV is not set
577 505
578# 506#
579# Userland interfaces 507# Userland interfaces
@@ -590,6 +518,7 @@ CONFIG_INPUT=y
590# CONFIG_INPUT_KEYBOARD is not set 518# CONFIG_INPUT_KEYBOARD is not set
591# CONFIG_INPUT_MOUSE is not set 519# CONFIG_INPUT_MOUSE is not set
592# CONFIG_INPUT_JOYSTICK is not set 520# CONFIG_INPUT_JOYSTICK is not set
521# CONFIG_INPUT_TABLET is not set
593# CONFIG_INPUT_TOUCHSCREEN is not set 522# CONFIG_INPUT_TOUCHSCREEN is not set
594# CONFIG_INPUT_MISC is not set 523# CONFIG_INPUT_MISC is not set
595 524
@@ -624,35 +553,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
624CONFIG_UNIX98_PTYS=y 553CONFIG_UNIX98_PTYS=y
625CONFIG_LEGACY_PTYS=y 554CONFIG_LEGACY_PTYS=y
626CONFIG_LEGACY_PTY_COUNT=256 555CONFIG_LEGACY_PTY_COUNT=256
627
628#
629# IPMI
630#
631# CONFIG_IPMI_HANDLER is not set 556# CONFIG_IPMI_HANDLER is not set
632
633#
634# Watchdog Cards
635#
636# CONFIG_WATCHDOG is not set 557# CONFIG_WATCHDOG is not set
637# CONFIG_HW_RANDOM is not set 558# CONFIG_HW_RANDOM is not set
638# CONFIG_RTC is not set 559# CONFIG_RTC is not set
639# CONFIG_GEN_RTC is not set
640# CONFIG_DTLK is not set
641# CONFIG_R3964 is not set 560# CONFIG_R3964 is not set
642# CONFIG_APPLICOM is not set 561# CONFIG_APPLICOM is not set
643CONFIG_GPIO_TB0219=y 562CONFIG_GPIO_TB0219=y
644# CONFIG_DRM is not set 563# CONFIG_DRM is not set
645CONFIG_GPIO_VR41XX=y 564CONFIG_GPIO_VR41XX=y
646# CONFIG_RAW_DRIVER is not set 565# CONFIG_RAW_DRIVER is not set
647
648#
649# TPM devices
650#
651# CONFIG_TCG_TPM is not set 566# CONFIG_TCG_TPM is not set
652 567CONFIG_DEVPORT=y
653#
654# I2C support
655#
656# CONFIG_I2C is not set 568# CONFIG_I2C is not set
657 569
658# 570#
@@ -660,17 +572,9 @@ CONFIG_GPIO_VR41XX=y
660# 572#
661# CONFIG_SPI is not set 573# CONFIG_SPI is not set
662# CONFIG_SPI_MASTER is not set 574# CONFIG_SPI_MASTER is not set
663
664#
665# Dallas's 1-wire bus
666#
667# CONFIG_W1 is not set 575# CONFIG_W1 is not set
668 576# CONFIG_POWER_SUPPLY is not set
669#
670# Hardware Monitoring support
671#
672# CONFIG_HWMON is not set 577# CONFIG_HWMON is not set
673# CONFIG_HWMON_VID is not set
674 578
675# 579#
676# Multifunction device drivers 580# Multifunction device drivers
@@ -681,17 +585,20 @@ CONFIG_GPIO_VR41XX=y
681# Multimedia devices 585# Multimedia devices
682# 586#
683# CONFIG_VIDEO_DEV is not set 587# CONFIG_VIDEO_DEV is not set
588# CONFIG_DVB_CORE is not set
589# CONFIG_DAB is not set
684 590
685# 591#
686# Digital Video Broadcasting Devices 592# Graphics support
687# 593#
688# CONFIG_DVB is not set 594# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
689# CONFIG_USB_DABUSB is not set
690 595
691# 596#
692# Graphics support 597# Display device support
693# 598#
694# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 599# CONFIG_DISPLAY_SUPPORT is not set
600# CONFIG_VGASTATE is not set
601# CONFIG_VIDEO_OUTPUT_CONTROL is not set
695# CONFIG_FB is not set 602# CONFIG_FB is not set
696 603
697# 604#
@@ -704,16 +611,8 @@ CONFIG_DUMMY_CONSOLE=y
704# Sound 611# Sound
705# 612#
706# CONFIG_SOUND is not set 613# CONFIG_SOUND is not set
707 614# CONFIG_HID_SUPPORT is not set
708# 615CONFIG_USB_SUPPORT=y
709# HID Devices
710#
711CONFIG_HID=y
712# CONFIG_HID_DEBUG is not set
713
714#
715# USB support
716#
717CONFIG_USB_ARCH_HAS_HCD=y 616CONFIG_USB_ARCH_HAS_HCD=y
718CONFIG_USB_ARCH_HAS_OHCI=y 617CONFIG_USB_ARCH_HAS_OHCI=y
719CONFIG_USB_ARCH_HAS_EHCI=y 618CONFIG_USB_ARCH_HAS_EHCI=y
@@ -724,8 +623,8 @@ CONFIG_USB=m
724# Miscellaneous USB options 623# Miscellaneous USB options
725# 624#
726CONFIG_USB_DEVICEFS=y 625CONFIG_USB_DEVICEFS=y
626CONFIG_USB_DEVICE_CLASS=y
727# CONFIG_USB_DYNAMIC_MINORS is not set 627# CONFIG_USB_DYNAMIC_MINORS is not set
728# CONFIG_USB_SUSPEND is not set
729# CONFIG_USB_OTG is not set 628# CONFIG_USB_OTG is not set
730 629
731# 630#
@@ -735,7 +634,6 @@ CONFIG_USB_EHCI_HCD=m
735# CONFIG_USB_EHCI_SPLIT_ISO is not set 634# CONFIG_USB_EHCI_SPLIT_ISO is not set
736# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 635# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
737# CONFIG_USB_EHCI_TT_NEWSCHED is not set 636# CONFIG_USB_EHCI_TT_NEWSCHED is not set
738# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
739# CONFIG_USB_ISP116X_HCD is not set 637# CONFIG_USB_ISP116X_HCD is not set
740CONFIG_USB_OHCI_HCD=m 638CONFIG_USB_OHCI_HCD=m
741# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 639# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -743,6 +641,7 @@ CONFIG_USB_OHCI_HCD=m
743CONFIG_USB_OHCI_LITTLE_ENDIAN=y 641CONFIG_USB_OHCI_LITTLE_ENDIAN=y
744# CONFIG_USB_UHCI_HCD is not set 642# CONFIG_USB_UHCI_HCD is not set
745# CONFIG_USB_SL811_HCD is not set 643# CONFIG_USB_SL811_HCD is not set
644# CONFIG_USB_R8A66597_HCD is not set
746 645
747# 646#
748# USB Device Class drivers 647# USB Device Class drivers
@@ -760,43 +659,9 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
760# CONFIG_USB_LIBUSUAL is not set 659# CONFIG_USB_LIBUSUAL is not set
761 660
762# 661#
763# USB Input Devices
764#
765# CONFIG_USB_HID is not set
766
767#
768# USB HID Boot Protocol drivers
769#
770# CONFIG_USB_KBD is not set
771# CONFIG_USB_MOUSE is not set
772# CONFIG_USB_AIPTEK is not set
773# CONFIG_USB_WACOM is not set
774# CONFIG_USB_ACECAD is not set
775# CONFIG_USB_KBTAB is not set
776# CONFIG_USB_POWERMATE is not set
777# CONFIG_USB_TOUCHSCREEN is not set
778# CONFIG_USB_YEALINK is not set
779# CONFIG_USB_XPAD is not set
780# CONFIG_USB_ATI_REMOTE is not set
781# CONFIG_USB_ATI_REMOTE2 is not set
782# CONFIG_USB_KEYSPAN_REMOTE is not set
783# CONFIG_USB_APPLETOUCH is not set
784# CONFIG_USB_GTCO is not set
785
786#
787# USB Imaging devices 662# USB Imaging devices
788# 663#
789# CONFIG_USB_MDC800 is not set 664# CONFIG_USB_MDC800 is not set
790
791#
792# USB Network Adapters
793#
794# CONFIG_USB_CATC is not set
795# CONFIG_USB_KAWETH is not set
796# CONFIG_USB_PEGASUS is not set
797# CONFIG_USB_RTL8150 is not set
798# CONFIG_USB_USBNET_MII is not set
799# CONFIG_USB_USBNET is not set
800CONFIG_USB_MON=y 665CONFIG_USB_MON=y
801 666
802# 667#
@@ -840,37 +705,9 @@ CONFIG_USB_MON=y
840# USB Gadget Support 705# USB Gadget Support
841# 706#
842# CONFIG_USB_GADGET is not set 707# CONFIG_USB_GADGET is not set
843
844#
845# MMC/SD Card support
846#
847# CONFIG_MMC is not set 708# CONFIG_MMC is not set
848
849#
850# LED devices
851#
852# CONFIG_NEW_LEDS is not set 709# CONFIG_NEW_LEDS is not set
853
854#
855# LED drivers
856#
857
858#
859# LED Triggers
860#
861
862#
863# InfiniBand support
864#
865# CONFIG_INFINIBAND is not set 710# CONFIG_INFINIBAND is not set
866
867#
868# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
869#
870
871#
872# Real Time Clock
873#
874CONFIG_RTC_LIB=y 711CONFIG_RTC_LIB=y
875CONFIG_RTC_CLASS=y 712CONFIG_RTC_CLASS=y
876CONFIG_RTC_HCTOSYS=y 713CONFIG_RTC_HCTOSYS=y
@@ -884,18 +721,29 @@ CONFIG_RTC_INTF_SYSFS=y
884CONFIG_RTC_INTF_PROC=y 721CONFIG_RTC_INTF_PROC=y
885CONFIG_RTC_INTF_DEV=y 722CONFIG_RTC_INTF_DEV=y
886# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 723# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
724# CONFIG_RTC_DRV_TEST is not set
725
726#
727# SPI RTC drivers
728#
887 729
888# 730#
889# RTC drivers 731# Platform RTC drivers
890# 732#
733# CONFIG_RTC_DRV_CMOS is not set
891# CONFIG_RTC_DRV_DS1553 is not set 734# CONFIG_RTC_DRV_DS1553 is not set
735# CONFIG_RTC_DRV_STK17TA8 is not set
892# CONFIG_RTC_DRV_DS1742 is not set 736# CONFIG_RTC_DRV_DS1742 is not set
893# CONFIG_RTC_DRV_M48T86 is not set 737# CONFIG_RTC_DRV_M48T86 is not set
894CONFIG_RTC_DRV_VR41XX=y 738# CONFIG_RTC_DRV_M48T59 is not set
895# CONFIG_RTC_DRV_TEST is not set
896# CONFIG_RTC_DRV_V3020 is not set 739# CONFIG_RTC_DRV_V3020 is not set
897 740
898# 741#
742# on-CPU RTC drivers
743#
744CONFIG_RTC_DRV_VR41XX=y
745
746#
899# DMA Engine support 747# DMA Engine support
900# 748#
901# CONFIG_DMA_ENGINE is not set 749# CONFIG_DMA_ENGINE is not set
@@ -909,12 +757,9 @@ CONFIG_RTC_DRV_VR41XX=y
909# 757#
910 758
911# 759#
912# Auxiliary Display support 760# Userspace I/O
913#
914
915#
916# Virtualization
917# 761#
762# CONFIG_UIO is not set
918 763
919# 764#
920# File systems 765# File systems
@@ -922,8 +767,14 @@ CONFIG_RTC_DRV_VR41XX=y
922CONFIG_EXT2_FS=y 767CONFIG_EXT2_FS=y
923# CONFIG_EXT2_FS_XATTR is not set 768# CONFIG_EXT2_FS_XATTR is not set
924# CONFIG_EXT2_FS_XIP is not set 769# CONFIG_EXT2_FS_XIP is not set
925# CONFIG_EXT3_FS is not set 770CONFIG_EXT3_FS=y
771CONFIG_EXT3_FS_XATTR=y
772# CONFIG_EXT3_FS_POSIX_ACL is not set
773# CONFIG_EXT3_FS_SECURITY is not set
926# CONFIG_EXT4DEV_FS is not set 774# CONFIG_EXT4DEV_FS is not set
775CONFIG_JBD=y
776# CONFIG_JBD_DEBUG is not set
777CONFIG_FS_MBCACHE=y
927# CONFIG_REISERFS_FS is not set 778# CONFIG_REISERFS_FS is not set
928# CONFIG_JFS_FS is not set 779# CONFIG_JFS_FS is not set
929CONFIG_FS_POSIX_ACL=y 780CONFIG_FS_POSIX_ACL=y
@@ -938,7 +789,7 @@ CONFIG_INOTIFY_USER=y
938CONFIG_DNOTIFY=y 789CONFIG_DNOTIFY=y
939# CONFIG_AUTOFS_FS is not set 790# CONFIG_AUTOFS_FS is not set
940CONFIG_AUTOFS4_FS=y 791CONFIG_AUTOFS4_FS=y
941CONFIG_FUSE_FS=m 792# CONFIG_FUSE_FS is not set
942CONFIG_GENERIC_ACL=y 793CONFIG_GENERIC_ACL=y
943 794
944# 795#
@@ -965,7 +816,7 @@ CONFIG_TMPFS=y
965CONFIG_TMPFS_POSIX_ACL=y 816CONFIG_TMPFS_POSIX_ACL=y
966# CONFIG_HUGETLB_PAGE is not set 817# CONFIG_HUGETLB_PAGE is not set
967CONFIG_RAMFS=y 818CONFIG_RAMFS=y
968CONFIG_CONFIGFS_FS=m 819# CONFIG_CONFIGFS_FS is not set
969 820
970# 821#
971# Miscellaneous filesystems 822# Miscellaneous filesystems
@@ -1003,6 +854,7 @@ CONFIG_LOCKD_V4=y
1003CONFIG_EXPORTFS=y 854CONFIG_EXPORTFS=y
1004CONFIG_NFS_COMMON=y 855CONFIG_NFS_COMMON=y
1005CONFIG_SUNRPC=y 856CONFIG_SUNRPC=y
857# CONFIG_SUNRPC_BIND34 is not set
1006# CONFIG_RPCSEC_GSS_KRB5 is not set 858# CONFIG_RPCSEC_GSS_KRB5 is not set
1007# CONFIG_RPCSEC_GSS_SPKM3 is not set 859# CONFIG_RPCSEC_GSS_SPKM3 is not set
1008# CONFIG_SMB_FS is not set 860# CONFIG_SMB_FS is not set
@@ -1010,7 +862,6 @@ CONFIG_SUNRPC=y
1010# CONFIG_NCP_FS is not set 862# CONFIG_NCP_FS is not set
1011# CONFIG_CODA_FS is not set 863# CONFIG_CODA_FS is not set
1012# CONFIG_AFS_FS is not set 864# CONFIG_AFS_FS is not set
1013# CONFIG_9P_FS is not set
1014 865
1015# 866#
1016# Partition Types 867# Partition Types
@@ -1026,10 +877,7 @@ CONFIG_MSDOS_PARTITION=y
1026# 877#
1027# Distributed Lock Manager 878# Distributed Lock Manager
1028# 879#
1029CONFIG_DLM=m 880# CONFIG_DLM is not set
1030CONFIG_DLM_TCP=y
1031# CONFIG_DLM_SCTP is not set
1032# CONFIG_DLM_DEBUG is not set
1033 881
1034# 882#
1035# Profiling support 883# Profiling support
@@ -1047,7 +895,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1047# CONFIG_DEBUG_FS is not set 895# CONFIG_DEBUG_FS is not set
1048# CONFIG_HEADERS_CHECK is not set 896# CONFIG_HEADERS_CHECK is not set
1049# CONFIG_DEBUG_KERNEL is not set 897# CONFIG_DEBUG_KERNEL is not set
1050CONFIG_LOG_BUF_SHIFT=14
1051CONFIG_CROSSCOMPILE=y 898CONFIG_CROSSCOMPILE=y
1052CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 899CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1053 900
@@ -1056,63 +903,20 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1056# 903#
1057# CONFIG_KEYS is not set 904# CONFIG_KEYS is not set
1058# CONFIG_SECURITY is not set 905# CONFIG_SECURITY is not set
1059 906# CONFIG_CRYPTO is not set
1060#
1061# Cryptographic options
1062#
1063CONFIG_CRYPTO=y
1064CONFIG_CRYPTO_ALGAPI=y
1065CONFIG_CRYPTO_BLKCIPHER=m
1066CONFIG_CRYPTO_HASH=m
1067CONFIG_CRYPTO_MANAGER=m
1068CONFIG_CRYPTO_HMAC=m
1069CONFIG_CRYPTO_XCBC=m
1070CONFIG_CRYPTO_NULL=m
1071CONFIG_CRYPTO_MD4=m
1072CONFIG_CRYPTO_MD5=y
1073CONFIG_CRYPTO_SHA1=m
1074CONFIG_CRYPTO_SHA256=m
1075CONFIG_CRYPTO_SHA512=m
1076CONFIG_CRYPTO_WP512=m
1077CONFIG_CRYPTO_TGR192=m
1078CONFIG_CRYPTO_GF128MUL=m
1079CONFIG_CRYPTO_ECB=m
1080CONFIG_CRYPTO_CBC=m
1081CONFIG_CRYPTO_PCBC=m
1082CONFIG_CRYPTO_LRW=m
1083CONFIG_CRYPTO_DES=m
1084CONFIG_CRYPTO_FCRYPT=m
1085CONFIG_CRYPTO_BLOWFISH=m
1086CONFIG_CRYPTO_TWOFISH=m
1087CONFIG_CRYPTO_TWOFISH_COMMON=m
1088CONFIG_CRYPTO_SERPENT=m
1089CONFIG_CRYPTO_AES=m
1090CONFIG_CRYPTO_CAST5=m
1091CONFIG_CRYPTO_CAST6=m
1092CONFIG_CRYPTO_TEA=m
1093CONFIG_CRYPTO_ARC4=m
1094CONFIG_CRYPTO_KHAZAD=m
1095CONFIG_CRYPTO_ANUBIS=m
1096CONFIG_CRYPTO_DEFLATE=m
1097CONFIG_CRYPTO_MICHAEL_MIC=m
1098CONFIG_CRYPTO_CRC32C=m
1099CONFIG_CRYPTO_CAMELLIA=m
1100# CONFIG_CRYPTO_TEST is not set
1101
1102#
1103# Hardware crypto devices
1104#
1105 907
1106# 908#
1107# Library routines 909# Library routines
1108# 910#
1109CONFIG_BITREVERSE=y 911CONFIG_BITREVERSE=y
1110# CONFIG_CRC_CCITT is not set 912CONFIG_CRC_CCITT=y
1111# CONFIG_CRC16 is not set 913# CONFIG_CRC16 is not set
914# CONFIG_CRC_ITU_T is not set
1112CONFIG_CRC32=y 915CONFIG_CRC32=y
1113CONFIG_LIBCRC32C=m 916# CONFIG_CRC7 is not set
917# CONFIG_LIBCRC32C is not set
1114CONFIG_ZLIB_INFLATE=m 918CONFIG_ZLIB_INFLATE=m
1115CONFIG_ZLIB_DEFLATE=m
1116CONFIG_PLIST=y 919CONFIG_PLIST=y
1117CONFIG_HAS_IOMEM=y 920CONFIG_HAS_IOMEM=y
1118CONFIG_HAS_IOPORT=y 921CONFIG_HAS_IOPORT=y
922CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig
index aea67568842a..9fd0faeacf53 100644
--- a/arch/mips/configs/tb0226_defconfig
+++ b/arch/mips/configs/tb0226_defconfig
@@ -1,68 +1,56 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:41 2007 4# Thu Aug 9 11:16:55 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58# CONFIG_CASIO_E55 is not set 45# CONFIG_CASIO_E55 is not set
59# CONFIG_IBM_WORKPAD is not set 46# CONFIG_IBM_WORKPAD is not set
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
61CONFIG_TANBAC_TB022X=y 48CONFIG_TANBAC_TB022X=y
62CONFIG_TANBAC_TB0226=y
63# CONFIG_TANBAC_TB0287 is not set
64# CONFIG_VICTOR_MPC30X is not set 49# CONFIG_VICTOR_MPC30X is not set
65# CONFIG_ZAO_CAPCELLA is not set 50# CONFIG_ZAO_CAPCELLA is not set
51# CONFIG_TANBAC_TB0219 is not set
52CONFIG_TANBAC_TB0226=y
53# CONFIG_TANBAC_TB0287 is not set
66CONFIG_PCI_VR41XX=y 54CONFIG_PCI_VR41XX=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 55CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set 56# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 63CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
76CONFIG_DMA_NONCOHERENT=y 64CONFIG_DMA_NONCOHERENT=y
77CONFIG_DMA_NEED_PCI_MAP_STATE=y 65CONFIG_DMA_NEED_PCI_MAP_STATE=y
66# CONFIG_HOTPLUG_CPU is not set
67# CONFIG_NO_IOPORT is not set
78# CONFIG_CPU_BIG_ENDIAN is not set 68# CONFIG_CPU_BIG_ENDIAN is not set
79CONFIG_CPU_LITTLE_ENDIAN=y 69CONFIG_CPU_LITTLE_ENDIAN=y
80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 70CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
84# 74#
85# CPU selection 75# CPU selection
86# 76#
77# CONFIG_CPU_LOONGSON2 is not set
87# CONFIG_CPU_MIPS32_R1 is not set 78# CONFIG_CPU_MIPS32_R1 is not set
88# CONFIG_CPU_MIPS32_R2 is not set 79# CONFIG_CPU_MIPS32_R2 is not set
89# CONFIG_CPU_MIPS64_R1 is not set 80# CONFIG_CPU_MIPS64_R1 is not set
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y
105# CONFIG_CPU_SB1 is not set 96# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_VR41XX=y 97CONFIG_SYS_HAS_CPU_VR41XX=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 98CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 99CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 100CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 101
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
121CONFIG_MIPS_MT_DISABLED=y 111CONFIG_MIPS_MT_DISABLED=y
122# CONFIG_MIPS_MT_SMP is not set 112# CONFIG_MIPS_MT_SMP is not set
123# CONFIG_MIPS_MT_SMTC is not set 113# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_VPE_LOADER is not set
125CONFIG_CPU_HAS_SYNC=y 114CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 115CONFIG_GENERIC_HARDIRQS=y
127CONFIG_GENERIC_IRQ_PROBE=y 116CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,48 +124,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 124# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 125CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 126# CONFIG_RESOURCES_64BIT is not set
138CONFIG_ZONE_DMA_FLAG=1 127CONFIG_ZONE_DMA_FLAG=0
128CONFIG_VIRT_TO_BUS=y
139# CONFIG_HZ_48 is not set 129# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 130# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 131# CONFIG_HZ_128 is not set
142# CONFIG_HZ_250 is not set 132CONFIG_HZ_250=y
143# CONFIG_HZ_256 is not set 133# CONFIG_HZ_256 is not set
144CONFIG_HZ_1000=y 134# CONFIG_HZ_1000 is not set
145# CONFIG_HZ_1024 is not set 135# CONFIG_HZ_1024 is not set
146CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 136CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
147CONFIG_HZ=1000 137CONFIG_HZ=250
148CONFIG_PREEMPT_NONE=y 138CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 139# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 140# CONFIG_PREEMPT is not set
151# CONFIG_KEXEC is not set 141# CONFIG_KEXEC is not set
142CONFIG_SECCOMP=y
152CONFIG_LOCKDEP_SUPPORT=y 143CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 144CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 145CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
155 146
156# 147#
157# Code maturity level options 148# General setup
158# 149#
159CONFIG_EXPERIMENTAL=y 150CONFIG_EXPERIMENTAL=y
160CONFIG_BROKEN_ON_SMP=y 151CONFIG_BROKEN_ON_SMP=y
161CONFIG_INIT_ENV_ARG_LIMIT=32 152CONFIG_INIT_ENV_ARG_LIMIT=32
162
163#
164# General setup
165#
166CONFIG_LOCALVERSION="" 153CONFIG_LOCALVERSION=""
167CONFIG_LOCALVERSION_AUTO=y 154CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 155CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 156CONFIG_SYSVIPC=y
170# CONFIG_IPC_NS is not set
171CONFIG_SYSVIPC_SYSCTL=y 157CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 158# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 159# CONFIG_BSD_PROCESS_ACCT is not set
174# CONFIG_TASKSTATS is not set 160# CONFIG_TASKSTATS is not set
175# CONFIG_UTS_NS is not set 161# CONFIG_USER_NS is not set
176# CONFIG_AUDIT is not set 162# CONFIG_AUDIT is not set
177# CONFIG_IKCONFIG is not set 163# CONFIG_IKCONFIG is not set
164CONFIG_LOG_BUF_SHIFT=14
178CONFIG_SYSFS_DEPRECATED=y 165CONFIG_SYSFS_DEPRECATED=y
179# CONFIG_RELAY is not set 166# CONFIG_RELAY is not set
167# CONFIG_BLK_DEV_INITRD is not set
180# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
181CONFIG_SYSCTL=y 169CONFIG_SYSCTL=y
182CONFIG_EMBEDDED=y 170CONFIG_EMBEDDED=y
@@ -189,32 +177,30 @@ CONFIG_BUG=y
189CONFIG_ELF_CORE=y 177CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 178CONFIG_BASE_FULL=y
191CONFIG_FUTEX=y 179CONFIG_FUTEX=y
180CONFIG_ANON_INODES=y
192CONFIG_EPOLL=y 181CONFIG_EPOLL=y
182CONFIG_SIGNALFD=y
183CONFIG_TIMERFD=y
184CONFIG_EVENTFD=y
193CONFIG_SHMEM=y 185CONFIG_SHMEM=y
194CONFIG_SLAB=y
195CONFIG_VM_EVENT_COUNTERS=y 186CONFIG_VM_EVENT_COUNTERS=y
187CONFIG_SLAB=y
188# CONFIG_SLUB is not set
189# CONFIG_SLOB is not set
196CONFIG_RT_MUTEXES=y 190CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 191# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 192CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set
200
201#
202# Loadable module support
203#
204CONFIG_MODULES=y 193CONFIG_MODULES=y
205CONFIG_MODULE_UNLOAD=y 194CONFIG_MODULE_UNLOAD=y
206# CONFIG_MODULE_FORCE_UNLOAD is not set 195CONFIG_MODULE_FORCE_UNLOAD=y
207CONFIG_MODVERSIONS=y 196CONFIG_MODVERSIONS=y
208CONFIG_MODULE_SRCVERSION_ALL=y 197CONFIG_MODULE_SRCVERSION_ALL=y
209CONFIG_KMOD=y 198CONFIG_KMOD=y
210
211#
212# Block layer
213#
214CONFIG_BLOCK=y 199CONFIG_BLOCK=y
215# CONFIG_LBD is not set 200# CONFIG_LBD is not set
216# CONFIG_BLK_DEV_IO_TRACE is not set 201# CONFIG_BLK_DEV_IO_TRACE is not set
217# CONFIG_LSF is not set 202# CONFIG_LSF is not set
203# CONFIG_BLK_DEV_BSG is not set
218 204
219# 205#
220# IO Schedulers 206# IO Schedulers
@@ -234,16 +220,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
234# 220#
235CONFIG_HW_HAS_PCI=y 221CONFIG_HW_HAS_PCI=y
236CONFIG_PCI=y 222CONFIG_PCI=y
223# CONFIG_ARCH_SUPPORTS_MSI is not set
237CONFIG_MMU=y 224CONFIG_MMU=y
238 225
239# 226#
240# PCCARD (PCMCIA/CardBus) support 227# PCCARD (PCMCIA/CardBus) support
241# 228#
242# CONFIG_PCCARD is not set 229# CONFIG_PCCARD is not set
243
244#
245# PCI Hotplug Support
246#
247# CONFIG_HOTPLUG_PCI is not set 230# CONFIG_HOTPLUG_PCI is not set
248 231
249# 232#
@@ -256,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y
256# 239#
257# Power management options 240# Power management options
258# 241#
259CONFIG_PM=y 242# CONFIG_PM is not set
260# CONFIG_PM_LEGACY is not set
261# CONFIG_PM_DEBUG is not set
262# CONFIG_PM_SYSFS_DEPRECATED is not set
263 243
264# 244#
265# Networking 245# Networking
@@ -269,14 +249,9 @@ CONFIG_NET=y
269# 249#
270# Networking options 250# Networking options
271# 251#
272# CONFIG_NETDEBUG is not set
273CONFIG_PACKET=y 252CONFIG_PACKET=y
274# CONFIG_PACKET_MMAP is not set 253# CONFIG_PACKET_MMAP is not set
275CONFIG_UNIX=y 254CONFIG_UNIX=y
276CONFIG_XFRM=y
277# CONFIG_XFRM_USER is not set
278# CONFIG_XFRM_SUB_POLICY is not set
279CONFIG_XFRM_MIGRATE=y
280# CONFIG_NET_KEY is not set 255# CONFIG_NET_KEY is not set
281CONFIG_INET=y 256CONFIG_INET=y
282CONFIG_IP_MULTICAST=y 257CONFIG_IP_MULTICAST=y
@@ -286,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y
286CONFIG_IP_FIB_HASH=y 261CONFIG_IP_FIB_HASH=y
287CONFIG_IP_MULTIPLE_TABLES=y 262CONFIG_IP_MULTIPLE_TABLES=y
288CONFIG_IP_ROUTE_MULTIPATH=y 263CONFIG_IP_ROUTE_MULTIPATH=y
289# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
290CONFIG_IP_ROUTE_VERBOSE=y 264CONFIG_IP_ROUTE_VERBOSE=y
291CONFIG_IP_PNP=y 265CONFIG_IP_PNP=y
292# CONFIG_IP_PNP_DHCP is not set 266# CONFIG_IP_PNP_DHCP is not set
@@ -302,34 +276,25 @@ CONFIG_SYN_COOKIES=y
302# CONFIG_INET_IPCOMP is not set 276# CONFIG_INET_IPCOMP is not set
303# CONFIG_INET_XFRM_TUNNEL is not set 277# CONFIG_INET_XFRM_TUNNEL is not set
304# CONFIG_INET_TUNNEL is not set 278# CONFIG_INET_TUNNEL is not set
305CONFIG_INET_XFRM_MODE_TRANSPORT=m 279# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
306CONFIG_INET_XFRM_MODE_TUNNEL=m 280# CONFIG_INET_XFRM_MODE_TUNNEL is not set
307CONFIG_INET_XFRM_MODE_BEET=m 281# CONFIG_INET_XFRM_MODE_BEET is not set
308CONFIG_INET_DIAG=y 282CONFIG_INET_DIAG=y
309CONFIG_INET_TCP_DIAG=y 283CONFIG_INET_TCP_DIAG=y
310# CONFIG_TCP_CONG_ADVANCED is not set 284# CONFIG_TCP_CONG_ADVANCED is not set
311CONFIG_TCP_CONG_CUBIC=y 285CONFIG_TCP_CONG_CUBIC=y
312CONFIG_DEFAULT_TCP_CONG="cubic" 286CONFIG_DEFAULT_TCP_CONG="cubic"
313CONFIG_TCP_MD5SIG=y 287# CONFIG_TCP_MD5SIG is not set
314# CONFIG_IPV6 is not set 288# CONFIG_IPV6 is not set
315# CONFIG_INET6_XFRM_TUNNEL is not set 289# CONFIG_INET6_XFRM_TUNNEL is not set
316# CONFIG_INET6_TUNNEL is not set 290# CONFIG_INET6_TUNNEL is not set
317CONFIG_NETWORK_SECMARK=y 291CONFIG_NETWORK_SECMARK=y
318# CONFIG_NETFILTER is not set 292# CONFIG_NETFILTER is not set
319
320#
321# DCCP Configuration (EXPERIMENTAL)
322#
323# CONFIG_IP_DCCP is not set 293# CONFIG_IP_DCCP is not set
324
325#
326# SCTP Configuration (EXPERIMENTAL)
327#
328# CONFIG_IP_SCTP is not set 294# CONFIG_IP_SCTP is not set
329 295# CONFIG_SCTP_HMAC_NONE is not set
330# 296# CONFIG_SCTP_HMAC_SHA1 is not set
331# TIPC Configuration (EXPERIMENTAL) 297# CONFIG_SCTP_HMAC_MD5 is not set
332#
333# CONFIG_TIPC is not set 298# CONFIG_TIPC is not set
334# CONFIG_ATM is not set 299# CONFIG_ATM is not set
335# CONFIG_BRIDGE is not set 300# CONFIG_BRIDGE is not set
@@ -355,10 +320,20 @@ CONFIG_NETWORK_SECMARK=y
355# CONFIG_HAMRADIO is not set 320# CONFIG_HAMRADIO is not set
356# CONFIG_IRDA is not set 321# CONFIG_IRDA is not set
357# CONFIG_BT is not set 322# CONFIG_BT is not set
358# CONFIG_IEEE80211 is not set 323# CONFIG_AF_RXRPC is not set
359CONFIG_FIB_RULES=y 324CONFIG_FIB_RULES=y
360 325
361# 326#
327# Wireless
328#
329# CONFIG_CFG80211 is not set
330# CONFIG_WIRELESS_EXT is not set
331# CONFIG_MAC80211 is not set
332# CONFIG_IEEE80211 is not set
333# CONFIG_RFKILL is not set
334# CONFIG_NET_9P is not set
335
336#
362# Device Drivers 337# Device Drivers
363# 338#
364 339
@@ -369,30 +344,10 @@ CONFIG_STANDALONE=y
369CONFIG_PREVENT_FIRMWARE_BUILD=y 344CONFIG_PREVENT_FIRMWARE_BUILD=y
370CONFIG_FW_LOADER=y 345CONFIG_FW_LOADER=y
371# CONFIG_SYS_HYPERVISOR is not set 346# CONFIG_SYS_HYPERVISOR is not set
372 347# CONFIG_CONNECTOR is not set
373#
374# Connector - unified userspace <-> kernelspace linker
375#
376CONFIG_CONNECTOR=m
377
378#
379# Memory Technology Devices (MTD)
380#
381# CONFIG_MTD is not set 348# CONFIG_MTD is not set
382
383#
384# Parallel port support
385#
386# CONFIG_PARPORT is not set 349# CONFIG_PARPORT is not set
387 350CONFIG_BLK_DEV=y
388#
389# Plug and Play support
390#
391# CONFIG_PNPACPI is not set
392
393#
394# Block devices
395#
396# CONFIG_BLK_CPQ_DA is not set 351# CONFIG_BLK_CPQ_DA is not set
397# CONFIG_BLK_CPQ_CISS_DA is not set 352# CONFIG_BLK_CPQ_CISS_DA is not set
398# CONFIG_BLK_DEV_DAC960 is not set 353# CONFIG_BLK_DEV_DAC960 is not set
@@ -407,19 +362,9 @@ CONFIG_BLK_DEV_RAM=y
407CONFIG_BLK_DEV_RAM_COUNT=16 362CONFIG_BLK_DEV_RAM_COUNT=16
408CONFIG_BLK_DEV_RAM_SIZE=4096 363CONFIG_BLK_DEV_RAM_SIZE=4096
409CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 364CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
410# CONFIG_BLK_DEV_INITRD is not set
411# CONFIG_CDROM_PKTCDVD is not set 365# CONFIG_CDROM_PKTCDVD is not set
412# CONFIG_ATA_OVER_ETH is not set 366# CONFIG_ATA_OVER_ETH is not set
413 367# CONFIG_MISC_DEVICES is not set
414#
415# Misc devices
416#
417CONFIG_SGI_IOC4=m
418# CONFIG_TIFM_CORE is not set
419
420#
421# ATA/ATAPI/MFM/RLL support
422#
423# CONFIG_IDE is not set 368# CONFIG_IDE is not set
424 369
425# 370#
@@ -427,6 +372,7 @@ CONFIG_SGI_IOC4=m
427# 372#
428# CONFIG_RAID_ATTRS is not set 373# CONFIG_RAID_ATTRS is not set
429CONFIG_SCSI=y 374CONFIG_SCSI=y
375CONFIG_SCSI_DMA=y
430CONFIG_SCSI_TGT=m 376CONFIG_SCSI_TGT=m
431# CONFIG_SCSI_NETLINK is not set 377# CONFIG_SCSI_NETLINK is not set
432CONFIG_SCSI_PROC_FS=y 378CONFIG_SCSI_PROC_FS=y
@@ -448,6 +394,7 @@ CONFIG_SCSI_MULTI_LUN=y
448# CONFIG_SCSI_CONSTANTS is not set 394# CONFIG_SCSI_CONSTANTS is not set
449# CONFIG_SCSI_LOGGING is not set 395# CONFIG_SCSI_LOGGING is not set
450CONFIG_SCSI_SCAN_ASYNC=y 396CONFIG_SCSI_SCAN_ASYNC=y
397CONFIG_SCSI_WAIT_SCAN=m
451 398
452# 399#
453# SCSI Transports 400# SCSI Transports
@@ -458,51 +405,8 @@ CONFIG_SCSI_SCAN_ASYNC=y
458CONFIG_SCSI_SAS_ATTRS=m 405CONFIG_SCSI_SAS_ATTRS=m
459CONFIG_SCSI_SAS_LIBSAS=m 406CONFIG_SCSI_SAS_LIBSAS=m
460# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set 407# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
461 408# CONFIG_SCSI_LOWLEVEL is not set
462#
463# SCSI low-level drivers
464#
465# CONFIG_ISCSI_TCP is not set
466# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
467# CONFIG_SCSI_3W_9XXX is not set
468# CONFIG_SCSI_ACARD is not set
469# CONFIG_SCSI_AACRAID is not set
470# CONFIG_SCSI_AIC7XXX is not set
471# CONFIG_SCSI_AIC7XXX_OLD is not set
472# CONFIG_SCSI_AIC79XX is not set
473CONFIG_SCSI_AIC94XX=m
474# CONFIG_AIC94XX_DEBUG is not set
475# CONFIG_SCSI_DPT_I2O is not set
476# CONFIG_SCSI_ARCMSR is not set
477# CONFIG_MEGARAID_NEWGEN is not set
478# CONFIG_MEGARAID_LEGACY is not set
479# CONFIG_MEGARAID_SAS is not set
480# CONFIG_SCSI_HPTIOP is not set
481# CONFIG_SCSI_DMX3191D is not set
482# CONFIG_SCSI_FUTURE_DOMAIN is not set
483# CONFIG_SCSI_IPS is not set
484# CONFIG_SCSI_INITIO is not set
485# CONFIG_SCSI_INIA100 is not set
486# CONFIG_SCSI_STEX is not set
487# CONFIG_SCSI_SYM53C8XX_2 is not set
488# CONFIG_SCSI_QLOGIC_1280 is not set
489# CONFIG_SCSI_QLA_FC is not set
490# CONFIG_SCSI_QLA_ISCSI is not set
491# CONFIG_SCSI_LPFC is not set
492# CONFIG_SCSI_DC395x is not set
493# CONFIG_SCSI_DC390T is not set
494# CONFIG_SCSI_NSP32 is not set
495# CONFIG_SCSI_DEBUG is not set
496# CONFIG_SCSI_SRP is not set
497
498#
499# Serial ATA (prod) and Parallel ATA (experimental) drivers
500#
501# CONFIG_ATA is not set 409# CONFIG_ATA is not set
502
503#
504# Multi-device support (RAID and LVM)
505#
506# CONFIG_MD is not set 410# CONFIG_MD is not set
507 411
508# 412#
@@ -516,59 +420,26 @@ CONFIG_SCSI_AIC94XX=m
516# 420#
517# IEEE 1394 (FireWire) support 421# IEEE 1394 (FireWire) support
518# 422#
423# CONFIG_FIREWIRE is not set
519# CONFIG_IEEE1394 is not set 424# CONFIG_IEEE1394 is not set
520
521#
522# I2O device support
523#
524# CONFIG_I2O is not set 425# CONFIG_I2O is not set
525
526#
527# Network device support
528#
529CONFIG_NETDEVICES=y 426CONFIG_NETDEVICES=y
427# CONFIG_NETDEVICES_MULTIQUEUE is not set
530# CONFIG_DUMMY is not set 428# CONFIG_DUMMY is not set
531# CONFIG_BONDING is not set 429# CONFIG_BONDING is not set
430# CONFIG_MACVLAN is not set
532# CONFIG_EQUALIZER is not set 431# CONFIG_EQUALIZER is not set
533# CONFIG_TUN is not set 432# CONFIG_TUN is not set
534
535#
536# ARCnet devices
537#
538# CONFIG_ARCNET is not set 433# CONFIG_ARCNET is not set
539 434# CONFIG_PHYLIB is not set
540#
541# PHY device support
542#
543CONFIG_PHYLIB=m
544
545#
546# MII PHY device drivers
547#
548CONFIG_MARVELL_PHY=m
549CONFIG_DAVICOM_PHY=m
550CONFIG_QSEMI_PHY=m
551CONFIG_LXT_PHY=m
552CONFIG_CICADA_PHY=m
553CONFIG_VITESSE_PHY=m
554CONFIG_SMSC_PHY=m
555# CONFIG_BROADCOM_PHY is not set
556# CONFIG_FIXED_PHY is not set
557
558#
559# Ethernet (10 or 100Mbit)
560#
561CONFIG_NET_ETHERNET=y 435CONFIG_NET_ETHERNET=y
562CONFIG_MII=y 436CONFIG_MII=y
437# CONFIG_AX88796 is not set
563# CONFIG_HAPPYMEAL is not set 438# CONFIG_HAPPYMEAL is not set
564# CONFIG_SUNGEM is not set 439# CONFIG_SUNGEM is not set
565# CONFIG_CASSINI is not set 440# CONFIG_CASSINI is not set
566# CONFIG_NET_VENDOR_3COM is not set 441# CONFIG_NET_VENDOR_3COM is not set
567# CONFIG_DM9000 is not set 442# CONFIG_DM9000 is not set
568
569#
570# Tulip family network device support
571#
572# CONFIG_NET_TULIP is not set 443# CONFIG_NET_TULIP is not set
573# CONFIG_HP100 is not set 444# CONFIG_HP100 is not set
574CONFIG_NET_PCI=y 445CONFIG_NET_PCI=y
@@ -577,6 +448,7 @@ CONFIG_NET_PCI=y
577# CONFIG_ADAPTEC_STARFIRE is not set 448# CONFIG_ADAPTEC_STARFIRE is not set
578# CONFIG_B44 is not set 449# CONFIG_B44 is not set
579# CONFIG_FORCEDETH is not set 450# CONFIG_FORCEDETH is not set
451# CONFIG_TC35815 is not set
580# CONFIG_DGRS is not set 452# CONFIG_DGRS is not set
581# CONFIG_EEPRO100 is not set 453# CONFIG_EEPRO100 is not set
582CONFIG_E100=y 454CONFIG_E100=y
@@ -591,50 +463,25 @@ CONFIG_E100=y
591# CONFIG_TLAN is not set 463# CONFIG_TLAN is not set
592# CONFIG_VIA_RHINE is not set 464# CONFIG_VIA_RHINE is not set
593# CONFIG_SC92031 is not set 465# CONFIG_SC92031 is not set
594 466# CONFIG_NETDEV_1000 is not set
595# 467# CONFIG_NETDEV_10000 is not set
596# Ethernet (1000 Mbit)
597#
598# CONFIG_ACENIC is not set
599# CONFIG_DL2K is not set
600# CONFIG_E1000 is not set
601# CONFIG_NS83820 is not set
602# CONFIG_HAMACHI is not set
603# CONFIG_YELLOWFIN is not set
604# CONFIG_R8169 is not set
605# CONFIG_SIS190 is not set
606# CONFIG_SKGE is not set
607# CONFIG_SKY2 is not set
608# CONFIG_SK98LIN is not set
609# CONFIG_VIA_VELOCITY is not set
610# CONFIG_TIGON3 is not set
611# CONFIG_BNX2 is not set
612CONFIG_QLA3XXX=m
613# CONFIG_ATL1 is not set
614
615#
616# Ethernet (10000 Mbit)
617#
618# CONFIG_CHELSIO_T1 is not set
619CONFIG_CHELSIO_T3=m
620# CONFIG_IXGB is not set
621# CONFIG_S2IO is not set
622# CONFIG_MYRI10GE is not set
623CONFIG_NETXEN_NIC=m
624
625#
626# Token Ring devices
627#
628# CONFIG_TR is not set 468# CONFIG_TR is not set
629 469
630# 470#
631# Wireless LAN (non-hamradio) 471# Wireless LAN
632# 472#
633# CONFIG_NET_RADIO is not set 473# CONFIG_WLAN_PRE80211 is not set
474# CONFIG_WLAN_80211 is not set
634 475
635# 476#
636# Wan interfaces 477# USB Network Adapters
637# 478#
479CONFIG_USB_CATC=m
480CONFIG_USB_KAWETH=m
481CONFIG_USB_PEGASUS=m
482CONFIG_USB_RTL8150=m
483# CONFIG_USB_USBNET_MII is not set
484# CONFIG_USB_USBNET is not set
638# CONFIG_WAN is not set 485# CONFIG_WAN is not set
639# CONFIG_FDDI is not set 486# CONFIG_FDDI is not set
640# CONFIG_HIPPI is not set 487# CONFIG_HIPPI is not set
@@ -645,15 +492,7 @@ CONFIG_NETXEN_NIC=m
645# CONFIG_NETCONSOLE is not set 492# CONFIG_NETCONSOLE is not set
646# CONFIG_NETPOLL is not set 493# CONFIG_NETPOLL is not set
647# CONFIG_NET_POLL_CONTROLLER is not set 494# CONFIG_NET_POLL_CONTROLLER is not set
648
649#
650# ISDN subsystem
651#
652# CONFIG_ISDN is not set 495# CONFIG_ISDN is not set
653
654#
655# Telephony Support
656#
657# CONFIG_PHONE is not set 496# CONFIG_PHONE is not set
658 497
659# 498#
@@ -661,6 +500,7 @@ CONFIG_NETXEN_NIC=m
661# 500#
662CONFIG_INPUT=y 501CONFIG_INPUT=y
663# CONFIG_INPUT_FF_MEMLESS is not set 502# CONFIG_INPUT_FF_MEMLESS is not set
503# CONFIG_INPUT_POLLDEV is not set
664 504
665# 505#
666# Userland interfaces 506# Userland interfaces
@@ -677,6 +517,7 @@ CONFIG_INPUT=y
677# CONFIG_INPUT_KEYBOARD is not set 517# CONFIG_INPUT_KEYBOARD is not set
678# CONFIG_INPUT_MOUSE is not set 518# CONFIG_INPUT_MOUSE is not set
679# CONFIG_INPUT_JOYSTICK is not set 519# CONFIG_INPUT_JOYSTICK is not set
520# CONFIG_INPUT_TABLET is not set
680# CONFIG_INPUT_TOUCHSCREEN is not set 521# CONFIG_INPUT_TOUCHSCREEN is not set
681# CONFIG_INPUT_MISC is not set 522# CONFIG_INPUT_MISC is not set
682 523
@@ -711,35 +552,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
711CONFIG_UNIX98_PTYS=y 552CONFIG_UNIX98_PTYS=y
712CONFIG_LEGACY_PTYS=y 553CONFIG_LEGACY_PTYS=y
713CONFIG_LEGACY_PTY_COUNT=256 554CONFIG_LEGACY_PTY_COUNT=256
714
715#
716# IPMI
717#
718# CONFIG_IPMI_HANDLER is not set 555# CONFIG_IPMI_HANDLER is not set
719
720#
721# Watchdog Cards
722#
723# CONFIG_WATCHDOG is not set 556# CONFIG_WATCHDOG is not set
724# CONFIG_HW_RANDOM is not set 557# CONFIG_HW_RANDOM is not set
725# CONFIG_RTC is not set 558# CONFIG_RTC is not set
726# CONFIG_GEN_RTC is not set
727# CONFIG_DTLK is not set
728# CONFIG_R3964 is not set 559# CONFIG_R3964 is not set
729# CONFIG_APPLICOM is not set 560# CONFIG_APPLICOM is not set
730# CONFIG_TANBAC_TB0219 is not set 561# CONFIG_GPIO_TB0219 is not set
731# CONFIG_DRM is not set 562# CONFIG_DRM is not set
732CONFIG_GPIO_VR41XX=y 563CONFIG_GPIO_VR41XX=y
733# CONFIG_RAW_DRIVER is not set 564# CONFIG_RAW_DRIVER is not set
734
735#
736# TPM devices
737#
738# CONFIG_TCG_TPM is not set 565# CONFIG_TCG_TPM is not set
739 566CONFIG_DEVPORT=y
740#
741# I2C support
742#
743# CONFIG_I2C is not set 567# CONFIG_I2C is not set
744 568
745# 569#
@@ -747,33 +571,33 @@ CONFIG_GPIO_VR41XX=y
747# 571#
748# CONFIG_SPI is not set 572# CONFIG_SPI is not set
749# CONFIG_SPI_MASTER is not set 573# CONFIG_SPI_MASTER is not set
750
751#
752# Dallas's 1-wire bus
753#
754# CONFIG_W1 is not set 574# CONFIG_W1 is not set
575# CONFIG_POWER_SUPPLY is not set
576# CONFIG_HWMON is not set
755 577
756# 578#
757# Hardware Monitoring support 579# Multifunction device drivers
758# 580#
759# CONFIG_HWMON is not set 581# CONFIG_MFD_SM501 is not set
760# CONFIG_HWMON_VID is not set
761 582
762# 583#
763# Multimedia devices 584# Multimedia devices
764# 585#
765# CONFIG_VIDEO_DEV is not set 586# CONFIG_VIDEO_DEV is not set
587# CONFIG_DVB_CORE is not set
588# CONFIG_DAB is not set
766 589
767# 590#
768# Digital Video Broadcasting Devices 591# Graphics support
769# 592#
770# CONFIG_DVB is not set 593# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
771# CONFIG_USB_DABUSB is not set
772 594
773# 595#
774# Graphics support 596# Display device support
775# 597#
776# CONFIG_FIRMWARE_EDID is not set 598# CONFIG_DISPLAY_SUPPORT is not set
599# CONFIG_VGASTATE is not set
600# CONFIG_VIDEO_OUTPUT_CONTROL is not set
777# CONFIG_FB is not set 601# CONFIG_FB is not set
778 602
779# 603#
@@ -781,22 +605,13 @@ CONFIG_GPIO_VR41XX=y
781# 605#
782# CONFIG_VGA_CONSOLE is not set 606# CONFIG_VGA_CONSOLE is not set
783CONFIG_DUMMY_CONSOLE=y 607CONFIG_DUMMY_CONSOLE=y
784# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
785 608
786# 609#
787# Sound 610# Sound
788# 611#
789# CONFIG_SOUND is not set 612# CONFIG_SOUND is not set
790 613# CONFIG_HID_SUPPORT is not set
791# 614CONFIG_USB_SUPPORT=y
792# HID Devices
793#
794CONFIG_HID=y
795# CONFIG_HID_DEBUG is not set
796
797#
798# USB support
799#
800CONFIG_USB_ARCH_HAS_HCD=y 615CONFIG_USB_ARCH_HAS_HCD=y
801CONFIG_USB_ARCH_HAS_OHCI=y 616CONFIG_USB_ARCH_HAS_OHCI=y
802CONFIG_USB_ARCH_HAS_EHCI=y 617CONFIG_USB_ARCH_HAS_EHCI=y
@@ -807,8 +622,8 @@ CONFIG_USB=y
807# Miscellaneous USB options 622# Miscellaneous USB options
808# 623#
809CONFIG_USB_DEVICEFS=y 624CONFIG_USB_DEVICEFS=y
625CONFIG_USB_DEVICE_CLASS=y
810# CONFIG_USB_DYNAMIC_MINORS is not set 626# CONFIG_USB_DYNAMIC_MINORS is not set
811# CONFIG_USB_SUSPEND is not set
812# CONFIG_USB_OTG is not set 627# CONFIG_USB_OTG is not set
813 628
814# 629#
@@ -818,7 +633,6 @@ CONFIG_USB_EHCI_HCD=y
818# CONFIG_USB_EHCI_SPLIT_ISO is not set 633# CONFIG_USB_EHCI_SPLIT_ISO is not set
819# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 634# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
820# CONFIG_USB_EHCI_TT_NEWSCHED is not set 635# CONFIG_USB_EHCI_TT_NEWSCHED is not set
821# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
822# CONFIG_USB_ISP116X_HCD is not set 636# CONFIG_USB_ISP116X_HCD is not set
823CONFIG_USB_OHCI_HCD=y 637CONFIG_USB_OHCI_HCD=y
824# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 638# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -826,11 +640,12 @@ CONFIG_USB_OHCI_HCD=y
826CONFIG_USB_OHCI_LITTLE_ENDIAN=y 640CONFIG_USB_OHCI_LITTLE_ENDIAN=y
827# CONFIG_USB_UHCI_HCD is not set 641# CONFIG_USB_UHCI_HCD is not set
828# CONFIG_USB_SL811_HCD is not set 642# CONFIG_USB_SL811_HCD is not set
643# CONFIG_USB_R8A66597_HCD is not set
829 644
830# 645#
831# USB Device Class drivers 646# USB Device Class drivers
832# 647#
833# CONFIG_USB_ACM is not set 648CONFIG_USB_ACM=y
834# CONFIG_USB_PRINTER is not set 649# CONFIG_USB_PRINTER is not set
835 650
836# 651#
@@ -854,44 +669,10 @@ CONFIG_USB_STORAGE=y
854# CONFIG_USB_LIBUSUAL is not set 669# CONFIG_USB_LIBUSUAL is not set
855 670
856# 671#
857# USB Input Devices
858#
859# CONFIG_USB_HID is not set
860
861#
862# USB HID Boot Protocol drivers
863#
864# CONFIG_USB_KBD is not set
865# CONFIG_USB_MOUSE is not set
866# CONFIG_USB_AIPTEK is not set
867# CONFIG_USB_WACOM is not set
868# CONFIG_USB_ACECAD is not set
869# CONFIG_USB_KBTAB is not set
870# CONFIG_USB_POWERMATE is not set
871# CONFIG_USB_TOUCHSCREEN is not set
872# CONFIG_USB_YEALINK is not set
873# CONFIG_USB_XPAD is not set
874# CONFIG_USB_ATI_REMOTE is not set
875# CONFIG_USB_ATI_REMOTE2 is not set
876# CONFIG_USB_KEYSPAN_REMOTE is not set
877# CONFIG_USB_APPLETOUCH is not set
878# CONFIG_USB_GTCO is not set
879
880#
881# USB Imaging devices 672# USB Imaging devices
882# 673#
883# CONFIG_USB_MDC800 is not set 674# CONFIG_USB_MDC800 is not set
884# CONFIG_USB_MICROTEK is not set 675# CONFIG_USB_MICROTEK is not set
885
886#
887# USB Network Adapters
888#
889# CONFIG_USB_CATC is not set
890# CONFIG_USB_KAWETH is not set
891# CONFIG_USB_PEGASUS is not set
892# CONFIG_USB_RTL8150 is not set
893# CONFIG_USB_USBNET_MII is not set
894# CONFIG_USB_USBNET is not set
895# CONFIG_USB_MON is not set 676# CONFIG_USB_MON is not set
896 677
897# 678#
@@ -924,6 +705,7 @@ CONFIG_USB_STORAGE=y
924# CONFIG_USB_SISUSBVGA is not set 705# CONFIG_USB_SISUSBVGA is not set
925# CONFIG_USB_LD is not set 706# CONFIG_USB_LD is not set
926# CONFIG_USB_TRANCEVIBRATOR is not set 707# CONFIG_USB_TRANCEVIBRATOR is not set
708# CONFIG_USB_IOWARRIOR is not set
927# CONFIG_USB_TEST is not set 709# CONFIG_USB_TEST is not set
928 710
929# 711#
@@ -934,37 +716,9 @@ CONFIG_USB_STORAGE=y
934# USB Gadget Support 716# USB Gadget Support
935# 717#
936# CONFIG_USB_GADGET is not set 718# CONFIG_USB_GADGET is not set
937
938#
939# MMC/SD Card support
940#
941# CONFIG_MMC is not set 719# CONFIG_MMC is not set
942
943#
944# LED devices
945#
946# CONFIG_NEW_LEDS is not set 720# CONFIG_NEW_LEDS is not set
947
948#
949# LED drivers
950#
951
952#
953# LED Triggers
954#
955
956#
957# InfiniBand support
958#
959# CONFIG_INFINIBAND is not set 721# CONFIG_INFINIBAND is not set
960
961#
962# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
963#
964
965#
966# Real Time Clock
967#
968CONFIG_RTC_LIB=y 722CONFIG_RTC_LIB=y
969CONFIG_RTC_CLASS=y 723CONFIG_RTC_CLASS=y
970CONFIG_RTC_HCTOSYS=y 724CONFIG_RTC_HCTOSYS=y
@@ -978,18 +732,29 @@ CONFIG_RTC_INTF_SYSFS=y
978CONFIG_RTC_INTF_PROC=y 732CONFIG_RTC_INTF_PROC=y
979CONFIG_RTC_INTF_DEV=y 733CONFIG_RTC_INTF_DEV=y
980# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set 734# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
735# CONFIG_RTC_DRV_TEST is not set
736
737#
738# SPI RTC drivers
739#
981 740
982# 741#
983# RTC drivers 742# Platform RTC drivers
984# 743#
744# CONFIG_RTC_DRV_CMOS is not set
985# CONFIG_RTC_DRV_DS1553 is not set 745# CONFIG_RTC_DRV_DS1553 is not set
746# CONFIG_RTC_DRV_STK17TA8 is not set
986# CONFIG_RTC_DRV_DS1742 is not set 747# CONFIG_RTC_DRV_DS1742 is not set
987# CONFIG_RTC_DRV_M48T86 is not set 748# CONFIG_RTC_DRV_M48T86 is not set
988CONFIG_RTC_DRV_VR41XX=y 749# CONFIG_RTC_DRV_M48T59 is not set
989# CONFIG_RTC_DRV_TEST is not set
990# CONFIG_RTC_DRV_V3020 is not set 750# CONFIG_RTC_DRV_V3020 is not set
991 751
992# 752#
753# on-CPU RTC drivers
754#
755CONFIG_RTC_DRV_VR41XX=y
756
757#
993# DMA Engine support 758# DMA Engine support
994# 759#
995# CONFIG_DMA_ENGINE is not set 760# CONFIG_DMA_ENGINE is not set
@@ -1003,12 +768,9 @@ CONFIG_RTC_DRV_VR41XX=y
1003# 768#
1004 769
1005# 770#
1006# Auxiliary Display support 771# Userspace I/O
1007#
1008
1009#
1010# Virtualization
1011# 772#
773# CONFIG_UIO is not set
1012 774
1013# 775#
1014# File systems 776# File systems
@@ -1032,7 +794,7 @@ CONFIG_INOTIFY_USER=y
1032CONFIG_DNOTIFY=y 794CONFIG_DNOTIFY=y
1033# CONFIG_AUTOFS_FS is not set 795# CONFIG_AUTOFS_FS is not set
1034CONFIG_AUTOFS4_FS=y 796CONFIG_AUTOFS4_FS=y
1035CONFIG_FUSE_FS=m 797# CONFIG_FUSE_FS is not set
1036CONFIG_GENERIC_ACL=y 798CONFIG_GENERIC_ACL=y
1037 799
1038# 800#
@@ -1059,7 +821,7 @@ CONFIG_TMPFS=y
1059CONFIG_TMPFS_POSIX_ACL=y 821CONFIG_TMPFS_POSIX_ACL=y
1060# CONFIG_HUGETLB_PAGE is not set 822# CONFIG_HUGETLB_PAGE is not set
1061CONFIG_RAMFS=y 823CONFIG_RAMFS=y
1062CONFIG_CONFIGFS_FS=m 824# CONFIG_CONFIGFS_FS is not set
1063 825
1064# 826#
1065# Miscellaneous filesystems 827# Miscellaneous filesystems
@@ -1097,6 +859,7 @@ CONFIG_LOCKD_V4=y
1097CONFIG_EXPORTFS=m 859CONFIG_EXPORTFS=m
1098CONFIG_NFS_COMMON=y 860CONFIG_NFS_COMMON=y
1099CONFIG_SUNRPC=y 861CONFIG_SUNRPC=y
862# CONFIG_SUNRPC_BIND34 is not set
1100# CONFIG_RPCSEC_GSS_KRB5 is not set 863# CONFIG_RPCSEC_GSS_KRB5 is not set
1101# CONFIG_RPCSEC_GSS_SPKM3 is not set 864# CONFIG_RPCSEC_GSS_SPKM3 is not set
1102# CONFIG_SMB_FS is not set 865# CONFIG_SMB_FS is not set
@@ -1104,7 +867,6 @@ CONFIG_SUNRPC=y
1104# CONFIG_NCP_FS is not set 867# CONFIG_NCP_FS is not set
1105# CONFIG_CODA_FS is not set 868# CONFIG_CODA_FS is not set
1106# CONFIG_AFS_FS is not set 869# CONFIG_AFS_FS is not set
1107# CONFIG_9P_FS is not set
1108 870
1109# 871#
1110# Partition Types 872# Partition Types
@@ -1120,10 +882,7 @@ CONFIG_MSDOS_PARTITION=y
1120# 882#
1121# Distributed Lock Manager 883# Distributed Lock Manager
1122# 884#
1123CONFIG_DLM=m 885# CONFIG_DLM is not set
1124CONFIG_DLM_TCP=y
1125# CONFIG_DLM_SCTP is not set
1126# CONFIG_DLM_DEBUG is not set
1127 886
1128# 887#
1129# Profiling support 888# Profiling support
@@ -1141,7 +900,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1141# CONFIG_DEBUG_FS is not set 900# CONFIG_DEBUG_FS is not set
1142# CONFIG_HEADERS_CHECK is not set 901# CONFIG_HEADERS_CHECK is not set
1143# CONFIG_DEBUG_KERNEL is not set 902# CONFIG_DEBUG_KERNEL is not set
1144CONFIG_LOG_BUF_SHIFT=14
1145CONFIG_CROSSCOMPILE=y 903CONFIG_CROSSCOMPILE=y
1146CONFIG_CMDLINE="mem=32M console=ttyVR0,115200" 904CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1147 905
@@ -1150,62 +908,20 @@ CONFIG_CMDLINE="mem=32M console=ttyVR0,115200"
1150# 908#
1151# CONFIG_KEYS is not set 909# CONFIG_KEYS is not set
1152# CONFIG_SECURITY is not set 910# CONFIG_SECURITY is not set
1153 911# CONFIG_CRYPTO is not set
1154#
1155# Cryptographic options
1156#
1157CONFIG_CRYPTO=y
1158CONFIG_CRYPTO_ALGAPI=y
1159CONFIG_CRYPTO_BLKCIPHER=m
1160CONFIG_CRYPTO_HASH=m
1161CONFIG_CRYPTO_MANAGER=m
1162CONFIG_CRYPTO_HMAC=m
1163CONFIG_CRYPTO_XCBC=m
1164CONFIG_CRYPTO_NULL=m
1165CONFIG_CRYPTO_MD4=m
1166CONFIG_CRYPTO_MD5=y
1167CONFIG_CRYPTO_SHA1=m
1168CONFIG_CRYPTO_SHA256=m
1169CONFIG_CRYPTO_SHA512=m
1170CONFIG_CRYPTO_WP512=m
1171CONFIG_CRYPTO_TGR192=m
1172CONFIG_CRYPTO_GF128MUL=m
1173CONFIG_CRYPTO_ECB=m
1174CONFIG_CRYPTO_CBC=m
1175CONFIG_CRYPTO_PCBC=m
1176CONFIG_CRYPTO_LRW=m
1177CONFIG_CRYPTO_DES=m
1178CONFIG_CRYPTO_FCRYPT=m
1179CONFIG_CRYPTO_BLOWFISH=m
1180CONFIG_CRYPTO_TWOFISH=m
1181CONFIG_CRYPTO_TWOFISH_COMMON=m
1182CONFIG_CRYPTO_SERPENT=m
1183CONFIG_CRYPTO_AES=m
1184CONFIG_CRYPTO_CAST5=m
1185CONFIG_CRYPTO_CAST6=m
1186CONFIG_CRYPTO_TEA=m
1187CONFIG_CRYPTO_ARC4=m
1188CONFIG_CRYPTO_KHAZAD=m
1189CONFIG_CRYPTO_ANUBIS=m
1190CONFIG_CRYPTO_DEFLATE=m
1191CONFIG_CRYPTO_MICHAEL_MIC=m
1192CONFIG_CRYPTO_CRC32C=m
1193CONFIG_CRYPTO_CAMELLIA=m
1194# CONFIG_CRYPTO_TEST is not set
1195
1196#
1197# Hardware crypto devices
1198#
1199 912
1200# 913#
1201# Library routines 914# Library routines
1202# 915#
916CONFIG_BITREVERSE=m
1203# CONFIG_CRC_CCITT is not set 917# CONFIG_CRC_CCITT is not set
1204# CONFIG_CRC16 is not set 918# CONFIG_CRC16 is not set
1205# CONFIG_CRC32 is not set 919# CONFIG_CRC_ITU_T is not set
1206CONFIG_LIBCRC32C=m 920CONFIG_CRC32=m
921# CONFIG_CRC7 is not set
922# CONFIG_LIBCRC32C is not set
1207CONFIG_ZLIB_INFLATE=m 923CONFIG_ZLIB_INFLATE=m
1208CONFIG_ZLIB_DEFLATE=m
1209CONFIG_PLIST=y 924CONFIG_PLIST=y
1210CONFIG_HAS_IOMEM=y 925CONFIG_HAS_IOMEM=y
1211CONFIG_HAS_IOPORT=y 926CONFIG_HAS_IOPORT=y
927CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
index 66383ecff200..499b6bd7ee68 100644
--- a/arch/mips/configs/tb0287_defconfig
+++ b/arch/mips/configs/tb0287_defconfig
@@ -1,68 +1,56 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.21-rc1 3# Linux kernel version: 2.6.23-rc2
4# Thu Feb 22 10:38:09 2007 4# Thu Aug 9 14:03:54 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58# CONFIG_CASIO_E55 is not set 45# CONFIG_CASIO_E55 is not set
59# CONFIG_IBM_WORKPAD is not set 46# CONFIG_IBM_WORKPAD is not set
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
61CONFIG_TANBAC_TB022X=y 48CONFIG_TANBAC_TB022X=y
62# CONFIG_TANBAC_TB0226 is not set
63CONFIG_TANBAC_TB0287=y
64# CONFIG_VICTOR_MPC30X is not set 49# CONFIG_VICTOR_MPC30X is not set
65# CONFIG_ZAO_CAPCELLA is not set 50# CONFIG_ZAO_CAPCELLA is not set
51# CONFIG_TANBAC_TB0219 is not set
52# CONFIG_TANBAC_TB0226 is not set
53CONFIG_TANBAC_TB0287=y
66CONFIG_PCI_VR41XX=y 54CONFIG_PCI_VR41XX=y
67CONFIG_RWSEM_GENERIC_SPINLOCK=y 55CONFIG_RWSEM_GENERIC_SPINLOCK=y
68# CONFIG_ARCH_HAS_ILOG2_U32 is not set 56# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -75,6 +63,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
75CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 63CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
76CONFIG_DMA_NONCOHERENT=y 64CONFIG_DMA_NONCOHERENT=y
77CONFIG_DMA_NEED_PCI_MAP_STATE=y 65CONFIG_DMA_NEED_PCI_MAP_STATE=y
66# CONFIG_HOTPLUG_CPU is not set
67# CONFIG_NO_IOPORT is not set
78# CONFIG_CPU_BIG_ENDIAN is not set 68# CONFIG_CPU_BIG_ENDIAN is not set
79CONFIG_CPU_LITTLE_ENDIAN=y 69CONFIG_CPU_LITTLE_ENDIAN=y
80CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 70CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -84,6 +74,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
84# 74#
85# CPU selection 75# CPU selection
86# 76#
77# CONFIG_CPU_LOONGSON2 is not set
87# CONFIG_CPU_MIPS32_R1 is not set 78# CONFIG_CPU_MIPS32_R1 is not set
88# CONFIG_CPU_MIPS32_R2 is not set 79# CONFIG_CPU_MIPS32_R2 is not set
89# CONFIG_CPU_MIPS64_R1 is not set 80# CONFIG_CPU_MIPS64_R1 is not set
@@ -105,7 +96,6 @@ CONFIG_CPU_VR41XX=y
105# CONFIG_CPU_SB1 is not set 96# CONFIG_CPU_SB1 is not set
106CONFIG_SYS_HAS_CPU_VR41XX=y 97CONFIG_SYS_HAS_CPU_VR41XX=y
107CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 98CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
108CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
109CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 99CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
110CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 100CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
111 101
@@ -121,7 +111,6 @@ CONFIG_PAGE_SIZE_4KB=y
121CONFIG_MIPS_MT_DISABLED=y 111CONFIG_MIPS_MT_DISABLED=y
122# CONFIG_MIPS_MT_SMP is not set 112# CONFIG_MIPS_MT_SMP is not set
123# CONFIG_MIPS_MT_SMTC is not set 113# CONFIG_MIPS_MT_SMTC is not set
124# CONFIG_MIPS_VPE_LOADER is not set
125CONFIG_CPU_HAS_SYNC=y 114CONFIG_CPU_HAS_SYNC=y
126CONFIG_GENERIC_HARDIRQS=y 115CONFIG_GENERIC_HARDIRQS=y
127CONFIG_GENERIC_IRQ_PROBE=y 116CONFIG_GENERIC_IRQ_PROBE=y
@@ -135,86 +124,83 @@ CONFIG_FLAT_NODE_MEM_MAP=y
135# CONFIG_SPARSEMEM_STATIC is not set 124# CONFIG_SPARSEMEM_STATIC is not set
136CONFIG_SPLIT_PTLOCK_CPUS=4 125CONFIG_SPLIT_PTLOCK_CPUS=4
137# CONFIG_RESOURCES_64BIT is not set 126# CONFIG_RESOURCES_64BIT is not set
138CONFIG_ZONE_DMA_FLAG=1 127CONFIG_ZONE_DMA_FLAG=0
128CONFIG_VIRT_TO_BUS=y
139# CONFIG_HZ_48 is not set 129# CONFIG_HZ_48 is not set
140# CONFIG_HZ_100 is not set 130# CONFIG_HZ_100 is not set
141# CONFIG_HZ_128 is not set 131# CONFIG_HZ_128 is not set
142# CONFIG_HZ_250 is not set 132CONFIG_HZ_250=y
143# CONFIG_HZ_256 is not set 133# CONFIG_HZ_256 is not set
144CONFIG_HZ_1000=y 134# CONFIG_HZ_1000 is not set
145# CONFIG_HZ_1024 is not set 135# CONFIG_HZ_1024 is not set
146CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 136CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
147CONFIG_HZ=1000 137CONFIG_HZ=250
148CONFIG_PREEMPT_NONE=y 138CONFIG_PREEMPT_NONE=y
149# CONFIG_PREEMPT_VOLUNTARY is not set 139# CONFIG_PREEMPT_VOLUNTARY is not set
150# CONFIG_PREEMPT is not set 140# CONFIG_PREEMPT is not set
151# CONFIG_KEXEC is not set 141# CONFIG_KEXEC is not set
142CONFIG_SECCOMP=y
152CONFIG_LOCKDEP_SUPPORT=y 143CONFIG_LOCKDEP_SUPPORT=y
153CONFIG_STACKTRACE_SUPPORT=y 144CONFIG_STACKTRACE_SUPPORT=y
154CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 145CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
155 146
156# 147#
157# Code maturity level options 148# General setup
158# 149#
159CONFIG_EXPERIMENTAL=y 150CONFIG_EXPERIMENTAL=y
160CONFIG_BROKEN_ON_SMP=y 151CONFIG_BROKEN_ON_SMP=y
161CONFIG_INIT_ENV_ARG_LIMIT=32 152CONFIG_INIT_ENV_ARG_LIMIT=32
162
163#
164# General setup
165#
166CONFIG_LOCALVERSION="" 153CONFIG_LOCALVERSION=""
167CONFIG_LOCALVERSION_AUTO=y 154CONFIG_LOCALVERSION_AUTO=y
168CONFIG_SWAP=y 155CONFIG_SWAP=y
169CONFIG_SYSVIPC=y 156CONFIG_SYSVIPC=y
170# CONFIG_IPC_NS is not set
171CONFIG_SYSVIPC_SYSCTL=y 157CONFIG_SYSVIPC_SYSCTL=y
172# CONFIG_POSIX_MQUEUE is not set 158# CONFIG_POSIX_MQUEUE is not set
173# CONFIG_BSD_PROCESS_ACCT is not set 159# CONFIG_BSD_PROCESS_ACCT is not set
174# CONFIG_TASKSTATS is not set 160# CONFIG_TASKSTATS is not set
175# CONFIG_UTS_NS is not set 161# CONFIG_USER_NS is not set
176# CONFIG_AUDIT is not set 162# CONFIG_AUDIT is not set
177# CONFIG_IKCONFIG is not set 163# CONFIG_IKCONFIG is not set
164CONFIG_LOG_BUF_SHIFT=14
178CONFIG_SYSFS_DEPRECATED=y 165CONFIG_SYSFS_DEPRECATED=y
179# CONFIG_RELAY is not set 166# CONFIG_RELAY is not set
167# CONFIG_BLK_DEV_INITRD is not set
180# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 168# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
181CONFIG_SYSCTL=y 169CONFIG_SYSCTL=y
182CONFIG_EMBEDDED=y 170CONFIG_EMBEDDED=y
183# CONFIG_SYSCTL_SYSCALL is not set 171# CONFIG_SYSCTL_SYSCALL is not set
184CONFIG_KALLSYMS=y 172CONFIG_KALLSYMS=y
185# CONFIG_KALLSYMS_EXTRA_PASS is not set 173# CONFIG_KALLSYMS_EXTRA_PASS is not set
186# CONFIG_HOTPLUG is not set 174CONFIG_HOTPLUG=y
187CONFIG_PRINTK=y 175CONFIG_PRINTK=y
188CONFIG_BUG=y 176CONFIG_BUG=y
189CONFIG_ELF_CORE=y 177CONFIG_ELF_CORE=y
190CONFIG_BASE_FULL=y 178CONFIG_BASE_FULL=y
191CONFIG_FUTEX=y 179CONFIG_FUTEX=y
180CONFIG_ANON_INODES=y
192CONFIG_EPOLL=y 181CONFIG_EPOLL=y
182CONFIG_SIGNALFD=y
183CONFIG_TIMERFD=y
184CONFIG_EVENTFD=y
193CONFIG_SHMEM=y 185CONFIG_SHMEM=y
194CONFIG_SLAB=y
195CONFIG_VM_EVENT_COUNTERS=y 186CONFIG_VM_EVENT_COUNTERS=y
187CONFIG_SLAB=y
188# CONFIG_SLUB is not set
189# CONFIG_SLOB is not set
196CONFIG_RT_MUTEXES=y 190CONFIG_RT_MUTEXES=y
197# CONFIG_TINY_SHMEM is not set 191# CONFIG_TINY_SHMEM is not set
198CONFIG_BASE_SMALL=0 192CONFIG_BASE_SMALL=0
199# CONFIG_SLOB is not set
200
201#
202# Loadable module support
203#
204CONFIG_MODULES=y 193CONFIG_MODULES=y
205CONFIG_MODULE_UNLOAD=y 194CONFIG_MODULE_UNLOAD=y
206# CONFIG_MODULE_FORCE_UNLOAD is not set 195CONFIG_MODULE_FORCE_UNLOAD=y
207CONFIG_MODVERSIONS=y 196CONFIG_MODVERSIONS=y
208CONFIG_MODULE_SRCVERSION_ALL=y 197CONFIG_MODULE_SRCVERSION_ALL=y
209CONFIG_KMOD=y 198CONFIG_KMOD=y
210
211#
212# Block layer
213#
214CONFIG_BLOCK=y 199CONFIG_BLOCK=y
215# CONFIG_LBD is not set 200# CONFIG_LBD is not set
216# CONFIG_BLK_DEV_IO_TRACE is not set 201# CONFIG_BLK_DEV_IO_TRACE is not set
217# CONFIG_LSF is not set 202# CONFIG_LSF is not set
203# CONFIG_BLK_DEV_BSG is not set
218 204
219# 205#
220# IO Schedulers 206# IO Schedulers
@@ -234,15 +220,14 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
234# 220#
235CONFIG_HW_HAS_PCI=y 221CONFIG_HW_HAS_PCI=y
236CONFIG_PCI=y 222CONFIG_PCI=y
223# CONFIG_ARCH_SUPPORTS_MSI is not set
237CONFIG_MMU=y 224CONFIG_MMU=y
238 225
239# 226#
240# PCCARD (PCMCIA/CardBus) support 227# PCCARD (PCMCIA/CardBus) support
241# 228#
242 229# CONFIG_PCCARD is not set
243# 230# CONFIG_HOTPLUG_PCI is not set
244# PCI Hotplug Support
245#
246 231
247# 232#
248# Executable file formats 233# Executable file formats
@@ -254,10 +239,7 @@ CONFIG_TRAD_SIGNALS=y
254# 239#
255# Power management options 240# Power management options
256# 241#
257CONFIG_PM=y 242# CONFIG_PM is not set
258# CONFIG_PM_LEGACY is not set
259# CONFIG_PM_DEBUG is not set
260# CONFIG_PM_SYSFS_DEPRECATED is not set
261 243
262# 244#
263# Networking 245# Networking
@@ -267,14 +249,9 @@ CONFIG_NET=y
267# 249#
268# Networking options 250# Networking options
269# 251#
270# CONFIG_NETDEBUG is not set
271CONFIG_PACKET=y 252CONFIG_PACKET=y
272# CONFIG_PACKET_MMAP is not set 253# CONFIG_PACKET_MMAP is not set
273CONFIG_UNIX=y 254CONFIG_UNIX=y
274CONFIG_XFRM=y
275# CONFIG_XFRM_USER is not set
276# CONFIG_XFRM_SUB_POLICY is not set
277CONFIG_XFRM_MIGRATE=y
278# CONFIG_NET_KEY is not set 255# CONFIG_NET_KEY is not set
279CONFIG_INET=y 256CONFIG_INET=y
280CONFIG_IP_MULTICAST=y 257CONFIG_IP_MULTICAST=y
@@ -284,7 +261,6 @@ CONFIG_ASK_IP_FIB_HASH=y
284CONFIG_IP_FIB_HASH=y 261CONFIG_IP_FIB_HASH=y
285CONFIG_IP_MULTIPLE_TABLES=y 262CONFIG_IP_MULTIPLE_TABLES=y
286CONFIG_IP_ROUTE_MULTIPATH=y 263CONFIG_IP_ROUTE_MULTIPATH=y
287# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
288CONFIG_IP_ROUTE_VERBOSE=y 264CONFIG_IP_ROUTE_VERBOSE=y
289CONFIG_IP_PNP=y 265CONFIG_IP_PNP=y
290# CONFIG_IP_PNP_DHCP is not set 266# CONFIG_IP_PNP_DHCP is not set
@@ -301,9 +277,9 @@ CONFIG_SYN_COOKIES=y
301# CONFIG_INET_IPCOMP is not set 277# CONFIG_INET_IPCOMP is not set
302# CONFIG_INET_XFRM_TUNNEL is not set 278# CONFIG_INET_XFRM_TUNNEL is not set
303CONFIG_INET_TUNNEL=m 279CONFIG_INET_TUNNEL=m
304CONFIG_INET_XFRM_MODE_TRANSPORT=m 280# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
305CONFIG_INET_XFRM_MODE_TUNNEL=m 281# CONFIG_INET_XFRM_MODE_TUNNEL is not set
306CONFIG_INET_XFRM_MODE_BEET=y 282# CONFIG_INET_XFRM_MODE_BEET is not set
307CONFIG_INET_DIAG=y 283CONFIG_INET_DIAG=y
308CONFIG_INET_TCP_DIAG=y 284CONFIG_INET_TCP_DIAG=y
309CONFIG_TCP_CONG_ADVANCED=y 285CONFIG_TCP_CONG_ADVANCED=y
@@ -317,6 +293,8 @@ CONFIG_TCP_CONG_HTCP=m
317# CONFIG_TCP_CONG_SCALABLE is not set 293# CONFIG_TCP_CONG_SCALABLE is not set
318# CONFIG_TCP_CONG_LP is not set 294# CONFIG_TCP_CONG_LP is not set
319# CONFIG_TCP_CONG_VENO is not set 295# CONFIG_TCP_CONG_VENO is not set
296# CONFIG_TCP_CONG_YEAH is not set
297# CONFIG_TCP_CONG_ILLINOIS is not set
320CONFIG_DEFAULT_BIC=y 298CONFIG_DEFAULT_BIC=y
321# CONFIG_DEFAULT_CUBIC is not set 299# CONFIG_DEFAULT_CUBIC is not set
322# CONFIG_DEFAULT_HTCP is not set 300# CONFIG_DEFAULT_HTCP is not set
@@ -324,26 +302,14 @@ CONFIG_DEFAULT_BIC=y
324# CONFIG_DEFAULT_WESTWOOD is not set 302# CONFIG_DEFAULT_WESTWOOD is not set
325# CONFIG_DEFAULT_RENO is not set 303# CONFIG_DEFAULT_RENO is not set
326CONFIG_DEFAULT_TCP_CONG="bic" 304CONFIG_DEFAULT_TCP_CONG="bic"
327CONFIG_TCP_MD5SIG=y 305# CONFIG_TCP_MD5SIG is not set
328# CONFIG_IPV6 is not set 306# CONFIG_IPV6 is not set
329# CONFIG_INET6_XFRM_TUNNEL is not set 307# CONFIG_INET6_XFRM_TUNNEL is not set
330# CONFIG_INET6_TUNNEL is not set 308# CONFIG_INET6_TUNNEL is not set
331CONFIG_NETWORK_SECMARK=y 309CONFIG_NETWORK_SECMARK=y
332# CONFIG_NETFILTER is not set 310# CONFIG_NETFILTER is not set
333
334#
335# DCCP Configuration (EXPERIMENTAL)
336#
337# CONFIG_IP_DCCP is not set 311# CONFIG_IP_DCCP is not set
338
339#
340# SCTP Configuration (EXPERIMENTAL)
341#
342# CONFIG_IP_SCTP is not set 312# CONFIG_IP_SCTP is not set
343
344#
345# TIPC Configuration (EXPERIMENTAL)
346#
347# CONFIG_TIPC is not set 313# CONFIG_TIPC is not set
348# CONFIG_ATM is not set 314# CONFIG_ATM is not set
349# CONFIG_BRIDGE is not set 315# CONFIG_BRIDGE is not set
@@ -369,10 +335,20 @@ CONFIG_NETWORK_SECMARK=y
369# CONFIG_HAMRADIO is not set 335# CONFIG_HAMRADIO is not set
370# CONFIG_IRDA is not set 336# CONFIG_IRDA is not set
371# CONFIG_BT is not set 337# CONFIG_BT is not set
372# CONFIG_IEEE80211 is not set 338# CONFIG_AF_RXRPC is not set
373CONFIG_FIB_RULES=y 339CONFIG_FIB_RULES=y
374 340
375# 341#
342# Wireless
343#
344# CONFIG_CFG80211 is not set
345# CONFIG_WIRELESS_EXT is not set
346# CONFIG_MAC80211 is not set
347# CONFIG_IEEE80211 is not set
348# CONFIG_RFKILL is not set
349# CONFIG_NET_9P is not set
350
351#
376# Device Drivers 352# Device Drivers
377# 353#
378 354
@@ -381,31 +357,12 @@ CONFIG_FIB_RULES=y
381# 357#
382CONFIG_STANDALONE=y 358CONFIG_STANDALONE=y
383CONFIG_PREVENT_FIRMWARE_BUILD=y 359CONFIG_PREVENT_FIRMWARE_BUILD=y
360CONFIG_FW_LOADER=m
384# CONFIG_SYS_HYPERVISOR is not set 361# CONFIG_SYS_HYPERVISOR is not set
385
386#
387# Connector - unified userspace <-> kernelspace linker
388#
389# CONFIG_CONNECTOR is not set 362# CONFIG_CONNECTOR is not set
390
391#
392# Memory Technology Devices (MTD)
393#
394# CONFIG_MTD is not set 363# CONFIG_MTD is not set
395
396#
397# Parallel port support
398#
399# CONFIG_PARPORT is not set 364# CONFIG_PARPORT is not set
400 365CONFIG_BLK_DEV=y
401#
402# Plug and Play support
403#
404# CONFIG_PNPACPI is not set
405
406#
407# Block devices
408#
409# CONFIG_BLK_CPQ_DA is not set 366# CONFIG_BLK_CPQ_DA is not set
410# CONFIG_BLK_CPQ_CISS_DA is not set 367# CONFIG_BLK_CPQ_CISS_DA is not set
411# CONFIG_BLK_DEV_DAC960 is not set 368# CONFIG_BLK_DEV_DAC960 is not set
@@ -420,19 +377,9 @@ CONFIG_BLK_DEV_RAM=y
420CONFIG_BLK_DEV_RAM_COUNT=16 377CONFIG_BLK_DEV_RAM_COUNT=16
421CONFIG_BLK_DEV_RAM_SIZE=4096 378CONFIG_BLK_DEV_RAM_SIZE=4096
422CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 379CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
423# CONFIG_BLK_DEV_INITRD is not set
424# CONFIG_CDROM_PKTCDVD is not set 380# CONFIG_CDROM_PKTCDVD is not set
425# CONFIG_ATA_OVER_ETH is not set 381# CONFIG_ATA_OVER_ETH is not set
426 382# CONFIG_MISC_DEVICES is not set
427#
428# Misc devices
429#
430CONFIG_SGI_IOC4=m
431# CONFIG_TIFM_CORE is not set
432
433#
434# ATA/ATAPI/MFM/RLL support
435#
436# CONFIG_IDE is not set 383# CONFIG_IDE is not set
437 384
438# 385#
@@ -440,6 +387,7 @@ CONFIG_SGI_IOC4=m
440# 387#
441# CONFIG_RAID_ATTRS is not set 388# CONFIG_RAID_ATTRS is not set
442CONFIG_SCSI=y 389CONFIG_SCSI=y
390CONFIG_SCSI_DMA=y
443CONFIG_SCSI_TGT=m 391CONFIG_SCSI_TGT=m
444# CONFIG_SCSI_NETLINK is not set 392# CONFIG_SCSI_NETLINK is not set
445CONFIG_SCSI_PROC_FS=y 393CONFIG_SCSI_PROC_FS=y
@@ -461,6 +409,7 @@ CONFIG_BLK_DEV_SD=y
461# CONFIG_SCSI_CONSTANTS is not set 409# CONFIG_SCSI_CONSTANTS is not set
462# CONFIG_SCSI_LOGGING is not set 410# CONFIG_SCSI_LOGGING is not set
463CONFIG_SCSI_SCAN_ASYNC=y 411CONFIG_SCSI_SCAN_ASYNC=y
412CONFIG_SCSI_WAIT_SCAN=m
464 413
465# 414#
466# SCSI Transports 415# SCSI Transports
@@ -468,48 +417,8 @@ CONFIG_SCSI_SCAN_ASYNC=y
468# CONFIG_SCSI_SPI_ATTRS is not set 417# CONFIG_SCSI_SPI_ATTRS is not set
469# CONFIG_SCSI_FC_ATTRS is not set 418# CONFIG_SCSI_FC_ATTRS is not set
470# CONFIG_SCSI_ISCSI_ATTRS is not set 419# CONFIG_SCSI_ISCSI_ATTRS is not set
471# CONFIG_SCSI_SAS_ATTRS is not set
472# CONFIG_SCSI_SAS_LIBSAS is not set 420# CONFIG_SCSI_SAS_LIBSAS is not set
473 421# CONFIG_SCSI_LOWLEVEL is not set
474#
475# SCSI low-level drivers
476#
477# CONFIG_ISCSI_TCP is not set
478# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
479# CONFIG_SCSI_3W_9XXX is not set
480# CONFIG_SCSI_ACARD is not set
481# CONFIG_SCSI_AACRAID is not set
482# CONFIG_SCSI_AIC7XXX is not set
483# CONFIG_SCSI_AIC7XXX_OLD is not set
484# CONFIG_SCSI_AIC79XX is not set
485# CONFIG_SCSI_AIC94XX is not set
486# CONFIG_SCSI_DPT_I2O is not set
487# CONFIG_SCSI_ARCMSR is not set
488# CONFIG_MEGARAID_NEWGEN is not set
489# CONFIG_MEGARAID_LEGACY is not set
490# CONFIG_MEGARAID_SAS is not set
491# CONFIG_SCSI_HPTIOP is not set
492# CONFIG_SCSI_DMX3191D is not set
493# CONFIG_SCSI_FUTURE_DOMAIN is not set
494# CONFIG_SCSI_IPS is not set
495# CONFIG_SCSI_INITIO is not set
496# CONFIG_SCSI_INIA100 is not set
497# CONFIG_SCSI_STEX is not set
498# CONFIG_SCSI_SYM53C8XX_2 is not set
499# CONFIG_SCSI_IPR is not set
500# CONFIG_SCSI_QLOGIC_1280 is not set
501# CONFIG_SCSI_QLA_FC is not set
502# CONFIG_SCSI_QLA_ISCSI is not set
503# CONFIG_SCSI_LPFC is not set
504# CONFIG_SCSI_DC395x is not set
505# CONFIG_SCSI_DC390T is not set
506# CONFIG_SCSI_NSP32 is not set
507# CONFIG_SCSI_DEBUG is not set
508# CONFIG_SCSI_SRP is not set
509
510#
511# Serial ATA (prod) and Parallel ATA (experimental) drivers
512#
513CONFIG_ATA=y 422CONFIG_ATA=y
514# CONFIG_ATA_NONSTANDARD is not set 423# CONFIG_ATA_NONSTANDARD is not set
515# CONFIG_SATA_AHCI is not set 424# CONFIG_SATA_AHCI is not set
@@ -532,6 +441,7 @@ CONFIG_ATA=y
532# CONFIG_PATA_AMD is not set 441# CONFIG_PATA_AMD is not set
533# CONFIG_PATA_ARTOP is not set 442# CONFIG_PATA_ARTOP is not set
534# CONFIG_PATA_ATIIXP is not set 443# CONFIG_PATA_ATIIXP is not set
444# CONFIG_PATA_CMD640_PCI is not set
535# CONFIG_PATA_CMD64X is not set 445# CONFIG_PATA_CMD64X is not set
536# CONFIG_PATA_CS5520 is not set 446# CONFIG_PATA_CS5520 is not set
537# CONFIG_PATA_CS5530 is not set 447# CONFIG_PATA_CS5530 is not set
@@ -564,10 +474,6 @@ CONFIG_PATA_SIL680=y
564# CONFIG_PATA_VIA is not set 474# CONFIG_PATA_VIA is not set
565# CONFIG_PATA_WINBOND is not set 475# CONFIG_PATA_WINBOND is not set
566# CONFIG_PATA_PLATFORM is not set 476# CONFIG_PATA_PLATFORM is not set
567
568#
569# Multi-device support (RAID and LVM)
570#
571# CONFIG_MD is not set 477# CONFIG_MD is not set
572 478
573# 479#
@@ -581,17 +487,16 @@ CONFIG_PATA_SIL680=y
581# 487#
582# IEEE 1394 (FireWire) support 488# IEEE 1394 (FireWire) support
583# 489#
490# CONFIG_FIREWIRE is not set
584CONFIG_IEEE1394=m 491CONFIG_IEEE1394=m
585 492
586# 493#
587# Subsystem Options 494# Subsystem Options
588# 495#
589# CONFIG_IEEE1394_VERBOSEDEBUG is not set 496# CONFIG_IEEE1394_VERBOSEDEBUG is not set
590CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
591CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
592 497
593# 498#
594# Device Drivers 499# Controllers
595# 500#
596 501
597# 502#
@@ -600,59 +505,63 @@ CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
600CONFIG_IEEE1394_OHCI1394=m 505CONFIG_IEEE1394_OHCI1394=m
601 506
602# 507#
603# Protocol Drivers 508# Protocols
604# 509#
605CONFIG_IEEE1394_VIDEO1394=m 510CONFIG_IEEE1394_VIDEO1394=m
606CONFIG_IEEE1394_SBP2=m 511CONFIG_IEEE1394_SBP2=m
512# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
513CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
607CONFIG_IEEE1394_ETH1394=m 514CONFIG_IEEE1394_ETH1394=m
608CONFIG_IEEE1394_DV1394=m 515CONFIG_IEEE1394_DV1394=m
609CONFIG_IEEE1394_RAWIO=m 516CONFIG_IEEE1394_RAWIO=m
610
611#
612# I2O device support
613#
614# CONFIG_I2O is not set 517# CONFIG_I2O is not set
615
616#
617# Network device support
618#
619CONFIG_NETDEVICES=y 518CONFIG_NETDEVICES=y
620CONFIG_DUMMY=m 519# CONFIG_NETDEVICES_MULTIQUEUE is not set
520# CONFIG_DUMMY is not set
621# CONFIG_BONDING is not set 521# CONFIG_BONDING is not set
522# CONFIG_MACVLAN is not set
622# CONFIG_EQUALIZER is not set 523# CONFIG_EQUALIZER is not set
623# CONFIG_TUN is not set 524# CONFIG_TUN is not set
624
625#
626# ARCnet devices
627#
628# CONFIG_ARCNET is not set 525# CONFIG_ARCNET is not set
629
630#
631# PHY device support
632#
633# CONFIG_PHYLIB is not set 526# CONFIG_PHYLIB is not set
634
635#
636# Ethernet (10 or 100Mbit)
637#
638CONFIG_NET_ETHERNET=y 527CONFIG_NET_ETHERNET=y
639CONFIG_MII=y 528CONFIG_MII=y
529# CONFIG_AX88796 is not set
640# CONFIG_HAPPYMEAL is not set 530# CONFIG_HAPPYMEAL is not set
641# CONFIG_SUNGEM is not set 531# CONFIG_SUNGEM is not set
642# CONFIG_CASSINI is not set 532# CONFIG_CASSINI is not set
643# CONFIG_NET_VENDOR_3COM is not set 533# CONFIG_NET_VENDOR_3COM is not set
644# CONFIG_DM9000 is not set 534# CONFIG_DM9000 is not set
645
646#
647# Tulip family network device support
648#
649# CONFIG_NET_TULIP is not set 535# CONFIG_NET_TULIP is not set
650# CONFIG_HP100 is not set 536# CONFIG_HP100 is not set
651# CONFIG_NET_PCI is not set 537CONFIG_NET_PCI=y
652 538# CONFIG_PCNET32 is not set
653# 539# CONFIG_AMD8111_ETH is not set
654# Ethernet (1000 Mbit) 540# CONFIG_ADAPTEC_STARFIRE is not set
655# 541# CONFIG_B44 is not set
542# CONFIG_FORCEDETH is not set
543# CONFIG_TC35815 is not set
544# CONFIG_DGRS is not set
545# CONFIG_EEPRO100 is not set
546# CONFIG_E100 is not set
547# CONFIG_FEALNX is not set
548# CONFIG_NATSEMI is not set
549# CONFIG_NE2K_PCI is not set
550# CONFIG_8139CP is not set
551CONFIG_8139TOO=y
552CONFIG_8139TOO_PIO=y
553# CONFIG_8139TOO_TUNE_TWISTER is not set
554# CONFIG_8139TOO_8129 is not set
555# CONFIG_8139_OLD_RX_RESET is not set
556# CONFIG_SIS900 is not set
557# CONFIG_EPIC100 is not set
558# CONFIG_SUNDANCE is not set
559# CONFIG_TLAN is not set
560CONFIG_VIA_RHINE=y
561CONFIG_VIA_RHINE_MMIO=y
562# CONFIG_VIA_RHINE_NAPI is not set
563# CONFIG_SC92031 is not set
564CONFIG_NETDEV_1000=y
656# CONFIG_ACENIC is not set 565# CONFIG_ACENIC is not set
657# CONFIG_DL2K is not set 566# CONFIG_DL2K is not set
658# CONFIG_E1000 is not set 567# CONFIG_E1000 is not set
@@ -664,35 +573,29 @@ CONFIG_R8169=y
664# CONFIG_SIS190 is not set 573# CONFIG_SIS190 is not set
665# CONFIG_SKGE is not set 574# CONFIG_SKGE is not set
666# CONFIG_SKY2 is not set 575# CONFIG_SKY2 is not set
667# CONFIG_SK98LIN is not set 576CONFIG_VIA_VELOCITY=y
668# CONFIG_TIGON3 is not set 577# CONFIG_TIGON3 is not set
669# CONFIG_BNX2 is not set 578# CONFIG_BNX2 is not set
670# CONFIG_QLA3XXX is not set 579# CONFIG_QLA3XXX is not set
671# CONFIG_ATL1 is not set 580# CONFIG_ATL1 is not set
672 581# CONFIG_NETDEV_10000 is not set
673#
674# Ethernet (10000 Mbit)
675#
676# CONFIG_CHELSIO_T1 is not set
677CONFIG_CHELSIO_T3=m
678# CONFIG_IXGB is not set
679# CONFIG_S2IO is not set
680# CONFIG_MYRI10GE is not set
681CONFIG_NETXEN_NIC=m
682
683#
684# Token Ring devices
685#
686# CONFIG_TR is not set 582# CONFIG_TR is not set
687 583
688# 584#
689# Wireless LAN (non-hamradio) 585# Wireless LAN
690# 586#
691# CONFIG_NET_RADIO is not set 587# CONFIG_WLAN_PRE80211 is not set
588# CONFIG_WLAN_80211 is not set
692 589
693# 590#
694# Wan interfaces 591# USB Network Adapters
695# 592#
593# CONFIG_USB_CATC is not set
594# CONFIG_USB_KAWETH is not set
595# CONFIG_USB_PEGASUS is not set
596# CONFIG_USB_RTL8150 is not set
597# CONFIG_USB_USBNET_MII is not set
598# CONFIG_USB_USBNET is not set
696# CONFIG_WAN is not set 599# CONFIG_WAN is not set
697# CONFIG_FDDI is not set 600# CONFIG_FDDI is not set
698# CONFIG_HIPPI is not set 601# CONFIG_HIPPI is not set
@@ -703,15 +606,7 @@ CONFIG_NETXEN_NIC=m
703# CONFIG_NETCONSOLE is not set 606# CONFIG_NETCONSOLE is not set
704# CONFIG_NETPOLL is not set 607# CONFIG_NETPOLL is not set
705# CONFIG_NET_POLL_CONTROLLER is not set 608# CONFIG_NET_POLL_CONTROLLER is not set
706
707#
708# ISDN subsystem
709#
710# CONFIG_ISDN is not set 609# CONFIG_ISDN is not set
711
712#
713# Telephony Support
714#
715# CONFIG_PHONE is not set 610# CONFIG_PHONE is not set
716 611
717# 612#
@@ -719,11 +614,15 @@ CONFIG_NETXEN_NIC=m
719# 614#
720CONFIG_INPUT=y 615CONFIG_INPUT=y
721# CONFIG_INPUT_FF_MEMLESS is not set 616# CONFIG_INPUT_FF_MEMLESS is not set
617# CONFIG_INPUT_POLLDEV is not set
722 618
723# 619#
724# Userland interfaces 620# Userland interfaces
725# 621#
726# CONFIG_INPUT_MOUSEDEV is not set 622CONFIG_INPUT_MOUSEDEV=y
623CONFIG_INPUT_MOUSEDEV_PSAUX=y
624CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
625CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
727# CONFIG_INPUT_JOYDEV is not set 626# CONFIG_INPUT_JOYDEV is not set
728# CONFIG_INPUT_TSDEV is not set 627# CONFIG_INPUT_TSDEV is not set
729# CONFIG_INPUT_EVDEV is not set 628# CONFIG_INPUT_EVDEV is not set
@@ -735,6 +634,7 @@ CONFIG_INPUT=y
735# CONFIG_INPUT_KEYBOARD is not set 634# CONFIG_INPUT_KEYBOARD is not set
736# CONFIG_INPUT_MOUSE is not set 635# CONFIG_INPUT_MOUSE is not set
737# CONFIG_INPUT_JOYSTICK is not set 636# CONFIG_INPUT_JOYSTICK is not set
637# CONFIG_INPUT_TABLET is not set
738# CONFIG_INPUT_TOUCHSCREEN is not set 638# CONFIG_INPUT_TOUCHSCREEN is not set
739# CONFIG_INPUT_MISC is not set 639# CONFIG_INPUT_MISC is not set
740 640
@@ -769,35 +669,18 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
769CONFIG_UNIX98_PTYS=y 669CONFIG_UNIX98_PTYS=y
770CONFIG_LEGACY_PTYS=y 670CONFIG_LEGACY_PTYS=y
771CONFIG_LEGACY_PTY_COUNT=256 671CONFIG_LEGACY_PTY_COUNT=256
772
773#
774# IPMI
775#
776# CONFIG_IPMI_HANDLER is not set 672# CONFIG_IPMI_HANDLER is not set
777
778#
779# Watchdog Cards
780#
781# CONFIG_WATCHDOG is not set 673# CONFIG_WATCHDOG is not set
782# CONFIG_HW_RANDOM is not set 674# CONFIG_HW_RANDOM is not set
783# CONFIG_RTC is not set 675# CONFIG_RTC is not set
784# CONFIG_GEN_RTC is not set
785# CONFIG_DTLK is not set
786# CONFIG_R3964 is not set 676# CONFIG_R3964 is not set
787# CONFIG_APPLICOM is not set 677# CONFIG_APPLICOM is not set
788# CONFIG_TANBAC_TB0219 is not set 678# CONFIG_GPIO_TB0219 is not set
789# CONFIG_DRM is not set 679# CONFIG_DRM is not set
790CONFIG_GPIO_VR41XX=y 680CONFIG_GPIO_VR41XX=y
791# CONFIG_RAW_DRIVER is not set 681# CONFIG_RAW_DRIVER is not set
792
793#
794# TPM devices
795#
796# CONFIG_TCG_TPM is not set 682# CONFIG_TCG_TPM is not set
797 683CONFIG_DEVPORT=y
798#
799# I2C support
800#
801# CONFIG_I2C is not set 684# CONFIG_I2C is not set
802 685
803# 686#
@@ -805,17 +688,9 @@ CONFIG_GPIO_VR41XX=y
805# 688#
806# CONFIG_SPI is not set 689# CONFIG_SPI is not set
807# CONFIG_SPI_MASTER is not set 690# CONFIG_SPI_MASTER is not set
808
809#
810# Dallas's 1-wire bus
811#
812# CONFIG_W1 is not set 691# CONFIG_W1 is not set
813 692# CONFIG_POWER_SUPPLY is not set
814#
815# Hardware Monitoring support
816#
817# CONFIG_HWMON is not set 693# CONFIG_HWMON is not set
818# CONFIG_HWMON_VID is not set
819 694
820# 695#
821# Multifunction device drivers 696# Multifunction device drivers
@@ -826,23 +701,31 @@ CONFIG_MFD_SM501=y
826# Multimedia devices 701# Multimedia devices
827# 702#
828# CONFIG_VIDEO_DEV is not set 703# CONFIG_VIDEO_DEV is not set
704# CONFIG_DVB_CORE is not set
705# CONFIG_DAB is not set
829 706
830# 707#
831# Digital Video Broadcasting Devices 708# Graphics support
832# 709#
833# CONFIG_DVB is not set 710# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
834# CONFIG_USB_DABUSB is not set
835 711
836# 712#
837# Graphics support 713# Display device support
838# 714#
839# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 715# CONFIG_DISPLAY_SUPPORT is not set
716# CONFIG_VGASTATE is not set
717CONFIG_VIDEO_OUTPUT_CONTROL=m
840CONFIG_FB=y 718CONFIG_FB=y
841# CONFIG_FIRMWARE_EDID is not set 719# CONFIG_FIRMWARE_EDID is not set
842# CONFIG_FB_DDC is not set 720# CONFIG_FB_DDC is not set
843CONFIG_FB_CFB_FILLRECT=y 721CONFIG_FB_CFB_FILLRECT=y
844CONFIG_FB_CFB_COPYAREA=y 722CONFIG_FB_CFB_COPYAREA=y
845CONFIG_FB_CFB_IMAGEBLIT=y 723CONFIG_FB_CFB_IMAGEBLIT=y
724# CONFIG_FB_SYS_FILLRECT is not set
725# CONFIG_FB_SYS_COPYAREA is not set
726# CONFIG_FB_SYS_IMAGEBLIT is not set
727# CONFIG_FB_SYS_FOPS is not set
728CONFIG_FB_DEFERRED_IO=y
846# CONFIG_FB_SVGALIB is not set 729# CONFIG_FB_SVGALIB is not set
847# CONFIG_FB_MACMODES is not set 730# CONFIG_FB_MACMODES is not set
848# CONFIG_FB_BACKLIGHT is not set 731# CONFIG_FB_BACKLIGHT is not set
@@ -850,7 +733,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
850# CONFIG_FB_TILEBLITTING is not set 733# CONFIG_FB_TILEBLITTING is not set
851 734
852# 735#
853# Frambuffer hardware drivers 736# Frame buffer hardware drivers
854# 737#
855# CONFIG_FB_CIRRUS is not set 738# CONFIG_FB_CIRRUS is not set
856# CONFIG_FB_PM2 is not set 739# CONFIG_FB_PM2 is not set
@@ -871,8 +754,10 @@ CONFIG_FB_CFB_IMAGEBLIT=y
871# CONFIG_FB_KYRO is not set 754# CONFIG_FB_KYRO is not set
872# CONFIG_FB_3DFX is not set 755# CONFIG_FB_3DFX is not set
873# CONFIG_FB_VOODOO1 is not set 756# CONFIG_FB_VOODOO1 is not set
874# CONFIG_FB_SMIVGX is not set 757# CONFIG_FB_VT8623 is not set
875# CONFIG_FB_TRIDENT is not set 758# CONFIG_FB_TRIDENT is not set
759# CONFIG_FB_ARK is not set
760# CONFIG_FB_PM3 is not set
876CONFIG_FB_SM501=y 761CONFIG_FB_SM501=y
877# CONFIG_FB_VIRTUAL is not set 762# CONFIG_FB_VIRTUAL is not set
878 763
@@ -881,27 +766,44 @@ CONFIG_FB_SM501=y
881# 766#
882# CONFIG_VGA_CONSOLE is not set 767# CONFIG_VGA_CONSOLE is not set
883CONFIG_DUMMY_CONSOLE=y 768CONFIG_DUMMY_CONSOLE=y
884# CONFIG_FRAMEBUFFER_CONSOLE is not set 769CONFIG_FRAMEBUFFER_CONSOLE=y
885 770# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
886# 771# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
887# Logo configuration 772CONFIG_FONTS=y
888# 773CONFIG_FONT_8x8=y
774CONFIG_FONT_8x16=y
775# CONFIG_FONT_6x11 is not set
776# CONFIG_FONT_7x14 is not set
777# CONFIG_FONT_PEARL_8x8 is not set
778# CONFIG_FONT_ACORN_8x8 is not set
779# CONFIG_FONT_MINI_4x6 is not set
780# CONFIG_FONT_SUN8x16 is not set
781# CONFIG_FONT_SUN12x22 is not set
782# CONFIG_FONT_10x18 is not set
889# CONFIG_LOGO is not set 783# CONFIG_LOGO is not set
890 784
891# 785#
892# Sound 786# Sound
893# 787#
894# CONFIG_SOUND is not set 788# CONFIG_SOUND is not set
789CONFIG_HID_SUPPORT=y
790CONFIG_HID=y
791# CONFIG_HID_DEBUG is not set
895 792
896# 793#
897# HID Devices 794# USB Input Devices
898# 795#
899CONFIG_HID=y 796CONFIG_USB_HID=m
900# CONFIG_HID_DEBUG is not set 797# CONFIG_USB_HIDINPUT_POWERBOOK is not set
798# CONFIG_HID_FF is not set
799# CONFIG_USB_HIDDEV is not set
901 800
902# 801#
903# USB support 802# USB HID Boot Protocol drivers
904# 803#
804# CONFIG_USB_KBD is not set
805# CONFIG_USB_MOUSE is not set
806CONFIG_USB_SUPPORT=y
905CONFIG_USB_ARCH_HAS_HCD=y 807CONFIG_USB_ARCH_HAS_HCD=y
906CONFIG_USB_ARCH_HAS_OHCI=y 808CONFIG_USB_ARCH_HAS_OHCI=y
907CONFIG_USB_ARCH_HAS_EHCI=y 809CONFIG_USB_ARCH_HAS_EHCI=y
@@ -912,8 +814,8 @@ CONFIG_USB=m
912# Miscellaneous USB options 814# Miscellaneous USB options
913# 815#
914# CONFIG_USB_DEVICEFS is not set 816# CONFIG_USB_DEVICEFS is not set
817CONFIG_USB_DEVICE_CLASS=y
915# CONFIG_USB_DYNAMIC_MINORS is not set 818# CONFIG_USB_DYNAMIC_MINORS is not set
916# CONFIG_USB_SUSPEND is not set
917# CONFIG_USB_OTG is not set 819# CONFIG_USB_OTG is not set
918 820
919# 821#
@@ -923,7 +825,6 @@ CONFIG_USB_EHCI_HCD=m
923# CONFIG_USB_EHCI_SPLIT_ISO is not set 825# CONFIG_USB_EHCI_SPLIT_ISO is not set
924# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 826# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
925# CONFIG_USB_EHCI_TT_NEWSCHED is not set 827# CONFIG_USB_EHCI_TT_NEWSCHED is not set
926# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
927# CONFIG_USB_ISP116X_HCD is not set 828# CONFIG_USB_ISP116X_HCD is not set
928CONFIG_USB_OHCI_HCD=m 829CONFIG_USB_OHCI_HCD=m
929# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 830# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
@@ -931,6 +832,7 @@ CONFIG_USB_OHCI_HCD=m
931CONFIG_USB_OHCI_LITTLE_ENDIAN=y 832CONFIG_USB_OHCI_LITTLE_ENDIAN=y
932# CONFIG_USB_UHCI_HCD is not set 833# CONFIG_USB_UHCI_HCD is not set
933# CONFIG_USB_SL811_HCD is not set 834# CONFIG_USB_SL811_HCD is not set
835# CONFIG_USB_R8A66597_HCD is not set
934 836
935# 837#
936# USB Device Class drivers 838# USB Device Class drivers
@@ -959,47 +861,10 @@ CONFIG_USB_STORAGE=m
959# CONFIG_USB_LIBUSUAL is not set 861# CONFIG_USB_LIBUSUAL is not set
960 862
961# 863#
962# USB Input Devices
963#
964CONFIG_USB_HID=m
965# CONFIG_USB_HIDINPUT_POWERBOOK is not set
966# CONFIG_HID_FF is not set
967# CONFIG_USB_HIDDEV is not set
968
969#
970# USB HID Boot Protocol drivers
971#
972# CONFIG_USB_KBD is not set
973# CONFIG_USB_MOUSE is not set
974# CONFIG_USB_AIPTEK is not set
975# CONFIG_USB_WACOM is not set
976# CONFIG_USB_ACECAD is not set
977# CONFIG_USB_KBTAB is not set
978# CONFIG_USB_POWERMATE is not set
979# CONFIG_USB_TOUCHSCREEN is not set
980# CONFIG_USB_YEALINK is not set
981# CONFIG_USB_XPAD is not set
982# CONFIG_USB_ATI_REMOTE is not set
983# CONFIG_USB_ATI_REMOTE2 is not set
984# CONFIG_USB_KEYSPAN_REMOTE is not set
985# CONFIG_USB_APPLETOUCH is not set
986# CONFIG_USB_GTCO is not set
987
988#
989# USB Imaging devices 864# USB Imaging devices
990# 865#
991# CONFIG_USB_MDC800 is not set 866# CONFIG_USB_MDC800 is not set
992# CONFIG_USB_MICROTEK is not set 867# CONFIG_USB_MICROTEK is not set
993
994#
995# USB Network Adapters
996#
997# CONFIG_USB_CATC is not set
998# CONFIG_USB_KAWETH is not set
999# CONFIG_USB_PEGASUS is not set
1000# CONFIG_USB_RTL8150 is not set
1001# CONFIG_USB_USBNET_MII is not set
1002# CONFIG_USB_USBNET is not set
1003CONFIG_USB_MON=y 868CONFIG_USB_MON=y
1004 869
1005# 870#
@@ -1032,6 +897,7 @@ CONFIG_USB_MON=y
1032# CONFIG_USB_SISUSBVGA is not set 897# CONFIG_USB_SISUSBVGA is not set
1033# CONFIG_USB_LD is not set 898# CONFIG_USB_LD is not set
1034# CONFIG_USB_TRANCEVIBRATOR is not set 899# CONFIG_USB_TRANCEVIBRATOR is not set
900# CONFIG_USB_IOWARRIOR is not set
1035 901
1036# 902#
1037# USB DSL modem support 903# USB DSL modem support
@@ -1041,37 +907,9 @@ CONFIG_USB_MON=y
1041# USB Gadget Support 907# USB Gadget Support
1042# 908#
1043# CONFIG_USB_GADGET is not set 909# CONFIG_USB_GADGET is not set
1044
1045#
1046# MMC/SD Card support
1047#
1048# CONFIG_MMC is not set 910# CONFIG_MMC is not set
1049
1050#
1051# LED devices
1052#
1053# CONFIG_NEW_LEDS is not set 911# CONFIG_NEW_LEDS is not set
1054
1055#
1056# LED drivers
1057#
1058
1059#
1060# LED Triggers
1061#
1062
1063#
1064# InfiniBand support
1065#
1066# CONFIG_INFINIBAND is not set 912# CONFIG_INFINIBAND is not set
1067
1068#
1069# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1070#
1071
1072#
1073# Real Time Clock
1074#
1075# CONFIG_RTC_CLASS is not set 913# CONFIG_RTC_CLASS is not set
1076 914
1077# 915#
@@ -1088,12 +926,9 @@ CONFIG_USB_MON=y
1088# 926#
1089 927
1090# 928#
1091# Auxiliary Display support 929# Userspace I/O
1092#
1093
1094#
1095# Virtualization
1096# 930#
931# CONFIG_UIO is not set
1097 932
1098# 933#
1099# File systems 934# File systems
@@ -1111,7 +946,7 @@ CONFIG_JBD=y
1111CONFIG_FS_MBCACHE=y 946CONFIG_FS_MBCACHE=y
1112# CONFIG_REISERFS_FS is not set 947# CONFIG_REISERFS_FS is not set
1113# CONFIG_JFS_FS is not set 948# CONFIG_JFS_FS is not set
1114# CONFIG_FS_POSIX_ACL is not set 949CONFIG_FS_POSIX_ACL=y
1115CONFIG_XFS_FS=y 950CONFIG_XFS_FS=y
1116CONFIG_XFS_QUOTA=y 951CONFIG_XFS_QUOTA=y
1117# CONFIG_XFS_SECURITY is not set 952# CONFIG_XFS_SECURITY is not set
@@ -1125,10 +960,11 @@ CONFIG_INOTIFY=y
1125CONFIG_INOTIFY_USER=y 960CONFIG_INOTIFY_USER=y
1126# CONFIG_QUOTA is not set 961# CONFIG_QUOTA is not set
1127CONFIG_QUOTACTL=y 962CONFIG_QUOTACTL=y
1128# CONFIG_DNOTIFY is not set 963CONFIG_DNOTIFY=y
1129# CONFIG_AUTOFS_FS is not set 964# CONFIG_AUTOFS_FS is not set
1130CONFIG_AUTOFS4_FS=y 965CONFIG_AUTOFS4_FS=y
1131# CONFIG_FUSE_FS is not set 966# CONFIG_FUSE_FS is not set
967CONFIG_GENERIC_ACL=y
1132 968
1133# 969#
1134# CD-ROM/DVD Filesystems 970# CD-ROM/DVD Filesystems
@@ -1151,10 +987,10 @@ CONFIG_PROC_KCORE=y
1151CONFIG_PROC_SYSCTL=y 987CONFIG_PROC_SYSCTL=y
1152CONFIG_SYSFS=y 988CONFIG_SYSFS=y
1153CONFIG_TMPFS=y 989CONFIG_TMPFS=y
1154# CONFIG_TMPFS_POSIX_ACL is not set 990CONFIG_TMPFS_POSIX_ACL=y
1155# CONFIG_HUGETLB_PAGE is not set 991# CONFIG_HUGETLB_PAGE is not set
1156CONFIG_RAMFS=y 992CONFIG_RAMFS=y
1157CONFIG_CONFIGFS_FS=m 993# CONFIG_CONFIGFS_FS is not set
1158 994
1159# 995#
1160# Miscellaneous filesystems 996# Miscellaneous filesystems
@@ -1181,12 +1017,18 @@ CONFIG_NFS_V3=y
1181# CONFIG_NFS_V3_ACL is not set 1017# CONFIG_NFS_V3_ACL is not set
1182# CONFIG_NFS_V4 is not set 1018# CONFIG_NFS_V4 is not set
1183# CONFIG_NFS_DIRECTIO is not set 1019# CONFIG_NFS_DIRECTIO is not set
1184# CONFIG_NFSD is not set 1020CONFIG_NFSD=m
1021CONFIG_NFSD_V3=y
1022# CONFIG_NFSD_V3_ACL is not set
1023# CONFIG_NFSD_V4 is not set
1024CONFIG_NFSD_TCP=y
1185CONFIG_ROOT_NFS=y 1025CONFIG_ROOT_NFS=y
1186CONFIG_LOCKD=y 1026CONFIG_LOCKD=y
1187CONFIG_LOCKD_V4=y 1027CONFIG_LOCKD_V4=y
1028CONFIG_EXPORTFS=m
1188CONFIG_NFS_COMMON=y 1029CONFIG_NFS_COMMON=y
1189CONFIG_SUNRPC=y 1030CONFIG_SUNRPC=y
1031# CONFIG_SUNRPC_BIND34 is not set
1190# CONFIG_RPCSEC_GSS_KRB5 is not set 1032# CONFIG_RPCSEC_GSS_KRB5 is not set
1191# CONFIG_RPCSEC_GSS_SPKM3 is not set 1033# CONFIG_RPCSEC_GSS_SPKM3 is not set
1192# CONFIG_SMB_FS is not set 1034# CONFIG_SMB_FS is not set
@@ -1194,7 +1036,6 @@ CONFIG_SUNRPC=y
1194# CONFIG_NCP_FS is not set 1036# CONFIG_NCP_FS is not set
1195# CONFIG_CODA_FS is not set 1037# CONFIG_CODA_FS is not set
1196# CONFIG_AFS_FS is not set 1038# CONFIG_AFS_FS is not set
1197# CONFIG_9P_FS is not set
1198 1039
1199# 1040#
1200# Partition Types 1041# Partition Types
@@ -1210,10 +1051,7 @@ CONFIG_MSDOS_PARTITION=y
1210# 1051#
1211# Distributed Lock Manager 1052# Distributed Lock Manager
1212# 1053#
1213CONFIG_DLM=m 1054# CONFIG_DLM is not set
1214CONFIG_DLM_TCP=y
1215# CONFIG_DLM_SCTP is not set
1216# CONFIG_DLM_DEBUG is not set
1217 1055
1218# 1056#
1219# Profiling support 1057# Profiling support
@@ -1231,7 +1069,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1231# CONFIG_DEBUG_FS is not set 1069# CONFIG_DEBUG_FS is not set
1232# CONFIG_HEADERS_CHECK is not set 1070# CONFIG_HEADERS_CHECK is not set
1233# CONFIG_DEBUG_KERNEL is not set 1071# CONFIG_DEBUG_KERNEL is not set
1234CONFIG_LOG_BUF_SHIFT=14
1235CONFIG_CROSSCOMPILE=y 1072CONFIG_CROSSCOMPILE=y
1236CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs" 1073CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1237 1074
@@ -1240,63 +1077,20 @@ CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
1240# 1077#
1241# CONFIG_KEYS is not set 1078# CONFIG_KEYS is not set
1242# CONFIG_SECURITY is not set 1079# CONFIG_SECURITY is not set
1243 1080# CONFIG_CRYPTO is not set
1244#
1245# Cryptographic options
1246#
1247CONFIG_CRYPTO=y
1248CONFIG_CRYPTO_ALGAPI=y
1249CONFIG_CRYPTO_BLKCIPHER=m
1250CONFIG_CRYPTO_HASH=m
1251CONFIG_CRYPTO_MANAGER=m
1252CONFIG_CRYPTO_HMAC=m
1253CONFIG_CRYPTO_XCBC=m
1254CONFIG_CRYPTO_NULL=m
1255CONFIG_CRYPTO_MD4=m
1256CONFIG_CRYPTO_MD5=y
1257CONFIG_CRYPTO_SHA1=m
1258CONFIG_CRYPTO_SHA256=m
1259CONFIG_CRYPTO_SHA512=m
1260CONFIG_CRYPTO_WP512=m
1261CONFIG_CRYPTO_TGR192=m
1262CONFIG_CRYPTO_GF128MUL=m
1263CONFIG_CRYPTO_ECB=m
1264CONFIG_CRYPTO_CBC=m
1265CONFIG_CRYPTO_PCBC=m
1266CONFIG_CRYPTO_LRW=m
1267CONFIG_CRYPTO_DES=m
1268CONFIG_CRYPTO_FCRYPT=m
1269CONFIG_CRYPTO_BLOWFISH=m
1270CONFIG_CRYPTO_TWOFISH=m
1271CONFIG_CRYPTO_TWOFISH_COMMON=m
1272CONFIG_CRYPTO_SERPENT=m
1273CONFIG_CRYPTO_AES=m
1274CONFIG_CRYPTO_CAST5=m
1275CONFIG_CRYPTO_CAST6=m
1276CONFIG_CRYPTO_TEA=m
1277CONFIG_CRYPTO_ARC4=m
1278CONFIG_CRYPTO_KHAZAD=m
1279CONFIG_CRYPTO_ANUBIS=m
1280CONFIG_CRYPTO_DEFLATE=m
1281CONFIG_CRYPTO_MICHAEL_MIC=m
1282CONFIG_CRYPTO_CRC32C=m
1283CONFIG_CRYPTO_CAMELLIA=m
1284# CONFIG_CRYPTO_TEST is not set
1285
1286#
1287# Hardware crypto devices
1288#
1289 1081
1290# 1082#
1291# Library routines 1083# Library routines
1292# 1084#
1293CONFIG_BITREVERSE=y 1085CONFIG_BITREVERSE=y
1294# CONFIG_CRC_CCITT is not set 1086CONFIG_CRC_CCITT=y
1295# CONFIG_CRC16 is not set 1087# CONFIG_CRC16 is not set
1088# CONFIG_CRC_ITU_T is not set
1296CONFIG_CRC32=y 1089CONFIG_CRC32=y
1297CONFIG_LIBCRC32C=m 1090# CONFIG_CRC7 is not set
1091# CONFIG_LIBCRC32C is not set
1298CONFIG_ZLIB_INFLATE=m 1092CONFIG_ZLIB_INFLATE=m
1299CONFIG_ZLIB_DEFLATE=m
1300CONFIG_PLIST=y 1093CONFIG_PLIST=y
1301CONFIG_HAS_IOMEM=y 1094CONFIG_HAS_IOMEM=y
1302CONFIG_HAS_IOPORT=y 1095CONFIG_HAS_IOPORT=y
1096CONFIG_HAS_DMA=y
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig
index db6fd4f15719..b52256ca0b53 100644
--- a/arch/mips/configs/workpad_defconfig
+++ b/arch/mips/configs/workpad_defconfig
@@ -1,60 +1,47 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:42 2007 4# Thu Aug 9 14:33:57 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
8# 8#
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11# CONFIG_MACH_ALCHEMY is not set
12# CONFIG_MIPS_MTX1 is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 12# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 13# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 14# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 15# CONFIG_MACH_JAZZ is not set
16# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 17# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 18# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 19# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 20# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 21# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 22CONFIG_MACH_VR41XX=y
36# CONFIG_PNX8550_JBS is not set 23# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 24# CONFIG_PNX8550_STB810 is not set
38CONFIG_MACH_VR41XX=y 25# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 26# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 27# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42# CONFIG_SGI_IP22 is not set 28# CONFIG_SGI_IP22 is not set
43# CONFIG_SGI_IP27 is not set 29# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 30# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 31# CONFIG_SIBYTE_CRHINE is not set
32# CONFIG_SIBYTE_CARMEL is not set
33# CONFIG_SIBYTE_CRHONE is not set
34# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 35# CONFIG_SIBYTE_SWARM is not set
36# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 37# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 38# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 39# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 40# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 41# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 42# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 43# CONFIG_TOSHIBA_RBTX4938 is not set
44# CONFIG_WR_PPMC is not set
58# CONFIG_CASIO_E55 is not set 45# CONFIG_CASIO_E55 is not set
59CONFIG_IBM_WORKPAD=y 46CONFIG_IBM_WORKPAD=y
60# CONFIG_NEC_CMBVR4133 is not set 47# CONFIG_NEC_CMBVR4133 is not set
@@ -72,6 +59,8 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
72CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 59CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
73CONFIG_DMA_NONCOHERENT=y 60CONFIG_DMA_NONCOHERENT=y
74CONFIG_DMA_NEED_PCI_MAP_STATE=y 61CONFIG_DMA_NEED_PCI_MAP_STATE=y
62# CONFIG_HOTPLUG_CPU is not set
63# CONFIG_NO_IOPORT is not set
75# CONFIG_CPU_BIG_ENDIAN is not set 64# CONFIG_CPU_BIG_ENDIAN is not set
76CONFIG_CPU_LITTLE_ENDIAN=y 65CONFIG_CPU_LITTLE_ENDIAN=y
77CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y 66CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
@@ -81,6 +70,7 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
81# 70#
82# CPU selection 71# CPU selection
83# 72#
73# CONFIG_CPU_LOONGSON2 is not set
84# CONFIG_CPU_MIPS32_R1 is not set 74# CONFIG_CPU_MIPS32_R1 is not set
85# CONFIG_CPU_MIPS32_R2 is not set 75# CONFIG_CPU_MIPS32_R2 is not set
86# CONFIG_CPU_MIPS64_R1 is not set 76# CONFIG_CPU_MIPS64_R1 is not set
@@ -102,7 +92,6 @@ CONFIG_CPU_VR41XX=y
102# CONFIG_CPU_SB1 is not set 92# CONFIG_CPU_SB1 is not set
103CONFIG_SYS_HAS_CPU_VR41XX=y 93CONFIG_SYS_HAS_CPU_VR41XX=y
104CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y 94CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
105CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
106CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y 95CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
107CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y 96CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
108 97
@@ -118,7 +107,6 @@ CONFIG_PAGE_SIZE_4KB=y
118CONFIG_MIPS_MT_DISABLED=y 107CONFIG_MIPS_MT_DISABLED=y
119# CONFIG_MIPS_MT_SMP is not set 108# CONFIG_MIPS_MT_SMP is not set
120# CONFIG_MIPS_MT_SMTC is not set 109# CONFIG_MIPS_MT_SMTC is not set
121# CONFIG_MIPS_VPE_LOADER is not set
122CONFIG_CPU_HAS_SYNC=y 110CONFIG_CPU_HAS_SYNC=y
123CONFIG_GENERIC_HARDIRQS=y 111CONFIG_GENERIC_HARDIRQS=y
124CONFIG_GENERIC_IRQ_PROBE=y 112CONFIG_GENERIC_IRQ_PROBE=y
@@ -132,48 +120,47 @@ CONFIG_FLAT_NODE_MEM_MAP=y
132# CONFIG_SPARSEMEM_STATIC is not set 120# CONFIG_SPARSEMEM_STATIC is not set
133CONFIG_SPLIT_PTLOCK_CPUS=4 121CONFIG_SPLIT_PTLOCK_CPUS=4
134# CONFIG_RESOURCES_64BIT is not set 122# CONFIG_RESOURCES_64BIT is not set
135CONFIG_ZONE_DMA_FLAG=1 123CONFIG_ZONE_DMA_FLAG=0
124CONFIG_VIRT_TO_BUS=y
136# CONFIG_HZ_48 is not set 125# CONFIG_HZ_48 is not set
137# CONFIG_HZ_100 is not set 126# CONFIG_HZ_100 is not set
138# CONFIG_HZ_128 is not set 127# CONFIG_HZ_128 is not set
139# CONFIG_HZ_250 is not set 128CONFIG_HZ_250=y
140# CONFIG_HZ_256 is not set 129# CONFIG_HZ_256 is not set
141CONFIG_HZ_1000=y 130# CONFIG_HZ_1000 is not set
142# CONFIG_HZ_1024 is not set 131# CONFIG_HZ_1024 is not set
143CONFIG_SYS_SUPPORTS_ARBIT_HZ=y 132CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
144CONFIG_HZ=1000 133CONFIG_HZ=250
145CONFIG_PREEMPT_NONE=y 134CONFIG_PREEMPT_NONE=y
146# CONFIG_PREEMPT_VOLUNTARY is not set 135# CONFIG_PREEMPT_VOLUNTARY is not set
147# CONFIG_PREEMPT is not set 136# CONFIG_PREEMPT is not set
148# CONFIG_KEXEC is not set 137# CONFIG_KEXEC is not set
138CONFIG_SECCOMP=y
149CONFIG_LOCKDEP_SUPPORT=y 139CONFIG_LOCKDEP_SUPPORT=y
150CONFIG_STACKTRACE_SUPPORT=y 140CONFIG_STACKTRACE_SUPPORT=y
151CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 141CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
152 142
153# 143#
154# Code maturity level options 144# General setup
155# 145#
156CONFIG_EXPERIMENTAL=y 146CONFIG_EXPERIMENTAL=y
157CONFIG_BROKEN_ON_SMP=y 147CONFIG_BROKEN_ON_SMP=y
158CONFIG_INIT_ENV_ARG_LIMIT=32 148CONFIG_INIT_ENV_ARG_LIMIT=32
159
160#
161# General setup
162#
163CONFIG_LOCALVERSION="" 149CONFIG_LOCALVERSION=""
164CONFIG_LOCALVERSION_AUTO=y 150CONFIG_LOCALVERSION_AUTO=y
165CONFIG_SWAP=y 151CONFIG_SWAP=y
166CONFIG_SYSVIPC=y 152CONFIG_SYSVIPC=y
167# CONFIG_IPC_NS is not set
168CONFIG_SYSVIPC_SYSCTL=y 153CONFIG_SYSVIPC_SYSCTL=y
169# CONFIG_POSIX_MQUEUE is not set 154# CONFIG_POSIX_MQUEUE is not set
170# CONFIG_BSD_PROCESS_ACCT is not set 155# CONFIG_BSD_PROCESS_ACCT is not set
171# CONFIG_TASKSTATS is not set 156# CONFIG_TASKSTATS is not set
172# CONFIG_UTS_NS is not set 157# CONFIG_USER_NS is not set
173# CONFIG_AUDIT is not set 158# CONFIG_AUDIT is not set
174# CONFIG_IKCONFIG is not set 159# CONFIG_IKCONFIG is not set
160CONFIG_LOG_BUF_SHIFT=14
175CONFIG_SYSFS_DEPRECATED=y 161CONFIG_SYSFS_DEPRECATED=y
176# CONFIG_RELAY is not set 162# CONFIG_RELAY is not set
163# CONFIG_BLK_DEV_INITRD is not set
177# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 164# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
178CONFIG_SYSCTL=y 165CONFIG_SYSCTL=y
179CONFIG_EMBEDDED=y 166CONFIG_EMBEDDED=y
@@ -186,32 +173,30 @@ CONFIG_BUG=y
186CONFIG_ELF_CORE=y 173CONFIG_ELF_CORE=y
187CONFIG_BASE_FULL=y 174CONFIG_BASE_FULL=y
188CONFIG_FUTEX=y 175CONFIG_FUTEX=y
176CONFIG_ANON_INODES=y
189CONFIG_EPOLL=y 177CONFIG_EPOLL=y
178CONFIG_SIGNALFD=y
179CONFIG_TIMERFD=y
180CONFIG_EVENTFD=y
190CONFIG_SHMEM=y 181CONFIG_SHMEM=y
191CONFIG_SLAB=y
192CONFIG_VM_EVENT_COUNTERS=y 182CONFIG_VM_EVENT_COUNTERS=y
183CONFIG_SLAB=y
184# CONFIG_SLUB is not set
185# CONFIG_SLOB is not set
193CONFIG_RT_MUTEXES=y 186CONFIG_RT_MUTEXES=y
194# CONFIG_TINY_SHMEM is not set 187# CONFIG_TINY_SHMEM is not set
195CONFIG_BASE_SMALL=0 188CONFIG_BASE_SMALL=0
196# CONFIG_SLOB is not set
197
198#
199# Loadable module support
200#
201CONFIG_MODULES=y 189CONFIG_MODULES=y
202CONFIG_MODULE_UNLOAD=y 190CONFIG_MODULE_UNLOAD=y
203# CONFIG_MODULE_FORCE_UNLOAD is not set 191CONFIG_MODULE_FORCE_UNLOAD=y
204CONFIG_MODVERSIONS=y 192CONFIG_MODVERSIONS=y
205CONFIG_MODULE_SRCVERSION_ALL=y 193CONFIG_MODULE_SRCVERSION_ALL=y
206CONFIG_KMOD=y 194CONFIG_KMOD=y
207
208#
209# Block layer
210#
211CONFIG_BLOCK=y 195CONFIG_BLOCK=y
212# CONFIG_LBD is not set 196# CONFIG_LBD is not set
213# CONFIG_BLK_DEV_IO_TRACE is not set 197# CONFIG_BLK_DEV_IO_TRACE is not set
214# CONFIG_LSF is not set 198# CONFIG_LSF is not set
199# CONFIG_BLK_DEV_BSG is not set
215 200
216# 201#
217# IO Schedulers 202# IO Schedulers
@@ -229,6 +214,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
229# 214#
230# Bus options (PCI, PCMCIA, EISA, ISA, TC) 215# Bus options (PCI, PCMCIA, EISA, ISA, TC)
231# 216#
217# CONFIG_ARCH_SUPPORTS_MSI is not set
232CONFIG_ISA=y 218CONFIG_ISA=y
233CONFIG_MMU=y 219CONFIG_MMU=y
234 220
@@ -250,10 +236,6 @@ CONFIG_PCMCIA_PROBE=y
250CONFIG_PCMCIA_VRC4171=y 236CONFIG_PCMCIA_VRC4171=y
251 237
252# 238#
253# PCI Hotplug Support
254#
255
256#
257# Executable file formats 239# Executable file formats
258# 240#
259CONFIG_BINFMT_ELF=y 241CONFIG_BINFMT_ELF=y
@@ -263,10 +245,7 @@ CONFIG_TRAD_SIGNALS=y
263# 245#
264# Power management options 246# Power management options
265# 247#
266CONFIG_PM=y 248# CONFIG_PM is not set
267# CONFIG_PM_LEGACY is not set
268# CONFIG_PM_DEBUG is not set
269# CONFIG_PM_SYSFS_DEPRECATED is not set
270 249
271# 250#
272# Networking 251# Networking
@@ -276,7 +255,6 @@ CONFIG_NET=y
276# 255#
277# Networking options 256# Networking options
278# 257#
279# CONFIG_NETDEBUG is not set
280CONFIG_PACKET=y 258CONFIG_PACKET=y
281CONFIG_PACKET_MMAP=y 259CONFIG_PACKET_MMAP=y
282CONFIG_UNIX=y 260CONFIG_UNIX=y
@@ -301,34 +279,25 @@ CONFIG_IP_FIB_HASH=y
301# CONFIG_INET_IPCOMP is not set 279# CONFIG_INET_IPCOMP is not set
302# CONFIG_INET_XFRM_TUNNEL is not set 280# CONFIG_INET_XFRM_TUNNEL is not set
303# CONFIG_INET_TUNNEL is not set 281# CONFIG_INET_TUNNEL is not set
304CONFIG_INET_XFRM_MODE_TRANSPORT=m 282# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
305CONFIG_INET_XFRM_MODE_TUNNEL=m 283# CONFIG_INET_XFRM_MODE_TUNNEL is not set
306CONFIG_INET_XFRM_MODE_BEET=m 284# CONFIG_INET_XFRM_MODE_BEET is not set
307CONFIG_INET_DIAG=y 285CONFIG_INET_DIAG=y
308CONFIG_INET_TCP_DIAG=y 286CONFIG_INET_TCP_DIAG=y
309# CONFIG_TCP_CONG_ADVANCED is not set 287# CONFIG_TCP_CONG_ADVANCED is not set
310CONFIG_TCP_CONG_CUBIC=y 288CONFIG_TCP_CONG_CUBIC=y
311CONFIG_DEFAULT_TCP_CONG="cubic" 289CONFIG_DEFAULT_TCP_CONG="cubic"
312CONFIG_TCP_MD5SIG=y 290# CONFIG_TCP_MD5SIG is not set
313# CONFIG_IPV6 is not set 291# CONFIG_IPV6 is not set
314# CONFIG_INET6_XFRM_TUNNEL is not set 292# CONFIG_INET6_XFRM_TUNNEL is not set
315# CONFIG_INET6_TUNNEL is not set 293# CONFIG_INET6_TUNNEL is not set
316CONFIG_NETWORK_SECMARK=y 294CONFIG_NETWORK_SECMARK=y
317# CONFIG_NETFILTER is not set 295# CONFIG_NETFILTER is not set
318
319#
320# DCCP Configuration (EXPERIMENTAL)
321#
322# CONFIG_IP_DCCP is not set 296# CONFIG_IP_DCCP is not set
323
324#
325# SCTP Configuration (EXPERIMENTAL)
326#
327# CONFIG_IP_SCTP is not set 297# CONFIG_IP_SCTP is not set
328 298# CONFIG_SCTP_HMAC_NONE is not set
329# 299# CONFIG_SCTP_HMAC_SHA1 is not set
330# TIPC Configuration (EXPERIMENTAL) 300# CONFIG_SCTP_HMAC_MD5 is not set
331#
332# CONFIG_TIPC is not set 301# CONFIG_TIPC is not set
333# CONFIG_ATM is not set 302# CONFIG_ATM is not set
334# CONFIG_BRIDGE is not set 303# CONFIG_BRIDGE is not set
@@ -354,8 +323,17 @@ CONFIG_NETWORK_SECMARK=y
354# CONFIG_HAMRADIO is not set 323# CONFIG_HAMRADIO is not set
355# CONFIG_IRDA is not set 324# CONFIG_IRDA is not set
356# CONFIG_BT is not set 325# CONFIG_BT is not set
357# CONFIG_IEEE80211 is not set 326# CONFIG_AF_RXRPC is not set
327
328#
329# Wireless
330#
331# CONFIG_CFG80211 is not set
358CONFIG_WIRELESS_EXT=y 332CONFIG_WIRELESS_EXT=y
333# CONFIG_MAC80211 is not set
334# CONFIG_IEEE80211 is not set
335# CONFIG_RFKILL is not set
336# CONFIG_NET_9P is not set
359 337
360# 338#
361# Device Drivers 339# Device Drivers
@@ -368,31 +346,11 @@ CONFIG_STANDALONE=y
368CONFIG_PREVENT_FIRMWARE_BUILD=y 346CONFIG_PREVENT_FIRMWARE_BUILD=y
369CONFIG_FW_LOADER=y 347CONFIG_FW_LOADER=y
370# CONFIG_SYS_HYPERVISOR is not set 348# CONFIG_SYS_HYPERVISOR is not set
371 349# CONFIG_CONNECTOR is not set
372#
373# Connector - unified userspace <-> kernelspace linker
374#
375CONFIG_CONNECTOR=m
376
377#
378# Memory Technology Devices (MTD)
379#
380# CONFIG_MTD is not set 350# CONFIG_MTD is not set
381
382#
383# Parallel port support
384#
385# CONFIG_PARPORT is not set 351# CONFIG_PARPORT is not set
386
387#
388# Plug and Play support
389#
390# CONFIG_PNP is not set 352# CONFIG_PNP is not set
391# CONFIG_PNPACPI is not set 353CONFIG_BLK_DEV=y
392
393#
394# Block devices
395#
396# CONFIG_BLK_DEV_COW_COMMON is not set 354# CONFIG_BLK_DEV_COW_COMMON is not set
397# CONFIG_BLK_DEV_LOOP is not set 355# CONFIG_BLK_DEV_LOOP is not set
398# CONFIG_BLK_DEV_NBD is not set 356# CONFIG_BLK_DEV_NBD is not set
@@ -400,17 +358,9 @@ CONFIG_BLK_DEV_RAM=m
400CONFIG_BLK_DEV_RAM_COUNT=16 358CONFIG_BLK_DEV_RAM_COUNT=16
401CONFIG_BLK_DEV_RAM_SIZE=4096 359CONFIG_BLK_DEV_RAM_SIZE=4096
402CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 360CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
403# CONFIG_BLK_DEV_INITRD is not set
404# CONFIG_CDROM_PKTCDVD is not set 361# CONFIG_CDROM_PKTCDVD is not set
405# CONFIG_ATA_OVER_ETH is not set 362# CONFIG_ATA_OVER_ETH is not set
406 363# CONFIG_MISC_DEVICES is not set
407#
408# Misc devices
409#
410
411#
412# ATA/ATAPI/MFM/RLL support
413#
414CONFIG_IDE=y 364CONFIG_IDE=y
415CONFIG_IDE_MAX_HWIFS=4 365CONFIG_IDE_MAX_HWIFS=4
416CONFIG_BLK_DEV_IDE=y 366CONFIG_BLK_DEV_IDE=y
@@ -426,15 +376,16 @@ CONFIG_BLK_DEV_IDECS=m
426# CONFIG_BLK_DEV_IDETAPE is not set 376# CONFIG_BLK_DEV_IDETAPE is not set
427# CONFIG_BLK_DEV_IDEFLOPPY is not set 377# CONFIG_BLK_DEV_IDEFLOPPY is not set
428# CONFIG_IDE_TASK_IOCTL is not set 378# CONFIG_IDE_TASK_IOCTL is not set
379CONFIG_IDE_PROC_FS=y
429 380
430# 381#
431# IDE chipset support/bugfixes 382# IDE chipset support/bugfixes
432# 383#
433CONFIG_IDE_GENERIC=y 384CONFIG_IDE_GENERIC=y
385# CONFIG_IDEPCI_PCIBUS_ORDER is not set
434# CONFIG_IDE_ARM is not set 386# CONFIG_IDE_ARM is not set
435# CONFIG_IDE_CHIPSETS is not set 387# CONFIG_IDE_CHIPSETS is not set
436# CONFIG_BLK_DEV_IDEDMA is not set 388# CONFIG_BLK_DEV_IDEDMA is not set
437# CONFIG_IDEDMA_AUTO is not set
438# CONFIG_BLK_DEV_HD is not set 389# CONFIG_BLK_DEV_HD is not set
439 390
440# 391#
@@ -442,135 +393,38 @@ CONFIG_IDE_GENERIC=y
442# 393#
443# CONFIG_RAID_ATTRS is not set 394# CONFIG_RAID_ATTRS is not set
444# CONFIG_SCSI is not set 395# CONFIG_SCSI is not set
396# CONFIG_SCSI_DMA is not set
445# CONFIG_SCSI_NETLINK is not set 397# CONFIG_SCSI_NETLINK is not set
446
447#
448# Serial ATA (prod) and Parallel ATA (experimental) drivers
449#
450# CONFIG_ATA is not set 398# CONFIG_ATA is not set
451
452#
453# Old CD-ROM drivers (not SCSI, not IDE)
454#
455# CONFIG_CD_NO_IDESCSI is not set
456
457#
458# Multi-device support (RAID and LVM)
459#
460# CONFIG_MD is not set 399# CONFIG_MD is not set
461
462#
463# Fusion MPT device support
464#
465# CONFIG_FUSION is not set
466
467#
468# IEEE 1394 (FireWire) support
469#
470
471#
472# I2O device support
473#
474
475#
476# Network device support
477#
478CONFIG_NETDEVICES=y 400CONFIG_NETDEVICES=y
401# CONFIG_NETDEVICES_MULTIQUEUE is not set
479# CONFIG_DUMMY is not set 402# CONFIG_DUMMY is not set
480# CONFIG_BONDING is not set 403# CONFIG_BONDING is not set
404# CONFIG_MACVLAN is not set
481# CONFIG_EQUALIZER is not set 405# CONFIG_EQUALIZER is not set
482# CONFIG_TUN is not set 406# CONFIG_TUN is not set
483
484#
485# ARCnet devices
486#
487# CONFIG_ARCNET is not set 407# CONFIG_ARCNET is not set
488 408# CONFIG_NET_ETHERNET is not set
489#
490# PHY device support
491#
492CONFIG_PHYLIB=m
493
494#
495# MII PHY device drivers
496#
497CONFIG_MARVELL_PHY=m
498CONFIG_DAVICOM_PHY=m
499CONFIG_QSEMI_PHY=m
500CONFIG_LXT_PHY=m
501CONFIG_CICADA_PHY=m
502CONFIG_VITESSE_PHY=m
503CONFIG_SMSC_PHY=m
504# CONFIG_BROADCOM_PHY is not set
505# CONFIG_FIXED_PHY is not set
506
507#
508# Ethernet (10 or 100Mbit)
509#
510CONFIG_NET_ETHERNET=y
511CONFIG_MII=m 409CONFIG_MII=m
512# CONFIG_NET_VENDOR_3COM is not set 410# CONFIG_NETDEV_1000 is not set
513# CONFIG_NET_VENDOR_SMC is not set 411# CONFIG_NETDEV_10000 is not set
514# CONFIG_DM9000 is not set
515# CONFIG_NET_VENDOR_RACAL is not set
516# CONFIG_AT1700 is not set
517# CONFIG_DEPCA is not set
518# CONFIG_HP100 is not set
519# CONFIG_NET_ISA is not set
520# CONFIG_NET_PCI is not set
521
522#
523# Ethernet (1000 Mbit)
524#
525
526#
527# Ethernet (10000 Mbit)
528#
529
530#
531# Token Ring devices
532#
533# CONFIG_TR is not set 412# CONFIG_TR is not set
534 413
535# 414#
536# Wireless LAN (non-hamradio) 415# Wireless LAN
537#
538CONFIG_NET_RADIO=y
539# CONFIG_NET_WIRELESS_RTNETLINK is not set
540
541#
542# Obsolete Wireless cards support (pre-802.11)
543#
544# CONFIG_STRIP is not set
545# CONFIG_ARLAN is not set
546# CONFIG_WAVELAN is not set
547# CONFIG_PCMCIA_WAVELAN is not set
548# CONFIG_PCMCIA_NETWAVE is not set
549
550#
551# Wireless 802.11 Frequency Hopping cards support
552# 416#
417# CONFIG_WLAN_PRE80211 is not set
418CONFIG_WLAN_80211=y
553# CONFIG_PCMCIA_RAYCS is not set 419# CONFIG_PCMCIA_RAYCS is not set
554 420# CONFIG_LIBERTAS is not set
555#
556# Wireless 802.11b ISA/PCI cards support
557#
558CONFIG_HERMES=m 421CONFIG_HERMES=m
559# CONFIG_ATMEL is not set 422# CONFIG_ATMEL is not set
560
561#
562# Wireless 802.11b Pcmcia/Cardbus cards support
563#
564CONFIG_PCMCIA_HERMES=m 423CONFIG_PCMCIA_HERMES=m
565# CONFIG_PCMCIA_SPECTRUM is not set 424# CONFIG_PCMCIA_SPECTRUM is not set
566# CONFIG_AIRO_CS is not set 425# CONFIG_AIRO_CS is not set
567# CONFIG_PCMCIA_WL3501 is not set 426# CONFIG_PCMCIA_WL3501 is not set
568# CONFIG_HOSTAP is not set 427# CONFIG_HOSTAP is not set
569CONFIG_NET_WIRELESS=y
570
571#
572# PCMCIA network device support
573#
574CONFIG_NET_PCMCIA=y 428CONFIG_NET_PCMCIA=y
575CONFIG_PCMCIA_3C589=m 429CONFIG_PCMCIA_3C589=m
576CONFIG_PCMCIA_3C574=m 430CONFIG_PCMCIA_3C574=m
@@ -580,10 +434,6 @@ CONFIG_PCMCIA_NMCLAN=m
580CONFIG_PCMCIA_SMC91C92=m 434CONFIG_PCMCIA_SMC91C92=m
581CONFIG_PCMCIA_XIRC2PS=m 435CONFIG_PCMCIA_XIRC2PS=m
582CONFIG_PCMCIA_AXNET=m 436CONFIG_PCMCIA_AXNET=m
583
584#
585# Wan interfaces
586#
587# CONFIG_WAN is not set 437# CONFIG_WAN is not set
588# CONFIG_PPP is not set 438# CONFIG_PPP is not set
589# CONFIG_SLIP is not set 439# CONFIG_SLIP is not set
@@ -591,15 +441,7 @@ CONFIG_PCMCIA_AXNET=m
591# CONFIG_NETCONSOLE is not set 441# CONFIG_NETCONSOLE is not set
592# CONFIG_NETPOLL is not set 442# CONFIG_NETPOLL is not set
593# CONFIG_NET_POLL_CONTROLLER is not set 443# CONFIG_NET_POLL_CONTROLLER is not set
594
595#
596# ISDN subsystem
597#
598# CONFIG_ISDN is not set 444# CONFIG_ISDN is not set
599
600#
601# Telephony Support
602#
603# CONFIG_PHONE is not set 445# CONFIG_PHONE is not set
604 446
605# 447#
@@ -607,6 +449,7 @@ CONFIG_PCMCIA_AXNET=m
607# 449#
608CONFIG_INPUT=y 450CONFIG_INPUT=y
609# CONFIG_INPUT_FF_MEMLESS is not set 451# CONFIG_INPUT_FF_MEMLESS is not set
452# CONFIG_INPUT_POLLDEV is not set
610 453
611# 454#
612# Userland interfaces 455# Userland interfaces
@@ -623,6 +466,7 @@ CONFIG_INPUT=y
623# CONFIG_INPUT_KEYBOARD is not set 466# CONFIG_INPUT_KEYBOARD is not set
624# CONFIG_INPUT_MOUSE is not set 467# CONFIG_INPUT_MOUSE is not set
625# CONFIG_INPUT_JOYSTICK is not set 468# CONFIG_INPUT_JOYSTICK is not set
469# CONFIG_INPUT_TABLET is not set
626# CONFIG_INPUT_TOUCHSCREEN is not set 470# CONFIG_INPUT_TOUCHSCREEN is not set
627# CONFIG_INPUT_MISC is not set 471# CONFIG_INPUT_MISC is not set
628 472
@@ -656,19 +500,10 @@ CONFIG_SERIAL_VR41XX_CONSOLE=y
656CONFIG_UNIX98_PTYS=y 500CONFIG_UNIX98_PTYS=y
657CONFIG_LEGACY_PTYS=y 501CONFIG_LEGACY_PTYS=y
658CONFIG_LEGACY_PTY_COUNT=256 502CONFIG_LEGACY_PTY_COUNT=256
659
660#
661# IPMI
662#
663# CONFIG_IPMI_HANDLER is not set 503# CONFIG_IPMI_HANDLER is not set
664
665#
666# Watchdog Cards
667#
668# CONFIG_WATCHDOG is not set 504# CONFIG_WATCHDOG is not set
669# CONFIG_HW_RANDOM is not set 505# CONFIG_HW_RANDOM is not set
670# CONFIG_RTC is not set 506# CONFIG_RTC is not set
671# CONFIG_GEN_RTC is not set
672# CONFIG_DTLK is not set 507# CONFIG_DTLK is not set
673# CONFIG_R3964 is not set 508# CONFIG_R3964 is not set
674 509
@@ -678,17 +513,10 @@ CONFIG_LEGACY_PTY_COUNT=256
678# CONFIG_SYNCLINK_CS is not set 513# CONFIG_SYNCLINK_CS is not set
679# CONFIG_CARDMAN_4000 is not set 514# CONFIG_CARDMAN_4000 is not set
680# CONFIG_CARDMAN_4040 is not set 515# CONFIG_CARDMAN_4040 is not set
681# CONFIG_GPIO_VR41XX is not set 516CONFIG_GPIO_VR41XX=y
682# CONFIG_RAW_DRIVER is not set 517# CONFIG_RAW_DRIVER is not set
683
684#
685# TPM devices
686#
687# CONFIG_TCG_TPM is not set 518# CONFIG_TCG_TPM is not set
688 519CONFIG_DEVPORT=y
689#
690# I2C support
691#
692# CONFIG_I2C is not set 520# CONFIG_I2C is not set
693 521
694# 522#
@@ -696,32 +524,33 @@ CONFIG_LEGACY_PTY_COUNT=256
696# 524#
697# CONFIG_SPI is not set 525# CONFIG_SPI is not set
698# CONFIG_SPI_MASTER is not set 526# CONFIG_SPI_MASTER is not set
699
700#
701# Dallas's 1-wire bus
702#
703# CONFIG_W1 is not set 527# CONFIG_W1 is not set
528# CONFIG_POWER_SUPPLY is not set
529# CONFIG_HWMON is not set
704 530
705# 531#
706# Hardware Monitoring support 532# Multifunction device drivers
707# 533#
708# CONFIG_HWMON is not set 534# CONFIG_MFD_SM501 is not set
709# CONFIG_HWMON_VID is not set
710 535
711# 536#
712# Multimedia devices 537# Multimedia devices
713# 538#
714# CONFIG_VIDEO_DEV is not set 539# CONFIG_VIDEO_DEV is not set
540# CONFIG_DVB_CORE is not set
541# CONFIG_DAB is not set
715 542
716# 543#
717# Digital Video Broadcasting Devices 544# Graphics support
718# 545#
719# CONFIG_DVB is not set 546# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
720 547
721# 548#
722# Graphics support 549# Display device support
723# 550#
724# CONFIG_FIRMWARE_EDID is not set 551# CONFIG_DISPLAY_SUPPORT is not set
552# CONFIG_VGASTATE is not set
553# CONFIG_VIDEO_OUTPUT_CONTROL is not set
725# CONFIG_FB is not set 554# CONFIG_FB is not set
726 555
727# 556#
@@ -730,65 +559,51 @@ CONFIG_LEGACY_PTY_COUNT=256
730# CONFIG_VGA_CONSOLE is not set 559# CONFIG_VGA_CONSOLE is not set
731# CONFIG_MDA_CONSOLE is not set 560# CONFIG_MDA_CONSOLE is not set
732CONFIG_DUMMY_CONSOLE=y 561CONFIG_DUMMY_CONSOLE=y
733# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
734 562
735# 563#
736# Sound 564# Sound
737# 565#
738# CONFIG_SOUND is not set 566# CONFIG_SOUND is not set
739 567CONFIG_HID_SUPPORT=y
740#
741# HID Devices
742#
743CONFIG_HID=y 568CONFIG_HID=y
744# CONFIG_HID_DEBUG is not set 569# CONFIG_HID_DEBUG is not set
745 570# CONFIG_USB_SUPPORT is not set
746#
747# USB support
748#
749# CONFIG_USB_ARCH_HAS_HCD is not set
750# CONFIG_USB_ARCH_HAS_OHCI is not set
751# CONFIG_USB_ARCH_HAS_EHCI is not set
752
753#
754# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
755#
756
757#
758# USB Gadget Support
759#
760# CONFIG_USB_GADGET is not set
761
762#
763# MMC/SD Card support
764#
765# CONFIG_MMC is not set 571# CONFIG_MMC is not set
766
767#
768# LED devices
769#
770# CONFIG_NEW_LEDS is not set 572# CONFIG_NEW_LEDS is not set
573CONFIG_RTC_LIB=y
574CONFIG_RTC_CLASS=y
575CONFIG_RTC_HCTOSYS=y
576CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
577# CONFIG_RTC_DEBUG is not set
771 578
772# 579#
773# LED drivers 580# RTC interfaces
774#
775
776#
777# LED Triggers
778# 581#
582CONFIG_RTC_INTF_SYSFS=y
583CONFIG_RTC_INTF_PROC=y
584CONFIG_RTC_INTF_DEV=y
585# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
586# CONFIG_RTC_DRV_TEST is not set
779 587
780# 588#
781# InfiniBand support 589# SPI RTC drivers
782# 590#
783 591
784# 592#
785# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 593# Platform RTC drivers
786# 594#
595# CONFIG_RTC_DRV_CMOS is not set
596# CONFIG_RTC_DRV_DS1553 is not set
597# CONFIG_RTC_DRV_STK17TA8 is not set
598# CONFIG_RTC_DRV_DS1742 is not set
599# CONFIG_RTC_DRV_M48T86 is not set
600# CONFIG_RTC_DRV_M48T59 is not set
601# CONFIG_RTC_DRV_V3020 is not set
787 602
788# 603#
789# Real Time Clock 604# on-CPU RTC drivers
790# 605#
791# CONFIG_RTC_CLASS is not set 606CONFIG_RTC_DRV_VR41XX=y
792 607
793# 608#
794# DMA Engine support 609# DMA Engine support
@@ -804,23 +619,25 @@ CONFIG_HID=y
804# 619#
805 620
806# 621#
807# Auxiliary Display support 622# Userspace I/O
808#
809
810#
811# Virtualization
812# 623#
624# CONFIG_UIO is not set
813 625
814# 626#
815# File systems 627# File systems
816# 628#
817CONFIG_EXT2_FS=y 629CONFIG_EXT2_FS=y
818CONFIG_EXT2_FS_XATTR=y 630CONFIG_EXT2_FS_XATTR=y
819CONFIG_EXT2_FS_POSIX_ACL=y 631# CONFIG_EXT2_FS_POSIX_ACL is not set
820CONFIG_EXT2_FS_SECURITY=y 632# CONFIG_EXT2_FS_SECURITY is not set
821# CONFIG_EXT2_FS_XIP is not set 633# CONFIG_EXT2_FS_XIP is not set
822# CONFIG_EXT3_FS is not set 634CONFIG_EXT3_FS=y
635CONFIG_EXT3_FS_XATTR=y
636# CONFIG_EXT3_FS_POSIX_ACL is not set
637# CONFIG_EXT3_FS_SECURITY is not set
823# CONFIG_EXT4DEV_FS is not set 638# CONFIG_EXT4DEV_FS is not set
639CONFIG_JBD=y
640# CONFIG_JBD_DEBUG is not set
824CONFIG_FS_MBCACHE=y 641CONFIG_FS_MBCACHE=y
825# CONFIG_REISERFS_FS is not set 642# CONFIG_REISERFS_FS is not set
826# CONFIG_JFS_FS is not set 643# CONFIG_JFS_FS is not set
@@ -836,7 +653,7 @@ CONFIG_INOTIFY_USER=y
836CONFIG_DNOTIFY=y 653CONFIG_DNOTIFY=y
837# CONFIG_AUTOFS_FS is not set 654# CONFIG_AUTOFS_FS is not set
838CONFIG_AUTOFS4_FS=y 655CONFIG_AUTOFS4_FS=y
839CONFIG_FUSE_FS=m 656# CONFIG_FUSE_FS is not set
840CONFIG_GENERIC_ACL=y 657CONFIG_GENERIC_ACL=y
841 658
842# 659#
@@ -863,7 +680,7 @@ CONFIG_TMPFS=y
863CONFIG_TMPFS_POSIX_ACL=y 680CONFIG_TMPFS_POSIX_ACL=y
864# CONFIG_HUGETLB_PAGE is not set 681# CONFIG_HUGETLB_PAGE is not set
865CONFIG_RAMFS=y 682CONFIG_RAMFS=y
866CONFIG_CONFIGFS_FS=m 683# CONFIG_CONFIGFS_FS is not set
867 684
868# 685#
869# Miscellaneous filesystems 686# Miscellaneous filesystems
@@ -885,17 +702,22 @@ CONFIG_CONFIGFS_FS=m
885# 702#
886# Network File Systems 703# Network File Systems
887# 704#
888CONFIG_NFS_FS=y 705CONFIG_NFS_FS=m
889# CONFIG_NFS_V3 is not set 706CONFIG_NFS_V3=y
707# CONFIG_NFS_V3_ACL is not set
890# CONFIG_NFS_V4 is not set 708# CONFIG_NFS_V4 is not set
891# CONFIG_NFS_DIRECTIO is not set 709# CONFIG_NFS_DIRECTIO is not set
892CONFIG_NFSD=y 710CONFIG_NFSD=m
893# CONFIG_NFSD_V3 is not set 711CONFIG_NFSD_V3=y
712# CONFIG_NFSD_V3_ACL is not set
713# CONFIG_NFSD_V4 is not set
894# CONFIG_NFSD_TCP is not set 714# CONFIG_NFSD_TCP is not set
895CONFIG_LOCKD=y 715CONFIG_LOCKD=m
896CONFIG_EXPORTFS=y 716CONFIG_LOCKD_V4=y
717CONFIG_EXPORTFS=m
897CONFIG_NFS_COMMON=y 718CONFIG_NFS_COMMON=y
898CONFIG_SUNRPC=y 719CONFIG_SUNRPC=m
720# CONFIG_SUNRPC_BIND34 is not set
899# CONFIG_RPCSEC_GSS_KRB5 is not set 721# CONFIG_RPCSEC_GSS_KRB5 is not set
900# CONFIG_RPCSEC_GSS_SPKM3 is not set 722# CONFIG_RPCSEC_GSS_SPKM3 is not set
901# CONFIG_SMB_FS is not set 723# CONFIG_SMB_FS is not set
@@ -903,7 +725,6 @@ CONFIG_SUNRPC=y
903# CONFIG_NCP_FS is not set 725# CONFIG_NCP_FS is not set
904# CONFIG_CODA_FS is not set 726# CONFIG_CODA_FS is not set
905# CONFIG_AFS_FS is not set 727# CONFIG_AFS_FS is not set
906# CONFIG_9P_FS is not set
907 728
908# 729#
909# Partition Types 730# Partition Types
@@ -919,10 +740,7 @@ CONFIG_MSDOS_PARTITION=y
919# 740#
920# Distributed Lock Manager 741# Distributed Lock Manager
921# 742#
922CONFIG_DLM=m 743# CONFIG_DLM is not set
923CONFIG_DLM_TCP=y
924# CONFIG_DLM_SCTP is not set
925# CONFIG_DLM_DEBUG is not set
926 744
927# 745#
928# Profiling support 746# Profiling support
@@ -940,7 +758,6 @@ CONFIG_ENABLE_MUST_CHECK=y
940# CONFIG_DEBUG_FS is not set 758# CONFIG_DEBUG_FS is not set
941# CONFIG_HEADERS_CHECK is not set 759# CONFIG_HEADERS_CHECK is not set
942# CONFIG_DEBUG_KERNEL is not set 760# CONFIG_DEBUG_KERNEL is not set
943CONFIG_LOG_BUF_SHIFT=14
944CONFIG_CROSSCOMPILE=y 761CONFIG_CROSSCOMPILE=y
945CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M" 762CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
946 763
@@ -949,52 +766,7 @@ CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x170,0x376,49 mem=16M"
949# 766#
950# CONFIG_KEYS is not set 767# CONFIG_KEYS is not set
951# CONFIG_SECURITY is not set 768# CONFIG_SECURITY is not set
952 769# CONFIG_CRYPTO is not set
953#
954# Cryptographic options
955#
956CONFIG_CRYPTO=y
957CONFIG_CRYPTO_ALGAPI=y
958CONFIG_CRYPTO_BLKCIPHER=m
959CONFIG_CRYPTO_HASH=m
960CONFIG_CRYPTO_MANAGER=m
961CONFIG_CRYPTO_HMAC=m
962CONFIG_CRYPTO_XCBC=m
963CONFIG_CRYPTO_NULL=m
964CONFIG_CRYPTO_MD4=m
965CONFIG_CRYPTO_MD5=y
966CONFIG_CRYPTO_SHA1=m
967CONFIG_CRYPTO_SHA256=m
968CONFIG_CRYPTO_SHA512=m
969CONFIG_CRYPTO_WP512=m
970CONFIG_CRYPTO_TGR192=m
971CONFIG_CRYPTO_GF128MUL=m
972CONFIG_CRYPTO_ECB=m
973CONFIG_CRYPTO_CBC=m
974CONFIG_CRYPTO_PCBC=m
975CONFIG_CRYPTO_LRW=m
976CONFIG_CRYPTO_DES=m
977CONFIG_CRYPTO_FCRYPT=m
978CONFIG_CRYPTO_BLOWFISH=m
979CONFIG_CRYPTO_TWOFISH=m
980CONFIG_CRYPTO_TWOFISH_COMMON=m
981CONFIG_CRYPTO_SERPENT=m
982CONFIG_CRYPTO_AES=m
983CONFIG_CRYPTO_CAST5=m
984CONFIG_CRYPTO_CAST6=m
985CONFIG_CRYPTO_TEA=m
986CONFIG_CRYPTO_ARC4=m
987CONFIG_CRYPTO_KHAZAD=m
988CONFIG_CRYPTO_ANUBIS=m
989CONFIG_CRYPTO_DEFLATE=m
990CONFIG_CRYPTO_MICHAEL_MIC=m
991CONFIG_CRYPTO_CRC32C=m
992CONFIG_CRYPTO_CAMELLIA=m
993# CONFIG_CRYPTO_TEST is not set
994
995#
996# Hardware crypto devices
997#
998 770
999# 771#
1000# Library routines 772# Library routines
@@ -1002,10 +774,11 @@ CONFIG_CRYPTO_CAMELLIA=m
1002CONFIG_BITREVERSE=y 774CONFIG_BITREVERSE=y
1003# CONFIG_CRC_CCITT is not set 775# CONFIG_CRC_CCITT is not set
1004# CONFIG_CRC16 is not set 776# CONFIG_CRC16 is not set
777# CONFIG_CRC_ITU_T is not set
1005CONFIG_CRC32=y 778CONFIG_CRC32=y
1006CONFIG_LIBCRC32C=m 779# CONFIG_CRC7 is not set
1007CONFIG_ZLIB_INFLATE=m 780# CONFIG_LIBCRC32C is not set
1008CONFIG_ZLIB_DEFLATE=m
1009CONFIG_PLIST=y 781CONFIG_PLIST=y
1010CONFIG_HAS_IOMEM=y 782CONFIG_HAS_IOMEM=y
1011CONFIG_HAS_IOPORT=y 783CONFIG_HAS_IOPORT=y
784CONFIG_HAS_DMA=y
diff --git a/arch/mips/defconfig b/arch/mips/defconfig
index d3d81fb2765a..670039bb1a7c 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.20 3# Linux kernel version: 2.6.23-rc2
4# Tue Feb 20 21:47:14 2007 4# Tue Aug 7 12:39:49 2007
5# 5#
6CONFIG_MIPS=y 6CONFIG_MIPS=y
7 7
@@ -9,52 +9,40 @@ CONFIG_MIPS=y
9# Machine selection 9# Machine selection
10# 10#
11CONFIG_ZONE_DMA=y 11CONFIG_ZONE_DMA=y
12# CONFIG_MIPS_MTX1 is not set 12# CONFIG_MACH_ALCHEMY is not set
13# CONFIG_MIPS_BOSPORUS is not set
14# CONFIG_MIPS_PB1000 is not set
15# CONFIG_MIPS_PB1100 is not set
16# CONFIG_MIPS_PB1500 is not set
17# CONFIG_MIPS_PB1550 is not set
18# CONFIG_MIPS_PB1200 is not set
19# CONFIG_MIPS_DB1000 is not set
20# CONFIG_MIPS_DB1100 is not set
21# CONFIG_MIPS_DB1500 is not set
22# CONFIG_MIPS_DB1550 is not set
23# CONFIG_MIPS_DB1200 is not set
24# CONFIG_MIPS_MIRAGE is not set
25# CONFIG_BASLER_EXCITE is not set 13# CONFIG_BASLER_EXCITE is not set
26# CONFIG_MIPS_COBALT is not set 14# CONFIG_MIPS_COBALT is not set
27# CONFIG_MACH_DECSTATION is not set 15# CONFIG_MACH_DECSTATION is not set
28# CONFIG_MACH_JAZZ is not set 16# CONFIG_MACH_JAZZ is not set
17# CONFIG_LEMOTE_FULONG is not set
29# CONFIG_MIPS_ATLAS is not set 18# CONFIG_MIPS_ATLAS is not set
30# CONFIG_MIPS_MALTA is not set 19# CONFIG_MIPS_MALTA is not set
31# CONFIG_MIPS_SEAD is not set 20# CONFIG_MIPS_SEAD is not set
32# CONFIG_WR_PPMC is not set
33# CONFIG_MIPS_SIM is not set 21# CONFIG_MIPS_SIM is not set
34# CONFIG_MOMENCO_JAGUAR_ATX is not set 22# CONFIG_MARKEINS is not set
35# CONFIG_MIPS_XXS1500 is not set 23# CONFIG_MACH_VR41XX is not set
36# CONFIG_PNX8550_JBS is not set 24# CONFIG_PNX8550_JBS is not set
37# CONFIG_PNX8550_STB810 is not set 25# CONFIG_PNX8550_STB810 is not set
38# CONFIG_MACH_VR41XX is not set 26# CONFIG_PMC_MSP is not set
39# CONFIG_PMC_YOSEMITE is not set 27# CONFIG_PMC_YOSEMITE is not set
40# CONFIG_QEMU is not set 28# CONFIG_QEMU is not set
41# CONFIG_MARKEINS is not set
42CONFIG_SGI_IP22=y 29CONFIG_SGI_IP22=y
43# CONFIG_SGI_IP27 is not set 30# CONFIG_SGI_IP27 is not set
44# CONFIG_SGI_IP32 is not set 31# CONFIG_SGI_IP32 is not set
45# CONFIG_SIBYTE_BIGSUR is not set 32# CONFIG_SIBYTE_CRHINE is not set
33# CONFIG_SIBYTE_CARMEL is not set
34# CONFIG_SIBYTE_CRHONE is not set
35# CONFIG_SIBYTE_RHONE is not set
46# CONFIG_SIBYTE_SWARM is not set 36# CONFIG_SIBYTE_SWARM is not set
37# CONFIG_SIBYTE_LITTLESUR is not set
47# CONFIG_SIBYTE_SENTOSA is not set 38# CONFIG_SIBYTE_SENTOSA is not set
48# CONFIG_SIBYTE_RHONE is not set
49# CONFIG_SIBYTE_CARMEL is not set
50# CONFIG_SIBYTE_PTSWARM is not set 39# CONFIG_SIBYTE_PTSWARM is not set
51# CONFIG_SIBYTE_LITTLESUR is not set 40# CONFIG_SIBYTE_BIGSUR is not set
52# CONFIG_SIBYTE_CRHINE is not set
53# CONFIG_SIBYTE_CRHONE is not set
54# CONFIG_SNI_RM is not set 41# CONFIG_SNI_RM is not set
55# CONFIG_TOSHIBA_JMR3927 is not set 42# CONFIG_TOSHIBA_JMR3927 is not set
56# CONFIG_TOSHIBA_RBTX4927 is not set 43# CONFIG_TOSHIBA_RBTX4927 is not set
57# CONFIG_TOSHIBA_RBTX4938 is not set 44# CONFIG_TOSHIBA_RBTX4938 is not set
45# CONFIG_WR_PPMC is not set
58CONFIG_RWSEM_GENERIC_SPINLOCK=y 46CONFIG_RWSEM_GENERIC_SPINLOCK=y
59# CONFIG_ARCH_HAS_ILOG2_U32 is not set 47# CONFIG_ARCH_HAS_ILOG2_U32 is not set
60# CONFIG_ARCH_HAS_ILOG2_U64 is not set 48# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -67,6 +55,9 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
67CONFIG_ARC=y 55CONFIG_ARC=y
68CONFIG_DMA_NONCOHERENT=y 56CONFIG_DMA_NONCOHERENT=y
69CONFIG_DMA_NEED_PCI_MAP_STATE=y 57CONFIG_DMA_NEED_PCI_MAP_STATE=y
58CONFIG_EARLY_PRINTK=y
59CONFIG_SYS_HAS_EARLY_PRINTK=y
60# CONFIG_NO_IOPORT is not set
70CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y 61CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN=y
71CONFIG_CPU_BIG_ENDIAN=y 62CONFIG_CPU_BIG_ENDIAN=y
72# CONFIG_CPU_LITTLE_ENDIAN is not set 63# CONFIG_CPU_LITTLE_ENDIAN is not set
@@ -82,6 +73,7 @@ CONFIG_ARC_PROMLIB=y
82# 73#
83# CPU selection 74# CPU selection
84# 75#
76# CONFIG_CPU_LOONGSON2 is not set
85# CONFIG_CPU_MIPS32_R1 is not set 77# CONFIG_CPU_MIPS32_R1 is not set
86# CONFIG_CPU_MIPS32_R2 is not set 78# CONFIG_CPU_MIPS32_R2 is not set
87# CONFIG_CPU_MIPS64_R1 is not set 79# CONFIG_CPU_MIPS64_R1 is not set
@@ -122,8 +114,6 @@ CONFIG_IP22_CPU_SCACHE=y
122CONFIG_MIPS_MT_DISABLED=y 114CONFIG_MIPS_MT_DISABLED=y
123# CONFIG_MIPS_MT_SMP is not set 115# CONFIG_MIPS_MT_SMP is not set
124# CONFIG_MIPS_MT_SMTC is not set 116# CONFIG_MIPS_MT_SMTC is not set
125# CONFIG_MIPS_VPE_LOADER is not set
126# CONFIG_64BIT_PHYS_ADDR is not set
127CONFIG_CPU_HAS_LLSC=y 117CONFIG_CPU_HAS_LLSC=y
128CONFIG_CPU_HAS_SYNC=y 118CONFIG_CPU_HAS_SYNC=y
129CONFIG_GENERIC_HARDIRQS=y 119CONFIG_GENERIC_HARDIRQS=y
@@ -139,6 +129,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
139CONFIG_SPLIT_PTLOCK_CPUS=4 129CONFIG_SPLIT_PTLOCK_CPUS=4
140# CONFIG_RESOURCES_64BIT is not set 130# CONFIG_RESOURCES_64BIT is not set
141CONFIG_ZONE_DMA_FLAG=1 131CONFIG_ZONE_DMA_FLAG=1
132CONFIG_BOUNCE=y
133CONFIG_VIRT_TO_BUS=y
142# CONFIG_HZ_48 is not set 134# CONFIG_HZ_48 is not set
143# CONFIG_HZ_100 is not set 135# CONFIG_HZ_100 is not set
144# CONFIG_HZ_128 is not set 136# CONFIG_HZ_128 is not set
@@ -152,35 +144,33 @@ CONFIG_HZ=1000
152CONFIG_PREEMPT_VOLUNTARY=y 144CONFIG_PREEMPT_VOLUNTARY=y
153# CONFIG_PREEMPT is not set 145# CONFIG_PREEMPT is not set
154# CONFIG_KEXEC is not set 146# CONFIG_KEXEC is not set
147CONFIG_SECCOMP=y
155CONFIG_LOCKDEP_SUPPORT=y 148CONFIG_LOCKDEP_SUPPORT=y
156CONFIG_STACKTRACE_SUPPORT=y 149CONFIG_STACKTRACE_SUPPORT=y
157CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 150CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
158 151
159# 152#
160# Code maturity level options 153# General setup
161# 154#
162CONFIG_EXPERIMENTAL=y 155CONFIG_EXPERIMENTAL=y
163CONFIG_BROKEN_ON_SMP=y 156CONFIG_BROKEN_ON_SMP=y
164CONFIG_INIT_ENV_ARG_LIMIT=32 157CONFIG_INIT_ENV_ARG_LIMIT=32
165
166#
167# General setup
168#
169CONFIG_LOCALVERSION="" 158CONFIG_LOCALVERSION=""
170CONFIG_LOCALVERSION_AUTO=y 159CONFIG_LOCALVERSION_AUTO=y
171CONFIG_SWAP=y 160CONFIG_SWAP=y
172CONFIG_SYSVIPC=y 161CONFIG_SYSVIPC=y
173# CONFIG_IPC_NS is not set
174CONFIG_SYSVIPC_SYSCTL=y 162CONFIG_SYSVIPC_SYSCTL=y
175# CONFIG_POSIX_MQUEUE is not set 163# CONFIG_POSIX_MQUEUE is not set
176# CONFIG_BSD_PROCESS_ACCT is not set 164# CONFIG_BSD_PROCESS_ACCT is not set
177# CONFIG_TASKSTATS is not set 165# CONFIG_TASKSTATS is not set
178# CONFIG_UTS_NS is not set 166# CONFIG_USER_NS is not set
179# CONFIG_AUDIT is not set 167# CONFIG_AUDIT is not set
180CONFIG_IKCONFIG=y 168CONFIG_IKCONFIG=y
181CONFIG_IKCONFIG_PROC=y 169CONFIG_IKCONFIG_PROC=y
170CONFIG_LOG_BUF_SHIFT=14
182CONFIG_SYSFS_DEPRECATED=y 171CONFIG_SYSFS_DEPRECATED=y
183CONFIG_RELAY=y 172CONFIG_RELAY=y
173# CONFIG_BLK_DEV_INITRD is not set
184# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 174# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
185CONFIG_SYSCTL=y 175CONFIG_SYSCTL=y
186CONFIG_EMBEDDED=y 176CONFIG_EMBEDDED=y
@@ -193,32 +183,30 @@ CONFIG_BUG=y
193CONFIG_ELF_CORE=y 183CONFIG_ELF_CORE=y
194CONFIG_BASE_FULL=y 184CONFIG_BASE_FULL=y
195CONFIG_FUTEX=y 185CONFIG_FUTEX=y
186CONFIG_ANON_INODES=y
196CONFIG_EPOLL=y 187CONFIG_EPOLL=y
188CONFIG_SIGNALFD=y
189CONFIG_TIMERFD=y
190CONFIG_EVENTFD=y
197CONFIG_SHMEM=y 191CONFIG_SHMEM=y
198CONFIG_SLAB=y
199CONFIG_VM_EVENT_COUNTERS=y 192CONFIG_VM_EVENT_COUNTERS=y
193CONFIG_SLAB=y
194# CONFIG_SLUB is not set
195# CONFIG_SLOB is not set
200CONFIG_RT_MUTEXES=y 196CONFIG_RT_MUTEXES=y
201# CONFIG_TINY_SHMEM is not set 197# CONFIG_TINY_SHMEM is not set
202CONFIG_BASE_SMALL=0 198CONFIG_BASE_SMALL=0
203# CONFIG_SLOB is not set
204
205#
206# Loadable module support
207#
208CONFIG_MODULES=y 199CONFIG_MODULES=y
209CONFIG_MODULE_UNLOAD=y 200CONFIG_MODULE_UNLOAD=y
210# CONFIG_MODULE_FORCE_UNLOAD is not set 201# CONFIG_MODULE_FORCE_UNLOAD is not set
211CONFIG_MODVERSIONS=y 202CONFIG_MODVERSIONS=y
212CONFIG_MODULE_SRCVERSION_ALL=y 203CONFIG_MODULE_SRCVERSION_ALL=y
213CONFIG_KMOD=y 204CONFIG_KMOD=y
214
215#
216# Block layer
217#
218CONFIG_BLOCK=y 205CONFIG_BLOCK=y
219# CONFIG_LBD is not set 206# CONFIG_LBD is not set
220# CONFIG_BLK_DEV_IO_TRACE is not set 207# CONFIG_BLK_DEV_IO_TRACE is not set
221# CONFIG_LSF is not set 208# CONFIG_LSF is not set
209# CONFIG_BLK_DEV_BSG is not set
222 210
223# 211#
224# IO Schedulers 212# IO Schedulers
@@ -237,6 +225,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
237# Bus options (PCI, PCMCIA, EISA, ISA, TC) 225# Bus options (PCI, PCMCIA, EISA, ISA, TC)
238# 226#
239CONFIG_HW_HAS_EISA=y 227CONFIG_HW_HAS_EISA=y
228# CONFIG_ARCH_SUPPORTS_MSI is not set
240# CONFIG_EISA is not set 229# CONFIG_EISA is not set
241CONFIG_MMU=y 230CONFIG_MMU=y
242 231
@@ -245,10 +234,6 @@ CONFIG_MMU=y
245# 234#
246 235
247# 236#
248# PCI Hotplug Support
249#
250
251#
252# Executable file formats 237# Executable file formats
253# 238#
254CONFIG_BINFMT_ELF=y 239CONFIG_BINFMT_ELF=y
@@ -261,7 +246,7 @@ CONFIG_TRAD_SIGNALS=y
261CONFIG_PM=y 246CONFIG_PM=y
262# CONFIG_PM_LEGACY is not set 247# CONFIG_PM_LEGACY is not set
263# CONFIG_PM_DEBUG is not set 248# CONFIG_PM_DEBUG is not set
264# CONFIG_PM_SYSFS_DEPRECATED is not set 249# CONFIG_SUSPEND is not set
265 250
266# 251#
267# Networking 252# Networking
@@ -271,7 +256,6 @@ CONFIG_NET=y
271# 256#
272# Networking options 257# Networking options
273# 258#
274# CONFIG_NETDEBUG is not set
275CONFIG_PACKET=y 259CONFIG_PACKET=y
276CONFIG_PACKET_MMAP=y 260CONFIG_PACKET_MMAP=y
277CONFIG_UNIX=y 261CONFIG_UNIX=y
@@ -308,10 +292,6 @@ CONFIG_INET_TCP_DIAG=y
308CONFIG_TCP_CONG_CUBIC=y 292CONFIG_TCP_CONG_CUBIC=y
309CONFIG_DEFAULT_TCP_CONG="cubic" 293CONFIG_DEFAULT_TCP_CONG="cubic"
310CONFIG_TCP_MD5SIG=y 294CONFIG_TCP_MD5SIG=y
311
312#
313# IP: Virtual Server Configuration
314#
315CONFIG_IP_VS=m 295CONFIG_IP_VS=m
316# CONFIG_IP_VS_DEBUG is not set 296# CONFIG_IP_VS_DEBUG is not set
317CONFIG_IP_VS_TAB_BITS=12 297CONFIG_IP_VS_TAB_BITS=12
@@ -346,10 +326,11 @@ CONFIG_IPV6=m
346CONFIG_IPV6_PRIVACY=y 326CONFIG_IPV6_PRIVACY=y
347CONFIG_IPV6_ROUTER_PREF=y 327CONFIG_IPV6_ROUTER_PREF=y
348CONFIG_IPV6_ROUTE_INFO=y 328CONFIG_IPV6_ROUTE_INFO=y
329CONFIG_IPV6_OPTIMISTIC_DAD=y
349CONFIG_INET6_AH=m 330CONFIG_INET6_AH=m
350CONFIG_INET6_ESP=m 331CONFIG_INET6_ESP=m
351CONFIG_INET6_IPCOMP=m 332CONFIG_INET6_IPCOMP=m
352CONFIG_IPV6_MIP6=y 333CONFIG_IPV6_MIP6=m
353CONFIG_INET6_XFRM_TUNNEL=m 334CONFIG_INET6_XFRM_TUNNEL=m
354CONFIG_INET6_TUNNEL=m 335CONFIG_INET6_TUNNEL=m
355CONFIG_INET6_XFRM_MODE_TRANSPORT=m 336CONFIG_INET6_XFRM_MODE_TRANSPORT=m
@@ -371,8 +352,6 @@ CONFIG_NETFILTER_NETLINK=m
371CONFIG_NETFILTER_NETLINK_QUEUE=m 352CONFIG_NETFILTER_NETLINK_QUEUE=m
372CONFIG_NETFILTER_NETLINK_LOG=m 353CONFIG_NETFILTER_NETLINK_LOG=m
373CONFIG_NF_CONNTRACK_ENABLED=m 354CONFIG_NF_CONNTRACK_ENABLED=m
374CONFIG_NF_CONNTRACK_SUPPORT=y
375# CONFIG_IP_NF_CONNTRACK_SUPPORT is not set
376CONFIG_NF_CONNTRACK=m 355CONFIG_NF_CONNTRACK=m
377CONFIG_NF_CT_ACCT=y 356CONFIG_NF_CT_ACCT=y
378CONFIG_NF_CONNTRACK_MARK=y 357CONFIG_NF_CONNTRACK_MARK=y
@@ -380,6 +359,7 @@ CONFIG_NF_CONNTRACK_SECMARK=y
380CONFIG_NF_CONNTRACK_EVENTS=y 359CONFIG_NF_CONNTRACK_EVENTS=y
381CONFIG_NF_CT_PROTO_GRE=m 360CONFIG_NF_CT_PROTO_GRE=m
382CONFIG_NF_CT_PROTO_SCTP=m 361CONFIG_NF_CT_PROTO_SCTP=m
362CONFIG_NF_CT_PROTO_UDPLITE=m
383CONFIG_NF_CONNTRACK_AMANDA=m 363CONFIG_NF_CONNTRACK_AMANDA=m
384CONFIG_NF_CONNTRACK_FTP=m 364CONFIG_NF_CONNTRACK_FTP=m
385CONFIG_NF_CONNTRACK_H323=m 365CONFIG_NF_CONNTRACK_H323=m
@@ -398,11 +378,13 @@ CONFIG_NETFILTER_XT_TARGET_MARK=m
398CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 378CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
399CONFIG_NETFILTER_XT_TARGET_NFLOG=m 379CONFIG_NETFILTER_XT_TARGET_NFLOG=m
400CONFIG_NETFILTER_XT_TARGET_NOTRACK=m 380CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
381CONFIG_NETFILTER_XT_TARGET_TRACE=m
401CONFIG_NETFILTER_XT_TARGET_SECMARK=m 382CONFIG_NETFILTER_XT_TARGET_SECMARK=m
402CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m 383CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
403CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 384CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
404CONFIG_NETFILTER_XT_MATCH_COMMENT=m 385CONFIG_NETFILTER_XT_MATCH_COMMENT=m
405CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m 386CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
387CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
406CONFIG_NETFILTER_XT_MATCH_CONNMARK=m 388CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
407CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 389CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
408CONFIG_NETFILTER_XT_MATCH_DCCP=m 390CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -423,6 +405,7 @@ CONFIG_NETFILTER_XT_MATCH_STATE=m
423CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 405CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
424CONFIG_NETFILTER_XT_MATCH_STRING=m 406CONFIG_NETFILTER_XT_MATCH_STRING=m
425CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 407CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
408CONFIG_NETFILTER_XT_MATCH_U32=m
426CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 409CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
427 410
428# 411#
@@ -490,25 +473,13 @@ CONFIG_IP6_NF_TARGET_REJECT=m
490CONFIG_IP6_NF_MANGLE=m 473CONFIG_IP6_NF_MANGLE=m
491CONFIG_IP6_NF_TARGET_HL=m 474CONFIG_IP6_NF_TARGET_HL=m
492CONFIG_IP6_NF_RAW=m 475CONFIG_IP6_NF_RAW=m
493
494#
495# DCCP Configuration (EXPERIMENTAL)
496#
497# CONFIG_IP_DCCP is not set 476# CONFIG_IP_DCCP is not set
498
499#
500# SCTP Configuration (EXPERIMENTAL)
501#
502CONFIG_IP_SCTP=m 477CONFIG_IP_SCTP=m
503# CONFIG_SCTP_DBG_MSG is not set 478# CONFIG_SCTP_DBG_MSG is not set
504# CONFIG_SCTP_DBG_OBJCNT is not set 479# CONFIG_SCTP_DBG_OBJCNT is not set
505# CONFIG_SCTP_HMAC_NONE is not set 480# CONFIG_SCTP_HMAC_NONE is not set
506# CONFIG_SCTP_HMAC_SHA1 is not set 481# CONFIG_SCTP_HMAC_SHA1 is not set
507CONFIG_SCTP_HMAC_MD5=y 482CONFIG_SCTP_HMAC_MD5=y
508
509#
510# TIPC Configuration (EXPERIMENTAL)
511#
512# CONFIG_TIPC is not set 483# CONFIG_TIPC is not set
513# CONFIG_ATM is not set 484# CONFIG_ATM is not set
514# CONFIG_BRIDGE is not set 485# CONFIG_BRIDGE is not set
@@ -527,9 +498,6 @@ CONFIG_SCTP_HMAC_MD5=y
527# 498#
528CONFIG_NET_SCHED=y 499CONFIG_NET_SCHED=y
529CONFIG_NET_SCH_FIFO=y 500CONFIG_NET_SCH_FIFO=y
530# CONFIG_NET_SCH_CLK_JIFFIES is not set
531CONFIG_NET_SCH_CLK_GETTIMEOFDAY=y
532# CONFIG_NET_SCH_CLK_CPU is not set
533 501
534# 502#
535# Queueing/Scheduling 503# Queueing/Scheduling
@@ -538,6 +506,7 @@ CONFIG_NET_SCH_CBQ=m
538CONFIG_NET_SCH_HTB=m 506CONFIG_NET_SCH_HTB=m
539CONFIG_NET_SCH_HFSC=m 507CONFIG_NET_SCH_HFSC=m
540CONFIG_NET_SCH_PRIO=m 508CONFIG_NET_SCH_PRIO=m
509CONFIG_NET_SCH_RR=m
541CONFIG_NET_SCH_RED=m 510CONFIG_NET_SCH_RED=m
542CONFIG_NET_SCH_SFQ=m 511CONFIG_NET_SCH_SFQ=m
543CONFIG_NET_SCH_TEQL=m 512CONFIG_NET_SCH_TEQL=m
@@ -562,10 +531,16 @@ CONFIG_NET_CLS_U32=m
562CONFIG_NET_CLS_RSVP=m 531CONFIG_NET_CLS_RSVP=m
563CONFIG_NET_CLS_RSVP6=m 532CONFIG_NET_CLS_RSVP6=m
564# CONFIG_NET_EMATCH is not set 533# CONFIG_NET_EMATCH is not set
565# CONFIG_NET_CLS_ACT is not set 534CONFIG_NET_CLS_ACT=y
535CONFIG_NET_ACT_POLICE=y
536CONFIG_NET_ACT_GACT=m
537CONFIG_GACT_PROB=y
538CONFIG_NET_ACT_MIRRED=m
539CONFIG_NET_ACT_IPT=m
540CONFIG_NET_ACT_PEDIT=m
541CONFIG_NET_ACT_SIMP=m
566CONFIG_NET_CLS_POLICE=y 542CONFIG_NET_CLS_POLICE=y
567# CONFIG_NET_CLS_IND is not set 543# CONFIG_NET_CLS_IND is not set
568CONFIG_NET_ESTIMATOR=y
569 544
570# 545#
571# Network testing 546# Network testing
@@ -574,14 +549,26 @@ CONFIG_NET_ESTIMATOR=y
574# CONFIG_HAMRADIO is not set 549# CONFIG_HAMRADIO is not set
575# CONFIG_IRDA is not set 550# CONFIG_IRDA is not set
576# CONFIG_BT is not set 551# CONFIG_BT is not set
552# CONFIG_AF_RXRPC is not set
553CONFIG_FIB_RULES=y
554
555#
556# Wireless
557#
558CONFIG_CFG80211=m
559CONFIG_WIRELESS_EXT=y
560CONFIG_MAC80211=m
561# CONFIG_MAC80211_DEBUG is not set
577CONFIG_IEEE80211=m 562CONFIG_IEEE80211=m
578# CONFIG_IEEE80211_DEBUG is not set 563# CONFIG_IEEE80211_DEBUG is not set
579CONFIG_IEEE80211_CRYPT_WEP=m 564CONFIG_IEEE80211_CRYPT_WEP=m
580CONFIG_IEEE80211_CRYPT_CCMP=m 565CONFIG_IEEE80211_CRYPT_CCMP=m
566CONFIG_IEEE80211_CRYPT_TKIP=m
581CONFIG_IEEE80211_SOFTMAC=m 567CONFIG_IEEE80211_SOFTMAC=m
582# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set 568# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
583CONFIG_WIRELESS_EXT=y 569CONFIG_RFKILL=m
584CONFIG_FIB_RULES=y 570CONFIG_RFKILL_INPUT=m
571# CONFIG_NET_9P is not set
585 572
586# 573#
587# Device Drivers 574# Device Drivers
@@ -593,47 +580,19 @@ CONFIG_FIB_RULES=y
593CONFIG_STANDALONE=y 580CONFIG_STANDALONE=y
594CONFIG_PREVENT_FIRMWARE_BUILD=y 581CONFIG_PREVENT_FIRMWARE_BUILD=y
595# CONFIG_SYS_HYPERVISOR is not set 582# CONFIG_SYS_HYPERVISOR is not set
596
597#
598# Connector - unified userspace <-> kernelspace linker
599#
600CONFIG_CONNECTOR=m 583CONFIG_CONNECTOR=m
601
602#
603# Memory Technology Devices (MTD)
604#
605# CONFIG_MTD is not set 584# CONFIG_MTD is not set
606
607#
608# Parallel port support
609#
610# CONFIG_PARPORT is not set 585# CONFIG_PARPORT is not set
611 586CONFIG_BLK_DEV=y
612#
613# Plug and Play support
614#
615# CONFIG_PNPACPI is not set
616
617#
618# Block devices
619#
620# CONFIG_BLK_DEV_COW_COMMON is not set 587# CONFIG_BLK_DEV_COW_COMMON is not set
621# CONFIG_BLK_DEV_LOOP is not set 588# CONFIG_BLK_DEV_LOOP is not set
622# CONFIG_BLK_DEV_NBD is not set 589# CONFIG_BLK_DEV_NBD is not set
623# CONFIG_BLK_DEV_RAM is not set 590# CONFIG_BLK_DEV_RAM is not set
624# CONFIG_BLK_DEV_INITRD is not set
625CONFIG_CDROM_PKTCDVD=m 591CONFIG_CDROM_PKTCDVD=m
626CONFIG_CDROM_PKTCDVD_BUFFERS=8 592CONFIG_CDROM_PKTCDVD_BUFFERS=8
627# CONFIG_CDROM_PKTCDVD_WCACHE is not set 593# CONFIG_CDROM_PKTCDVD_WCACHE is not set
628CONFIG_ATA_OVER_ETH=m 594CONFIG_ATA_OVER_ETH=m
629 595# CONFIG_MISC_DEVICES is not set
630#
631# Misc devices
632#
633
634#
635# ATA/ATAPI/MFM/RLL support
636#
637# CONFIG_IDE is not set 596# CONFIG_IDE is not set
638 597
639# 598#
@@ -641,6 +600,7 @@ CONFIG_ATA_OVER_ETH=m
641# 600#
642CONFIG_RAID_ATTRS=m 601CONFIG_RAID_ATTRS=m
643CONFIG_SCSI=y 602CONFIG_SCSI=y
603CONFIG_SCSI_DMA=y
644CONFIG_SCSI_TGT=m 604CONFIG_SCSI_TGT=m
645# CONFIG_SCSI_NETLINK is not set 605# CONFIG_SCSI_NETLINK is not set
646CONFIG_SCSI_PROC_FS=y 606CONFIG_SCSI_PROC_FS=y
@@ -663,6 +623,7 @@ CONFIG_CHR_DEV_SCH=m
663CONFIG_SCSI_CONSTANTS=y 623CONFIG_SCSI_CONSTANTS=y
664# CONFIG_SCSI_LOGGING is not set 624# CONFIG_SCSI_LOGGING is not set
665CONFIG_SCSI_SCAN_ASYNC=y 625CONFIG_SCSI_SCAN_ASYNC=y
626CONFIG_SCSI_WAIT_SCAN=m
666 627
667# 628#
668# SCSI Transports 629# SCSI Transports
@@ -670,51 +631,21 @@ CONFIG_SCSI_SCAN_ASYNC=y
670CONFIG_SCSI_SPI_ATTRS=m 631CONFIG_SCSI_SPI_ATTRS=m
671# CONFIG_SCSI_FC_ATTRS is not set 632# CONFIG_SCSI_FC_ATTRS is not set
672CONFIG_SCSI_ISCSI_ATTRS=m 633CONFIG_SCSI_ISCSI_ATTRS=m
673CONFIG_SCSI_SAS_ATTRS=m
674# CONFIG_SCSI_SAS_LIBSAS is not set 634# CONFIG_SCSI_SAS_LIBSAS is not set
675 635CONFIG_SCSI_LOWLEVEL=y
676#
677# SCSI low-level drivers
678#
679CONFIG_ISCSI_TCP=m 636CONFIG_ISCSI_TCP=m
680CONFIG_SGIWD93_SCSI=y 637CONFIG_SGIWD93_SCSI=y
681# CONFIG_SCSI_DEBUG is not set 638# CONFIG_SCSI_DEBUG is not set
682
683#
684# Serial ATA (prod) and Parallel ATA (experimental) drivers
685#
686# CONFIG_ATA is not set 639# CONFIG_ATA is not set
687
688#
689# Multi-device support (RAID and LVM)
690#
691# CONFIG_MD is not set 640# CONFIG_MD is not set
692
693#
694# Fusion MPT device support
695#
696# CONFIG_FUSION is not set
697
698#
699# IEEE 1394 (FireWire) support
700#
701
702#
703# I2O device support
704#
705
706#
707# Network device support
708#
709CONFIG_NETDEVICES=y 641CONFIG_NETDEVICES=y
642# CONFIG_NETDEVICES_MULTIQUEUE is not set
643# CONFIG_IFB is not set
710CONFIG_DUMMY=m 644CONFIG_DUMMY=m
711CONFIG_BONDING=m 645CONFIG_BONDING=m
646CONFIG_MACVLAN=m
712CONFIG_EQUALIZER=m 647CONFIG_EQUALIZER=m
713CONFIG_TUN=m 648CONFIG_TUN=m
714
715#
716# PHY device support
717#
718CONFIG_PHYLIB=m 649CONFIG_PHYLIB=m
719 650
720# 651#
@@ -728,36 +659,25 @@ CONFIG_CICADA_PHY=m
728# CONFIG_VITESSE_PHY is not set 659# CONFIG_VITESSE_PHY is not set
729# CONFIG_SMSC_PHY is not set 660# CONFIG_SMSC_PHY is not set
730# CONFIG_BROADCOM_PHY is not set 661# CONFIG_BROADCOM_PHY is not set
662# CONFIG_ICPLUS_PHY is not set
731# CONFIG_FIXED_PHY is not set 663# CONFIG_FIXED_PHY is not set
732
733#
734# Ethernet (10 or 100Mbit)
735#
736CONFIG_NET_ETHERNET=y 664CONFIG_NET_ETHERNET=y
737# CONFIG_MII is not set 665# CONFIG_MII is not set
666# CONFIG_AX88796 is not set
738# CONFIG_DM9000 is not set 667# CONFIG_DM9000 is not set
739CONFIG_SGISEEQ=y 668CONFIG_SGISEEQ=y
669# CONFIG_NETDEV_1000 is not set
670# CONFIG_NETDEV_10000 is not set
740 671
741# 672#
742# Ethernet (1000 Mbit) 673# Wireless LAN
743#
744
745#
746# Ethernet (10000 Mbit)
747#
748
749#
750# Token Ring devices
751#
752
753#
754# Wireless LAN (non-hamradio)
755#
756# CONFIG_NET_RADIO is not set
757
758#
759# Wan interfaces
760# 674#
675CONFIG_WLAN_PRE80211=y
676CONFIG_STRIP=m
677CONFIG_WLAN_80211=y
678# CONFIG_LIBERTAS is not set
679CONFIG_HOSTAP=m
680# CONFIG_HOSTAP_FIRMWARE is not set
761# CONFIG_WAN is not set 681# CONFIG_WAN is not set
762# CONFIG_PPP is not set 682# CONFIG_PPP is not set
763# CONFIG_SLIP is not set 683# CONFIG_SLIP is not set
@@ -765,15 +685,7 @@ CONFIG_SGISEEQ=y
765# CONFIG_NETCONSOLE is not set 685# CONFIG_NETCONSOLE is not set
766# CONFIG_NETPOLL is not set 686# CONFIG_NETPOLL is not set
767# CONFIG_NET_POLL_CONTROLLER is not set 687# CONFIG_NET_POLL_CONTROLLER is not set
768
769#
770# ISDN subsystem
771#
772# CONFIG_ISDN is not set 688# CONFIG_ISDN is not set
773
774#
775# Telephony Support
776#
777# CONFIG_PHONE is not set 689# CONFIG_PHONE is not set
778 690
779# 691#
@@ -781,6 +693,7 @@ CONFIG_SGISEEQ=y
781# 693#
782CONFIG_INPUT=y 694CONFIG_INPUT=y
783# CONFIG_INPUT_FF_MEMLESS is not set 695# CONFIG_INPUT_FF_MEMLESS is not set
696# CONFIG_INPUT_POLLDEV is not set
784 697
785# 698#
786# Userland interfaces 699# Userland interfaces
@@ -806,9 +719,16 @@ CONFIG_KEYBOARD_ATKBD=y
806# CONFIG_KEYBOARD_STOWAWAY is not set 719# CONFIG_KEYBOARD_STOWAWAY is not set
807CONFIG_INPUT_MOUSE=y 720CONFIG_INPUT_MOUSE=y
808CONFIG_MOUSE_PS2=m 721CONFIG_MOUSE_PS2=m
722# CONFIG_MOUSE_PS2_ALPS is not set
723CONFIG_MOUSE_PS2_LOGIPS2PP=y
724# CONFIG_MOUSE_PS2_SYNAPTICS is not set
725# CONFIG_MOUSE_PS2_LIFEBOOK is not set
726CONFIG_MOUSE_PS2_TRACKPOINT=y
727# CONFIG_MOUSE_PS2_TOUCHKIT is not set
809CONFIG_MOUSE_SERIAL=m 728CONFIG_MOUSE_SERIAL=m
810# CONFIG_MOUSE_VSXXXAA is not set 729# CONFIG_MOUSE_VSXXXAA is not set
811# CONFIG_INPUT_JOYSTICK is not set 730# CONFIG_INPUT_JOYSTICK is not set
731# CONFIG_INPUT_TABLET is not set
812# CONFIG_INPUT_TOUCHSCREEN is not set 732# CONFIG_INPUT_TOUCHSCREEN is not set
813# CONFIG_INPUT_MISC is not set 733# CONFIG_INPUT_MISC is not set
814 734
@@ -844,15 +764,7 @@ CONFIG_SERIAL_CORE=m
844CONFIG_UNIX98_PTYS=y 764CONFIG_UNIX98_PTYS=y
845CONFIG_LEGACY_PTYS=y 765CONFIG_LEGACY_PTYS=y
846CONFIG_LEGACY_PTY_COUNT=256 766CONFIG_LEGACY_PTY_COUNT=256
847
848#
849# IPMI
850#
851# CONFIG_IPMI_HANDLER is not set 767# CONFIG_IPMI_HANDLER is not set
852
853#
854# Watchdog Cards
855#
856CONFIG_WATCHDOG=y 768CONFIG_WATCHDOG=y
857# CONFIG_WATCHDOG_NOWAYOUT is not set 769# CONFIG_WATCHDOG_NOWAYOUT is not set
858 770
@@ -864,20 +776,10 @@ CONFIG_INDYDOG=m
864# CONFIG_HW_RANDOM is not set 776# CONFIG_HW_RANDOM is not set
865# CONFIG_RTC is not set 777# CONFIG_RTC is not set
866CONFIG_SGI_DS1286=m 778CONFIG_SGI_DS1286=m
867# CONFIG_GEN_RTC is not set
868# CONFIG_DTLK is not set
869# CONFIG_R3964 is not set 779# CONFIG_R3964 is not set
870CONFIG_RAW_DRIVER=m 780CONFIG_RAW_DRIVER=m
871CONFIG_MAX_RAW_DEVS=256 781CONFIG_MAX_RAW_DEVS=256
872
873#
874# TPM devices
875#
876# CONFIG_TCG_TPM is not set 782# CONFIG_TCG_TPM is not set
877
878#
879# I2C support
880#
881# CONFIG_I2C is not set 783# CONFIG_I2C is not set
882 784
883# 785#
@@ -885,32 +787,33 @@ CONFIG_MAX_RAW_DEVS=256
885# 787#
886# CONFIG_SPI is not set 788# CONFIG_SPI is not set
887# CONFIG_SPI_MASTER is not set 789# CONFIG_SPI_MASTER is not set
888
889#
890# Dallas's 1-wire bus
891#
892# CONFIG_W1 is not set 790# CONFIG_W1 is not set
791# CONFIG_POWER_SUPPLY is not set
792# CONFIG_HWMON is not set
893 793
894# 794#
895# Hardware Monitoring support 795# Multifunction device drivers
896# 796#
897# CONFIG_HWMON is not set 797# CONFIG_MFD_SM501 is not set
898# CONFIG_HWMON_VID is not set
899 798
900# 799#
901# Multimedia devices 800# Multimedia devices
902# 801#
903# CONFIG_VIDEO_DEV is not set 802# CONFIG_VIDEO_DEV is not set
803# CONFIG_DVB_CORE is not set
804# CONFIG_DAB is not set
904 805
905# 806#
906# Digital Video Broadcasting Devices 807# Graphics support
907# 808#
908# CONFIG_DVB is not set 809# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
909 810
910# 811#
911# Graphics support 812# Display device support
912# 813#
913CONFIG_FIRMWARE_EDID=y 814# CONFIG_DISPLAY_SUPPORT is not set
815# CONFIG_VGASTATE is not set
816# CONFIG_VIDEO_OUTPUT_CONTROL is not set
914# CONFIG_FB is not set 817# CONFIG_FB is not set
915 818
916# 819#
@@ -920,31 +823,20 @@ CONFIG_FIRMWARE_EDID=y
920CONFIG_SGI_NEWPORT_CONSOLE=y 823CONFIG_SGI_NEWPORT_CONSOLE=y
921CONFIG_DUMMY_CONSOLE=y 824CONFIG_DUMMY_CONSOLE=y
922CONFIG_FONT_8x16=y 825CONFIG_FONT_8x16=y
923
924#
925# Logo configuration
926#
927CONFIG_LOGO=y 826CONFIG_LOGO=y
928# CONFIG_LOGO_LINUX_MONO is not set 827# CONFIG_LOGO_LINUX_MONO is not set
929# CONFIG_LOGO_LINUX_VGA16 is not set 828# CONFIG_LOGO_LINUX_VGA16 is not set
930# CONFIG_LOGO_LINUX_CLUT224 is not set 829# CONFIG_LOGO_LINUX_CLUT224 is not set
931CONFIG_LOGO_SGI_CLUT224=y 830CONFIG_LOGO_SGI_CLUT224=y
932# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
933 831
934# 832#
935# Sound 833# Sound
936# 834#
937# CONFIG_SOUND is not set 835# CONFIG_SOUND is not set
938 836CONFIG_HID_SUPPORT=y
939#
940# HID Devices
941#
942CONFIG_HID=y 837CONFIG_HID=y
943# CONFIG_HID_DEBUG is not set 838# CONFIG_HID_DEBUG is not set
944 839CONFIG_USB_SUPPORT=y
945#
946# USB support
947#
948# CONFIG_USB_ARCH_HAS_HCD is not set 840# CONFIG_USB_ARCH_HAS_HCD is not set
949# CONFIG_USB_ARCH_HAS_OHCI is not set 841# CONFIG_USB_ARCH_HAS_OHCI is not set
950# CONFIG_USB_ARCH_HAS_EHCI is not set 842# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -957,36 +849,8 @@ CONFIG_HID=y
957# USB Gadget Support 849# USB Gadget Support
958# 850#
959# CONFIG_USB_GADGET is not set 851# CONFIG_USB_GADGET is not set
960
961#
962# MMC/SD Card support
963#
964# CONFIG_MMC is not set 852# CONFIG_MMC is not set
965
966#
967# LED devices
968#
969# CONFIG_NEW_LEDS is not set 853# CONFIG_NEW_LEDS is not set
970
971#
972# LED drivers
973#
974
975#
976# LED Triggers
977#
978
979#
980# InfiniBand support
981#
982
983#
984# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
985#
986
987#
988# Real Time Clock
989#
990# CONFIG_RTC_CLASS is not set 854# CONFIG_RTC_CLASS is not set
991 855
992# 856#
@@ -1003,12 +867,9 @@ CONFIG_HID=y
1003# 867#
1004 868
1005# 869#
1006# Auxiliary Display support 870# Userspace I/O
1007#
1008
1009#
1010# Virtualization
1011# 871#
872# CONFIG_UIO is not set
1012 873
1013# 874#
1014# File systems 875# File systems
@@ -1121,6 +982,7 @@ CONFIG_NFS_ACL_SUPPORT=m
1121CONFIG_NFS_COMMON=y 982CONFIG_NFS_COMMON=y
1122CONFIG_SUNRPC=m 983CONFIG_SUNRPC=m
1123CONFIG_SUNRPC_GSS=m 984CONFIG_SUNRPC_GSS=m
985# CONFIG_SUNRPC_BIND34 is not set
1124CONFIG_RPCSEC_GSS_KRB5=m 986CONFIG_RPCSEC_GSS_KRB5=m
1125# CONFIG_RPCSEC_GSS_SPKM3 is not set 987# CONFIG_RPCSEC_GSS_SPKM3 is not set
1126CONFIG_SMB_FS=m 988CONFIG_SMB_FS=m
@@ -1136,7 +998,6 @@ CONFIG_CIFS=m
1136CONFIG_CODA_FS=m 998CONFIG_CODA_FS=m
1137# CONFIG_CODA_FS_OLD_API is not set 999# CONFIG_CODA_FS_OLD_API is not set
1138# CONFIG_AFS_FS is not set 1000# CONFIG_AFS_FS is not set
1139# CONFIG_9P_FS is not set
1140 1001
1141# 1002#
1142# Partition Types 1003# Partition Types
@@ -1158,6 +1019,7 @@ CONFIG_SGI_PARTITION=y
1158# CONFIG_SUN_PARTITION is not set 1019# CONFIG_SUN_PARTITION is not set
1159# CONFIG_KARMA_PARTITION is not set 1020# CONFIG_KARMA_PARTITION is not set
1160# CONFIG_EFI_PARTITION is not set 1021# CONFIG_EFI_PARTITION is not set
1022# CONFIG_SYSV68_PARTITION is not set
1161 1023
1162# 1024#
1163# Native Language Support 1025# Native Language Support
@@ -1207,8 +1069,6 @@ CONFIG_NLS_UTF8=m
1207# Distributed Lock Manager 1069# Distributed Lock Manager
1208# 1070#
1209CONFIG_DLM=m 1071CONFIG_DLM=m
1210CONFIG_DLM_TCP=y
1211# CONFIG_DLM_SCTP is not set
1212# CONFIG_DLM_DEBUG is not set 1072# CONFIG_DLM_DEBUG is not set
1213 1073
1214# 1074#
@@ -1227,7 +1087,6 @@ CONFIG_ENABLE_MUST_CHECK=y
1227# CONFIG_DEBUG_FS is not set 1087# CONFIG_DEBUG_FS is not set
1228# CONFIG_HEADERS_CHECK is not set 1088# CONFIG_HEADERS_CHECK is not set
1229# CONFIG_DEBUG_KERNEL is not set 1089# CONFIG_DEBUG_KERNEL is not set
1230CONFIG_LOG_BUF_SHIFT=14
1231CONFIG_CROSSCOMPILE=y 1090CONFIG_CROSSCOMPILE=y
1232CONFIG_CMDLINE="" 1091CONFIG_CMDLINE=""
1233 1092
@@ -1237,12 +1096,9 @@ CONFIG_CMDLINE=""
1237CONFIG_KEYS=y 1096CONFIG_KEYS=y
1238CONFIG_KEYS_DEBUG_PROC_KEYS=y 1097CONFIG_KEYS_DEBUG_PROC_KEYS=y
1239# CONFIG_SECURITY is not set 1098# CONFIG_SECURITY is not set
1240
1241#
1242# Cryptographic options
1243#
1244CONFIG_CRYPTO=y 1099CONFIG_CRYPTO=y
1245CONFIG_CRYPTO_ALGAPI=y 1100CONFIG_CRYPTO_ALGAPI=y
1101CONFIG_CRYPTO_ABLKCIPHER=m
1246CONFIG_CRYPTO_BLKCIPHER=m 1102CONFIG_CRYPTO_BLKCIPHER=m
1247CONFIG_CRYPTO_HASH=y 1103CONFIG_CRYPTO_HASH=y
1248CONFIG_CRYPTO_MANAGER=y 1104CONFIG_CRYPTO_MANAGER=y
@@ -1261,6 +1117,7 @@ CONFIG_CRYPTO_ECB=m
1261CONFIG_CRYPTO_CBC=m 1117CONFIG_CRYPTO_CBC=m
1262CONFIG_CRYPTO_PCBC=m 1118CONFIG_CRYPTO_PCBC=m
1263CONFIG_CRYPTO_LRW=m 1119CONFIG_CRYPTO_LRW=m
1120CONFIG_CRYPTO_CRYPTD=m
1264CONFIG_CRYPTO_DES=m 1121CONFIG_CRYPTO_DES=m
1265CONFIG_CRYPTO_FCRYPT=m 1122CONFIG_CRYPTO_FCRYPT=m
1266CONFIG_CRYPTO_BLOWFISH=m 1123CONFIG_CRYPTO_BLOWFISH=m
@@ -1279,10 +1136,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
1279CONFIG_CRYPTO_CRC32C=m 1136CONFIG_CRYPTO_CRC32C=m
1280CONFIG_CRYPTO_CAMELLIA=m 1137CONFIG_CRYPTO_CAMELLIA=m
1281# CONFIG_CRYPTO_TEST is not set 1138# CONFIG_CRYPTO_TEST is not set
1282 1139# CONFIG_CRYPTO_HW is not set
1283#
1284# Hardware crypto devices
1285#
1286 1140
1287# 1141#
1288# Library routines 1142# Library routines
@@ -1290,7 +1144,9 @@ CONFIG_CRYPTO_CAMELLIA=m
1290CONFIG_BITREVERSE=m 1144CONFIG_BITREVERSE=m
1291# CONFIG_CRC_CCITT is not set 1145# CONFIG_CRC_CCITT is not set
1292CONFIG_CRC16=m 1146CONFIG_CRC16=m
1147# CONFIG_CRC_ITU_T is not set
1293CONFIG_CRC32=m 1148CONFIG_CRC32=m
1149# CONFIG_CRC7 is not set
1294CONFIG_LIBCRC32C=m 1150CONFIG_LIBCRC32C=m
1295CONFIG_ZLIB_INFLATE=m 1151CONFIG_ZLIB_INFLATE=m
1296CONFIG_ZLIB_DEFLATE=m 1152CONFIG_ZLIB_DEFLATE=m
@@ -1301,3 +1157,4 @@ CONFIG_TEXTSEARCH_FSM=m
1301CONFIG_PLIST=y 1157CONFIG_PLIST=y
1302CONFIG_HAS_IOMEM=y 1158CONFIG_HAS_IOMEM=y
1303CONFIG_HAS_IOPORT=y 1159CONFIG_HAS_IOPORT=y
1160CONFIG_HAS_DMA=y
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index 1187b44a3dd4..d9efe692e551 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -45,9 +45,6 @@
45#error JMR3927_IRQ_END > NR_IRQS 45#error JMR3927_IRQ_END > NR_IRQS
46#endif 46#endif
47 47
48#define irc_dlevel 0
49#define irc_elevel 1
50
51static unsigned char irc_level[TX3927_NUM_IR] = { 48static unsigned char irc_level[TX3927_NUM_IR] = {
52 5, 5, 5, 5, 5, 5, /* INT[5:0] */ 49 5, 5, 5, 5, 5, 5, /* INT[5:0] */
53 7, 7, /* SIO */ 50 7, 7, /* SIO */
@@ -80,34 +77,6 @@ static void unmask_irq_ioc(unsigned int irq)
80 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR); 77 (void)jmr3927_ioc_reg_in(JMR3927_IOC_REV_ADDR);
81} 78}
82 79
83static void mask_irq_irc(unsigned int irq)
84{
85 unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
86 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
87 if (irq_nr & 1)
88 *ilrp = (*ilrp & 0x00ff) | (irc_dlevel << 8);
89 else
90 *ilrp = (*ilrp & 0xff00) | irc_dlevel;
91 /* update IRCSR */
92 tx3927_ircptr->imr = 0;
93 tx3927_ircptr->imr = irc_elevel;
94 /* flush write buffer */
95 (void)tx3927_ircptr->ssr;
96}
97
98static void unmask_irq_irc(unsigned int irq)
99{
100 unsigned int irq_nr = irq - JMR3927_IRQ_IRC;
101 volatile unsigned long *ilrp = &tx3927_ircptr->ilr[irq_nr / 2];
102 if (irq_nr & 1)
103 *ilrp = (*ilrp & 0x00ff) | (irc_level[irq_nr] << 8);
104 else
105 *ilrp = (*ilrp & 0xff00) | irc_level[irq_nr];
106 /* update IRCSR */
107 tx3927_ircptr->imr = 0;
108 tx3927_ircptr->imr = irc_elevel;
109}
110
111asmlinkage void plat_irq_dispatch(void) 80asmlinkage void plat_irq_dispatch(void)
112{ 81{
113 unsigned long cp0_cause = read_c0_cause(); 82 unsigned long cp0_cause = read_c0_cause();
@@ -168,10 +137,6 @@ void __init arch_init_irq(void)
168 /* clear PCI Reset interrupts */ 137 /* clear PCI Reset interrupts */
169 jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR); 138 jmr3927_ioc_reg_out(0, JMR3927_IOC_RESET_ADDR);
170 139
171 /* enable interrupt control */
172 tx3927_ircptr->cer = TX3927_IRCER_ICE;
173 tx3927_ircptr->imr = irc_elevel;
174
175 jmr3927_irq_init(); 140 jmr3927_irq_init();
176 141
177 /* setup IOC interrupt 1 (PCI, MODEM) */ 142 /* setup IOC interrupt 1 (PCI, MODEM) */
@@ -193,20 +158,13 @@ static struct irq_chip jmr3927_irq_ioc = {
193 .unmask = unmask_irq_ioc, 158 .unmask = unmask_irq_ioc,
194}; 159};
195 160
196static struct irq_chip jmr3927_irq_irc = {
197 .name = "jmr3927_irc",
198 .ack = mask_irq_irc,
199 .mask = mask_irq_irc,
200 .mask_ack = mask_irq_irc,
201 .unmask = unmask_irq_irc,
202};
203
204static void __init jmr3927_irq_init(void) 161static void __init jmr3927_irq_init(void)
205{ 162{
206 u32 i; 163 u32 i;
207 164
208 for (i = JMR3927_IRQ_IRC; i < JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC; i++) 165 txx9_irq_init(TX3927_IRC_REG);
209 set_irq_chip_and_handler(i, &jmr3927_irq_irc, handle_level_irq); 166 for (i = 0; i < TXx9_MAX_IR; i++)
167 txx9_irq_set_pri(i, irc_level[i]);
210 for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++) 168 for (i = JMR3927_IRQ_IOC; i < JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC; i++)
211 set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq); 169 set_irq_chip_and_handler(i, &jmr3927_irq_ioc, handle_level_irq);
212} 170}
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index 8303001516d2..fde56e86c2ab 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -290,19 +290,6 @@ static void __init tx3927_setup(void)
290 tx3927_ccfgptr->crir, 290 tx3927_ccfgptr->crir,
291 tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg); 291 tx3927_ccfgptr->ccfg, tx3927_ccfgptr->pcfg);
292 292
293 /* IRC */
294 /* disable interrupt control */
295 tx3927_ircptr->cer = 0;
296 /* mask all IRC interrupts */
297 tx3927_ircptr->imr = 0;
298 for (i = 0; i < TX3927_NUM_IR / 2; i++) {
299 tx3927_ircptr->ilr[i] = 0;
300 }
301 /* setup IRC interrupt mode (Low Active) */
302 for (i = 0; i < TX3927_NUM_IR / 8; i++) {
303 tx3927_ircptr->cr[i] = 0;
304 }
305
306 /* TMR */ 293 /* TMR */
307 /* disable all timers */ 294 /* disable all timers */
308 for (i = 0; i < TX3927_NR_TMR; i++) { 295 for (i = 0; i < TX3927_NR_TMR; i++) {
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 07344cb37596..2fd96d95a39c 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_IRQ_CPU) += irq_cpu.o
50obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o 50obj-$(CONFIG_IRQ_CPU_RM7K) += irq-rm7000.o
51obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o 51obj-$(CONFIG_IRQ_CPU_RM9K) += irq-rm9000.o
52obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o 52obj-$(CONFIG_MIPS_BOARDS_GEN) += irq-msc01.o
53obj-$(CONFIG_IRQ_TXX9) += irq_txx9.o
53 54
54obj-$(CONFIG_32BIT) += scall32-o32.o 55obj-$(CONFIG_32BIT) += scall32-o32.o
55obj-$(CONFIG_64BIT) += scall64-64.o 56obj-$(CONFIG_64BIT) += scall64-64.o
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 013327286c26..ca136298acdc 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -232,6 +232,10 @@ void output_mm_defines(void)
232 constant("#define _PMD_T_LOG2 ", PMD_T_LOG2); 232 constant("#define _PMD_T_LOG2 ", PMD_T_LOG2);
233 constant("#define _PTE_T_LOG2 ", PTE_T_LOG2); 233 constant("#define _PTE_T_LOG2 ", PTE_T_LOG2);
234 linefeed; 234 linefeed;
235 constant("#define _PGD_ORDER ", PGD_ORDER);
236 constant("#define _PMD_ORDER ", PMD_ORDER);
237 constant("#define _PTE_ORDER ", PTE_ORDER);
238 linefeed;
235 constant("#define _PMD_SHIFT ", PMD_SHIFT); 239 constant("#define _PMD_SHIFT ", PMD_SHIFT);
236 constant("#define _PGDIR_SHIFT ", PGDIR_SHIFT); 240 constant("#define _PGDIR_SHIFT ", PGDIR_SHIFT);
237 linefeed; 241 linefeed;
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index c09337b947b9..ac04f0adc408 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod)
29 ".endr\n\t" 29 ".endr\n\t"
30 ".set pop" 30 ".set pop"
31 : 31 :
32 : "n" (align), "n" (mod)); 32 : "rn" (align), "rn" (mod));
33} 33}
34 34
35static inline void mult_sh_align_mod(long *v1, long *v2, long *w, 35static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 6980deb6dced..28b2a8f00911 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -725,7 +725,7 @@ asmlinkage int irix_getcontext(struct pt_regs *regs)
725 current->comm, current->pid, ctx); 725 current->comm, current->pid, ctx);
726#endif 726#endif
727 727
728 if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx))); 728 if (!access_ok(VERIFY_WRITE, ctx, sizeof(*ctx)))
729 return -EFAULT; 729 return -EFAULT;
730 730
731 error = __put_user(current->thread.irix_oldctx, &ctx->link); 731 error = __put_user(current->thread.irix_oldctx, &ctx->link);
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c
new file mode 100644
index 000000000000..a4d1462c27f7
--- /dev/null
+++ b/arch/mips/kernel/irq_txx9.c
@@ -0,0 +1,192 @@
1/*
2 * linux/arch/mips/kernel/irq_txx9.c
3 *
4 * Based on linux/arch/mips/jmr3927/rbhma3100/irq.c,
5 * linux/arch/mips/tx4927/common/tx4927_irq.c,
6 * linux/arch/mips/tx4938/common/irq.c
7 *
8 * Copyright 2001, 2003-2005 MontaVista Software Inc.
9 * Author: MontaVista Software, Inc.
10 * ahennessy@mvista.com
11 * source@mvista.com
12 * Copyright (C) 2000-2001 Toshiba Corporation
13 *
14 * This file is subject to the terms and conditions of the GNU General Public
15 * License. See the file "COPYING" in the main directory of this archive
16 * for more details.
17 */
18#include <linux/init.h>
19#include <linux/interrupt.h>
20#include <linux/types.h>
21#include <asm/txx9irq.h>
22
23struct txx9_irc_reg {
24 u32 cer;
25 u32 cr[2];
26 u32 unused0;
27 u32 ilr[8];
28 u32 unused1[4];
29 u32 imr;
30 u32 unused2[7];
31 u32 scr;
32 u32 unused3[7];
33 u32 ssr;
34 u32 unused4[7];
35 u32 csr;
36};
37
38/* IRCER : Int. Control Enable */
39#define TXx9_IRCER_ICE 0x00000001
40
41/* IRCR : Int. Control */
42#define TXx9_IRCR_LOW 0x00000000
43#define TXx9_IRCR_HIGH 0x00000001
44#define TXx9_IRCR_DOWN 0x00000002
45#define TXx9_IRCR_UP 0x00000003
46#define TXx9_IRCR_EDGE(cr) ((cr) & 0x00000002)
47
48/* IRSCR : Int. Status Control */
49#define TXx9_IRSCR_EIClrE 0x00000100
50#define TXx9_IRSCR_EIClr_MASK 0x0000000f
51
52/* IRCSR : Int. Current Status */
53#define TXx9_IRCSR_IF 0x00010000
54#define TXx9_IRCSR_ILV_MASK 0x00000700
55#define TXx9_IRCSR_IVL_MASK 0x0000001f
56
57#define irc_dlevel 0
58#define irc_elevel 1
59
60static struct txx9_irc_reg __iomem *txx9_ircptr __read_mostly;
61
62static struct {
63 unsigned char level;
64 unsigned char mode;
65} txx9irq[TXx9_MAX_IR] __read_mostly;
66
67static void txx9_irq_unmask(unsigned int irq)
68{
69 unsigned int irq_nr = irq - TXX9_IRQ_BASE;
70 u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16 ) / 2];
71 int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
72
73 __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs))
74 | (txx9irq[irq_nr].level << ofs),
75 ilrp);
76#ifdef CONFIG_CPU_TX39XX
77 /* update IRCSR */
78 __raw_writel(0, &txx9_ircptr->imr);
79 __raw_writel(irc_elevel, &txx9_ircptr->imr);
80#endif
81}
82
83static inline void txx9_irq_mask(unsigned int irq)
84{
85 unsigned int irq_nr = irq - TXX9_IRQ_BASE;
86 u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16) / 2];
87 int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
88
89 __raw_writel((__raw_readl(ilrp) & ~(0xff << ofs))
90 | (irc_dlevel << ofs),
91 ilrp);
92#ifdef CONFIG_CPU_TX39XX
93 /* update IRCSR */
94 __raw_writel(0, &txx9_ircptr->imr);
95 __raw_writel(irc_elevel, &txx9_ircptr->imr);
96 /* flush write buffer */
97 __raw_readl(&txx9_ircptr->ssr);
98#else
99 mmiowb();
100#endif
101}
102
103static void txx9_irq_mask_ack(unsigned int irq)
104{
105 unsigned int irq_nr = irq - TXX9_IRQ_BASE;
106
107 txx9_irq_mask(irq);
108 /* clear edge detection */
109 if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)))
110 __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr);
111}
112
113static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type)
114{
115 unsigned int irq_nr = irq - TXX9_IRQ_BASE;
116 u32 cr;
117 u32 __iomem *crp;
118 int ofs;
119 int mode;
120
121 if (flow_type & IRQF_TRIGGER_PROBE)
122 return 0;
123 switch (flow_type & IRQF_TRIGGER_MASK) {
124 case IRQF_TRIGGER_RISING: mode = TXx9_IRCR_UP; break;
125 case IRQF_TRIGGER_FALLING: mode = TXx9_IRCR_DOWN; break;
126 case IRQF_TRIGGER_HIGH: mode = TXx9_IRCR_HIGH; break;
127 case IRQF_TRIGGER_LOW: mode = TXx9_IRCR_LOW; break;
128 default:
129 return -EINVAL;
130 }
131 crp = &txx9_ircptr->cr[(unsigned int)irq_nr / 8];
132 cr = __raw_readl(crp);
133 ofs = (irq_nr & (8 - 1)) * 2;
134 cr &= ~(0x3 << ofs);
135 cr |= (mode & 0x3) << ofs;
136 __raw_writel(cr, crp);
137 txx9irq[irq_nr].mode = mode;
138 return 0;
139}
140
141static struct irq_chip txx9_irq_chip = {
142 .name = "TXX9",
143 .ack = txx9_irq_mask_ack,
144 .mask = txx9_irq_mask,
145 .mask_ack = txx9_irq_mask_ack,
146 .unmask = txx9_irq_unmask,
147 .set_type = txx9_irq_set_type,
148};
149
150void __init txx9_irq_init(unsigned long baseaddr)
151{
152 int i;
153
154 txx9_ircptr = ioremap(baseaddr, sizeof(struct txx9_irc_reg));
155 for (i = 0; i < TXx9_MAX_IR; i++) {
156 txx9irq[i].level = 4; /* middle level */
157 txx9irq[i].mode = TXx9_IRCR_LOW;
158 set_irq_chip_and_handler(TXX9_IRQ_BASE + i,
159 &txx9_irq_chip, handle_level_irq);
160 }
161
162 /* mask all IRC interrupts */
163 __raw_writel(0, &txx9_ircptr->imr);
164 for (i = 0; i < 8; i++)
165 __raw_writel(0, &txx9_ircptr->ilr[i]);
166 /* setup IRC interrupt mode (Low Active) */
167 for (i = 0; i < 2; i++)
168 __raw_writel(0, &txx9_ircptr->cr[i]);
169 /* enable interrupt control */
170 __raw_writel(TXx9_IRCER_ICE, &txx9_ircptr->cer);
171 __raw_writel(irc_elevel, &txx9_ircptr->imr);
172}
173
174int __init txx9_irq_set_pri(int irc_irq, int new_pri)
175{
176 int old_pri;
177
178 if ((unsigned int)irc_irq >= TXx9_MAX_IR)
179 return 0;
180 old_pri = txx9irq[irc_irq].level;
181 txx9irq[irc_irq].level = new_pri;
182 return old_pri;
183}
184
185int txx9_irq(void)
186{
187 u32 csr = __raw_readl(&txx9_ircptr->csr);
188
189 if (likely(!(csr & TXx9_IRCSR_IF)))
190 return TXX9_IRQ_BASE + (csr & (TXx9_MAX_IR - 1));
191 return -1;
192}
diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c
index 22960d67cf07..85beb9b0b2d0 100644
--- a/arch/mips/kernel/machine_kexec.c
+++ b/arch/mips/kernel/machine_kexec.c
@@ -78,11 +78,8 @@ machine_kexec(struct kimage *image)
78 */ 78 */
79 local_irq_disable(); 79 local_irq_disable();
80 80
81 flush_icache_range(reboot_code_buffer,
82 reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
83
84 printk("Will call new kernel at %08lx\n", image->start); 81 printk("Will call new kernel at %08lx\n", image->start);
85 printk("Bye ...\n"); 82 printk("Bye ...\n");
86 flush_cache_all(); 83 __flush_cache_all();
87 ((noretfun_t) reboot_code_buffer)(); 84 ((noretfun_t) reboot_code_buffer)();
88} 85}
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 7169a4db37b8..56750b02ab40 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -4,6 +4,7 @@
4 */ 4 */
5 5
6#include <linux/device.h> 6#include <linux/device.h>
7#include <linux/kallsyms.h>
7#include <linux/kernel.h> 8#include <linux/kernel.h>
8#include <linux/sched.h> 9#include <linux/sched.h>
9#include <linux/module.h> 10#include <linux/module.h>
@@ -84,8 +85,9 @@ void mips_mt_regdump(unsigned long mvpctl)
84 read_vpe_c0_vpeconf0()); 85 read_vpe_c0_vpeconf0());
85 printk(" VPE%d.Status : %08lx\n", 86 printk(" VPE%d.Status : %08lx\n",
86 i, read_vpe_c0_status()); 87 i, read_vpe_c0_status());
87 printk(" VPE%d.EPC : %08lx\n", 88 printk(" VPE%d.EPC : %08lx ",
88 i, read_vpe_c0_epc()); 89 i, read_vpe_c0_epc());
90 print_symbol("%s\n", read_vpe_c0_epc());
89 printk(" VPE%d.Cause : %08lx\n", 91 printk(" VPE%d.Cause : %08lx\n",
90 i, read_vpe_c0_cause()); 92 i, read_vpe_c0_cause());
91 printk(" VPE%d.Config7 : %08lx\n", 93 printk(" VPE%d.Config7 : %08lx\n",
@@ -110,7 +112,8 @@ void mips_mt_regdump(unsigned long mvpctl)
110 } 112 }
111 printk(" TCStatus : %08lx\n", tcstatval); 113 printk(" TCStatus : %08lx\n", tcstatval);
112 printk(" TCBind : %08lx\n", read_tc_c0_tcbind()); 114 printk(" TCBind : %08lx\n", read_tc_c0_tcbind());
113 printk(" TCRestart : %08lx\n", read_tc_c0_tcrestart()); 115 printk(" TCRestart : %08lx ", read_tc_c0_tcrestart());
116 print_symbol("%s\n", read_tc_c0_tcrestart());
114 printk(" TCHalt : %08lx\n", haltval); 117 printk(" TCHalt : %08lx\n", haltval);
115 printk(" TCContext : %08lx\n", read_tc_c0_tccontext()); 118 printk(" TCContext : %08lx\n", read_tc_c0_tccontext());
116 if (!haltval) 119 if (!haltval)
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 19b30d6f1727..05dcce416325 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -287,7 +287,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
287 * (unsigned long)idle->thread_info the gp 287 * (unsigned long)idle->thread_info the gp
288 * assumes a 1:1 mapping of TC => VPE 288 * assumes a 1:1 mapping of TC => VPE
289 */ 289 */
290void prom_boot_secondary(int cpu, struct task_struct *idle) 290void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
291{ 291{
292 struct thread_info *gp = task_thread_info(idle); 292 struct thread_info *gp = task_thread_info(idle);
293 dvpe(); 293 dvpe();
@@ -321,7 +321,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
321 evpe(EVPE_ENABLE); 321 evpe(EVPE_ENABLE);
322} 322}
323 323
324void prom_init_secondary(void) 324void __cpuinit prom_init_secondary(void)
325{ 325{
326 /* Enable per-cpu interrupts */ 326 /* Enable per-cpu interrupts */
327 327
@@ -330,7 +330,7 @@ void prom_init_secondary(void)
330 (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | STATUSF_IP7)); 330 (STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP6 | STATUSF_IP7));
331} 331}
332 332
333void prom_smp_finish(void) 333void __cpuinit prom_smp_finish(void)
334{ 334{
335 write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ)); 335 write_c0_compare(read_c0_count() + (8* mips_hpt_frequency/HZ));
336 336
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 16aa5d37117c..43826c16101d 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -28,8 +28,6 @@
28 * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set. 28 * This file should be built into the kernel only if CONFIG_MIPS_MT_SMTC is set.
29 */ 29 */
30 30
31#define MIPS_CPU_IPI_IRQ 1
32
33#define LOCK_MT_PRA() \ 31#define LOCK_MT_PRA() \
34 local_irq_save(flags); \ 32 local_irq_save(flags); \
35 mtflags = dmt() 33 mtflags = dmt()
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c8e291c83057..6379003f9d8d 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -606,6 +606,8 @@ asmlinkage void do_ov(struct pt_regs *regs)
606 */ 606 */
607asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31) 607asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
608{ 608{
609 siginfo_t info;
610
609 die_if_kernel("FP exception in kernel code", regs); 611 die_if_kernel("FP exception in kernel code", regs);
610 612
611 if (fcr31 & FPU_CSR_UNI_X) { 613 if (fcr31 & FPU_CSR_UNI_X) {
@@ -641,9 +643,22 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
641 force_sig(sig, current); 643 force_sig(sig, current);
642 644
643 return; 645 return;
644 } 646 } else if (fcr31 & FPU_CSR_INV_X)
645 647 info.si_code = FPE_FLTINV;
646 force_sig(SIGFPE, current); 648 else if (fcr31 & FPU_CSR_DIV_X)
649 info.si_code = FPE_FLTDIV;
650 else if (fcr31 & FPU_CSR_OVF_X)
651 info.si_code = FPE_FLTOVF;
652 else if (fcr31 & FPU_CSR_UDF_X)
653 info.si_code = FPE_FLTUND;
654 else if (fcr31 & FPU_CSR_INE_X)
655 info.si_code = FPE_FLTRES;
656 else
657 info.si_code = __SI_FAULT;
658 info.si_signo = SIGFPE;
659 info.si_errno = 0;
660 info.si_addr = (void __user *) regs->cp0_epc;
661 force_sig_info(SIGFPE, &info, current);
647} 662}
648 663
649asmlinkage void do_bp(struct pt_regs *regs) 664asmlinkage void do_bp(struct pt_regs *regs)
@@ -1035,19 +1050,11 @@ void ejtag_exception_handler(struct pt_regs *regs)
1035/* 1050/*
1036 * NMI exception handler. 1051 * NMI exception handler.
1037 */ 1052 */
1038void nmi_exception_handler(struct pt_regs *regs) 1053NORET_TYPE void ATTRIB_NORET nmi_exception_handler(struct pt_regs *regs)
1039{ 1054{
1040#ifdef CONFIG_MIPS_MT_SMTC
1041 unsigned long dvpret = dvpe();
1042 bust_spinlocks(1);
1043 printk("NMI taken!!!!\n");
1044 mips_mt_regdump(dvpret);
1045#else
1046 bust_spinlocks(1); 1055 bust_spinlocks(1);
1047 printk("NMI taken!!!!\n"); 1056 printk("NMI taken!!!!\n");
1048#endif /* CONFIG_MIPS_MT_SMTC */
1049 die("NMI", regs); 1057 die("NMI", regs);
1050 while(1) ;
1051} 1058}
1052 1059
1053#define VECTORSPACING 0x100 /* for EI/VI mode */ 1060#define VECTORSPACING 0x100 /* for EI/VI mode */
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index bc9bae2a73f4..60bbaecde187 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -142,15 +142,16 @@ SECTIONS
142 *(.exitcall.exit) 142 *(.exitcall.exit)
143 143
144 /* ABI crap starts here */ 144 /* ABI crap starts here */
145 *(.comment)
146 *(.MIPS.options) 145 *(.MIPS.options)
147 *(.note)
148 *(.options) 146 *(.options)
149 *(.pdr) 147 *(.pdr)
150 *(.reginfo) 148 *(.reginfo)
151 *(.mdebug*)
152 } 149 }
153 150
151 /* These mark the ABI of the kernel for debuggers. */
152 .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
153 .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
154
154 /* This is the MIPS specific mdebug section. */ 155 /* This is the MIPS specific mdebug section. */
155 .mdebug : { *(.mdebug) } 156 .mdebug : { *(.mdebug) }
156 157
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 91ed1eb33102..8810dfb915dd 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -28,4 +28,4 @@ obj-$(CONFIG_CPU_TX49XX) += dump_tlb.o
28obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o 28obj-$(CONFIG_CPU_VR41XX) += dump_tlb.o
29 29
30# libgcc-style stuff needed in the kernel 30# libgcc-style stuff needed in the kernel
31obj-y += ashldi3.o ashrdi3.o lshrdi3.o ucmpdi2.o 31obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o
diff --git a/arch/mips/lib/cmpdi2.c b/arch/mips/lib/cmpdi2.c
new file mode 100644
index 000000000000..8c1306437ed1
--- /dev/null
+++ b/arch/mips/lib/cmpdi2.c
@@ -0,0 +1,27 @@
1#include <linux/module.h>
2
3#include "libgcc.h"
4
5word_type __cmpdi2(long long a, long long b)
6{
7 const DWunion au = {
8 .ll = a
9 };
10 const DWunion bu = {
11 .ll = b
12 };
13
14 if (au.s.high < bu.s.high)
15 return 0;
16 else if (au.s.high > bu.s.high)
17 return 2;
18
19 if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
20 return 0;
21 else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
22 return 2;
23
24 return 1;
25}
26
27EXPORT_SYMBOL(__cmpdi2);
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mips-boards/malta/malta_smtc.c
index 0fb4c269901c..ae05d058cb37 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -1,6 +1,7 @@
1/* 1/*
2 * Malta Platform-specific hooks for SMP operation 2 * Malta Platform-specific hooks for SMP operation
3 */ 3 */
4#include <linux/irq.h>
4#include <linux/init.h> 5#include <linux/init.h>
5 6
6#include <asm/mipsregs.h> 7#include <asm/mipsregs.h>
@@ -24,7 +25,7 @@ void core_send_ipi(int cpu, unsigned int action)
24 * Platform "CPU" startup hook 25 * Platform "CPU" startup hook
25 */ 26 */
26 27
27void prom_boot_secondary(int cpu, struct task_struct *idle) 28void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
28{ 29{
29 smtc_boot_secondary(cpu, idle); 30 smtc_boot_secondary(cpu, idle);
30} 31}
@@ -33,7 +34,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
33 * Post-config but pre-boot cleanup entry point 34 * Post-config but pre-boot cleanup entry point
34 */ 35 */
35 36
36void prom_init_secondary(void) 37void __cpuinit prom_init_secondary(void)
37{ 38{
38 void smtc_init_secondary(void); 39 void smtc_init_secondary(void);
39 int myvpe; 40 int myvpe;
@@ -42,10 +43,11 @@ void prom_init_secondary(void)
42 myvpe = read_c0_tcbind() & TCBIND_CURVPE; 43 myvpe = read_c0_tcbind() & TCBIND_CURVPE;
43 if (myvpe != 0) { 44 if (myvpe != 0) {
44 /* Ideally, this should be done only once per VPE, but... */ 45 /* Ideally, this should be done only once per VPE, but... */
45 clear_c0_status(STATUSF_IP2); 46 clear_c0_status(ST0_IM);
46 set_c0_status(STATUSF_IP0 | STATUSF_IP1 | STATUSF_IP3 47 set_c0_status((0x100 << cp0_compare_irq)
47 | STATUSF_IP4 | STATUSF_IP5 | STATUSF_IP6 48 | (0x100 << MIPS_CPU_IPI_IRQ));
48 | STATUSF_IP7); 49 if (cp0_perfcount_irq >= 0)
50 set_c0_status(0x100 << cp0_perfcount_irq);
49 } 51 }
50 52
51 smtc_init_secondary(); 53 smtc_init_secondary();
@@ -74,7 +76,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
74 * SMP initialization finalization entry point 76 * SMP initialization finalization entry point
75 */ 77 */
76 78
77void prom_smp_finish(void) 79void __cpuinit prom_smp_finish(void)
78{ 80{
79 smtc_smp_finish(); 81 smtc_smp_finish();
80} 82}
diff --git a/arch/mips/mips-boards/sim/sim_int.c b/arch/mips/mips-boards/sim/sim_int.c
deleted file mode 100644
index 766e0159ee5b..000000000000
--- a/arch/mips/mips-boards/sim/sim_int.c
+++ /dev/null
@@ -1,88 +0,0 @@
1/*
2 * Copyright (C) 1999, 2005 MIPS Technologies, Inc. All rights reserved.
3 *
4 * This program is free software; you can distribute it and/or modify it
5 * under the terms of the GNU General Public License (Version 2) as
6 * published by the Free Software Foundation.
7 *
8 * This program is distributed in the hope it will be useful, but WITHOUT
9 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
11 * for more details.
12 *
13 * You should have received a copy of the GNU General Public License along
14 * with this program; if not, write to the Free Software Foundation, Inc.,
15 * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
16 *
17 */
18#include <linux/init.h>
19#include <linux/sched.h>
20#include <linux/slab.h>
21#include <linux/interrupt.h>
22#include <linux/kernel_stat.h>
23#include <asm/mips-boards/simint.h>
24#include <asm/irq_cpu.h>
25
26static inline int clz(unsigned long x)
27{
28 __asm__ (
29 " .set push \n"
30 " .set mips32 \n"
31 " clz %0, %1 \n"
32 " .set pop \n"
33 : "=r" (x)
34 : "r" (x));
35
36 return x;
37}
38
39/*
40 * Version of ffs that only looks at bits 12..15.
41 */
42static inline unsigned int irq_ffs(unsigned int pending)
43{
44#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
45 return -clz(pending) + 31 - CAUSEB_IP;
46#else
47 unsigned int a0 = 7;
48 unsigned int t0;
49
50 t0 = s0 & 0xf000;
51 t0 = t0 < 1;
52 t0 = t0 << 2;
53 a0 = a0 - t0;
54 s0 = s0 << t0;
55
56 t0 = s0 & 0xc000;
57 t0 = t0 < 1;
58 t0 = t0 << 1;
59 a0 = a0 - t0;
60 s0 = s0 << t0;
61
62 t0 = s0 & 0x8000;
63 t0 = t0 < 1;
64 //t0 = t0 << 2;
65 a0 = a0 - t0;
66 //s0 = s0 << t0;
67
68 return a0;
69#endif
70}
71
72asmlinkage void plat_irq_dispatch(void)
73{
74 unsigned int pending = read_c0_cause() & read_c0_status() & ST0_IM;
75 int irq;
76
77 irq = irq_ffs(pending);
78
79 if (irq > 0)
80 do_IRQ(MIPS_CPU_IRQ_BASE + irq);
81 else
82 spurious_interrupt();
83}
84
85void __init arch_init_irq(void)
86{
87 mips_cpu_irq_init();
88}
diff --git a/arch/mips/mipssim/sim_smp.c b/arch/mips/mipssim/sim_smp.c
index 38fa807b99f9..ccbbccac23ef 100644
--- a/arch/mips/mipssim/sim_smp.c
+++ b/arch/mips/mipssim/sim_smp.c
@@ -53,7 +53,7 @@ void core_send_ipi(int cpu, unsigned int action)
53 * Platform "CPU" startup hook 53 * Platform "CPU" startup hook
54 */ 54 */
55 55
56void prom_boot_secondary(int cpu, struct task_struct *idle) 56void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
57{ 57{
58#ifdef CONFIG_MIPS_MT_SMTC 58#ifdef CONFIG_MIPS_MT_SMTC
59 smtc_boot_secondary(cpu, idle); 59 smtc_boot_secondary(cpu, idle);
@@ -64,7 +64,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
64 * Post-config but pre-boot cleanup entry point 64 * Post-config but pre-boot cleanup entry point
65 */ 65 */
66 66
67void prom_init_secondary(void) 67void __cpuinit prom_init_secondary(void)
68{ 68{
69#ifdef CONFIG_MIPS_MT_SMTC 69#ifdef CONFIG_MIPS_MT_SMTC
70 void smtc_init_secondary(void); 70 void smtc_init_secondary(void);
@@ -103,7 +103,7 @@ void plat_prepare_cpus(unsigned int max_cpus)
103 * SMP initialization finalization entry point 103 * SMP initialization finalization entry point
104 */ 104 */
105 105
106void prom_smp_finish(void) 106void __cpuinit prom_smp_finish(void)
107{ 107{
108#ifdef CONFIG_MIPS_MT_SMTC 108#ifdef CONFIG_MIPS_MT_SMTC
109 smtc_smp_finish(); 109 smtc_smp_finish();
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b8cb0dde3af0..09d91505b90c 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -26,6 +26,7 @@
26#include <linux/proc_fs.h> 26#include <linux/proc_fs.h>
27#include <linux/pfn.h> 27#include <linux/pfn.h>
28 28
29#include <asm/asm-offsets.h>
29#include <asm/bootinfo.h> 30#include <asm/bootinfo.h>
30#include <asm/cachectl.h> 31#include <asm/cachectl.h>
31#include <asm/cpu.h> 32#include <asm/cpu.h>
@@ -498,7 +499,13 @@ unsigned long pgd_current[NR_CPUS];
498 * different layout ... 499 * different layout ...
499 */ 500 */
500#define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order))) 501#define __page_aligned(order) __attribute__((__aligned__(PAGE_SIZE<<order)))
501pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); 502
503/*
504 * gcc 3.3 and older have trouble determining that PTRS_PER_PGD and PGD_ORDER
505 * are constants. So we use the variants from asm-offset.h until that gcc
506 * will officially be retired.
507 */
508pgd_t swapper_pg_dir[_PTRS_PER_PGD] __page_aligned(_PGD_ORDER);
502#ifdef CONFIG_64BIT 509#ifdef CONFIG_64BIT
503#ifdef MODULE_START 510#ifdef MODULE_START
504pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER); 511pgd_t module_pg_dir[PTRS_PER_PGD] __page_aligned(PGD_ORDER);
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 99d8f4fd3ff4..6c5c684d1422 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -75,7 +75,7 @@ pcibios_align_resource(void *data, struct resource *res,
75 res->start = start; 75 res->start = start;
76} 76}
77 77
78void __init register_pci_controller(struct pci_controller *hose) 78void __devinit register_pci_controller(struct pci_controller *hose)
79{ 79{
80 if (request_resource(&iomem_resource, hose->mem_resource) < 0) 80 if (request_resource(&iomem_resource, hose->mem_resource) < 0)
81 goto out; 81 goto out;
@@ -230,7 +230,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
230 return pcibios_plat_dev_init(dev); 230 return pcibios_plat_dev_init(dev);
231} 231}
232 232
233static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev, 233static void pcibios_fixup_device_resources(struct pci_dev *dev,
234 struct pci_bus *bus) 234 struct pci_bus *bus)
235{ 235{
236 /* Update device resources. */ 236 /* Update device resources. */
@@ -251,7 +251,7 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
251 } 251 }
252} 252}
253 253
254void __devinit pcibios_fixup_bus(struct pci_bus *bus) 254void pcibios_fixup_bus(struct pci_bus *bus)
255{ 255{
256 /* Propagate hose info into the subordinate devices. */ 256 /* Propagate hose info into the subordinate devices. */
257 257
@@ -282,8 +282,7 @@ pcibios_update_irq(struct pci_dev *dev, int irq)
282 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); 282 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
283} 283}
284 284
285void __devinit 285void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
286pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
287 struct resource *res) 286 struct resource *res)
288{ 287{
289 struct pci_controller *hose = (struct pci_controller *)dev->sysdata; 288 struct pci_controller *hose = (struct pci_controller *)dev->sysdata;
diff --git a/arch/mips/philips/pnx8550/common/Kconfig b/arch/mips/philips/pnx8550/common/Kconfig
deleted file mode 100644
index 072572d173cc..000000000000
--- a/arch/mips/philips/pnx8550/common/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
1# Place holder
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 1c852d6a7654..b0f12cd2968a 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -77,7 +77,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
77 * stack so the first thing we do is throw away that stuff and load useful 77 * stack so the first thing we do is throw away that stuff and load useful
78 * values into the registers ... 78 * values into the registers ...
79 */ 79 */
80void __init prom_boot_secondary(int cpu, struct task_struct *idle) 80void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
81{ 81{
82 unsigned long gp = (unsigned long) task_thread_info(idle); 82 unsigned long gp = (unsigned long) task_thread_info(idle);
83 unsigned long sp = __KSTK_TOS(idle); 83 unsigned long sp = __KSTK_TOS(idle);
@@ -97,12 +97,12 @@ void prom_cpus_done(void)
97 * After we've done initial boot, this function is called to allow the 97 * After we've done initial boot, this function is called to allow the
98 * board code to clean up state, if needed 98 * board code to clean up state, if needed
99 */ 99 */
100void prom_init_secondary(void) 100void __cpuinit prom_init_secondary(void)
101{ 101{
102 set_c0_status(ST0_CO | ST0_IE | ST0_IM); 102 set_c0_status(ST0_CO | ST0_IE | ST0_IM);
103} 103}
104 104
105void prom_smp_finish(void) 105void __cpuinit prom_smp_finish(void)
106{ 106{
107} 107}
108 108
diff --git a/arch/mips/qemu/q-smp.c b/arch/mips/qemu/q-smp.c
index 786bbfa214d1..4b0178d0df0b 100644
--- a/arch/mips/qemu/q-smp.c
+++ b/arch/mips/qemu/q-smp.c
@@ -22,11 +22,11 @@ void core_send_ipi(int cpu, unsigned int action)
22 * After we've done initial boot, this function is called to allow the 22 * After we've done initial boot, this function is called to allow the
23 * board code to clean up state, if needed 23 * board code to clean up state, if needed
24 */ 24 */
25void prom_init_secondary(void) 25void __cpuinit prom_init_secondary(void)
26{ 26{
27} 27}
28 28
29void prom_smp_finish(void) 29void __cpuinit prom_smp_finish(void)
30{ 30{
31} 31}
32 32
@@ -43,7 +43,7 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
43/* 43/*
44 * Firmware CPU startup hook 44 * Firmware CPU startup hook
45 */ 45 */
46void prom_boot_secondary(int cpu, struct task_struct *idle) 46void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
47{ 47{
48} 48}
49 49
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c
index ddb6506d8341..01a805dcc67c 100644
--- a/arch/mips/sgi-ip22/ip22-mc.c
+++ b/arch/mips/sgi-ip22/ip22-mc.c
@@ -47,7 +47,7 @@ struct mem {
47/* 47/*
48 * Detect installed memory, do some sanity checks and notify kernel about it 48 * Detect installed memory, do some sanity checks and notify kernel about it
49 */ 49 */
50static void probe_memory(void) 50static void __init probe_memory(void)
51{ 51{
52 int i, j, found, cnt = 0; 52 int i, j, found, cnt = 0;
53 struct mem bank[4]; 53 struct mem bank[4];
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c
index 25097ecc9baa..e7ce7982db72 100644
--- a/arch/mips/sgi-ip22/ip22-setup.c
+++ b/arch/mips/sgi-ip22/ip22-setup.c
@@ -29,6 +29,7 @@
29#include <asm/sgi/ip22.h> 29#include <asm/sgi/ip22.h>
30 30
31unsigned long sgi_gfxaddr; 31unsigned long sgi_gfxaddr;
32EXPORT_SYMBOL_GPL(sgi_gfxaddr);
32 33
33/* 34/*
34 * Stop-A is originally a Sun thing that isn't standard on IP22 so to avoid 35 * Stop-A is originally a Sun thing that isn't standard on IP22 so to avoid
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index ba8e0794630c..856649cf9f1e 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -207,11 +207,9 @@ static int intr_connect_level(int cpu, int bit)
207{ 207{
208 nasid_t nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu)); 208 nasid_t nasid = COMPACT_TO_NASID_NODEID(cpu_to_node(cpu));
209 struct slice_data *si = cpu_data[cpu].data; 209 struct slice_data *si = cpu_data[cpu].data;
210 unsigned long flags;
211 210
212 set_bit(bit, si->irq_enable_mask); 211 set_bit(bit, si->irq_enable_mask);
213 212
214 local_irq_save(flags);
215 if (!cputoslice(cpu)) { 213 if (!cputoslice(cpu)) {
216 REMOTE_HUB_S(nasid, PI_INT_MASK0_A, si->irq_enable_mask[0]); 214 REMOTE_HUB_S(nasid, PI_INT_MASK0_A, si->irq_enable_mask[0]);
217 REMOTE_HUB_S(nasid, PI_INT_MASK1_A, si->irq_enable_mask[1]); 215 REMOTE_HUB_S(nasid, PI_INT_MASK1_A, si->irq_enable_mask[1]);
@@ -219,7 +217,6 @@ static int intr_connect_level(int cpu, int bit)
219 REMOTE_HUB_S(nasid, PI_INT_MASK0_B, si->irq_enable_mask[0]); 217 REMOTE_HUB_S(nasid, PI_INT_MASK0_B, si->irq_enable_mask[0]);
220 REMOTE_HUB_S(nasid, PI_INT_MASK1_B, si->irq_enable_mask[1]); 218 REMOTE_HUB_S(nasid, PI_INT_MASK1_B, si->irq_enable_mask[1]);
221 } 219 }
222 local_irq_restore(flags);
223 220
224 return 0; 221 return 0;
225} 222}
@@ -285,6 +282,8 @@ static unsigned int startup_bridge_irq(unsigned int irq)
285 282
286 bridge->b_wid_tflush; 283 bridge->b_wid_tflush;
287 284
285 intr_connect_level(cpu, swlevel);
286
288 return 0; /* Never anything pending. */ 287 return 0; /* Never anything pending. */
289} 288}
290 289
@@ -292,7 +291,6 @@ static unsigned int startup_bridge_irq(unsigned int irq)
292static void shutdown_bridge_irq(unsigned int irq) 291static void shutdown_bridge_irq(unsigned int irq)
293{ 292{
294 struct bridge_controller *bc = IRQ_TO_BRIDGE(irq); 293 struct bridge_controller *bc = IRQ_TO_BRIDGE(irq);
295 struct hub_data *hub = hub_data(cpu_to_node(bc->irq_cpu));
296 bridge_t *bridge = bc->base; 294 bridge_t *bridge = bc->base;
297 int pin, swlevel; 295 int pin, swlevel;
298 cpuid_t cpu; 296 cpuid_t cpu;
@@ -307,8 +305,6 @@ static void shutdown_bridge_irq(unsigned int irq)
307 swlevel = find_level(&cpu, irq); 305 swlevel = find_level(&cpu, irq);
308 intr_disconnect_level(cpu, swlevel); 306 intr_disconnect_level(cpu, swlevel);
309 307
310 __clear_bit(swlevel, hub->irq_alloc_mask);
311
312 bridge->b_int_enable &= ~(1 << pin); 308 bridge->b_int_enable &= ~(1 << pin);
313 bridge->b_wid_tflush; 309 bridge->b_wid_tflush;
314} 310}
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 08e79141b47c..fbb27728a76a 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -171,7 +171,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
171 * set sp to the kernel stack of the newly created idle process, gp to the proc 171 * set sp to the kernel stack of the newly created idle process, gp to the proc
172 * struct so that current_thread_info() will work. 172 * struct so that current_thread_info() will work.
173 */ 173 */
174void __init prom_boot_secondary(int cpu, struct task_struct *idle) 174void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
175{ 175{
176 unsigned long gp = (unsigned long)task_thread_info(idle); 176 unsigned long gp = (unsigned long)task_thread_info(idle);
177 unsigned long sp = __KSTK_TOS(idle); 177 unsigned long sp = __KSTK_TOS(idle);
@@ -191,7 +191,7 @@ void __init prom_cpus_done(void)
191{ 191{
192} 192}
193 193
194void prom_smp_finish(void) 194void __cpuinit prom_smp_finish(void)
195{ 195{
196} 196}
197 197
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index ba0c4b776c85..79ae6ef979bb 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -76,7 +76,7 @@ __setup("nokgdb", nokgdb);
76 76
77/* Default to UART1 */ 77/* Default to UART1 */
78int kgdb_port = 1; 78int kgdb_port = 1;
79#ifdef CONFIG_SIBYTE_SB1250_DUART 79#ifdef CONFIG_SERIAL_SB1250_DUART
80extern char sb1250_duart_present[]; 80extern char sb1250_duart_present[];
81#endif 81#endif
82#endif 82#endif
@@ -404,7 +404,7 @@ void __init arch_init_irq(void)
404 if (kgdb_flag) { 404 if (kgdb_flag) {
405 kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port; 405 kgdb_irq = K_BCM1480_INT_UART_0 + kgdb_port;
406 406
407#ifdef CONFIG_SIBYTE_SB1250_DUART 407#ifdef CONFIG_SERIAL_SB1250_DUART
408 sb1250_duart_present[kgdb_port] = 0; 408 sb1250_duart_present[kgdb_port] = 0;
409#endif 409#endif
410 /* Setup uart 1 settings, mapper */ 410 /* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index c6ec748175b0..4cec9d798d2f 100644
--- a/arch/mips/sibyte/cfe/console.c
+++ b/arch/mips/sibyte/cfe/console.c
@@ -46,7 +46,7 @@ static int cfe_console_setup(struct console *cons, char *str)
46 /* XXXKW think about interaction with 'console=' cmdline arg */ 46 /* XXXKW think about interaction with 'console=' cmdline arg */
47 /* If none of the console options are configured, the build will break. */ 47 /* If none of the console options are configured, the build will break. */
48 if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) { 48 if (cfe_getenv("BOOT_CONSOLE", consdev, 32) >= 0) {
49#ifdef CONFIG_SIBYTE_SB1250_DUART 49#ifdef CONFIG_SERIAL_SB1250_DUART
50 if (!strcmp(consdev, "uart0")) { 50 if (!strcmp(consdev, "uart0")) {
51 setleds("u0cn"); 51 setleds("u0cn");
52 } else if (!strcmp(consdev, "uart1")) { 52 } else if (!strcmp(consdev, "uart1")) {
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c
index eab20e2db323..5de4cff9d14a 100644
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
@@ -58,7 +58,7 @@ void __init plat_prepare_cpus(unsigned int max_cpus)
58 * Setup the PC, SP, and GP of a secondary processor and start it 58 * Setup the PC, SP, and GP of a secondary processor and start it
59 * running! 59 * running!
60 */ 60 */
61void prom_boot_secondary(int cpu, struct task_struct *idle) 61void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
62{ 62{
63 int retval; 63 int retval;
64 64
@@ -72,7 +72,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
72/* 72/*
73 * Code to run on secondary just after probing the CPU 73 * Code to run on secondary just after probing the CPU
74 */ 74 */
75void prom_init_secondary(void) 75void __cpuinit prom_init_secondary(void)
76{ 76{
77#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) 77#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
78 extern void bcm1480_smp_init(void); 78 extern void bcm1480_smp_init(void);
@@ -89,7 +89,7 @@ void prom_init_secondary(void)
89 * Do any tidying up before marking online and running the idle 89 * Do any tidying up before marking online and running the idle
90 * loop 90 * loop
91 */ 91 */
92void prom_smp_finish(void) 92void __cpuinit prom_smp_finish(void)
93{ 93{
94#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80) 94#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
95 extern void bcm1480_smp_finish(void); 95 extern void bcm1480_smp_finish(void);
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index 0e6a13c0bd0e..ad593a6c20be 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -61,7 +61,7 @@ static int kgdb_irq;
61 61
62/* Default to UART1 */ 62/* Default to UART1 */
63int kgdb_port = 1; 63int kgdb_port = 1;
64#ifdef CONFIG_SIBYTE_SB1250_DUART 64#ifdef CONFIG_SERIAL_SB1250_DUART
65extern char sb1250_duart_present[]; 65extern char sb1250_duart_present[];
66#endif 66#endif
67#endif 67#endif
@@ -359,7 +359,7 @@ void __init arch_init_irq(void)
359 if (kgdb_flag) { 359 if (kgdb_flag) {
360 kgdb_irq = K_INT_UART_0 + kgdb_port; 360 kgdb_irq = K_INT_UART_0 + kgdb_port;
361 361
362#ifdef CONFIG_SIBYTE_SB1250_DUART 362#ifdef CONFIG_SERIAL_SB1250_DUART
363 sb1250_duart_present[kgdb_port] = 0; 363 sb1250_duart_present[kgdb_port] = 0;
364#endif 364#endif
365 /* Setup uart 1 settings, mapper */ 365 /* Setup uart 1 settings, mapper */
diff --git a/arch/mips/sni/pcimt_scache.c b/arch/mips/sni/pcimt_scache.c
deleted file mode 100644
index a59d457fa8b1..000000000000
--- a/arch/mips/sni/pcimt_scache.c
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2 * arch/mips/sni/pcimt_scache.c
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 *
8 * Copyright (c) 1997, 1998 by Ralf Baechle
9 */
10#include <linux/init.h>
11#include <linux/kernel.h>
12#include <asm/bcache.h>
13#include <asm/sni.h>
14
15#define cacheconf (*(volatile unsigned int *)PCIMT_CACHECONF)
16#define invspace (*(volatile unsigned int *)PCIMT_INVSPACE)
17
18void __init sni_pcimt_sc_init(void)
19{
20 unsigned int scsiz, sc_size;
21
22 scsiz = cacheconf & 7;
23 if (scsiz == 0) {
24 printk("Second level cache is deactived.\n");
25 return;
26 }
27 if (scsiz >= 6) {
28 printk("Invalid second level cache size configured, "
29 "deactivating second level cache.\n");
30 cacheconf = 0;
31 return;
32 }
33
34 sc_size = 128 << scsiz;
35 printk("%dkb second level cache detected, deactivating.\n", sc_size);
36 cacheconf = 0;
37}
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 2eada8aea682..38b6a97a31b5 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -40,10 +40,6 @@ void sni_machine_restart(char *command)
40 } 40 }
41} 41}
42 42
43void sni_machine_halt(void)
44{
45}
46
47void sni_machine_power_off(void) 43void sni_machine_power_off(void)
48{ 44{
49 *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd; 45 *(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 4fedfbda0c79..6edbb3051c82 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -26,7 +26,6 @@
26unsigned int sni_brd_type; 26unsigned int sni_brd_type;
27 27
28extern void sni_machine_restart(char *command); 28extern void sni_machine_restart(char *command);
29extern void sni_machine_halt(void);
30extern void sni_machine_power_off(void); 29extern void sni_machine_power_off(void);
31 30
32static void __init sni_display_setup(void) 31static void __init sni_display_setup(void)
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void)
87 } 86 }
88 87
89 _machine_restart = sni_machine_restart; 88 _machine_restart = sni_machine_restart;
90 _machine_halt = sni_machine_halt;
91 pm_power_off = sni_machine_power_off; 89 pm_power_off = sni_machine_power_off;
92 90
93 sni_display_setup(); 91 sni_display_setup();
diff --git a/arch/mips/tx4927/common/Makefile b/arch/mips/tx4927/common/Makefile
index 9cb9535ebacb..18375787e094 100644
--- a/arch/mips/tx4927/common/Makefile
+++ b/arch/mips/tx4927/common/Makefile
@@ -10,3 +10,5 @@ obj-y += tx4927_prom.o tx4927_setup.o tx4927_irq.o
10 10
11obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o 11obj-$(CONFIG_TOSHIBA_FPCIB0) += smsc_fdc37m81x.o
12obj-$(CONFIG_KGDB) += tx4927_dbgio.o 12obj-$(CONFIG_KGDB) += tx4927_dbgio.o
13
14EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/common/tx4927_irq.c b/arch/mips/tx4927/common/tx4927_irq.c
index 00b0b975f349..0aabd57fdad2 100644
--- a/arch/mips/tx4927/common/tx4927_irq.c
+++ b/arch/mips/tx4927/common/tx4927_irq.c
@@ -23,398 +23,20 @@
23 * with this program; if not, write to the Free Software Foundation, Inc., 23 * with this program; if not, write to the Free Software Foundation, Inc.,
24 * 675 Mass Ave, Cambridge, MA 02139, USA. 24 * 675 Mass Ave, Cambridge, MA 02139, USA.
25 */ 25 */
26#include <linux/errno.h>
27#include <linux/init.h> 26#include <linux/init.h>
28#include <linux/kernel_stat.h>
29#include <linux/module.h>
30#include <linux/signal.h>
31#include <linux/sched.h>
32#include <linux/types.h>
33#include <linux/interrupt.h> 27#include <linux/interrupt.h>
34#include <linux/ioport.h> 28#include <asm/irq_cpu.h>
35#include <linux/timex.h>
36#include <linux/slab.h>
37#include <linux/random.h>
38#include <linux/irq.h>
39#include <linux/bitops.h>
40#include <asm/bootinfo.h>
41#include <asm/io.h>
42#include <asm/irq.h>
43#include <asm/mipsregs.h> 29#include <asm/mipsregs.h>
44#include <asm/system.h>
45#include <asm/tx4927/tx4927.h> 30#include <asm/tx4927/tx4927.h>
46#ifdef CONFIG_TOSHIBA_RBTX4927 31#ifdef CONFIG_TOSHIBA_RBTX4927
47#include <asm/tx4927/toshiba_rbtx4927.h> 32#include <asm/tx4927/toshiba_rbtx4927.h>
48#endif 33#endif
49 34
50/*
51 * DEBUG
52 */
53
54#undef TX4927_IRQ_DEBUG
55
56#ifdef TX4927_IRQ_DEBUG
57#define TX4927_IRQ_NONE 0x00000000
58
59#define TX4927_IRQ_INFO ( 1 << 0 )
60#define TX4927_IRQ_WARN ( 1 << 1 )
61#define TX4927_IRQ_EROR ( 1 << 2 )
62
63#define TX4927_IRQ_INIT ( 1 << 5 )
64#define TX4927_IRQ_NEST1 ( 1 << 6 )
65#define TX4927_IRQ_NEST2 ( 1 << 7 )
66#define TX4927_IRQ_NEST3 ( 1 << 8 )
67#define TX4927_IRQ_NEST4 ( 1 << 9 )
68
69#define TX4927_IRQ_CP0_INIT ( 1 << 10 )
70#define TX4927_IRQ_CP0_ENABLE ( 1 << 13 )
71#define TX4927_IRQ_CP0_DISABLE ( 1 << 14 )
72
73#define TX4927_IRQ_PIC_INIT ( 1 << 20 )
74#define TX4927_IRQ_PIC_ENABLE ( 1 << 23 )
75#define TX4927_IRQ_PIC_DISABLE ( 1 << 24 )
76
77#define TX4927_IRQ_ALL 0xffffffff
78#endif
79
80#ifdef TX4927_IRQ_DEBUG
81static const u32 tx4927_irq_debug_flag = (TX4927_IRQ_NONE
82 | TX4927_IRQ_INFO
83 | TX4927_IRQ_WARN | TX4927_IRQ_EROR
84// | TX4927_IRQ_CP0_INIT
85// | TX4927_IRQ_CP0_ENABLE
86// | TX4927_IRQ_CP0_ENDIRQ
87// | TX4927_IRQ_PIC_INIT
88// | TX4927_IRQ_PIC_ENABLE
89// | TX4927_IRQ_PIC_DISABLE
90// | TX4927_IRQ_INIT
91// | TX4927_IRQ_NEST1
92// | TX4927_IRQ_NEST2
93// | TX4927_IRQ_NEST3
94// | TX4927_IRQ_NEST4
95 );
96#endif
97
98#ifdef TX4927_IRQ_DEBUG
99#define TX4927_IRQ_DPRINTK(flag,str...) \
100 if ( (tx4927_irq_debug_flag) & (flag) ) \
101 { \
102 char tmp[100]; \
103 sprintf( tmp, str ); \
104 printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
105 }
106#else
107#define TX4927_IRQ_DPRINTK(flag,str...)
108#endif
109
110/*
111 * Forwad definitions for all pic's
112 */
113
114static void tx4927_irq_cp0_enable(unsigned int irq);
115static void tx4927_irq_cp0_disable(unsigned int irq);
116
117static void tx4927_irq_pic_enable(unsigned int irq);
118static void tx4927_irq_pic_disable(unsigned int irq);
119
120/*
121 * Kernel structs for all pic's
122 */
123
124#define TX4927_CP0_NAME "TX4927-CP0"
125static struct irq_chip tx4927_irq_cp0_type = {
126 .name = TX4927_CP0_NAME,
127 .ack = tx4927_irq_cp0_disable,
128 .mask = tx4927_irq_cp0_disable,
129 .mask_ack = tx4927_irq_cp0_disable,
130 .unmask = tx4927_irq_cp0_enable,
131};
132
133#define TX4927_PIC_NAME "TX4927-PIC"
134static struct irq_chip tx4927_irq_pic_type = {
135 .name = TX4927_PIC_NAME,
136 .ack = tx4927_irq_pic_disable,
137 .mask = tx4927_irq_pic_disable,
138 .mask_ack = tx4927_irq_pic_disable,
139 .unmask = tx4927_irq_pic_enable,
140};
141
142#define TX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }
143static struct irqaction tx4927_irq_pic_action =
144TX4927_PIC_ACTION(TX4927_PIC_NAME);
145
146#define CCP0_STATUS 12
147#define CCP0_CAUSE 13
148
149/*
150 * Functions for cp0
151 */
152
153#define tx4927_irq_cp0_mask(irq) ( 1 << ( irq-TX4927_IRQ_CP0_BEG+8 ) )
154
155static void
156tx4927_irq_cp0_modify(unsigned cp0_reg, unsigned clr_bits, unsigned set_bits)
157{
158 unsigned long val = 0;
159
160 switch (cp0_reg) {
161 case CCP0_STATUS:
162 val = read_c0_status();
163 break;
164
165 case CCP0_CAUSE:
166 val = read_c0_cause();
167 break;
168
169 }
170
171 val &= (~clr_bits);
172 val |= (set_bits);
173
174 switch (cp0_reg) {
175 case CCP0_STATUS:{
176 write_c0_status(val);
177 break;
178 }
179 case CCP0_CAUSE:{
180 write_c0_cause(val);
181 break;
182 }
183 }
184}
185
186static void __init tx4927_irq_cp0_init(void)
187{
188 int i;
189
190 TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_INIT, "beg=%d end=%d\n",
191 TX4927_IRQ_CP0_BEG, TX4927_IRQ_CP0_END);
192
193 for (i = TX4927_IRQ_CP0_BEG; i <= TX4927_IRQ_CP0_END; i++)
194 set_irq_chip_and_handler(i, &tx4927_irq_cp0_type,
195 handle_level_irq);
196}
197
198static void tx4927_irq_cp0_enable(unsigned int irq)
199{
200 TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d \n", irq);
201
202 tx4927_irq_cp0_modify(CCP0_STATUS, 0, tx4927_irq_cp0_mask(irq));
203}
204
205static void tx4927_irq_cp0_disable(unsigned int irq)
206{
207 TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d \n", irq);
208
209 tx4927_irq_cp0_modify(CCP0_STATUS, tx4927_irq_cp0_mask(irq), 0);
210}
211
212/*
213 * Functions for pic
214 */
215u32 tx4927_irq_pic_addr(int irq)
216{
217 /* MVMCP -- need to formulize this */
218 irq -= TX4927_IRQ_PIC_BEG;
219 switch (irq) {
220 case 17:
221 case 16:
222 case 1:
223 case 0:
224 return (0xff1ff610);
225
226 case 19:
227 case 18:
228 case 3:
229 case 2:
230 return (0xff1ff614);
231
232 case 21:
233 case 20:
234 case 5:
235 case 4:
236 return (0xff1ff618);
237
238 case 23:
239 case 22:
240 case 7:
241 case 6:
242 return (0xff1ff61c);
243
244 case 25:
245 case 24:
246 case 9:
247 case 8:
248 return (0xff1ff620);
249
250 case 27:
251 case 26:
252 case 11:
253 case 10:
254 return (0xff1ff624);
255
256 case 29:
257 case 28:
258 case 13:
259 case 12:
260 return (0xff1ff628);
261
262 case 31:
263 case 30:
264 case 15:
265 case 14:
266 return (0xff1ff62c);
267
268 }
269 return (0);
270}
271
272u32 tx4927_irq_pic_mask(int irq)
273{
274 /* MVMCP -- need to formulize this */
275 irq -= TX4927_IRQ_PIC_BEG;
276 switch (irq) {
277 case 31:
278 case 29:
279 case 27:
280 case 25:
281 case 23:
282 case 21:
283 case 19:
284 case 17:{
285 return (0x07000000);
286 }
287 case 30:
288 case 28:
289 case 26:
290 case 24:
291 case 22:
292 case 20:
293 case 18:
294 case 16:{
295 return (0x00070000);
296 }
297 case 15:
298 case 13:
299 case 11:
300 case 9:
301 case 7:
302 case 5:
303 case 3:
304 case 1:{
305 return (0x00000700);
306 }
307 case 14:
308 case 12:
309 case 10:
310 case 8:
311 case 6:
312 case 4:
313 case 2:
314 case 0:{
315 return (0x00000007);
316 }
317 }
318 return (0x00000000);
319}
320
321static void tx4927_irq_pic_modify(unsigned pic_reg, unsigned clr_bits,
322 unsigned set_bits)
323{
324 unsigned long val = 0;
325
326 val = TX4927_RD(pic_reg);
327 val &= (~clr_bits);
328 val |= (set_bits);
329 TX4927_WR(pic_reg, val);
330}
331
332static void __init tx4927_irq_pic_init(void)
333{
334 int i;
335
336 TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_INIT, "beg=%d end=%d\n",
337 TX4927_IRQ_PIC_BEG, TX4927_IRQ_PIC_END);
338
339 for (i = TX4927_IRQ_PIC_BEG; i <= TX4927_IRQ_PIC_END; i++)
340 set_irq_chip_and_handler(i, &tx4927_irq_pic_type,
341 handle_level_irq);
342
343 setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);
344
345 TX4927_WR(0xff1ff640, 0x6); /* irq level mask -- only accept hightest */
346 TX4927_WR(0xff1ff600, TX4927_RD(0xff1ff600) | 0x1); /* irq enable */
347}
348
349static void tx4927_irq_pic_enable(unsigned int irq)
350{
351 TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_ENABLE, "irq=%d\n", irq);
352
353 tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq), 0,
354 tx4927_irq_pic_mask(irq));
355}
356
357static void tx4927_irq_pic_disable(unsigned int irq)
358{
359 TX4927_IRQ_DPRINTK(TX4927_IRQ_PIC_DISABLE, "irq=%d\n", irq);
360
361 tx4927_irq_pic_modify(tx4927_irq_pic_addr(irq),
362 tx4927_irq_pic_mask(irq), 0);
363}
364
365/*
366 * Main init functions
367 */
368void __init tx4927_irq_init(void) 35void __init tx4927_irq_init(void)
369{ 36{
370 TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "-\n"); 37 mips_cpu_irq_init();
371 38 txx9_irq_init(TX4927_IRC_REG);
372 TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_cp0_init()\n"); 39 set_irq_chained_handler(TX4927_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
373 tx4927_irq_cp0_init();
374
375 TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "=Calling tx4927_irq_pic_init()\n");
376 tx4927_irq_pic_init();
377
378 TX4927_IRQ_DPRINTK(TX4927_IRQ_INIT, "+\n");
379}
380
381static int tx4927_irq_nested(void)
382{
383 int sw_irq = 0;
384 u32 level2;
385
386 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "-\n");
387
388 level2 = TX4927_RD(0xff1ff6a0);
389 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=level2a=0x%x\n", level2);
390
391 if ((level2 & 0x10000) == 0) {
392 level2 &= 0x1f;
393 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=level2b=0x%x\n", level2);
394
395 sw_irq = TX4927_IRQ_PIC_BEG + level2;
396 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST3, "=sw_irq=%d\n", sw_irq);
397
398 if (sw_irq == 27) {
399 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq-%d\n",
400 sw_irq);
401
402#ifdef CONFIG_TOSHIBA_RBTX4927
403 {
404 sw_irq = toshiba_rbtx4927_irq_nested(sw_irq);
405 }
406#endif
407
408 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST4, "=irq+%d\n",
409 sw_irq);
410 }
411 }
412
413 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST2, "=sw_irq=%d\n", sw_irq);
414
415 TX4927_IRQ_DPRINTK(TX4927_IRQ_NEST1, "+\n");
416
417 return (sw_irq);
418} 40}
419 41
420asmlinkage void plat_irq_dispatch(void) 42asmlinkage void plat_irq_dispatch(void)
@@ -424,9 +46,12 @@ asmlinkage void plat_irq_dispatch(void)
424 if (pending & STATUSF_IP7) /* cpu timer */ 46 if (pending & STATUSF_IP7) /* cpu timer */
425 do_IRQ(TX4927_IRQ_CPU_TIMER); 47 do_IRQ(TX4927_IRQ_CPU_TIMER);
426 else if (pending & STATUSF_IP2) { /* tx4927 pic */ 48 else if (pending & STATUSF_IP2) { /* tx4927 pic */
427 unsigned int irq = tx4927_irq_nested(); 49 int irq = txx9_irq();
428 50#ifdef CONFIG_TOSHIBA_RBTX4927
429 if (unlikely(irq == 0)) { 51 if (irq == TX4927_IRQ_NEST_EXT_ON_PIC)
52 irq = toshiba_rbtx4927_irq_nested(irq);
53#endif
54 if (unlikely(irq < 0)) {
430 spurious_interrupt(); 55 spurious_interrupt();
431 return; 56 return;
432 } 57 }
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/Makefile b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
index 8a991f3c1a6f..13f96725d772 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/Makefile
+++ b/arch/mips/tx4927/toshiba_rbtx4927/Makefile
@@ -1,3 +1,5 @@
1obj-y += toshiba_rbtx4927_prom.o 1obj-y += toshiba_rbtx4927_prom.o
2obj-y += toshiba_rbtx4927_setup.o 2obj-y += toshiba_rbtx4927_setup.o
3obj-y += toshiba_rbtx4927_irq.o 3obj-y += toshiba_rbtx4927_irq.o
4
5EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index e265fcd31b60..9607ad5e734a 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -133,6 +133,7 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
133#include <linux/bootmem.h> 133#include <linux/bootmem.h>
134#include <linux/blkdev.h> 134#include <linux/blkdev.h>
135#ifdef CONFIG_TOSHIBA_FPCIB0 135#ifdef CONFIG_TOSHIBA_FPCIB0
136#include <asm/i8259.h>
136#include <asm/tx4927/smsc_fdc37m81x.h> 137#include <asm/tx4927/smsc_fdc37m81x.h>
137#endif 138#endif
138#include <asm/tx4927/toshiba_rbtx4927.h> 139#include <asm/tx4927/toshiba_rbtx4927.h>
@@ -151,11 +152,6 @@ JP7 is not bus master -- do NOT use -- only 4 pci bus master's allowed -- SouthB
151#define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE ( 1 << 13 ) 152#define TOSHIBA_RBTX4927_IRQ_IOC_ENABLE ( 1 << 13 )
152#define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE ( 1 << 14 ) 153#define TOSHIBA_RBTX4927_IRQ_IOC_DISABLE ( 1 << 14 )
153 154
154#define TOSHIBA_RBTX4927_IRQ_ISA_INIT ( 1 << 20 )
155#define TOSHIBA_RBTX4927_IRQ_ISA_ENABLE ( 1 << 23 )
156#define TOSHIBA_RBTX4927_IRQ_ISA_DISABLE ( 1 << 24 )
157#define TOSHIBA_RBTX4927_IRQ_ISA_MASK ( 1 << 25 )
158
159#define TOSHIBA_RBTX4927_SETUP_ALL 0xffffffff 155#define TOSHIBA_RBTX4927_SETUP_ALL 0xffffffff
160#endif 156#endif
161 157
@@ -167,10 +163,6 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
167// | TOSHIBA_RBTX4927_IRQ_IOC_INIT 163// | TOSHIBA_RBTX4927_IRQ_IOC_INIT
168// | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE 164// | TOSHIBA_RBTX4927_IRQ_IOC_ENABLE
169// | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE 165// | TOSHIBA_RBTX4927_IRQ_IOC_DISABLE
170// | TOSHIBA_RBTX4927_IRQ_ISA_INIT
171// | TOSHIBA_RBTX4927_IRQ_ISA_ENABLE
172// | TOSHIBA_RBTX4927_IRQ_ISA_DISABLE
173// | TOSHIBA_RBTX4927_IRQ_ISA_MASK
174 ); 166 );
175#endif 167#endif
176 168
@@ -196,33 +188,14 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
196#define TOSHIBA_RBTX4927_IRQ_IOC_BEG ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG) /* 56 */ 188#define TOSHIBA_RBTX4927_IRQ_IOC_BEG ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_BEG) /* 56 */
197#define TOSHIBA_RBTX4927_IRQ_IOC_END ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END) /* 63 */ 189#define TOSHIBA_RBTX4927_IRQ_IOC_END ((TX4927_IRQ_PIC_END+1)+TOSHIBA_RBTX4927_IRQ_IOC_RAW_END) /* 63 */
198 190
199
200#define TOSHIBA_RBTX4927_IRQ_ISA_BEG MI8259_IRQ_ISA_BEG
201#define TOSHIBA_RBTX4927_IRQ_ISA_END MI8259_IRQ_ISA_END
202#define TOSHIBA_RBTX4927_IRQ_ISA_MID ((TOSHIBA_RBTX4927_IRQ_ISA_BEG+TOSHIBA_RBTX4927_IRQ_ISA_END+1)/2)
203
204
205#define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC 191#define TOSHIBA_RBTX4927_IRQ_NEST_IOC_ON_PIC TX4927_IRQ_NEST_EXT_ON_PIC
206#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2) 192#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC (TOSHIBA_RBTX4927_IRQ_IOC_BEG+2)
207#define TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA (TOSHIBA_RBTX4927_IRQ_ISA_BEG+2)
208 193
209extern int tx4927_using_backplane; 194extern int tx4927_using_backplane;
210 195
211#ifdef CONFIG_TOSHIBA_FPCIB0
212extern void enable_8259A_irq(unsigned int irq);
213extern void disable_8259A_irq(unsigned int irq);
214extern void mask_and_ack_8259A(unsigned int irq);
215#endif
216
217static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq); 196static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq);
218static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq); 197static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq);
219 198
220#ifdef CONFIG_TOSHIBA_FPCIB0
221static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq);
222static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq);
223static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq);
224#endif
225
226#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC" 199#define TOSHIBA_RBTX4927_IOC_NAME "RBTX4927-IOC"
227static struct irq_chip toshiba_rbtx4927_irq_ioc_type = { 200static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
228 .name = TOSHIBA_RBTX4927_IOC_NAME, 201 .name = TOSHIBA_RBTX4927_IOC_NAME,
@@ -235,18 +208,6 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
235#define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006 208#define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
236 209
237 210
238#ifdef CONFIG_TOSHIBA_FPCIB0
239#define TOSHIBA_RBTX4927_ISA_NAME "RBTX4927-ISA"
240static struct irq_chip toshiba_rbtx4927_irq_isa_type = {
241 .name = TOSHIBA_RBTX4927_ISA_NAME,
242 .ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
243 .mask = toshiba_rbtx4927_irq_isa_disable,
244 .mask_ack = toshiba_rbtx4927_irq_isa_mask_and_ack,
245 .unmask = toshiba_rbtx4927_irq_isa_enable,
246};
247#endif
248
249
250u32 bit2num(u32 num) 211u32 bit2num(u32 num)
251{ 212{
252 u32 i; 213 u32 i;
@@ -271,31 +232,10 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
271 } 232 }
272 } 233 }
273#ifdef CONFIG_TOSHIBA_FPCIB0 234#ifdef CONFIG_TOSHIBA_FPCIB0
274 { 235 if (tx4927_using_backplane) {
275 if (tx4927_using_backplane) { 236 int irq = i8259_irq();
276 u32 level4; 237 if (irq >= 0)
277 u32 level5; 238 sw_irq = irq;
278 outb(0x0A, 0x20);
279 level4 = inb(0x20) & 0xff;
280 if (level4) {
281 sw_irq =
282 TOSHIBA_RBTX4927_IRQ_ISA_BEG +
283 bit2num(level4);
284 if (sw_irq !=
285 TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA) {
286 goto RETURN;
287 }
288 }
289
290 outb(0x0A, 0xA0);
291 level5 = inb(0xA0) & 0xff;
292 if (level5) {
293 sw_irq =
294 TOSHIBA_RBTX4927_IRQ_ISA_MID +
295 bit2num(level5);
296 goto RETURN;
297 }
298 }
299 } 239 }
300#endif 240#endif
301 241
@@ -307,12 +247,6 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
307#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL } 247#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL }
308static struct irqaction toshiba_rbtx4927_irq_ioc_action = 248static struct irqaction toshiba_rbtx4927_irq_ioc_action =
309TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME); 249TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);
310#ifdef CONFIG_TOSHIBA_FPCIB0
311static struct irqaction toshiba_rbtx4927_irq_isa_master =
312TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/M");
313static struct irqaction toshiba_rbtx4927_irq_isa_slave =
314TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_ISA_NAME "/S");
315#endif
316 250
317 251
318/**********************************************************************************/ 252/**********************************************************************************/
@@ -378,92 +312,6 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
378} 312}
379 313
380 314
381/**********************************************************************************/
382/* Functions for isa */
383/**********************************************************************************/
384
385
386#ifdef CONFIG_TOSHIBA_FPCIB0
387static void __init toshiba_rbtx4927_irq_isa_init(void)
388{
389 int i;
390
391 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_INIT,
392 "beg=%d end=%d\n",
393 TOSHIBA_RBTX4927_IRQ_ISA_BEG,
394 TOSHIBA_RBTX4927_IRQ_ISA_END);
395
396 for (i = TOSHIBA_RBTX4927_IRQ_ISA_BEG;
397 i <= TOSHIBA_RBTX4927_IRQ_ISA_END; i++)
398 set_irq_chip_and_handler(i, &toshiba_rbtx4927_irq_isa_type,
399 handle_level_irq);
400
401 setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC,
402 &toshiba_rbtx4927_irq_isa_master);
403 setup_irq(TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_ISA,
404 &toshiba_rbtx4927_irq_isa_slave);
405
406 /* make sure we are looking at IRR (not ISR) */
407 outb(0x0A, 0x20);
408 outb(0x0A, 0xA0);
409}
410#endif
411
412
413#ifdef CONFIG_TOSHIBA_FPCIB0
414static void toshiba_rbtx4927_irq_isa_enable(unsigned int irq)
415{
416 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_ENABLE,
417 "irq=%d\n", irq);
418
419 if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
420 || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
421 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
422 "bad irq=%d\n", irq);
423 panic("\n");
424 }
425
426 enable_8259A_irq(irq);
427}
428#endif
429
430
431#ifdef CONFIG_TOSHIBA_FPCIB0
432static void toshiba_rbtx4927_irq_isa_disable(unsigned int irq)
433{
434 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_DISABLE,
435 "irq=%d\n", irq);
436
437 if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
438 || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
439 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
440 "bad irq=%d\n", irq);
441 panic("\n");
442 }
443
444 disable_8259A_irq(irq);
445}
446#endif
447
448
449#ifdef CONFIG_TOSHIBA_FPCIB0
450static void toshiba_rbtx4927_irq_isa_mask_and_ack(unsigned int irq)
451{
452 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_ISA_MASK,
453 "irq=%d\n", irq);
454
455 if (irq < TOSHIBA_RBTX4927_IRQ_ISA_BEG
456 || irq > TOSHIBA_RBTX4927_IRQ_ISA_END) {
457 TOSHIBA_RBTX4927_IRQ_DPRINTK(TOSHIBA_RBTX4927_IRQ_EROR,
458 "bad irq=%d\n", irq);
459 panic("\n");
460 }
461
462 mask_and_ack_8259A(irq);
463}
464#endif
465
466
467void __init arch_init_irq(void) 315void __init arch_init_irq(void)
468{ 316{
469 extern void tx4927_irq_init(void); 317 extern void tx4927_irq_init(void);
@@ -471,12 +319,11 @@ void __init arch_init_irq(void)
471 tx4927_irq_init(); 319 tx4927_irq_init();
472 toshiba_rbtx4927_irq_ioc_init(); 320 toshiba_rbtx4927_irq_ioc_init();
473#ifdef CONFIG_TOSHIBA_FPCIB0 321#ifdef CONFIG_TOSHIBA_FPCIB0
474 { 322 if (tx4927_using_backplane)
475 if (tx4927_using_backplane) { 323 init_i8259_irqs();
476 toshiba_rbtx4927_irq_isa_init();
477 }
478 }
479#endif 324#endif
325 /* Onboard 10M Ether: High Active */
326 set_irq_type(RBTX4927_RTL_8019_IRQ, IRQF_TRIGGER_HIGH);
480 327
481 wbflush(); 328 wbflush();
482} 329}
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index ea5a70b252a0..3e84237abe63 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -151,7 +151,6 @@ unsigned long mips_memory_upper;
151static int tx4927_ccfg_toeon = 1; 151static int tx4927_ccfg_toeon = 1;
152static int tx4927_pcic_trdyto = 0; /* default: disabled */ 152static int tx4927_pcic_trdyto = 0; /* default: disabled */
153unsigned long tx4927_ce_base[8]; 153unsigned long tx4927_ce_base[8];
154void tx4927_pci_setup(void);
155void tx4927_reset_pci_pcic(void); 154void tx4927_reset_pci_pcic(void);
156int tx4927_pci66 = 0; /* 0:auto */ 155int tx4927_pci66 = 0; /* 0:auto */
157#endif 156#endif
@@ -442,7 +441,7 @@ arch_initcall(tx4927_pcibios_init);
442extern struct resource pci_io_resource; 441extern struct resource pci_io_resource;
443extern struct resource pci_mem_resource; 442extern struct resource pci_mem_resource;
444 443
445void tx4927_pci_setup(void) 444void __init tx4927_pci_setup(void)
446{ 445{
447 static int called = 0; 446 static int called = 0;
448 extern unsigned int tx4927_get_mem_size(void); 447 extern unsigned int tx4927_get_mem_size(void);
@@ -748,12 +747,6 @@ void __init toshiba_rbtx4927_setup(void)
748 } 747 }
749#endif 748#endif
750 749
751 /* setup irq stuff */
752 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
753 ":Setting up tx4927 pic.\n");
754 TX4927_WR(0xff1ff604, 0x00000400); /* irq trigger */
755 TX4927_WR(0xff1ff608, 0x00000000); /* irq trigger */
756
757 /* setup serial stuff */ 750 /* setup serial stuff */
758 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP, 751 TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
759 ":Setting up tx4927 sio.\n"); 752 ":Setting up tx4927 sio.\n");
@@ -915,7 +908,7 @@ void __init toshiba_rbtx4927_setup(void)
915 req.iotype = UPIO_MEM; 908 req.iotype = UPIO_MEM;
916 req.membase = (char *)(0xff1ff300 + i * 0x100); 909 req.membase = (char *)(0xff1ff300 + i * 0x100);
917 req.mapbase = 0xff1ff300 + i * 0x100; 910 req.mapbase = 0xff1ff300 + i * 0x100;
918 req.irq = 32 + i; 911 req.irq = TX4927_IRQ_PIC_BEG + 8 + i;
919 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; 912 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
920 req.uartclk = 50000000; 913 req.uartclk = 50000000;
921 early_serial_txx9_setup(&req); 914 early_serial_txx9_setup(&req);
diff --git a/arch/mips/tx4938/common/Makefile b/arch/mips/tx4938/common/Makefile
index 83cda518f204..8352eca67906 100644
--- a/arch/mips/tx4938/common/Makefile
+++ b/arch/mips/tx4938/common/Makefile
@@ -9,3 +9,4 @@
9obj-y += prom.o setup.o irq.o 9obj-y += prom.o setup.o irq.o
10obj-$(CONFIG_KGDB) += dbgio.o 10obj-$(CONFIG_KGDB) += dbgio.o
11 11
12EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/common/irq.c b/arch/mips/tx4938/common/irq.c
index 3a2dbfc25014..c059b899d120 100644
--- a/arch/mips/tx4938/common/irq.c
+++ b/arch/mips/tx4938/common/irq.c
@@ -11,284 +11,21 @@
11 * 11 *
12 * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com) 12 * Support for TX4938 in 2.6 - Manish Lachwani (mlachwani@mvista.com)
13 */ 13 */
14#include <linux/errno.h>
15#include <linux/init.h> 14#include <linux/init.h>
16#include <linux/kernel_stat.h>
17#include <linux/module.h>
18#include <linux/signal.h>
19#include <linux/sched.h>
20#include <linux/types.h>
21#include <linux/interrupt.h> 15#include <linux/interrupt.h>
22#include <linux/ioport.h> 16#include <asm/irq_cpu.h>
23#include <linux/timex.h>
24#include <linux/slab.h>
25#include <linux/random.h>
26#include <linux/irq.h>
27#include <asm/bitops.h>
28#include <asm/bootinfo.h>
29#include <asm/io.h>
30#include <asm/irq.h>
31#include <asm/mipsregs.h> 17#include <asm/mipsregs.h>
32#include <asm/system.h>
33#include <asm/wbflush.h>
34#include <asm/tx4938/rbtx4938.h> 18#include <asm/tx4938/rbtx4938.h>
35 19
36/**********************************************************************************/
37/* Forwad definitions for all pic's */
38/**********************************************************************************/
39
40static void tx4938_irq_cp0_enable(unsigned int irq);
41static void tx4938_irq_cp0_disable(unsigned int irq);
42
43static void tx4938_irq_pic_enable(unsigned int irq);
44static void tx4938_irq_pic_disable(unsigned int irq);
45
46/**********************************************************************************/
47/* Kernel structs for all pic's */
48/**********************************************************************************/
49
50#define TX4938_CP0_NAME "TX4938-CP0"
51static struct irq_chip tx4938_irq_cp0_type = {
52 .name = TX4938_CP0_NAME,
53 .ack = tx4938_irq_cp0_disable,
54 .mask = tx4938_irq_cp0_disable,
55 .mask_ack = tx4938_irq_cp0_disable,
56 .unmask = tx4938_irq_cp0_enable,
57};
58
59#define TX4938_PIC_NAME "TX4938-PIC"
60static struct irq_chip tx4938_irq_pic_type = {
61 .name = TX4938_PIC_NAME,
62 .ack = tx4938_irq_pic_disable,
63 .mask = tx4938_irq_pic_disable,
64 .mask_ack = tx4938_irq_pic_disable,
65 .unmask = tx4938_irq_pic_enable,
66};
67
68static struct irqaction tx4938_irq_pic_action = {
69 .handler = no_action,
70 .flags = 0,
71 .mask = CPU_MASK_NONE,
72 .name = TX4938_PIC_NAME
73};
74
75/**********************************************************************************/
76/* Functions for cp0 */
77/**********************************************************************************/
78
79#define tx4938_irq_cp0_mask(irq) ( 1 << ( irq-TX4938_IRQ_CP0_BEG+8 ) )
80
81static void __init
82tx4938_irq_cp0_init(void)
83{
84 int i;
85
86 for (i = TX4938_IRQ_CP0_BEG; i <= TX4938_IRQ_CP0_END; i++)
87 set_irq_chip_and_handler(i, &tx4938_irq_cp0_type,
88 handle_level_irq);
89}
90
91static void
92tx4938_irq_cp0_enable(unsigned int irq)
93{
94 set_c0_status(tx4938_irq_cp0_mask(irq));
95}
96
97static void
98tx4938_irq_cp0_disable(unsigned int irq)
99{
100 clear_c0_status(tx4938_irq_cp0_mask(irq));
101}
102
103/**********************************************************************************/
104/* Functions for pic */
105/**********************************************************************************/
106
107u32
108tx4938_irq_pic_addr(int irq)
109{
110 /* MVMCP -- need to formulize this */
111 irq -= TX4938_IRQ_PIC_BEG;
112
113 switch (irq) {
114 case 17:
115 case 16:
116 case 1:
117 case 0:{
118 return (TX4938_MKA(TX4938_IRC_IRLVL0));
119 }
120 case 19:
121 case 18:
122 case 3:
123 case 2:{
124 return (TX4938_MKA(TX4938_IRC_IRLVL1));
125 }
126 case 21:
127 case 20:
128 case 5:
129 case 4:{
130 return (TX4938_MKA(TX4938_IRC_IRLVL2));
131 }
132 case 23:
133 case 22:
134 case 7:
135 case 6:{
136 return (TX4938_MKA(TX4938_IRC_IRLVL3));
137 }
138 case 25:
139 case 24:
140 case 9:
141 case 8:{
142 return (TX4938_MKA(TX4938_IRC_IRLVL4));
143 }
144 case 27:
145 case 26:
146 case 11:
147 case 10:{
148 return (TX4938_MKA(TX4938_IRC_IRLVL5));
149 }
150 case 29:
151 case 28:
152 case 13:
153 case 12:{
154 return (TX4938_MKA(TX4938_IRC_IRLVL6));
155 }
156 case 31:
157 case 30:
158 case 15:
159 case 14:{
160 return (TX4938_MKA(TX4938_IRC_IRLVL7));
161 }
162 }
163
164 return 0;
165}
166
167u32
168tx4938_irq_pic_mask(int irq)
169{
170 /* MVMCP -- need to formulize this */
171 irq -= TX4938_IRQ_PIC_BEG;
172
173 switch (irq) {
174 case 31:
175 case 29:
176 case 27:
177 case 25:
178 case 23:
179 case 21:
180 case 19:
181 case 17:{
182 return (0x07000000);
183 }
184 case 30:
185 case 28:
186 case 26:
187 case 24:
188 case 22:
189 case 20:
190 case 18:
191 case 16:{
192 return (0x00070000);
193 }
194 case 15:
195 case 13:
196 case 11:
197 case 9:
198 case 7:
199 case 5:
200 case 3:
201 case 1:{
202 return (0x00000700);
203 }
204 case 14:
205 case 12:
206 case 10:
207 case 8:
208 case 6:
209 case 4:
210 case 2:
211 case 0:{
212 return (0x00000007);
213 }
214 }
215 return 0x00000000;
216}
217
218static void
219tx4938_irq_pic_modify(unsigned pic_reg, unsigned clr_bits, unsigned set_bits)
220{
221 unsigned long val = 0;
222
223 val = TX4938_RD(pic_reg);
224 val &= (~clr_bits);
225 val |= (set_bits);
226 TX4938_WR(pic_reg, val);
227 mmiowb();
228 TX4938_RD(pic_reg);
229}
230
231static void __init
232tx4938_irq_pic_init(void)
233{
234 int i;
235
236 for (i = TX4938_IRQ_PIC_BEG; i <= TX4938_IRQ_PIC_END; i++)
237 set_irq_chip_and_handler(i, &tx4938_irq_pic_type,
238 handle_level_irq);
239
240 setup_irq(TX4938_IRQ_NEST_PIC_ON_CP0, &tx4938_irq_pic_action);
241
242 TX4938_WR(0xff1ff640, 0x6); /* irq level mask -- only accept hightest */
243 TX4938_WR(0xff1ff600, TX4938_RD(0xff1ff600) | 0x1); /* irq enable */
244}
245
246static void
247tx4938_irq_pic_enable(unsigned int irq)
248{
249 tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq), 0,
250 tx4938_irq_pic_mask(irq));
251}
252
253static void
254tx4938_irq_pic_disable(unsigned int irq)
255{
256 tx4938_irq_pic_modify(tx4938_irq_pic_addr(irq),
257 tx4938_irq_pic_mask(irq), 0);
258}
259
260/**********************************************************************************/
261/* Main init functions */
262/**********************************************************************************/
263
264void __init 20void __init
265tx4938_irq_init(void) 21tx4938_irq_init(void)
266{ 22{
267 tx4938_irq_cp0_init(); 23 mips_cpu_irq_init();
268 tx4938_irq_pic_init(); 24 txx9_irq_init(TX4938_IRC_REG);
25 set_irq_chained_handler(TX4938_IRQ_NEST_PIC_ON_CP0, handle_simple_irq);
269} 26}
270 27
271int 28int toshiba_rbtx4938_irq_nested(int irq);
272tx4938_irq_nested(void)
273{
274 int sw_irq = 0;
275 u32 level2;
276
277 level2 = TX4938_RD(0xff1ff6a0);
278 if ((level2 & 0x10000) == 0) {
279 level2 &= 0x1f;
280 sw_irq = TX4938_IRQ_PIC_BEG + level2;
281 if (sw_irq == 26) {
282 {
283 extern int toshiba_rbtx4938_irq_nested(int sw_irq);
284 sw_irq = toshiba_rbtx4938_irq_nested(sw_irq);
285 }
286 }
287 }
288
289 wbflush();
290 return sw_irq;
291}
292 29
293asmlinkage void plat_irq_dispatch(void) 30asmlinkage void plat_irq_dispatch(void)
294{ 31{
@@ -297,8 +34,10 @@ asmlinkage void plat_irq_dispatch(void)
297 if (pending & STATUSF_IP7) 34 if (pending & STATUSF_IP7)
298 do_IRQ(TX4938_IRQ_CPU_TIMER); 35 do_IRQ(TX4938_IRQ_CPU_TIMER);
299 else if (pending & STATUSF_IP2) { 36 else if (pending & STATUSF_IP2) {
300 int irq = tx4938_irq_nested(); 37 int irq = txx9_irq();
301 if (irq) 38 if (irq == TX4938_IRQ_PIC_BEG + TX4938_IR_INT(0))
39 irq = toshiba_rbtx4938_irq_nested(irq);
40 if (irq >= 0)
302 do_IRQ(irq); 41 do_IRQ(irq);
303 else 42 else
304 spurious_interrupt(); 43 spurious_interrupt();
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/Makefile b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
index 10c94e62bf5b..675bb1c3e40c 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/Makefile
+++ b/arch/mips/tx4938/toshiba_rbtx4938/Makefile
@@ -7,3 +7,5 @@
7# 7#
8 8
9obj-y += prom.o setup.o irq.o spi_eeprom.o 9obj-y += prom.o setup.o irq.o spi_eeprom.o
10
11EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/irq.c b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
index 91aea7aff515..f00185017e80 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/irq.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/irq.c
@@ -181,7 +181,7 @@ void __init arch_init_irq(void)
181 tx4938_irq_init(); 181 tx4938_irq_init();
182 toshiba_rbtx4938_irq_ioc_init(); 182 toshiba_rbtx4938_irq_ioc_init();
183 /* Onboard 10M Ether: High Active */ 183 /* Onboard 10M Ether: High Active */
184 TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000040); 184 set_irq_type(RBTX4938_IRQ_ETHER, IRQF_TRIGGER_HIGH);
185 185
186 wbflush(); 186 wbflush();
187} 187}
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index f9ad482749e4..84ebff711e6e 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -773,10 +773,6 @@ void __init tx4938_board_setup(void)
773 txboard_add_phys_region(base, size); 773 txboard_add_phys_region(base, size);
774 } 774 }
775 775
776 /* IRC */
777 /* disable interrupt control */
778 tx4938_ircptr->cer = 0;
779
780 /* TMR */ 776 /* TMR */
781 /* disable all timers */ 777 /* disable all timers */
782 for (i = 0; i < TX4938_NR_TMR; i++) { 778 for (i = 0; i < TX4938_NR_TMR; i++) {
@@ -875,9 +871,6 @@ void __init toshiba_rbtx4938_setup(void)
875 if (txx9_master_clock == 0) 871 if (txx9_master_clock == 0)
876 txx9_master_clock = 25000000; /* 25MHz */ 872 txx9_master_clock = 25000000; /* 25MHz */
877 tx4938_board_setup(); 873 tx4938_board_setup();
878 /* setup irq stuff */
879 TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM0), 0x00000000); /* irq trigger */
880 TX4938_WR(TX4938_MKA(TX4938_IRC_IRDM1), 0x00000000); /* irq trigger */
881 /* setup serial stuff */ 874 /* setup serial stuff */
882 TX4938_WR(0xff1ff314, 0x00000000); /* h/w flow control off */ 875 TX4938_WR(0xff1ff314, 0x00000000); /* h/w flow control off */
883 TX4938_WR(0xff1ff414, 0x00000000); /* h/w flow control off */ 876 TX4938_WR(0xff1ff414, 0x00000000); /* h/w flow control off */
@@ -897,7 +890,7 @@ void __init toshiba_rbtx4938_setup(void)
897 req.iotype = UPIO_MEM; 890 req.iotype = UPIO_MEM;
898 req.membase = (char *)(0xff1ff300 + i * 0x100); 891 req.membase = (char *)(0xff1ff300 + i * 0x100);
899 req.mapbase = 0xff1ff300 + i * 0x100; 892 req.mapbase = 0xff1ff300 + i * 0x100;
900 req.irq = 32 + i; 893 req.irq = RBTX4938_IRQ_IRC_SIO(i);
901 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/; 894 req.flags |= UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
902 req.uartclk = 50000000; 895 req.uartclk = 50000000;
903 early_serial_txx9_setup(&req); 896 early_serial_txx9_setup(&req);
@@ -1122,7 +1115,7 @@ static void __init txx9_spi_init(unsigned long base, int irq)
1122static int __init rbtx4938_spi_init(void) 1115static int __init rbtx4938_spi_init(void)
1123{ 1116{
1124 struct spi_board_info srtc_info = { 1117 struct spi_board_info srtc_info = {
1125 .modalias = "rs5c348", 1118 .modalias = "rtc-rs5c348",
1126 .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */ 1119 .max_speed_hz = 1000000, /* 1.0Mbps @ Vdd 2.0V */
1127 .bus_num = 0, 1120 .bus_num = 0,
1128 .chip_select = 16 + SRTC_CS, 1121 .chip_select = 16 + SRTC_CS,
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index bb23ff71c28e..2989c6682bf6 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -285,147 +285,6 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
285 return err; 285 return err;
286} 286}
287 287
288struct linux32_dirent {
289 u32 d_ino;
290 compat_off_t d_off;
291 u16 d_reclen;
292 char d_name[1];
293};
294
295struct old_linux32_dirent {
296 u32 d_ino;
297 u32 d_offset;
298 u16 d_namlen;
299 char d_name[1];
300};
301
302struct getdents32_callback {
303 struct linux32_dirent __user * current_dir;
304 struct linux32_dirent __user * previous;
305 int count;
306 int error;
307};
308
309struct readdir32_callback {
310 struct old_linux32_dirent __user * dirent;
311 int count;
312};
313
314#define NAME_OFFSET(de) ((int) ((de)->d_name - (char __user *) (de)))
315static int filldir32 (void *__buf, const char *name, int namlen,
316 loff_t offset, u64 ino, unsigned int d_type)
317{
318 struct linux32_dirent __user * dirent;
319 struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
320 int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, 4);
321 u32 d_ino;
322
323 buf->error = -EINVAL; /* only used if we fail.. */
324 if (reclen > buf->count)
325 return -EINVAL;
326 d_ino = ino;
327 if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
328 return -EOVERFLOW;
329 dirent = buf->previous;
330 if (dirent)
331 put_user(offset, &dirent->d_off);
332 dirent = buf->current_dir;
333 buf->previous = dirent;
334 put_user(d_ino, &dirent->d_ino);
335 put_user(reclen, &dirent->d_reclen);
336 copy_to_user(dirent->d_name, name, namlen);
337 put_user(0, dirent->d_name + namlen);
338 dirent = ((void __user *)dirent) + reclen;
339 buf->current_dir = dirent;
340 buf->count -= reclen;
341 return 0;
342}
343
344asmlinkage long
345sys32_getdents (unsigned int fd, void __user * dirent, unsigned int count)
346{
347 struct file * file;
348 struct linux32_dirent __user * lastdirent;
349 struct getdents32_callback buf;
350 int error;
351
352 error = -EFAULT;
353 if (!access_ok(VERIFY_WRITE, dirent, count))
354 goto out;
355
356 error = -EBADF;
357 file = fget(fd);
358 if (!file)
359 goto out;
360
361 buf.current_dir = (struct linux32_dirent __user *) dirent;
362 buf.previous = NULL;
363 buf.count = count;
364 buf.error = 0;
365
366 error = vfs_readdir(file, filldir32, &buf);
367 if (error < 0)
368 goto out_putf;
369 error = buf.error;
370 lastdirent = buf.previous;
371 if (lastdirent) {
372 if (put_user(file->f_pos, &lastdirent->d_off))
373 error = -EFAULT;
374 else
375 error = count - buf.count;
376 }
377
378out_putf:
379 fput(file);
380out:
381 return error;
382}
383
384static int fillonedir32(void * __buf, const char * name, int namlen,
385 loff_t offset, u64 ino, unsigned int d_type)
386{
387 struct readdir32_callback * buf = (struct readdir32_callback *) __buf;
388 struct old_linux32_dirent __user * dirent;
389 u32 d_ino;
390
391 if (buf->count)
392 return -EINVAL;
393 d_ino = ino;
394 if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)
395 return -EOVERFLOW;
396 buf->count++;
397 dirent = buf->dirent;
398 put_user(d_ino, &dirent->d_ino);
399 put_user(offset, &dirent->d_offset);
400 put_user(namlen, &dirent->d_namlen);
401 copy_to_user(dirent->d_name, name, namlen);
402 put_user(0, dirent->d_name + namlen);
403 return 0;
404}
405
406asmlinkage long
407sys32_readdir (unsigned int fd, void __user * dirent, unsigned int count)
408{
409 int error;
410 struct file * file;
411 struct readdir32_callback buf;
412
413 error = -EBADF;
414 file = fget(fd);
415 if (!file)
416 goto out;
417
418 buf.count = 0;
419 buf.dirent = dirent;
420
421 error = vfs_readdir(file, fillonedir32, &buf);
422 if (error >= 0)
423 error = buf.count;
424 fput(file);
425out:
426 return error;
427}
428
429/*** copied from mips64 ***/ 288/*** copied from mips64 ***/
430/* 289/*
431 * Ooo, nasty. We need here to frob 32-bit unsigned longs to 290 * Ooo, nasty. We need here to frob 32-bit unsigned longs to
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 627f3c28ad8c..2540786a970f 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -222,9 +222,7 @@
222 ENTRY_SAME(setfsgid) 222 ENTRY_SAME(setfsgid)
223 /* I think this might work */ 223 /* I think this might work */
224 ENTRY_SAME(llseek) /* 140 */ 224 ENTRY_SAME(llseek) /* 140 */
225 /* struct linux_dirent has longs, like 'unsigned long d_ino' which 225 ENTRY_COMP(getdents)
226 * almost definitely should be 'ino_t d_ino' but it's too late now */
227 ENTRY_DIFF(getdents)
228 /* it is POSSIBLE that select will be OK because even though fd_set 226 /* it is POSSIBLE that select will be OK because even though fd_set
229 * contains longs, the macros and sizes are clever. */ 227 * contains longs, the macros and sizes are clever. */
230 ENTRY_COMP(select) 228 ENTRY_COMP(select)
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index d4e6a93c8d9a..ee7a16eb6fdd 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -81,6 +81,8 @@ SECTIONS
81 __ex_table : { *(__ex_table) } 81 __ex_table : { *(__ex_table) }
82 __stop___ex_table = .; 82 __stop___ex_table = .;
83 83
84 NOTES
85
84 __start___unwind = .; /* unwind info */ 86 __start___unwind = .; /* unwind info */
85 .PARISC.unwind : { *(.PARISC.unwind) } 87 .PARISC.unwind : { *(.PARISC.unwind) }
86 __stop___unwind = .; 88 __stop___unwind = .;
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig
index d9ac24e8de16..8b47c846421c 100644
--- a/arch/powerpc/configs/cell_defconfig
+++ b/arch/powerpc/configs/cell_defconfig
@@ -1,9 +1,23 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.22-rc6 3# Linux kernel version: 2.6.23-rc3
4# Tue Jun 26 12:32:34 2007 4# Wed Aug 22 15:19:19 2007
5# 5#
6CONFIG_PPC64=y 6CONFIG_PPC64=y
7
8#
9# Processor support
10#
11# CONFIG_POWER4_ONLY is not set
12CONFIG_POWER3=y
13CONFIG_POWER4=y
14CONFIG_PPC_FPU=y
15CONFIG_ALTIVEC=y
16CONFIG_PPC_STD_MMU=y
17CONFIG_PPC_MM_SLICES=y
18CONFIG_VIRT_CPU_ACCOUNTING=y
19CONFIG_SMP=y
20CONFIG_NR_CPUS=4
7CONFIG_64BIT=y 21CONFIG_64BIT=y
8CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
9CONFIG_MMU=y 23CONFIG_MMU=y
@@ -15,6 +29,7 @@ CONFIG_ARCH_HAS_ILOG2_U64=y
15CONFIG_GENERIC_HWEIGHT=y 29CONFIG_GENERIC_HWEIGHT=y
16CONFIG_GENERIC_CALIBRATE_DELAY=y 30CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_GENERIC_FIND_NEXT_BIT=y 31CONFIG_GENERIC_FIND_NEXT_BIT=y
32CONFIG_ARCH_NO_VIRT_TO_BUS=y
18CONFIG_PPC=y 33CONFIG_PPC=y
19CONFIG_EARLY_PRINTK=y 34CONFIG_EARLY_PRINTK=y
20CONFIG_COMPAT=y 35CONFIG_COMPAT=y
@@ -22,51 +37,33 @@ CONFIG_SYSVIPC_COMPAT=y
22CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 37CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
23CONFIG_ARCH_MAY_HAVE_PC_FDC=y 38CONFIG_ARCH_MAY_HAVE_PC_FDC=y
24CONFIG_PPC_OF=y 39CONFIG_PPC_OF=y
40CONFIG_OF=y
25CONFIG_PPC_UDBG_16550=y 41CONFIG_PPC_UDBG_16550=y
26# CONFIG_GENERIC_TBSYNC is not set 42# CONFIG_GENERIC_TBSYNC is not set
27CONFIG_AUDIT_ARCH=y 43CONFIG_AUDIT_ARCH=y
28CONFIG_GENERIC_BUG=y 44CONFIG_GENERIC_BUG=y
29# CONFIG_DEFAULT_UIMAGE is not set 45# CONFIG_DEFAULT_UIMAGE is not set
30
31#
32# Processor support
33#
34# CONFIG_POWER4_ONLY is not set
35CONFIG_POWER3=y
36CONFIG_POWER4=y
37CONFIG_PPC_FPU=y
38# CONFIG_PPC_DCR_NATIVE is not set 46# CONFIG_PPC_DCR_NATIVE is not set
39CONFIG_PPC_DCR_MMIO=y 47CONFIG_PPC_DCR_MMIO=y
40CONFIG_PPC_DCR=y 48CONFIG_PPC_DCR=y
41CONFIG_PPC_OF_PLATFORM_PCI=y 49CONFIG_PPC_OF_PLATFORM_PCI=y
42CONFIG_ALTIVEC=y
43CONFIG_PPC_STD_MMU=y
44CONFIG_PPC_MM_SLICES=y
45CONFIG_VIRT_CPU_ACCOUNTING=y
46CONFIG_SMP=y
47CONFIG_NR_CPUS=4
48CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 50CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
49 51
50# 52#
51# Code maturity level options 53# General setup
52# 54#
53CONFIG_EXPERIMENTAL=y 55CONFIG_EXPERIMENTAL=y
54CONFIG_LOCK_KERNEL=y 56CONFIG_LOCK_KERNEL=y
55CONFIG_INIT_ENV_ARG_LIMIT=32 57CONFIG_INIT_ENV_ARG_LIMIT=32
56
57#
58# General setup
59#
60CONFIG_LOCALVERSION="" 58CONFIG_LOCALVERSION=""
61CONFIG_LOCALVERSION_AUTO=y 59CONFIG_LOCALVERSION_AUTO=y
62CONFIG_SWAP=y 60CONFIG_SWAP=y
63CONFIG_SYSVIPC=y 61CONFIG_SYSVIPC=y
64# CONFIG_IPC_NS is not set
65CONFIG_SYSVIPC_SYSCTL=y 62CONFIG_SYSVIPC_SYSCTL=y
66# CONFIG_POSIX_MQUEUE is not set 63# CONFIG_POSIX_MQUEUE is not set
67# CONFIG_BSD_PROCESS_ACCT is not set 64# CONFIG_BSD_PROCESS_ACCT is not set
68# CONFIG_TASKSTATS is not set 65# CONFIG_TASKSTATS is not set
69# CONFIG_UTS_NS is not set 66# CONFIG_USER_NS is not set
70# CONFIG_AUDIT is not set 67# CONFIG_AUDIT is not set
71CONFIG_IKCONFIG=y 68CONFIG_IKCONFIG=y
72CONFIG_IKCONFIG_PROC=y 69CONFIG_IKCONFIG_PROC=y
@@ -96,16 +93,13 @@ CONFIG_TIMERFD=y
96CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
97CONFIG_SHMEM=y 94CONFIG_SHMEM=y
98CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
99CONFIG_SLAB=y 96CONFIG_SLUB_DEBUG=y
100# CONFIG_SLUB is not set 97# CONFIG_SLAB is not set
98CONFIG_SLUB=y
101# CONFIG_SLOB is not set 99# CONFIG_SLOB is not set
102CONFIG_RT_MUTEXES=y 100CONFIG_RT_MUTEXES=y
103# CONFIG_TINY_SHMEM is not set 101# CONFIG_TINY_SHMEM is not set
104CONFIG_BASE_SMALL=0 102CONFIG_BASE_SMALL=0
105
106#
107# Loadable module support
108#
109CONFIG_MODULES=y 103CONFIG_MODULES=y
110CONFIG_MODULE_UNLOAD=y 104CONFIG_MODULE_UNLOAD=y
111# CONFIG_MODULE_FORCE_UNLOAD is not set 105# CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -113,12 +107,9 @@ CONFIG_MODULE_UNLOAD=y
113# CONFIG_MODULE_SRCVERSION_ALL is not set 107# CONFIG_MODULE_SRCVERSION_ALL is not set
114CONFIG_KMOD=y 108CONFIG_KMOD=y
115CONFIG_STOP_MACHINE=y 109CONFIG_STOP_MACHINE=y
116
117#
118# Block layer
119#
120CONFIG_BLOCK=y 110CONFIG_BLOCK=y
121# CONFIG_BLK_DEV_IO_TRACE is not set 111# CONFIG_BLK_DEV_IO_TRACE is not set
112# CONFIG_BLK_DEV_BSG is not set
122 113
123# 114#
124# IO Schedulers 115# IO Schedulers
@@ -138,7 +129,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
138# 129#
139CONFIG_PPC_MULTIPLATFORM=y 130CONFIG_PPC_MULTIPLATFORM=y
140# CONFIG_EMBEDDED6xx is not set 131# CONFIG_EMBEDDED6xx is not set
141# CONFIG_APUS is not set 132# CONFIG_PPC_82xx is not set
133# CONFIG_PPC_83xx is not set
134# CONFIG_PPC_86xx is not set
142# CONFIG_PPC_PSERIES is not set 135# CONFIG_PPC_PSERIES is not set
143# CONFIG_PPC_ISERIES is not set 136# CONFIG_PPC_ISERIES is not set
144# CONFIG_PPC_MPC52xx is not set 137# CONFIG_PPC_MPC52xx is not set
@@ -158,7 +151,11 @@ CONFIG_PS3_HTAB_SIZE=20
158CONFIG_PS3_USE_LPAR_ADDR=y 151CONFIG_PS3_USE_LPAR_ADDR=y
159CONFIG_PS3_VUART=y 152CONFIG_PS3_VUART=y
160CONFIG_PS3_PS3AV=y 153CONFIG_PS3_PS3AV=y
161CONFIG_PS3_SYS_MANAGER=y 154CONFIG_PS3_SYS_MANAGER=m
155CONFIG_PS3_STORAGE=y
156CONFIG_PS3_DISK=y
157CONFIG_PS3_ROM=m
158CONFIG_PS3_FLASH=m
162CONFIG_PPC_CELL=y 159CONFIG_PPC_CELL=y
163CONFIG_PPC_CELL_NATIVE=y 160CONFIG_PPC_CELL_NATIVE=y
164CONFIG_PPC_IBM_CELL_BLADE=y 161CONFIG_PPC_IBM_CELL_BLADE=y
@@ -171,6 +168,7 @@ CONFIG_SPU_BASE=y
171CONFIG_CBE_RAS=y 168CONFIG_CBE_RAS=y
172CONFIG_CBE_THERM=m 169CONFIG_CBE_THERM=m
173CONFIG_CBE_CPUFREQ=m 170CONFIG_CBE_CPUFREQ=m
171CONFIG_CBE_CPUFREQ_PMI=m
174# CONFIG_PQ2ADS is not set 172# CONFIG_PQ2ADS is not set
175CONFIG_PPC_NATIVE=y 173CONFIG_PPC_NATIVE=y
176CONFIG_UDBG_RTAS_CONSOLE=y 174CONFIG_UDBG_RTAS_CONSOLE=y
@@ -183,7 +181,7 @@ CONFIG_PPC_RTAS=y
183# CONFIG_RTAS_ERROR_LOGGING is not set 181# CONFIG_RTAS_ERROR_LOGGING is not set
184CONFIG_RTAS_PROC=y 182CONFIG_RTAS_PROC=y
185CONFIG_RTAS_FLASH=y 183CONFIG_RTAS_FLASH=y
186# CONFIG_PPC_PMI is not set 184CONFIG_PPC_PMI=m
187CONFIG_MMIO_NVRAM=y 185CONFIG_MMIO_NVRAM=y
188# CONFIG_PPC_MPC106 is not set 186# CONFIG_PPC_MPC106 is not set
189# CONFIG_PPC_970_NAP is not set 187# CONFIG_PPC_970_NAP is not set
@@ -206,6 +204,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
206# CPU Frequency drivers 204# CPU Frequency drivers
207# 205#
208# CONFIG_CPM2 is not set 206# CONFIG_CPM2 is not set
207CONFIG_AXON_RAM=m
208# CONFIG_FSL_ULI1575 is not set
209 209
210# 210#
211# Kernel options 211# Kernel options
@@ -248,6 +248,7 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
248CONFIG_MIGRATION=y 248CONFIG_MIGRATION=y
249CONFIG_RESOURCES_64BIT=y 249CONFIG_RESOURCES_64BIT=y
250CONFIG_ZONE_DMA_FLAG=1 250CONFIG_ZONE_DMA_FLAG=1
251CONFIG_BOUNCE=y
251CONFIG_ARCH_MEMORY_PROBE=y 252CONFIG_ARCH_MEMORY_PROBE=y
252CONFIG_NODES_SPAN_OTHER_NODES=y 253CONFIG_NODES_SPAN_OTHER_NODES=y
253CONFIG_PPC_HAS_HASH_64K=y 254CONFIG_PPC_HAS_HASH_64K=y
@@ -268,7 +269,9 @@ CONFIG_GENERIC_ISA_DMA=y
268# CONFIG_PPC_INDIRECT_PCI is not set 269# CONFIG_PPC_INDIRECT_PCI is not set
269CONFIG_PCI=y 270CONFIG_PCI=y
270CONFIG_PCI_DOMAINS=y 271CONFIG_PCI_DOMAINS=y
272CONFIG_PCI_SYSCALL=y
271CONFIG_PCIEPORTBUS=y 273CONFIG_PCIEPORTBUS=y
274CONFIG_PCIEAER=y
272CONFIG_ARCH_SUPPORTS_MSI=y 275CONFIG_ARCH_SUPPORTS_MSI=y
273# CONFIG_PCI_MSI is not set 276# CONFIG_PCI_MSI is not set
274# CONFIG_PCI_DEBUG is not set 277# CONFIG_PCI_DEBUG is not set
@@ -359,6 +362,7 @@ CONFIG_NETFILTER_XT_TARGET_DSCP=m
359CONFIG_NETFILTER_XT_TARGET_MARK=m 362CONFIG_NETFILTER_XT_TARGET_MARK=m
360CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m 363CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
361CONFIG_NETFILTER_XT_TARGET_NFLOG=m 364CONFIG_NETFILTER_XT_TARGET_NFLOG=m
365# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
362CONFIG_NETFILTER_XT_TARGET_TCPMSS=m 366CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
363CONFIG_NETFILTER_XT_MATCH_COMMENT=m 367CONFIG_NETFILTER_XT_MATCH_COMMENT=m
364CONFIG_NETFILTER_XT_MATCH_DCCP=m 368CONFIG_NETFILTER_XT_MATCH_DCCP=m
@@ -377,6 +381,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m
377CONFIG_NETFILTER_XT_MATCH_STATISTIC=m 381CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
378CONFIG_NETFILTER_XT_MATCH_STRING=m 382CONFIG_NETFILTER_XT_MATCH_STRING=m
379CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 383CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
384CONFIG_NETFILTER_XT_MATCH_U32=m
380CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m 385CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
381 386
382# 387#
@@ -448,6 +453,7 @@ CONFIG_NET_CLS_ROUTE=y
448# CONFIG_MAC80211 is not set 453# CONFIG_MAC80211 is not set
449# CONFIG_IEEE80211 is not set 454# CONFIG_IEEE80211 is not set
450# CONFIG_RFKILL is not set 455# CONFIG_RFKILL is not set
456# CONFIG_NET_9P is not set
451 457
452# 458#
453# Device Drivers 459# Device Drivers
@@ -462,28 +468,12 @@ CONFIG_FW_LOADER=y
462# CONFIG_DEBUG_DRIVER is not set 468# CONFIG_DEBUG_DRIVER is not set
463# CONFIG_DEBUG_DEVRES is not set 469# CONFIG_DEBUG_DEVRES is not set
464# CONFIG_SYS_HYPERVISOR is not set 470# CONFIG_SYS_HYPERVISOR is not set
465
466#
467# Connector - unified userspace <-> kernelspace linker
468#
469# CONFIG_CONNECTOR is not set 471# CONFIG_CONNECTOR is not set
470# CONFIG_MTD is not set 472# CONFIG_MTD is not set
471 473CONFIG_OF_DEVICE=y
472#
473# Parallel port support
474#
475# CONFIG_PARPORT is not set 474# CONFIG_PARPORT is not set
476 475CONFIG_BLK_DEV=y
477#
478# Plug and Play support
479#
480# CONFIG_PNPACPI is not set
481
482#
483# Block devices
484#
485# CONFIG_BLK_DEV_FD is not set 476# CONFIG_BLK_DEV_FD is not set
486# CONFIG_BLK_CPQ_DA is not set
487# CONFIG_BLK_CPQ_CISS_DA is not set 477# CONFIG_BLK_CPQ_CISS_DA is not set
488# CONFIG_BLK_DEV_DAC960 is not set 478# CONFIG_BLK_DEV_DAC960 is not set
489# CONFIG_BLK_DEV_UMEM is not set 479# CONFIG_BLK_DEV_UMEM is not set
@@ -499,14 +489,11 @@ CONFIG_BLK_DEV_RAM_SIZE=131072
499CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 489CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
500# CONFIG_CDROM_PKTCDVD is not set 490# CONFIG_CDROM_PKTCDVD is not set
501# CONFIG_ATA_OVER_ETH is not set 491# CONFIG_ATA_OVER_ETH is not set
502 492CONFIG_MISC_DEVICES=y
503#
504# Misc devices
505#
506# CONFIG_PHANTOM is not set 493# CONFIG_PHANTOM is not set
494# CONFIG_EEPROM_93CX6 is not set
507# CONFIG_SGI_IOC4 is not set 495# CONFIG_SGI_IOC4 is not set
508# CONFIG_TIFM_CORE is not set 496# CONFIG_TIFM_CORE is not set
509# CONFIG_BLINK is not set
510CONFIG_IDE=y 497CONFIG_IDE=y
511CONFIG_BLK_DEV_IDE=y 498CONFIG_BLK_DEV_IDE=y
512 499
@@ -572,6 +559,7 @@ CONFIG_BLK_DEV_IDEDMA=y
572# 559#
573# CONFIG_RAID_ATTRS is not set 560# CONFIG_RAID_ATTRS is not set
574CONFIG_SCSI=y 561CONFIG_SCSI=y
562CONFIG_SCSI_DMA=y
575# CONFIG_SCSI_TGT is not set 563# CONFIG_SCSI_TGT is not set
576# CONFIG_SCSI_NETLINK is not set 564# CONFIG_SCSI_NETLINK is not set
577CONFIG_SCSI_PROC_FS=y 565CONFIG_SCSI_PROC_FS=y
@@ -604,10 +592,7 @@ CONFIG_SCSI_WAIT_SCAN=m
604# CONFIG_SCSI_ISCSI_ATTRS is not set 592# CONFIG_SCSI_ISCSI_ATTRS is not set
605CONFIG_SCSI_SAS_ATTRS=y 593CONFIG_SCSI_SAS_ATTRS=y
606# CONFIG_SCSI_SAS_LIBSAS is not set 594# CONFIG_SCSI_SAS_LIBSAS is not set
607 595CONFIG_SCSI_LOWLEVEL=y
608#
609# SCSI low-level drivers
610#
611# CONFIG_ISCSI_TCP is not set 596# CONFIG_ISCSI_TCP is not set
612# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 597# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
613# CONFIG_SCSI_3W_9XXX is not set 598# CONFIG_SCSI_3W_9XXX is not set
@@ -622,7 +607,6 @@ CONFIG_SCSI_SAS_ATTRS=y
622# CONFIG_MEGARAID_LEGACY is not set 607# CONFIG_MEGARAID_LEGACY is not set
623# CONFIG_MEGARAID_SAS is not set 608# CONFIG_MEGARAID_SAS is not set
624# CONFIG_SCSI_HPTIOP is not set 609# CONFIG_SCSI_HPTIOP is not set
625# CONFIG_SCSI_BUSLOGIC is not set
626# CONFIG_SCSI_DMX3191D is not set 610# CONFIG_SCSI_DMX3191D is not set
627# CONFIG_SCSI_EATA is not set 611# CONFIG_SCSI_EATA is not set
628# CONFIG_SCSI_FUTURE_DOMAIN is not set 612# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -696,10 +680,6 @@ CONFIG_PATA_PDC2027X=m
696# CONFIG_PATA_VIA is not set 680# CONFIG_PATA_VIA is not set
697# CONFIG_PATA_WINBOND is not set 681# CONFIG_PATA_WINBOND is not set
698# CONFIG_PATA_SCC is not set 682# CONFIG_PATA_SCC is not set
699
700#
701# Multi-device support (RAID and LVM)
702#
703CONFIG_MD=y 683CONFIG_MD=y
704CONFIG_BLK_DEV_MD=m 684CONFIG_BLK_DEV_MD=m
705CONFIG_MD_LINEAR=m 685CONFIG_MD_LINEAR=m
@@ -717,6 +697,7 @@ CONFIG_DM_MIRROR=m
717CONFIG_DM_ZERO=m 697CONFIG_DM_ZERO=m
718CONFIG_DM_MULTIPATH=m 698CONFIG_DM_MULTIPATH=m
719# CONFIG_DM_MULTIPATH_EMC is not set 699# CONFIG_DM_MULTIPATH_EMC is not set
700# CONFIG_DM_MULTIPATH_RDAC is not set
720# CONFIG_DM_DELAY is not set 701# CONFIG_DM_DELAY is not set
721 702
722# 703#
@@ -728,43 +709,30 @@ CONFIG_FUSION=y
728CONFIG_FUSION_SAS=y 709CONFIG_FUSION_SAS=y
729CONFIG_FUSION_MAX_SGE=128 710CONFIG_FUSION_MAX_SGE=128
730# CONFIG_FUSION_CTL is not set 711# CONFIG_FUSION_CTL is not set
712# CONFIG_FUSION_LOGGING is not set
731 713
732# 714#
733# IEEE 1394 (FireWire) support 715# IEEE 1394 (FireWire) support
734# 716#
735# CONFIG_FIREWIRE is not set 717# CONFIG_FIREWIRE is not set
736# CONFIG_IEEE1394 is not set 718# CONFIG_IEEE1394 is not set
737
738#
739# I2O device support
740#
741# CONFIG_I2O is not set 719# CONFIG_I2O is not set
742# CONFIG_MACINTOSH_DRIVERS is not set 720# CONFIG_MACINTOSH_DRIVERS is not set
743
744#
745# Network device support
746#
747CONFIG_NETDEVICES=y 721CONFIG_NETDEVICES=y
722# CONFIG_NETDEVICES_MULTIQUEUE is not set
748# CONFIG_DUMMY is not set 723# CONFIG_DUMMY is not set
749CONFIG_BONDING=m 724CONFIG_BONDING=m
725CONFIG_MACVLAN=m
750# CONFIG_EQUALIZER is not set 726# CONFIG_EQUALIZER is not set
751CONFIG_TUN=y 727CONFIG_TUN=y
752# CONFIG_ARCNET is not set 728# CONFIG_ARCNET is not set
753# CONFIG_PHYLIB is not set 729# CONFIG_PHYLIB is not set
754
755#
756# Ethernet (10 or 100Mbit)
757#
758CONFIG_NET_ETHERNET=y 730CONFIG_NET_ETHERNET=y
759CONFIG_MII=y 731CONFIG_MII=y
760# CONFIG_HAPPYMEAL is not set 732# CONFIG_HAPPYMEAL is not set
761# CONFIG_SUNGEM is not set 733# CONFIG_SUNGEM is not set
762# CONFIG_CASSINI is not set 734# CONFIG_CASSINI is not set
763# CONFIG_NET_VENDOR_3COM is not set 735# CONFIG_NET_VENDOR_3COM is not set
764
765#
766# Tulip family network device support
767#
768# CONFIG_NET_TULIP is not set 736# CONFIG_NET_TULIP is not set
769# CONFIG_HP100 is not set 737# CONFIG_HP100 is not set
770# CONFIG_NET_PCI is not set 738# CONFIG_NET_PCI is not set
@@ -781,11 +749,12 @@ CONFIG_E1000_NAPI=y
781# CONFIG_SIS190 is not set 749# CONFIG_SIS190 is not set
782CONFIG_SKGE=m 750CONFIG_SKGE=m
783CONFIG_SKY2=m 751CONFIG_SKY2=m
784# CONFIG_SK98LIN is not set 752# CONFIG_SKY2_DEBUG is not set
785# CONFIG_VIA_VELOCITY is not set 753# CONFIG_VIA_VELOCITY is not set
786CONFIG_TIGON3=y 754CONFIG_TIGON3=y
787# CONFIG_BNX2 is not set 755# CONFIG_BNX2 is not set
788CONFIG_SPIDER_NET=y 756CONFIG_SPIDER_NET=y
757CONFIG_GELIC_NET=m
789# CONFIG_QLA3XXX is not set 758# CONFIG_QLA3XXX is not set
790# CONFIG_ATL1 is not set 759# CONFIG_ATL1 is not set
791CONFIG_NETDEV_10000=y 760CONFIG_NETDEV_10000=y
@@ -824,15 +793,7 @@ CONFIG_NETDEV_10000=y
824# CONFIG_NETCONSOLE is not set 793# CONFIG_NETCONSOLE is not set
825# CONFIG_NETPOLL is not set 794# CONFIG_NETPOLL is not set
826# CONFIG_NET_POLL_CONTROLLER is not set 795# CONFIG_NET_POLL_CONTROLLER is not set
827
828#
829# ISDN subsystem
830#
831# CONFIG_ISDN is not set 796# CONFIG_ISDN is not set
832
833#
834# Telephony Support
835#
836# CONFIG_PHONE is not set 797# CONFIG_PHONE is not set
837 798
838# 799#
@@ -925,10 +886,6 @@ CONFIG_UNIX98_PTYS=y
925CONFIG_HVC_DRIVER=y 886CONFIG_HVC_DRIVER=y
926CONFIG_HVC_RTAS=y 887CONFIG_HVC_RTAS=y
927CONFIG_HVC_BEAT=y 888CONFIG_HVC_BEAT=y
928
929#
930# IPMI
931#
932CONFIG_IPMI_HANDLER=m 889CONFIG_IPMI_HANDLER=m
933# CONFIG_IPMI_PANIC_EVENT is not set 890# CONFIG_IPMI_PANIC_EVENT is not set
934CONFIG_IPMI_DEVICE_INTERFACE=m 891CONFIG_IPMI_DEVICE_INTERFACE=m
@@ -963,10 +920,6 @@ CONFIG_GEN_RTC=y
963# CONFIG_DRM is not set 920# CONFIG_DRM is not set
964# CONFIG_RAW_DRIVER is not set 921# CONFIG_RAW_DRIVER is not set
965# CONFIG_HANGCHECK_TIMER is not set 922# CONFIG_HANGCHECK_TIMER is not set
966
967#
968# TPM devices
969#
970# CONFIG_TCG_TPM is not set 923# CONFIG_TCG_TPM is not set
971CONFIG_DEVPORT=y 924CONFIG_DEVPORT=y
972CONFIG_I2C=y 925CONFIG_I2C=y
@@ -1000,6 +953,7 @@ CONFIG_I2C_ALGOBIT=y
1000# CONFIG_I2C_SIS5595 is not set 953# CONFIG_I2C_SIS5595 is not set
1001# CONFIG_I2C_SIS630 is not set 954# CONFIG_I2C_SIS630 is not set
1002# CONFIG_I2C_SIS96X is not set 955# CONFIG_I2C_SIS96X is not set
956# CONFIG_I2C_TAOS_EVM is not set
1003# CONFIG_I2C_STUB is not set 957# CONFIG_I2C_STUB is not set
1004# CONFIG_I2C_TINY_USB is not set 958# CONFIG_I2C_TINY_USB is not set
1005# CONFIG_I2C_VIA is not set 959# CONFIG_I2C_VIA is not set
@@ -1011,11 +965,13 @@ CONFIG_I2C_ALGOBIT=y
1011# 965#
1012# CONFIG_SENSORS_DS1337 is not set 966# CONFIG_SENSORS_DS1337 is not set
1013# CONFIG_SENSORS_DS1374 is not set 967# CONFIG_SENSORS_DS1374 is not set
968# CONFIG_DS1682 is not set
1014# CONFIG_SENSORS_EEPROM is not set 969# CONFIG_SENSORS_EEPROM is not set
1015# CONFIG_SENSORS_PCF8574 is not set 970# CONFIG_SENSORS_PCF8574 is not set
1016# CONFIG_SENSORS_PCA9539 is not set 971# CONFIG_SENSORS_PCA9539 is not set
1017# CONFIG_SENSORS_PCF8591 is not set 972# CONFIG_SENSORS_PCF8591 is not set
1018# CONFIG_SENSORS_MAX6875 is not set 973# CONFIG_SENSORS_MAX6875 is not set
974# CONFIG_SENSORS_TSL2550 is not set
1019# CONFIG_I2C_DEBUG_CORE is not set 975# CONFIG_I2C_DEBUG_CORE is not set
1020# CONFIG_I2C_DEBUG_ALGO is not set 976# CONFIG_I2C_DEBUG_ALGO is not set
1021# CONFIG_I2C_DEBUG_BUS is not set 977# CONFIG_I2C_DEBUG_BUS is not set
@@ -1026,11 +982,8 @@ CONFIG_I2C_ALGOBIT=y
1026# 982#
1027# CONFIG_SPI is not set 983# CONFIG_SPI is not set
1028# CONFIG_SPI_MASTER is not set 984# CONFIG_SPI_MASTER is not set
1029
1030#
1031# Dallas's 1-wire bus
1032#
1033# CONFIG_W1 is not set 985# CONFIG_W1 is not set
986# CONFIG_POWER_SUPPLY is not set
1034# CONFIG_HWMON is not set 987# CONFIG_HWMON is not set
1035 988
1036# 989#
@@ -1055,6 +1008,7 @@ CONFIG_I2C_ALGOBIT=y
1055# 1008#
1056# CONFIG_DISPLAY_SUPPORT is not set 1009# CONFIG_DISPLAY_SUPPORT is not set
1057# CONFIG_VGASTATE is not set 1010# CONFIG_VGASTATE is not set
1011CONFIG_VIDEO_OUTPUT_CONTROL=m
1058# CONFIG_FB is not set 1012# CONFIG_FB is not set
1059# CONFIG_FB_IBM_GXT4500 is not set 1013# CONFIG_FB_IBM_GXT4500 is not set
1060 1014
@@ -1068,10 +1022,7 @@ CONFIG_DUMMY_CONSOLE=y
1068# Sound 1022# Sound
1069# 1023#
1070# CONFIG_SOUND is not set 1024# CONFIG_SOUND is not set
1071 1025CONFIG_HID_SUPPORT=y
1072#
1073# HID Devices
1074#
1075CONFIG_HID=m 1026CONFIG_HID=m
1076# CONFIG_HID_DEBUG is not set 1027# CONFIG_HID_DEBUG is not set
1077 1028
@@ -1085,10 +1036,7 @@ CONFIG_HID=m
1085# 1036#
1086# CONFIG_USB_KBD is not set 1037# CONFIG_USB_KBD is not set
1087# CONFIG_USB_MOUSE is not set 1038# CONFIG_USB_MOUSE is not set
1088 1039CONFIG_USB_SUPPORT=y
1089#
1090# USB support
1091#
1092CONFIG_USB_ARCH_HAS_HCD=y 1040CONFIG_USB_ARCH_HAS_HCD=y
1093CONFIG_USB_ARCH_HAS_OHCI=y 1041CONFIG_USB_ARCH_HAS_OHCI=y
1094CONFIG_USB_ARCH_HAS_EHCI=y 1042CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1122,6 +1070,7 @@ CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
1122CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1070CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1123# CONFIG_USB_UHCI_HCD is not set 1071# CONFIG_USB_UHCI_HCD is not set
1124# CONFIG_USB_SL811_HCD is not set 1072# CONFIG_USB_SL811_HCD is not set
1073# CONFIG_USB_R8A66597_HCD is not set
1125 1074
1126# 1075#
1127# USB Device Class drivers 1076# USB Device Class drivers
@@ -1199,23 +1148,7 @@ CONFIG_USB_MON=y
1199# 1148#
1200# CONFIG_USB_GADGET is not set 1149# CONFIG_USB_GADGET is not set
1201# CONFIG_MMC is not set 1150# CONFIG_MMC is not set
1202
1203#
1204# LED devices
1205#
1206# CONFIG_NEW_LEDS is not set 1151# CONFIG_NEW_LEDS is not set
1207
1208#
1209# LED drivers
1210#
1211
1212#
1213# LED Triggers
1214#
1215
1216#
1217# InfiniBand support
1218#
1219CONFIG_INFINIBAND=m 1152CONFIG_INFINIBAND=m
1220CONFIG_INFINIBAND_USER_MAD=m 1153CONFIG_INFINIBAND_USER_MAD=m
1221CONFIG_INFINIBAND_USER_ACCESS=m 1154CONFIG_INFINIBAND_USER_ACCESS=m
@@ -1231,14 +1164,13 @@ CONFIG_INFINIBAND_IPOIB_DEBUG=y
1231CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y 1164CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
1232# CONFIG_INFINIBAND_SRP is not set 1165# CONFIG_INFINIBAND_SRP is not set
1233# CONFIG_INFINIBAND_ISER is not set 1166# CONFIG_INFINIBAND_ISER is not set
1167CONFIG_EDAC=y
1234 1168
1235# 1169#
1236# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) 1170# Reporting subsystems
1237#
1238
1239#
1240# Real Time Clock
1241# 1171#
1172# CONFIG_EDAC_DEBUG is not set
1173CONFIG_EDAC_MM_EDAC=y
1242# CONFIG_RTC_CLASS is not set 1174# CONFIG_RTC_CLASS is not set
1243 1175
1244# 1176#
@@ -1255,6 +1187,12 @@ CONFIG_INFINIBAND_IPOIB_DEBUG_DATA=y
1255# 1187#
1256 1188
1257# 1189#
1190# Userspace I/O
1191#
1192CONFIG_UIO=m
1193# CONFIG_UIO_CIF is not set
1194
1195#
1258# File systems 1196# File systems
1259# 1197#
1260CONFIG_EXT2_FS=y 1198CONFIG_EXT2_FS=y
@@ -1357,7 +1295,6 @@ CONFIG_SUNRPC=y
1357# CONFIG_NCP_FS is not set 1295# CONFIG_NCP_FS is not set
1358# CONFIG_CODA_FS is not set 1296# CONFIG_CODA_FS is not set
1359# CONFIG_AFS_FS is not set 1297# CONFIG_AFS_FS is not set
1360# CONFIG_9P_FS is not set
1361 1298
1362# 1299#
1363# Partition Types 1300# Partition Types
@@ -1439,6 +1376,7 @@ CONFIG_BITREVERSE=y
1439# CONFIG_CRC16 is not set 1376# CONFIG_CRC16 is not set
1440# CONFIG_CRC_ITU_T is not set 1377# CONFIG_CRC_ITU_T is not set
1441CONFIG_CRC32=y 1378CONFIG_CRC32=y
1379# CONFIG_CRC7 is not set
1442# CONFIG_LIBCRC32C is not set 1380# CONFIG_LIBCRC32C is not set
1443CONFIG_ZLIB_INFLATE=m 1381CONFIG_ZLIB_INFLATE=m
1444CONFIG_ZLIB_DEFLATE=m 1382CONFIG_ZLIB_DEFLATE=m
@@ -1471,9 +1409,10 @@ CONFIG_DEBUG_FS=y
1471CONFIG_DEBUG_KERNEL=y 1409CONFIG_DEBUG_KERNEL=y
1472# CONFIG_DEBUG_SHIRQ is not set 1410# CONFIG_DEBUG_SHIRQ is not set
1473# CONFIG_DETECT_SOFTLOCKUP is not set 1411# CONFIG_DETECT_SOFTLOCKUP is not set
1412CONFIG_SCHED_DEBUG=y
1474# CONFIG_SCHEDSTATS is not set 1413# CONFIG_SCHEDSTATS is not set
1475# CONFIG_TIMER_STATS is not set 1414# CONFIG_TIMER_STATS is not set
1476# CONFIG_DEBUG_SLAB is not set 1415# CONFIG_SLUB_DEBUG_ON is not set
1477# CONFIG_DEBUG_RT_MUTEXES is not set 1416# CONFIG_DEBUG_RT_MUTEXES is not set
1478# CONFIG_RT_MUTEX_TESTER is not set 1417# CONFIG_RT_MUTEX_TESTER is not set
1479# CONFIG_DEBUG_SPINLOCK is not set 1418# CONFIG_DEBUG_SPINLOCK is not set
@@ -1504,10 +1443,6 @@ CONFIG_IRQSTACKS=y
1504# 1443#
1505# CONFIG_KEYS is not set 1444# CONFIG_KEYS is not set
1506# CONFIG_SECURITY is not set 1445# CONFIG_SECURITY is not set
1507
1508#
1509# Cryptographic options
1510#
1511CONFIG_CRYPTO=y 1446CONFIG_CRYPTO=y
1512CONFIG_CRYPTO_ALGAPI=y 1447CONFIG_CRYPTO_ALGAPI=y
1513CONFIG_CRYPTO_BLKCIPHER=m 1448CONFIG_CRYPTO_BLKCIPHER=m
@@ -1546,7 +1481,4 @@ CONFIG_CRYPTO_DEFLATE=m
1546# CONFIG_CRYPTO_CRC32C is not set 1481# CONFIG_CRYPTO_CRC32C is not set
1547# CONFIG_CRYPTO_CAMELLIA is not set 1482# CONFIG_CRYPTO_CAMELLIA is not set
1548# CONFIG_CRYPTO_TEST is not set 1483# CONFIG_CRYPTO_TEST is not set
1549 1484CONFIG_CRYPTO_HW=y
1550#
1551# Hardware crypto devices
1552#
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index a73d2d700973..ff1811ac6c81 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -74,6 +74,22 @@ static inline void slb_shadow_clear(unsigned long entry)
74 get_slb_shadow()->save_area[entry].esid = 0; 74 get_slb_shadow()->save_area[entry].esid = 0;
75} 75}
76 76
77static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
78 unsigned long entry)
79{
80 /*
81 * Updating the shadow buffer before writing the SLB ensures
82 * we don't get a stale entry here if we get preempted by PHYP
83 * between these two statements.
84 */
85 slb_shadow_update(ea, flags, entry);
86
87 asm volatile("slbmte %0,%1" :
88 : "r" (mk_vsid_data(ea, flags)),
89 "r" (mk_esid_data(ea, entry))
90 : "memory" );
91}
92
77void slb_flush_and_rebolt(void) 93void slb_flush_and_rebolt(void)
78{ 94{
79 /* If you change this make sure you change SLB_NUM_BOLTED 95 /* If you change this make sure you change SLB_NUM_BOLTED
@@ -226,12 +242,16 @@ void slb_initialize(void)
226 vflags = SLB_VSID_KERNEL | vmalloc_llp; 242 vflags = SLB_VSID_KERNEL | vmalloc_llp;
227 243
228 /* Invalidate the entire SLB (even slot 0) & all the ERATS */ 244 /* Invalidate the entire SLB (even slot 0) & all the ERATS */
229 slb_shadow_update(PAGE_OFFSET, lflags, 0); 245 asm volatile("isync":::"memory");
230 asm volatile("isync; slbia; sync; slbmte %0,%1; isync" :: 246 asm volatile("slbmte %0,%0"::"r" (0) : "memory");
231 "r" (get_slb_shadow()->save_area[0].vsid), 247 asm volatile("isync; slbia; isync":::"memory");
232 "r" (get_slb_shadow()->save_area[0].esid) : "memory"); 248 create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
233 249
234 slb_shadow_update(VMALLOC_START, vflags, 1); 250 create_shadowed_slbe(VMALLOC_START, vflags, 1);
235 251
236 slb_flush_and_rebolt(); 252 /* We don't bolt the stack for the time being - we're in boot,
253 * so the stack is in the bolted segment. By the time it goes
254 * elsewhere, we'll call _switch() which will bolt in the new
255 * one. */
256 asm volatile("isync":::"memory");
237} 257}
diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h
index 17d597144877..b24025f2ac7a 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.h
+++ b/arch/powerpc/platforms/cell/cbe_regs.h
@@ -113,10 +113,14 @@ struct cbe_pmd_regs {
113 u64 checkstop_fir; /* 0x0c00 */ 113 u64 checkstop_fir; /* 0x0c00 */
114 u64 recoverable_fir; /* 0x0c08 */ 114 u64 recoverable_fir; /* 0x0c08 */
115 u64 spec_att_mchk_fir; /* 0x0c10 */ 115 u64 spec_att_mchk_fir; /* 0x0c10 */
116 u64 fir_mode_reg; /* 0x0c18 */ 116 u32 fir_mode_reg; /* 0x0c18 */
117 u8 pad_0x0c1c_0x0c20 [4]; /* 0x0c1c */
118#define CBE_PMD_FIR_MODE_M8 0x00800
117 u64 fir_enable_mask; /* 0x0c20 */ 119 u64 fir_enable_mask; /* 0x0c20 */
118 120
119 u8 pad_0x0c28_0x1000 [0x1000 - 0x0c28]; /* 0x0c28 */ 121 u8 pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28]; /* 0x0c28 */
122 u64 ras_esc_0; /* 0x0ca8 */
123 u8 pad_0x0cb0_0x1000 [0x1000 - 0x0cb0]; /* 0x0cb0 */
120}; 124};
121 125
122extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np); 126extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index e4132f8f51b3..fb5eda48467d 100644
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -88,17 +88,13 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
88/* returns the value for a given spu in a given register */ 88/* returns the value for a given spu in a given register */
89static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg) 89static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iomem *reg)
90{ 90{
91 const unsigned int *id;
92 union spe_reg value; 91 union spe_reg value;
93 struct spu *spu; 92 struct spu *spu;
94 93
95 /* getting the id from the reg attribute will not work on future device-tree layouts
96 * in future we should store the id to the spu struct and use it here */
97 spu = container_of(sysdev, struct spu, sysdev); 94 spu = container_of(sysdev, struct spu, sysdev);
98 id = of_get_property(spu_devnode(spu), "reg", NULL);
99 value.val = in_be64(&reg->val); 95 value.val = in_be64(&reg->val);
100 96
101 return value.spe[*id]; 97 return value.spe[spu->spe_id];
102} 98}
103 99
104static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf) 100static ssize_t spu_show_temp(struct sys_device *sysdev, char *buf)
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 812bf563ed65..4ede22d363fa 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -38,6 +38,8 @@
38#include "pervasive.h" 38#include "pervasive.h"
39#include "cbe_regs.h" 39#include "cbe_regs.h"
40 40
41static int sysreset_hack;
42
41static void cbe_power_save(void) 43static void cbe_power_save(void)
42{ 44{
43 unsigned long ctrl, thread_switch_control; 45 unsigned long ctrl, thread_switch_control;
@@ -85,6 +87,9 @@ static void cbe_power_save(void)
85 87
86static int cbe_system_reset_exception(struct pt_regs *regs) 88static int cbe_system_reset_exception(struct pt_regs *regs)
87{ 89{
90 int cpu;
91 struct cbe_pmd_regs __iomem *pmd;
92
88 switch (regs->msr & SRR1_WAKEMASK) { 93 switch (regs->msr & SRR1_WAKEMASK) {
89 case SRR1_WAKEEE: 94 case SRR1_WAKEEE:
90 do_IRQ(regs); 95 do_IRQ(regs);
@@ -93,6 +98,18 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
93 timer_interrupt(regs); 98 timer_interrupt(regs);
94 break; 99 break;
95 case SRR1_WAKEMT: 100 case SRR1_WAKEMT:
101 /*
102 * The BMC can inject user triggered system reset exceptions,
103 * but cannot set the system reset reason in srr1,
104 * so check an extra register here.
105 */
106 if (sysreset_hack && (cpu = smp_processor_id()) == 0) {
107 pmd = cbe_get_cpu_pmd_regs(cpu);
108 if (in_be64(&pmd->ras_esc_0) & 0xffff) {
109 out_be64(&pmd->ras_esc_0, 0);
110 return 0;
111 }
112 }
96 break; 113 break;
97#ifdef CONFIG_CBE_RAS 114#ifdef CONFIG_CBE_RAS
98 case SRR1_WAKESYSERR: 115 case SRR1_WAKESYSERR:
@@ -113,9 +130,12 @@ static int cbe_system_reset_exception(struct pt_regs *regs)
113void __init cbe_pervasive_init(void) 130void __init cbe_pervasive_init(void)
114{ 131{
115 int cpu; 132 int cpu;
133
116 if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO)) 134 if (!cpu_has_feature(CPU_FTR_PAUSE_ZERO))
117 return; 135 return;
118 136
137 sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
138
119 for_each_possible_cpu(cpu) { 139 for_each_possible_cpu(cpu) {
120 struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu); 140 struct cbe_pmd_regs __iomem *regs = cbe_get_cpu_pmd_regs(cpu);
121 if (!regs) 141 if (!regs)
@@ -124,6 +144,12 @@ void __init cbe_pervasive_init(void)
124 /* Enable Pause(0) control bit */ 144 /* Enable Pause(0) control bit */
125 out_be64(&regs->pmcr, in_be64(&regs->pmcr) | 145 out_be64(&regs->pmcr, in_be64(&regs->pmcr) |
126 CBE_PMD_PAUSE_ZERO_CONTROL); 146 CBE_PMD_PAUSE_ZERO_CONTROL);
147
148 /* Enable JTAG system-reset hack */
149 if (sysreset_hack)
150 out_be32(&regs->fir_mode_reg,
151 in_be32(&regs->fir_mode_reg) |
152 CBE_PMD_FIR_MODE_M8);
127 } 153 }
128 154
129 ppc_md.power_save = cbe_power_save; 155 ppc_md.power_save = cbe_power_save;
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 5eb88346181a..7c0668a9dcc7 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -48,7 +48,7 @@ static u64 __init find_spu_unit_number(struct device_node *spe)
48{ 48{
49 const unsigned int *prop; 49 const unsigned int *prop;
50 int proplen; 50 int proplen;
51 prop = of_get_property(spe, "unit-id", &proplen); 51 prop = of_get_property(spe, "physical-id", &proplen);
52 if (proplen == 4) 52 if (proplen == 4)
53 return (u64)*prop; 53 return (u64)*prop;
54 54
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index f33b21b9f5d4..9014d55c717b 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -93,7 +93,7 @@ static void iobmap_build(struct iommu_table *tbl, long index,
93 93
94 pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr); 94 pr_debug("iobmap: build at: %lx, %lx, addr: %lx\n", index, npages, uaddr);
95 95
96 bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; 96 bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
97 97
98 ip = ((u32 *)tbl->it_base) + index; 98 ip = ((u32 *)tbl->it_base) + index;
99 99
@@ -118,7 +118,7 @@ static void iobmap_free(struct iommu_table *tbl, long index,
118 118
119 pr_debug("iobmap: free at: %lx, %lx\n", index, npages); 119 pr_debug("iobmap: free at: %lx, %lx\n", index, npages);
120 120
121 bus_addr = (tbl->it_offset + index) << PAGE_SHIFT; 121 bus_addr = (tbl->it_offset + index) << IOBMAP_PAGE_SHIFT;
122 122
123 ip = ((u32 *)tbl->it_base) + index; 123 ip = ((u32 *)tbl->it_base) + index;
124 124
@@ -137,7 +137,7 @@ static void iommu_table_iobmap_setup(void)
137 iommu_table_iobmap.it_busno = 0; 137 iommu_table_iobmap.it_busno = 0;
138 iommu_table_iobmap.it_offset = 0; 138 iommu_table_iobmap.it_offset = 0;
139 /* it_size is in number of entries */ 139 /* it_size is in number of entries */
140 iommu_table_iobmap.it_size = 0x80000000 >> PAGE_SHIFT; 140 iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;
141 141
142 /* Initialize the common IOMMU code */ 142 /* Initialize the common IOMMU code */
143 iommu_table_iobmap.it_base = (unsigned long)iob_l2_base; 143 iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 2326d5dc5752..ab037a3a40db 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -59,8 +59,7 @@
59struct axon_ram_bank { 59struct axon_ram_bank {
60 struct of_device *device; 60 struct of_device *device;
61 struct gendisk *disk; 61 struct gendisk *disk;
62 unsigned int irq_correctable; 62 unsigned int irq_id;
63 unsigned int irq_uncorrectable;
64 unsigned long ph_addr; 63 unsigned long ph_addr;
65 unsigned long io_addr; 64 unsigned long io_addr;
66 unsigned long size; 65 unsigned long size;
@@ -93,16 +92,9 @@ axon_ram_irq_handler(int irq, void *dev)
93 92
94 BUG_ON(!bank); 93 BUG_ON(!bank);
95 94
96 if (irq == bank->irq_correctable) { 95 dev_err(&device->dev, "Correctable memory error occured\n");
97 dev_err(&device->dev, "Correctable memory error occured\n"); 96 bank->ecc_counter++;
98 bank->ecc_counter++; 97 return IRQ_HANDLED;
99 return IRQ_HANDLED;
100 } else if (irq == bank->irq_uncorrectable) {
101 dev_err(&device->dev, "Uncorrectable memory error occured\n");
102 panic("Critical ECC error on %s", device->node->full_name);
103 }
104
105 return IRQ_NONE;
106} 98}
107 99
108/** 100/**
@@ -259,28 +251,18 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
259 blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE); 251 blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
260 add_disk(bank->disk); 252 add_disk(bank->disk);
261 253
262 bank->irq_correctable = irq_of_parse_and_map(device->node, 0); 254 bank->irq_id = irq_of_parse_and_map(device->node, 0);
263 bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1); 255 if (bank->irq_id == NO_IRQ) {
264 if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
265 dev_err(&device->dev, "Cannot access ECC interrupt ID\n"); 256 dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
266 rc = -EFAULT; 257 rc = -EFAULT;
267 goto failed; 258 goto failed;
268 } 259 }
269 260
270 rc = request_irq(bank->irq_correctable, axon_ram_irq_handler, 261 rc = request_irq(bank->irq_id, axon_ram_irq_handler,
271 AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
272 if (rc != 0) {
273 dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
274 bank->irq_correctable = bank->irq_uncorrectable = 0;
275 rc = -EFAULT;
276 goto failed;
277 }
278
279 rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
280 AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device); 262 AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
281 if (rc != 0) { 263 if (rc != 0) {
282 dev_err(&device->dev, "Cannot register ECC interrupt handler\n"); 264 dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
283 bank->irq_uncorrectable = 0; 265 bank->irq_id = NO_IRQ;
284 rc = -EFAULT; 266 rc = -EFAULT;
285 goto failed; 267 goto failed;
286 } 268 }
@@ -296,13 +278,9 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
296 278
297failed: 279failed:
298 if (bank != NULL) { 280 if (bank != NULL) {
299 if (bank->irq_uncorrectable > 0) 281 if (bank->irq_id != NO_IRQ)
300 free_irq(bank->irq_uncorrectable, device); 282 free_irq(bank->irq_id, device);
301 if (bank->irq_correctable > 0)
302 free_irq(bank->irq_correctable, device);
303 if (bank->disk != NULL) { 283 if (bank->disk != NULL) {
304 if (bank->disk->queue != NULL)
305 blk_cleanup_queue(bank->disk->queue);
306 if (bank->disk->major > 0) 284 if (bank->disk->major > 0)
307 unregister_blkdev(bank->disk->major, 285 unregister_blkdev(bank->disk->major,
308 bank->disk->disk_name); 286 bank->disk->disk_name);
@@ -329,9 +307,7 @@ axon_ram_remove(struct of_device *device)
329 BUG_ON(!bank || !bank->disk); 307 BUG_ON(!bank || !bank->disk);
330 308
331 device_remove_file(&device->dev, &dev_attr_ecc); 309 device_remove_file(&device->dev, &dev_attr_ecc);
332 free_irq(bank->irq_uncorrectable, device); 310 free_irq(bank->irq_id, device);
333 free_irq(bank->irq_correctable, device);
334 blk_cleanup_queue(bank->disk->queue);
335 unregister_blkdev(bank->disk->major, bank->disk->disk_name); 311 unregister_blkdev(bank->disk->major, bank->disk->disk_name);
336 del_gendisk(bank->disk); 312 del_gendisk(bank->disk);
337 iounmap((void __iomem *) bank->io_addr); 313 iounmap((void __iomem *) bank->io_addr);
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 574259476fbf..4875f0149eb4 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -71,6 +71,7 @@ config ACPI_PROCFS
71config ACPI_PROC_EVENT 71config ACPI_PROC_EVENT
72 bool "Deprecated /proc/acpi/event support" 72 bool "Deprecated /proc/acpi/event support"
73 depends on PROC_FS 73 depends on PROC_FS
74 default y
74 ---help--- 75 ---help---
75 A user-space daemon, acpi, typically read /proc/acpi/event 76 A user-space daemon, acpi, typically read /proc/acpi/event
76 and handled all ACPI sub-system generated events. 77 and handled all ACPI sub-system generated events.
@@ -78,10 +79,13 @@ config ACPI_PROC_EVENT
78 These events are now delivered to user-space via 79 These events are now delivered to user-space via
79 either the input layer, or as netlink events. 80 either the input layer, or as netlink events.
80 81
81 This build option enables the old code for for legacy 82 This build option enables the old code for legacy
82 user-space implementation. After some time, this will 83 user-space implementation. After some time, this will
83 be moved under CONFIG_ACPI_PROCFS, and then deleted. 84 be moved under CONFIG_ACPI_PROCFS, and then deleted.
84 85
86 Say Y here to retain the old behaviour. Say N if your
87 user-space is newer than kernel 2.6.23 (September 2007).
88
85config ACPI_AC 89config ACPI_AC
86 tristate "AC Adapter" 90 tristate "AC Adapter"
87 depends on X86 91 depends on X86
diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 1f0962616ee5..4fe9206f84de 100644
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -25,7 +25,6 @@
25#include <asm/io.h> 25#include <asm/io.h>
26#include <asm/uaccess.h> 26#include <asm/uaccess.h>
27#include <asm/system.h> 27#include <asm/system.h>
28#include <linux/delay.h>
29 28
30#include "lcd.h" 29#include "lcd.h"
31 30
diff --git a/drivers/dma/ioatdma.c b/drivers/dma/ioatdma.c
index 2d1f17865b64..41b18c5a3141 100644
--- a/drivers/dma/ioatdma.c
+++ b/drivers/dma/ioatdma.c
@@ -191,17 +191,12 @@ static int ioat_dma_alloc_chan_resources(struct dma_chan *chan)
191 int i; 191 int i;
192 LIST_HEAD(tmp_list); 192 LIST_HEAD(tmp_list);
193 193
194 /* 194 /* have we already been set up? */
195 * In-use bit automatically set by reading chanctrl 195 if (!list_empty(&ioat_chan->free_desc))
196 * If 0, we got it, if 1, someone else did 196 return INITIAL_IOAT_DESC_COUNT;
197 */
198 chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
199 if (chanctrl & IOAT_CHANCTRL_CHANNEL_IN_USE)
200 return -EBUSY;
201 197
202 /* Setup register to interrupt and write completion status on error */ 198 /* Setup register to interrupt and write completion status on error */
203 chanctrl = IOAT_CHANCTRL_CHANNEL_IN_USE | 199 chanctrl = IOAT_CHANCTRL_ERR_INT_EN |
204 IOAT_CHANCTRL_ERR_INT_EN |
205 IOAT_CHANCTRL_ANY_ERR_ABORT_EN | 200 IOAT_CHANCTRL_ANY_ERR_ABORT_EN |
206 IOAT_CHANCTRL_ERR_COMPLETION_EN; 201 IOAT_CHANCTRL_ERR_COMPLETION_EN;
207 writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET); 202 writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
@@ -282,11 +277,6 @@ static void ioat_dma_free_chan_resources(struct dma_chan *chan)
282 in_use_descs - 1); 277 in_use_descs - 1);
283 278
284 ioat_chan->last_completion = ioat_chan->completion_addr = 0; 279 ioat_chan->last_completion = ioat_chan->completion_addr = 0;
285
286 /* Tell hw the chan is free */
287 chanctrl = readw(ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
288 chanctrl &= ~IOAT_CHANCTRL_CHANNEL_IN_USE;
289 writew(chanctrl, ioat_chan->reg_base + IOAT_CHANCTRL_OFFSET);
290} 280}
291 281
292static struct dma_async_tx_descriptor * 282static struct dma_async_tx_descriptor *
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c
index 90a23795db7e..02d9918705dd 100644
--- a/drivers/isdn/i4l/isdn_bsdcomp.c
+++ b/drivers/isdn/i4l/isdn_bsdcomp.c
@@ -341,7 +341,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
341 * Allocate space for the dictionary. This may be more than one page in 341 * Allocate space for the dictionary. This may be more than one page in
342 * length. 342 * length.
343 */ 343 */
344 db->dict = (struct bsd_dict *) vmalloc (hsize * sizeof (struct bsd_dict)); 344 db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
345 if (!db->dict) { 345 if (!db->dict) {
346 bsd_free (db); 346 bsd_free (db);
347 return NULL; 347 return NULL;
@@ -354,8 +354,7 @@ static void *bsd_alloc (struct isdn_ppp_comp_data *data)
354 if (!decomp) 354 if (!decomp)
355 db->lens = NULL; 355 db->lens = NULL;
356 else { 356 else {
357 db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) * 357 db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
358 sizeof (db->lens[0]));
359 if (!db->lens) { 358 if (!db->lens) {
360 bsd_free (db); 359 bsd_free (db);
361 return (NULL); 360 return (NULL);
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index c97330b19877..ec5f4046412f 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -2291,7 +2291,7 @@ static int __init isdn_init(void)
2291 int i; 2291 int i;
2292 char tmprev[50]; 2292 char tmprev[50];
2293 2293
2294 if (!(dev = (isdn_dev *) vmalloc(sizeof(isdn_dev)))) { 2294 if (!(dev = vmalloc(sizeof(isdn_dev)))) {
2295 printk(KERN_WARNING "isdn: Could not allocate device-struct.\n"); 2295 printk(KERN_WARNING "isdn: Could not allocate device-struct.\n");
2296 return -EIO; 2296 return -EIO;
2297 } 2297 }
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index bc77c5e2ca9f..5c742a526082 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -89,7 +89,7 @@ static int sleepy_trackpad;
89static int autopoll_devs; 89static int autopoll_devs;
90int __adb_probe_sync; 90int __adb_probe_sync;
91 91
92#ifdef CONFIG_PM 92#ifdef CONFIG_PM_SLEEP
93static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when); 93static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
94static struct pmu_sleep_notifier adb_sleep_notifier = { 94static struct pmu_sleep_notifier adb_sleep_notifier = {
95 adb_notify_sleep, 95 adb_notify_sleep,
@@ -313,7 +313,7 @@ int __init adb_init(void)
313 printk(KERN_WARNING "Warning: no ADB interface detected\n"); 313 printk(KERN_WARNING "Warning: no ADB interface detected\n");
314 adb_controller = NULL; 314 adb_controller = NULL;
315 } else { 315 } else {
316#ifdef CONFIG_PM 316#ifdef CONFIG_PM_SLEEP
317 pmu_register_sleep_notifier(&adb_sleep_notifier); 317 pmu_register_sleep_notifier(&adb_sleep_notifier);
318#endif /* CONFIG_PM */ 318#endif /* CONFIG_PM */
319#ifdef CONFIG_PPC 319#ifdef CONFIG_PPC
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 157080b3b468..04f3973e3874 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -152,10 +152,10 @@ static spinlock_t pmu_lock;
152static u8 pmu_intr_mask; 152static u8 pmu_intr_mask;
153static int pmu_version; 153static int pmu_version;
154static int drop_interrupts; 154static int drop_interrupts;
155#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 155#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
156static int option_lid_wakeup = 1; 156static int option_lid_wakeup = 1;
157#endif /* CONFIG_PM && CONFIG_PPC32 */ 157#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
158#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY) 158#if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
159static int sleep_in_progress; 159static int sleep_in_progress;
160#endif 160#endif
161static unsigned long async_req_locks; 161static unsigned long async_req_locks;
@@ -875,7 +875,7 @@ proc_read_options(char *page, char **start, off_t off,
875{ 875{
876 char *p = page; 876 char *p = page;
877 877
878#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 878#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
879 if (pmu_kind == PMU_KEYLARGO_BASED && 879 if (pmu_kind == PMU_KEYLARGO_BASED &&
880 pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0) 880 pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
881 p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup); 881 p += sprintf(p, "lid_wakeup=%d\n", option_lid_wakeup);
@@ -916,7 +916,7 @@ proc_write_options(struct file *file, const char __user *buffer,
916 *(val++) = 0; 916 *(val++) = 0;
917 while(*val == ' ') 917 while(*val == ' ')
918 val++; 918 val++;
919#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 919#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
920 if (pmu_kind == PMU_KEYLARGO_BASED && 920 if (pmu_kind == PMU_KEYLARGO_BASED &&
921 pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0) 921 pmac_call_feature(PMAC_FTR_SLEEP_STATE,NULL,0,-1) >= 0)
922 if (!strcmp(label, "lid_wakeup")) 922 if (!strcmp(label, "lid_wakeup"))
@@ -1738,7 +1738,7 @@ pmu_present(void)
1738 return via != 0; 1738 return via != 0;
1739} 1739}
1740 1740
1741#ifdef CONFIG_PM 1741#ifdef CONFIG_PM_SLEEP
1742 1742
1743static LIST_HEAD(sleep_notifiers); 1743static LIST_HEAD(sleep_notifiers);
1744 1744
@@ -1769,9 +1769,9 @@ pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* n)
1769 return 0; 1769 return 0;
1770} 1770}
1771EXPORT_SYMBOL(pmu_unregister_sleep_notifier); 1771EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
1772#endif /* CONFIG_PM */ 1772#endif /* CONFIG_PM_SLEEP */
1773 1773
1774#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 1774#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
1775 1775
1776/* Sleep is broadcast last-to-first */ 1776/* Sleep is broadcast last-to-first */
1777static void broadcast_sleep(int when) 1777static void broadcast_sleep(int when)
@@ -2390,7 +2390,7 @@ powerbook_sleep_3400(void)
2390 return 0; 2390 return 0;
2391} 2391}
2392 2392
2393#endif /* CONFIG_PM && CONFIG_PPC32 */ 2393#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2394 2394
2395/* 2395/*
2396 * Support for /dev/pmu device 2396 * Support for /dev/pmu device
@@ -2573,7 +2573,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
2573 int error = -EINVAL; 2573 int error = -EINVAL;
2574 2574
2575 switch (cmd) { 2575 switch (cmd) {
2576#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 2576#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2577 case PMU_IOC_SLEEP: 2577 case PMU_IOC_SLEEP:
2578 if (!capable(CAP_SYS_ADMIN)) 2578 if (!capable(CAP_SYS_ADMIN))
2579 return -EACCES; 2579 return -EACCES;
@@ -2601,7 +2601,7 @@ pmu_ioctl(struct inode * inode, struct file *filp,
2601 return put_user(0, argp); 2601 return put_user(0, argp);
2602 else 2602 else
2603 return put_user(1, argp); 2603 return put_user(1, argp);
2604#endif /* CONFIG_PM && CONFIG_PPC32 */ 2604#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2605 2605
2606#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY 2606#ifdef CONFIG_PMAC_BACKLIGHT_LEGACY
2607 /* Compatibility ioctl's for backlight */ 2607 /* Compatibility ioctl's for backlight */
@@ -2757,7 +2757,7 @@ pmu_polled_request(struct adb_request *req)
2757 * to do suspend-to-disk. 2757 * to do suspend-to-disk.
2758 */ 2758 */
2759 2759
2760#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 2760#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2761 2761
2762int pmu_sys_suspended; 2762int pmu_sys_suspended;
2763 2763
@@ -2792,7 +2792,7 @@ static int pmu_sys_resume(struct sys_device *sysdev)
2792 return 0; 2792 return 0;
2793} 2793}
2794 2794
2795#endif /* CONFIG_PM && CONFIG_PPC32 */ 2795#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2796 2796
2797static struct sysdev_class pmu_sysclass = { 2797static struct sysdev_class pmu_sysclass = {
2798 set_kset_name("pmu"), 2798 set_kset_name("pmu"),
@@ -2803,10 +2803,10 @@ static struct sys_device device_pmu = {
2803}; 2803};
2804 2804
2805static struct sysdev_driver driver_pmu = { 2805static struct sysdev_driver driver_pmu = {
2806#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 2806#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2807 .suspend = &pmu_sys_suspend, 2807 .suspend = &pmu_sys_suspend,
2808 .resume = &pmu_sys_resume, 2808 .resume = &pmu_sys_resume,
2809#endif /* CONFIG_PM && CONFIG_PPC32 */ 2809#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2810}; 2810};
2811 2811
2812static int __init init_pmu_sysfs(void) 2812static int __init init_pmu_sysfs(void)
@@ -2841,10 +2841,10 @@ EXPORT_SYMBOL(pmu_wait_complete);
2841EXPORT_SYMBOL(pmu_suspend); 2841EXPORT_SYMBOL(pmu_suspend);
2842EXPORT_SYMBOL(pmu_resume); 2842EXPORT_SYMBOL(pmu_resume);
2843EXPORT_SYMBOL(pmu_unlock); 2843EXPORT_SYMBOL(pmu_unlock);
2844#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 2844#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
2845EXPORT_SYMBOL(pmu_enable_irled); 2845EXPORT_SYMBOL(pmu_enable_irled);
2846EXPORT_SYMBOL(pmu_battery_count); 2846EXPORT_SYMBOL(pmu_battery_count);
2847EXPORT_SYMBOL(pmu_batteries); 2847EXPORT_SYMBOL(pmu_batteries);
2848EXPORT_SYMBOL(pmu_power_flags); 2848EXPORT_SYMBOL(pmu_power_flags);
2849#endif /* CONFIG_PM && CONFIG_PPC32 */ 2849#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
2850 2850
diff --git a/drivers/net/bsd_comp.c b/drivers/net/bsd_comp.c
index 202d4a4ef751..88edb986691a 100644
--- a/drivers/net/bsd_comp.c
+++ b/drivers/net/bsd_comp.c
@@ -406,8 +406,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
406 * Allocate space for the dictionary. This may be more than one page in 406 * Allocate space for the dictionary. This may be more than one page in
407 * length. 407 * length.
408 */ 408 */
409 db->dict = (struct bsd_dict *) vmalloc (hsize * 409 db->dict = vmalloc(hsize * sizeof(struct bsd_dict));
410 sizeof (struct bsd_dict));
411 if (!db->dict) 410 if (!db->dict)
412 { 411 {
413 bsd_free (db); 412 bsd_free (db);
@@ -426,8 +425,7 @@ static void *bsd_alloc (unsigned char *options, int opt_len, int decomp)
426 */ 425 */
427 else 426 else
428 { 427 {
429 db->lens = (unsigned short *) vmalloc ((maxmaxcode + 1) * 428 db->lens = vmalloc((maxmaxcode + 1) * sizeof(db->lens[0]));
430 sizeof (db->lens[0]));
431 if (!db->lens) 429 if (!db->lens)
432 { 430 {
433 bsd_free (db); 431 bsd_free (db);
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index a93700e5661a..102218c4a907 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -391,7 +391,7 @@ static int __eql_insert_slave(slave_queue_t *queue, slave_t *slave)
391 slave_t *duplicate_slave = NULL; 391 slave_t *duplicate_slave = NULL;
392 392
393 duplicate_slave = __eql_find_slave_dev(queue, slave->dev); 393 duplicate_slave = __eql_find_slave_dev(queue, slave->dev);
394 if (duplicate_slave != 0) 394 if (duplicate_slave)
395 eql_kill_one_slave(queue, duplicate_slave); 395 eql_kill_one_slave(queue, duplicate_slave);
396 396
397 list_add(&slave->list, &queue->all_slaves); 397 list_add(&slave->list, &queue->all_slaves);
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c
index bdd5c979bead..4e5101a45c3c 100644
--- a/drivers/net/irda/kingsun-sir.c
+++ b/drivers/net/irda/kingsun-sir.c
@@ -509,12 +509,12 @@ static int kingsun_probe(struct usb_interface *intf,
509 spin_lock_init(&kingsun->lock); 509 spin_lock_init(&kingsun->lock);
510 510
511 /* Allocate input buffer */ 511 /* Allocate input buffer */
512 kingsun->in_buf = (__u8 *)kmalloc(kingsun->max_rx, GFP_KERNEL); 512 kingsun->in_buf = kmalloc(kingsun->max_rx, GFP_KERNEL);
513 if (!kingsun->in_buf) 513 if (!kingsun->in_buf)
514 goto free_mem; 514 goto free_mem;
515 515
516 /* Allocate output buffer */ 516 /* Allocate output buffer */
517 kingsun->out_buf = (__u8 *)kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL); 517 kingsun->out_buf = kmalloc(KINGSUN_FIFO_SIZE, GFP_KERNEL);
518 if (!kingsun->out_buf) 518 if (!kingsun->out_buf)
519 goto free_mem; 519 goto free_mem;
520 520
diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 65bd20fac820..3fd4735006f5 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -957,7 +957,7 @@ slip_close(struct tty_struct *tty)
957 * STANDARD SLIP ENCAPSULATION * 957 * STANDARD SLIP ENCAPSULATION *
958 ************************************************************************/ 958 ************************************************************************/
959 959
960int 960static int
961slip_esc(unsigned char *s, unsigned char *d, int len) 961slip_esc(unsigned char *s, unsigned char *d, int len)
962{ 962{
963 unsigned char *ptr = d; 963 unsigned char *ptr = d;
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c
index f50f3fc353cd..839462659afa 100644
--- a/drivers/rtc/rtc-rs5c348.c
+++ b/drivers/rtc/rtc-rs5c348.c
@@ -226,7 +226,7 @@ static int __devexit rs5c348_remove(struct spi_device *spi)
226 226
227static struct spi_driver rs5c348_driver = { 227static struct spi_driver rs5c348_driver = {
228 .driver = { 228 .driver = {
229 .name = "rs5c348", 229 .name = "rtc-rs5c348",
230 .bus = &spi_bus_type, 230 .bus = &spi_bus_type,
231 .owner = THIS_MODULE, 231 .owner = THIS_MODULE,
232 }, 232 },
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 49643969f9f8..5db6b1e489b0 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -145,7 +145,7 @@ config FRAMEBUFFER_CONSOLE_ROTATION
145 oriented. 145 oriented.
146 146
147config STI_CONSOLE 147config STI_CONSOLE
148 tristate "STI text console" 148 bool "STI text console"
149 depends on PARISC 149 depends on PARISC
150 default y 150 default y
151 help 151 help
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 870017d44970..e9ab657f0bb7 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -232,18 +232,14 @@ sti_bmove(struct sti_struct *sti, int src_y, int src_x,
232} 232}
233 233
234 234
235/* FIXME: Do we have another solution for this ? */ 235static void sti_flush(unsigned long start, unsigned long end)
236static void sti_flush(unsigned long from, unsigned long len)
237{ 236{
238 flush_data_cache(); 237 flush_icache_range(start, end);
239 flush_kernel_dcache_range(from, len);
240 flush_icache_range(from, from+len);
241} 238}
242 239
243void __devinit 240void __devinit
244sti_rom_copy(unsigned long base, unsigned long count, void *dest) 241sti_rom_copy(unsigned long base, unsigned long count, void *dest)
245{ 242{
246 unsigned long dest_len = count;
247 unsigned long dest_start = (unsigned long) dest; 243 unsigned long dest_start = (unsigned long) dest;
248 244
249 /* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */ 245 /* this still needs to be revisited (see arch/parisc/mm/init.c:246) ! */
@@ -260,7 +256,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
260 dest++; 256 dest++;
261 } 257 }
262 258
263 sti_flush(dest_start, dest_len); 259 sti_flush(dest_start, (unsigned long)dest);
264} 260}
265 261
266 262
@@ -663,7 +659,6 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
663static void __devinit 659static void __devinit
664sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) 660sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
665{ 661{
666 unsigned long dest_len = count;
667 unsigned long dest_start = (unsigned long) dest; 662 unsigned long dest_start = (unsigned long) dest;
668 663
669 while (count) { 664 while (count) {
@@ -672,7 +667,8 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
672 base += 4; 667 base += 4;
673 dest++; 668 dest++;
674 } 669 }
675 sti_flush(dest_start, dest_len); 670
671 sti_flush(dest_start, (unsigned long)dest);
676} 672}
677 673
678static struct sti_rom * __devinit 674static struct sti_rom * __devinit
diff --git a/include/asm-mips/bcache.h b/include/asm-mips/bcache.h
index 3646a3f2ed38..0ba9d6ef76a7 100644
--- a/include/asm-mips/bcache.h
+++ b/include/asm-mips/bcache.h
@@ -21,7 +21,6 @@ struct bcache_ops {
21}; 21};
22 22
23extern void indy_sc_init(void); 23extern void indy_sc_init(void);
24extern void sni_pcimt_sc_init(void);
25 24
26#ifdef CONFIG_BOARD_SCACHE 25#ifdef CONFIG_BOARD_SCACHE
27 26
diff --git a/include/asm-mips/edac.h b/include/asm-mips/edac.h
index 83719eee2d13..4da0c1fe30d9 100644
--- a/include/asm-mips/edac.h
+++ b/include/asm-mips/edac.h
@@ -9,8 +9,7 @@ static inline void atomic_scrub(void *va, u32 size)
9 unsigned long temp; 9 unsigned long temp;
10 u32 i; 10 u32 i;
11 11
12 for (i = 0; i < size / sizeof(unsigned long); i++, virt_addr++) { 12 for (i = 0; i < size / sizeof(unsigned long); i++) {
13
14 /* 13 /*
15 * Very carefully read and write to memory atomically 14 * Very carefully read and write to memory atomically
16 * so we are interrupt, DMA and SMP safe. 15 * so we are interrupt, DMA and SMP safe.
@@ -19,16 +18,16 @@ static inline void atomic_scrub(void *va, u32 size)
19 */ 18 */
20 19
21 __asm__ __volatile__ ( 20 __asm__ __volatile__ (
22 " .set mips3 \n" 21 " .set mips2 \n"
23 "1: ll %0, %1 # atomic_add \n" 22 "1: ll %0, %1 # atomic_scrub \n"
24 " ll %0, %1 # atomic_add \n" 23 " addu %0, $0 \n"
25 " addu %0, $0 \n" 24 " sc %0, %1 \n"
26 " sc %0, %1 \n" 25 " beqz %0, 1b \n"
27 " beqz %0, 1b \n" 26 " .set mips0 \n"
28 " .set mips0 \n"
29 : "=&r" (temp), "=m" (*virt_addr) 27 : "=&r" (temp), "=m" (*virt_addr)
30 : "m" (*virt_addr)); 28 : "m" (*virt_addr));
31 29
30 virt_addr++;
32 } 31 }
33} 32}
34 33
diff --git a/include/asm-mips/gt64240.h b/include/asm-mips/gt64240.h
deleted file mode 100644
index 8f9bd341ed49..000000000000
--- a/include/asm-mips/gt64240.h
+++ /dev/null
@@ -1,1235 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright - Galileo technology.
7 * Copyright (C) 2004 by Ralf Baechle
8 */
9#ifndef __ASM_MIPS_MV64240_H
10#define __ASM_MIPS_MV64240_H
11
12#include <asm/addrspace.h>
13#include <asm/marvell.h>
14
15/*
16 * CPU Control Registers
17 */
18
19#define CPU_CONFIGURATION 0x000
20#define CPU_MODE 0x120
21#define CPU_READ_RESPONSE_CROSSBAR_LOW 0x170
22#define CPU_READ_RESPONSE_CROSSBAR_HIGH 0x178
23
24/*
25 * Processor Address Space
26 */
27
28/* Sdram's BAR'S */
29#define SCS_0_LOW_DECODE_ADDRESS 0x008
30#define SCS_0_HIGH_DECODE_ADDRESS 0x010
31#define SCS_1_LOW_DECODE_ADDRESS 0x208
32#define SCS_1_HIGH_DECODE_ADDRESS 0x210
33#define SCS_2_LOW_DECODE_ADDRESS 0x018
34#define SCS_2_HIGH_DECODE_ADDRESS 0x020
35#define SCS_3_LOW_DECODE_ADDRESS 0x218
36#define SCS_3_HIGH_DECODE_ADDRESS 0x220
37/* Devices BAR'S */
38#define CS_0_LOW_DECODE_ADDRESS 0x028
39#define CS_0_HIGH_DECODE_ADDRESS 0x030
40#define CS_1_LOW_DECODE_ADDRESS 0x228
41#define CS_1_HIGH_DECODE_ADDRESS 0x230
42#define CS_2_LOW_DECODE_ADDRESS 0x248
43#define CS_2_HIGH_DECODE_ADDRESS 0x250
44#define CS_3_LOW_DECODE_ADDRESS 0x038
45#define CS_3_HIGH_DECODE_ADDRESS 0x040
46#define BOOTCS_LOW_DECODE_ADDRESS 0x238
47#define BOOTCS_HIGH_DECODE_ADDRESS 0x240
48
49#define PCI_0I_O_LOW_DECODE_ADDRESS 0x048
50#define PCI_0I_O_HIGH_DECODE_ADDRESS 0x050
51#define PCI_0MEMORY0_LOW_DECODE_ADDRESS 0x058
52#define PCI_0MEMORY0_HIGH_DECODE_ADDRESS 0x060
53#define PCI_0MEMORY1_LOW_DECODE_ADDRESS 0x080
54#define PCI_0MEMORY1_HIGH_DECODE_ADDRESS 0x088
55#define PCI_0MEMORY2_LOW_DECODE_ADDRESS 0x258
56#define PCI_0MEMORY2_HIGH_DECODE_ADDRESS 0x260
57#define PCI_0MEMORY3_LOW_DECODE_ADDRESS 0x280
58#define PCI_0MEMORY3_HIGH_DECODE_ADDRESS 0x288
59
60#define PCI_1I_O_LOW_DECODE_ADDRESS 0x090
61#define PCI_1I_O_HIGH_DECODE_ADDRESS 0x098
62#define PCI_1MEMORY0_LOW_DECODE_ADDRESS 0x0a0
63#define PCI_1MEMORY0_HIGH_DECODE_ADDRESS 0x0a8
64#define PCI_1MEMORY1_LOW_DECODE_ADDRESS 0x0b0
65#define PCI_1MEMORY1_HIGH_DECODE_ADDRESS 0x0b8
66#define PCI_1MEMORY2_LOW_DECODE_ADDRESS 0x2a0
67#define PCI_1MEMORY2_HIGH_DECODE_ADDRESS 0x2a8
68#define PCI_1MEMORY3_LOW_DECODE_ADDRESS 0x2b0
69#define PCI_1MEMORY3_HIGH_DECODE_ADDRESS 0x2b8
70
71#define INTERNAL_SPACE_DECODE 0x068
72
73#define CPU_0_LOW_DECODE_ADDRESS 0x290
74#define CPU_0_HIGH_DECODE_ADDRESS 0x298
75#define CPU_1_LOW_DECODE_ADDRESS 0x2c0
76#define CPU_1_HIGH_DECODE_ADDRESS 0x2c8
77
78#define PCI_0I_O_ADDRESS_REMAP 0x0f0
79#define PCI_0MEMORY0_ADDRESS_REMAP 0x0f8
80#define PCI_0MEMORY0_HIGH_ADDRESS_REMAP 0x320
81#define PCI_0MEMORY1_ADDRESS_REMAP 0x100
82#define PCI_0MEMORY1_HIGH_ADDRESS_REMAP 0x328
83#define PCI_0MEMORY2_ADDRESS_REMAP 0x2f8
84#define PCI_0MEMORY2_HIGH_ADDRESS_REMAP 0x330
85#define PCI_0MEMORY3_ADDRESS_REMAP 0x300
86#define PCI_0MEMORY3_HIGH_ADDRESS_REMAP 0x338
87
88#define PCI_1I_O_ADDRESS_REMAP 0x108
89#define PCI_1MEMORY0_ADDRESS_REMAP 0x110
90#define PCI_1MEMORY0_HIGH_ADDRESS_REMAP 0x340
91#define PCI_1MEMORY1_ADDRESS_REMAP 0x118
92#define PCI_1MEMORY1_HIGH_ADDRESS_REMAP 0x348
93#define PCI_1MEMORY2_ADDRESS_REMAP 0x310
94#define PCI_1MEMORY2_HIGH_ADDRESS_REMAP 0x350
95#define PCI_1MEMORY3_ADDRESS_REMAP 0x318
96#define PCI_1MEMORY3_HIGH_ADDRESS_REMAP 0x358
97
98/*
99 * CPU Sync Barrier
100 */
101
102#define PCI_0SYNC_BARIER_VIRTUAL_REGISTER 0x0c0
103#define PCI_1SYNC_BARIER_VIRTUAL_REGISTER 0x0c8
104
105
106/*
107 * CPU Access Protect
108 */
109
110#define CPU_LOW_PROTECT_ADDRESS_0 0X180
111#define CPU_HIGH_PROTECT_ADDRESS_0 0X188
112#define CPU_LOW_PROTECT_ADDRESS_1 0X190
113#define CPU_HIGH_PROTECT_ADDRESS_1 0X198
114#define CPU_LOW_PROTECT_ADDRESS_2 0X1a0
115#define CPU_HIGH_PROTECT_ADDRESS_2 0X1a8
116#define CPU_LOW_PROTECT_ADDRESS_3 0X1b0
117#define CPU_HIGH_PROTECT_ADDRESS_3 0X1b8
118#define CPU_LOW_PROTECT_ADDRESS_4 0X1c0
119#define CPU_HIGH_PROTECT_ADDRESS_4 0X1c8
120#define CPU_LOW_PROTECT_ADDRESS_5 0X1d0
121#define CPU_HIGH_PROTECT_ADDRESS_5 0X1d8
122#define CPU_LOW_PROTECT_ADDRESS_6 0X1e0
123#define CPU_HIGH_PROTECT_ADDRESS_6 0X1e8
124#define CPU_LOW_PROTECT_ADDRESS_7 0X1f0
125#define CPU_HIGH_PROTECT_ADDRESS_7 0X1f8
126
127
128/*
129 * Snoop Control
130 */
131
132#define SNOOP_BASE_ADDRESS_0 0x380
133#define SNOOP_TOP_ADDRESS_0 0x388
134#define SNOOP_BASE_ADDRESS_1 0x390
135#define SNOOP_TOP_ADDRESS_1 0x398
136#define SNOOP_BASE_ADDRESS_2 0x3a0
137#define SNOOP_TOP_ADDRESS_2 0x3a8
138#define SNOOP_BASE_ADDRESS_3 0x3b0
139#define SNOOP_TOP_ADDRESS_3 0x3b8
140
141/*
142 * CPU Error Report
143 */
144
145#define CPU_ERROR_ADDRESS_LOW 0x070
146#define CPU_ERROR_ADDRESS_HIGH 0x078
147#define CPU_ERROR_DATA_LOW 0x128
148#define CPU_ERROR_DATA_HIGH 0x130
149#define CPU_ERROR_PARITY 0x138
150#define CPU_ERROR_CAUSE 0x140
151#define CPU_ERROR_MASK 0x148
152
153/*
154 * Pslave Debug
155 */
156
157#define X_0_ADDRESS 0x360
158#define X_0_COMMAND_ID 0x368
159#define X_1_ADDRESS 0x370
160#define X_1_COMMAND_ID 0x378
161#define WRITE_DATA_LOW 0x3c0
162#define WRITE_DATA_HIGH 0x3c8
163#define WRITE_BYTE_ENABLE 0X3e0
164#define READ_DATA_LOW 0x3d0
165#define READ_DATA_HIGH 0x3d8
166#define READ_ID 0x3e8
167
168
169/*
170 * SDRAM and Device Address Space
171 */
172
173
174/*
175 * SDRAM Configuration
176 */
177
178#define SDRAM_CONFIGURATION 0x448
179#define SDRAM_OPERATION_MODE 0x474
180#define SDRAM_ADDRESS_DECODE 0x47C
181#define SDRAM_TIMING_PARAMETERS 0x4b4
182#define SDRAM_UMA_CONTROL 0x4a4
183#define SDRAM_CROSS_BAR_CONTROL_LOW 0x4a8
184#define SDRAM_CROSS_BAR_CONTROL_HIGH 0x4ac
185#define SDRAM_CROSS_BAR_TIMEOUT 0x4b0
186
187
188/*
189 * SDRAM Parameters
190 */
191
192#define SDRAM_BANK0PARAMETERS 0x44C
193#define SDRAM_BANK1PARAMETERS 0x450
194#define SDRAM_BANK2PARAMETERS 0x454
195#define SDRAM_BANK3PARAMETERS 0x458
196
197
198/*
199 * SDRAM Error Report
200 */
201
202#define SDRAM_ERROR_DATA_LOW 0x484
203#define SDRAM_ERROR_DATA_HIGH 0x480
204#define SDRAM_AND_DEVICE_ERROR_ADDRESS 0x490
205#define SDRAM_RECEIVED_ECC 0x488
206#define SDRAM_CALCULATED_ECC 0x48c
207#define SDRAM_ECC_CONTROL 0x494
208#define SDRAM_ECC_ERROR_COUNTER 0x498
209
210
211/*
212 * SDunit Debug (for internal use)
213 */
214
215#define X0_ADDRESS 0x500
216#define X0_COMMAND_AND_ID 0x504
217#define X0_WRITE_DATA_LOW 0x508
218#define X0_WRITE_DATA_HIGH 0x50c
219#define X0_WRITE_BYTE_ENABLE 0x518
220#define X0_READ_DATA_LOW 0x510
221#define X0_READ_DATA_HIGH 0x514
222#define X0_READ_ID 0x51c
223#define X1_ADDRESS 0x520
224#define X1_COMMAND_AND_ID 0x524
225#define X1_WRITE_DATA_LOW 0x528
226#define X1_WRITE_DATA_HIGH 0x52c
227#define X1_WRITE_BYTE_ENABLE 0x538
228#define X1_READ_DATA_LOW 0x530
229#define X1_READ_DATA_HIGH 0x534
230#define X1_READ_ID 0x53c
231#define X0_SNOOP_ADDRESS 0x540
232#define X0_SNOOP_COMMAND 0x544
233#define X1_SNOOP_ADDRESS 0x548
234#define X1_SNOOP_COMMAND 0x54c
235
236
237/*
238 * Device Parameters
239 */
240
241#define DEVICE_BANK0PARAMETERS 0x45c
242#define DEVICE_BANK1PARAMETERS 0x460
243#define DEVICE_BANK2PARAMETERS 0x464
244#define DEVICE_BANK3PARAMETERS 0x468
245#define DEVICE_BOOT_BANK_PARAMETERS 0x46c
246#define DEVICE_CONTROL 0x4c0
247#define DEVICE_CROSS_BAR_CONTROL_LOW 0x4c8
248#define DEVICE_CROSS_BAR_CONTROL_HIGH 0x4cc
249#define DEVICE_CROSS_BAR_TIMEOUT 0x4c4
250
251
252/*
253 * Device Interrupt
254 */
255
256#define DEVICE_INTERRUPT_CAUSE 0x4d0
257#define DEVICE_INTERRUPT_MASK 0x4d4
258#define DEVICE_ERROR_ADDRESS 0x4d8
259
260/*
261 * DMA Record
262 */
263
264#define CHANNEL0_DMA_BYTE_COUNT 0x800
265#define CHANNEL1_DMA_BYTE_COUNT 0x804
266#define CHANNEL2_DMA_BYTE_COUNT 0x808
267#define CHANNEL3_DMA_BYTE_COUNT 0x80C
268#define CHANNEL4_DMA_BYTE_COUNT 0x900
269#define CHANNEL5_DMA_BYTE_COUNT 0x904
270#define CHANNEL6_DMA_BYTE_COUNT 0x908
271#define CHANNEL7_DMA_BYTE_COUNT 0x90C
272#define CHANNEL0_DMA_SOURCE_ADDRESS 0x810
273#define CHANNEL1_DMA_SOURCE_ADDRESS 0x814
274#define CHANNEL2_DMA_SOURCE_ADDRESS 0x818
275#define CHANNEL3_DMA_SOURCE_ADDRESS 0x81C
276#define CHANNEL4_DMA_SOURCE_ADDRESS 0x910
277#define CHANNEL5_DMA_SOURCE_ADDRESS 0x914
278#define CHANNEL6_DMA_SOURCE_ADDRESS 0x918
279#define CHANNEL7_DMA_SOURCE_ADDRESS 0x91C
280#define CHANNEL0_DMA_DESTINATION_ADDRESS 0x820
281#define CHANNEL1_DMA_DESTINATION_ADDRESS 0x824
282#define CHANNEL2_DMA_DESTINATION_ADDRESS 0x828
283#define CHANNEL3_DMA_DESTINATION_ADDRESS 0x82C
284#define CHANNEL4_DMA_DESTINATION_ADDRESS 0x920
285#define CHANNEL5_DMA_DESTINATION_ADDRESS 0x924
286#define CHANNEL6_DMA_DESTINATION_ADDRESS 0x928
287#define CHANNEL7_DMA_DESTINATION_ADDRESS 0x92C
288#define CHANNEL0NEXT_RECORD_POINTER 0x830
289#define CHANNEL1NEXT_RECORD_POINTER 0x834
290#define CHANNEL2NEXT_RECORD_POINTER 0x838
291#define CHANNEL3NEXT_RECORD_POINTER 0x83C
292#define CHANNEL4NEXT_RECORD_POINTER 0x930
293#define CHANNEL5NEXT_RECORD_POINTER 0x934
294#define CHANNEL6NEXT_RECORD_POINTER 0x938
295#define CHANNEL7NEXT_RECORD_POINTER 0x93C
296#define CHANNEL0CURRENT_DESCRIPTOR_POINTER 0x870
297#define CHANNEL1CURRENT_DESCRIPTOR_POINTER 0x874
298#define CHANNEL2CURRENT_DESCRIPTOR_POINTER 0x878
299#define CHANNEL3CURRENT_DESCRIPTOR_POINTER 0x87C
300#define CHANNEL4CURRENT_DESCRIPTOR_POINTER 0x970
301#define CHANNEL5CURRENT_DESCRIPTOR_POINTER 0x974
302#define CHANNEL6CURRENT_DESCRIPTOR_POINTER 0x978
303#define CHANNEL7CURRENT_DESCRIPTOR_POINTER 0x97C
304#define CHANNEL0_DMA_SOURCE_HIGH_PCI_ADDRESS 0x890
305#define CHANNEL1_DMA_SOURCE_HIGH_PCI_ADDRESS 0x894
306#define CHANNEL2_DMA_SOURCE_HIGH_PCI_ADDRESS 0x898
307#define CHANNEL3_DMA_SOURCE_HIGH_PCI_ADDRESS 0x89c
308#define CHANNEL4_DMA_SOURCE_HIGH_PCI_ADDRESS 0x990
309#define CHANNEL5_DMA_SOURCE_HIGH_PCI_ADDRESS 0x994
310#define CHANNEL6_DMA_SOURCE_HIGH_PCI_ADDRESS 0x998
311#define CHANNEL7_DMA_SOURCE_HIGH_PCI_ADDRESS 0x99c
312#define CHANNEL0_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x8a0
313#define CHANNEL1_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x8a4
314#define CHANNEL2_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x8a8
315#define CHANNEL3_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x8ac
316#define CHANNEL4_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x9a0
317#define CHANNEL5_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x9a4
318#define CHANNEL6_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x9a8
319#define CHANNEL7_DMA_DESTINATION_HIGH_PCI_ADDRESS 0x9ac
320#define CHANNEL0_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x8b0
321#define CHANNEL1_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x8b4
322#define CHANNEL2_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x8b8
323#define CHANNEL3_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x8bc
324#define CHANNEL4_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x9b0
325#define CHANNEL5_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x9b4
326#define CHANNEL6_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x9b8
327#define CHANNEL7_DMA_NEXT_RECORD_POINTER_HIGH_PCI_ADDRESS 0x9bc
328
329/*
330 * DMA Channel Control
331 */
332
333#define CHANNEL0CONTROL 0x840
334#define CHANNEL0CONTROL_HIGH 0x880
335
336#define CHANNEL1CONTROL 0x844
337#define CHANNEL1CONTROL_HIGH 0x884
338
339#define CHANNEL2CONTROL 0x848
340#define CHANNEL2CONTROL_HIGH 0x888
341
342#define CHANNEL3CONTROL 0x84C
343#define CHANNEL3CONTROL_HIGH 0x88C
344
345#define CHANNEL4CONTROL 0x940
346#define CHANNEL4CONTROL_HIGH 0x980
347
348#define CHANNEL5CONTROL 0x944
349#define CHANNEL5CONTROL_HIGH 0x984
350
351#define CHANNEL6CONTROL 0x948
352#define CHANNEL6CONTROL_HIGH 0x988
353
354#define CHANNEL7CONTROL 0x94C
355#define CHANNEL7CONTROL_HIGH 0x98C
356
357
358/*
359 * DMA Arbiter
360 */
361
362#define ARBITER_CONTROL_0_3 0x860
363#define ARBITER_CONTROL_4_7 0x960
364
365
366/*
367 * DMA Interrupt
368 */
369
370#define CHANELS0_3_INTERRUPT_CAUSE 0x8c0
371#define CHANELS0_3_INTERRUPT_MASK 0x8c4
372#define CHANELS0_3_ERROR_ADDRESS 0x8c8
373#define CHANELS0_3_ERROR_SELECT 0x8cc
374#define CHANELS4_7_INTERRUPT_CAUSE 0x9c0
375#define CHANELS4_7_INTERRUPT_MASK 0x9c4
376#define CHANELS4_7_ERROR_ADDRESS 0x9c8
377#define CHANELS4_7_ERROR_SELECT 0x9cc
378
379
380/*
381 * DMA Debug (for internal use)
382 */
383
384#define DMA_X0_ADDRESS 0x8e0
385#define DMA_X0_COMMAND_AND_ID 0x8e4
386#define DMA_X0_WRITE_DATA_LOW 0x8e8
387#define DMA_X0_WRITE_DATA_HIGH 0x8ec
388#define DMA_X0_WRITE_BYTE_ENABLE 0x8f8
389#define DMA_X0_READ_DATA_LOW 0x8f0
390#define DMA_X0_READ_DATA_HIGH 0x8f4
391#define DMA_X0_READ_ID 0x8fc
392#define DMA_X1_ADDRESS 0x9e0
393#define DMA_X1_COMMAND_AND_ID 0x9e4
394#define DMA_X1_WRITE_DATA_LOW 0x9e8
395#define DMA_X1_WRITE_DATA_HIGH 0x9ec
396#define DMA_X1_WRITE_BYTE_ENABLE 0x9f8
397#define DMA_X1_READ_DATA_LOW 0x9f0
398#define DMA_X1_READ_DATA_HIGH 0x9f4
399#define DMA_X1_READ_ID 0x9fc
400
401/*
402 * Timer_Counter
403 */
404
405#define TIMER_COUNTER0 0x850
406#define TIMER_COUNTER1 0x854
407#define TIMER_COUNTER2 0x858
408#define TIMER_COUNTER3 0x85C
409#define TIMER_COUNTER_0_3_CONTROL 0x864
410#define TIMER_COUNTER_0_3_INTERRUPT_CAUSE 0x868
411#define TIMER_COUNTER_0_3_INTERRUPT_MASK 0x86c
412#define TIMER_COUNTER4 0x950
413#define TIMER_COUNTER5 0x954
414#define TIMER_COUNTER6 0x958
415#define TIMER_COUNTER7 0x95C
416#define TIMER_COUNTER_4_7_CONTROL 0x964
417#define TIMER_COUNTER_4_7_INTERRUPT_CAUSE 0x968
418#define TIMER_COUNTER_4_7_INTERRUPT_MASK 0x96c
419
420/*
421 * PCI Slave Address Decoding
422 */
423
424#define PCI_0SCS_0_BANK_SIZE 0xc08
425#define PCI_1SCS_0_BANK_SIZE 0xc88
426#define PCI_0SCS_1_BANK_SIZE 0xd08
427#define PCI_1SCS_1_BANK_SIZE 0xd88
428#define PCI_0SCS_2_BANK_SIZE 0xc0c
429#define PCI_1SCS_2_BANK_SIZE 0xc8c
430#define PCI_0SCS_3_BANK_SIZE 0xd0c
431#define PCI_1SCS_3_BANK_SIZE 0xd8c
432#define PCI_0CS_0_BANK_SIZE 0xc10
433#define PCI_1CS_0_BANK_SIZE 0xc90
434#define PCI_0CS_1_BANK_SIZE 0xd10
435#define PCI_1CS_1_BANK_SIZE 0xd90
436#define PCI_0CS_2_BANK_SIZE 0xd18
437#define PCI_1CS_2_BANK_SIZE 0xd98
438#define PCI_0CS_3_BANK_SIZE 0xc14
439#define PCI_1CS_3_BANK_SIZE 0xc94
440#define PCI_0CS_BOOT_BANK_SIZE 0xd14
441#define PCI_1CS_BOOT_BANK_SIZE 0xd94
442#define PCI_0P2P_MEM0_BAR_SIZE 0xd1c
443#define PCI_1P2P_MEM0_BAR_SIZE 0xd9c
444#define PCI_0P2P_MEM1_BAR_SIZE 0xd20
445#define PCI_1P2P_MEM1_BAR_SIZE 0xda0
446#define PCI_0P2P_I_O_BAR_SIZE 0xd24
447#define PCI_1P2P_I_O_BAR_SIZE 0xda4
448#define PCI_0CPU_BAR_SIZE 0xd28
449#define PCI_1CPU_BAR_SIZE 0xda8
450#define PCI_0DAC_SCS_0_BANK_SIZE 0xe00
451#define PCI_1DAC_SCS_0_BANK_SIZE 0xe80
452#define PCI_0DAC_SCS_1_BANK_SIZE 0xe04
453#define PCI_1DAC_SCS_1_BANK_SIZE 0xe84
454#define PCI_0DAC_SCS_2_BANK_SIZE 0xe08
455#define PCI_1DAC_SCS_2_BANK_SIZE 0xe88
456#define PCI_0DAC_SCS_3_BANK_SIZE 0xe0c
457#define PCI_1DAC_SCS_3_BANK_SIZE 0xe8c
458#define PCI_0DAC_CS_0_BANK_SIZE 0xe10
459#define PCI_1DAC_CS_0_BANK_SIZE 0xe90
460#define PCI_0DAC_CS_1_BANK_SIZE 0xe14
461#define PCI_1DAC_CS_1_BANK_SIZE 0xe94
462#define PCI_0DAC_CS_2_BANK_SIZE 0xe18
463#define PCI_1DAC_CS_2_BANK_SIZE 0xe98
464#define PCI_0DAC_CS_3_BANK_SIZE 0xe1c
465#define PCI_1DAC_CS_3_BANK_SIZE 0xe9c
466#define PCI_0DAC_BOOTCS_BANK_SIZE 0xe20
467#define PCI_1DAC_BOOTCS_BANK_SIZE 0xea0
468#define PCI_0DAC_P2P_MEM0_BAR_SIZE 0xe24
469#define PCI_1DAC_P2P_MEM0_BAR_SIZE 0xea4
470#define PCI_0DAC_P2P_MEM1_BAR_SIZE 0xe28
471#define PCI_1DAC_P2P_MEM1_BAR_SIZE 0xea8
472#define PCI_0DAC_CPU_BAR_SIZE 0xe2c
473#define PCI_1DAC_CPU_BAR_SIZE 0xeac
474#define PCI_0EXPANSION_ROM_BAR_SIZE 0xd2c
475#define PCI_1EXPANSION_ROM_BAR_SIZE 0xdac
476#define PCI_0BASE_ADDRESS_REGISTERS_ENABLE 0xc3c
477#define PCI_1BASE_ADDRESS_REGISTERS_ENABLE 0xcbc
478#define PCI_0SCS_0_BASE_ADDRESS_REMAP 0xc48
479#define PCI_1SCS_0_BASE_ADDRESS_REMAP 0xcc8
480#define PCI_0SCS_1_BASE_ADDRESS_REMAP 0xd48
481#define PCI_1SCS_1_BASE_ADDRESS_REMAP 0xdc8
482#define PCI_0SCS_2_BASE_ADDRESS_REMAP 0xc4c
483#define PCI_1SCS_2_BASE_ADDRESS_REMAP 0xccc
484#define PCI_0SCS_3_BASE_ADDRESS_REMAP 0xd4c
485#define PCI_1SCS_3_BASE_ADDRESS_REMAP 0xdcc
486#define PCI_0CS_0_BASE_ADDRESS_REMAP 0xc50
487#define PCI_1CS_0_BASE_ADDRESS_REMAP 0xcd0
488#define PCI_0CS_1_BASE_ADDRESS_REMAP 0xd50
489#define PCI_1CS_1_BASE_ADDRESS_REMAP 0xdd0
490#define PCI_0CS_2_BASE_ADDRESS_REMAP 0xd58
491#define PCI_1CS_2_BASE_ADDRESS_REMAP 0xdd8
492#define PCI_0CS_3_BASE_ADDRESS_REMAP 0xc54
493#define PCI_1CS_3_BASE_ADDRESS_REMAP 0xcd4
494#define PCI_0CS_BOOTCS_BASE_ADDRESS_REMAP 0xd54
495#define PCI_1CS_BOOTCS_BASE_ADDRESS_REMAP 0xdd4
496#define PCI_0P2P_MEM0_BASE_ADDRESS_REMAP_LOW 0xd5c
497#define PCI_1P2P_MEM0_BASE_ADDRESS_REMAP_LOW 0xddc
498#define PCI_0P2P_MEM0_BASE_ADDRESS_REMAP_HIGH 0xd60
499#define PCI_1P2P_MEM0_BASE_ADDRESS_REMAP_HIGH 0xde0
500#define PCI_0P2P_MEM1_BASE_ADDRESS_REMAP_LOW 0xd64
501#define PCI_1P2P_MEM1_BASE_ADDRESS_REMAP_LOW 0xde4
502#define PCI_0P2P_MEM1_BASE_ADDRESS_REMAP_HIGH 0xd68
503#define PCI_1P2P_MEM1_BASE_ADDRESS_REMAP_HIGH 0xde8
504#define PCI_0P2P_I_O_BASE_ADDRESS_REMAP 0xd6c
505#define PCI_1P2P_I_O_BASE_ADDRESS_REMAP 0xdec
506#define PCI_0CPU_BASE_ADDRESS_REMAP 0xd70
507#define PCI_1CPU_BASE_ADDRESS_REMAP 0xdf0
508#define PCI_0DAC_SCS_0_BASE_ADDRESS_REMAP 0xf00
509#define PCI_1DAC_SCS_0_BASE_ADDRESS_REMAP 0xff0
510#define PCI_0DAC_SCS_1_BASE_ADDRESS_REMAP 0xf04
511#define PCI_1DAC_SCS_1_BASE_ADDRESS_REMAP 0xf84
512#define PCI_0DAC_SCS_2_BASE_ADDRESS_REMAP 0xf08
513#define PCI_1DAC_SCS_2_BASE_ADDRESS_REMAP 0xf88
514#define PCI_0DAC_SCS_3_BASE_ADDRESS_REMAP 0xf0c
515#define PCI_1DAC_SCS_3_BASE_ADDRESS_REMAP 0xf8c
516#define PCI_0DAC_CS_0_BASE_ADDRESS_REMAP 0xf10
517#define PCI_1DAC_CS_0_BASE_ADDRESS_REMAP 0xf90
518#define PCI_0DAC_CS_1_BASE_ADDRESS_REMAP 0xf14
519#define PCI_1DAC_CS_1_BASE_ADDRESS_REMAP 0xf94
520#define PCI_0DAC_CS_2_BASE_ADDRESS_REMAP 0xf18
521#define PCI_1DAC_CS_2_BASE_ADDRESS_REMAP 0xf98
522#define PCI_0DAC_CS_3_BASE_ADDRESS_REMAP 0xf1c
523#define PCI_1DAC_CS_3_BASE_ADDRESS_REMAP 0xf9c
524#define PCI_0DAC_BOOTCS_BASE_ADDRESS_REMAP 0xf20
525#define PCI_1DAC_BOOTCS_BASE_ADDRESS_REMAP 0xfa0
526#define PCI_0DAC_P2P_MEM0_BASE_ADDRESS_REMAP_LOW 0xf24
527#define PCI_1DAC_P2P_MEM0_BASE_ADDRESS_REMAP_LOW 0xfa4
528#define PCI_0DAC_P2P_MEM0_BASE_ADDRESS_REMAP_HIGH 0xf28
529#define PCI_1DAC_P2P_MEM0_BASE_ADDRESS_REMAP_HIGH 0xfa8
530#define PCI_0DAC_P2P_MEM1_BASE_ADDRESS_REMAP_LOW 0xf2c
531#define PCI_1DAC_P2P_MEM1_BASE_ADDRESS_REMAP_LOW 0xfac
532#define PCI_0DAC_P2P_MEM1_BASE_ADDRESS_REMAP_HIGH 0xf30
533#define PCI_1DAC_P2P_MEM1_BASE_ADDRESS_REMAP_HIGH 0xfb0
534#define PCI_0DAC_CPU_BASE_ADDRESS_REMAP 0xf34
535#define PCI_1DAC_CPU_BASE_ADDRESS_REMAP 0xfb4
536#define PCI_0EXPANSION_ROM_BASE_ADDRESS_REMAP 0xf38
537#define PCI_1EXPANSION_ROM_BASE_ADDRESS_REMAP 0xfb8
538#define PCI_0ADDRESS_DECODE_CONTROL 0xd3c
539#define PCI_1ADDRESS_DECODE_CONTROL 0xdbc
540
541/*
542 * PCI Control
543 */
544
545#define PCI_0COMMAND 0xc00
546#define PCI_1COMMAND 0xc80
547#define PCI_0MODE 0xd00
548#define PCI_1MODE 0xd80
549#define PCI_0TIMEOUT_RETRY 0xc04
550#define PCI_1TIMEOUT_RETRY 0xc84
551#define PCI_0READ_BUFFER_DISCARD_TIMER 0xd04
552#define PCI_1READ_BUFFER_DISCARD_TIMER 0xd84
553#define MSI_0TRIGGER_TIMER 0xc38
554#define MSI_1TRIGGER_TIMER 0xcb8
555#define PCI_0ARBITER_CONTROL 0x1d00
556#define PCI_1ARBITER_CONTROL 0x1d80
557/* changing untill here */
558#define PCI_0CROSS_BAR_CONTROL_LOW 0x1d08
559#define PCI_0CROSS_BAR_CONTROL_HIGH 0x1d0c
560#define PCI_0CROSS_BAR_TIMEOUT 0x1d04
561#define PCI_0READ_RESPONSE_CROSS_BAR_CONTROL_LOW 0x1d18
562#define PCI_0READ_RESPONSE_CROSS_BAR_CONTROL_HIGH 0x1d1c
563#define PCI_0SYNC_BARRIER_VIRTUAL_REGISTER 0x1d10
564#define PCI_0P2P_CONFIGURATION 0x1d14
565#define PCI_0ACCESS_CONTROL_BASE_0_LOW 0x1e00
566#define PCI_0ACCESS_CONTROL_BASE_0_HIGH 0x1e04
567#define PCI_0ACCESS_CONTROL_TOP_0 0x1e08
568#define PCI_0ACCESS_CONTROL_BASE_1_LOW 0c1e10
569#define PCI_0ACCESS_CONTROL_BASE_1_HIGH 0x1e14
570#define PCI_0ACCESS_CONTROL_TOP_1 0x1e18
571#define PCI_0ACCESS_CONTROL_BASE_2_LOW 0c1e20
572#define PCI_0ACCESS_CONTROL_BASE_2_HIGH 0x1e24
573#define PCI_0ACCESS_CONTROL_TOP_2 0x1e28
574#define PCI_0ACCESS_CONTROL_BASE_3_LOW 0c1e30
575#define PCI_0ACCESS_CONTROL_BASE_3_HIGH 0x1e34
576#define PCI_0ACCESS_CONTROL_TOP_3 0x1e38
577#define PCI_0ACCESS_CONTROL_BASE_4_LOW 0c1e40
578#define PCI_0ACCESS_CONTROL_BASE_4_HIGH 0x1e44
579#define PCI_0ACCESS_CONTROL_TOP_4 0x1e48
580#define PCI_0ACCESS_CONTROL_BASE_5_LOW 0c1e50
581#define PCI_0ACCESS_CONTROL_BASE_5_HIGH 0x1e54
582#define PCI_0ACCESS_CONTROL_TOP_5 0x1e58
583#define PCI_0ACCESS_CONTROL_BASE_6_LOW 0c1e60
584#define PCI_0ACCESS_CONTROL_BASE_6_HIGH 0x1e64
585#define PCI_0ACCESS_CONTROL_TOP_6 0x1e68
586#define PCI_0ACCESS_CONTROL_BASE_7_LOW 0c1e70
587#define PCI_0ACCESS_CONTROL_BASE_7_HIGH 0x1e74
588#define PCI_0ACCESS_CONTROL_TOP_7 0x1e78
589#define PCI_1CROSS_BAR_CONTROL_LOW 0x1d88
590#define PCI_1CROSS_BAR_CONTROL_HIGH 0x1d8c
591#define PCI_1CROSS_BAR_TIMEOUT 0x1d84
592#define PCI_1READ_RESPONSE_CROSS_BAR_CONTROL_LOW 0x1d98
593#define PCI_1READ_RESPONSE_CROSS_BAR_CONTROL_HIGH 0x1d9c
594#define PCI_1SYNC_BARRIER_VIRTUAL_REGISTER 0x1d90
595#define PCI_1P2P_CONFIGURATION 0x1d94
596#define PCI_1ACCESS_CONTROL_BASE_0_LOW 0x1e80
597#define PCI_1ACCESS_CONTROL_BASE_0_HIGH 0x1e84
598#define PCI_1ACCESS_CONTROL_TOP_0 0x1e88
599#define PCI_1ACCESS_CONTROL_BASE_1_LOW 0c1e90
600#define PCI_1ACCESS_CONTROL_BASE_1_HIGH 0x1e94
601#define PCI_1ACCESS_CONTROL_TOP_1 0x1e98
602#define PCI_1ACCESS_CONTROL_BASE_2_LOW 0c1ea0
603#define PCI_1ACCESS_CONTROL_BASE_2_HIGH 0x1ea4
604#define PCI_1ACCESS_CONTROL_TOP_2 0x1ea8
605#define PCI_1ACCESS_CONTROL_BASE_3_LOW 0c1eb0
606#define PCI_1ACCESS_CONTROL_BASE_3_HIGH 0x1eb4
607#define PCI_1ACCESS_CONTROL_TOP_3 0x1eb8
608#define PCI_1ACCESS_CONTROL_BASE_4_LOW 0c1ec0
609#define PCI_1ACCESS_CONTROL_BASE_4_HIGH 0x1ec4
610#define PCI_1ACCESS_CONTROL_TOP_4 0x1ec8
611#define PCI_1ACCESS_CONTROL_BASE_5_LOW 0c1ed0
612#define PCI_1ACCESS_CONTROL_BASE_5_HIGH 0x1ed4
613#define PCI_1ACCESS_CONTROL_TOP_5 0x1ed8
614#define PCI_1ACCESS_CONTROL_BASE_6_LOW 0c1ee0
615#define PCI_1ACCESS_CONTROL_BASE_6_HIGH 0x1ee4
616#define PCI_1ACCESS_CONTROL_TOP_6 0x1ee8
617#define PCI_1ACCESS_CONTROL_BASE_7_LOW 0c1ef0
618#define PCI_1ACCESS_CONTROL_BASE_7_HIGH 0x1ef4
619#define PCI_1ACCESS_CONTROL_TOP_7 0x1ef8
620
621/*
622 * PCI Snoop Control
623 */
624
625#define PCI_0SNOOP_CONTROL_BASE_0_LOW 0x1f00
626#define PCI_0SNOOP_CONTROL_BASE_0_HIGH 0x1f04
627#define PCI_0SNOOP_CONTROL_TOP_0 0x1f08
628#define PCI_0SNOOP_CONTROL_BASE_1_0_LOW 0x1f10
629#define PCI_0SNOOP_CONTROL_BASE_1_0_HIGH 0x1f14
630#define PCI_0SNOOP_CONTROL_TOP_1 0x1f18
631#define PCI_0SNOOP_CONTROL_BASE_2_0_LOW 0x1f20
632#define PCI_0SNOOP_CONTROL_BASE_2_0_HIGH 0x1f24
633#define PCI_0SNOOP_CONTROL_TOP_2 0x1f28
634#define PCI_0SNOOP_CONTROL_BASE_3_0_LOW 0x1f30
635#define PCI_0SNOOP_CONTROL_BASE_3_0_HIGH 0x1f34
636#define PCI_0SNOOP_CONTROL_TOP_3 0x1f38
637#define PCI_1SNOOP_CONTROL_BASE_0_LOW 0x1f80
638#define PCI_1SNOOP_CONTROL_BASE_0_HIGH 0x1f84
639#define PCI_1SNOOP_CONTROL_TOP_0 0x1f88
640#define PCI_1SNOOP_CONTROL_BASE_1_0_LOW 0x1f90
641#define PCI_1SNOOP_CONTROL_BASE_1_0_HIGH 0x1f94
642#define PCI_1SNOOP_CONTROL_TOP_1 0x1f98
643#define PCI_1SNOOP_CONTROL_BASE_2_0_LOW 0x1fa0
644#define PCI_1SNOOP_CONTROL_BASE_2_0_HIGH 0x1fa4
645#define PCI_1SNOOP_CONTROL_TOP_2 0x1fa8
646#define PCI_1SNOOP_CONTROL_BASE_3_0_LOW 0x1fb0
647#define PCI_1SNOOP_CONTROL_BASE_3_0_HIGH 0x1fb4
648#define PCI_1SNOOP_CONTROL_TOP_3 0x1fb8
649
650/*
651 * PCI Configuration Address
652 */
653
654#define PCI_0CONFIGURATION_ADDRESS 0xcf8
655#define PCI_0CONFIGURATION_DATA_VIRTUAL_REGISTER 0xcfc
656#define PCI_1CONFIGURATION_ADDRESS 0xc78
657#define PCI_1CONFIGURATION_DATA_VIRTUAL_REGISTER 0xc7c
658#define PCI_0INTERRUPT_ACKNOWLEDGE_VIRTUAL_REGISTER 0xc34
659#define PCI_1INTERRUPT_ACKNOWLEDGE_VIRTUAL_REGISTER 0xcb4
660
661/*
662 * PCI Error Report
663 */
664
665#define PCI_0SERR_MASK 0xc28
666#define PCI_0ERROR_ADDRESS_LOW 0x1d40
667#define PCI_0ERROR_ADDRESS_HIGH 0x1d44
668#define PCI_0ERROR_DATA_LOW 0x1d48
669#define PCI_0ERROR_DATA_HIGH 0x1d4c
670#define PCI_0ERROR_COMMAND 0x1d50
671#define PCI_0ERROR_CAUSE 0x1d58
672#define PCI_0ERROR_MASK 0x1d5c
673
674#define PCI_1SERR_MASK 0xca8
675#define PCI_1ERROR_ADDRESS_LOW 0x1dc0
676#define PCI_1ERROR_ADDRESS_HIGH 0x1dc4
677#define PCI_1ERROR_DATA_LOW 0x1dc8
678#define PCI_1ERROR_DATA_HIGH 0x1dcc
679#define PCI_1ERROR_COMMAND 0x1dd0
680#define PCI_1ERROR_CAUSE 0x1dd8
681#define PCI_1ERROR_MASK 0x1ddc
682
683
684/*
685 * Lslave Debug (for internal use)
686 */
687
688#define L_SLAVE_X0_ADDRESS 0x1d20
689#define L_SLAVE_X0_COMMAND_AND_ID 0x1d24
690#define L_SLAVE_X1_ADDRESS 0x1d28
691#define L_SLAVE_X1_COMMAND_AND_ID 0x1d2c
692#define L_SLAVE_WRITE_DATA_LOW 0x1d30
693#define L_SLAVE_WRITE_DATA_HIGH 0x1d34
694#define L_SLAVE_WRITE_BYTE_ENABLE 0x1d60
695#define L_SLAVE_READ_DATA_LOW 0x1d38
696#define L_SLAVE_READ_DATA_HIGH 0x1d3c
697#define L_SLAVE_READ_ID 0x1d64
698
699#if 0 /* Disabled because PCI_* namespace belongs to PCI subsystem ... */
700
701/*
702 * PCI Configuration Function 0
703 */
704
705#define PCI_DEVICE_AND_VENDOR_ID 0x000
706#define PCI_STATUS_AND_COMMAND 0x004
707#define PCI_CLASS_CODE_AND_REVISION_ID 0x008
708#define PCI_BIST_HEADER_TYPE_LATENCY_TIMER_CACHE_LINE 0x00C
709#define PCI_SCS_0_BASE_ADDRESS 0x010
710#define PCI_SCS_1_BASE_ADDRESS 0x014
711#define PCI_SCS_2_BASE_ADDRESS 0x018
712#define PCI_SCS_3_BASE_ADDRESS 0x01C
713#define PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS 0x020
714#define PCI_INTERNAL_REGISTERS_I_OMAPPED_BASE_ADDRESS 0x024
715#define PCI_SUBSYSTEM_ID_AND_SUBSYSTEM_VENDOR_ID 0x02C
716#define PCI_EXPANSION_ROM_BASE_ADDRESS_REGISTER 0x030
717#define PCI_CAPABILTY_LIST_POINTER 0x034
718#define PCI_INTERRUPT_PIN_AND_LINE 0x03C
719#define PCI_POWER_MANAGEMENT_CAPABILITY 0x040
720#define PCI_POWER_MANAGEMENT_STATUS_AND_CONTROL 0x044
721#define PCI_VPD_ADDRESS 0x048
722#define PCI_VPD_DATA 0X04c
723#define PCI_MSI_MESSAGE_CONTROL 0x050
724#define PCI_MSI_MESSAGE_ADDRESS 0x054
725#define PCI_MSI_MESSAGE_UPPER_ADDRESS 0x058
726#define PCI_MSI_MESSAGE_DATA 0x05c
727#define PCI_COMPACT_PCI_HOT_SWAP_CAPABILITY 0x058
728
729/*
730 * PCI Configuration Function 1
731 */
732
733#define PCI_CS_0_BASE_ADDRESS 0x110
734#define PCI_CS_1_BASE_ADDRESS 0x114
735#define PCI_CS_2_BASE_ADDRESS 0x118
736#define PCI_CS_3_BASE_ADDRESS 0x11c
737#define PCI_BOOTCS_BASE_ADDRESS 0x120
738
739/*
740 * PCI Configuration Function 2
741 */
742
743#define PCI_P2P_MEM0_BASE_ADDRESS 0x210
744#define PCI_P2P_MEM1_BASE_ADDRESS 0x214
745#define PCI_P2P_I_O_BASE_ADDRESS 0x218
746#define PCI_CPU_BASE_ADDRESS 0x21c
747
748/*
749 * PCI Configuration Function 4
750 */
751
752#define PCI_DAC_SCS_0_BASE_ADDRESS_LOW 0x410
753#define PCI_DAC_SCS_0_BASE_ADDRESS_HIGH 0x414
754#define PCI_DAC_SCS_1_BASE_ADDRESS_LOW 0x418
755#define PCI_DAC_SCS_1_BASE_ADDRESS_HIGH 0x41c
756#define PCI_DAC_P2P_MEM0_BASE_ADDRESS_LOW 0x420
757#define PCI_DAC_P2P_MEM0_BASE_ADDRESS_HIGH 0x424
758
759
760/*
761 * PCI Configuration Function 5
762 */
763
764#define PCI_DAC_SCS_2_BASE_ADDRESS_LOW 0x510
765#define PCI_DAC_SCS_2_BASE_ADDRESS_HIGH 0x514
766#define PCI_DAC_SCS_3_BASE_ADDRESS_LOW 0x518
767#define PCI_DAC_SCS_3_BASE_ADDRESS_HIGH 0x51c
768#define PCI_DAC_P2P_MEM1_BASE_ADDRESS_LOW 0x520
769#define PCI_DAC_P2P_MEM1_BASE_ADDRESS_HIGH 0x524
770
771
772/*
773 * PCI Configuration Function 6
774 */
775
776#define PCI_DAC_CS_0_BASE_ADDRESS_LOW 0x610
777#define PCI_DAC_CS_0_BASE_ADDRESS_HIGH 0x614
778#define PCI_DAC_CS_1_BASE_ADDRESS_LOW 0x618
779#define PCI_DAC_CS_1_BASE_ADDRESS_HIGH 0x61c
780#define PCI_DAC_CS_2_BASE_ADDRESS_LOW 0x620
781#define PCI_DAC_CS_2_BASE_ADDRESS_HIGH 0x624
782
783/*
784 * PCI Configuration Function 7
785 */
786
787#define PCI_DAC_CS_3_BASE_ADDRESS_LOW 0x710
788#define PCI_DAC_CS_3_BASE_ADDRESS_HIGH 0x714
789#define PCI_DAC_BOOTCS_BASE_ADDRESS_LOW 0x718
790#define PCI_DAC_BOOTCS_BASE_ADDRESS_HIGH 0x71c
791#define PCI_DAC_CPU_BASE_ADDRESS_LOW 0x720
792#define PCI_DAC_CPU_BASE_ADDRESS_HIGH 0x724
793#endif
794
795/*
796 * Interrupts
797 */
798
799#define LOW_INTERRUPT_CAUSE_REGISTER 0xc18
800#define HIGH_INTERRUPT_CAUSE_REGISTER 0xc68
801#define CPU_INTERRUPT_MASK_REGISTER_LOW 0xc1c
802#define CPU_INTERRUPT_MASK_REGISTER_HIGH 0xc6c
803#define CPU_SELECT_CAUSE_REGISTER 0xc70
804#define PCI_0INTERRUPT_CAUSE_MASK_REGISTER_LOW 0xc24
805#define PCI_0INTERRUPT_CAUSE_MASK_REGISTER_HIGH 0xc64
806#define PCI_0SELECT_CAUSE 0xc74
807#define PCI_1INTERRUPT_CAUSE_MASK_REGISTER_LOW 0xca4
808#define PCI_1INTERRUPT_CAUSE_MASK_REGISTER_HIGH 0xce4
809#define PCI_1SELECT_CAUSE 0xcf4
810#define CPU_INT_0_MASK 0xe60
811#define CPU_INT_1_MASK 0xe64
812#define CPU_INT_2_MASK 0xe68
813#define CPU_INT_3_MASK 0xe6c
814
815/*
816 * I20 Support registers
817 */
818
819#define INBOUND_MESSAGE_REGISTER0_PCI0_SIDE 0x010
820#define INBOUND_MESSAGE_REGISTER1_PCI0_SIDE 0x014
821#define OUTBOUND_MESSAGE_REGISTER0_PCI0_SIDE 0x018
822#define OUTBOUND_MESSAGE_REGISTER1_PCI0_SIDE 0x01C
823#define INBOUND_DOORBELL_REGISTER_PCI0_SIDE 0x020
824#define INBOUND_INTERRUPT_CAUSE_REGISTER_PCI0_SIDE 0x024
825#define INBOUND_INTERRUPT_MASK_REGISTER_PCI0_SIDE 0x028
826#define OUTBOUND_DOORBELL_REGISTER_PCI0_SIDE 0x02C
827#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_PCI0_SIDE 0x030
828#define OUTBOUND_INTERRUPT_MASK_REGISTER_PCI0_SIDE 0x034
829#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI0_SIDE 0x040
830#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI0_SIDE 0x044
831#define QUEUE_CONTROL_REGISTER_PCI0_SIDE 0x050
832#define QUEUE_BASE_ADDRESS_REGISTER_PCI0_SIDE 0x054
833#define INBOUND_FREE_HEAD_POINTER_REGISTER_PCI0_SIDE 0x060
834#define INBOUND_FREE_TAIL_POINTER_REGISTER_PCI0_SIDE 0x064
835#define INBOUND_POST_HEAD_POINTER_REGISTER_PCI0_SIDE 0x068
836#define INBOUND_POST_TAIL_POINTER_REGISTER_PCI0_SIDE 0x06C
837#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_PCI0_SIDE 0x070
838#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_PCI0_SIDE 0x074
839#define OUTBOUND_POST_HEAD_POINTER_REGISTER_PCI0_SIDE 0x0F8
840#define OUTBOUND_POST_TAIL_POINTER_REGISTER_PCI0_SIDE 0x0FC
841
842#define INBOUND_MESSAGE_REGISTER0_PCI1_SIDE 0x090
843#define INBOUND_MESSAGE_REGISTER1_PCI1_SIDE 0x094
844#define OUTBOUND_MESSAGE_REGISTER0_PCI1_SIDE 0x098
845#define OUTBOUND_MESSAGE_REGISTER1_PCI1_SIDE 0x09C
846#define INBOUND_DOORBELL_REGISTER_PCI1_SIDE 0x0A0
847#define INBOUND_INTERRUPT_CAUSE_REGISTER_PCI1_SIDE 0x0A4
848#define INBOUND_INTERRUPT_MASK_REGISTER_PCI1_SIDE 0x0A8
849#define OUTBOUND_DOORBELL_REGISTER_PCI1_SIDE 0x0AC
850#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_PCI1_SIDE 0x0B0
851#define OUTBOUND_INTERRUPT_MASK_REGISTER_PCI1_SIDE 0x0B4
852#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI1_SIDE 0x0C0
853#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_PCI1_SIDE 0x0C4
854#define QUEUE_CONTROL_REGISTER_PCI1_SIDE 0x0D0
855#define QUEUE_BASE_ADDRESS_REGISTER_PCI1_SIDE 0x0D4
856#define INBOUND_FREE_HEAD_POINTER_REGISTER_PCI1_SIDE 0x0E0
857#define INBOUND_FREE_TAIL_POINTER_REGISTER_PCI1_SIDE 0x0E4
858#define INBOUND_POST_HEAD_POINTER_REGISTER_PCI1_SIDE 0x0E8
859#define INBOUND_POST_TAIL_POINTER_REGISTER_PCI1_SIDE 0x0EC
860#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_PCI1_SIDE 0x0F0
861#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_PCI1_SIDE 0x0F4
862#define OUTBOUND_POST_HEAD_POINTER_REGISTER_PCI1_SIDE 0x078
863#define OUTBOUND_POST_TAIL_POINTER_REGISTER_PCI1_SIDE 0x07C
864
865#define INBOUND_MESSAGE_REGISTER0_CPU0_SIDE 0X1C10
866#define INBOUND_MESSAGE_REGISTER1_CPU0_SIDE 0X1C14
867#define OUTBOUND_MESSAGE_REGISTER0_CPU0_SIDE 0X1C18
868#define OUTBOUND_MESSAGE_REGISTER1_CPU0_SIDE 0X1C1C
869#define INBOUND_DOORBELL_REGISTER_CPU0_SIDE 0X1C20
870#define INBOUND_INTERRUPT_CAUSE_REGISTER_CPU0_SIDE 0X1C24
871#define INBOUND_INTERRUPT_MASK_REGISTER_CPU0_SIDE 0X1C28
872#define OUTBOUND_DOORBELL_REGISTER_CPU0_SIDE 0X1C2C
873#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_CPU0_SIDE 0X1C30
874#define OUTBOUND_INTERRUPT_MASK_REGISTER_CPU0_SIDE 0X1C34
875#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU0_SIDE 0X1C40
876#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU0_SIDE 0X1C44
877#define QUEUE_CONTROL_REGISTER_CPU0_SIDE 0X1C50
878#define QUEUE_BASE_ADDRESS_REGISTER_CPU0_SIDE 0X1C54
879#define INBOUND_FREE_HEAD_POINTER_REGISTER_CPU0_SIDE 0X1C60
880#define INBOUND_FREE_TAIL_POINTER_REGISTER_CPU0_SIDE 0X1C64
881#define INBOUND_POST_HEAD_POINTER_REGISTER_CPU0_SIDE 0X1C68
882#define INBOUND_POST_TAIL_POINTER_REGISTER_CPU0_SIDE 0X1C6C
883#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_CPU0_SIDE 0X1C70
884#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_CPU0_SIDE 0X1C74
885#define OUTBOUND_POST_HEAD_POINTER_REGISTER_CPU0_SIDE 0X1CF8
886#define OUTBOUND_POST_TAIL_POINTER_REGISTER_CPU0_SIDE 0X1CFC
887
888#define INBOUND_MESSAGE_REGISTER0_CPU1_SIDE 0X1C90
889#define INBOUND_MESSAGE_REGISTER1_CPU1_SIDE 0X1C94
890#define OUTBOUND_MESSAGE_REGISTER0_CPU1_SIDE 0X1C98
891#define OUTBOUND_MESSAGE_REGISTER1_CPU1_SIDE 0X1C9C
892#define INBOUND_DOORBELL_REGISTER_CPU1_SIDE 0X1CA0
893#define INBOUND_INTERRUPT_CAUSE_REGISTER_CPU1_SIDE 0X1CA4
894#define INBOUND_INTERRUPT_MASK_REGISTER_CPU1_SIDE 0X1CA8
895#define OUTBOUND_DOORBELL_REGISTER_CPU1_SIDE 0X1CAC
896#define OUTBOUND_INTERRUPT_CAUSE_REGISTER_CPU1_SIDE 0X1CB0
897#define OUTBOUND_INTERRUPT_MASK_REGISTER_CPU1_SIDE 0X1CB4
898#define INBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU1_SIDE 0X1CC0
899#define OUTBOUND_QUEUE_PORT_VIRTUAL_REGISTER_CPU1_SIDE 0X1CC4
900#define QUEUE_CONTROL_REGISTER_CPU1_SIDE 0X1CD0
901#define QUEUE_BASE_ADDRESS_REGISTER_CPU1_SIDE 0X1CD4
902#define INBOUND_FREE_HEAD_POINTER_REGISTER_CPU1_SIDE 0X1CE0
903#define INBOUND_FREE_TAIL_POINTER_REGISTER_CPU1_SIDE 0X1CE4
904#define INBOUND_POST_HEAD_POINTER_REGISTER_CPU1_SIDE 0X1CE8
905#define INBOUND_POST_TAIL_POINTER_REGISTER_CPU1_SIDE 0X1CEC
906#define OUTBOUND_FREE_HEAD_POINTER_REGISTER_CPU1_SIDE 0X1CF0
907#define OUTBOUND_FREE_TAIL_POINTER_REGISTER_CPU1_SIDE 0X1CF4
908#define OUTBOUND_POST_HEAD_POINTER_REGISTER_CPU1_SIDE 0X1C78
909#define OUTBOUND_POST_TAIL_POINTER_REGISTER_CPU1_SIDE 0X1C7C
910
911/*
912 * Communication Unit Registers
913 */
914
915#define ETHERNET_0_ADDRESS_CONTROL_LOW
916#define ETHERNET_0_ADDRESS_CONTROL_HIGH 0xf204
917#define ETHERNET_0_RECEIVE_BUFFER_PCI_HIGH_ADDRESS 0xf208
918#define ETHERNET_0_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS 0xf20c
919#define ETHERNET_0_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf210
920#define ETHERNET_0_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf214
921#define ETHERNET_0_HASH_TABLE_PCI_HIGH_ADDRESS 0xf218
922#define ETHERNET_1_ADDRESS_CONTROL_LOW 0xf220
923#define ETHERNET_1_ADDRESS_CONTROL_HIGH 0xf224
924#define ETHERNET_1_RECEIVE_BUFFER_PCI_HIGH_ADDRESS 0xf228
925#define ETHERNET_1_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS 0xf22c
926#define ETHERNET_1_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf230
927#define ETHERNET_1_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf234
928#define ETHERNET_1_HASH_TABLE_PCI_HIGH_ADDRESS 0xf238
929#define ETHERNET_2_ADDRESS_CONTROL_LOW 0xf240
930#define ETHERNET_2_ADDRESS_CONTROL_HIGH 0xf244
931#define ETHERNET_2_RECEIVE_BUFFER_PCI_HIGH_ADDRESS 0xf248
932#define ETHERNET_2_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS 0xf24c
933#define ETHERNET_2_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf250
934#define ETHERNET_2_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf254
935#define ETHERNET_2_HASH_TABLE_PCI_HIGH_ADDRESS 0xf258
936#define MPSC_0_ADDRESS_CONTROL_LOW 0xf280
937#define MPSC_0_ADDRESS_CONTROL_HIGH 0xf284
938#define MPSC_0_RECEIVE_BUFFER_PCI_HIGH_ADDRESS 0xf288
939#define MPSC_0_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS 0xf28c
940#define MPSC_0_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf290
941#define MPSC_0_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf294
942#define MPSC_1_ADDRESS_CONTROL_LOW 0xf2a0
943#define MPSC_1_ADDRESS_CONTROL_HIGH 0xf2a4
944#define MPSC_1_RECEIVE_BUFFER_PCI_HIGH_ADDRESS 0xf2a8
945#define MPSC_1_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS 0xf2ac
946#define MPSC_1_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf2b0
947#define MPSC_1_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf2b4
948#define MPSC_2_ADDRESS_CONTROL_LOW 0xf2c0
949#define MPSC_2_ADDRESS_CONTROL_HIGH 0xf2c4
950#define MPSC_2_RECEIVE_BUFFER_PCI_HIGH_ADDRESS 0xf2c8
951#define MPSC_2_TRANSMIT_BUFFER_PCI_HIGH_ADDRESS 0xf2cc
952#define MPSC_2_RECEIVE_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf2d0
953#define MPSC_2_TRANSMIT_DESCRIPTOR_PCI_HIGH_ADDRESS 0xf2d4
954#define SERIAL_INIT_PCI_HIGH_ADDRESS 0xf320
955#define SERIAL_INIT_LAST_DATA 0xf324
956#define SERIAL_INIT_STATUS_AND_CONTROL 0xf328
957#define COMM_UNIT_ARBITER_CONTROL 0xf300
958#define COMM_UNIT_CROSS_BAR_TIMEOUT 0xf304
959#define COMM_UNIT_INTERRUPT_CAUSE 0xf310
960#define COMM_UNIT_INTERRUPT_MASK 0xf314
961#define COMM_UNIT_ERROR_ADDRESS 0xf314
962
963/*
964 * Cunit Debug (for internal use)
965 */
966
967#define CUNIT_ADDRESS 0xf340
968#define CUNIT_COMMAND_AND_ID 0xf344
969#define CUNIT_WRITE_DATA_LOW 0xf348
970#define CUNIT_WRITE_DATA_HIGH 0xf34c
971#define CUNIT_WRITE_BYTE_ENABLE 0xf358
972#define CUNIT_READ_DATA_LOW 0xf350
973#define CUNIT_READ_DATA_HIGH 0xf354
974#define CUNIT_READ_ID 0xf35c
975
976/*
977 * Fast Ethernet Unit Registers
978 */
979
980/* Ethernet */
981
982#define ETHERNET_PHY_ADDRESS_REGISTER 0x2000
983#define ETHERNET_SMI_REGISTER 0x2010
984
985/* Ethernet 0 */
986
987#define ETHERNET0_PORT_CONFIGURATION_REGISTER 0x2400
988#define ETHERNET0_PORT_CONFIGURATION_EXTEND_REGISTER 0x2408
989#define ETHERNET0_PORT_COMMAND_REGISTER 0x2410
990#define ETHERNET0_PORT_STATUS_REGISTER 0x2418
991#define ETHERNET0_SERIAL_PARAMETRS_REGISTER 0x2420
992#define ETHERNET0_HASH_TABLE_POINTER_REGISTER 0x2428
993#define ETHERNET0_FLOW_CONTROL_SOURCE_ADDRESS_LOW 0x2430
994#define ETHERNET0_FLOW_CONTROL_SOURCE_ADDRESS_HIGH 0x2438
995#define ETHERNET0_SDMA_CONFIGURATION_REGISTER 0x2440
996#define ETHERNET0_SDMA_COMMAND_REGISTER 0x2448
997#define ETHERNET0_INTERRUPT_CAUSE_REGISTER 0x2450
998#define ETHERNET0_INTERRUPT_MASK_REGISTER 0x2458
999#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER0 0x2480
1000#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER1 0x2484
1001#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER2 0x2488
1002#define ETHERNET0_FIRST_RX_DESCRIPTOR_POINTER3 0x248c
1003#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER0 0x24a0
1004#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER1 0x24a4
1005#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER2 0x24a8
1006#define ETHERNET0_CURRENT_RX_DESCRIPTOR_POINTER3 0x24ac
1007#define ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER0 0x24e0
1008#define ETHERNET0_CURRENT_TX_DESCRIPTOR_POINTER1 0x24e4
1009#define ETHERNET0_MIB_COUNTER_BASE 0x2500
1010
1011/* Ethernet 1 */
1012
1013#define ETHERNET1_PORT_CONFIGURATION_REGISTER 0x2800
1014#define ETHERNET1_PORT_CONFIGURATION_EXTEND_REGISTER 0x2808
1015#define ETHERNET1_PORT_COMMAND_REGISTER 0x2810
1016#define ETHERNET1_PORT_STATUS_REGISTER 0x2818
1017#define ETHERNET1_SERIAL_PARAMETRS_REGISTER 0x2820
1018#define ETHERNET1_HASH_TABLE_POINTER_REGISTER 0x2828
1019#define ETHERNET1_FLOW_CONTROL_SOURCE_ADDRESS_LOW 0x2830
1020#define ETHERNET1_FLOW_CONTROL_SOURCE_ADDRESS_HIGH 0x2838
1021#define ETHERNET1_SDMA_CONFIGURATION_REGISTER 0x2840
1022#define ETHERNET1_SDMA_COMMAND_REGISTER 0x2848
1023#define ETHERNET1_INTERRUPT_CAUSE_REGISTER 0x2850
1024#define ETHERNET1_INTERRUPT_MASK_REGISTER 0x2858
1025#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER0 0x2880
1026#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER1 0x2884
1027#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER2 0x2888
1028#define ETHERNET1_FIRST_RX_DESCRIPTOR_POINTER3 0x288c
1029#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER0 0x28a0
1030#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER1 0x28a4
1031#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER2 0x28a8
1032#define ETHERNET1_CURRENT_RX_DESCRIPTOR_POINTER3 0x28ac
1033#define ETHERNET1_CURRENT_TX_DESCRIPTOR_POINTER0 0x28e0
1034#define ETHERNET1_CURRENT_TX_DESCRIPTOR_POINTER1 0x28e4
1035#define ETHERNET1_MIB_COUNTER_BASE 0x2900
1036
1037/* Ethernet 2 */
1038
1039#define ETHERNET2_PORT_CONFIGURATION_REGISTER 0x2c00
1040#define ETHERNET2_PORT_CONFIGURATION_EXTEND_REGISTER 0x2c08
1041#define ETHERNET2_PORT_COMMAND_REGISTER 0x2c10
1042#define ETHERNET2_PORT_STATUS_REGISTER 0x2c18
1043#define ETHERNET2_SERIAL_PARAMETRS_REGISTER 0x2c20
1044#define ETHERNET2_HASH_TABLE_POINTER_REGISTER 0x2c28
1045#define ETHERNET2_FLOW_CONTROL_SOURCE_ADDRESS_LOW 0x2c30
1046#define ETHERNET2_FLOW_CONTROL_SOURCE_ADDRESS_HIGH 0x2c38
1047#define ETHERNET2_SDMA_CONFIGURATION_REGISTER 0x2c40
1048#define ETHERNET2_SDMA_COMMAND_REGISTER 0x2c48
1049#define ETHERNET2_INTERRUPT_CAUSE_REGISTER 0x2c50
1050#define ETHERNET2_INTERRUPT_MASK_REGISTER 0x2c58
1051#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER0 0x2c80
1052#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER1 0x2c84
1053#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER2 0x2c88
1054#define ETHERNET2_FIRST_RX_DESCRIPTOR_POINTER3 0x2c8c
1055#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER0 0x2ca0
1056#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER1 0x2ca4
1057#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER2 0x2ca8
1058#define ETHERNET2_CURRENT_RX_DESCRIPTOR_POINTER3 0x2cac
1059#define ETHERNET2_CURRENT_TX_DESCRIPTOR_POINTER0 0x2ce0
1060#define ETHERNET2_CURRENT_TX_DESCRIPTOR_POINTER1 0x2ce4
1061#define ETHERNET2_MIB_COUNTER_BASE 0x2d00
1062
1063/*
1064 * SDMA Registers
1065 */
1066
1067#define SDMA_GROUP_CONFIGURATION_REGISTER 0xb1f0
1068#define CHANNEL0_CONFIGURATION_REGISTER 0x4000
1069#define CHANNEL0_COMMAND_REGISTER 0x4008
1070#define CHANNEL0_RX_CMD_STATUS 0x4800
1071#define CHANNEL0_RX_PACKET_AND_BUFFER_SIZES 0x4804
1072#define CHANNEL0_RX_BUFFER_POINTER 0x4808
1073#define CHANNEL0_RX_NEXT_POINTER 0x480c
1074#define CHANNEL0_CURRENT_RX_DESCRIPTOR_POINTER 0x4810
1075#define CHANNEL0_TX_CMD_STATUS 0x4C00
1076#define CHANNEL0_TX_PACKET_SIZE 0x4C04
1077#define CHANNEL0_TX_BUFFER_POINTER 0x4C08
1078#define CHANNEL0_TX_NEXT_POINTER 0x4C0c
1079#define CHANNEL0_CURRENT_TX_DESCRIPTOR_POINTER 0x4c10
1080#define CHANNEL0_FIRST_TX_DESCRIPTOR_POINTER 0x4c14
1081#define CHANNEL1_CONFIGURATION_REGISTER 0x6000
1082#define CHANNEL1_COMMAND_REGISTER 0x6008
1083#define CHANNEL1_RX_CMD_STATUS 0x6800
1084#define CHANNEL1_RX_PACKET_AND_BUFFER_SIZES 0x6804
1085#define CHANNEL1_RX_BUFFER_POINTER 0x6808
1086#define CHANNEL1_RX_NEXT_POINTER 0x680c
1087#define CHANNEL1_CURRENT_RX_DESCRIPTOR_POINTER 0x6810
1088#define CHANNEL1_TX_CMD_STATUS 0x6C00
1089#define CHANNEL1_TX_PACKET_SIZE 0x6C04
1090#define CHANNEL1_TX_BUFFER_POINTER 0x6C08
1091#define CHANNEL1_TX_NEXT_POINTER 0x6C0c
1092#define CHANNEL1_CURRENT_RX_DESCRIPTOR_POINTER 0x6810
1093#define CHANNEL1_CURRENT_TX_DESCRIPTOR_POINTER 0x6c10
1094#define CHANNEL1_FIRST_TX_DESCRIPTOR_POINTER 0x6c14
1095
1096/* SDMA Interrupt */
1097
1098#define SDMA_CAUSE 0xb820
1099#define SDMA_MASK 0xb8a0
1100
1101
1102/*
1103 * Baude Rate Generators Registers
1104 */
1105
1106/* BRG 0 */
1107
1108#define BRG0_CONFIGURATION_REGISTER 0xb200
1109#define BRG0_BAUDE_TUNING_REGISTER 0xb204
1110
1111/* BRG 1 */
1112
1113#define BRG1_CONFIGURATION_REGISTER 0xb208
1114#define BRG1_BAUDE_TUNING_REGISTER 0xb20c
1115
1116/* BRG 2 */
1117
1118#define BRG2_CONFIGURATION_REGISTER 0xb210
1119#define BRG2_BAUDE_TUNING_REGISTER 0xb214
1120
1121/* BRG Interrupts */
1122
1123#define BRG_CAUSE_REGISTER 0xb834
1124#define BRG_MASK_REGISTER 0xb8b4
1125
1126/* MISC */
1127
1128#define MAIN_ROUTING_REGISTER 0xb400
1129#define RECEIVE_CLOCK_ROUTING_REGISTER 0xb404
1130#define TRANSMIT_CLOCK_ROUTING_REGISTER 0xb408
1131#define COMM_UNIT_ARBITER_CONFIGURATION_REGISTER 0xb40c
1132#define WATCHDOG_CONFIGURATION_REGISTER 0xb410
1133#define WATCHDOG_VALUE_REGISTER 0xb414
1134
1135
1136/*
1137 * Flex TDM Registers
1138 */
1139
1140/* FTDM Port */
1141
1142#define FLEXTDM_TRANSMIT_READ_POINTER 0xa800
1143#define FLEXTDM_RECEIVE_READ_POINTER 0xa804
1144#define FLEXTDM_CONFIGURATION_REGISTER 0xa808
1145#define FLEXTDM_AUX_CHANNELA_TX_REGISTER 0xa80c
1146#define FLEXTDM_AUX_CHANNELA_RX_REGISTER 0xa810
1147#define FLEXTDM_AUX_CHANNELB_TX_REGISTER 0xa814
1148#define FLEXTDM_AUX_CHANNELB_RX_REGISTER 0xa818
1149
1150/* FTDM Interrupts */
1151
1152#define FTDM_CAUSE_REGISTER 0xb830
1153#define FTDM_MASK_REGISTER 0xb8b0
1154
1155
1156/*
1157 * GPP Interface Registers
1158 */
1159
1160#define GPP_IO_CONTROL 0xf100
1161#define GPP_LEVEL_CONTROL 0xf110
1162#define GPP_VALUE 0xf104
1163#define GPP_INTERRUPT_CAUSE 0xf108
1164#define GPP_INTERRUPT_MASK 0xf10c
1165
1166#define MPP_CONTROL0 0xf000
1167#define MPP_CONTROL1 0xf004
1168#define MPP_CONTROL2 0xf008
1169#define MPP_CONTROL3 0xf00c
1170#define DEBUG_PORT_MULTIPLEX 0xf014
1171#define SERIAL_PORT_MULTIPLEX 0xf010
1172
1173/*
1174 * I2C Registers
1175 */
1176
1177#define I2C_SLAVE_ADDRESS 0xc000
1178#define I2C_EXTENDED_SLAVE_ADDRESS 0xc040
1179#define I2C_DATA 0xc004
1180#define I2C_CONTROL 0xc008
1181#define I2C_STATUS_BAUDE_RATE 0xc00C
1182#define I2C_SOFT_RESET 0xc01c
1183
1184/*
1185 * MPSC Registers
1186 */
1187
1188/*
1189 * MPSC0
1190 */
1191
1192#define MPSC0_MAIN_CONFIGURATION_LOW 0x8000
1193#define MPSC0_MAIN_CONFIGURATION_HIGH 0x8004
1194#define MPSC0_PROTOCOL_CONFIGURATION 0x8008
1195#define CHANNEL0_REGISTER1 0x800c
1196#define CHANNEL0_REGISTER2 0x8010
1197#define CHANNEL0_REGISTER3 0x8014
1198#define CHANNEL0_REGISTER4 0x8018
1199#define CHANNEL0_REGISTER5 0x801c
1200#define CHANNEL0_REGISTER6 0x8020
1201#define CHANNEL0_REGISTER7 0x8024
1202#define CHANNEL0_REGISTER8 0x8028
1203#define CHANNEL0_REGISTER9 0x802c
1204#define CHANNEL0_REGISTER10 0x8030
1205#define CHANNEL0_REGISTER11 0x8034
1206
1207/*
1208 * MPSC1
1209 */
1210
1211#define MPSC1_MAIN_CONFIGURATION_LOW 0x9000
1212#define MPSC1_MAIN_CONFIGURATION_HIGH 0x9004
1213#define MPSC1_PROTOCOL_CONFIGURATION 0x9008
1214#define CHANNEL1_REGISTER1 0x900c
1215#define CHANNEL1_REGISTER2 0x9010
1216#define CHANNEL1_REGISTER3 0x9014
1217#define CHANNEL1_REGISTER4 0x9018
1218#define CHANNEL1_REGISTER5 0x901c
1219#define CHANNEL1_REGISTER6 0x9020
1220#define CHANNEL1_REGISTER7 0x9024
1221#define CHANNEL1_REGISTER8 0x9028
1222#define CHANNEL1_REGISTER9 0x902c
1223#define CHANNEL1_REGISTER10 0x9030
1224#define CHANNEL1_REGISTER11 0x9034
1225
1226/*
1227 * MPSCs Interupts
1228 */
1229
1230#define MPSC0_CAUSE 0xb804
1231#define MPSC0_MASK 0xb884
1232#define MPSC1_CAUSE 0xb80c
1233#define MPSC1_MASK 0xb88c
1234
1235#endif /* __ASM_MIPS_MV64240_H */
diff --git a/include/asm-mips/jmr3927/jmr3927.h b/include/asm-mips/jmr3927/jmr3927.h
index 958e29706e2d..b2dc35f56181 100644
--- a/include/asm-mips/jmr3927/jmr3927.h
+++ b/include/asm-mips/jmr3927/jmr3927.h
@@ -13,6 +13,7 @@
13#include <asm/jmr3927/tx3927.h> 13#include <asm/jmr3927/tx3927.h>
14#include <asm/addrspace.h> 14#include <asm/addrspace.h>
15#include <asm/system.h> 15#include <asm/system.h>
16#include <asm/txx9irq.h>
16 17
17/* CS */ 18/* CS */
18#define JMR3927_ROMCE0 0x1fc00000 /* 4M */ 19#define JMR3927_ROMCE0 0x1fc00000 /* 4M */
@@ -115,7 +116,7 @@
115#define JMR3927_NR_IRQ_IRC 16 /* On-Chip IRC */ 116#define JMR3927_NR_IRQ_IRC 16 /* On-Chip IRC */
116#define JMR3927_NR_IRQ_IOC 8 /* PCI/MODEM/INT[6:7] */ 117#define JMR3927_NR_IRQ_IOC 8 /* PCI/MODEM/INT[6:7] */
117 118
118#define JMR3927_IRQ_IRC 16 119#define JMR3927_IRQ_IRC TXX9_IRQ_BASE
119#define JMR3927_IRQ_IOC (JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC) 120#define JMR3927_IRQ_IOC (JMR3927_IRQ_IRC + JMR3927_NR_IRQ_IRC)
120#define JMR3927_IRQ_END (JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC) 121#define JMR3927_IRQ_END (JMR3927_IRQ_IOC + JMR3927_NR_IRQ_IOC)
121 122
diff --git a/include/asm-mips/jmr3927/tx3927.h b/include/asm-mips/jmr3927/tx3927.h
index 0b9073bfb759..4be2f25f70dd 100644
--- a/include/asm-mips/jmr3927/tx3927.h
+++ b/include/asm-mips/jmr3927/tx3927.h
@@ -50,21 +50,6 @@ struct tx3927_dma_reg {
50 volatile unsigned long unused0; 50 volatile unsigned long unused0;
51}; 51};
52 52
53struct tx3927_irc_reg {
54 volatile unsigned long cer;
55 volatile unsigned long cr[2];
56 volatile unsigned long unused0;
57 volatile unsigned long ilr[8];
58 volatile unsigned long unused1[4];
59 volatile unsigned long imr;
60 volatile unsigned long unused2[7];
61 volatile unsigned long scr;
62 volatile unsigned long unused3[7];
63 volatile unsigned long ssr;
64 volatile unsigned long unused4[7];
65 volatile unsigned long csr;
66};
67
68#include <asm/byteorder.h> 53#include <asm/byteorder.h>
69 54
70#ifdef __BIG_ENDIAN 55#ifdef __BIG_ENDIAN
@@ -225,26 +210,6 @@ struct tx3927_ccfg_reg {
225/* 210/*
226 * IRC 211 * IRC
227 */ 212 */
228#define TX3927_IR_MAX_LEVEL 7
229
230/* IRCER : Int. Control Enable */
231#define TX3927_IRCER_ICE 0x00000001
232
233/* IRCR : Int. Control */
234#define TX3927_IRCR_LOW 0x00000000
235#define TX3927_IRCR_HIGH 0x00000001
236#define TX3927_IRCR_DOWN 0x00000002
237#define TX3927_IRCR_UP 0x00000003
238
239/* IRSCR : Int. Status Control */
240#define TX3927_IRSCR_EIClrE 0x00000100
241#define TX3927_IRSCR_EIClr_MASK 0x0000000f
242
243/* IRCSR : Int. Current Status */
244#define TX3927_IRCSR_IF 0x00010000
245#define TX3927_IRCSR_ILV_MASK 0x00000700
246#define TX3927_IRCSR_IVL_MASK 0x0000001f
247
248#define TX3927_IR_INT0 0 213#define TX3927_IR_INT0 0
249#define TX3927_IR_INT1 1 214#define TX3927_IR_INT1 1
250#define TX3927_IR_INT2 2 215#define TX3927_IR_INT2 2
@@ -347,7 +312,6 @@ struct tx3927_ccfg_reg {
347#define tx3927_sdramcptr ((struct tx3927_sdramc_reg *)TX3927_SDRAMC_REG) 312#define tx3927_sdramcptr ((struct tx3927_sdramc_reg *)TX3927_SDRAMC_REG)
348#define tx3927_romcptr ((struct tx3927_romc_reg *)TX3927_ROMC_REG) 313#define tx3927_romcptr ((struct tx3927_romc_reg *)TX3927_ROMC_REG)
349#define tx3927_dmaptr ((struct tx3927_dma_reg *)TX3927_DMA_REG) 314#define tx3927_dmaptr ((struct tx3927_dma_reg *)TX3927_DMA_REG)
350#define tx3927_ircptr ((struct tx3927_irc_reg *)TX3927_IRC_REG)
351#define tx3927_pcicptr ((struct tx3927_pcic_reg *)TX3927_PCIC_REG) 315#define tx3927_pcicptr ((struct tx3927_pcic_reg *)TX3927_PCIC_REG)
352#define tx3927_ccfgptr ((struct tx3927_ccfg_reg *)TX3927_CCFG_REG) 316#define tx3927_ccfgptr ((struct tx3927_ccfg_reg *)TX3927_CCFG_REG)
353#define tx3927_tmrptr(ch) ((struct txx927_tmr_reg *)TX3927_TMR_REG(ch)) 317#define tx3927_tmrptr(ch) ((struct txx927_tmr_reg *)TX3927_TMR_REG(ch))
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 6eba2e576aaa..2b928577be5d 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -29,68 +29,42 @@
29 29
30#define IDE_ARCH_OBSOLETE_DEFAULTS 30#define IDE_ARCH_OBSOLETE_DEFAULTS
31 31
32static __inline__ int ide_probe_legacy(void)
33{
34#ifdef CONFIG_PCI
35 struct pci_dev *dev;
36 if ((dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL)) != NULL ||
37 (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) {
38 pci_dev_put(dev);
39
40 return 1;
41 }
42 return 0;
43#elif defined(CONFIG_EISA) || defined(CONFIG_ISA)
44 return 1;
45#else
46 return 0;
47#endif
48}
49
50static __inline__ int ide_default_irq(unsigned long base) 32static __inline__ int ide_default_irq(unsigned long base)
51{ 33{
52 if (ide_probe_legacy()) 34 switch (base) {
53 switch (base) { 35 case 0x1f0: return 14;
54 case 0x1f0: 36 case 0x170: return 15;
55 return 14; 37 case 0x1e8: return 11;
56 case 0x170: 38 case 0x168: return 10;
57 return 15; 39 case 0x1e0: return 8;
58 case 0x1e8: 40 case 0x160: return 12;
59 return 11;
60 case 0x168:
61 return 10;
62 case 0x1e0:
63 return 8;
64 case 0x160:
65 return 12;
66 default: 41 default:
67 return 0; 42 return 0;
68 } 43 }
69 else
70 return 0;
71} 44}
72 45
73static __inline__ unsigned long ide_default_io_base(int index) 46static __inline__ unsigned long ide_default_io_base(int index)
74{ 47{
75 if (ide_probe_legacy()) 48 /*
49 * If PCI is present then it is not safe to poke around
50 * the other legacy IDE ports. Only 0x1f0 and 0x170 are
51 * defined compatibility mode ports for PCI. A user can
52 * override this using ide= but we must default safe.
53 */
54 if (no_pci_devices()) {
76 switch (index) { 55 switch (index) {
77 case 0: 56 case 2: return 0x1e8;
78 return 0x1f0; 57 case 3: return 0x168;
79 case 1: 58 case 4: return 0x1e0;
80 return 0x170; 59 case 5: return 0x160;
81 case 2:
82 return 0x1e8;
83 case 3:
84 return 0x168;
85 case 4:
86 return 0x1e0;
87 case 5:
88 return 0x160;
89 default:
90 return 0;
91 } 60 }
92 else 61 }
62 switch (index) {
63 case 0: return 0x1f0;
64 case 1: return 0x170;
65 default:
93 return 0; 66 return 0;
67 }
94} 68}
95 69
96#define IDE_ARCH_OBSOLETE_INIT 70#define IDE_ARCH_OBSOLETE_INIT
diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h
deleted file mode 100644
index b6144bafc565..000000000000
--- a/include/asm-mips/marvell.h
+++ /dev/null
@@ -1,59 +0,0 @@
1/*
2 * This file is subject to the terms and conditions of the GNU General Public
3 * License. See the file "COPYING" in the main directory of this archive
4 * for more details.
5 *
6 * Copyright (C) 2004 by Ralf Baechle
7 */
8#ifndef __ASM_MIPS_MARVELL_H
9#define __ASM_MIPS_MARVELL_H
10
11#include <linux/pci.h>
12
13#include <asm/byteorder.h>
14
15extern unsigned long marvell_base;
16
17/*
18 * Because of an error/peculiarity in the Galileo chip, we need to swap the
19 * bytes when running bigendian.
20 */
21#define __MV_READ(ofs) \
22 (*(volatile u32 *)(marvell_base+(ofs)))
23#define __MV_WRITE(ofs, data) \
24 do { *(volatile u32 *)(marvell_base+(ofs)) = (data); } while (0)
25
26#define MV_READ(ofs) le32_to_cpu(__MV_READ(ofs))
27#define MV_WRITE(ofs, data) __MV_WRITE(ofs, cpu_to_le32(data))
28
29#define MV_READ_16(ofs) \
30 le16_to_cpu(*(volatile u16 *)(marvell_base+(ofs)))
31#define MV_WRITE_16(ofs, data) \
32 *(volatile u16 *)(marvell_base+(ofs)) = cpu_to_le16(data)
33
34#define MV_READ_8(ofs) \
35 *(volatile u8 *)(marvell_base+(ofs))
36#define MV_WRITE_8(ofs, data) \
37 *(volatile u8 *)(marvell_base+(ofs)) = data
38
39#define MV_SET_REG_BITS(ofs, bits) \
40 (*((volatile u32 *)(marvell_base + (ofs)))) |= ((u32)cpu_to_le32(bits))
41#define MV_RESET_REG_BITS(ofs, bits) \
42 (*((volatile u32 *)(marvell_base + (ofs)))) &= ~((u32)cpu_to_le32(bits))
43
44extern struct pci_ops mv_pci_ops;
45
46struct mv_pci_controller {
47 struct pci_controller pcic;
48
49 /*
50 * GT-64240/MV-64340 specific, per host bus information
51 */
52 unsigned long config_addr;
53 unsigned long config_vreg;
54};
55
56extern void ll_mv64340_irq(void);
57extern void mv64340_irq_init(unsigned int base);
58
59#endif /* __ASM_MIPS_MARVELL_H */
diff --git a/include/asm-mips/pgtable-32.h b/include/asm-mips/pgtable-32.h
index 2fbd47eba32d..59c865deb0c7 100644
--- a/include/asm-mips/pgtable-32.h
+++ b/include/asm-mips/pgtable-32.h
@@ -43,11 +43,7 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
43 */ 43 */
44 44
45/* PGDIR_SHIFT determines what a third-level page table entry can map */ 45/* PGDIR_SHIFT determines what a third-level page table entry can map */
46#ifdef CONFIG_64BIT_PHYS_ADDR 46#define PGDIR_SHIFT (2 * PAGE_SHIFT + PTE_ORDER - PTE_T_LOG2)
47#define PGDIR_SHIFT 21
48#else
49#define PGDIR_SHIFT 22
50#endif
51#define PGDIR_SIZE (1UL << PGDIR_SHIFT) 47#define PGDIR_SIZE (1UL << PGDIR_SHIFT)
52#define PGDIR_MASK (~(PGDIR_SIZE-1)) 48#define PGDIR_MASK (~(PGDIR_SIZE-1))
53 49
@@ -55,17 +51,11 @@ extern int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
55 * Entries per page directory level: we use two-level, so 51 * Entries per page directory level: we use two-level, so
56 * we don't really have any PUD/PMD directory physically. 52 * we don't really have any PUD/PMD directory physically.
57 */ 53 */
58#ifdef CONFIG_64BIT_PHYS_ADDR 54#define __PGD_ORDER (32 - 3 * PAGE_SHIFT + PGD_T_LOG2 + PTE_T_LOG2)
59#define PGD_ORDER 1 55#define PGD_ORDER (__PGD_ORDER >= 0 ? __PGD_ORDER : 0)
60#define PUD_ORDER aieeee_attempt_to_allocate_pud 56#define PUD_ORDER aieeee_attempt_to_allocate_pud
61#define PMD_ORDER 1 57#define PMD_ORDER 1
62#define PTE_ORDER 0 58#define PTE_ORDER 0
63#else
64#define PGD_ORDER 0
65#define PUD_ORDER aieeee_attempt_to_allocate_pud
66#define PMD_ORDER 1
67#define PTE_ORDER 0
68#endif
69 59
70#define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t)) 60#define PTRS_PER_PGD ((PAGE_SIZE << PGD_ORDER) / sizeof(pgd_t))
71#define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t)) 61#define PTRS_PER_PTE ((PAGE_SIZE << PTE_ORDER) / sizeof(pte_t))
diff --git a/include/asm-mips/pgtable.h b/include/asm-mips/pgtable.h
index 2e2d70d13ff6..d2ee28156743 100644
--- a/include/asm-mips/pgtable.h
+++ b/include/asm-mips/pgtable.h
@@ -168,11 +168,15 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *pt
168#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0) 168#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while(0)
169#endif 169#endif
170 170
171#define PGD_T_LOG2 ffz(~sizeof(pgd_t)) 171#define PGD_T_LOG2 (__builtin_ffs(sizeof(pgd_t)) - 1)
172#define PMD_T_LOG2 ffz(~sizeof(pmd_t)) 172#define PMD_T_LOG2 (__builtin_ffs(sizeof(pmd_t)) - 1)
173#define PTE_T_LOG2 ffz(~sizeof(pte_t)) 173#define PTE_T_LOG2 (__builtin_ffs(sizeof(pte_t)) - 1)
174 174
175extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; 175/*
176 * We used to declare this array with size but gcc 3.3 and older are not able
177 * to find that this expression is a constant, so the size is dropped.
178 */
179extern pgd_t swapper_pg_dir[];
176 180
177/* 181/*
178 * The following only work if pte_present() is true. 182 * The following only work if pte_present() is true.
diff --git a/include/asm-mips/smtc.h b/include/asm-mips/smtc.h
index 44dfa4adecf3..ff3e8936b493 100644
--- a/include/asm-mips/smtc.h
+++ b/include/asm-mips/smtc.h
@@ -55,4 +55,14 @@ extern void smtc_boot_secondary(int cpu, struct task_struct *t);
55 55
56#define PARKED_INDEX ((unsigned int)0x80000000) 56#define PARKED_INDEX ((unsigned int)0x80000000)
57 57
58/*
59 * Define low-level interrupt mask for IPIs, if necessary.
60 * By default, use SW interrupt 1, which requires no external
61 * hardware support, but which works only for single-core
62 * MIPS MT systems.
63 */
64#ifndef MIPS_CPU_IPI_IRQ
65#define MIPS_CPU_IPI_IRQ 1
66#endif
67
58#endif /* _ASM_SMTC_MT_H */ 68#endif /* _ASM_SMTC_MT_H */
diff --git a/include/asm-mips/stacktrace.h b/include/asm-mips/stacktrace.h
index 07f873351a86..0bf82818aa53 100644
--- a/include/asm-mips/stacktrace.h
+++ b/include/asm-mips/stacktrace.h
@@ -9,7 +9,11 @@ extern unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
9 unsigned long pc, unsigned long *ra); 9 unsigned long pc, unsigned long *ra);
10#else 10#else
11#define raw_show_trace 1 11#define raw_show_trace 1
12#define unwind_stack(task, sp, pc, ra) 0 12static inline unsigned long unwind_stack(struct task_struct *task,
13 unsigned long *sp, unsigned long pc, unsigned long *ra)
14{
15 return 0;
16}
13#endif 17#endif
14 18
15static __always_inline void prepare_frametrace(struct pt_regs *regs) 19static __always_inline void prepare_frametrace(struct pt_regs *regs)
diff --git a/include/asm-mips/tx4927/toshiba_rbtx4927.h b/include/asm-mips/tx4927/toshiba_rbtx4927.h
index 5dc40a867774..a60649569c2c 100644
--- a/include/asm-mips/tx4927/toshiba_rbtx4927.h
+++ b/include/asm-mips/tx4927/toshiba_rbtx4927.h
@@ -50,7 +50,7 @@
50 50
51 51
52#define RBTX4927_RTL_8019_BASE (0x1c020280-TBTX4927_ISA_IO_OFFSET) 52#define RBTX4927_RTL_8019_BASE (0x1c020280-TBTX4927_ISA_IO_OFFSET)
53#define RBTX4927_RTL_8019_IRQ (29) 53#define RBTX4927_RTL_8019_IRQ (TX4927_IRQ_PIC_BEG + 5)
54 54
55int toshiba_rbtx4927_irq_nested(int sw_irq); 55int toshiba_rbtx4927_irq_nested(int sw_irq);
56 56
diff --git a/include/asm-mips/tx4927/tx4927.h b/include/asm-mips/tx4927/tx4927.h
index de85bd2245f7..4bd4368e188c 100644
--- a/include/asm-mips/tx4927/tx4927.h
+++ b/include/asm-mips/tx4927/tx4927.h
@@ -28,6 +28,7 @@
28#define __ASM_TX4927_TX4927_H 28#define __ASM_TX4927_TX4927_H
29 29
30#include <asm/tx4927/tx4927_mips.h> 30#include <asm/tx4927/tx4927_mips.h>
31#include <asm/txx9irq.h>
31 32
32/* 33/*
33 This register naming came from the integrated CPU/controller name TX4927 34 This register naming came from the integrated CPU/controller name TX4927
@@ -421,32 +422,6 @@
421#define TX4927_PIO_LIMIT 0xf50f 422#define TX4927_PIO_LIMIT 0xf50f
422 423
423 424
424/* TX4927 Interrupt Controller (32-bit registers) */
425#define TX4927_IRC_BASE 0xf510
426#define TX4927_IRC_IRFLAG0 0xf510
427#define TX4927_IRC_IRFLAG1 0xf514
428#define TX4927_IRC_IRPOL 0xf518
429#define TX4927_IRC_IRRCNT 0xf51c
430#define TX4927_IRC_IRMASKINT 0xf520
431#define TX4927_IRC_IRMASKEXT 0xf524
432#define TX4927_IRC_IRDEN 0xf600
433#define TX4927_IRC_IRDM0 0xf604
434#define TX4927_IRC_IRDM1 0xf608
435#define TX4927_IRC_IRLVL0 0xf610
436#define TX4927_IRC_IRLVL1 0xf614
437#define TX4927_IRC_IRLVL2 0xf618
438#define TX4927_IRC_IRLVL3 0xf61c
439#define TX4927_IRC_IRLVL4 0xf620
440#define TX4927_IRC_IRLVL5 0xf624
441#define TX4927_IRC_IRLVL6 0xf628
442#define TX4927_IRC_IRLVL7 0xf62c
443#define TX4927_IRC_IRMSK 0xf640
444#define TX4927_IRC_IREDC 0xf660
445#define TX4927_IRC_IRPND 0xf680
446#define TX4927_IRC_IRCS 0xf6a0
447#define TX4927_IRC_LIMIT 0xf6ff
448
449
450/* TX4927 AC-link controller (32-bit registers) */ 425/* TX4927 AC-link controller (32-bit registers) */
451#define TX4927_ACLC_BASE 0xf700 426#define TX4927_ACLC_BASE 0xf700
452#define TX4927_ACLC_ACCTLEN 0xf700 427#define TX4927_ACLC_ACCTLEN 0xf700
@@ -493,25 +468,11 @@
493#define TX4927_WR( reg, val ) TX4927_WR32( reg, val ) 468#define TX4927_WR( reg, val ) TX4927_WR32( reg, val )
494 469
495 470
471#define TX4927_IRQ_CP0_BEG MIPS_CPU_IRQ_BASE
472#define TX4927_IRQ_CP0_END (MIPS_CPU_IRQ_BASE + 8 - 1)
496 473
497 474#define TX4927_IRQ_PIC_BEG TXX9_IRQ_BASE
498 475#define TX4927_IRQ_PIC_END (TXX9_IRQ_BASE + TXx9_MAX_IR - 1)
499#define MI8259_IRQ_ISA_RAW_BEG 0 /* optional backplane i8259 */
500#define MI8259_IRQ_ISA_RAW_END 15
501#define TX4927_IRQ_CP0_RAW_BEG 0 /* tx4927 cpu built-in cp0 */
502#define TX4927_IRQ_CP0_RAW_END 7
503#define TX4927_IRQ_PIC_RAW_BEG 0 /* tx4927 cpu build-in pic */
504#define TX4927_IRQ_PIC_RAW_END 31
505
506
507#define MI8259_IRQ_ISA_BEG MI8259_IRQ_ISA_RAW_BEG /* 0 */
508#define MI8259_IRQ_ISA_END MI8259_IRQ_ISA_RAW_END /* 15 */
509
510#define TX4927_IRQ_CP0_BEG ((MI8259_IRQ_ISA_END+1)+TX4927_IRQ_CP0_RAW_BEG) /* 16 */
511#define TX4927_IRQ_CP0_END ((MI8259_IRQ_ISA_END+1)+TX4927_IRQ_CP0_RAW_END) /* 23 */
512
513#define TX4927_IRQ_PIC_BEG ((TX4927_IRQ_CP0_END+1)+TX4927_IRQ_PIC_RAW_BEG) /* 24 */
514#define TX4927_IRQ_PIC_END ((TX4927_IRQ_CP0_END+1)+TX4927_IRQ_PIC_RAW_END) /* 55 */
515 476
516 477
517#define TX4927_IRQ_USER0 (TX4927_IRQ_CP0_BEG+0) 478#define TX4927_IRQ_USER0 (TX4927_IRQ_CP0_BEG+0)
diff --git a/include/asm-mips/tx4927/tx4927_pci.h b/include/asm-mips/tx4927/tx4927_pci.h
index 66c064690f41..f98b2bb719d5 100644
--- a/include/asm-mips/tx4927/tx4927_pci.h
+++ b/include/asm-mips/tx4927/tx4927_pci.h
@@ -48,7 +48,7 @@
48#define TX4927_PCI_CLK_ACK 0x04 48#define TX4927_PCI_CLK_ACK 0x04
49#define TX4927_PCI_CLK_ACE 0x02 49#define TX4927_PCI_CLK_ACE 0x02
50#define TX4927_PCI_CLK_ENDIAN 0x01 50#define TX4927_PCI_CLK_ENDIAN 0x01
51#define TX4927_NR_IRQ_LOCAL (8+16) 51#define TX4927_NR_IRQ_LOCAL TX4927_IRQ_PIC_BEG
52#define TX4927_NR_IRQ_IRC 32 /* On-Chip IRC */ 52#define TX4927_NR_IRQ_IRC 32 /* On-Chip IRC */
53 53
54#define TX4927_IR_PCIC 16 54#define TX4927_IR_PCIC 16
@@ -99,21 +99,6 @@ struct tx4927_ccfg_reg {
99 volatile unsigned long long ramp; 99 volatile unsigned long long ramp;
100}; 100};
101 101
102struct tx4927_irc_reg {
103 volatile unsigned long cer;
104 volatile unsigned long cr[2];
105 volatile unsigned long unused0;
106 volatile unsigned long ilr[8];
107 volatile unsigned long unused1[4];
108 volatile unsigned long imr;
109 volatile unsigned long unused2[7];
110 volatile unsigned long scr;
111 volatile unsigned long unused3[7];
112 volatile unsigned long ssr;
113 volatile unsigned long unused4[7];
114 volatile unsigned long csr;
115};
116
117struct tx4927_pcic_reg { 102struct tx4927_pcic_reg {
118 volatile unsigned long pciid; 103 volatile unsigned long pciid;
119 volatile unsigned long pcistatus; 104 volatile unsigned long pcistatus;
@@ -182,11 +167,6 @@ struct tx4927_pcic_reg {
182 167
183#endif /* _LANGUAGE_ASSEMBLY */ 168#endif /* _LANGUAGE_ASSEMBLY */
184 169
185/* IRCSR : Int. Current Status */
186#define TX4927_IRCSR_IF 0x00010000
187#define TX4927_IRCSR_ILV_MASK 0x00000700
188#define TX4927_IRCSR_IVL_MASK 0x0000001f
189
190/* 170/*
191 * PCIC 171 * PCIC
192 */ 172 */
@@ -278,7 +258,6 @@ struct tx4927_pcic_reg {
278#define tx4927_pcicptr ((struct tx4927_pcic_reg *)TX4927_PCIC_REG) 258#define tx4927_pcicptr ((struct tx4927_pcic_reg *)TX4927_PCIC_REG)
279#define tx4927_ccfgptr ((struct tx4927_ccfg_reg *)TX4927_CCFG_REG) 259#define tx4927_ccfgptr ((struct tx4927_ccfg_reg *)TX4927_CCFG_REG)
280#define tx4927_ebuscptr ((struct tx4927_ebusc_reg *)TX4927_EBUSC_REG) 260#define tx4927_ebuscptr ((struct tx4927_ebusc_reg *)TX4927_EBUSC_REG)
281#define tx4927_ircptr ((struct tx4927_irc_reg *)TX4927_IRC_REG)
282 261
283#endif /* _LANGUAGE_ASSEMBLY */ 262#endif /* _LANGUAGE_ASSEMBLY */
284 263
diff --git a/include/asm-mips/tx4938/rbtx4938.h b/include/asm-mips/tx4938/rbtx4938.h
index 74e7d8061e58..b14acb575be2 100644
--- a/include/asm-mips/tx4938/rbtx4938.h
+++ b/include/asm-mips/tx4938/rbtx4938.h
@@ -14,6 +14,7 @@
14 14
15#include <asm/addrspace.h> 15#include <asm/addrspace.h>
16#include <asm/tx4938/tx4938.h> 16#include <asm/tx4938/tx4938.h>
17#include <asm/txx9irq.h>
17 18
18/* CS */ 19/* CS */
19#define RBTX4938_CE0 0x1c000000 /* 64M */ 20#define RBTX4938_CE0 0x1c000000 /* 64M */
@@ -123,21 +124,11 @@
123#define RBTX4938_NR_IRQ_IRC 32 /* On-Chip IRC */ 124#define RBTX4938_NR_IRQ_IRC 32 /* On-Chip IRC */
124#define RBTX4938_NR_IRQ_IOC 8 125#define RBTX4938_NR_IRQ_IOC 8
125 126
126#define MI8259_IRQ_ISA_RAW_BEG 0 /* optional backplane i8259 */ 127#define TX4938_IRQ_CP0_BEG MIPS_CPU_IRQ_BASE
127#define MI8259_IRQ_ISA_RAW_END 15 128#define TX4938_IRQ_CP0_END (MIPS_CPU_IRQ_BASE + 8 - 1)
128#define TX4938_IRQ_CP0_RAW_BEG 0 /* tx4938 cpu built-in cp0 */
129#define TX4938_IRQ_CP0_RAW_END 7
130#define TX4938_IRQ_PIC_RAW_BEG 0 /* tx4938 cpu build-in pic */
131#define TX4938_IRQ_PIC_RAW_END 31
132 129
133#define MI8259_IRQ_ISA_BEG MI8259_IRQ_ISA_RAW_BEG /* 0 */ 130#define TX4938_IRQ_PIC_BEG TXX9_IRQ_BASE
134#define MI8259_IRQ_ISA_END MI8259_IRQ_ISA_RAW_END /* 15 */ 131#define TX4938_IRQ_PIC_END (TXX9_IRQ_BASE + TXx9_MAX_IR - 1)
135
136#define TX4938_IRQ_CP0_BEG ((MI8259_IRQ_ISA_END+1)+TX4938_IRQ_CP0_RAW_BEG) /* 16 */
137#define TX4938_IRQ_CP0_END ((MI8259_IRQ_ISA_END+1)+TX4938_IRQ_CP0_RAW_END) /* 23 */
138
139#define TX4938_IRQ_PIC_BEG ((TX4938_IRQ_CP0_END+1)+TX4938_IRQ_PIC_RAW_BEG) /* 24 */
140#define TX4938_IRQ_PIC_END ((TX4938_IRQ_CP0_END+1)+TX4938_IRQ_PIC_RAW_END) /* 55 */
141#define TX4938_IRQ_NEST_EXT_ON_PIC (TX4938_IRQ_PIC_BEG+2) 132#define TX4938_IRQ_NEST_EXT_ON_PIC (TX4938_IRQ_PIC_BEG+2)
142#define TX4938_IRQ_NEST_PIC_ON_CP0 (TX4938_IRQ_CP0_BEG+2) 133#define TX4938_IRQ_NEST_PIC_ON_CP0 (TX4938_IRQ_CP0_BEG+2)
143#define TX4938_IRQ_USER0 (TX4938_IRQ_CP0_BEG+0) 134#define TX4938_IRQ_USER0 (TX4938_IRQ_CP0_BEG+0)
@@ -192,10 +183,4 @@
192#define RBTX4938_RTL_8019_BASE (RBTX4938_ETHER_ADDR - mips_io_port_base) 183#define RBTX4938_RTL_8019_BASE (RBTX4938_ETHER_ADDR - mips_io_port_base)
193#define RBTX4938_RTL_8019_IRQ (RBTX4938_IRQ_ETHER) 184#define RBTX4938_RTL_8019_IRQ (RBTX4938_IRQ_ETHER)
194 185
195/* IRCR : Int. Control */
196#define TX4938_IRCR_LOW 0x00000000
197#define TX4938_IRCR_HIGH 0x00000001
198#define TX4938_IRCR_DOWN 0x00000002
199#define TX4938_IRCR_UP 0x00000003
200
201#endif /* __ASM_TX_BOARDS_RBTX4938_H */ 186#endif /* __ASM_TX_BOARDS_RBTX4938_H */
diff --git a/include/asm-mips/tx4938/tx4938.h b/include/asm-mips/tx4938/tx4938.h
index e25b1a0975cb..afdb19813ca1 100644
--- a/include/asm-mips/tx4938/tx4938.h
+++ b/include/asm-mips/tx4938/tx4938.h
@@ -272,20 +272,6 @@ struct tx4938_pio_reg {
272 volatile unsigned long maskcpu; 272 volatile unsigned long maskcpu;
273 volatile unsigned long maskext; 273 volatile unsigned long maskext;
274}; 274};
275struct tx4938_irc_reg {
276 volatile unsigned long cer;
277 volatile unsigned long cr[2];
278 volatile unsigned long unused0;
279 volatile unsigned long ilr[8];
280 volatile unsigned long unused1[4];
281 volatile unsigned long imr;
282 volatile unsigned long unused2[7];
283 volatile unsigned long scr;
284 volatile unsigned long unused3[7];
285 volatile unsigned long ssr;
286 volatile unsigned long unused4[7];
287 volatile unsigned long csr;
288};
289 275
290struct tx4938_ndfmc_reg { 276struct tx4938_ndfmc_reg {
291 endian_def_l2(unused0, dtr); 277 endian_def_l2(unused0, dtr);
@@ -646,39 +632,12 @@ struct tx4938_ccfg_reg {
646#define TX4938_DMA_CSR_DESERR 0x00000002 632#define TX4938_DMA_CSR_DESERR 0x00000002
647#define TX4938_DMA_CSR_SORERR 0x00000001 633#define TX4938_DMA_CSR_SORERR 0x00000001
648 634
649/* TX4938 Interrupt Controller (32-bit registers) */
650#define TX4938_IRC_BASE 0xf510
651#define TX4938_IRC_IRFLAG0 0xf510
652#define TX4938_IRC_IRFLAG1 0xf514
653#define TX4938_IRC_IRPOL 0xf518
654#define TX4938_IRC_IRRCNT 0xf51c
655#define TX4938_IRC_IRMASKINT 0xf520
656#define TX4938_IRC_IRMASKEXT 0xf524
657#define TX4938_IRC_IRDEN 0xf600
658#define TX4938_IRC_IRDM0 0xf604
659#define TX4938_IRC_IRDM1 0xf608
660#define TX4938_IRC_IRLVL0 0xf610
661#define TX4938_IRC_IRLVL1 0xf614
662#define TX4938_IRC_IRLVL2 0xf618
663#define TX4938_IRC_IRLVL3 0xf61c
664#define TX4938_IRC_IRLVL4 0xf620
665#define TX4938_IRC_IRLVL5 0xf624
666#define TX4938_IRC_IRLVL6 0xf628
667#define TX4938_IRC_IRLVL7 0xf62c
668#define TX4938_IRC_IRMSK 0xf640
669#define TX4938_IRC_IREDC 0xf660
670#define TX4938_IRC_IRPND 0xf680
671#define TX4938_IRC_IRCS 0xf6a0
672#define TX4938_IRC_LIMIT 0xf6ff
673
674
675#ifndef __ASSEMBLY__ 635#ifndef __ASSEMBLY__
676 636
677#define tx4938_sdramcptr ((struct tx4938_sdramc_reg *)TX4938_SDRAMC_REG) 637#define tx4938_sdramcptr ((struct tx4938_sdramc_reg *)TX4938_SDRAMC_REG)
678#define tx4938_ebuscptr ((struct tx4938_ebusc_reg *)TX4938_EBUSC_REG) 638#define tx4938_ebuscptr ((struct tx4938_ebusc_reg *)TX4938_EBUSC_REG)
679#define tx4938_dmaptr(ch) ((struct tx4938_dma_reg *)TX4938_DMA_REG(ch)) 639#define tx4938_dmaptr(ch) ((struct tx4938_dma_reg *)TX4938_DMA_REG(ch))
680#define tx4938_ndfmcptr ((struct tx4938_ndfmc_reg *)TX4938_NDFMC_REG) 640#define tx4938_ndfmcptr ((struct tx4938_ndfmc_reg *)TX4938_NDFMC_REG)
681#define tx4938_ircptr ((struct tx4938_irc_reg *)TX4938_IRC_REG)
682#define tx4938_pcicptr ((struct tx4938_pcic_reg *)TX4938_PCIC_REG) 641#define tx4938_pcicptr ((struct tx4938_pcic_reg *)TX4938_PCIC_REG)
683#define tx4938_pcic1ptr ((struct tx4938_pcic_reg *)TX4938_PCIC1_REG) 642#define tx4938_pcic1ptr ((struct tx4938_pcic_reg *)TX4938_PCIC1_REG)
684#define tx4938_ccfgptr ((struct tx4938_ccfg_reg *)TX4938_CCFG_REG) 643#define tx4938_ccfgptr ((struct tx4938_ccfg_reg *)TX4938_CCFG_REG)
diff --git a/include/asm-mips/txx9irq.h b/include/asm-mips/txx9irq.h
new file mode 100644
index 000000000000..1c439e51b875
--- /dev/null
+++ b/include/asm-mips/txx9irq.h
@@ -0,0 +1,30 @@
1/*
2 * include/asm-mips/txx9irq.h
3 * TX39/TX49 interrupt controller definitions.
4 *
5 * This file is subject to the terms and conditions of the GNU General Public
6 * License. See the file "COPYING" in the main directory of this archive
7 * for more details.
8 */
9#ifndef __ASM_TXX9IRQ_H
10#define __ASM_TXX9IRQ_H
11
12#include <irq.h>
13
14#ifdef CONFIG_IRQ_CPU
15#define TXX9_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8)
16#else
17#define TXX9_IRQ_BASE 0
18#endif
19
20#ifdef CONFIG_CPU_TX39XX
21#define TXx9_MAX_IR 16
22#else
23#define TXx9_MAX_IR 32
24#endif
25
26void txx9_irq_init(unsigned long baseaddr);
27int txx9_irq(void);
28int txx9_irq_set_pri(int irc_irq, int new_pri);
29
30#endif /* __ASM_TXX9IRQ_H */
diff --git a/include/asm-parisc/io.h b/include/asm-parisc/io.h
index c0fed91da3a2..4cc9bcec0564 100644
--- a/include/asm-parisc/io.h
+++ b/include/asm-parisc/io.h
@@ -15,6 +15,16 @@ extern unsigned long parisc_vmerge_max_size;
15#define virt_to_bus virt_to_phys 15#define virt_to_bus virt_to_phys
16#define bus_to_virt phys_to_virt 16#define bus_to_virt phys_to_virt
17 17
18static inline unsigned long isa_bus_to_virt(unsigned long addr) {
19 BUG();
20 return 0;
21}
22
23static inline unsigned long isa_virt_to_bus(void *addr) {
24 BUG();
25 return 0;
26}
27
18/* 28/*
19 * Memory mapped I/O 29 * Memory mapped I/O
20 * 30 *
diff --git a/include/asm-parisc/vga.h b/include/asm-parisc/vga.h
new file mode 100644
index 000000000000..154a84c843a7
--- /dev/null
+++ b/include/asm-parisc/vga.h
@@ -0,0 +1,6 @@
1#ifndef __ASM_PARISC_VGA_H__
2#define __ASM_PARISC_VGA_H__
3
4/* nothing */
5
6#endif __ASM_PARISC_VGA_H__
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index ad7f71a81b0a..818cc3a50e6b 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -7,6 +7,7 @@ header-y += raid/
7header-y += spi/ 7header-y += spi/
8header-y += sunrpc/ 8header-y += sunrpc/
9header-y += tc_act/ 9header-y += tc_act/
10header-y += tc_ematch/
10header-y += netfilter/ 11header-y += netfilter/
11header-y += netfilter_arp/ 12header-y += netfilter_arp/
12header-y += netfilter_bridge/ 13header-y += netfilter_bridge/
diff --git a/include/linux/if_pppol2tp.h b/include/linux/if_pppol2tp.h
index 516203b6fdeb..a7d6a2234b31 100644
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
@@ -32,8 +32,8 @@ struct pppol2tp_addr
32 32
33 struct sockaddr_in addr; /* IP address and port to send to */ 33 struct sockaddr_in addr; /* IP address and port to send to */
34 34
35 __be16 s_tunnel, s_session; /* For matching incoming packets */ 35 __u16 s_tunnel, s_session; /* For matching incoming packets */
36 __be16 d_tunnel, d_session; /* For sending outgoing packets */ 36 __u16 d_tunnel, d_session; /* For sending outgoing packets */
37}; 37};
38 38
39/* Socket options: 39/* Socket options:
diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index 5ad913ff02b2..b7824c215354 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -226,7 +226,7 @@ extern unsigned int pmu_power_flags;
226extern void pmu_backlight_init(void); 226extern void pmu_backlight_init(void);
227 227
228/* some code needs to know if the PMU was suspended for hibernation */ 228/* some code needs to know if the PMU was suspended for hibernation */
229#if defined(CONFIG_PM) && defined(CONFIG_PPC32) 229#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
230extern int pmu_sys_suspended; 230extern int pmu_sys_suspended;
231#else 231#else
232/* if power management is not configured it can't be suspended */ 232/* if power management is not configured it can't be suspended */
diff --git a/init/main.c b/init/main.c
index cc0653ec081d..450e6ee52ab6 100644
--- a/init/main.c
+++ b/init/main.c
@@ -168,7 +168,7 @@ static int __init maxcpus(char *str)
168 return 0; 168 return 0;
169} 169}
170 170
171early_param("maxcpus=", maxcpus); 171early_param("maxcpus", maxcpus);
172#else 172#else
173#define max_cpus NR_CPUS 173#define max_cpus NR_CPUS
174#endif 174#endif
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 58e5c152a6bb..e080d1d744cc 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -635,7 +635,7 @@ int keventd_up(void)
635int current_is_keventd(void) 635int current_is_keventd(void)
636{ 636{
637 struct cpu_workqueue_struct *cwq; 637 struct cpu_workqueue_struct *cwq;
638 int cpu = smp_processor_id(); /* preempt-safe: keventd is per-cpu */ 638 int cpu = raw_smp_processor_id(); /* preempt-safe: keventd is per-cpu */
639 int ret = 0; 639 int ret = 0;
640 640
641 BUG_ON(!keventd_wq); 641 BUG_ON(!keventd_wq);
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4bab322c9f8f..328759c32d61 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -116,12 +116,22 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
116 struct packet_type* ptype, struct net_device *orig_dev) 116 struct packet_type* ptype, struct net_device *orig_dev)
117{ 117{
118 unsigned char *rawp = NULL; 118 unsigned char *rawp = NULL;
119 struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data); 119 struct vlan_hdr *vhdr;
120 unsigned short vid; 120 unsigned short vid;
121 struct net_device_stats *stats; 121 struct net_device_stats *stats;
122 unsigned short vlan_TCI; 122 unsigned short vlan_TCI;
123 __be16 proto; 123 __be16 proto;
124 124
125 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
126 return -1;
127
128 if (unlikely(!pskb_may_pull(skb, VLAN_HLEN))) {
129 kfree_skb(skb);
130 return -1;
131 }
132
133 vhdr = (struct vlan_hdr *)(skb->data);
134
125 /* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */ 135 /* vlan_TCI = ntohs(get_unaligned(&vhdr->h_vlan_TCI)); */
126 vlan_TCI = ntohs(vhdr->h_vlan_TCI); 136 vlan_TCI = ntohs(vhdr->h_vlan_TCI);
127 137
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index fa779874b9dd..3ee2022928e3 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -509,8 +509,14 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
509 int (*okfn)(struct sk_buff *)) 509 int (*okfn)(struct sk_buff *))
510{ 510{
511 struct iphdr *iph; 511 struct iphdr *iph;
512 __u32 len;
513 struct sk_buff *skb = *pskb; 512 struct sk_buff *skb = *pskb;
513 __u32 len = nf_bridge_encap_header_len(skb);
514
515 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
516 return NF_STOLEN;
517
518 if (unlikely(!pskb_may_pull(skb, len)))
519 goto out;
514 520
515 if (skb->protocol == htons(ETH_P_IPV6) || IS_VLAN_IPV6(skb) || 521 if (skb->protocol == htons(ETH_P_IPV6) || IS_VLAN_IPV6(skb) ||
516 IS_PPPOE_IPV6(skb)) { 522 IS_PPPOE_IPV6(skb)) {
@@ -518,8 +524,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
518 if (!brnf_call_ip6tables) 524 if (!brnf_call_ip6tables)
519 return NF_ACCEPT; 525 return NF_ACCEPT;
520#endif 526#endif
521 if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
522 goto out;
523 nf_bridge_pull_encap_header_rcsum(skb); 527 nf_bridge_pull_encap_header_rcsum(skb);
524 return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn); 528 return br_nf_pre_routing_ipv6(hook, skb, in, out, okfn);
525 } 529 }
@@ -532,8 +536,6 @@ static unsigned int br_nf_pre_routing(unsigned int hook, struct sk_buff **pskb,
532 !IS_PPPOE_IP(skb)) 536 !IS_PPPOE_IP(skb))
533 return NF_ACCEPT; 537 return NF_ACCEPT;
534 538
535 if ((skb = skb_share_check(*pskb, GFP_ATOMIC)) == NULL)
536 goto out;
537 nf_bridge_pull_encap_header_rcsum(skb); 539 nf_bridge_pull_encap_header_rcsum(skb);
538 540
539 if (!pskb_may_pull(skb, sizeof(struct iphdr))) 541 if (!pskb_may_pull(skb, sizeof(struct iphdr)))
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 99aece1aeccf..20330c572610 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -116,11 +116,13 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
116 */ 116 */
117int dev_mc_sync(struct net_device *to, struct net_device *from) 117int dev_mc_sync(struct net_device *to, struct net_device *from)
118{ 118{
119 struct dev_addr_list *da; 119 struct dev_addr_list *da, *next;
120 int err = 0; 120 int err = 0;
121 121
122 netif_tx_lock_bh(to); 122 netif_tx_lock_bh(to);
123 for (da = from->mc_list; da != NULL; da = da->next) { 123 da = from->mc_list;
124 while (da != NULL) {
125 next = da->next;
124 if (!da->da_synced) { 126 if (!da->da_synced) {
125 err = __dev_addr_add(&to->mc_list, &to->mc_count, 127 err = __dev_addr_add(&to->mc_list, &to->mc_count,
126 da->da_addr, da->da_addrlen, 0); 128 da->da_addr, da->da_addrlen, 0);
@@ -134,6 +136,7 @@ int dev_mc_sync(struct net_device *to, struct net_device *from)
134 __dev_addr_delete(&from->mc_list, &from->mc_count, 136 __dev_addr_delete(&from->mc_list, &from->mc_count,
135 da->da_addr, da->da_addrlen, 0); 137 da->da_addr, da->da_addrlen, 0);
136 } 138 }
139 da = next;
137 } 140 }
138 if (!err) 141 if (!err)
139 __dev_set_rx_mode(to); 142 __dev_set_rx_mode(to);
@@ -156,12 +159,14 @@ EXPORT_SYMBOL(dev_mc_sync);
156 */ 159 */
157void dev_mc_unsync(struct net_device *to, struct net_device *from) 160void dev_mc_unsync(struct net_device *to, struct net_device *from)
158{ 161{
159 struct dev_addr_list *da; 162 struct dev_addr_list *da, *next;
160 163
161 netif_tx_lock_bh(from); 164 netif_tx_lock_bh(from);
162 netif_tx_lock_bh(to); 165 netif_tx_lock_bh(to);
163 166
164 for (da = from->mc_list; da != NULL; da = da->next) { 167 da = from->mc_list;
168 while (da != NULL) {
169 next = da->next;
165 if (!da->da_synced) 170 if (!da->da_synced)
166 continue; 171 continue;
167 __dev_addr_delete(&to->mc_list, &to->mc_count, 172 __dev_addr_delete(&to->mc_list, &to->mc_count,
@@ -169,6 +174,7 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
169 da->da_synced = 0; 174 da->da_synced = 0;
170 __dev_addr_delete(&from->mc_list, &from->mc_count, 175 __dev_addr_delete(&from->mc_list, &from->mc_count,
171 da->da_addr, da->da_addrlen, 0); 176 da->da_addr, da->da_addrlen, 0);
177 da = next;
172 } 178 }
173 __dev_set_rx_mode(to); 179 __dev_set_rx_mode(to);
174 180
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ca2a1533138a..f7de8f24d8dd 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -33,6 +33,7 @@
33#include <linux/rtnetlink.h> 33#include <linux/rtnetlink.h>
34#include <linux/random.h> 34#include <linux/random.h>
35#include <linux/string.h> 35#include <linux/string.h>
36#include <linux/log2.h>
36 37
37#define NEIGH_DEBUG 1 38#define NEIGH_DEBUG 1
38 39
@@ -311,7 +312,7 @@ static void neigh_hash_grow(struct neigh_table *tbl, unsigned long new_entries)
311 312
312 NEIGH_CACHE_STAT_INC(tbl, hash_grows); 313 NEIGH_CACHE_STAT_INC(tbl, hash_grows);
313 314
314 BUG_ON(new_entries & (new_entries - 1)); 315 BUG_ON(!is_power_of_2(new_entries));
315 new_hash = neigh_hash_alloc(new_entries); 316 new_hash = neigh_hash_alloc(new_entries);
316 if (!new_hash) 317 if (!new_hash)
317 return; 318 return;
diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
index 7a23e59c374a..39f6211f1496 100644
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@@ -46,7 +46,7 @@ static int ip_clear_mutable_options(struct iphdr *iph, __be32 *daddr)
46 memcpy(daddr, optptr+optlen-4, 4); 46 memcpy(daddr, optptr+optlen-4, 4);
47 /* Fall through */ 47 /* Fall through */
48 default: 48 default:
49 memset(optptr+2, 0, optlen-2); 49 memset(optptr, 0, optlen);
50 } 50 }
51 l -= optlen; 51 l -= optlen;
52 optptr += optlen; 52 optptr += optlen;
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 4d544573f48a..6b420aedcdcf 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -625,6 +625,10 @@ static int do_ip_setsockopt(struct sock *sk, int level,
625 { 625 {
626 struct ip_mreqn mreq; 626 struct ip_mreqn mreq;
627 627
628 err = -EPROTO;
629 if (inet_sk(sk)->is_icsk)
630 break;
631
628 if (optlen < sizeof(struct ip_mreq)) 632 if (optlen < sizeof(struct ip_mreq))
629 goto e_inval; 633 goto e_inval;
630 err = -EFAULT; 634 err = -EFAULT;
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index f030435e0eb4..9785df37a65f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -755,7 +755,15 @@ void tcp_update_metrics(struct sock *sk)
755 } 755 }
756} 756}
757 757
758/* Numbers are taken from RFC2414. */ 758/* Numbers are taken from RFC3390.
759 *
760 * John Heffner states:
761 *
762 * The RFC specifies a window of no more than 4380 bytes
763 * unless 2*MSS > 4380. Reading the pseudocode in the RFC
764 * is a bit misleading because they use a clamp at 4380 bytes
765 * rather than use a multiplier in the relevant range.
766 */
759__u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst) 767__u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst)
760{ 768{
761 __u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0); 769 __u32 cwnd = (dst ? dst_metric(dst, RTAX_INITCWND) : 0);
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 761a910f4f97..6b038aa72e88 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -554,6 +554,10 @@ done:
554 { 554 {
555 struct ipv6_mreq mreq; 555 struct ipv6_mreq mreq;
556 556
557 retv = -EPROTO;
558 if (inet_sk(sk)->is_icsk)
559 break;
560
557 retv = -EFAULT; 561 retv = -EFAULT;
558 if (copy_from_user(&mreq, optval, sizeof(struct ipv6_mreq))) 562 if (copy_from_user(&mreq, optval, sizeof(struct ipv6_mreq)))
559 break; 563 break;
generated by cgit v1.2.2 (git 2.25.0) at 2025-06-02 04:12:18 -0400