aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2005-06-25 11:58:21 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-06-25 11:58:21 -0400
commit456b6b863a6a1a80e369e42568817747a427b072 (patch)
treeec2d71a6dfdc7045ffb5e54ee951ada7e9dfecdc /arch/arm
parentb3e112bcc19abd8e9657dca34a87316786e096f3 (diff)
[PATCH] ARM: 2749/1: update ixp2000 defconfigs to 2.6.12-git6
Patch from Lennert Buytenhek Update the defconfigs for the ixp2000 platforms to 2.6.12-git6. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/enp2611_defconfig58
-rw-r--r--arch/arm/configs/ixdp2400_defconfig58
-rw-r--r--arch/arm/configs/ixdp2401_defconfig58
-rw-r--r--arch/arm/configs/ixdp2800_defconfig58
-rw-r--r--arch/arm/configs/ixdp2801_defconfig58
5 files changed, 245 insertions, 45 deletions
diff --git a/arch/arm/configs/enp2611_defconfig b/arch/arm/configs/enp2611_defconfig
index 06fae4b62774..af2153424560 100644
--- a/arch/arm/configs/enp2611_defconfig
+++ b/arch/arm/configs/enp2611_defconfig
@@ -1,14 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc1-bk2 3# Linux kernel version: 2.6.12-git6
4# Sun Mar 27 22:08:24 2005 4# Sat Jun 25 00:57:29 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_IOMAP=y
12 11
13# 12#
14# Code maturity level options 13# Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
16CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
17CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
18CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19 19
20# 20#
21# General setup 21# General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
38CONFIG_BASE_FULL=y 40CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 41CONFIG_FUTEX=y
40CONFIG_EPOLL=y 42CONFIG_EPOLL=y
@@ -82,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
82# CONFIG_ARCH_VERSATILE is not set 84# CONFIG_ARCH_VERSATILE is not set
83# CONFIG_ARCH_IMX is not set 85# CONFIG_ARCH_IMX is not set
84# CONFIG_ARCH_H720X is not set 86# CONFIG_ARCH_H720X is not set
87# CONFIG_ARCH_AAEC2000 is not set
85CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y 88CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
86 89
87# 90#
@@ -106,7 +109,6 @@ CONFIG_CPU_32v5=y
106CONFIG_CPU_ABRT_EV5T=y 109CONFIG_CPU_ABRT_EV5T=y
107CONFIG_CPU_CACHE_VIVT=y 110CONFIG_CPU_CACHE_VIVT=y
108CONFIG_CPU_TLB_V4WBI=y 111CONFIG_CPU_TLB_V4WBI=y
109CONFIG_CPU_MINICACHE=y
110 112
111# 113#
112# Processor Features 114# Processor Features
@@ -118,9 +120,11 @@ CONFIG_XSCALE_PMU=y
118# 120#
119# Bus support 121# Bus support
120# 122#
123CONFIG_ISA_DMA_API=y
121CONFIG_PCI=y 124CONFIG_PCI=y
122CONFIG_PCI_LEGACY_PROC=y 125CONFIG_PCI_LEGACY_PROC=y
123CONFIG_PCI_NAMES=y 126CONFIG_PCI_NAMES=y
127# CONFIG_PCI_DEBUG is not set
124 128
125# 129#
126# PCCARD (PCMCIA/CardBus) support 130# PCCARD (PCMCIA/CardBus) support
@@ -130,7 +134,15 @@ CONFIG_PCI_NAMES=y
130# 134#
131# Kernel Features 135# Kernel Features
132# 136#
137# CONFIG_SMP is not set
133# CONFIG_PREEMPT is not set 138# CONFIG_PREEMPT is not set
139# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
140CONFIG_SELECT_MEMORY_MODEL=y
141CONFIG_FLATMEM_MANUAL=y
142# CONFIG_DISCONTIGMEM_MANUAL is not set
143# CONFIG_SPARSEMEM_MANUAL is not set
144CONFIG_FLATMEM=y
145CONFIG_FLAT_NODE_MEM_MAP=y
134CONFIG_ALIGNMENT_TRAP=y 146CONFIG_ALIGNMENT_TRAP=y
135 147
136# 148#
@@ -269,7 +281,6 @@ CONFIG_MTD_IXP2000=y
269# 281#
270# Block devices 282# Block devices
271# 283#
272# CONFIG_BLK_DEV_FD is not set
273# CONFIG_BLK_CPQ_DA is not set 284# CONFIG_BLK_CPQ_DA is not set
274# CONFIG_BLK_CPQ_CISS_DA is not set 285# CONFIG_BLK_CPQ_CISS_DA is not set
275# CONFIG_BLK_DEV_DAC960 is not set 286# CONFIG_BLK_DEV_DAC960 is not set
@@ -308,6 +319,7 @@ CONFIG_IOSCHED_CFQ=y
308# 319#
309# Fusion MPT device support 320# Fusion MPT device support
310# 321#
322# CONFIG_FUSION is not set
311 323
312# 324#
313# IEEE 1394 (FireWire) support 325# IEEE 1394 (FireWire) support
@@ -329,10 +341,11 @@ CONFIG_NET=y
329# 341#
330CONFIG_PACKET=y 342CONFIG_PACKET=y
331CONFIG_PACKET_MMAP=y 343CONFIG_PACKET_MMAP=y
332# CONFIG_NETLINK_DEV is not set
333CONFIG_UNIX=y 344CONFIG_UNIX=y
334# CONFIG_NET_KEY is not set 345# CONFIG_NET_KEY is not set
335CONFIG_INET=y 346CONFIG_INET=y
347CONFIG_IP_FIB_HASH=y
348# CONFIG_IP_FIB_TRIE is not set
336# CONFIG_IP_MULTICAST is not set 349# CONFIG_IP_MULTICAST is not set
337# CONFIG_IP_ADVANCED_ROUTER is not set 350# CONFIG_IP_ADVANCED_ROUTER is not set
338CONFIG_IP_PNP=y 351CONFIG_IP_PNP=y
@@ -349,6 +362,17 @@ CONFIG_SYN_COOKIES=y
349# CONFIG_INET_TUNNEL is not set 362# CONFIG_INET_TUNNEL is not set
350# CONFIG_IP_TCPDIAG is not set 363# CONFIG_IP_TCPDIAG is not set
351# CONFIG_IP_TCPDIAG_IPV6 is not set 364# CONFIG_IP_TCPDIAG_IPV6 is not set
365
366#
367# TCP congestion control
368#
369CONFIG_TCP_CONG_BIC=y
370CONFIG_TCP_CONG_WESTWOOD=m
371CONFIG_TCP_CONG_HTCP=m
372# CONFIG_TCP_CONG_HSTCP is not set
373# CONFIG_TCP_CONG_HYBLA is not set
374# CONFIG_TCP_CONG_VEGAS is not set
375# CONFIG_TCP_CONG_SCALABLE is not set
352# CONFIG_IPV6 is not set 376# CONFIG_IPV6 is not set
353# CONFIG_NETFILTER is not set 377# CONFIG_NETFILTER is not set
354 378
@@ -404,6 +428,7 @@ CONFIG_MII=y
404# CONFIG_SUNGEM is not set 428# CONFIG_SUNGEM is not set
405# CONFIG_NET_VENDOR_3COM is not set 429# CONFIG_NET_VENDOR_3COM is not set
406# CONFIG_SMC91X is not set 430# CONFIG_SMC91X is not set
431# CONFIG_DM9000 is not set
407 432
408# 433#
409# Tulip family network device support 434# Tulip family network device support
@@ -440,9 +465,11 @@ CONFIG_EEPRO100=y
440# CONFIG_HAMACHI is not set 465# CONFIG_HAMACHI is not set
441# CONFIG_YELLOWFIN is not set 466# CONFIG_YELLOWFIN is not set
442# CONFIG_R8169 is not set 467# CONFIG_R8169 is not set
468# CONFIG_SKGE is not set
443# CONFIG_SK98LIN is not set 469# CONFIG_SK98LIN is not set
444# CONFIG_VIA_VELOCITY is not set 470# CONFIG_VIA_VELOCITY is not set
445# CONFIG_TIGON3 is not set 471# CONFIG_TIGON3 is not set
472# CONFIG_BNX2 is not set
446 473
447# 474#
448# Ethernet (10000 Mbit) 475# Ethernet (10000 Mbit)
@@ -464,6 +491,7 @@ CONFIG_EEPRO100=y
464# Wan interfaces 491# Wan interfaces
465# 492#
466CONFIG_WAN=y 493CONFIG_WAN=y
494# CONFIG_DSCC4 is not set
467# CONFIG_LANMEDIA is not set 495# CONFIG_LANMEDIA is not set
468# CONFIG_SYNCLINK_SYNCPPP is not set 496# CONFIG_SYNCLINK_SYNCPPP is not set
469CONFIG_HDLC=y 497CONFIG_HDLC=y
@@ -526,7 +554,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
526# 554#
527# CONFIG_SERIO is not set 555# CONFIG_SERIO is not set
528# CONFIG_GAMEPORT is not set 556# CONFIG_GAMEPORT is not set
529CONFIG_SOUND_GAMEPORT=y
530 557
531# 558#
532# Character devices 559# Character devices
@@ -547,6 +574,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
547# 574#
548CONFIG_SERIAL_CORE=y 575CONFIG_SERIAL_CORE=y
549CONFIG_SERIAL_CORE_CONSOLE=y 576CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set
550CONFIG_UNIX98_PTYS=y 578CONFIG_UNIX98_PTYS=y
551CONFIG_LEGACY_PTYS=y 579CONFIG_LEGACY_PTYS=y
552CONFIG_LEGACY_PTY_COUNT=256 580CONFIG_LEGACY_PTY_COUNT=256
@@ -613,17 +641,18 @@ CONFIG_I2C_ALGOBIT=y
613# CONFIG_I2C_AMD8111 is not set 641# CONFIG_I2C_AMD8111 is not set
614# CONFIG_I2C_I801 is not set 642# CONFIG_I2C_I801 is not set
615# CONFIG_I2C_I810 is not set 643# CONFIG_I2C_I810 is not set
644# CONFIG_I2C_PIIX4 is not set
616# CONFIG_I2C_ISA is not set 645# CONFIG_I2C_ISA is not set
617# CONFIG_I2C_IXP2000 is not set 646# CONFIG_I2C_IXP2000 is not set
618# CONFIG_I2C_NFORCE2 is not set 647# CONFIG_I2C_NFORCE2 is not set
619# CONFIG_I2C_PARPORT_LIGHT is not set 648# CONFIG_I2C_PARPORT_LIGHT is not set
620# CONFIG_I2C_PIIX4 is not set
621# CONFIG_I2C_PROSAVAGE is not set 649# CONFIG_I2C_PROSAVAGE is not set
622# CONFIG_I2C_SAVAGE4 is not set 650# CONFIG_I2C_SAVAGE4 is not set
623# CONFIG_SCx200_ACB is not set 651# CONFIG_SCx200_ACB is not set
624# CONFIG_I2C_SIS5595 is not set 652# CONFIG_I2C_SIS5595 is not set
625# CONFIG_I2C_SIS630 is not set 653# CONFIG_I2C_SIS630 is not set
626# CONFIG_I2C_SIS96X is not set 654# CONFIG_I2C_SIS96X is not set
655# CONFIG_I2C_STUB is not set
627# CONFIG_I2C_VIA is not set 656# CONFIG_I2C_VIA is not set
628# CONFIG_I2C_VIAPRO is not set 657# CONFIG_I2C_VIAPRO is not set
629# CONFIG_I2C_VOODOO3 is not set 658# CONFIG_I2C_VOODOO3 is not set
@@ -637,7 +666,9 @@ CONFIG_I2C_SENSOR=y
637# CONFIG_SENSORS_ADM1025 is not set 666# CONFIG_SENSORS_ADM1025 is not set
638# CONFIG_SENSORS_ADM1026 is not set 667# CONFIG_SENSORS_ADM1026 is not set
639# CONFIG_SENSORS_ADM1031 is not set 668# CONFIG_SENSORS_ADM1031 is not set
669# CONFIG_SENSORS_ADM9240 is not set
640# CONFIG_SENSORS_ASB100 is not set 670# CONFIG_SENSORS_ASB100 is not set
671# CONFIG_SENSORS_ATXP1 is not set
641# CONFIG_SENSORS_DS1621 is not set 672# CONFIG_SENSORS_DS1621 is not set
642# CONFIG_SENSORS_FSCHER is not set 673# CONFIG_SENSORS_FSCHER is not set
643# CONFIG_SENSORS_FSCPOS is not set 674# CONFIG_SENSORS_FSCPOS is not set
@@ -653,6 +684,7 @@ CONFIG_I2C_SENSOR=y
653# CONFIG_SENSORS_LM85 is not set 684# CONFIG_SENSORS_LM85 is not set
654# CONFIG_SENSORS_LM87 is not set 685# CONFIG_SENSORS_LM87 is not set
655# CONFIG_SENSORS_LM90 is not set 686# CONFIG_SENSORS_LM90 is not set
687# CONFIG_SENSORS_LM92 is not set
656# CONFIG_SENSORS_MAX1619 is not set 688# CONFIG_SENSORS_MAX1619 is not set
657# CONFIG_SENSORS_PC87360 is not set 689# CONFIG_SENSORS_PC87360 is not set
658# CONFIG_SENSORS_SMSC47B397 is not set 690# CONFIG_SENSORS_SMSC47B397 is not set
@@ -662,14 +694,19 @@ CONFIG_I2C_SENSOR=y
662# CONFIG_SENSORS_W83781D is not set 694# CONFIG_SENSORS_W83781D is not set
663# CONFIG_SENSORS_W83L785TS is not set 695# CONFIG_SENSORS_W83L785TS is not set
664# CONFIG_SENSORS_W83627HF is not set 696# CONFIG_SENSORS_W83627HF is not set
697# CONFIG_SENSORS_W83627EHF is not set
665 698
666# 699#
667# Other I2C Chip support 700# Other I2C Chip support
668# 701#
702# CONFIG_SENSORS_DS1337 is not set
703# CONFIG_SENSORS_DS1374 is not set
669CONFIG_SENSORS_EEPROM=y 704CONFIG_SENSORS_EEPROM=y
670# CONFIG_SENSORS_PCF8574 is not set 705# CONFIG_SENSORS_PCF8574 is not set
706# CONFIG_SENSORS_PCA9539 is not set
671# CONFIG_SENSORS_PCF8591 is not set 707# CONFIG_SENSORS_PCF8591 is not set
672# CONFIG_SENSORS_RTC8564 is not set 708# CONFIG_SENSORS_RTC8564 is not set
709# CONFIG_SENSORS_MAX6875 is not set
673# CONFIG_I2C_DEBUG_CORE is not set 710# CONFIG_I2C_DEBUG_CORE is not set
674# CONFIG_I2C_DEBUG_ALGO is not set 711# CONFIG_I2C_DEBUG_ALGO is not set
675# CONFIG_I2C_DEBUG_BUS is not set 712# CONFIG_I2C_DEBUG_BUS is not set
@@ -723,6 +760,7 @@ CONFIG_EXT2_FS=y
723CONFIG_EXT2_FS_XATTR=y 760CONFIG_EXT2_FS_XATTR=y
724CONFIG_EXT2_FS_POSIX_ACL=y 761CONFIG_EXT2_FS_POSIX_ACL=y
725# CONFIG_EXT2_FS_SECURITY is not set 762# CONFIG_EXT2_FS_SECURITY is not set
763# CONFIG_EXT2_FS_XIP is not set
726CONFIG_EXT3_FS=y 764CONFIG_EXT3_FS=y
727CONFIG_EXT3_FS_XATTR=y 765CONFIG_EXT3_FS_XATTR=y
728CONFIG_EXT3_FS_POSIX_ACL=y 766CONFIG_EXT3_FS_POSIX_ACL=y
@@ -763,7 +801,6 @@ CONFIG_DNOTIFY=y
763# 801#
764CONFIG_PROC_FS=y 802CONFIG_PROC_FS=y
765CONFIG_SYSFS=y 803CONFIG_SYSFS=y
766# CONFIG_DEVFS_FS is not set
767# CONFIG_DEVPTS_FS_XATTR is not set 804# CONFIG_DEVPTS_FS_XATTR is not set
768CONFIG_TMPFS=y 805CONFIG_TMPFS=y
769# CONFIG_TMPFS_XATTR is not set 806# CONFIG_TMPFS_XATTR is not set
@@ -801,12 +838,14 @@ CONFIG_JFFS2_RTIME=y
801# 838#
802CONFIG_NFS_FS=y 839CONFIG_NFS_FS=y
803CONFIG_NFS_V3=y 840CONFIG_NFS_V3=y
841# CONFIG_NFS_V3_ACL is not set
804# CONFIG_NFS_V4 is not set 842# CONFIG_NFS_V4 is not set
805# CONFIG_NFS_DIRECTIO is not set 843# CONFIG_NFS_DIRECTIO is not set
806# CONFIG_NFSD is not set 844# CONFIG_NFSD is not set
807CONFIG_ROOT_NFS=y 845CONFIG_ROOT_NFS=y
808CONFIG_LOCKD=y 846CONFIG_LOCKD=y
809CONFIG_LOCKD_V4=y 847CONFIG_LOCKD_V4=y
848CONFIG_NFS_COMMON=y
810CONFIG_SUNRPC=y 849CONFIG_SUNRPC=y
811# CONFIG_RPCSEC_GSS_KRB5 is not set 850# CONFIG_RPCSEC_GSS_KRB5 is not set
812# CONFIG_RPCSEC_GSS_SPKM3 is not set 851# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -891,3 +930,4 @@ CONFIG_CRC32=y
891# CONFIG_LIBCRC32C is not set 930# CONFIG_LIBCRC32C is not set
892CONFIG_ZLIB_INFLATE=y 931CONFIG_ZLIB_INFLATE=y
893CONFIG_ZLIB_DEFLATE=y 932CONFIG_ZLIB_DEFLATE=y
933# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2400_defconfig b/arch/arm/configs/ixdp2400_defconfig
index 810a450a55d2..a7ee1a442f34 100644
--- a/arch/arm/configs/ixdp2400_defconfig
+++ b/arch/arm/configs/ixdp2400_defconfig
@@ -1,14 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc1-bk2 3# Linux kernel version: 2.6.12-git6
4# Sun Mar 27 21:13:38 2005 4# Sat Jun 25 00:58:38 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_IOMAP=y
12 11
13# 12#
14# Code maturity level options 13# Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
16CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
17CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
18CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19 19
20# 20#
21# General setup 21# General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
38CONFIG_BASE_FULL=y 40CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 41CONFIG_FUTEX=y
40CONFIG_EPOLL=y 42CONFIG_EPOLL=y
@@ -82,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
82# CONFIG_ARCH_VERSATILE is not set 84# CONFIG_ARCH_VERSATILE is not set
83# CONFIG_ARCH_IMX is not set 85# CONFIG_ARCH_IMX is not set
84# CONFIG_ARCH_H720X is not set 86# CONFIG_ARCH_H720X is not set
87# CONFIG_ARCH_AAEC2000 is not set
85CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y 88CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
86 89
87# 90#
@@ -107,7 +110,6 @@ CONFIG_CPU_32v5=y
107CONFIG_CPU_ABRT_EV5T=y 110CONFIG_CPU_ABRT_EV5T=y
108CONFIG_CPU_CACHE_VIVT=y 111CONFIG_CPU_CACHE_VIVT=y
109CONFIG_CPU_TLB_V4WBI=y 112CONFIG_CPU_TLB_V4WBI=y
110CONFIG_CPU_MINICACHE=y
111 113
112# 114#
113# Processor Features 115# Processor Features
@@ -119,9 +121,11 @@ CONFIG_XSCALE_PMU=y
119# 121#
120# Bus support 122# Bus support
121# 123#
124CONFIG_ISA_DMA_API=y
122CONFIG_PCI=y 125CONFIG_PCI=y
123CONFIG_PCI_LEGACY_PROC=y 126CONFIG_PCI_LEGACY_PROC=y
124CONFIG_PCI_NAMES=y 127CONFIG_PCI_NAMES=y
128# CONFIG_PCI_DEBUG is not set
125 129
126# 130#
127# PCCARD (PCMCIA/CardBus) support 131# PCCARD (PCMCIA/CardBus) support
@@ -131,7 +135,15 @@ CONFIG_PCI_NAMES=y
131# 135#
132# Kernel Features 136# Kernel Features
133# 137#
138# CONFIG_SMP is not set
134# CONFIG_PREEMPT is not set 139# CONFIG_PREEMPT is not set
140# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
141CONFIG_SELECT_MEMORY_MODEL=y
142CONFIG_FLATMEM_MANUAL=y
143# CONFIG_DISCONTIGMEM_MANUAL is not set
144# CONFIG_SPARSEMEM_MANUAL is not set
145CONFIG_FLATMEM=y
146CONFIG_FLAT_NODE_MEM_MAP=y
135CONFIG_ALIGNMENT_TRAP=y 147CONFIG_ALIGNMENT_TRAP=y
136 148
137# 149#
@@ -270,7 +282,6 @@ CONFIG_MTD_IXP2000=y
270# 282#
271# Block devices 283# Block devices
272# 284#
273# CONFIG_BLK_DEV_FD is not set
274# CONFIG_BLK_CPQ_DA is not set 285# CONFIG_BLK_CPQ_DA is not set
275# CONFIG_BLK_CPQ_CISS_DA is not set 286# CONFIG_BLK_CPQ_CISS_DA is not set
276# CONFIG_BLK_DEV_DAC960 is not set 287# CONFIG_BLK_DEV_DAC960 is not set
@@ -309,6 +320,7 @@ CONFIG_IOSCHED_CFQ=y
309# 320#
310# Fusion MPT device support 321# Fusion MPT device support
311# 322#
323# CONFIG_FUSION is not set
312 324
313# 325#
314# IEEE 1394 (FireWire) support 326# IEEE 1394 (FireWire) support
@@ -330,10 +342,11 @@ CONFIG_NET=y
330# 342#
331CONFIG_PACKET=y 343CONFIG_PACKET=y
332CONFIG_PACKET_MMAP=y 344CONFIG_PACKET_MMAP=y
333# CONFIG_NETLINK_DEV is not set
334CONFIG_UNIX=y 345CONFIG_UNIX=y
335# CONFIG_NET_KEY is not set 346# CONFIG_NET_KEY is not set
336CONFIG_INET=y 347CONFIG_INET=y
348CONFIG_IP_FIB_HASH=y
349# CONFIG_IP_FIB_TRIE is not set
337# CONFIG_IP_MULTICAST is not set 350# CONFIG_IP_MULTICAST is not set
338# CONFIG_IP_ADVANCED_ROUTER is not set 351# CONFIG_IP_ADVANCED_ROUTER is not set
339CONFIG_IP_PNP=y 352CONFIG_IP_PNP=y
@@ -350,6 +363,17 @@ CONFIG_SYN_COOKIES=y
350# CONFIG_INET_TUNNEL is not set 363# CONFIG_INET_TUNNEL is not set
351# CONFIG_IP_TCPDIAG is not set 364# CONFIG_IP_TCPDIAG is not set
352# CONFIG_IP_TCPDIAG_IPV6 is not set 365# CONFIG_IP_TCPDIAG_IPV6 is not set
366
367#
368# TCP congestion control
369#
370CONFIG_TCP_CONG_BIC=y
371CONFIG_TCP_CONG_WESTWOOD=m
372CONFIG_TCP_CONG_HTCP=m
373# CONFIG_TCP_CONG_HSTCP is not set
374# CONFIG_TCP_CONG_HYBLA is not set
375# CONFIG_TCP_CONG_VEGAS is not set
376# CONFIG_TCP_CONG_SCALABLE is not set
353# CONFIG_IPV6 is not set 377# CONFIG_IPV6 is not set
354# CONFIG_NETFILTER is not set 378# CONFIG_NETFILTER is not set
355 379
@@ -405,6 +429,7 @@ CONFIG_MII=y
405# CONFIG_SUNGEM is not set 429# CONFIG_SUNGEM is not set
406# CONFIG_NET_VENDOR_3COM is not set 430# CONFIG_NET_VENDOR_3COM is not set
407# CONFIG_SMC91X is not set 431# CONFIG_SMC91X is not set
432# CONFIG_DM9000 is not set
408 433
409# 434#
410# Tulip family network device support 435# Tulip family network device support
@@ -441,9 +466,11 @@ CONFIG_EEPRO100=y
441# CONFIG_HAMACHI is not set 466# CONFIG_HAMACHI is not set
442# CONFIG_YELLOWFIN is not set 467# CONFIG_YELLOWFIN is not set
443# CONFIG_R8169 is not set 468# CONFIG_R8169 is not set
469# CONFIG_SKGE is not set
444# CONFIG_SK98LIN is not set 470# CONFIG_SK98LIN is not set
445# CONFIG_VIA_VELOCITY is not set 471# CONFIG_VIA_VELOCITY is not set
446# CONFIG_TIGON3 is not set 472# CONFIG_TIGON3 is not set
473# CONFIG_BNX2 is not set
447 474
448# 475#
449# Ethernet (10000 Mbit) 476# Ethernet (10000 Mbit)
@@ -465,6 +492,7 @@ CONFIG_EEPRO100=y
465# Wan interfaces 492# Wan interfaces
466# 493#
467CONFIG_WAN=y 494CONFIG_WAN=y
495# CONFIG_DSCC4 is not set
468# CONFIG_LANMEDIA is not set 496# CONFIG_LANMEDIA is not set
469# CONFIG_SYNCLINK_SYNCPPP is not set 497# CONFIG_SYNCLINK_SYNCPPP is not set
470CONFIG_HDLC=y 498CONFIG_HDLC=y
@@ -527,7 +555,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
527# 555#
528# CONFIG_SERIO is not set 556# CONFIG_SERIO is not set
529# CONFIG_GAMEPORT is not set 557# CONFIG_GAMEPORT is not set
530CONFIG_SOUND_GAMEPORT=y
531 558
532# 559#
533# Character devices 560# Character devices
@@ -548,6 +575,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
548# 575#
549CONFIG_SERIAL_CORE=y 576CONFIG_SERIAL_CORE=y
550CONFIG_SERIAL_CORE_CONSOLE=y 577CONFIG_SERIAL_CORE_CONSOLE=y
578# CONFIG_SERIAL_JSM is not set
551CONFIG_UNIX98_PTYS=y 579CONFIG_UNIX98_PTYS=y
552CONFIG_LEGACY_PTYS=y 580CONFIG_LEGACY_PTYS=y
553CONFIG_LEGACY_PTY_COUNT=256 581CONFIG_LEGACY_PTY_COUNT=256
@@ -614,17 +642,18 @@ CONFIG_I2C_ALGOBIT=y
614# CONFIG_I2C_AMD8111 is not set 642# CONFIG_I2C_AMD8111 is not set
615# CONFIG_I2C_I801 is not set 643# CONFIG_I2C_I801 is not set
616# CONFIG_I2C_I810 is not set 644# CONFIG_I2C_I810 is not set
645# CONFIG_I2C_PIIX4 is not set
617# CONFIG_I2C_ISA is not set 646# CONFIG_I2C_ISA is not set
618# CONFIG_I2C_IXP2000 is not set 647# CONFIG_I2C_IXP2000 is not set
619# CONFIG_I2C_NFORCE2 is not set 648# CONFIG_I2C_NFORCE2 is not set
620# CONFIG_I2C_PARPORT_LIGHT is not set 649# CONFIG_I2C_PARPORT_LIGHT is not set
621# CONFIG_I2C_PIIX4 is not set
622# CONFIG_I2C_PROSAVAGE is not set 650# CONFIG_I2C_PROSAVAGE is not set
623# CONFIG_I2C_SAVAGE4 is not set 651# CONFIG_I2C_SAVAGE4 is not set
624# CONFIG_SCx200_ACB is not set 652# CONFIG_SCx200_ACB is not set
625# CONFIG_I2C_SIS5595 is not set 653# CONFIG_I2C_SIS5595 is not set
626# CONFIG_I2C_SIS630 is not set 654# CONFIG_I2C_SIS630 is not set
627# CONFIG_I2C_SIS96X is not set 655# CONFIG_I2C_SIS96X is not set
656# CONFIG_I2C_STUB is not set
628# CONFIG_I2C_VIA is not set 657# CONFIG_I2C_VIA is not set
629# CONFIG_I2C_VIAPRO is not set 658# CONFIG_I2C_VIAPRO is not set
630# CONFIG_I2C_VOODOO3 is not set 659# CONFIG_I2C_VOODOO3 is not set
@@ -638,7 +667,9 @@ CONFIG_I2C_SENSOR=y
638# CONFIG_SENSORS_ADM1025 is not set 667# CONFIG_SENSORS_ADM1025 is not set
639# CONFIG_SENSORS_ADM1026 is not set 668# CONFIG_SENSORS_ADM1026 is not set
640# CONFIG_SENSORS_ADM1031 is not set 669# CONFIG_SENSORS_ADM1031 is not set
670# CONFIG_SENSORS_ADM9240 is not set
641# CONFIG_SENSORS_ASB100 is not set 671# CONFIG_SENSORS_ASB100 is not set
672# CONFIG_SENSORS_ATXP1 is not set
642# CONFIG_SENSORS_DS1621 is not set 673# CONFIG_SENSORS_DS1621 is not set
643# CONFIG_SENSORS_FSCHER is not set 674# CONFIG_SENSORS_FSCHER is not set
644# CONFIG_SENSORS_FSCPOS is not set 675# CONFIG_SENSORS_FSCPOS is not set
@@ -654,6 +685,7 @@ CONFIG_I2C_SENSOR=y
654# CONFIG_SENSORS_LM85 is not set 685# CONFIG_SENSORS_LM85 is not set
655# CONFIG_SENSORS_LM87 is not set 686# CONFIG_SENSORS_LM87 is not set
656# CONFIG_SENSORS_LM90 is not set 687# CONFIG_SENSORS_LM90 is not set
688# CONFIG_SENSORS_LM92 is not set
657# CONFIG_SENSORS_MAX1619 is not set 689# CONFIG_SENSORS_MAX1619 is not set
658# CONFIG_SENSORS_PC87360 is not set 690# CONFIG_SENSORS_PC87360 is not set
659# CONFIG_SENSORS_SMSC47B397 is not set 691# CONFIG_SENSORS_SMSC47B397 is not set
@@ -663,14 +695,19 @@ CONFIG_I2C_SENSOR=y
663# CONFIG_SENSORS_W83781D is not set 695# CONFIG_SENSORS_W83781D is not set
664# CONFIG_SENSORS_W83L785TS is not set 696# CONFIG_SENSORS_W83L785TS is not set
665# CONFIG_SENSORS_W83627HF is not set 697# CONFIG_SENSORS_W83627HF is not set
698# CONFIG_SENSORS_W83627EHF is not set
666 699
667# 700#
668# Other I2C Chip support 701# Other I2C Chip support
669# 702#
703# CONFIG_SENSORS_DS1337 is not set
704# CONFIG_SENSORS_DS1374 is not set
670CONFIG_SENSORS_EEPROM=y 705CONFIG_SENSORS_EEPROM=y
671# CONFIG_SENSORS_PCF8574 is not set 706# CONFIG_SENSORS_PCF8574 is not set
707# CONFIG_SENSORS_PCA9539 is not set
672# CONFIG_SENSORS_PCF8591 is not set 708# CONFIG_SENSORS_PCF8591 is not set
673# CONFIG_SENSORS_RTC8564 is not set 709# CONFIG_SENSORS_RTC8564 is not set
710# CONFIG_SENSORS_MAX6875 is not set
674# CONFIG_I2C_DEBUG_CORE is not set 711# CONFIG_I2C_DEBUG_CORE is not set
675# CONFIG_I2C_DEBUG_ALGO is not set 712# CONFIG_I2C_DEBUG_ALGO is not set
676# CONFIG_I2C_DEBUG_BUS is not set 713# CONFIG_I2C_DEBUG_BUS is not set
@@ -724,6 +761,7 @@ CONFIG_EXT2_FS=y
724CONFIG_EXT2_FS_XATTR=y 761CONFIG_EXT2_FS_XATTR=y
725CONFIG_EXT2_FS_POSIX_ACL=y 762CONFIG_EXT2_FS_POSIX_ACL=y
726# CONFIG_EXT2_FS_SECURITY is not set 763# CONFIG_EXT2_FS_SECURITY is not set
764# CONFIG_EXT2_FS_XIP is not set
727CONFIG_EXT3_FS=y 765CONFIG_EXT3_FS=y
728CONFIG_EXT3_FS_XATTR=y 766CONFIG_EXT3_FS_XATTR=y
729CONFIG_EXT3_FS_POSIX_ACL=y 767CONFIG_EXT3_FS_POSIX_ACL=y
@@ -764,7 +802,6 @@ CONFIG_DNOTIFY=y
764# 802#
765CONFIG_PROC_FS=y 803CONFIG_PROC_FS=y
766CONFIG_SYSFS=y 804CONFIG_SYSFS=y
767# CONFIG_DEVFS_FS is not set
768# CONFIG_DEVPTS_FS_XATTR is not set 805# CONFIG_DEVPTS_FS_XATTR is not set
769CONFIG_TMPFS=y 806CONFIG_TMPFS=y
770# CONFIG_TMPFS_XATTR is not set 807# CONFIG_TMPFS_XATTR is not set
@@ -802,12 +839,14 @@ CONFIG_JFFS2_RTIME=y
802# 839#
803CONFIG_NFS_FS=y 840CONFIG_NFS_FS=y
804CONFIG_NFS_V3=y 841CONFIG_NFS_V3=y
842# CONFIG_NFS_V3_ACL is not set
805# CONFIG_NFS_V4 is not set 843# CONFIG_NFS_V4 is not set
806# CONFIG_NFS_DIRECTIO is not set 844# CONFIG_NFS_DIRECTIO is not set
807# CONFIG_NFSD is not set 845# CONFIG_NFSD is not set
808CONFIG_ROOT_NFS=y 846CONFIG_ROOT_NFS=y
809CONFIG_LOCKD=y 847CONFIG_LOCKD=y
810CONFIG_LOCKD_V4=y 848CONFIG_LOCKD_V4=y
849CONFIG_NFS_COMMON=y
811CONFIG_SUNRPC=y 850CONFIG_SUNRPC=y
812# CONFIG_RPCSEC_GSS_KRB5 is not set 851# CONFIG_RPCSEC_GSS_KRB5 is not set
813# CONFIG_RPCSEC_GSS_SPKM3 is not set 852# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -892,3 +931,4 @@ CONFIG_CRC32=y
892# CONFIG_LIBCRC32C is not set 931# CONFIG_LIBCRC32C is not set
893CONFIG_ZLIB_INFLATE=y 932CONFIG_ZLIB_INFLATE=y
894CONFIG_ZLIB_DEFLATE=y 933CONFIG_ZLIB_DEFLATE=y
934# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2401_defconfig b/arch/arm/configs/ixdp2401_defconfig
index 72e1b940e975..2da48fca5c1c 100644
--- a/arch/arm/configs/ixdp2401_defconfig
+++ b/arch/arm/configs/ixdp2401_defconfig
@@ -1,14 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc1-bk2 3# Linux kernel version: 2.6.12-git6
4# Sun Mar 27 21:53:55 2005 4# Sat Jun 25 00:59:35 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_IOMAP=y
12 11
13# 12#
14# Code maturity level options 13# Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
16CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
17CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
18CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19 19
20# 20#
21# General setup 21# General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
38CONFIG_BASE_FULL=y 40CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 41CONFIG_FUTEX=y
40CONFIG_EPOLL=y 42CONFIG_EPOLL=y
@@ -82,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
82# CONFIG_ARCH_VERSATILE is not set 84# CONFIG_ARCH_VERSATILE is not set
83# CONFIG_ARCH_IMX is not set 85# CONFIG_ARCH_IMX is not set
84# CONFIG_ARCH_H720X is not set 86# CONFIG_ARCH_H720X is not set
87# CONFIG_ARCH_AAEC2000 is not set
85CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y 88CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
86 89
87# 90#
@@ -107,7 +110,6 @@ CONFIG_CPU_32v5=y
107CONFIG_CPU_ABRT_EV5T=y 110CONFIG_CPU_ABRT_EV5T=y
108CONFIG_CPU_CACHE_VIVT=y 111CONFIG_CPU_CACHE_VIVT=y
109CONFIG_CPU_TLB_V4WBI=y 112CONFIG_CPU_TLB_V4WBI=y
110CONFIG_CPU_MINICACHE=y
111 113
112# 114#
113# Processor Features 115# Processor Features
@@ -119,9 +121,11 @@ CONFIG_XSCALE_PMU=y
119# 121#
120# Bus support 122# Bus support
121# 123#
124CONFIG_ISA_DMA_API=y
122CONFIG_PCI=y 125CONFIG_PCI=y
123CONFIG_PCI_LEGACY_PROC=y 126CONFIG_PCI_LEGACY_PROC=y
124CONFIG_PCI_NAMES=y 127CONFIG_PCI_NAMES=y
128# CONFIG_PCI_DEBUG is not set
125 129
126# 130#
127# PCCARD (PCMCIA/CardBus) support 131# PCCARD (PCMCIA/CardBus) support
@@ -131,7 +135,15 @@ CONFIG_PCI_NAMES=y
131# 135#
132# Kernel Features 136# Kernel Features
133# 137#
138# CONFIG_SMP is not set
134# CONFIG_PREEMPT is not set 139# CONFIG_PREEMPT is not set
140# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
141CONFIG_SELECT_MEMORY_MODEL=y
142CONFIG_FLATMEM_MANUAL=y
143# CONFIG_DISCONTIGMEM_MANUAL is not set
144# CONFIG_SPARSEMEM_MANUAL is not set
145CONFIG_FLATMEM=y
146CONFIG_FLAT_NODE_MEM_MAP=y
135CONFIG_ALIGNMENT_TRAP=y 147CONFIG_ALIGNMENT_TRAP=y
136 148
137# 149#
@@ -270,7 +282,6 @@ CONFIG_MTD_IXP2000=y
270# 282#
271# Block devices 283# Block devices
272# 284#
273# CONFIG_BLK_DEV_FD is not set
274# CONFIG_BLK_CPQ_DA is not set 285# CONFIG_BLK_CPQ_DA is not set
275# CONFIG_BLK_CPQ_CISS_DA is not set 286# CONFIG_BLK_CPQ_CISS_DA is not set
276# CONFIG_BLK_DEV_DAC960 is not set 287# CONFIG_BLK_DEV_DAC960 is not set
@@ -309,6 +320,7 @@ CONFIG_IOSCHED_CFQ=y
309# 320#
310# Fusion MPT device support 321# Fusion MPT device support
311# 322#
323# CONFIG_FUSION is not set
312 324
313# 325#
314# IEEE 1394 (FireWire) support 326# IEEE 1394 (FireWire) support
@@ -330,10 +342,11 @@ CONFIG_NET=y
330# 342#
331CONFIG_PACKET=y 343CONFIG_PACKET=y
332CONFIG_PACKET_MMAP=y 344CONFIG_PACKET_MMAP=y
333# CONFIG_NETLINK_DEV is not set
334CONFIG_UNIX=y 345CONFIG_UNIX=y
335# CONFIG_NET_KEY is not set 346# CONFIG_NET_KEY is not set
336CONFIG_INET=y 347CONFIG_INET=y
348CONFIG_IP_FIB_HASH=y
349# CONFIG_IP_FIB_TRIE is not set
337# CONFIG_IP_MULTICAST is not set 350# CONFIG_IP_MULTICAST is not set
338# CONFIG_IP_ADVANCED_ROUTER is not set 351# CONFIG_IP_ADVANCED_ROUTER is not set
339CONFIG_IP_PNP=y 352CONFIG_IP_PNP=y
@@ -350,6 +363,17 @@ CONFIG_SYN_COOKIES=y
350# CONFIG_INET_TUNNEL is not set 363# CONFIG_INET_TUNNEL is not set
351CONFIG_IP_TCPDIAG=y 364CONFIG_IP_TCPDIAG=y
352# CONFIG_IP_TCPDIAG_IPV6 is not set 365# CONFIG_IP_TCPDIAG_IPV6 is not set
366
367#
368# TCP congestion control
369#
370CONFIG_TCP_CONG_BIC=y
371CONFIG_TCP_CONG_WESTWOOD=m
372CONFIG_TCP_CONG_HTCP=m
373# CONFIG_TCP_CONG_HSTCP is not set
374# CONFIG_TCP_CONG_HYBLA is not set
375# CONFIG_TCP_CONG_VEGAS is not set
376# CONFIG_TCP_CONG_SCALABLE is not set
353# CONFIG_IPV6 is not set 377# CONFIG_IPV6 is not set
354# CONFIG_NETFILTER is not set 378# CONFIG_NETFILTER is not set
355 379
@@ -405,6 +429,7 @@ CONFIG_MII=y
405# CONFIG_SUNGEM is not set 429# CONFIG_SUNGEM is not set
406# CONFIG_NET_VENDOR_3COM is not set 430# CONFIG_NET_VENDOR_3COM is not set
407# CONFIG_SMC91X is not set 431# CONFIG_SMC91X is not set
432# CONFIG_DM9000 is not set
408 433
409# 434#
410# Tulip family network device support 435# Tulip family network device support
@@ -442,9 +467,11 @@ CONFIG_EEPRO100=y
442# CONFIG_HAMACHI is not set 467# CONFIG_HAMACHI is not set
443# CONFIG_YELLOWFIN is not set 468# CONFIG_YELLOWFIN is not set
444# CONFIG_R8169 is not set 469# CONFIG_R8169 is not set
470# CONFIG_SKGE is not set
445# CONFIG_SK98LIN is not set 471# CONFIG_SK98LIN is not set
446# CONFIG_VIA_VELOCITY is not set 472# CONFIG_VIA_VELOCITY is not set
447# CONFIG_TIGON3 is not set 473# CONFIG_TIGON3 is not set
474# CONFIG_BNX2 is not set
448 475
449# 476#
450# Ethernet (10000 Mbit) 477# Ethernet (10000 Mbit)
@@ -466,6 +493,7 @@ CONFIG_EEPRO100=y
466# Wan interfaces 493# Wan interfaces
467# 494#
468CONFIG_WAN=y 495CONFIG_WAN=y
496# CONFIG_DSCC4 is not set
469# CONFIG_LANMEDIA is not set 497# CONFIG_LANMEDIA is not set
470# CONFIG_SYNCLINK_SYNCPPP is not set 498# CONFIG_SYNCLINK_SYNCPPP is not set
471CONFIG_HDLC=y 499CONFIG_HDLC=y
@@ -528,7 +556,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
528# 556#
529# CONFIG_SERIO is not set 557# CONFIG_SERIO is not set
530# CONFIG_GAMEPORT is not set 558# CONFIG_GAMEPORT is not set
531CONFIG_SOUND_GAMEPORT=y
532 559
533# 560#
534# Character devices 561# Character devices
@@ -549,6 +576,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
549# 576#
550CONFIG_SERIAL_CORE=y 577CONFIG_SERIAL_CORE=y
551CONFIG_SERIAL_CORE_CONSOLE=y 578CONFIG_SERIAL_CORE_CONSOLE=y
579# CONFIG_SERIAL_JSM is not set
552CONFIG_UNIX98_PTYS=y 580CONFIG_UNIX98_PTYS=y
553CONFIG_LEGACY_PTYS=y 581CONFIG_LEGACY_PTYS=y
554CONFIG_LEGACY_PTY_COUNT=256 582CONFIG_LEGACY_PTY_COUNT=256
@@ -615,17 +643,18 @@ CONFIG_I2C_ALGOBIT=y
615# CONFIG_I2C_AMD8111 is not set 643# CONFIG_I2C_AMD8111 is not set
616# CONFIG_I2C_I801 is not set 644# CONFIG_I2C_I801 is not set
617# CONFIG_I2C_I810 is not set 645# CONFIG_I2C_I810 is not set
646# CONFIG_I2C_PIIX4 is not set
618# CONFIG_I2C_ISA is not set 647# CONFIG_I2C_ISA is not set
619# CONFIG_I2C_IXP2000 is not set 648# CONFIG_I2C_IXP2000 is not set
620# CONFIG_I2C_NFORCE2 is not set 649# CONFIG_I2C_NFORCE2 is not set
621# CONFIG_I2C_PARPORT_LIGHT is not set 650# CONFIG_I2C_PARPORT_LIGHT is not set
622# CONFIG_I2C_PIIX4 is not set
623# CONFIG_I2C_PROSAVAGE is not set 651# CONFIG_I2C_PROSAVAGE is not set
624# CONFIG_I2C_SAVAGE4 is not set 652# CONFIG_I2C_SAVAGE4 is not set
625# CONFIG_SCx200_ACB is not set 653# CONFIG_SCx200_ACB is not set
626# CONFIG_I2C_SIS5595 is not set 654# CONFIG_I2C_SIS5595 is not set
627# CONFIG_I2C_SIS630 is not set 655# CONFIG_I2C_SIS630 is not set
628# CONFIG_I2C_SIS96X is not set 656# CONFIG_I2C_SIS96X is not set
657# CONFIG_I2C_STUB is not set
629# CONFIG_I2C_VIA is not set 658# CONFIG_I2C_VIA is not set
630# CONFIG_I2C_VIAPRO is not set 659# CONFIG_I2C_VIAPRO is not set
631# CONFIG_I2C_VOODOO3 is not set 660# CONFIG_I2C_VOODOO3 is not set
@@ -639,7 +668,9 @@ CONFIG_I2C_SENSOR=y
639# CONFIG_SENSORS_ADM1025 is not set 668# CONFIG_SENSORS_ADM1025 is not set
640# CONFIG_SENSORS_ADM1026 is not set 669# CONFIG_SENSORS_ADM1026 is not set
641# CONFIG_SENSORS_ADM1031 is not set 670# CONFIG_SENSORS_ADM1031 is not set
671# CONFIG_SENSORS_ADM9240 is not set
642# CONFIG_SENSORS_ASB100 is not set 672# CONFIG_SENSORS_ASB100 is not set
673# CONFIG_SENSORS_ATXP1 is not set
643# CONFIG_SENSORS_DS1621 is not set 674# CONFIG_SENSORS_DS1621 is not set
644# CONFIG_SENSORS_FSCHER is not set 675# CONFIG_SENSORS_FSCHER is not set
645# CONFIG_SENSORS_FSCPOS is not set 676# CONFIG_SENSORS_FSCPOS is not set
@@ -655,6 +686,7 @@ CONFIG_I2C_SENSOR=y
655# CONFIG_SENSORS_LM85 is not set 686# CONFIG_SENSORS_LM85 is not set
656# CONFIG_SENSORS_LM87 is not set 687# CONFIG_SENSORS_LM87 is not set
657# CONFIG_SENSORS_LM90 is not set 688# CONFIG_SENSORS_LM90 is not set
689# CONFIG_SENSORS_LM92 is not set
658# CONFIG_SENSORS_MAX1619 is not set 690# CONFIG_SENSORS_MAX1619 is not set
659# CONFIG_SENSORS_PC87360 is not set 691# CONFIG_SENSORS_PC87360 is not set
660# CONFIG_SENSORS_SMSC47B397 is not set 692# CONFIG_SENSORS_SMSC47B397 is not set
@@ -664,14 +696,19 @@ CONFIG_I2C_SENSOR=y
664# CONFIG_SENSORS_W83781D is not set 696# CONFIG_SENSORS_W83781D is not set
665# CONFIG_SENSORS_W83L785TS is not set 697# CONFIG_SENSORS_W83L785TS is not set
666# CONFIG_SENSORS_W83627HF is not set 698# CONFIG_SENSORS_W83627HF is not set
699# CONFIG_SENSORS_W83627EHF is not set
667 700
668# 701#
669# Other I2C Chip support 702# Other I2C Chip support
670# 703#
704# CONFIG_SENSORS_DS1337 is not set
705# CONFIG_SENSORS_DS1374 is not set
671CONFIG_SENSORS_EEPROM=y 706CONFIG_SENSORS_EEPROM=y
672# CONFIG_SENSORS_PCF8574 is not set 707# CONFIG_SENSORS_PCF8574 is not set
708# CONFIG_SENSORS_PCA9539 is not set
673# CONFIG_SENSORS_PCF8591 is not set 709# CONFIG_SENSORS_PCF8591 is not set
674# CONFIG_SENSORS_RTC8564 is not set 710# CONFIG_SENSORS_RTC8564 is not set
711# CONFIG_SENSORS_MAX6875 is not set
675# CONFIG_I2C_DEBUG_CORE is not set 712# CONFIG_I2C_DEBUG_CORE is not set
676# CONFIG_I2C_DEBUG_ALGO is not set 713# CONFIG_I2C_DEBUG_ALGO is not set
677# CONFIG_I2C_DEBUG_BUS is not set 714# CONFIG_I2C_DEBUG_BUS is not set
@@ -725,6 +762,7 @@ CONFIG_EXT2_FS=y
725CONFIG_EXT2_FS_XATTR=y 762CONFIG_EXT2_FS_XATTR=y
726CONFIG_EXT2_FS_POSIX_ACL=y 763CONFIG_EXT2_FS_POSIX_ACL=y
727# CONFIG_EXT2_FS_SECURITY is not set 764# CONFIG_EXT2_FS_SECURITY is not set
765# CONFIG_EXT2_FS_XIP is not set
728CONFIG_EXT3_FS=y 766CONFIG_EXT3_FS=y
729CONFIG_EXT3_FS_XATTR=y 767CONFIG_EXT3_FS_XATTR=y
730CONFIG_EXT3_FS_POSIX_ACL=y 768CONFIG_EXT3_FS_POSIX_ACL=y
@@ -765,7 +803,6 @@ CONFIG_DNOTIFY=y
765# 803#
766CONFIG_PROC_FS=y 804CONFIG_PROC_FS=y
767CONFIG_SYSFS=y 805CONFIG_SYSFS=y
768# CONFIG_DEVFS_FS is not set
769# CONFIG_DEVPTS_FS_XATTR is not set 806# CONFIG_DEVPTS_FS_XATTR is not set
770CONFIG_TMPFS=y 807CONFIG_TMPFS=y
771# CONFIG_TMPFS_XATTR is not set 808# CONFIG_TMPFS_XATTR is not set
@@ -803,12 +840,14 @@ CONFIG_JFFS2_RTIME=y
803# 840#
804CONFIG_NFS_FS=y 841CONFIG_NFS_FS=y
805CONFIG_NFS_V3=y 842CONFIG_NFS_V3=y
843# CONFIG_NFS_V3_ACL is not set
806# CONFIG_NFS_V4 is not set 844# CONFIG_NFS_V4 is not set
807# CONFIG_NFS_DIRECTIO is not set 845# CONFIG_NFS_DIRECTIO is not set
808# CONFIG_NFSD is not set 846# CONFIG_NFSD is not set
809CONFIG_ROOT_NFS=y 847CONFIG_ROOT_NFS=y
810CONFIG_LOCKD=y 848CONFIG_LOCKD=y
811CONFIG_LOCKD_V4=y 849CONFIG_LOCKD_V4=y
850CONFIG_NFS_COMMON=y
812CONFIG_SUNRPC=y 851CONFIG_SUNRPC=y
813# CONFIG_RPCSEC_GSS_KRB5 is not set 852# CONFIG_RPCSEC_GSS_KRB5 is not set
814# CONFIG_RPCSEC_GSS_SPKM3 is not set 853# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -893,3 +932,4 @@ CONFIG_CRC32=y
893# CONFIG_LIBCRC32C is not set 932# CONFIG_LIBCRC32C is not set
894CONFIG_ZLIB_INFLATE=y 933CONFIG_ZLIB_INFLATE=y
895CONFIG_ZLIB_DEFLATE=y 934CONFIG_ZLIB_DEFLATE=y
935# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2800_defconfig b/arch/arm/configs/ixdp2800_defconfig
index 1592e45f0278..7ba867f751fd 100644
--- a/arch/arm/configs/ixdp2800_defconfig
+++ b/arch/arm/configs/ixdp2800_defconfig
@@ -1,14 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc1-bk2 3# Linux kernel version: 2.6.12-git6
4# Sun Mar 27 22:15:23 2005 4# Sat Jun 25 01:00:27 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_IOMAP=y
12 11
13# 12#
14# Code maturity level options 13# Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
16CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
17CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
18CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19 19
20# 20#
21# General setup 21# General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
38CONFIG_BASE_FULL=y 40CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 41CONFIG_FUTEX=y
40CONFIG_EPOLL=y 42CONFIG_EPOLL=y
@@ -82,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
82# CONFIG_ARCH_VERSATILE is not set 84# CONFIG_ARCH_VERSATILE is not set
83# CONFIG_ARCH_IMX is not set 85# CONFIG_ARCH_IMX is not set
84# CONFIG_ARCH_H720X is not set 86# CONFIG_ARCH_H720X is not set
87# CONFIG_ARCH_AAEC2000 is not set
85CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y 88CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
86 89
87# 90#
@@ -107,7 +110,6 @@ CONFIG_CPU_32v5=y
107CONFIG_CPU_ABRT_EV5T=y 110CONFIG_CPU_ABRT_EV5T=y
108CONFIG_CPU_CACHE_VIVT=y 111CONFIG_CPU_CACHE_VIVT=y
109CONFIG_CPU_TLB_V4WBI=y 112CONFIG_CPU_TLB_V4WBI=y
110CONFIG_CPU_MINICACHE=y
111 113
112# 114#
113# Processor Features 115# Processor Features
@@ -119,9 +121,11 @@ CONFIG_XSCALE_PMU=y
119# 121#
120# Bus support 122# Bus support
121# 123#
124CONFIG_ISA_DMA_API=y
122CONFIG_PCI=y 125CONFIG_PCI=y
123CONFIG_PCI_LEGACY_PROC=y 126CONFIG_PCI_LEGACY_PROC=y
124CONFIG_PCI_NAMES=y 127CONFIG_PCI_NAMES=y
128# CONFIG_PCI_DEBUG is not set
125 129
126# 130#
127# PCCARD (PCMCIA/CardBus) support 131# PCCARD (PCMCIA/CardBus) support
@@ -131,7 +135,15 @@ CONFIG_PCI_NAMES=y
131# 135#
132# Kernel Features 136# Kernel Features
133# 137#
138# CONFIG_SMP is not set
134# CONFIG_PREEMPT is not set 139# CONFIG_PREEMPT is not set
140# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
141CONFIG_SELECT_MEMORY_MODEL=y
142CONFIG_FLATMEM_MANUAL=y
143# CONFIG_DISCONTIGMEM_MANUAL is not set
144# CONFIG_SPARSEMEM_MANUAL is not set
145CONFIG_FLATMEM=y
146CONFIG_FLAT_NODE_MEM_MAP=y
135CONFIG_ALIGNMENT_TRAP=y 147CONFIG_ALIGNMENT_TRAP=y
136 148
137# 149#
@@ -270,7 +282,6 @@ CONFIG_MTD_IXP2000=y
270# 282#
271# Block devices 283# Block devices
272# 284#
273# CONFIG_BLK_DEV_FD is not set
274# CONFIG_BLK_CPQ_DA is not set 285# CONFIG_BLK_CPQ_DA is not set
275# CONFIG_BLK_CPQ_CISS_DA is not set 286# CONFIG_BLK_CPQ_CISS_DA is not set
276# CONFIG_BLK_DEV_DAC960 is not set 287# CONFIG_BLK_DEV_DAC960 is not set
@@ -309,6 +320,7 @@ CONFIG_IOSCHED_CFQ=y
309# 320#
310# Fusion MPT device support 321# Fusion MPT device support
311# 322#
323# CONFIG_FUSION is not set
312 324
313# 325#
314# IEEE 1394 (FireWire) support 326# IEEE 1394 (FireWire) support
@@ -330,10 +342,11 @@ CONFIG_NET=y
330# 342#
331CONFIG_PACKET=y 343CONFIG_PACKET=y
332CONFIG_PACKET_MMAP=y 344CONFIG_PACKET_MMAP=y
333# CONFIG_NETLINK_DEV is not set
334CONFIG_UNIX=y 345CONFIG_UNIX=y
335# CONFIG_NET_KEY is not set 346# CONFIG_NET_KEY is not set
336CONFIG_INET=y 347CONFIG_INET=y
348CONFIG_IP_FIB_HASH=y
349# CONFIG_IP_FIB_TRIE is not set
337# CONFIG_IP_MULTICAST is not set 350# CONFIG_IP_MULTICAST is not set
338# CONFIG_IP_ADVANCED_ROUTER is not set 351# CONFIG_IP_ADVANCED_ROUTER is not set
339CONFIG_IP_PNP=y 352CONFIG_IP_PNP=y
@@ -350,6 +363,17 @@ CONFIG_SYN_COOKIES=y
350# CONFIG_INET_TUNNEL is not set 363# CONFIG_INET_TUNNEL is not set
351# CONFIG_IP_TCPDIAG is not set 364# CONFIG_IP_TCPDIAG is not set
352# CONFIG_IP_TCPDIAG_IPV6 is not set 365# CONFIG_IP_TCPDIAG_IPV6 is not set
366
367#
368# TCP congestion control
369#
370CONFIG_TCP_CONG_BIC=y
371CONFIG_TCP_CONG_WESTWOOD=m
372CONFIG_TCP_CONG_HTCP=m
373# CONFIG_TCP_CONG_HSTCP is not set
374# CONFIG_TCP_CONG_HYBLA is not set
375# CONFIG_TCP_CONG_VEGAS is not set
376# CONFIG_TCP_CONG_SCALABLE is not set
353# CONFIG_IPV6 is not set 377# CONFIG_IPV6 is not set
354# CONFIG_NETFILTER is not set 378# CONFIG_NETFILTER is not set
355 379
@@ -405,6 +429,7 @@ CONFIG_MII=y
405# CONFIG_SUNGEM is not set 429# CONFIG_SUNGEM is not set
406# CONFIG_NET_VENDOR_3COM is not set 430# CONFIG_NET_VENDOR_3COM is not set
407# CONFIG_SMC91X is not set 431# CONFIG_SMC91X is not set
432# CONFIG_DM9000 is not set
408 433
409# 434#
410# Tulip family network device support 435# Tulip family network device support
@@ -441,9 +466,11 @@ CONFIG_EEPRO100=y
441# CONFIG_HAMACHI is not set 466# CONFIG_HAMACHI is not set
442# CONFIG_YELLOWFIN is not set 467# CONFIG_YELLOWFIN is not set
443# CONFIG_R8169 is not set 468# CONFIG_R8169 is not set
469# CONFIG_SKGE is not set
444# CONFIG_SK98LIN is not set 470# CONFIG_SK98LIN is not set
445# CONFIG_VIA_VELOCITY is not set 471# CONFIG_VIA_VELOCITY is not set
446# CONFIG_TIGON3 is not set 472# CONFIG_TIGON3 is not set
473# CONFIG_BNX2 is not set
447 474
448# 475#
449# Ethernet (10000 Mbit) 476# Ethernet (10000 Mbit)
@@ -465,6 +492,7 @@ CONFIG_EEPRO100=y
465# Wan interfaces 492# Wan interfaces
466# 493#
467CONFIG_WAN=y 494CONFIG_WAN=y
495# CONFIG_DSCC4 is not set
468# CONFIG_LANMEDIA is not set 496# CONFIG_LANMEDIA is not set
469# CONFIG_SYNCLINK_SYNCPPP is not set 497# CONFIG_SYNCLINK_SYNCPPP is not set
470CONFIG_HDLC=y 498CONFIG_HDLC=y
@@ -527,7 +555,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
527# 555#
528# CONFIG_SERIO is not set 556# CONFIG_SERIO is not set
529# CONFIG_GAMEPORT is not set 557# CONFIG_GAMEPORT is not set
530CONFIG_SOUND_GAMEPORT=y
531 558
532# 559#
533# Character devices 560# Character devices
@@ -548,6 +575,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
548# 575#
549CONFIG_SERIAL_CORE=y 576CONFIG_SERIAL_CORE=y
550CONFIG_SERIAL_CORE_CONSOLE=y 577CONFIG_SERIAL_CORE_CONSOLE=y
578# CONFIG_SERIAL_JSM is not set
551CONFIG_UNIX98_PTYS=y 579CONFIG_UNIX98_PTYS=y
552CONFIG_LEGACY_PTYS=y 580CONFIG_LEGACY_PTYS=y
553CONFIG_LEGACY_PTY_COUNT=256 581CONFIG_LEGACY_PTY_COUNT=256
@@ -614,17 +642,18 @@ CONFIG_I2C_ALGOBIT=y
614# CONFIG_I2C_AMD8111 is not set 642# CONFIG_I2C_AMD8111 is not set
615# CONFIG_I2C_I801 is not set 643# CONFIG_I2C_I801 is not set
616# CONFIG_I2C_I810 is not set 644# CONFIG_I2C_I810 is not set
645# CONFIG_I2C_PIIX4 is not set
617# CONFIG_I2C_ISA is not set 646# CONFIG_I2C_ISA is not set
618# CONFIG_I2C_IXP2000 is not set 647# CONFIG_I2C_IXP2000 is not set
619# CONFIG_I2C_NFORCE2 is not set 648# CONFIG_I2C_NFORCE2 is not set
620# CONFIG_I2C_PARPORT_LIGHT is not set 649# CONFIG_I2C_PARPORT_LIGHT is not set
621# CONFIG_I2C_PIIX4 is not set
622# CONFIG_I2C_PROSAVAGE is not set 650# CONFIG_I2C_PROSAVAGE is not set
623# CONFIG_I2C_SAVAGE4 is not set 651# CONFIG_I2C_SAVAGE4 is not set
624# CONFIG_SCx200_ACB is not set 652# CONFIG_SCx200_ACB is not set
625# CONFIG_I2C_SIS5595 is not set 653# CONFIG_I2C_SIS5595 is not set
626# CONFIG_I2C_SIS630 is not set 654# CONFIG_I2C_SIS630 is not set
627# CONFIG_I2C_SIS96X is not set 655# CONFIG_I2C_SIS96X is not set
656# CONFIG_I2C_STUB is not set
628# CONFIG_I2C_VIA is not set 657# CONFIG_I2C_VIA is not set
629# CONFIG_I2C_VIAPRO is not set 658# CONFIG_I2C_VIAPRO is not set
630# CONFIG_I2C_VOODOO3 is not set 659# CONFIG_I2C_VOODOO3 is not set
@@ -638,7 +667,9 @@ CONFIG_I2C_SENSOR=y
638# CONFIG_SENSORS_ADM1025 is not set 667# CONFIG_SENSORS_ADM1025 is not set
639# CONFIG_SENSORS_ADM1026 is not set 668# CONFIG_SENSORS_ADM1026 is not set
640# CONFIG_SENSORS_ADM1031 is not set 669# CONFIG_SENSORS_ADM1031 is not set
670# CONFIG_SENSORS_ADM9240 is not set
641# CONFIG_SENSORS_ASB100 is not set 671# CONFIG_SENSORS_ASB100 is not set
672# CONFIG_SENSORS_ATXP1 is not set
642# CONFIG_SENSORS_DS1621 is not set 673# CONFIG_SENSORS_DS1621 is not set
643# CONFIG_SENSORS_FSCHER is not set 674# CONFIG_SENSORS_FSCHER is not set
644# CONFIG_SENSORS_FSCPOS is not set 675# CONFIG_SENSORS_FSCPOS is not set
@@ -654,6 +685,7 @@ CONFIG_I2C_SENSOR=y
654# CONFIG_SENSORS_LM85 is not set 685# CONFIG_SENSORS_LM85 is not set
655# CONFIG_SENSORS_LM87 is not set 686# CONFIG_SENSORS_LM87 is not set
656# CONFIG_SENSORS_LM90 is not set 687# CONFIG_SENSORS_LM90 is not set
688# CONFIG_SENSORS_LM92 is not set
657# CONFIG_SENSORS_MAX1619 is not set 689# CONFIG_SENSORS_MAX1619 is not set
658# CONFIG_SENSORS_PC87360 is not set 690# CONFIG_SENSORS_PC87360 is not set
659# CONFIG_SENSORS_SMSC47B397 is not set 691# CONFIG_SENSORS_SMSC47B397 is not set
@@ -663,14 +695,19 @@ CONFIG_I2C_SENSOR=y
663# CONFIG_SENSORS_W83781D is not set 695# CONFIG_SENSORS_W83781D is not set
664# CONFIG_SENSORS_W83L785TS is not set 696# CONFIG_SENSORS_W83L785TS is not set
665# CONFIG_SENSORS_W83627HF is not set 697# CONFIG_SENSORS_W83627HF is not set
698# CONFIG_SENSORS_W83627EHF is not set
666 699
667# 700#
668# Other I2C Chip support 701# Other I2C Chip support
669# 702#
703# CONFIG_SENSORS_DS1337 is not set
704# CONFIG_SENSORS_DS1374 is not set
670CONFIG_SENSORS_EEPROM=y 705CONFIG_SENSORS_EEPROM=y
671# CONFIG_SENSORS_PCF8574 is not set 706# CONFIG_SENSORS_PCF8574 is not set
707# CONFIG_SENSORS_PCA9539 is not set
672# CONFIG_SENSORS_PCF8591 is not set 708# CONFIG_SENSORS_PCF8591 is not set
673# CONFIG_SENSORS_RTC8564 is not set 709# CONFIG_SENSORS_RTC8564 is not set
710# CONFIG_SENSORS_MAX6875 is not set
674# CONFIG_I2C_DEBUG_CORE is not set 711# CONFIG_I2C_DEBUG_CORE is not set
675# CONFIG_I2C_DEBUG_ALGO is not set 712# CONFIG_I2C_DEBUG_ALGO is not set
676# CONFIG_I2C_DEBUG_BUS is not set 713# CONFIG_I2C_DEBUG_BUS is not set
@@ -724,6 +761,7 @@ CONFIG_EXT2_FS=y
724CONFIG_EXT2_FS_XATTR=y 761CONFIG_EXT2_FS_XATTR=y
725CONFIG_EXT2_FS_POSIX_ACL=y 762CONFIG_EXT2_FS_POSIX_ACL=y
726# CONFIG_EXT2_FS_SECURITY is not set 763# CONFIG_EXT2_FS_SECURITY is not set
764# CONFIG_EXT2_FS_XIP is not set
727CONFIG_EXT3_FS=y 765CONFIG_EXT3_FS=y
728CONFIG_EXT3_FS_XATTR=y 766CONFIG_EXT3_FS_XATTR=y
729CONFIG_EXT3_FS_POSIX_ACL=y 767CONFIG_EXT3_FS_POSIX_ACL=y
@@ -764,7 +802,6 @@ CONFIG_DNOTIFY=y
764# 802#
765CONFIG_PROC_FS=y 803CONFIG_PROC_FS=y
766CONFIG_SYSFS=y 804CONFIG_SYSFS=y
767# CONFIG_DEVFS_FS is not set
768# CONFIG_DEVPTS_FS_XATTR is not set 805# CONFIG_DEVPTS_FS_XATTR is not set
769CONFIG_TMPFS=y 806CONFIG_TMPFS=y
770# CONFIG_TMPFS_XATTR is not set 807# CONFIG_TMPFS_XATTR is not set
@@ -802,12 +839,14 @@ CONFIG_JFFS2_RTIME=y
802# 839#
803CONFIG_NFS_FS=y 840CONFIG_NFS_FS=y
804CONFIG_NFS_V3=y 841CONFIG_NFS_V3=y
842# CONFIG_NFS_V3_ACL is not set
805# CONFIG_NFS_V4 is not set 843# CONFIG_NFS_V4 is not set
806# CONFIG_NFS_DIRECTIO is not set 844# CONFIG_NFS_DIRECTIO is not set
807# CONFIG_NFSD is not set 845# CONFIG_NFSD is not set
808CONFIG_ROOT_NFS=y 846CONFIG_ROOT_NFS=y
809CONFIG_LOCKD=y 847CONFIG_LOCKD=y
810CONFIG_LOCKD_V4=y 848CONFIG_LOCKD_V4=y
849CONFIG_NFS_COMMON=y
811CONFIG_SUNRPC=y 850CONFIG_SUNRPC=y
812# CONFIG_RPCSEC_GSS_KRB5 is not set 851# CONFIG_RPCSEC_GSS_KRB5 is not set
813# CONFIG_RPCSEC_GSS_SPKM3 is not set 852# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -892,3 +931,4 @@ CONFIG_CRC32=y
892# CONFIG_LIBCRC32C is not set 931# CONFIG_LIBCRC32C is not set
893CONFIG_ZLIB_INFLATE=y 932CONFIG_ZLIB_INFLATE=y
894CONFIG_ZLIB_DEFLATE=y 933CONFIG_ZLIB_DEFLATE=y
934# CONFIG_TEXTSEARCH is not set
diff --git a/arch/arm/configs/ixdp2801_defconfig b/arch/arm/configs/ixdp2801_defconfig
index f1afe3d09ec6..c4df0ec34b08 100644
--- a/arch/arm/configs/ixdp2801_defconfig
+++ b/arch/arm/configs/ixdp2801_defconfig
@@ -1,14 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.12-rc1-bk2 3# Linux kernel version: 2.6.12-git6
4# Sun Mar 27 22:39:19 2005 4# Sat Jun 25 01:01:18 2005
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
8CONFIG_UID16=y 8CONFIG_UID16=y
9CONFIG_RWSEM_GENERIC_SPINLOCK=y 9CONFIG_RWSEM_GENERIC_SPINLOCK=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y 10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_GENERIC_IOMAP=y
12 11
13# 12#
14# Code maturity level options 13# Code maturity level options
@@ -16,6 +15,7 @@ CONFIG_GENERIC_IOMAP=y
16CONFIG_EXPERIMENTAL=y 15CONFIG_EXPERIMENTAL=y
17CONFIG_CLEAN_COMPILE=y 16CONFIG_CLEAN_COMPILE=y
18CONFIG_BROKEN_ON_SMP=y 17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19 19
20# 20#
21# General setup 21# General setup
@@ -35,6 +35,8 @@ CONFIG_EMBEDDED=y
35CONFIG_KALLSYMS=y 35CONFIG_KALLSYMS=y
36# CONFIG_KALLSYMS_ALL is not set 36# CONFIG_KALLSYMS_ALL is not set
37# CONFIG_KALLSYMS_EXTRA_PASS is not set 37# CONFIG_KALLSYMS_EXTRA_PASS is not set
38CONFIG_PRINTK=y
39CONFIG_BUG=y
38CONFIG_BASE_FULL=y 40CONFIG_BASE_FULL=y
39CONFIG_FUTEX=y 41CONFIG_FUTEX=y
40CONFIG_EPOLL=y 42CONFIG_EPOLL=y
@@ -82,6 +84,7 @@ CONFIG_ARCH_IXP2000=y
82# CONFIG_ARCH_VERSATILE is not set 84# CONFIG_ARCH_VERSATILE is not set
83# CONFIG_ARCH_IMX is not set 85# CONFIG_ARCH_IMX is not set
84# CONFIG_ARCH_H720X is not set 86# CONFIG_ARCH_H720X is not set
87# CONFIG_ARCH_AAEC2000 is not set
85CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y 88CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
86 89
87# 90#
@@ -107,7 +110,6 @@ CONFIG_CPU_32v5=y
107CONFIG_CPU_ABRT_EV5T=y 110CONFIG_CPU_ABRT_EV5T=y
108CONFIG_CPU_CACHE_VIVT=y 111CONFIG_CPU_CACHE_VIVT=y
109CONFIG_CPU_TLB_V4WBI=y 112CONFIG_CPU_TLB_V4WBI=y
110CONFIG_CPU_MINICACHE=y
111 113
112# 114#
113# Processor Features 115# Processor Features
@@ -119,9 +121,11 @@ CONFIG_XSCALE_PMU=y
119# 121#
120# Bus support 122# Bus support
121# 123#
124CONFIG_ISA_DMA_API=y
122CONFIG_PCI=y 125CONFIG_PCI=y
123CONFIG_PCI_LEGACY_PROC=y 126CONFIG_PCI_LEGACY_PROC=y
124CONFIG_PCI_NAMES=y 127CONFIG_PCI_NAMES=y
128# CONFIG_PCI_DEBUG is not set
125 129
126# 130#
127# PCCARD (PCMCIA/CardBus) support 131# PCCARD (PCMCIA/CardBus) support
@@ -131,7 +135,15 @@ CONFIG_PCI_NAMES=y
131# 135#
132# Kernel Features 136# Kernel Features
133# 137#
138# CONFIG_SMP is not set
134# CONFIG_PREEMPT is not set 139# CONFIG_PREEMPT is not set
140# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
141CONFIG_SELECT_MEMORY_MODEL=y
142CONFIG_FLATMEM_MANUAL=y
143# CONFIG_DISCONTIGMEM_MANUAL is not set
144# CONFIG_SPARSEMEM_MANUAL is not set
145CONFIG_FLATMEM=y
146CONFIG_FLAT_NODE_MEM_MAP=y
135CONFIG_ALIGNMENT_TRAP=y 147CONFIG_ALIGNMENT_TRAP=y
136 148
137# 149#
@@ -270,7 +282,6 @@ CONFIG_MTD_IXP2000=y
270# 282#
271# Block devices 283# Block devices
272# 284#
273# CONFIG_BLK_DEV_FD is not set
274# CONFIG_BLK_CPQ_DA is not set 285# CONFIG_BLK_CPQ_DA is not set
275# CONFIG_BLK_CPQ_CISS_DA is not set 286# CONFIG_BLK_CPQ_CISS_DA is not set
276# CONFIG_BLK_DEV_DAC960 is not set 287# CONFIG_BLK_DEV_DAC960 is not set
@@ -309,6 +320,7 @@ CONFIG_IOSCHED_CFQ=y
309# 320#
310# Fusion MPT device support 321# Fusion MPT device support
311# 322#
323# CONFIG_FUSION is not set
312 324
313# 325#
314# IEEE 1394 (FireWire) support 326# IEEE 1394 (FireWire) support
@@ -330,10 +342,11 @@ CONFIG_NET=y
330# 342#
331CONFIG_PACKET=y 343CONFIG_PACKET=y
332CONFIG_PACKET_MMAP=y 344CONFIG_PACKET_MMAP=y
333# CONFIG_NETLINK_DEV is not set
334CONFIG_UNIX=y 345CONFIG_UNIX=y
335# CONFIG_NET_KEY is not set 346# CONFIG_NET_KEY is not set
336CONFIG_INET=y 347CONFIG_INET=y
348CONFIG_IP_FIB_HASH=y
349# CONFIG_IP_FIB_TRIE is not set
337# CONFIG_IP_MULTICAST is not set 350# CONFIG_IP_MULTICAST is not set
338# CONFIG_IP_ADVANCED_ROUTER is not set 351# CONFIG_IP_ADVANCED_ROUTER is not set
339CONFIG_IP_PNP=y 352CONFIG_IP_PNP=y
@@ -350,6 +363,17 @@ CONFIG_SYN_COOKIES=y
350# CONFIG_INET_TUNNEL is not set 363# CONFIG_INET_TUNNEL is not set
351# CONFIG_IP_TCPDIAG is not set 364# CONFIG_IP_TCPDIAG is not set
352# CONFIG_IP_TCPDIAG_IPV6 is not set 365# CONFIG_IP_TCPDIAG_IPV6 is not set
366
367#
368# TCP congestion control
369#
370CONFIG_TCP_CONG_BIC=y
371CONFIG_TCP_CONG_WESTWOOD=m
372CONFIG_TCP_CONG_HTCP=m
373# CONFIG_TCP_CONG_HSTCP is not set
374# CONFIG_TCP_CONG_HYBLA is not set
375# CONFIG_TCP_CONG_VEGAS is not set
376# CONFIG_TCP_CONG_SCALABLE is not set
353# CONFIG_IPV6 is not set 377# CONFIG_IPV6 is not set
354# CONFIG_NETFILTER is not set 378# CONFIG_NETFILTER is not set
355 379
@@ -405,6 +429,7 @@ CONFIG_MII=y
405# CONFIG_SUNGEM is not set 429# CONFIG_SUNGEM is not set
406# CONFIG_NET_VENDOR_3COM is not set 430# CONFIG_NET_VENDOR_3COM is not set
407# CONFIG_SMC91X is not set 431# CONFIG_SMC91X is not set
432# CONFIG_DM9000 is not set
408 433
409# 434#
410# Tulip family network device support 435# Tulip family network device support
@@ -442,9 +467,11 @@ CONFIG_EEPRO100=y
442# CONFIG_HAMACHI is not set 467# CONFIG_HAMACHI is not set
443# CONFIG_YELLOWFIN is not set 468# CONFIG_YELLOWFIN is not set
444# CONFIG_R8169 is not set 469# CONFIG_R8169 is not set
470# CONFIG_SKGE is not set
445# CONFIG_SK98LIN is not set 471# CONFIG_SK98LIN is not set
446# CONFIG_VIA_VELOCITY is not set 472# CONFIG_VIA_VELOCITY is not set
447# CONFIG_TIGON3 is not set 473# CONFIG_TIGON3 is not set
474# CONFIG_BNX2 is not set
448 475
449# 476#
450# Ethernet (10000 Mbit) 477# Ethernet (10000 Mbit)
@@ -466,6 +493,7 @@ CONFIG_EEPRO100=y
466# Wan interfaces 493# Wan interfaces
467# 494#
468CONFIG_WAN=y 495CONFIG_WAN=y
496# CONFIG_DSCC4 is not set
469# CONFIG_LANMEDIA is not set 497# CONFIG_LANMEDIA is not set
470# CONFIG_SYNCLINK_SYNCPPP is not set 498# CONFIG_SYNCLINK_SYNCPPP is not set
471CONFIG_HDLC=y 499CONFIG_HDLC=y
@@ -528,7 +556,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
528# 556#
529# CONFIG_SERIO is not set 557# CONFIG_SERIO is not set
530# CONFIG_GAMEPORT is not set 558# CONFIG_GAMEPORT is not set
531CONFIG_SOUND_GAMEPORT=y
532 559
533# 560#
534# Character devices 561# Character devices
@@ -549,6 +576,7 @@ CONFIG_SERIAL_8250_NR_UARTS=2
549# 576#
550CONFIG_SERIAL_CORE=y 577CONFIG_SERIAL_CORE=y
551CONFIG_SERIAL_CORE_CONSOLE=y 578CONFIG_SERIAL_CORE_CONSOLE=y
579# CONFIG_SERIAL_JSM is not set
552CONFIG_UNIX98_PTYS=y 580CONFIG_UNIX98_PTYS=y
553CONFIG_LEGACY_PTYS=y 581CONFIG_LEGACY_PTYS=y
554CONFIG_LEGACY_PTY_COUNT=256 582CONFIG_LEGACY_PTY_COUNT=256
@@ -615,17 +643,18 @@ CONFIG_I2C_ALGOBIT=y
615# CONFIG_I2C_AMD8111 is not set 643# CONFIG_I2C_AMD8111 is not set
616# CONFIG_I2C_I801 is not set 644# CONFIG_I2C_I801 is not set
617# CONFIG_I2C_I810 is not set 645# CONFIG_I2C_I810 is not set
646# CONFIG_I2C_PIIX4 is not set
618# CONFIG_I2C_ISA is not set 647# CONFIG_I2C_ISA is not set
619# CONFIG_I2C_IXP2000 is not set 648# CONFIG_I2C_IXP2000 is not set
620# CONFIG_I2C_NFORCE2 is not set 649# CONFIG_I2C_NFORCE2 is not set
621# CONFIG_I2C_PARPORT_LIGHT is not set 650# CONFIG_I2C_PARPORT_LIGHT is not set
622# CONFIG_I2C_PIIX4 is not set
623# CONFIG_I2C_PROSAVAGE is not set 651# CONFIG_I2C_PROSAVAGE is not set
624# CONFIG_I2C_SAVAGE4 is not set 652# CONFIG_I2C_SAVAGE4 is not set
625# CONFIG_SCx200_ACB is not set 653# CONFIG_SCx200_ACB is not set
626# CONFIG_I2C_SIS5595 is not set 654# CONFIG_I2C_SIS5595 is not set
627# CONFIG_I2C_SIS630 is not set 655# CONFIG_I2C_SIS630 is not set
628# CONFIG_I2C_SIS96X is not set 656# CONFIG_I2C_SIS96X is not set
657# CONFIG_I2C_STUB is not set
629# CONFIG_I2C_VIA is not set 658# CONFIG_I2C_VIA is not set
630# CONFIG_I2C_VIAPRO is not set 659# CONFIG_I2C_VIAPRO is not set
631# CONFIG_I2C_VOODOO3 is not set 660# CONFIG_I2C_VOODOO3 is not set
@@ -639,7 +668,9 @@ CONFIG_I2C_SENSOR=y
639# CONFIG_SENSORS_ADM1025 is not set 668# CONFIG_SENSORS_ADM1025 is not set
640# CONFIG_SENSORS_ADM1026 is not set 669# CONFIG_SENSORS_ADM1026 is not set
641# CONFIG_SENSORS_ADM1031 is not set 670# CONFIG_SENSORS_ADM1031 is not set
671# CONFIG_SENSORS_ADM9240 is not set
642# CONFIG_SENSORS_ASB100 is not set 672# CONFIG_SENSORS_ASB100 is not set
673# CONFIG_SENSORS_ATXP1 is not set
643# CONFIG_SENSORS_DS1621 is not set 674# CONFIG_SENSORS_DS1621 is not set
644# CONFIG_SENSORS_FSCHER is not set 675# CONFIG_SENSORS_FSCHER is not set
645# CONFIG_SENSORS_FSCPOS is not set 676# CONFIG_SENSORS_FSCPOS is not set
@@ -655,6 +686,7 @@ CONFIG_I2C_SENSOR=y
655# CONFIG_SENSORS_LM85 is not set 686# CONFIG_SENSORS_LM85 is not set
656# CONFIG_SENSORS_LM87 is not set 687# CONFIG_SENSORS_LM87 is not set
657# CONFIG_SENSORS_LM90 is not set 688# CONFIG_SENSORS_LM90 is not set
689# CONFIG_SENSORS_LM92 is not set
658# CONFIG_SENSORS_MAX1619 is not set 690# CONFIG_SENSORS_MAX1619 is not set
659# CONFIG_SENSORS_PC87360 is not set 691# CONFIG_SENSORS_PC87360 is not set
660# CONFIG_SENSORS_SMSC47B397 is not set 692# CONFIG_SENSORS_SMSC47B397 is not set
@@ -664,14 +696,19 @@ CONFIG_I2C_SENSOR=y
664# CONFIG_SENSORS_W83781D is not set 696# CONFIG_SENSORS_W83781D is not set
665# CONFIG_SENSORS_W83L785TS is not set 697# CONFIG_SENSORS_W83L785TS is not set
666# CONFIG_SENSORS_W83627HF is not set 698# CONFIG_SENSORS_W83627HF is not set
699# CONFIG_SENSORS_W83627EHF is not set
667 700
668# 701#
669# Other I2C Chip support 702# Other I2C Chip support
670# 703#
704# CONFIG_SENSORS_DS1337 is not set
705# CONFIG_SENSORS_DS1374 is not set
671CONFIG_SENSORS_EEPROM=y 706CONFIG_SENSORS_EEPROM=y
672# CONFIG_SENSORS_PCF8574 is not set 707# CONFIG_SENSORS_PCF8574 is not set
708# CONFIG_SENSORS_PCA9539 is not set
673# CONFIG_SENSORS_PCF8591 is not set 709# CONFIG_SENSORS_PCF8591 is not set
674# CONFIG_SENSORS_RTC8564 is not set 710# CONFIG_SENSORS_RTC8564 is not set
711# CONFIG_SENSORS_MAX6875 is not set
675# CONFIG_I2C_DEBUG_CORE is not set 712# CONFIG_I2C_DEBUG_CORE is not set
676# CONFIG_I2C_DEBUG_ALGO is not set 713# CONFIG_I2C_DEBUG_ALGO is not set
677# CONFIG_I2C_DEBUG_BUS is not set 714# CONFIG_I2C_DEBUG_BUS is not set
@@ -725,6 +762,7 @@ CONFIG_EXT2_FS=y
725CONFIG_EXT2_FS_XATTR=y 762CONFIG_EXT2_FS_XATTR=y
726CONFIG_EXT2_FS_POSIX_ACL=y 763CONFIG_EXT2_FS_POSIX_ACL=y
727# CONFIG_EXT2_FS_SECURITY is not set 764# CONFIG_EXT2_FS_SECURITY is not set
765# CONFIG_EXT2_FS_XIP is not set
728CONFIG_EXT3_FS=y 766CONFIG_EXT3_FS=y
729CONFIG_EXT3_FS_XATTR=y 767CONFIG_EXT3_FS_XATTR=y
730CONFIG_EXT3_FS_POSIX_ACL=y 768CONFIG_EXT3_FS_POSIX_ACL=y
@@ -765,7 +803,6 @@ CONFIG_DNOTIFY=y
765# 803#
766CONFIG_PROC_FS=y 804CONFIG_PROC_FS=y
767CONFIG_SYSFS=y 805CONFIG_SYSFS=y
768# CONFIG_DEVFS_FS is not set
769# CONFIG_DEVPTS_FS_XATTR is not set 806# CONFIG_DEVPTS_FS_XATTR is not set
770CONFIG_TMPFS=y 807CONFIG_TMPFS=y
771# CONFIG_TMPFS_XATTR is not set 808# CONFIG_TMPFS_XATTR is not set
@@ -803,12 +840,14 @@ CONFIG_JFFS2_RTIME=y
803# 840#
804CONFIG_NFS_FS=y 841CONFIG_NFS_FS=y
805CONFIG_NFS_V3=y 842CONFIG_NFS_V3=y
843# CONFIG_NFS_V3_ACL is not set
806# CONFIG_NFS_V4 is not set 844# CONFIG_NFS_V4 is not set
807# CONFIG_NFS_DIRECTIO is not set 845# CONFIG_NFS_DIRECTIO is not set
808# CONFIG_NFSD is not set 846# CONFIG_NFSD is not set
809CONFIG_ROOT_NFS=y 847CONFIG_ROOT_NFS=y
810CONFIG_LOCKD=y 848CONFIG_LOCKD=y
811CONFIG_LOCKD_V4=y 849CONFIG_LOCKD_V4=y
850CONFIG_NFS_COMMON=y
812CONFIG_SUNRPC=y 851CONFIG_SUNRPC=y
813# CONFIG_RPCSEC_GSS_KRB5 is not set 852# CONFIG_RPCSEC_GSS_KRB5 is not set
814# CONFIG_RPCSEC_GSS_SPKM3 is not set 853# CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -893,3 +932,4 @@ CONFIG_CRC32=y
893# CONFIG_LIBCRC32C is not set 932# CONFIG_LIBCRC32C is not set
894CONFIG_ZLIB_INFLATE=y 933CONFIG_ZLIB_INFLATE=y
895CONFIG_ZLIB_DEFLATE=y 934CONFIG_ZLIB_DEFLATE=y
935# CONFIG_TEXTSEARCH is not set