aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2005-07-27 14:44:15 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 19:25:57 -0400
commit1bc3a1ec6030f7a6a9e78172e1221be9baed68e8 (patch)
treea4c49e3ed78cec3d5cd95571a0971ba41f607dc2
parentc64d7b4cea71b6841d9d96d390aed323c9fe1c9d (diff)
[PATCH] ppc64: update defconfigs
update defconfig, use new CONFIG_HZ and set it to 100 just for the kicks. Signed-off-by: Olaf Hering <olh@suse.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc64/configs/g5_defconfig371
-rw-r--r--arch/ppc64/configs/iSeries_defconfig322
-rw-r--r--arch/ppc64/configs/maple_defconfig220
-rw-r--r--arch/ppc64/configs/pSeries_defconfig379
-rw-r--r--arch/ppc64/defconfig382
5 files changed, 896 insertions, 778 deletions
diff --git a/arch/ppc64/configs/g5_defconfig b/arch/ppc64/configs/g5_defconfig
index 1eb33398648e..9e0abe8392fc 100644
--- a/arch/ppc64/configs/g5_defconfig
+++ b/arch/ppc64/configs/g5_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.12-rc6 3# Linux kernel version: 2.6.13-rc3
4# Tue Jun 14 16:59:20 2005 4# Wed Jul 13 14:40:34 2005
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -73,12 +73,15 @@ CONFIG_SYSVIPC_COMPAT=y
73# CONFIG_PPC_ISERIES is not set 73# CONFIG_PPC_ISERIES is not set
74CONFIG_PPC_MULTIPLATFORM=y 74CONFIG_PPC_MULTIPLATFORM=y
75# CONFIG_PPC_PSERIES is not set 75# CONFIG_PPC_PSERIES is not set
76# CONFIG_PPC_BPA is not set
76CONFIG_PPC_PMAC=y 77CONFIG_PPC_PMAC=y
77# CONFIG_PPC_MAPLE is not set 78# CONFIG_PPC_MAPLE is not set
78CONFIG_PPC=y 79CONFIG_PPC=y
79CONFIG_PPC64=y 80CONFIG_PPC64=y
80CONFIG_PPC_OF=y 81CONFIG_PPC_OF=y
82CONFIG_MPIC=y
81CONFIG_ALTIVEC=y 83CONFIG_ALTIVEC=y
84CONFIG_KEXEC=y
82CONFIG_U3_DART=y 85CONFIG_U3_DART=y
83CONFIG_PPC_PMAC64=y 86CONFIG_PPC_PMAC64=y
84CONFIG_BOOTX_TEXT=y 87CONFIG_BOOTX_TEXT=y
@@ -86,8 +89,24 @@ CONFIG_POWER4_ONLY=y
86CONFIG_IOMMU_VMERGE=y 89CONFIG_IOMMU_VMERGE=y
87CONFIG_SMP=y 90CONFIG_SMP=y
88CONFIG_NR_CPUS=2 91CONFIG_NR_CPUS=2
92CONFIG_ARCH_SELECT_MEMORY_MODEL=y
93CONFIG_ARCH_FLATMEM_ENABLE=y
94CONFIG_SELECT_MEMORY_MODEL=y
95CONFIG_FLATMEM_MANUAL=y
96# CONFIG_DISCONTIGMEM_MANUAL is not set
97# CONFIG_SPARSEMEM_MANUAL is not set
98CONFIG_FLATMEM=y
99CONFIG_FLAT_NODE_MEM_MAP=y
100# CONFIG_NUMA is not set
89# CONFIG_SCHED_SMT is not set 101# CONFIG_SCHED_SMT is not set
102CONFIG_PREEMPT_NONE=y
103# CONFIG_PREEMPT_VOLUNTARY is not set
90# CONFIG_PREEMPT is not set 104# CONFIG_PREEMPT is not set
105# CONFIG_PREEMPT_BKL is not set
106CONFIG_HZ_100=y
107# CONFIG_HZ_250 is not set
108# CONFIG_HZ_1000 is not set
109CONFIG_HZ=100
91CONFIG_GENERIC_HARDIRQS=y 110CONFIG_GENERIC_HARDIRQS=y
92CONFIG_SECCOMP=y 111CONFIG_SECCOMP=y
93CONFIG_ISA_DMA_API=y 112CONFIG_ISA_DMA_API=y
@@ -117,6 +136,144 @@ CONFIG_PROC_DEVICETREE=y
117# CONFIG_CMDLINE_BOOL is not set 136# CONFIG_CMDLINE_BOOL is not set
118 137
119# 138#
139# Networking
140#
141CONFIG_NET=y
142
143#
144# Networking options
145#
146CONFIG_PACKET=y
147# CONFIG_PACKET_MMAP is not set
148CONFIG_UNIX=y
149CONFIG_XFRM=y
150CONFIG_XFRM_USER=m
151CONFIG_NET_KEY=m
152CONFIG_INET=y
153CONFIG_IP_MULTICAST=y
154# CONFIG_IP_ADVANCED_ROUTER is not set
155CONFIG_IP_FIB_HASH=y
156# CONFIG_IP_PNP is not set
157CONFIG_NET_IPIP=y
158# CONFIG_NET_IPGRE is not set
159# CONFIG_IP_MROUTE is not set
160# CONFIG_ARPD is not set
161CONFIG_SYN_COOKIES=y
162CONFIG_INET_AH=m
163CONFIG_INET_ESP=m
164CONFIG_INET_IPCOMP=m
165CONFIG_INET_TUNNEL=y
166CONFIG_IP_TCPDIAG=m
167# CONFIG_IP_TCPDIAG_IPV6 is not set
168# CONFIG_TCP_CONG_ADVANCED is not set
169CONFIG_TCP_CONG_BIC=y
170
171#
172# IP: Virtual Server Configuration
173#
174# CONFIG_IP_VS is not set
175# CONFIG_IPV6 is not set
176CONFIG_NETFILTER=y
177# CONFIG_NETFILTER_DEBUG is not set
178
179#
180# IP: Netfilter Configuration
181#
182CONFIG_IP_NF_CONNTRACK=m
183CONFIG_IP_NF_CT_ACCT=y
184CONFIG_IP_NF_CONNTRACK_MARK=y
185CONFIG_IP_NF_CT_PROTO_SCTP=m
186CONFIG_IP_NF_FTP=m
187CONFIG_IP_NF_IRC=m
188CONFIG_IP_NF_TFTP=m
189CONFIG_IP_NF_AMANDA=m
190CONFIG_IP_NF_QUEUE=m
191CONFIG_IP_NF_IPTABLES=m
192CONFIG_IP_NF_MATCH_LIMIT=m
193CONFIG_IP_NF_MATCH_IPRANGE=m
194CONFIG_IP_NF_MATCH_MAC=m
195CONFIG_IP_NF_MATCH_PKTTYPE=m
196CONFIG_IP_NF_MATCH_MARK=m
197CONFIG_IP_NF_MATCH_MULTIPORT=m
198CONFIG_IP_NF_MATCH_TOS=m
199CONFIG_IP_NF_MATCH_RECENT=m
200CONFIG_IP_NF_MATCH_ECN=m
201CONFIG_IP_NF_MATCH_DSCP=m
202CONFIG_IP_NF_MATCH_AH_ESP=m
203CONFIG_IP_NF_MATCH_LENGTH=m
204CONFIG_IP_NF_MATCH_TTL=m
205CONFIG_IP_NF_MATCH_TCPMSS=m
206CONFIG_IP_NF_MATCH_HELPER=m
207CONFIG_IP_NF_MATCH_STATE=m
208CONFIG_IP_NF_MATCH_CONNTRACK=m
209CONFIG_IP_NF_MATCH_OWNER=m
210CONFIG_IP_NF_MATCH_ADDRTYPE=m
211CONFIG_IP_NF_MATCH_REALM=m
212CONFIG_IP_NF_MATCH_SCTP=m
213CONFIG_IP_NF_MATCH_COMMENT=m
214CONFIG_IP_NF_MATCH_CONNMARK=m
215CONFIG_IP_NF_MATCH_HASHLIMIT=m
216CONFIG_IP_NF_FILTER=m
217CONFIG_IP_NF_TARGET_REJECT=m
218CONFIG_IP_NF_TARGET_LOG=m
219CONFIG_IP_NF_TARGET_ULOG=m
220CONFIG_IP_NF_TARGET_TCPMSS=m
221CONFIG_IP_NF_NAT=m
222CONFIG_IP_NF_NAT_NEEDED=y
223CONFIG_IP_NF_TARGET_MASQUERADE=m
224CONFIG_IP_NF_TARGET_REDIRECT=m
225CONFIG_IP_NF_TARGET_NETMAP=m
226CONFIG_IP_NF_TARGET_SAME=m
227CONFIG_IP_NF_NAT_SNMP_BASIC=m
228CONFIG_IP_NF_NAT_IRC=m
229CONFIG_IP_NF_NAT_FTP=m
230CONFIG_IP_NF_NAT_TFTP=m
231CONFIG_IP_NF_NAT_AMANDA=m
232CONFIG_IP_NF_MANGLE=m
233CONFIG_IP_NF_TARGET_TOS=m
234CONFIG_IP_NF_TARGET_ECN=m
235CONFIG_IP_NF_TARGET_DSCP=m
236CONFIG_IP_NF_TARGET_MARK=m
237CONFIG_IP_NF_TARGET_CLASSIFY=m
238CONFIG_IP_NF_TARGET_CONNMARK=m
239CONFIG_IP_NF_TARGET_CLUSTERIP=m
240CONFIG_IP_NF_RAW=m
241CONFIG_IP_NF_TARGET_NOTRACK=m
242CONFIG_IP_NF_ARPTABLES=m
243CONFIG_IP_NF_ARPFILTER=m
244CONFIG_IP_NF_ARP_MANGLE=m
245
246#
247# SCTP Configuration (EXPERIMENTAL)
248#
249# CONFIG_IP_SCTP is not set
250# CONFIG_ATM is not set
251# CONFIG_BRIDGE is not set
252# CONFIG_VLAN_8021Q is not set
253# CONFIG_DECNET is not set
254CONFIG_LLC=y
255# CONFIG_LLC2 is not set
256# CONFIG_IPX is not set
257# CONFIG_ATALK is not set
258# CONFIG_X25 is not set
259# CONFIG_LAPB is not set
260# CONFIG_NET_DIVERT is not set
261# CONFIG_ECONET is not set
262# CONFIG_WAN_ROUTER is not set
263# CONFIG_NET_SCHED is not set
264CONFIG_NET_CLS_ROUTE=y
265
266#
267# Network testing
268#
269# CONFIG_NET_PKTGEN is not set
270# CONFIG_NETPOLL is not set
271# CONFIG_NET_POLL_CONTROLLER is not set
272# CONFIG_HAMRADIO is not set
273# CONFIG_IRDA is not set
274# CONFIG_BT is not set
275
276#
120# Device Drivers 277# Device Drivers
121# 278#
122 279
@@ -218,6 +375,7 @@ CONFIG_IDEDMA_PCI_AUTO=y
218# CONFIG_BLK_DEV_HPT366 is not set 375# CONFIG_BLK_DEV_HPT366 is not set
219# CONFIG_BLK_DEV_SC1200 is not set 376# CONFIG_BLK_DEV_SC1200 is not set
220# CONFIG_BLK_DEV_PIIX is not set 377# CONFIG_BLK_DEV_PIIX is not set
378# CONFIG_BLK_DEV_IT821X is not set
221# CONFIG_BLK_DEV_NS87415 is not set 379# CONFIG_BLK_DEV_NS87415 is not set
222# CONFIG_BLK_DEV_PDC202XX_OLD is not set 380# CONFIG_BLK_DEV_PDC202XX_OLD is not set
223# CONFIG_BLK_DEV_PDC202XX_NEW is not set 381# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -251,6 +409,7 @@ CONFIG_CHR_DEV_ST=y
251CONFIG_BLK_DEV_SR=y 409CONFIG_BLK_DEV_SR=y
252CONFIG_BLK_DEV_SR_VENDOR=y 410CONFIG_BLK_DEV_SR_VENDOR=y
253CONFIG_CHR_DEV_SG=y 411CONFIG_CHR_DEV_SG=y
412# CONFIG_CHR_DEV_SCH is not set
254 413
255# 414#
256# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 415# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -338,6 +497,8 @@ CONFIG_DM_ZERO=m
338# Fusion MPT device support 497# Fusion MPT device support
339# 498#
340# CONFIG_FUSION is not set 499# CONFIG_FUSION is not set
500# CONFIG_FUSION_SPI is not set
501# CONFIG_FUSION_FC is not set
341 502
342# 503#
343# IEEE 1394 (FireWire) support 504# IEEE 1394 (FireWire) support
@@ -351,6 +512,7 @@ CONFIG_IEEE1394=y
351CONFIG_IEEE1394_OUI_DB=y 512CONFIG_IEEE1394_OUI_DB=y
352CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y 513CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
353CONFIG_IEEE1394_CONFIG_ROM_IP1394=y 514CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
515# CONFIG_IEEE1394_EXPORT_FULL_API is not set
354 516
355# 517#
356# Device Drivers 518# Device Drivers
@@ -380,149 +542,13 @@ CONFIG_IEEE1394_RAWIO=y
380CONFIG_ADB=y 542CONFIG_ADB=y
381CONFIG_ADB_PMU=y 543CONFIG_ADB_PMU=y
382CONFIG_PMAC_SMU=y 544CONFIG_PMAC_SMU=y
383# CONFIG_PMAC_PBOOK is not set
384# CONFIG_PMAC_BACKLIGHT is not set 545# CONFIG_PMAC_BACKLIGHT is not set
385# CONFIG_INPUT_ADBHID is not set 546# CONFIG_INPUT_ADBHID is not set
386CONFIG_THERM_PM72=y 547CONFIG_THERM_PM72=y
387 548
388# 549#
389# Networking support 550# Network device support
390#
391CONFIG_NET=y
392
393#
394# Networking options
395# 551#
396CONFIG_PACKET=y
397# CONFIG_PACKET_MMAP is not set
398CONFIG_UNIX=y
399CONFIG_NET_KEY=m
400CONFIG_INET=y
401CONFIG_IP_MULTICAST=y
402# CONFIG_IP_ADVANCED_ROUTER is not set
403# CONFIG_IP_PNP is not set
404CONFIG_NET_IPIP=y
405# CONFIG_NET_IPGRE is not set
406# CONFIG_IP_MROUTE is not set
407# CONFIG_ARPD is not set
408CONFIG_SYN_COOKIES=y
409CONFIG_INET_AH=m
410CONFIG_INET_ESP=m
411CONFIG_INET_IPCOMP=m
412CONFIG_INET_TUNNEL=y
413CONFIG_IP_TCPDIAG=m
414# CONFIG_IP_TCPDIAG_IPV6 is not set
415
416#
417# IP: Virtual Server Configuration
418#
419# CONFIG_IP_VS is not set
420# CONFIG_IPV6 is not set
421CONFIG_NETFILTER=y
422# CONFIG_NETFILTER_DEBUG is not set
423
424#
425# IP: Netfilter Configuration
426#
427CONFIG_IP_NF_CONNTRACK=m
428CONFIG_IP_NF_CT_ACCT=y
429CONFIG_IP_NF_CONNTRACK_MARK=y
430CONFIG_IP_NF_CT_PROTO_SCTP=m
431CONFIG_IP_NF_FTP=m
432CONFIG_IP_NF_IRC=m
433CONFIG_IP_NF_TFTP=m
434CONFIG_IP_NF_AMANDA=m
435CONFIG_IP_NF_QUEUE=m
436CONFIG_IP_NF_IPTABLES=m
437CONFIG_IP_NF_MATCH_LIMIT=m
438CONFIG_IP_NF_MATCH_IPRANGE=m
439CONFIG_IP_NF_MATCH_MAC=m
440CONFIG_IP_NF_MATCH_PKTTYPE=m
441CONFIG_IP_NF_MATCH_MARK=m
442CONFIG_IP_NF_MATCH_MULTIPORT=m
443CONFIG_IP_NF_MATCH_TOS=m
444CONFIG_IP_NF_MATCH_RECENT=m
445CONFIG_IP_NF_MATCH_ECN=m
446CONFIG_IP_NF_MATCH_DSCP=m
447CONFIG_IP_NF_MATCH_AH_ESP=m
448CONFIG_IP_NF_MATCH_LENGTH=m
449CONFIG_IP_NF_MATCH_TTL=m
450CONFIG_IP_NF_MATCH_TCPMSS=m
451CONFIG_IP_NF_MATCH_HELPER=m
452CONFIG_IP_NF_MATCH_STATE=m
453CONFIG_IP_NF_MATCH_CONNTRACK=m
454CONFIG_IP_NF_MATCH_OWNER=m
455CONFIG_IP_NF_MATCH_ADDRTYPE=m
456CONFIG_IP_NF_MATCH_REALM=m
457CONFIG_IP_NF_MATCH_SCTP=m
458CONFIG_IP_NF_MATCH_COMMENT=m
459CONFIG_IP_NF_MATCH_CONNMARK=m
460CONFIG_IP_NF_MATCH_HASHLIMIT=m
461CONFIG_IP_NF_FILTER=m
462CONFIG_IP_NF_TARGET_REJECT=m
463CONFIG_IP_NF_TARGET_LOG=m
464CONFIG_IP_NF_TARGET_ULOG=m
465CONFIG_IP_NF_TARGET_TCPMSS=m
466CONFIG_IP_NF_NAT=m
467CONFIG_IP_NF_NAT_NEEDED=y
468CONFIG_IP_NF_TARGET_MASQUERADE=m
469CONFIG_IP_NF_TARGET_REDIRECT=m
470CONFIG_IP_NF_TARGET_NETMAP=m
471CONFIG_IP_NF_TARGET_SAME=m
472CONFIG_IP_NF_NAT_SNMP_BASIC=m
473CONFIG_IP_NF_NAT_IRC=m
474CONFIG_IP_NF_NAT_FTP=m
475CONFIG_IP_NF_NAT_TFTP=m
476CONFIG_IP_NF_NAT_AMANDA=m
477CONFIG_IP_NF_MANGLE=m
478CONFIG_IP_NF_TARGET_TOS=m
479CONFIG_IP_NF_TARGET_ECN=m
480CONFIG_IP_NF_TARGET_DSCP=m
481CONFIG_IP_NF_TARGET_MARK=m
482CONFIG_IP_NF_TARGET_CLASSIFY=m
483CONFIG_IP_NF_TARGET_CONNMARK=m
484CONFIG_IP_NF_TARGET_CLUSTERIP=m
485CONFIG_IP_NF_RAW=m
486CONFIG_IP_NF_TARGET_NOTRACK=m
487CONFIG_IP_NF_ARPTABLES=m
488CONFIG_IP_NF_ARPFILTER=m
489CONFIG_IP_NF_ARP_MANGLE=m
490CONFIG_XFRM=y
491CONFIG_XFRM_USER=m
492
493#
494# SCTP Configuration (EXPERIMENTAL)
495#
496# CONFIG_IP_SCTP is not set
497# CONFIG_ATM is not set
498# CONFIG_BRIDGE is not set
499# CONFIG_VLAN_8021Q is not set
500# CONFIG_DECNET is not set
501CONFIG_LLC=y
502# CONFIG_LLC2 is not set
503# CONFIG_IPX is not set
504# CONFIG_ATALK is not set
505# CONFIG_X25 is not set
506# CONFIG_LAPB is not set
507# CONFIG_NET_DIVERT is not set
508# CONFIG_ECONET is not set
509# CONFIG_WAN_ROUTER is not set
510
511#
512# QoS and/or fair queueing
513#
514# CONFIG_NET_SCHED is not set
515CONFIG_NET_CLS_ROUTE=y
516
517#
518# Network testing
519#
520# CONFIG_NET_PKTGEN is not set
521# CONFIG_NETPOLL is not set
522# CONFIG_NET_POLL_CONTROLLER is not set
523# CONFIG_HAMRADIO is not set
524# CONFIG_IRDA is not set
525# CONFIG_BT is not set
526CONFIG_NETDEVICES=y 552CONFIG_NETDEVICES=y
527CONFIG_DUMMY=m 553CONFIG_DUMMY=m
528CONFIG_BONDING=m 554CONFIG_BONDING=m
@@ -562,6 +588,7 @@ CONFIG_E1000=y
562# CONFIG_HAMACHI is not set 588# CONFIG_HAMACHI is not set
563# CONFIG_YELLOWFIN is not set 589# CONFIG_YELLOWFIN is not set
564# CONFIG_R8169 is not set 590# CONFIG_R8169 is not set
591# CONFIG_SKGE is not set
565# CONFIG_SK98LIN is not set 592# CONFIG_SK98LIN is not set
566CONFIG_TIGON3=m 593CONFIG_TIGON3=m
567# CONFIG_BNX2 is not set 594# CONFIG_BNX2 is not set
@@ -750,50 +777,19 @@ CONFIG_I2C_KEYWEST=y
750# CONFIG_I2C_VIAPRO is not set 777# CONFIG_I2C_VIAPRO is not set
751# CONFIG_I2C_VOODOO3 is not set 778# CONFIG_I2C_VOODOO3 is not set
752# CONFIG_I2C_PCA_ISA is not set 779# CONFIG_I2C_PCA_ISA is not set
780# CONFIG_I2C_SENSOR is not set
753 781
754# 782#
755# Hardware Sensors Chip support 783# Miscellaneous I2C Chip support
756#
757# CONFIG_I2C_SENSOR is not set
758# CONFIG_SENSORS_ADM1021 is not set
759# CONFIG_SENSORS_ADM1025 is not set
760# CONFIG_SENSORS_ADM1026 is not set
761# CONFIG_SENSORS_ADM1031 is not set
762# CONFIG_SENSORS_ASB100 is not set
763# CONFIG_SENSORS_DS1621 is not set
764# CONFIG_SENSORS_FSCHER is not set
765# CONFIG_SENSORS_FSCPOS is not set
766# CONFIG_SENSORS_GL518SM is not set
767# CONFIG_SENSORS_GL520SM is not set
768# CONFIG_SENSORS_IT87 is not set
769# CONFIG_SENSORS_LM63 is not set
770# CONFIG_SENSORS_LM75 is not set
771# CONFIG_SENSORS_LM77 is not set
772# CONFIG_SENSORS_LM78 is not set
773# CONFIG_SENSORS_LM80 is not set
774# CONFIG_SENSORS_LM83 is not set
775# CONFIG_SENSORS_LM85 is not set
776# CONFIG_SENSORS_LM87 is not set
777# CONFIG_SENSORS_LM90 is not set
778# CONFIG_SENSORS_LM92 is not set
779# CONFIG_SENSORS_MAX1619 is not set
780# CONFIG_SENSORS_PC87360 is not set
781# CONFIG_SENSORS_SMSC47B397 is not set
782# CONFIG_SENSORS_SIS5595 is not set
783# CONFIG_SENSORS_SMSC47M1 is not set
784# CONFIG_SENSORS_VIA686A is not set
785# CONFIG_SENSORS_W83781D is not set
786# CONFIG_SENSORS_W83L785TS is not set
787# CONFIG_SENSORS_W83627HF is not set
788
789#
790# Other I2C Chip support
791# 784#
792# CONFIG_SENSORS_DS1337 is not set 785# CONFIG_SENSORS_DS1337 is not set
786# CONFIG_SENSORS_DS1374 is not set
793# CONFIG_SENSORS_EEPROM is not set 787# CONFIG_SENSORS_EEPROM is not set
794# CONFIG_SENSORS_PCF8574 is not set 788# CONFIG_SENSORS_PCF8574 is not set
789# CONFIG_SENSORS_PCA9539 is not set
795# CONFIG_SENSORS_PCF8591 is not set 790# CONFIG_SENSORS_PCF8591 is not set
796# CONFIG_SENSORS_RTC8564 is not set 791# CONFIG_SENSORS_RTC8564 is not set
792# CONFIG_SENSORS_MAX6875 is not set
797# CONFIG_I2C_DEBUG_CORE is not set 793# CONFIG_I2C_DEBUG_CORE is not set
798# CONFIG_I2C_DEBUG_ALGO is not set 794# CONFIG_I2C_DEBUG_ALGO is not set
799# CONFIG_I2C_DEBUG_BUS is not set 795# CONFIG_I2C_DEBUG_BUS is not set
@@ -805,6 +801,11 @@ CONFIG_I2C_KEYWEST=y
805# CONFIG_W1 is not set 801# CONFIG_W1 is not set
806 802
807# 803#
804# Hardware Monitoring support
805#
806# CONFIG_HWMON is not set
807
808#
808# Misc devices 809# Misc devices
809# 810#
810 811
@@ -911,6 +912,7 @@ CONFIG_USB_DEVICEFS=y
911CONFIG_USB_EHCI_HCD=y 912CONFIG_USB_EHCI_HCD=y
912# CONFIG_USB_EHCI_SPLIT_ISO is not set 913# CONFIG_USB_EHCI_SPLIT_ISO is not set
913# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 914# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
915# CONFIG_USB_ISP116X_HCD is not set
914CONFIG_USB_OHCI_HCD=y 916CONFIG_USB_OHCI_HCD=y
915# CONFIG_USB_OHCI_BIG_ENDIAN is not set 917# CONFIG_USB_OHCI_BIG_ENDIAN is not set
916CONFIG_USB_OHCI_LITTLE_ENDIAN=y 918CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -950,12 +952,15 @@ CONFIG_THRUSTMASTER_FF=y
950CONFIG_USB_HIDDEV=y 952CONFIG_USB_HIDDEV=y
951# CONFIG_USB_AIPTEK is not set 953# CONFIG_USB_AIPTEK is not set
952# CONFIG_USB_WACOM is not set 954# CONFIG_USB_WACOM is not set
955# CONFIG_USB_ACECAD is not set
953# CONFIG_USB_KBTAB is not set 956# CONFIG_USB_KBTAB is not set
954# CONFIG_USB_POWERMATE is not set 957# CONFIG_USB_POWERMATE is not set
955# CONFIG_USB_MTOUCH is not set 958# CONFIG_USB_MTOUCH is not set
959# CONFIG_USB_ITMTOUCH is not set
956# CONFIG_USB_EGALAX is not set 960# CONFIG_USB_EGALAX is not set
957# CONFIG_USB_XPAD is not set 961# CONFIG_USB_XPAD is not set
958# CONFIG_USB_ATI_REMOTE is not set 962# CONFIG_USB_ATI_REMOTE is not set
963# CONFIG_USB_KEYSPAN_REMOTE is not set
959 964
960# 965#
961# USB Imaging devices 966# USB Imaging devices
@@ -1071,10 +1076,11 @@ CONFIG_USB_EZUSB=y
1071# CONFIG_USB_PHIDGETSERVO is not set 1076# CONFIG_USB_PHIDGETSERVO is not set
1072# CONFIG_USB_IDMOUSE is not set 1077# CONFIG_USB_IDMOUSE is not set
1073# CONFIG_USB_SISUSBVGA is not set 1078# CONFIG_USB_SISUSBVGA is not set
1079# CONFIG_USB_LD is not set
1074# CONFIG_USB_TEST is not set 1080# CONFIG_USB_TEST is not set
1075 1081
1076# 1082#
1077# USB ATM/DSL drivers 1083# USB DSL modem support
1078# 1084#
1079 1085
1080# 1086#
@@ -1093,12 +1099,18 @@ CONFIG_USB_EZUSB=y
1093# CONFIG_INFINIBAND is not set 1099# CONFIG_INFINIBAND is not set
1094 1100
1095# 1101#
1102# SN Devices
1103#
1104
1105#
1096# File systems 1106# File systems
1097# 1107#
1098CONFIG_EXT2_FS=y 1108CONFIG_EXT2_FS=y
1099CONFIG_EXT2_FS_XATTR=y 1109CONFIG_EXT2_FS_XATTR=y
1100CONFIG_EXT2_FS_POSIX_ACL=y 1110CONFIG_EXT2_FS_POSIX_ACL=y
1101CONFIG_EXT2_FS_SECURITY=y 1111CONFIG_EXT2_FS_SECURITY=y
1112CONFIG_EXT2_FS_XIP=y
1113CONFIG_FS_XIP=y
1102CONFIG_EXT3_FS=y 1114CONFIG_EXT3_FS=y
1103CONFIG_EXT3_FS_XATTR=y 1115CONFIG_EXT3_FS_XATTR=y
1104CONFIG_EXT3_FS_POSIX_ACL=y 1116CONFIG_EXT3_FS_POSIX_ACL=y
@@ -1126,6 +1138,7 @@ CONFIG_XFS_SECURITY=y
1126CONFIG_XFS_POSIX_ACL=y 1138CONFIG_XFS_POSIX_ACL=y
1127# CONFIG_MINIX_FS is not set 1139# CONFIG_MINIX_FS is not set
1128# CONFIG_ROMFS_FS is not set 1140# CONFIG_ROMFS_FS is not set
1141CONFIG_INOTIFY=y
1129# CONFIG_QUOTA is not set 1142# CONFIG_QUOTA is not set
1130CONFIG_DNOTIFY=y 1143CONFIG_DNOTIFY=y
1131CONFIG_AUTOFS_FS=m 1144CONFIG_AUTOFS_FS=m
@@ -1157,7 +1170,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1157CONFIG_PROC_FS=y 1170CONFIG_PROC_FS=y
1158CONFIG_PROC_KCORE=y 1171CONFIG_PROC_KCORE=y
1159CONFIG_SYSFS=y 1172CONFIG_SYSFS=y
1160# CONFIG_DEVFS_FS is not set
1161CONFIG_DEVPTS_FS_XATTR=y 1173CONFIG_DEVPTS_FS_XATTR=y
1162# CONFIG_DEVPTS_FS_SECURITY is not set 1174# CONFIG_DEVPTS_FS_SECURITY is not set
1163CONFIG_TMPFS=y 1175CONFIG_TMPFS=y
@@ -1189,15 +1201,20 @@ CONFIG_CRAMFS=y
1189# 1201#
1190CONFIG_NFS_FS=y 1202CONFIG_NFS_FS=y
1191CONFIG_NFS_V3=y 1203CONFIG_NFS_V3=y
1204CONFIG_NFS_V3_ACL=y
1192CONFIG_NFS_V4=y 1205CONFIG_NFS_V4=y
1193# CONFIG_NFS_DIRECTIO is not set 1206# CONFIG_NFS_DIRECTIO is not set
1194CONFIG_NFSD=y 1207CONFIG_NFSD=y
1208CONFIG_NFSD_V2_ACL=y
1195CONFIG_NFSD_V3=y 1209CONFIG_NFSD_V3=y
1210CONFIG_NFSD_V3_ACL=y
1196CONFIG_NFSD_V4=y 1211CONFIG_NFSD_V4=y
1197CONFIG_NFSD_TCP=y 1212CONFIG_NFSD_TCP=y
1198CONFIG_LOCKD=y 1213CONFIG_LOCKD=y
1199CONFIG_LOCKD_V4=y 1214CONFIG_LOCKD_V4=y
1200CONFIG_EXPORTFS=y 1215CONFIG_EXPORTFS=y
1216CONFIG_NFS_ACL_SUPPORT=y
1217CONFIG_NFS_COMMON=y
1201CONFIG_SUNRPC=y 1218CONFIG_SUNRPC=y
1202CONFIG_SUNRPC_GSS=y 1219CONFIG_SUNRPC_GSS=y
1203CONFIG_RPCSEC_GSS_KRB5=y 1220CONFIG_RPCSEC_GSS_KRB5=y
diff --git a/arch/ppc64/configs/iSeries_defconfig b/arch/ppc64/configs/iSeries_defconfig
index f6a2b99afd63..dbd54d188c2b 100644
--- a/arch/ppc64/configs/iSeries_defconfig
+++ b/arch/ppc64/configs/iSeries_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.12-rc6 3# Linux kernel version: 2.6.13-rc3
4# Tue Jun 14 17:01:28 2005 4# Wed Jul 13 14:43:39 2005
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -80,8 +80,24 @@ CONFIG_IBMVIO=y
80CONFIG_IOMMU_VMERGE=y 80CONFIG_IOMMU_VMERGE=y
81CONFIG_SMP=y 81CONFIG_SMP=y
82CONFIG_NR_CPUS=32 82CONFIG_NR_CPUS=32
83CONFIG_ARCH_SELECT_MEMORY_MODEL=y
84CONFIG_ARCH_FLATMEM_ENABLE=y
85CONFIG_SELECT_MEMORY_MODEL=y
86CONFIG_FLATMEM_MANUAL=y
87# CONFIG_DISCONTIGMEM_MANUAL is not set
88# CONFIG_SPARSEMEM_MANUAL is not set
89CONFIG_FLATMEM=y
90CONFIG_FLAT_NODE_MEM_MAP=y
91# CONFIG_NUMA is not set
83# CONFIG_SCHED_SMT is not set 92# CONFIG_SCHED_SMT is not set
93CONFIG_PREEMPT_NONE=y
94# CONFIG_PREEMPT_VOLUNTARY is not set
84# CONFIG_PREEMPT is not set 95# CONFIG_PREEMPT is not set
96# CONFIG_PREEMPT_BKL is not set
97CONFIG_HZ_100=y
98# CONFIG_HZ_250 is not set
99# CONFIG_HZ_1000 is not set
100CONFIG_HZ=100
85CONFIG_GENERIC_HARDIRQS=y 101CONFIG_GENERIC_HARDIRQS=y
86CONFIG_MSCHUNKS=y 102CONFIG_MSCHUNKS=y
87CONFIG_LPARCFG=y 103CONFIG_LPARCFG=y
@@ -110,6 +126,146 @@ CONFIG_PCI_NAMES=y
110# CONFIG_HOTPLUG_PCI is not set 126# CONFIG_HOTPLUG_PCI is not set
111 127
112# 128#
129# Networking
130#
131CONFIG_NET=y
132
133#
134# Networking options
135#
136CONFIG_PACKET=y
137# CONFIG_PACKET_MMAP is not set
138CONFIG_UNIX=y
139CONFIG_XFRM=y
140CONFIG_XFRM_USER=m
141CONFIG_NET_KEY=m
142CONFIG_INET=y
143CONFIG_IP_MULTICAST=y
144# CONFIG_IP_ADVANCED_ROUTER is not set
145CONFIG_IP_FIB_HASH=y
146# CONFIG_IP_PNP is not set
147CONFIG_NET_IPIP=y
148# CONFIG_NET_IPGRE is not set
149# CONFIG_IP_MROUTE is not set
150# CONFIG_ARPD is not set
151CONFIG_SYN_COOKIES=y
152CONFIG_INET_AH=m
153CONFIG_INET_ESP=m
154CONFIG_INET_IPCOMP=m
155CONFIG_INET_TUNNEL=y
156CONFIG_IP_TCPDIAG=m
157# CONFIG_IP_TCPDIAG_IPV6 is not set
158# CONFIG_TCP_CONG_ADVANCED is not set
159CONFIG_TCP_CONG_BIC=y
160
161#
162# IP: Virtual Server Configuration
163#
164# CONFIG_IP_VS is not set
165# CONFIG_IPV6 is not set
166CONFIG_NETFILTER=y
167# CONFIG_NETFILTER_DEBUG is not set
168
169#
170# IP: Netfilter Configuration
171#
172CONFIG_IP_NF_CONNTRACK=m
173CONFIG_IP_NF_CT_ACCT=y
174CONFIG_IP_NF_CONNTRACK_MARK=y
175CONFIG_IP_NF_CT_PROTO_SCTP=m
176CONFIG_IP_NF_FTP=m
177CONFIG_IP_NF_IRC=m
178CONFIG_IP_NF_TFTP=m
179CONFIG_IP_NF_AMANDA=m
180CONFIG_IP_NF_QUEUE=m
181CONFIG_IP_NF_IPTABLES=m
182CONFIG_IP_NF_MATCH_LIMIT=m
183CONFIG_IP_NF_MATCH_IPRANGE=m
184CONFIG_IP_NF_MATCH_MAC=m
185CONFIG_IP_NF_MATCH_PKTTYPE=m
186CONFIG_IP_NF_MATCH_MARK=m
187CONFIG_IP_NF_MATCH_MULTIPORT=m
188CONFIG_IP_NF_MATCH_TOS=m
189CONFIG_IP_NF_MATCH_RECENT=m
190CONFIG_IP_NF_MATCH_ECN=m
191CONFIG_IP_NF_MATCH_DSCP=m
192CONFIG_IP_NF_MATCH_AH_ESP=m
193CONFIG_IP_NF_MATCH_LENGTH=m
194CONFIG_IP_NF_MATCH_TTL=m
195CONFIG_IP_NF_MATCH_TCPMSS=m
196CONFIG_IP_NF_MATCH_HELPER=m
197CONFIG_IP_NF_MATCH_STATE=m
198CONFIG_IP_NF_MATCH_CONNTRACK=m
199CONFIG_IP_NF_MATCH_OWNER=m
200CONFIG_IP_NF_MATCH_ADDRTYPE=m
201CONFIG_IP_NF_MATCH_REALM=m
202CONFIG_IP_NF_MATCH_SCTP=m
203CONFIG_IP_NF_MATCH_COMMENT=m
204CONFIG_IP_NF_MATCH_CONNMARK=m
205CONFIG_IP_NF_MATCH_HASHLIMIT=m
206CONFIG_IP_NF_FILTER=m
207CONFIG_IP_NF_TARGET_REJECT=m
208CONFIG_IP_NF_TARGET_LOG=m
209CONFIG_IP_NF_TARGET_ULOG=m
210CONFIG_IP_NF_TARGET_TCPMSS=m
211CONFIG_IP_NF_NAT=m
212CONFIG_IP_NF_NAT_NEEDED=y
213CONFIG_IP_NF_TARGET_MASQUERADE=m
214CONFIG_IP_NF_TARGET_REDIRECT=m
215CONFIG_IP_NF_TARGET_NETMAP=m
216CONFIG_IP_NF_TARGET_SAME=m
217CONFIG_IP_NF_NAT_SNMP_BASIC=m
218CONFIG_IP_NF_NAT_IRC=m
219CONFIG_IP_NF_NAT_FTP=m
220CONFIG_IP_NF_NAT_TFTP=m
221CONFIG_IP_NF_NAT_AMANDA=m
222CONFIG_IP_NF_MANGLE=m
223CONFIG_IP_NF_TARGET_TOS=m
224CONFIG_IP_NF_TARGET_ECN=m
225CONFIG_IP_NF_TARGET_DSCP=m
226CONFIG_IP_NF_TARGET_MARK=m
227CONFIG_IP_NF_TARGET_CLASSIFY=m
228CONFIG_IP_NF_TARGET_CONNMARK=m
229CONFIG_IP_NF_TARGET_CLUSTERIP=m
230CONFIG_IP_NF_RAW=m
231CONFIG_IP_NF_TARGET_NOTRACK=m
232CONFIG_IP_NF_ARPTABLES=m
233CONFIG_IP_NF_ARPFILTER=m
234CONFIG_IP_NF_ARP_MANGLE=m
235
236#
237# SCTP Configuration (EXPERIMENTAL)
238#
239# CONFIG_IP_SCTP is not set
240# CONFIG_ATM is not set
241# CONFIG_BRIDGE is not set
242# CONFIG_VLAN_8021Q is not set
243# CONFIG_DECNET is not set
244CONFIG_LLC=y
245# CONFIG_LLC2 is not set
246# CONFIG_IPX is not set
247# CONFIG_ATALK is not set
248# CONFIG_X25 is not set
249# CONFIG_LAPB is not set
250# CONFIG_NET_DIVERT is not set
251# CONFIG_ECONET is not set
252# CONFIG_WAN_ROUTER is not set
253# CONFIG_NET_SCHED is not set
254CONFIG_NET_CLS_ROUTE=y
255
256#
257# Network testing
258#
259# CONFIG_NET_PKTGEN is not set
260CONFIG_NETPOLL=y
261CONFIG_NETPOLL_RX=y
262CONFIG_NETPOLL_TRAP=y
263CONFIG_NET_POLL_CONTROLLER=y
264# CONFIG_HAMRADIO is not set
265# CONFIG_IRDA is not set
266# CONFIG_BT is not set
267
268#
113# Device Drivers 269# Device Drivers
114# 270#
115 271
@@ -184,6 +340,7 @@ CONFIG_CHR_DEV_ST=y
184CONFIG_BLK_DEV_SR=y 340CONFIG_BLK_DEV_SR=y
185CONFIG_BLK_DEV_SR_VENDOR=y 341CONFIG_BLK_DEV_SR_VENDOR=y
186CONFIG_CHR_DEV_SG=y 342CONFIG_CHR_DEV_SG=y
343# CONFIG_CHR_DEV_SCH is not set
187 344
188# 345#
189# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 346# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -260,6 +417,8 @@ CONFIG_DM_ZERO=m
260# Fusion MPT device support 417# Fusion MPT device support
261# 418#
262# CONFIG_FUSION is not set 419# CONFIG_FUSION is not set
420# CONFIG_FUSION_SPI is not set
421# CONFIG_FUSION_FC is not set
263 422
264# 423#
265# IEEE 1394 (FireWire) support 424# IEEE 1394 (FireWire) support
@@ -276,145 +435,8 @@ CONFIG_DM_ZERO=m
276# 435#
277 436
278# 437#
279# Networking support 438# Network device support
280#
281CONFIG_NET=y
282
283#
284# Networking options
285# 439#
286CONFIG_PACKET=y
287# CONFIG_PACKET_MMAP is not set
288CONFIG_UNIX=y
289CONFIG_NET_KEY=m
290CONFIG_INET=y
291CONFIG_IP_MULTICAST=y
292# CONFIG_IP_ADVANCED_ROUTER is not set
293# CONFIG_IP_PNP is not set
294CONFIG_NET_IPIP=y
295# CONFIG_NET_IPGRE is not set
296# CONFIG_IP_MROUTE is not set
297# CONFIG_ARPD is not set
298CONFIG_SYN_COOKIES=y
299CONFIG_INET_AH=m
300CONFIG_INET_ESP=m
301CONFIG_INET_IPCOMP=m
302CONFIG_INET_TUNNEL=y
303CONFIG_IP_TCPDIAG=m
304# CONFIG_IP_TCPDIAG_IPV6 is not set
305
306#
307# IP: Virtual Server Configuration
308#
309# CONFIG_IP_VS is not set
310# CONFIG_IPV6 is not set
311CONFIG_NETFILTER=y
312# CONFIG_NETFILTER_DEBUG is not set
313
314#
315# IP: Netfilter Configuration
316#
317CONFIG_IP_NF_CONNTRACK=m
318CONFIG_IP_NF_CT_ACCT=y
319CONFIG_IP_NF_CONNTRACK_MARK=y
320CONFIG_IP_NF_CT_PROTO_SCTP=m
321CONFIG_IP_NF_FTP=m
322CONFIG_IP_NF_IRC=m
323CONFIG_IP_NF_TFTP=m
324CONFIG_IP_NF_AMANDA=m
325CONFIG_IP_NF_QUEUE=m
326CONFIG_IP_NF_IPTABLES=m
327CONFIG_IP_NF_MATCH_LIMIT=m
328CONFIG_IP_NF_MATCH_IPRANGE=m
329CONFIG_IP_NF_MATCH_MAC=m
330CONFIG_IP_NF_MATCH_PKTTYPE=m
331CONFIG_IP_NF_MATCH_MARK=m
332CONFIG_IP_NF_MATCH_MULTIPORT=m
333CONFIG_IP_NF_MATCH_TOS=m
334CONFIG_IP_NF_MATCH_RECENT=m
335CONFIG_IP_NF_MATCH_ECN=m
336CONFIG_IP_NF_MATCH_DSCP=m
337CONFIG_IP_NF_MATCH_AH_ESP=m
338CONFIG_IP_NF_MATCH_LENGTH=m
339CONFIG_IP_NF_MATCH_TTL=m
340CONFIG_IP_NF_MATCH_TCPMSS=m
341CONFIG_IP_NF_MATCH_HELPER=m
342CONFIG_IP_NF_MATCH_STATE=m
343CONFIG_IP_NF_MATCH_CONNTRACK=m
344CONFIG_IP_NF_MATCH_OWNER=m
345CONFIG_IP_NF_MATCH_ADDRTYPE=m
346CONFIG_IP_NF_MATCH_REALM=m
347CONFIG_IP_NF_MATCH_SCTP=m
348CONFIG_IP_NF_MATCH_COMMENT=m
349CONFIG_IP_NF_MATCH_CONNMARK=m
350CONFIG_IP_NF_MATCH_HASHLIMIT=m
351CONFIG_IP_NF_FILTER=m
352CONFIG_IP_NF_TARGET_REJECT=m
353CONFIG_IP_NF_TARGET_LOG=m
354CONFIG_IP_NF_TARGET_ULOG=m
355CONFIG_IP_NF_TARGET_TCPMSS=m
356CONFIG_IP_NF_NAT=m
357CONFIG_IP_NF_NAT_NEEDED=y
358CONFIG_IP_NF_TARGET_MASQUERADE=m
359CONFIG_IP_NF_TARGET_REDIRECT=m
360CONFIG_IP_NF_TARGET_NETMAP=m
361CONFIG_IP_NF_TARGET_SAME=m
362CONFIG_IP_NF_NAT_SNMP_BASIC=m
363CONFIG_IP_NF_NAT_IRC=m
364CONFIG_IP_NF_NAT_FTP=m
365CONFIG_IP_NF_NAT_TFTP=m
366CONFIG_IP_NF_NAT_AMANDA=m
367CONFIG_IP_NF_MANGLE=m
368CONFIG_IP_NF_TARGET_TOS=m
369CONFIG_IP_NF_TARGET_ECN=m
370CONFIG_IP_NF_TARGET_DSCP=m
371CONFIG_IP_NF_TARGET_MARK=m
372CONFIG_IP_NF_TARGET_CLASSIFY=m
373CONFIG_IP_NF_TARGET_CONNMARK=m
374CONFIG_IP_NF_TARGET_CLUSTERIP=m
375CONFIG_IP_NF_RAW=m
376CONFIG_IP_NF_TARGET_NOTRACK=m
377CONFIG_IP_NF_ARPTABLES=m
378CONFIG_IP_NF_ARPFILTER=m
379CONFIG_IP_NF_ARP_MANGLE=m
380CONFIG_XFRM=y
381CONFIG_XFRM_USER=m
382
383#
384# SCTP Configuration (EXPERIMENTAL)
385#
386# CONFIG_IP_SCTP is not set
387# CONFIG_ATM is not set
388# CONFIG_BRIDGE is not set
389# CONFIG_VLAN_8021Q is not set
390# CONFIG_DECNET is not set
391CONFIG_LLC=y
392# CONFIG_LLC2 is not set
393# CONFIG_IPX is not set
394# CONFIG_ATALK is not set
395# CONFIG_X25 is not set
396# CONFIG_LAPB is not set
397# CONFIG_NET_DIVERT is not set
398# CONFIG_ECONET is not set
399# CONFIG_WAN_ROUTER is not set
400
401#
402# QoS and/or fair queueing
403#
404# CONFIG_NET_SCHED is not set
405CONFIG_NET_CLS_ROUTE=y
406
407#
408# Network testing
409#
410# CONFIG_NET_PKTGEN is not set
411CONFIG_NETPOLL=y
412CONFIG_NETPOLL_RX=y
413CONFIG_NETPOLL_TRAP=y
414CONFIG_NET_POLL_CONTROLLER=y
415# CONFIG_HAMRADIO is not set
416# CONFIG_IRDA is not set
417# CONFIG_BT is not set
418CONFIG_NETDEVICES=y 440CONFIG_NETDEVICES=y
419CONFIG_DUMMY=m 441CONFIG_DUMMY=m
420CONFIG_BONDING=m 442CONFIG_BONDING=m
@@ -471,6 +493,7 @@ CONFIG_E1000=m
471# CONFIG_HAMACHI is not set 493# CONFIG_HAMACHI is not set
472# CONFIG_YELLOWFIN is not set 494# CONFIG_YELLOWFIN is not set
473# CONFIG_R8169 is not set 495# CONFIG_R8169 is not set
496# CONFIG_SKGE is not set
474# CONFIG_SK98LIN is not set 497# CONFIG_SK98LIN is not set
475# CONFIG_VIA_VELOCITY is not set 498# CONFIG_VIA_VELOCITY is not set
476# CONFIG_TIGON3 is not set 499# CONFIG_TIGON3 is not set
@@ -610,6 +633,7 @@ CONFIG_MAX_RAW_DEVS=256
610# I2C support 633# I2C support
611# 634#
612# CONFIG_I2C is not set 635# CONFIG_I2C is not set
636# CONFIG_I2C_SENSOR is not set
613 637
614# 638#
615# Dallas's 1-wire bus 639# Dallas's 1-wire bus
@@ -617,6 +641,11 @@ CONFIG_MAX_RAW_DEVS=256
617# CONFIG_W1 is not set 641# CONFIG_W1 is not set
618 642
619# 643#
644# Hardware Monitoring support
645#
646# CONFIG_HWMON is not set
647
648#
620# Misc devices 649# Misc devices
621# 650#
622 651
@@ -663,12 +692,18 @@ CONFIG_USB_ARCH_HAS_OHCI=y
663# CONFIG_INFINIBAND is not set 692# CONFIG_INFINIBAND is not set
664 693
665# 694#
695# SN Devices
696#
697
698#
666# File systems 699# File systems
667# 700#
668CONFIG_EXT2_FS=y 701CONFIG_EXT2_FS=y
669CONFIG_EXT2_FS_XATTR=y 702CONFIG_EXT2_FS_XATTR=y
670CONFIG_EXT2_FS_POSIX_ACL=y 703CONFIG_EXT2_FS_POSIX_ACL=y
671CONFIG_EXT2_FS_SECURITY=y 704CONFIG_EXT2_FS_SECURITY=y
705CONFIG_EXT2_FS_XIP=y
706CONFIG_FS_XIP=y
672CONFIG_EXT3_FS=y 707CONFIG_EXT3_FS=y
673CONFIG_EXT3_FS_XATTR=y 708CONFIG_EXT3_FS_XATTR=y
674CONFIG_EXT3_FS_POSIX_ACL=y 709CONFIG_EXT3_FS_POSIX_ACL=y
@@ -700,6 +735,7 @@ CONFIG_XFS_SECURITY=y
700CONFIG_XFS_POSIX_ACL=y 735CONFIG_XFS_POSIX_ACL=y
701# CONFIG_MINIX_FS is not set 736# CONFIG_MINIX_FS is not set
702# CONFIG_ROMFS_FS is not set 737# CONFIG_ROMFS_FS is not set
738CONFIG_INOTIFY=y
703# CONFIG_QUOTA is not set 739# CONFIG_QUOTA is not set
704CONFIG_DNOTIFY=y 740CONFIG_DNOTIFY=y
705CONFIG_AUTOFS_FS=m 741CONFIG_AUTOFS_FS=m
@@ -731,7 +767,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
731CONFIG_PROC_FS=y 767CONFIG_PROC_FS=y
732CONFIG_PROC_KCORE=y 768CONFIG_PROC_KCORE=y
733CONFIG_SYSFS=y 769CONFIG_SYSFS=y
734# CONFIG_DEVFS_FS is not set
735CONFIG_DEVPTS_FS_XATTR=y 770CONFIG_DEVPTS_FS_XATTR=y
736CONFIG_DEVPTS_FS_SECURITY=y 771CONFIG_DEVPTS_FS_SECURITY=y
737CONFIG_TMPFS=y 772CONFIG_TMPFS=y
@@ -763,15 +798,20 @@ CONFIG_CRAMFS=y
763# 798#
764CONFIG_NFS_FS=y 799CONFIG_NFS_FS=y
765CONFIG_NFS_V3=y 800CONFIG_NFS_V3=y
801CONFIG_NFS_V3_ACL=y
766CONFIG_NFS_V4=y 802CONFIG_NFS_V4=y
767# CONFIG_NFS_DIRECTIO is not set 803# CONFIG_NFS_DIRECTIO is not set
768CONFIG_NFSD=m 804CONFIG_NFSD=m
805CONFIG_NFSD_V2_ACL=y
769CONFIG_NFSD_V3=y 806CONFIG_NFSD_V3=y
807CONFIG_NFSD_V3_ACL=y
770CONFIG_NFSD_V4=y 808CONFIG_NFSD_V4=y
771CONFIG_NFSD_TCP=y 809CONFIG_NFSD_TCP=y
772CONFIG_LOCKD=y 810CONFIG_LOCKD=y
773CONFIG_LOCKD_V4=y 811CONFIG_LOCKD_V4=y
774CONFIG_EXPORTFS=m 812CONFIG_EXPORTFS=m
813CONFIG_NFS_ACL_SUPPORT=y
814CONFIG_NFS_COMMON=y
775CONFIG_SUNRPC=y 815CONFIG_SUNRPC=y
776CONFIG_SUNRPC_GSS=y 816CONFIG_SUNRPC_GSS=y
777CONFIG_RPCSEC_GSS_KRB5=y 817CONFIG_RPCSEC_GSS_KRB5=y
diff --git a/arch/ppc64/configs/maple_defconfig b/arch/ppc64/configs/maple_defconfig
index 8051b0f47b6f..cda8e8cb6d1d 100644
--- a/arch/ppc64/configs/maple_defconfig
+++ b/arch/ppc64/configs/maple_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.12-rc6 3# Linux kernel version: 2.6.13-rc3
4# Tue Jun 14 17:12:48 2005 4# Wed Jul 13 14:46:18 2005
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -73,12 +73,15 @@ CONFIG_SYSVIPC_COMPAT=y
73# CONFIG_PPC_ISERIES is not set 73# CONFIG_PPC_ISERIES is not set
74CONFIG_PPC_MULTIPLATFORM=y 74CONFIG_PPC_MULTIPLATFORM=y
75# CONFIG_PPC_PSERIES is not set 75# CONFIG_PPC_PSERIES is not set
76# CONFIG_PPC_BPA is not set
76# CONFIG_PPC_PMAC is not set 77# CONFIG_PPC_PMAC is not set
77CONFIG_PPC_MAPLE=y 78CONFIG_PPC_MAPLE=y
78CONFIG_PPC=y 79CONFIG_PPC=y
79CONFIG_PPC64=y 80CONFIG_PPC64=y
80CONFIG_PPC_OF=y 81CONFIG_PPC_OF=y
82CONFIG_MPIC=y
81# CONFIG_ALTIVEC is not set 83# CONFIG_ALTIVEC is not set
84CONFIG_KEXEC=y
82CONFIG_U3_DART=y 85CONFIG_U3_DART=y
83CONFIG_MPIC_BROKEN_U3=y 86CONFIG_MPIC_BROKEN_U3=y
84CONFIG_BOOTX_TEXT=y 87CONFIG_BOOTX_TEXT=y
@@ -86,8 +89,24 @@ CONFIG_POWER4_ONLY=y
86CONFIG_IOMMU_VMERGE=y 89CONFIG_IOMMU_VMERGE=y
87CONFIG_SMP=y 90CONFIG_SMP=y
88CONFIG_NR_CPUS=2 91CONFIG_NR_CPUS=2
92CONFIG_ARCH_SELECT_MEMORY_MODEL=y
93CONFIG_ARCH_FLATMEM_ENABLE=y
94CONFIG_SELECT_MEMORY_MODEL=y
95CONFIG_FLATMEM_MANUAL=y
96# CONFIG_DISCONTIGMEM_MANUAL is not set
97# CONFIG_SPARSEMEM_MANUAL is not set
98CONFIG_FLATMEM=y
99CONFIG_FLAT_NODE_MEM_MAP=y
100# CONFIG_NUMA is not set
89# CONFIG_SCHED_SMT is not set 101# CONFIG_SCHED_SMT is not set
102CONFIG_PREEMPT_NONE=y
103# CONFIG_PREEMPT_VOLUNTARY is not set
90# CONFIG_PREEMPT is not set 104# CONFIG_PREEMPT is not set
105# CONFIG_PREEMPT_BKL is not set
106CONFIG_HZ_100=y
107# CONFIG_HZ_250 is not set
108# CONFIG_HZ_1000 is not set
109CONFIG_HZ=100
91CONFIG_GENERIC_HARDIRQS=y 110CONFIG_GENERIC_HARDIRQS=y
92CONFIG_SECCOMP=y 111CONFIG_SECCOMP=y
93CONFIG_ISA_DMA_API=y 112CONFIG_ISA_DMA_API=y
@@ -116,6 +135,71 @@ CONFIG_PROC_DEVICETREE=y
116# CONFIG_CMDLINE_BOOL is not set 135# CONFIG_CMDLINE_BOOL is not set
117 136
118# 137#
138# Networking
139#
140CONFIG_NET=y
141
142#
143# Networking options
144#
145CONFIG_PACKET=y
146CONFIG_PACKET_MMAP=y
147CONFIG_UNIX=y
148# CONFIG_NET_KEY is not set
149CONFIG_INET=y
150CONFIG_IP_MULTICAST=y
151# CONFIG_IP_ADVANCED_ROUTER is not set
152CONFIG_IP_FIB_HASH=y
153CONFIG_IP_PNP=y
154CONFIG_IP_PNP_DHCP=y
155# CONFIG_IP_PNP_BOOTP is not set
156# CONFIG_IP_PNP_RARP is not set
157# CONFIG_NET_IPIP is not set
158# CONFIG_NET_IPGRE is not set
159# CONFIG_IP_MROUTE is not set
160# CONFIG_ARPD is not set
161# CONFIG_SYN_COOKIES is not set
162# CONFIG_INET_AH is not set
163# CONFIG_INET_ESP is not set
164# CONFIG_INET_IPCOMP is not set
165# CONFIG_INET_TUNNEL is not set
166CONFIG_IP_TCPDIAG=y
167# CONFIG_IP_TCPDIAG_IPV6 is not set
168# CONFIG_TCP_CONG_ADVANCED is not set
169CONFIG_TCP_CONG_BIC=y
170# CONFIG_IPV6 is not set
171# CONFIG_NETFILTER is not set
172
173#
174# SCTP Configuration (EXPERIMENTAL)
175#
176# CONFIG_IP_SCTP is not set
177# CONFIG_ATM is not set
178# CONFIG_BRIDGE is not set
179# CONFIG_VLAN_8021Q is not set
180# CONFIG_DECNET is not set
181# CONFIG_LLC2 is not set
182# CONFIG_IPX is not set
183# CONFIG_ATALK is not set
184# CONFIG_X25 is not set
185# CONFIG_LAPB is not set
186# CONFIG_NET_DIVERT is not set
187# CONFIG_ECONET is not set
188# CONFIG_WAN_ROUTER is not set
189# CONFIG_NET_SCHED is not set
190# CONFIG_NET_CLS_ROUTE is not set
191
192#
193# Network testing
194#
195# CONFIG_NET_PKTGEN is not set
196# CONFIG_NETPOLL is not set
197# CONFIG_NET_POLL_CONTROLLER is not set
198# CONFIG_HAMRADIO is not set
199# CONFIG_IRDA is not set
200# CONFIG_BT is not set
201
202#
119# Device Drivers 203# Device Drivers
120# 204#
121 205
@@ -213,6 +297,7 @@ CONFIG_BLK_DEV_AMD74XX=y
213# CONFIG_BLK_DEV_HPT366 is not set 297# CONFIG_BLK_DEV_HPT366 is not set
214# CONFIG_BLK_DEV_SC1200 is not set 298# CONFIG_BLK_DEV_SC1200 is not set
215# CONFIG_BLK_DEV_PIIX is not set 299# CONFIG_BLK_DEV_PIIX is not set
300# CONFIG_BLK_DEV_IT821X is not set
216# CONFIG_BLK_DEV_NS87415 is not set 301# CONFIG_BLK_DEV_NS87415 is not set
217# CONFIG_BLK_DEV_PDC202XX_OLD is not set 302# CONFIG_BLK_DEV_PDC202XX_OLD is not set
218# CONFIG_BLK_DEV_PDC202XX_NEW is not set 303# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -240,6 +325,7 @@ CONFIG_IDEDMA_AUTO=y
240# 325#
241# Fusion MPT device support 326# Fusion MPT device support
242# 327#
328# CONFIG_FUSION is not set
243 329
244# 330#
245# IEEE 1394 (FireWire) support 331# IEEE 1394 (FireWire) support
@@ -256,70 +342,8 @@ CONFIG_IDEDMA_AUTO=y
256# 342#
257 343
258# 344#
259# Networking support 345# Network device support
260#
261CONFIG_NET=y
262
263#
264# Networking options
265# 346#
266CONFIG_PACKET=y
267CONFIG_PACKET_MMAP=y
268CONFIG_UNIX=y
269# CONFIG_NET_KEY is not set
270CONFIG_INET=y
271CONFIG_IP_MULTICAST=y
272# CONFIG_IP_ADVANCED_ROUTER is not set
273CONFIG_IP_PNP=y
274CONFIG_IP_PNP_DHCP=y
275# CONFIG_IP_PNP_BOOTP is not set
276# CONFIG_IP_PNP_RARP is not set
277# CONFIG_NET_IPIP is not set
278# CONFIG_NET_IPGRE is not set
279# CONFIG_IP_MROUTE is not set
280# CONFIG_ARPD is not set
281# CONFIG_SYN_COOKIES is not set
282# CONFIG_INET_AH is not set
283# CONFIG_INET_ESP is not set
284# CONFIG_INET_IPCOMP is not set
285# CONFIG_INET_TUNNEL is not set
286CONFIG_IP_TCPDIAG=y
287# CONFIG_IP_TCPDIAG_IPV6 is not set
288# CONFIG_IPV6 is not set
289# CONFIG_NETFILTER is not set
290
291#
292# SCTP Configuration (EXPERIMENTAL)
293#
294# CONFIG_IP_SCTP is not set
295# CONFIG_ATM is not set
296# CONFIG_BRIDGE is not set
297# CONFIG_VLAN_8021Q is not set
298# CONFIG_DECNET is not set
299# CONFIG_LLC2 is not set
300# CONFIG_IPX is not set
301# CONFIG_ATALK is not set
302# CONFIG_X25 is not set
303# CONFIG_LAPB is not set
304# CONFIG_NET_DIVERT is not set
305# CONFIG_ECONET is not set
306# CONFIG_WAN_ROUTER is not set
307
308#
309# QoS and/or fair queueing
310#
311# CONFIG_NET_SCHED is not set
312# CONFIG_NET_CLS_ROUTE is not set
313
314#
315# Network testing
316#
317# CONFIG_NET_PKTGEN is not set
318# CONFIG_NETPOLL is not set
319# CONFIG_NET_POLL_CONTROLLER is not set
320# CONFIG_HAMRADIO is not set
321# CONFIG_IRDA is not set
322# CONFIG_BT is not set
323CONFIG_NETDEVICES=y 347CONFIG_NETDEVICES=y
324# CONFIG_DUMMY is not set 348# CONFIG_DUMMY is not set
325# CONFIG_BONDING is not set 349# CONFIG_BONDING is not set
@@ -376,6 +400,7 @@ CONFIG_E1000=y
376# CONFIG_HAMACHI is not set 400# CONFIG_HAMACHI is not set
377# CONFIG_YELLOWFIN is not set 401# CONFIG_YELLOWFIN is not set
378# CONFIG_R8169 is not set 402# CONFIG_R8169 is not set
403# CONFIG_SKGE is not set
379# CONFIG_SK98LIN is not set 404# CONFIG_SK98LIN is not set
380# CONFIG_VIA_VELOCITY is not set 405# CONFIG_VIA_VELOCITY is not set
381# CONFIG_TIGON3 is not set 406# CONFIG_TIGON3 is not set
@@ -543,50 +568,19 @@ CONFIG_I2C_AMD8111=y
543# CONFIG_I2C_VIAPRO is not set 568# CONFIG_I2C_VIAPRO is not set
544# CONFIG_I2C_VOODOO3 is not set 569# CONFIG_I2C_VOODOO3 is not set
545# CONFIG_I2C_PCA_ISA is not set 570# CONFIG_I2C_PCA_ISA is not set
571# CONFIG_I2C_SENSOR is not set
546 572
547# 573#
548# Hardware Sensors Chip support 574# Miscellaneous I2C Chip support
549#
550# CONFIG_I2C_SENSOR is not set
551# CONFIG_SENSORS_ADM1021 is not set
552# CONFIG_SENSORS_ADM1025 is not set
553# CONFIG_SENSORS_ADM1026 is not set
554# CONFIG_SENSORS_ADM1031 is not set
555# CONFIG_SENSORS_ASB100 is not set
556# CONFIG_SENSORS_DS1621 is not set
557# CONFIG_SENSORS_FSCHER is not set
558# CONFIG_SENSORS_FSCPOS is not set
559# CONFIG_SENSORS_GL518SM is not set
560# CONFIG_SENSORS_GL520SM is not set
561# CONFIG_SENSORS_IT87 is not set
562# CONFIG_SENSORS_LM63 is not set
563# CONFIG_SENSORS_LM75 is not set
564# CONFIG_SENSORS_LM77 is not set
565# CONFIG_SENSORS_LM78 is not set
566# CONFIG_SENSORS_LM80 is not set
567# CONFIG_SENSORS_LM83 is not set
568# CONFIG_SENSORS_LM85 is not set
569# CONFIG_SENSORS_LM87 is not set
570# CONFIG_SENSORS_LM90 is not set
571# CONFIG_SENSORS_LM92 is not set
572# CONFIG_SENSORS_MAX1619 is not set
573# CONFIG_SENSORS_PC87360 is not set
574# CONFIG_SENSORS_SMSC47B397 is not set
575# CONFIG_SENSORS_SIS5595 is not set
576# CONFIG_SENSORS_SMSC47M1 is not set
577# CONFIG_SENSORS_VIA686A is not set
578# CONFIG_SENSORS_W83781D is not set
579# CONFIG_SENSORS_W83L785TS is not set
580# CONFIG_SENSORS_W83627HF is not set
581
582#
583# Other I2C Chip support
584# 575#
585# CONFIG_SENSORS_DS1337 is not set 576# CONFIG_SENSORS_DS1337 is not set
577# CONFIG_SENSORS_DS1374 is not set
586# CONFIG_SENSORS_EEPROM is not set 578# CONFIG_SENSORS_EEPROM is not set
587# CONFIG_SENSORS_PCF8574 is not set 579# CONFIG_SENSORS_PCF8574 is not set
580# CONFIG_SENSORS_PCA9539 is not set
588# CONFIG_SENSORS_PCF8591 is not set 581# CONFIG_SENSORS_PCF8591 is not set
589# CONFIG_SENSORS_RTC8564 is not set 582# CONFIG_SENSORS_RTC8564 is not set
583# CONFIG_SENSORS_MAX6875 is not set
590# CONFIG_I2C_DEBUG_CORE is not set 584# CONFIG_I2C_DEBUG_CORE is not set
591# CONFIG_I2C_DEBUG_ALGO is not set 585# CONFIG_I2C_DEBUG_ALGO is not set
592# CONFIG_I2C_DEBUG_BUS is not set 586# CONFIG_I2C_DEBUG_BUS is not set
@@ -598,6 +592,11 @@ CONFIG_I2C_AMD8111=y
598# CONFIG_W1 is not set 592# CONFIG_W1 is not set
599 593
600# 594#
595# Hardware Monitoring support
596#
597# CONFIG_HWMON is not set
598
599#
601# Misc devices 600# Misc devices
602# 601#
603 602
@@ -649,6 +648,7 @@ CONFIG_USB_DEVICEFS=y
649CONFIG_USB_EHCI_HCD=y 648CONFIG_USB_EHCI_HCD=y
650CONFIG_USB_EHCI_SPLIT_ISO=y 649CONFIG_USB_EHCI_SPLIT_ISO=y
651CONFIG_USB_EHCI_ROOT_HUB_TT=y 650CONFIG_USB_EHCI_ROOT_HUB_TT=y
651# CONFIG_USB_ISP116X_HCD is not set
652CONFIG_USB_OHCI_HCD=y 652CONFIG_USB_OHCI_HCD=y
653# CONFIG_USB_OHCI_BIG_ENDIAN is not set 653# CONFIG_USB_OHCI_BIG_ENDIAN is not set
654CONFIG_USB_OHCI_LITTLE_ENDIAN=y 654CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -676,12 +676,15 @@ CONFIG_USB_HIDINPUT=y
676# CONFIG_USB_HIDDEV is not set 676# CONFIG_USB_HIDDEV is not set
677# CONFIG_USB_AIPTEK is not set 677# CONFIG_USB_AIPTEK is not set
678# CONFIG_USB_WACOM is not set 678# CONFIG_USB_WACOM is not set
679# CONFIG_USB_ACECAD is not set
679# CONFIG_USB_KBTAB is not set 680# CONFIG_USB_KBTAB is not set
680# CONFIG_USB_POWERMATE is not set 681# CONFIG_USB_POWERMATE is not set
681# CONFIG_USB_MTOUCH is not set 682# CONFIG_USB_MTOUCH is not set
683# CONFIG_USB_ITMTOUCH is not set
682# CONFIG_USB_EGALAX is not set 684# CONFIG_USB_EGALAX is not set
683# CONFIG_USB_XPAD is not set 685# CONFIG_USB_XPAD is not set
684# CONFIG_USB_ATI_REMOTE is not set 686# CONFIG_USB_ATI_REMOTE is not set
687# CONFIG_USB_KEYSPAN_REMOTE is not set
685 688
686# 689#
687# USB Imaging devices 690# USB Imaging devices
@@ -772,10 +775,11 @@ CONFIG_USB_EZUSB=y
772# CONFIG_USB_PHIDGETSERVO is not set 775# CONFIG_USB_PHIDGETSERVO is not set
773# CONFIG_USB_IDMOUSE is not set 776# CONFIG_USB_IDMOUSE is not set
774# CONFIG_USB_SISUSBVGA is not set 777# CONFIG_USB_SISUSBVGA is not set
778# CONFIG_USB_LD is not set
775# CONFIG_USB_TEST is not set 779# CONFIG_USB_TEST is not set
776 780
777# 781#
778# USB ATM/DSL drivers 782# USB DSL modem support
779# 783#
780 784
781# 785#
@@ -794,16 +798,23 @@ CONFIG_USB_EZUSB=y
794# CONFIG_INFINIBAND is not set 798# CONFIG_INFINIBAND is not set
795 799
796# 800#
801# SN Devices
802#
803
804#
797# File systems 805# File systems
798# 806#
799CONFIG_EXT2_FS=y 807CONFIG_EXT2_FS=y
800# CONFIG_EXT2_FS_XATTR is not set 808# CONFIG_EXT2_FS_XATTR is not set
809CONFIG_EXT2_FS_XIP=y
810CONFIG_FS_XIP=y
801CONFIG_EXT3_FS=y 811CONFIG_EXT3_FS=y
802# CONFIG_EXT3_FS_XATTR is not set 812# CONFIG_EXT3_FS_XATTR is not set
803CONFIG_JBD=y 813CONFIG_JBD=y
804# CONFIG_JBD_DEBUG is not set 814# CONFIG_JBD_DEBUG is not set
805# CONFIG_REISERFS_FS is not set 815# CONFIG_REISERFS_FS is not set
806# CONFIG_JFS_FS is not set 816# CONFIG_JFS_FS is not set
817CONFIG_FS_POSIX_ACL=y
807 818
808# 819#
809# XFS support 820# XFS support
@@ -811,6 +822,7 @@ CONFIG_JBD=y
811# CONFIG_XFS_FS is not set 822# CONFIG_XFS_FS is not set
812# CONFIG_MINIX_FS is not set 823# CONFIG_MINIX_FS is not set
813# CONFIG_ROMFS_FS is not set 824# CONFIG_ROMFS_FS is not set
825CONFIG_INOTIFY=y
814# CONFIG_QUOTA is not set 826# CONFIG_QUOTA is not set
815CONFIG_DNOTIFY=y 827CONFIG_DNOTIFY=y
816# CONFIG_AUTOFS_FS is not set 828# CONFIG_AUTOFS_FS is not set
@@ -838,7 +850,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
838CONFIG_PROC_FS=y 850CONFIG_PROC_FS=y
839CONFIG_PROC_KCORE=y 851CONFIG_PROC_KCORE=y
840CONFIG_SYSFS=y 852CONFIG_SYSFS=y
841# CONFIG_DEVFS_FS is not set
842CONFIG_DEVPTS_FS_XATTR=y 853CONFIG_DEVPTS_FS_XATTR=y
843# CONFIG_DEVPTS_FS_SECURITY is not set 854# CONFIG_DEVPTS_FS_SECURITY is not set
844CONFIG_TMPFS=y 855CONFIG_TMPFS=y
@@ -870,12 +881,15 @@ CONFIG_CRAMFS=y
870# 881#
871CONFIG_NFS_FS=y 882CONFIG_NFS_FS=y
872CONFIG_NFS_V3=y 883CONFIG_NFS_V3=y
884CONFIG_NFS_V3_ACL=y
873CONFIG_NFS_V4=y 885CONFIG_NFS_V4=y
874# CONFIG_NFS_DIRECTIO is not set 886# CONFIG_NFS_DIRECTIO is not set
875# CONFIG_NFSD is not set 887# CONFIG_NFSD is not set
876CONFIG_ROOT_NFS=y 888CONFIG_ROOT_NFS=y
877CONFIG_LOCKD=y 889CONFIG_LOCKD=y
878CONFIG_LOCKD_V4=y 890CONFIG_LOCKD_V4=y
891CONFIG_NFS_ACL_SUPPORT=y
892CONFIG_NFS_COMMON=y
879CONFIG_SUNRPC=y 893CONFIG_SUNRPC=y
880CONFIG_SUNRPC_GSS=y 894CONFIG_SUNRPC_GSS=y
881CONFIG_RPCSEC_GSS_KRB5=y 895CONFIG_RPCSEC_GSS_KRB5=y
diff --git a/arch/ppc64/configs/pSeries_defconfig b/arch/ppc64/configs/pSeries_defconfig
index d0db8b5966c0..5112edf18181 100644
--- a/arch/ppc64/configs/pSeries_defconfig
+++ b/arch/ppc64/configs/pSeries_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.12-rc6 3# Linux kernel version: 2.6.13-rc3
4# Tue Jun 14 17:13:47 2005 4# Wed Jul 13 14:47:54 2005
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -74,13 +74,17 @@ CONFIG_SYSVIPC_COMPAT=y
74# CONFIG_PPC_ISERIES is not set 74# CONFIG_PPC_ISERIES is not set
75CONFIG_PPC_MULTIPLATFORM=y 75CONFIG_PPC_MULTIPLATFORM=y
76CONFIG_PPC_PSERIES=y 76CONFIG_PPC_PSERIES=y
77# CONFIG_PPC_BPA is not set
77# CONFIG_PPC_PMAC is not set 78# CONFIG_PPC_PMAC is not set
78# CONFIG_PPC_MAPLE is not set 79# CONFIG_PPC_MAPLE is not set
79CONFIG_PPC=y 80CONFIG_PPC=y
80CONFIG_PPC64=y 81CONFIG_PPC64=y
81CONFIG_PPC_OF=y 82CONFIG_PPC_OF=y
83CONFIG_XICS=y
84CONFIG_MPIC=y
82CONFIG_ALTIVEC=y 85CONFIG_ALTIVEC=y
83CONFIG_PPC_SPLPAR=y 86CONFIG_PPC_SPLPAR=y
87CONFIG_KEXEC=y
84CONFIG_IBMVIO=y 88CONFIG_IBMVIO=y
85# CONFIG_U3_DART is not set 89# CONFIG_U3_DART is not set
86# CONFIG_BOOTX_TEXT is not set 90# CONFIG_BOOTX_TEXT is not set
@@ -88,10 +92,30 @@ CONFIG_IBMVIO=y
88CONFIG_IOMMU_VMERGE=y 92CONFIG_IOMMU_VMERGE=y
89CONFIG_SMP=y 93CONFIG_SMP=y
90CONFIG_NR_CPUS=128 94CONFIG_NR_CPUS=128
95CONFIG_ARCH_SELECT_MEMORY_MODEL=y
96CONFIG_ARCH_FLATMEM_ENABLE=y
91CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 97CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
98CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
99CONFIG_ARCH_SPARSEMEM_ENABLE=y
100CONFIG_SELECT_MEMORY_MODEL=y
101# CONFIG_FLATMEM_MANUAL is not set
102CONFIG_DISCONTIGMEM_MANUAL=y
103# CONFIG_SPARSEMEM_MANUAL is not set
104CONFIG_DISCONTIGMEM=y
105CONFIG_FLAT_NODE_MEM_MAP=y
106CONFIG_NEED_MULTIPLE_NODES=y
107CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
108CONFIG_NODES_SPAN_OTHER_NODES=y
92CONFIG_NUMA=y 109CONFIG_NUMA=y
93CONFIG_SCHED_SMT=y 110CONFIG_SCHED_SMT=y
111CONFIG_PREEMPT_NONE=y
112# CONFIG_PREEMPT_VOLUNTARY is not set
94# CONFIG_PREEMPT is not set 113# CONFIG_PREEMPT is not set
114# CONFIG_PREEMPT_BKL is not set
115CONFIG_HZ_100=y
116# CONFIG_HZ_250 is not set
117# CONFIG_HZ_1000 is not set
118CONFIG_HZ=100
95CONFIG_EEH=y 119CONFIG_EEH=y
96CONFIG_GENERIC_HARDIRQS=y 120CONFIG_GENERIC_HARDIRQS=y
97CONFIG_PPC_RTAS=y 121CONFIG_PPC_RTAS=y
@@ -132,6 +156,146 @@ CONFIG_PROC_DEVICETREE=y
132# CONFIG_CMDLINE_BOOL is not set 156# CONFIG_CMDLINE_BOOL is not set
133 157
134# 158#
159# Networking
160#
161CONFIG_NET=y
162
163#
164# Networking options
165#
166CONFIG_PACKET=y
167# CONFIG_PACKET_MMAP is not set
168CONFIG_UNIX=y
169CONFIG_XFRM=y
170CONFIG_XFRM_USER=m
171CONFIG_NET_KEY=m
172CONFIG_INET=y
173CONFIG_IP_MULTICAST=y
174# CONFIG_IP_ADVANCED_ROUTER is not set
175CONFIG_IP_FIB_HASH=y
176# CONFIG_IP_PNP is not set
177CONFIG_NET_IPIP=y
178# CONFIG_NET_IPGRE is not set
179# CONFIG_IP_MROUTE is not set
180# CONFIG_ARPD is not set
181CONFIG_SYN_COOKIES=y
182CONFIG_INET_AH=m
183CONFIG_INET_ESP=m
184CONFIG_INET_IPCOMP=m
185CONFIG_INET_TUNNEL=y
186CONFIG_IP_TCPDIAG=m
187# CONFIG_IP_TCPDIAG_IPV6 is not set
188# CONFIG_TCP_CONG_ADVANCED is not set
189CONFIG_TCP_CONG_BIC=y
190
191#
192# IP: Virtual Server Configuration
193#
194# CONFIG_IP_VS is not set
195# CONFIG_IPV6 is not set
196CONFIG_NETFILTER=y
197# CONFIG_NETFILTER_DEBUG is not set
198
199#
200# IP: Netfilter Configuration
201#
202CONFIG_IP_NF_CONNTRACK=m
203CONFIG_IP_NF_CT_ACCT=y
204CONFIG_IP_NF_CONNTRACK_MARK=y
205CONFIG_IP_NF_CT_PROTO_SCTP=m
206CONFIG_IP_NF_FTP=m
207CONFIG_IP_NF_IRC=m
208CONFIG_IP_NF_TFTP=m
209CONFIG_IP_NF_AMANDA=m
210CONFIG_IP_NF_QUEUE=m
211CONFIG_IP_NF_IPTABLES=m
212CONFIG_IP_NF_MATCH_LIMIT=m
213CONFIG_IP_NF_MATCH_IPRANGE=m
214CONFIG_IP_NF_MATCH_MAC=m
215CONFIG_IP_NF_MATCH_PKTTYPE=m
216CONFIG_IP_NF_MATCH_MARK=m
217CONFIG_IP_NF_MATCH_MULTIPORT=m
218CONFIG_IP_NF_MATCH_TOS=m
219CONFIG_IP_NF_MATCH_RECENT=m
220CONFIG_IP_NF_MATCH_ECN=m
221CONFIG_IP_NF_MATCH_DSCP=m
222CONFIG_IP_NF_MATCH_AH_ESP=m
223CONFIG_IP_NF_MATCH_LENGTH=m
224CONFIG_IP_NF_MATCH_TTL=m
225CONFIG_IP_NF_MATCH_TCPMSS=m
226CONFIG_IP_NF_MATCH_HELPER=m
227CONFIG_IP_NF_MATCH_STATE=m
228CONFIG_IP_NF_MATCH_CONNTRACK=m
229CONFIG_IP_NF_MATCH_OWNER=m
230CONFIG_IP_NF_MATCH_ADDRTYPE=m
231CONFIG_IP_NF_MATCH_REALM=m
232CONFIG_IP_NF_MATCH_SCTP=m
233CONFIG_IP_NF_MATCH_COMMENT=m
234CONFIG_IP_NF_MATCH_CONNMARK=m
235CONFIG_IP_NF_MATCH_HASHLIMIT=m
236CONFIG_IP_NF_FILTER=m
237CONFIG_IP_NF_TARGET_REJECT=m
238CONFIG_IP_NF_TARGET_LOG=m
239CONFIG_IP_NF_TARGET_ULOG=m
240CONFIG_IP_NF_TARGET_TCPMSS=m
241CONFIG_IP_NF_NAT=m
242CONFIG_IP_NF_NAT_NEEDED=y
243CONFIG_IP_NF_TARGET_MASQUERADE=m
244CONFIG_IP_NF_TARGET_REDIRECT=m
245CONFIG_IP_NF_TARGET_NETMAP=m
246CONFIG_IP_NF_TARGET_SAME=m
247CONFIG_IP_NF_NAT_SNMP_BASIC=m
248CONFIG_IP_NF_NAT_IRC=m
249CONFIG_IP_NF_NAT_FTP=m
250CONFIG_IP_NF_NAT_TFTP=m
251CONFIG_IP_NF_NAT_AMANDA=m
252CONFIG_IP_NF_MANGLE=m
253CONFIG_IP_NF_TARGET_TOS=m
254CONFIG_IP_NF_TARGET_ECN=m
255CONFIG_IP_NF_TARGET_DSCP=m
256CONFIG_IP_NF_TARGET_MARK=m
257CONFIG_IP_NF_TARGET_CLASSIFY=m
258CONFIG_IP_NF_TARGET_CONNMARK=m
259CONFIG_IP_NF_TARGET_CLUSTERIP=m
260CONFIG_IP_NF_RAW=m
261CONFIG_IP_NF_TARGET_NOTRACK=m
262CONFIG_IP_NF_ARPTABLES=m
263CONFIG_IP_NF_ARPFILTER=m
264CONFIG_IP_NF_ARP_MANGLE=m
265
266#
267# SCTP Configuration (EXPERIMENTAL)
268#
269# CONFIG_IP_SCTP is not set
270# CONFIG_ATM is not set
271# CONFIG_BRIDGE is not set
272# CONFIG_VLAN_8021Q is not set
273# CONFIG_DECNET is not set
274CONFIG_LLC=y
275# CONFIG_LLC2 is not set
276# CONFIG_IPX is not set
277# CONFIG_ATALK is not set
278# CONFIG_X25 is not set
279# CONFIG_LAPB is not set
280# CONFIG_NET_DIVERT is not set
281# CONFIG_ECONET is not set
282# CONFIG_WAN_ROUTER is not set
283# CONFIG_NET_SCHED is not set
284CONFIG_NET_CLS_ROUTE=y
285
286#
287# Network testing
288#
289# CONFIG_NET_PKTGEN is not set
290CONFIG_NETPOLL=y
291CONFIG_NETPOLL_RX=y
292CONFIG_NETPOLL_TRAP=y
293CONFIG_NET_POLL_CONTROLLER=y
294# CONFIG_HAMRADIO is not set
295# CONFIG_IRDA is not set
296# CONFIG_BT is not set
297
298#
135# Device Drivers 299# Device Drivers
136# 300#
137 301
@@ -238,6 +402,7 @@ CONFIG_BLK_DEV_AMD74XX=y
238# CONFIG_BLK_DEV_HPT366 is not set 402# CONFIG_BLK_DEV_HPT366 is not set
239# CONFIG_BLK_DEV_SC1200 is not set 403# CONFIG_BLK_DEV_SC1200 is not set
240# CONFIG_BLK_DEV_PIIX is not set 404# CONFIG_BLK_DEV_PIIX is not set
405# CONFIG_BLK_DEV_IT821X is not set
241# CONFIG_BLK_DEV_NS87415 is not set 406# CONFIG_BLK_DEV_NS87415 is not set
242# CONFIG_BLK_DEV_PDC202XX_OLD is not set 407# CONFIG_BLK_DEV_PDC202XX_OLD is not set
243# CONFIG_BLK_DEV_PDC202XX_NEW is not set 408# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -267,6 +432,7 @@ CONFIG_CHR_DEV_ST=y
267CONFIG_BLK_DEV_SR=y 432CONFIG_BLK_DEV_SR=y
268CONFIG_BLK_DEV_SR_VENDOR=y 433CONFIG_BLK_DEV_SR_VENDOR=y
269CONFIG_CHR_DEV_SG=y 434CONFIG_CHR_DEV_SG=y
435# CONFIG_CHR_DEV_SCH is not set
270 436
271# 437#
272# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 438# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -352,6 +518,8 @@ CONFIG_DM_MULTIPATH_EMC=m
352# Fusion MPT device support 518# Fusion MPT device support
353# 519#
354# CONFIG_FUSION is not set 520# CONFIG_FUSION is not set
521# CONFIG_FUSION_SPI is not set
522# CONFIG_FUSION_FC is not set
355 523
356# 524#
357# IEEE 1394 (FireWire) support 525# IEEE 1394 (FireWire) support
@@ -368,145 +536,8 @@ CONFIG_DM_MULTIPATH_EMC=m
368# 536#
369 537
370# 538#
371# Networking support 539# Network device support
372#
373CONFIG_NET=y
374
375#
376# Networking options
377# 540#
378CONFIG_PACKET=y
379# CONFIG_PACKET_MMAP is not set
380CONFIG_UNIX=y
381CONFIG_NET_KEY=m
382CONFIG_INET=y
383CONFIG_IP_MULTICAST=y
384# CONFIG_IP_ADVANCED_ROUTER is not set
385# CONFIG_IP_PNP is not set
386CONFIG_NET_IPIP=y
387# CONFIG_NET_IPGRE is not set
388# CONFIG_IP_MROUTE is not set
389# CONFIG_ARPD is not set
390CONFIG_SYN_COOKIES=y
391CONFIG_INET_AH=m
392CONFIG_INET_ESP=m
393CONFIG_INET_IPCOMP=m
394CONFIG_INET_TUNNEL=y
395CONFIG_IP_TCPDIAG=m
396# CONFIG_IP_TCPDIAG_IPV6 is not set
397
398#
399# IP: Virtual Server Configuration
400#
401# CONFIG_IP_VS is not set
402# CONFIG_IPV6 is not set
403CONFIG_NETFILTER=y
404# CONFIG_NETFILTER_DEBUG is not set
405
406#
407# IP: Netfilter Configuration
408#
409CONFIG_IP_NF_CONNTRACK=m
410CONFIG_IP_NF_CT_ACCT=y
411CONFIG_IP_NF_CONNTRACK_MARK=y
412CONFIG_IP_NF_CT_PROTO_SCTP=m
413CONFIG_IP_NF_FTP=m
414CONFIG_IP_NF_IRC=m
415CONFIG_IP_NF_TFTP=m
416CONFIG_IP_NF_AMANDA=m
417CONFIG_IP_NF_QUEUE=m
418CONFIG_IP_NF_IPTABLES=m
419CONFIG_IP_NF_MATCH_LIMIT=m
420CONFIG_IP_NF_MATCH_IPRANGE=m
421CONFIG_IP_NF_MATCH_MAC=m
422CONFIG_IP_NF_MATCH_PKTTYPE=m
423CONFIG_IP_NF_MATCH_MARK=m
424CONFIG_IP_NF_MATCH_MULTIPORT=m
425CONFIG_IP_NF_MATCH_TOS=m
426CONFIG_IP_NF_MATCH_RECENT=m
427CONFIG_IP_NF_MATCH_ECN=m
428CONFIG_IP_NF_MATCH_DSCP=m
429CONFIG_IP_NF_MATCH_AH_ESP=m
430CONFIG_IP_NF_MATCH_LENGTH=m
431CONFIG_IP_NF_MATCH_TTL=m
432CONFIG_IP_NF_MATCH_TCPMSS=m
433CONFIG_IP_NF_MATCH_HELPER=m
434CONFIG_IP_NF_MATCH_STATE=m
435CONFIG_IP_NF_MATCH_CONNTRACK=m
436CONFIG_IP_NF_MATCH_OWNER=m
437CONFIG_IP_NF_MATCH_ADDRTYPE=m
438CONFIG_IP_NF_MATCH_REALM=m
439CONFIG_IP_NF_MATCH_SCTP=m
440CONFIG_IP_NF_MATCH_COMMENT=m
441CONFIG_IP_NF_MATCH_CONNMARK=m
442CONFIG_IP_NF_MATCH_HASHLIMIT=m
443CONFIG_IP_NF_FILTER=m
444CONFIG_IP_NF_TARGET_REJECT=m
445CONFIG_IP_NF_TARGET_LOG=m
446CONFIG_IP_NF_TARGET_ULOG=m
447CONFIG_IP_NF_TARGET_TCPMSS=m
448CONFIG_IP_NF_NAT=m
449CONFIG_IP_NF_NAT_NEEDED=y
450CONFIG_IP_NF_TARGET_MASQUERADE=m
451CONFIG_IP_NF_TARGET_REDIRECT=m
452CONFIG_IP_NF_TARGET_NETMAP=m
453CONFIG_IP_NF_TARGET_SAME=m
454CONFIG_IP_NF_NAT_SNMP_BASIC=m
455CONFIG_IP_NF_NAT_IRC=m
456CONFIG_IP_NF_NAT_FTP=m
457CONFIG_IP_NF_NAT_TFTP=m
458CONFIG_IP_NF_NAT_AMANDA=m
459CONFIG_IP_NF_MANGLE=m
460CONFIG_IP_NF_TARGET_TOS=m
461CONFIG_IP_NF_TARGET_ECN=m
462CONFIG_IP_NF_TARGET_DSCP=m
463CONFIG_IP_NF_TARGET_MARK=m
464CONFIG_IP_NF_TARGET_CLASSIFY=m
465CONFIG_IP_NF_TARGET_CONNMARK=m
466CONFIG_IP_NF_TARGET_CLUSTERIP=m
467CONFIG_IP_NF_RAW=m
468CONFIG_IP_NF_TARGET_NOTRACK=m
469CONFIG_IP_NF_ARPTABLES=m
470CONFIG_IP_NF_ARPFILTER=m
471CONFIG_IP_NF_ARP_MANGLE=m
472CONFIG_XFRM=y
473CONFIG_XFRM_USER=m
474
475#
476# SCTP Configuration (EXPERIMENTAL)
477#
478# CONFIG_IP_SCTP is not set
479# CONFIG_ATM is not set
480# CONFIG_BRIDGE is not set
481# CONFIG_VLAN_8021Q is not set
482# CONFIG_DECNET is not set
483CONFIG_LLC=y
484# CONFIG_LLC2 is not set
485# CONFIG_IPX is not set
486# CONFIG_ATALK is not set
487# CONFIG_X25 is not set
488# CONFIG_LAPB is not set
489# CONFIG_NET_DIVERT is not set
490# CONFIG_ECONET is not set
491# CONFIG_WAN_ROUTER is not set
492
493#
494# QoS and/or fair queueing
495#
496# CONFIG_NET_SCHED is not set
497CONFIG_NET_CLS_ROUTE=y
498
499#
500# Network testing
501#
502# CONFIG_NET_PKTGEN is not set
503CONFIG_NETPOLL=y
504CONFIG_NETPOLL_RX=y
505CONFIG_NETPOLL_TRAP=y
506CONFIG_NET_POLL_CONTROLLER=y
507# CONFIG_HAMRADIO is not set
508# CONFIG_IRDA is not set
509# CONFIG_BT is not set
510CONFIG_NETDEVICES=y 541CONFIG_NETDEVICES=y
511CONFIG_DUMMY=m 542CONFIG_DUMMY=m
512CONFIG_BONDING=m 543CONFIG_BONDING=m
@@ -566,6 +597,7 @@ CONFIG_E1000=y
566# CONFIG_HAMACHI is not set 597# CONFIG_HAMACHI is not set
567# CONFIG_YELLOWFIN is not set 598# CONFIG_YELLOWFIN is not set
568# CONFIG_R8169 is not set 599# CONFIG_R8169 is not set
600# CONFIG_SKGE is not set
569# CONFIG_SK98LIN is not set 601# CONFIG_SK98LIN is not set
570# CONFIG_VIA_VELOCITY is not set 602# CONFIG_VIA_VELOCITY is not set
571CONFIG_TIGON3=y 603CONFIG_TIGON3=y
@@ -772,50 +804,19 @@ CONFIG_I2C_ALGOBIT=y
772# CONFIG_I2C_VIAPRO is not set 804# CONFIG_I2C_VIAPRO is not set
773# CONFIG_I2C_VOODOO3 is not set 805# CONFIG_I2C_VOODOO3 is not set
774# CONFIG_I2C_PCA_ISA is not set 806# CONFIG_I2C_PCA_ISA is not set
807# CONFIG_I2C_SENSOR is not set
775 808
776# 809#
777# Hardware Sensors Chip support 810# Miscellaneous I2C Chip support
778#
779# CONFIG_I2C_SENSOR is not set
780# CONFIG_SENSORS_ADM1021 is not set
781# CONFIG_SENSORS_ADM1025 is not set
782# CONFIG_SENSORS_ADM1026 is not set
783# CONFIG_SENSORS_ADM1031 is not set
784# CONFIG_SENSORS_ASB100 is not set
785# CONFIG_SENSORS_DS1621 is not set
786# CONFIG_SENSORS_FSCHER is not set
787# CONFIG_SENSORS_FSCPOS is not set
788# CONFIG_SENSORS_GL518SM is not set
789# CONFIG_SENSORS_GL520SM is not set
790# CONFIG_SENSORS_IT87 is not set
791# CONFIG_SENSORS_LM63 is not set
792# CONFIG_SENSORS_LM75 is not set
793# CONFIG_SENSORS_LM77 is not set
794# CONFIG_SENSORS_LM78 is not set
795# CONFIG_SENSORS_LM80 is not set
796# CONFIG_SENSORS_LM83 is not set
797# CONFIG_SENSORS_LM85 is not set
798# CONFIG_SENSORS_LM87 is not set
799# CONFIG_SENSORS_LM90 is not set
800# CONFIG_SENSORS_LM92 is not set
801# CONFIG_SENSORS_MAX1619 is not set
802# CONFIG_SENSORS_PC87360 is not set
803# CONFIG_SENSORS_SMSC47B397 is not set
804# CONFIG_SENSORS_SIS5595 is not set
805# CONFIG_SENSORS_SMSC47M1 is not set
806# CONFIG_SENSORS_VIA686A is not set
807# CONFIG_SENSORS_W83781D is not set
808# CONFIG_SENSORS_W83L785TS is not set
809# CONFIG_SENSORS_W83627HF is not set
810
811#
812# Other I2C Chip support
813# 811#
814# CONFIG_SENSORS_DS1337 is not set 812# CONFIG_SENSORS_DS1337 is not set
813# CONFIG_SENSORS_DS1374 is not set
815# CONFIG_SENSORS_EEPROM is not set 814# CONFIG_SENSORS_EEPROM is not set
816# CONFIG_SENSORS_PCF8574 is not set 815# CONFIG_SENSORS_PCF8574 is not set
816# CONFIG_SENSORS_PCA9539 is not set
817# CONFIG_SENSORS_PCF8591 is not set 817# CONFIG_SENSORS_PCF8591 is not set
818# CONFIG_SENSORS_RTC8564 is not set 818# CONFIG_SENSORS_RTC8564 is not set
819# CONFIG_SENSORS_MAX6875 is not set
819# CONFIG_I2C_DEBUG_CORE is not set 820# CONFIG_I2C_DEBUG_CORE is not set
820# CONFIG_I2C_DEBUG_ALGO is not set 821# CONFIG_I2C_DEBUG_ALGO is not set
821# CONFIG_I2C_DEBUG_BUS is not set 822# CONFIG_I2C_DEBUG_BUS is not set
@@ -827,6 +828,11 @@ CONFIG_I2C_ALGOBIT=y
827# CONFIG_W1 is not set 828# CONFIG_W1 is not set
828 829
829# 830#
831# Hardware Monitoring support
832#
833# CONFIG_HWMON is not set
834
835#
830# Misc devices 836# Misc devices
831# 837#
832 838
@@ -933,6 +939,7 @@ CONFIG_USB_DEVICEFS=y
933CONFIG_USB_EHCI_HCD=y 939CONFIG_USB_EHCI_HCD=y
934# CONFIG_USB_EHCI_SPLIT_ISO is not set 940# CONFIG_USB_EHCI_SPLIT_ISO is not set
935# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 941# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
942# CONFIG_USB_ISP116X_HCD is not set
936CONFIG_USB_OHCI_HCD=y 943CONFIG_USB_OHCI_HCD=y
937# CONFIG_USB_OHCI_BIG_ENDIAN is not set 944# CONFIG_USB_OHCI_BIG_ENDIAN is not set
938CONFIG_USB_OHCI_LITTLE_ENDIAN=y 945CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -969,12 +976,15 @@ CONFIG_USB_HIDINPUT=y
969CONFIG_USB_HIDDEV=y 976CONFIG_USB_HIDDEV=y
970# CONFIG_USB_AIPTEK is not set 977# CONFIG_USB_AIPTEK is not set
971# CONFIG_USB_WACOM is not set 978# CONFIG_USB_WACOM is not set
979# CONFIG_USB_ACECAD is not set
972# CONFIG_USB_KBTAB is not set 980# CONFIG_USB_KBTAB is not set
973# CONFIG_USB_POWERMATE is not set 981# CONFIG_USB_POWERMATE is not set
974# CONFIG_USB_MTOUCH is not set 982# CONFIG_USB_MTOUCH is not set
983# CONFIG_USB_ITMTOUCH is not set
975# CONFIG_USB_EGALAX is not set 984# CONFIG_USB_EGALAX is not set
976# CONFIG_USB_XPAD is not set 985# CONFIG_USB_XPAD is not set
977# CONFIG_USB_ATI_REMOTE is not set 986# CONFIG_USB_ATI_REMOTE is not set
987# CONFIG_USB_KEYSPAN_REMOTE is not set
978 988
979# 989#
980# USB Imaging devices 990# USB Imaging devices
@@ -1026,10 +1036,11 @@ CONFIG_USB_MON=y
1026# CONFIG_USB_PHIDGETSERVO is not set 1036# CONFIG_USB_PHIDGETSERVO is not set
1027# CONFIG_USB_IDMOUSE is not set 1037# CONFIG_USB_IDMOUSE is not set
1028# CONFIG_USB_SISUSBVGA is not set 1038# CONFIG_USB_SISUSBVGA is not set
1039# CONFIG_USB_LD is not set
1029# CONFIG_USB_TEST is not set 1040# CONFIG_USB_TEST is not set
1030 1041
1031# 1042#
1032# USB ATM/DSL drivers 1043# USB DSL modem support
1033# 1044#
1034 1045
1035# 1046#
@@ -1046,18 +1057,25 @@ CONFIG_USB_MON=y
1046# InfiniBand support 1057# InfiniBand support
1047# 1058#
1048CONFIG_INFINIBAND=m 1059CONFIG_INFINIBAND=m
1060CONFIG_INFINIBAND_USER_VERBS=m
1049CONFIG_INFINIBAND_MTHCA=m 1061CONFIG_INFINIBAND_MTHCA=m
1050# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1062# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
1051CONFIG_INFINIBAND_IPOIB=m 1063CONFIG_INFINIBAND_IPOIB=m
1052# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1064# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
1053 1065
1054# 1066#
1067# SN Devices
1068#
1069
1070#
1055# File systems 1071# File systems
1056# 1072#
1057CONFIG_EXT2_FS=y 1073CONFIG_EXT2_FS=y
1058CONFIG_EXT2_FS_XATTR=y 1074CONFIG_EXT2_FS_XATTR=y
1059CONFIG_EXT2_FS_POSIX_ACL=y 1075CONFIG_EXT2_FS_POSIX_ACL=y
1060CONFIG_EXT2_FS_SECURITY=y 1076CONFIG_EXT2_FS_SECURITY=y
1077CONFIG_EXT2_FS_XIP=y
1078CONFIG_FS_XIP=y
1061CONFIG_EXT3_FS=y 1079CONFIG_EXT3_FS=y
1062CONFIG_EXT3_FS_XATTR=y 1080CONFIG_EXT3_FS_XATTR=y
1063CONFIG_EXT3_FS_POSIX_ACL=y 1081CONFIG_EXT3_FS_POSIX_ACL=y
@@ -1089,6 +1107,7 @@ CONFIG_XFS_SECURITY=y
1089CONFIG_XFS_POSIX_ACL=y 1107CONFIG_XFS_POSIX_ACL=y
1090# CONFIG_MINIX_FS is not set 1108# CONFIG_MINIX_FS is not set
1091# CONFIG_ROMFS_FS is not set 1109# CONFIG_ROMFS_FS is not set
1110CONFIG_INOTIFY=y
1092# CONFIG_QUOTA is not set 1111# CONFIG_QUOTA is not set
1093CONFIG_DNOTIFY=y 1112CONFIG_DNOTIFY=y
1094CONFIG_AUTOFS_FS=m 1113CONFIG_AUTOFS_FS=m
@@ -1120,7 +1139,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1120CONFIG_PROC_FS=y 1139CONFIG_PROC_FS=y
1121CONFIG_PROC_KCORE=y 1140CONFIG_PROC_KCORE=y
1122CONFIG_SYSFS=y 1141CONFIG_SYSFS=y
1123# CONFIG_DEVFS_FS is not set
1124CONFIG_DEVPTS_FS_XATTR=y 1142CONFIG_DEVPTS_FS_XATTR=y
1125CONFIG_DEVPTS_FS_SECURITY=y 1143CONFIG_DEVPTS_FS_SECURITY=y
1126CONFIG_TMPFS=y 1144CONFIG_TMPFS=y
@@ -1152,15 +1170,20 @@ CONFIG_CRAMFS=y
1152# 1170#
1153CONFIG_NFS_FS=y 1171CONFIG_NFS_FS=y
1154CONFIG_NFS_V3=y 1172CONFIG_NFS_V3=y
1173CONFIG_NFS_V3_ACL=y
1155CONFIG_NFS_V4=y 1174CONFIG_NFS_V4=y
1156# CONFIG_NFS_DIRECTIO is not set 1175# CONFIG_NFS_DIRECTIO is not set
1157CONFIG_NFSD=y 1176CONFIG_NFSD=y
1177CONFIG_NFSD_V2_ACL=y
1158CONFIG_NFSD_V3=y 1178CONFIG_NFSD_V3=y
1179CONFIG_NFSD_V3_ACL=y
1159CONFIG_NFSD_V4=y 1180CONFIG_NFSD_V4=y
1160CONFIG_NFSD_TCP=y 1181CONFIG_NFSD_TCP=y
1161CONFIG_LOCKD=y 1182CONFIG_LOCKD=y
1162CONFIG_LOCKD_V4=y 1183CONFIG_LOCKD_V4=y
1163CONFIG_EXPORTFS=y 1184CONFIG_EXPORTFS=y
1185CONFIG_NFS_ACL_SUPPORT=y
1186CONFIG_NFS_COMMON=y
1164CONFIG_SUNRPC=y 1187CONFIG_SUNRPC=y
1165CONFIG_SUNRPC_GSS=y 1188CONFIG_SUNRPC_GSS=y
1166CONFIG_RPCSEC_GSS_KRB5=y 1189CONFIG_RPCSEC_GSS_KRB5=y
diff --git a/arch/ppc64/defconfig b/arch/ppc64/defconfig
index b8e2066dde77..fbf1f427ad35 100644
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/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.12-rc5-git9 3# Linux kernel version: 2.6.13-rc3
4# Sun Jun 5 09:26:47 2005 4# Wed Jul 13 14:37:07 2005
5# 5#
6CONFIG_64BIT=y 6CONFIG_64BIT=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -73,13 +73,18 @@ CONFIG_SYSVIPC_COMPAT=y
73# CONFIG_PPC_ISERIES is not set 73# CONFIG_PPC_ISERIES is not set
74CONFIG_PPC_MULTIPLATFORM=y 74CONFIG_PPC_MULTIPLATFORM=y
75CONFIG_PPC_PSERIES=y 75CONFIG_PPC_PSERIES=y
76CONFIG_PPC_BPA=y
76CONFIG_PPC_PMAC=y 77CONFIG_PPC_PMAC=y
77CONFIG_PPC_MAPLE=y 78CONFIG_PPC_MAPLE=y
78CONFIG_PPC=y 79CONFIG_PPC=y
79CONFIG_PPC64=y 80CONFIG_PPC64=y
80CONFIG_PPC_OF=y 81CONFIG_PPC_OF=y
82CONFIG_XICS=y
83CONFIG_MPIC=y
84CONFIG_BPA_IIC=y
81CONFIG_ALTIVEC=y 85CONFIG_ALTIVEC=y
82CONFIG_PPC_SPLPAR=y 86CONFIG_PPC_SPLPAR=y
87CONFIG_KEXEC=y
83CONFIG_IBMVIO=y 88CONFIG_IBMVIO=y
84CONFIG_U3_DART=y 89CONFIG_U3_DART=y
85CONFIG_MPIC_BROKEN_U3=y 90CONFIG_MPIC_BROKEN_U3=y
@@ -89,10 +94,30 @@ CONFIG_BOOTX_TEXT=y
89CONFIG_IOMMU_VMERGE=y 94CONFIG_IOMMU_VMERGE=y
90CONFIG_SMP=y 95CONFIG_SMP=y
91CONFIG_NR_CPUS=32 96CONFIG_NR_CPUS=32
97CONFIG_ARCH_SELECT_MEMORY_MODEL=y
98CONFIG_ARCH_FLATMEM_ENABLE=y
92CONFIG_ARCH_DISCONTIGMEM_ENABLE=y 99CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
100CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
101CONFIG_ARCH_SPARSEMEM_ENABLE=y
102CONFIG_SELECT_MEMORY_MODEL=y
103# CONFIG_FLATMEM_MANUAL is not set
104CONFIG_DISCONTIGMEM_MANUAL=y
105# CONFIG_SPARSEMEM_MANUAL is not set
106CONFIG_DISCONTIGMEM=y
107CONFIG_FLAT_NODE_MEM_MAP=y
108CONFIG_NEED_MULTIPLE_NODES=y
109CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
110CONFIG_NODES_SPAN_OTHER_NODES=y
93# CONFIG_NUMA is not set 111# CONFIG_NUMA is not set
94# CONFIG_SCHED_SMT is not set 112# CONFIG_SCHED_SMT is not set
113CONFIG_PREEMPT_NONE=y
114# CONFIG_PREEMPT_VOLUNTARY is not set
95# CONFIG_PREEMPT is not set 115# CONFIG_PREEMPT is not set
116# CONFIG_PREEMPT_BKL is not set
117CONFIG_HZ_100=y
118# CONFIG_HZ_250 is not set
119# CONFIG_HZ_1000 is not set
120CONFIG_HZ=100
96CONFIG_EEH=y 121CONFIG_EEH=y
97CONFIG_GENERIC_HARDIRQS=y 122CONFIG_GENERIC_HARDIRQS=y
98CONFIG_PPC_RTAS=y 123CONFIG_PPC_RTAS=y
@@ -133,6 +158,146 @@ CONFIG_PROC_DEVICETREE=y
133# CONFIG_CMDLINE_BOOL is not set 158# CONFIG_CMDLINE_BOOL is not set
134 159
135# 160#
161# Networking
162#
163CONFIG_NET=y
164
165#
166# Networking options
167#
168CONFIG_PACKET=y
169# CONFIG_PACKET_MMAP is not set
170CONFIG_UNIX=y
171CONFIG_XFRM=y
172CONFIG_XFRM_USER=m
173CONFIG_NET_KEY=m
174CONFIG_INET=y
175CONFIG_IP_MULTICAST=y
176# CONFIG_IP_ADVANCED_ROUTER is not set
177CONFIG_IP_FIB_HASH=y
178# CONFIG_IP_PNP is not set
179CONFIG_NET_IPIP=y
180# CONFIG_NET_IPGRE is not set
181# CONFIG_IP_MROUTE is not set
182# CONFIG_ARPD is not set
183CONFIG_SYN_COOKIES=y
184CONFIG_INET_AH=m
185CONFIG_INET_ESP=m
186CONFIG_INET_IPCOMP=m
187CONFIG_INET_TUNNEL=y
188# CONFIG_IP_TCPDIAG is not set
189# CONFIG_IP_TCPDIAG_IPV6 is not set
190# CONFIG_TCP_CONG_ADVANCED is not set
191CONFIG_TCP_CONG_BIC=y
192
193#
194# IP: Virtual Server Configuration
195#
196# CONFIG_IP_VS is not set
197# CONFIG_IPV6 is not set
198CONFIG_NETFILTER=y
199# CONFIG_NETFILTER_DEBUG is not set
200
201#
202# IP: Netfilter Configuration
203#
204CONFIG_IP_NF_CONNTRACK=m
205CONFIG_IP_NF_CT_ACCT=y
206CONFIG_IP_NF_CONNTRACK_MARK=y
207CONFIG_IP_NF_CT_PROTO_SCTP=m
208CONFIG_IP_NF_FTP=m
209CONFIG_IP_NF_IRC=m
210CONFIG_IP_NF_TFTP=m
211CONFIG_IP_NF_AMANDA=m
212CONFIG_IP_NF_QUEUE=m
213CONFIG_IP_NF_IPTABLES=m
214CONFIG_IP_NF_MATCH_LIMIT=m
215CONFIG_IP_NF_MATCH_IPRANGE=m
216CONFIG_IP_NF_MATCH_MAC=m
217CONFIG_IP_NF_MATCH_PKTTYPE=m
218CONFIG_IP_NF_MATCH_MARK=m
219CONFIG_IP_NF_MATCH_MULTIPORT=m
220CONFIG_IP_NF_MATCH_TOS=m
221CONFIG_IP_NF_MATCH_RECENT=m
222CONFIG_IP_NF_MATCH_ECN=m
223CONFIG_IP_NF_MATCH_DSCP=m
224CONFIG_IP_NF_MATCH_AH_ESP=m
225CONFIG_IP_NF_MATCH_LENGTH=m
226CONFIG_IP_NF_MATCH_TTL=m
227CONFIG_IP_NF_MATCH_TCPMSS=m
228CONFIG_IP_NF_MATCH_HELPER=m
229CONFIG_IP_NF_MATCH_STATE=m
230CONFIG_IP_NF_MATCH_CONNTRACK=m
231CONFIG_IP_NF_MATCH_OWNER=m
232CONFIG_IP_NF_MATCH_ADDRTYPE=m
233CONFIG_IP_NF_MATCH_REALM=m
234CONFIG_IP_NF_MATCH_SCTP=m
235CONFIG_IP_NF_MATCH_COMMENT=m
236CONFIG_IP_NF_MATCH_CONNMARK=m
237CONFIG_IP_NF_MATCH_HASHLIMIT=m
238CONFIG_IP_NF_FILTER=m
239CONFIG_IP_NF_TARGET_REJECT=m
240CONFIG_IP_NF_TARGET_LOG=m
241CONFIG_IP_NF_TARGET_ULOG=m
242CONFIG_IP_NF_TARGET_TCPMSS=m
243CONFIG_IP_NF_NAT=m
244CONFIG_IP_NF_NAT_NEEDED=y
245CONFIG_IP_NF_TARGET_MASQUERADE=m
246CONFIG_IP_NF_TARGET_REDIRECT=m
247CONFIG_IP_NF_TARGET_NETMAP=m
248CONFIG_IP_NF_TARGET_SAME=m
249CONFIG_IP_NF_NAT_SNMP_BASIC=m
250CONFIG_IP_NF_NAT_IRC=m
251CONFIG_IP_NF_NAT_FTP=m
252CONFIG_IP_NF_NAT_TFTP=m
253CONFIG_IP_NF_NAT_AMANDA=m
254CONFIG_IP_NF_MANGLE=m
255CONFIG_IP_NF_TARGET_TOS=m
256CONFIG_IP_NF_TARGET_ECN=m
257CONFIG_IP_NF_TARGET_DSCP=m
258CONFIG_IP_NF_TARGET_MARK=m
259CONFIG_IP_NF_TARGET_CLASSIFY=m
260CONFIG_IP_NF_TARGET_CONNMARK=m
261CONFIG_IP_NF_TARGET_CLUSTERIP=m
262CONFIG_IP_NF_RAW=m
263CONFIG_IP_NF_TARGET_NOTRACK=m
264CONFIG_IP_NF_ARPTABLES=m
265CONFIG_IP_NF_ARPFILTER=m
266CONFIG_IP_NF_ARP_MANGLE=m
267
268#
269# SCTP Configuration (EXPERIMENTAL)
270#
271# CONFIG_IP_SCTP is not set
272# CONFIG_ATM is not set
273# CONFIG_BRIDGE is not set
274# CONFIG_VLAN_8021Q is not set
275# CONFIG_DECNET is not set
276CONFIG_LLC=y
277# CONFIG_LLC2 is not set
278# CONFIG_IPX is not set
279# CONFIG_ATALK is not set
280# CONFIG_X25 is not set
281# CONFIG_LAPB is not set
282# CONFIG_NET_DIVERT is not set
283# CONFIG_ECONET is not set
284# CONFIG_WAN_ROUTER is not set
285# CONFIG_NET_SCHED is not set
286CONFIG_NET_CLS_ROUTE=y
287
288#
289# Network testing
290#
291# CONFIG_NET_PKTGEN is not set
292CONFIG_NETPOLL=y
293CONFIG_NETPOLL_RX=y
294CONFIG_NETPOLL_TRAP=y
295CONFIG_NET_POLL_CONTROLLER=y
296# CONFIG_HAMRADIO is not set
297# CONFIG_IRDA is not set
298# CONFIG_BT is not set
299
300#
136# Device Drivers 301# Device Drivers
137# 302#
138 303
@@ -239,6 +404,7 @@ CONFIG_BLK_DEV_AMD74XX=y
239# CONFIG_BLK_DEV_HPT366 is not set 404# CONFIG_BLK_DEV_HPT366 is not set
240# CONFIG_BLK_DEV_SC1200 is not set 405# CONFIG_BLK_DEV_SC1200 is not set
241# CONFIG_BLK_DEV_PIIX is not set 406# CONFIG_BLK_DEV_PIIX is not set
407# CONFIG_BLK_DEV_IT821X is not set
242# CONFIG_BLK_DEV_NS87415 is not set 408# CONFIG_BLK_DEV_NS87415 is not set
243# CONFIG_BLK_DEV_PDC202XX_OLD is not set 409# CONFIG_BLK_DEV_PDC202XX_OLD is not set
244# CONFIG_BLK_DEV_PDC202XX_NEW is not set 410# CONFIG_BLK_DEV_PDC202XX_NEW is not set
@@ -272,6 +438,7 @@ CONFIG_CHR_DEV_ST=y
272CONFIG_BLK_DEV_SR=y 438CONFIG_BLK_DEV_SR=y
273CONFIG_BLK_DEV_SR_VENDOR=y 439CONFIG_BLK_DEV_SR_VENDOR=y
274CONFIG_CHR_DEV_SG=y 440CONFIG_CHR_DEV_SG=y
441# CONFIG_CHR_DEV_SCH is not set
275 442
276# 443#
277# Some SCSI devices (e.g. CD jukebox) support multiple LUNs 444# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -369,6 +536,8 @@ CONFIG_DM_MULTIPATH_EMC=m
369# Fusion MPT device support 536# Fusion MPT device support
370# 537#
371# CONFIG_FUSION is not set 538# CONFIG_FUSION is not set
539# CONFIG_FUSION_SPI is not set
540# CONFIG_FUSION_FC is not set
372 541
373# 542#
374# IEEE 1394 (FireWire) support 543# IEEE 1394 (FireWire) support
@@ -382,6 +551,7 @@ CONFIG_IEEE1394=y
382# CONFIG_IEEE1394_OUI_DB is not set 551# CONFIG_IEEE1394_OUI_DB is not set
383CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y 552CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
384CONFIG_IEEE1394_CONFIG_ROM_IP1394=y 553CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
554# CONFIG_IEEE1394_EXPORT_FULL_API is not set
385 555
386# 556#
387# Device Drivers 557# Device Drivers
@@ -412,151 +582,13 @@ CONFIG_IEEE1394_AMDTP=m
412CONFIG_ADB=y 582CONFIG_ADB=y
413CONFIG_ADB_PMU=y 583CONFIG_ADB_PMU=y
414CONFIG_PMAC_SMU=y 584CONFIG_PMAC_SMU=y
415# CONFIG_PMAC_PBOOK is not set
416# CONFIG_PMAC_BACKLIGHT is not set 585# CONFIG_PMAC_BACKLIGHT is not set
417# CONFIG_INPUT_ADBHID is not set 586# CONFIG_INPUT_ADBHID is not set
418CONFIG_THERM_PM72=y 587CONFIG_THERM_PM72=y
419 588
420# 589#
421# Networking support 590# Network device support
422#
423CONFIG_NET=y
424
425#
426# Networking options
427# 591#
428CONFIG_PACKET=y
429# CONFIG_PACKET_MMAP is not set
430CONFIG_UNIX=y
431CONFIG_NET_KEY=m
432CONFIG_INET=y
433CONFIG_IP_MULTICAST=y
434# CONFIG_IP_ADVANCED_ROUTER is not set
435# CONFIG_IP_PNP is not set
436CONFIG_NET_IPIP=y
437# CONFIG_NET_IPGRE is not set
438# CONFIG_IP_MROUTE is not set
439# CONFIG_ARPD is not set
440CONFIG_SYN_COOKIES=y
441CONFIG_INET_AH=m
442CONFIG_INET_ESP=m
443CONFIG_INET_IPCOMP=m
444CONFIG_INET_TUNNEL=y
445# CONFIG_IP_TCPDIAG is not set
446# CONFIG_IP_TCPDIAG_IPV6 is not set
447
448#
449# IP: Virtual Server Configuration
450#
451# CONFIG_IP_VS is not set
452# CONFIG_IPV6 is not set
453CONFIG_NETFILTER=y
454# CONFIG_NETFILTER_DEBUG is not set
455
456#
457# IP: Netfilter Configuration
458#
459CONFIG_IP_NF_CONNTRACK=m
460CONFIG_IP_NF_CT_ACCT=y
461CONFIG_IP_NF_CONNTRACK_MARK=y
462CONFIG_IP_NF_CT_PROTO_SCTP=m
463CONFIG_IP_NF_FTP=m
464CONFIG_IP_NF_IRC=m
465CONFIG_IP_NF_TFTP=m
466CONFIG_IP_NF_AMANDA=m
467CONFIG_IP_NF_QUEUE=m
468CONFIG_IP_NF_IPTABLES=m
469CONFIG_IP_NF_MATCH_LIMIT=m
470CONFIG_IP_NF_MATCH_IPRANGE=m
471CONFIG_IP_NF_MATCH_MAC=m
472CONFIG_IP_NF_MATCH_PKTTYPE=m
473CONFIG_IP_NF_MATCH_MARK=m
474CONFIG_IP_NF_MATCH_MULTIPORT=m
475CONFIG_IP_NF_MATCH_TOS=m
476CONFIG_IP_NF_MATCH_RECENT=m
477CONFIG_IP_NF_MATCH_ECN=m
478CONFIG_IP_NF_MATCH_DSCP=m
479CONFIG_IP_NF_MATCH_AH_ESP=m
480CONFIG_IP_NF_MATCH_LENGTH=m
481CONFIG_IP_NF_MATCH_TTL=m
482CONFIG_IP_NF_MATCH_TCPMSS=m
483CONFIG_IP_NF_MATCH_HELPER=m
484CONFIG_IP_NF_MATCH_STATE=m
485CONFIG_IP_NF_MATCH_CONNTRACK=m
486CONFIG_IP_NF_MATCH_OWNER=m
487CONFIG_IP_NF_MATCH_ADDRTYPE=m
488CONFIG_IP_NF_MATCH_REALM=m
489CONFIG_IP_NF_MATCH_SCTP=m
490CONFIG_IP_NF_MATCH_COMMENT=m
491CONFIG_IP_NF_MATCH_CONNMARK=m
492CONFIG_IP_NF_MATCH_HASHLIMIT=m
493CONFIG_IP_NF_FILTER=m
494CONFIG_IP_NF_TARGET_REJECT=m
495CONFIG_IP_NF_TARGET_LOG=m
496CONFIG_IP_NF_TARGET_ULOG=m
497CONFIG_IP_NF_TARGET_TCPMSS=m
498CONFIG_IP_NF_NAT=m
499CONFIG_IP_NF_NAT_NEEDED=y
500CONFIG_IP_NF_TARGET_MASQUERADE=m
501CONFIG_IP_NF_TARGET_REDIRECT=m
502CONFIG_IP_NF_TARGET_NETMAP=m
503CONFIG_IP_NF_TARGET_SAME=m
504CONFIG_IP_NF_NAT_SNMP_BASIC=m
505CONFIG_IP_NF_NAT_IRC=m
506CONFIG_IP_NF_NAT_FTP=m
507CONFIG_IP_NF_NAT_TFTP=m
508CONFIG_IP_NF_NAT_AMANDA=m
509CONFIG_IP_NF_MANGLE=m
510CONFIG_IP_NF_TARGET_TOS=m
511CONFIG_IP_NF_TARGET_ECN=m
512CONFIG_IP_NF_TARGET_DSCP=m
513CONFIG_IP_NF_TARGET_MARK=m
514CONFIG_IP_NF_TARGET_CLASSIFY=m
515CONFIG_IP_NF_TARGET_CONNMARK=m
516CONFIG_IP_NF_TARGET_CLUSTERIP=m
517CONFIG_IP_NF_RAW=m
518CONFIG_IP_NF_TARGET_NOTRACK=m
519CONFIG_IP_NF_ARPTABLES=m
520CONFIG_IP_NF_ARPFILTER=m
521CONFIG_IP_NF_ARP_MANGLE=m
522CONFIG_XFRM=y
523CONFIG_XFRM_USER=m
524
525#
526# SCTP Configuration (EXPERIMENTAL)
527#
528# CONFIG_IP_SCTP is not set
529# CONFIG_ATM is not set
530# CONFIG_BRIDGE is not set
531# CONFIG_VLAN_8021Q is not set
532# CONFIG_DECNET is not set
533CONFIG_LLC=y
534# CONFIG_LLC2 is not set
535# CONFIG_IPX is not set
536# CONFIG_ATALK is not set
537# CONFIG_X25 is not set
538# CONFIG_LAPB is not set
539# CONFIG_NET_DIVERT is not set
540# CONFIG_ECONET is not set
541# CONFIG_WAN_ROUTER is not set
542
543#
544# QoS and/or fair queueing
545#
546# CONFIG_NET_SCHED is not set
547CONFIG_NET_CLS_ROUTE=y
548
549#
550# Network testing
551#
552# CONFIG_NET_PKTGEN is not set
553CONFIG_NETPOLL=y
554CONFIG_NETPOLL_RX=y
555CONFIG_NETPOLL_TRAP=y
556CONFIG_NET_POLL_CONTROLLER=y
557# CONFIG_HAMRADIO is not set
558# CONFIG_IRDA is not set
559# CONFIG_BT is not set
560CONFIG_NETDEVICES=y 592CONFIG_NETDEVICES=y
561CONFIG_DUMMY=m 593CONFIG_DUMMY=m
562CONFIG_BONDING=m 594CONFIG_BONDING=m
@@ -616,6 +648,7 @@ CONFIG_E1000=y
616# CONFIG_HAMACHI is not set 648# CONFIG_HAMACHI is not set
617# CONFIG_YELLOWFIN is not set 649# CONFIG_YELLOWFIN is not set
618# CONFIG_R8169 is not set 650# CONFIG_R8169 is not set
651# CONFIG_SKGE is not set
619# CONFIG_SK98LIN is not set 652# CONFIG_SK98LIN is not set
620# CONFIG_VIA_VELOCITY is not set 653# CONFIG_VIA_VELOCITY is not set
621CONFIG_TIGON3=y 654CONFIG_TIGON3=y
@@ -823,50 +856,19 @@ CONFIG_I2C_KEYWEST=y
823# CONFIG_I2C_VIAPRO is not set 856# CONFIG_I2C_VIAPRO is not set
824# CONFIG_I2C_VOODOO3 is not set 857# CONFIG_I2C_VOODOO3 is not set
825# CONFIG_I2C_PCA_ISA is not set 858# CONFIG_I2C_PCA_ISA is not set
859# CONFIG_I2C_SENSOR is not set
826 860
827# 861#
828# Hardware Sensors Chip support 862# Miscellaneous I2C Chip support
829#
830# CONFIG_I2C_SENSOR is not set
831# CONFIG_SENSORS_ADM1021 is not set
832# CONFIG_SENSORS_ADM1025 is not set
833# CONFIG_SENSORS_ADM1026 is not set
834# CONFIG_SENSORS_ADM1031 is not set
835# CONFIG_SENSORS_ASB100 is not set
836# CONFIG_SENSORS_DS1621 is not set
837# CONFIG_SENSORS_FSCHER is not set
838# CONFIG_SENSORS_FSCPOS is not set
839# CONFIG_SENSORS_GL518SM is not set
840# CONFIG_SENSORS_GL520SM is not set
841# CONFIG_SENSORS_IT87 is not set
842# CONFIG_SENSORS_LM63 is not set
843# CONFIG_SENSORS_LM75 is not set
844# CONFIG_SENSORS_LM77 is not set
845# CONFIG_SENSORS_LM78 is not set
846# CONFIG_SENSORS_LM80 is not set
847# CONFIG_SENSORS_LM83 is not set
848# CONFIG_SENSORS_LM85 is not set
849# CONFIG_SENSORS_LM87 is not set
850# CONFIG_SENSORS_LM90 is not set
851# CONFIG_SENSORS_LM92 is not set
852# CONFIG_SENSORS_MAX1619 is not set
853# CONFIG_SENSORS_PC87360 is not set
854# CONFIG_SENSORS_SMSC47B397 is not set
855# CONFIG_SENSORS_SIS5595 is not set
856# CONFIG_SENSORS_SMSC47M1 is not set
857# CONFIG_SENSORS_VIA686A is not set
858# CONFIG_SENSORS_W83781D is not set
859# CONFIG_SENSORS_W83L785TS is not set
860# CONFIG_SENSORS_W83627HF is not set
861
862#
863# Other I2C Chip support
864# 863#
865# CONFIG_SENSORS_DS1337 is not set 864# CONFIG_SENSORS_DS1337 is not set
865# CONFIG_SENSORS_DS1374 is not set
866# CONFIG_SENSORS_EEPROM is not set 866# CONFIG_SENSORS_EEPROM is not set
867# CONFIG_SENSORS_PCF8574 is not set 867# CONFIG_SENSORS_PCF8574 is not set
868# CONFIG_SENSORS_PCA9539 is not set
868# CONFIG_SENSORS_PCF8591 is not set 869# CONFIG_SENSORS_PCF8591 is not set
869# CONFIG_SENSORS_RTC8564 is not set 870# CONFIG_SENSORS_RTC8564 is not set
871# CONFIG_SENSORS_MAX6875 is not set
870# CONFIG_I2C_DEBUG_CORE is not set 872# CONFIG_I2C_DEBUG_CORE is not set
871# CONFIG_I2C_DEBUG_ALGO is not set 873# CONFIG_I2C_DEBUG_ALGO is not set
872# CONFIG_I2C_DEBUG_BUS is not set 874# CONFIG_I2C_DEBUG_BUS is not set
@@ -878,6 +880,11 @@ CONFIG_I2C_KEYWEST=y
878# CONFIG_W1 is not set 880# CONFIG_W1 is not set
879 881
880# 882#
883# Hardware Monitoring support
884#
885# CONFIG_HWMON is not set
886
887#
881# Misc devices 888# Misc devices
882# 889#
883 890
@@ -988,6 +995,7 @@ CONFIG_USB_DEVICEFS=y
988CONFIG_USB_EHCI_HCD=y 995CONFIG_USB_EHCI_HCD=y
989# CONFIG_USB_EHCI_SPLIT_ISO is not set 996# CONFIG_USB_EHCI_SPLIT_ISO is not set
990# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 997# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
998# CONFIG_USB_ISP116X_HCD is not set
991CONFIG_USB_OHCI_HCD=y 999CONFIG_USB_OHCI_HCD=y
992# CONFIG_USB_OHCI_BIG_ENDIAN is not set 1000# CONFIG_USB_OHCI_BIG_ENDIAN is not set
993CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1001CONFIG_USB_OHCI_LITTLE_ENDIAN=y
@@ -1024,12 +1032,15 @@ CONFIG_USB_HIDINPUT=y
1024CONFIG_USB_HIDDEV=y 1032CONFIG_USB_HIDDEV=y
1025# CONFIG_USB_AIPTEK is not set 1033# CONFIG_USB_AIPTEK is not set
1026# CONFIG_USB_WACOM is not set 1034# CONFIG_USB_WACOM is not set
1035# CONFIG_USB_ACECAD is not set
1027# CONFIG_USB_KBTAB is not set 1036# CONFIG_USB_KBTAB is not set
1028# CONFIG_USB_POWERMATE is not set 1037# CONFIG_USB_POWERMATE is not set
1029# CONFIG_USB_MTOUCH is not set 1038# CONFIG_USB_MTOUCH is not set
1039# CONFIG_USB_ITMTOUCH is not set
1030# CONFIG_USB_EGALAX is not set 1040# CONFIG_USB_EGALAX is not set
1031# CONFIG_USB_XPAD is not set 1041# CONFIG_USB_XPAD is not set
1032# CONFIG_USB_ATI_REMOTE is not set 1042# CONFIG_USB_ATI_REMOTE is not set
1043# CONFIG_USB_KEYSPAN_REMOTE is not set
1033 1044
1034# 1045#
1035# USB Imaging devices 1046# USB Imaging devices
@@ -1081,10 +1092,11 @@ CONFIG_USB_PEGASUS=y
1081# CONFIG_USB_PHIDGETSERVO is not set 1092# CONFIG_USB_PHIDGETSERVO is not set
1082# CONFIG_USB_IDMOUSE is not set 1093# CONFIG_USB_IDMOUSE is not set
1083# CONFIG_USB_SISUSBVGA is not set 1094# CONFIG_USB_SISUSBVGA is not set
1095# CONFIG_USB_LD is not set
1084# CONFIG_USB_TEST is not set 1096# CONFIG_USB_TEST is not set
1085 1097
1086# 1098#
1087# USB ATM/DSL drivers 1099# USB DSL modem support
1088# 1100#
1089 1101
1090# 1102#
@@ -1101,18 +1113,25 @@ CONFIG_USB_PEGASUS=y
1101# InfiniBand support 1113# InfiniBand support
1102# 1114#
1103CONFIG_INFINIBAND=m 1115CONFIG_INFINIBAND=m
1116CONFIG_INFINIBAND_USER_VERBS=m
1104CONFIG_INFINIBAND_MTHCA=m 1117CONFIG_INFINIBAND_MTHCA=m
1105# CONFIG_INFINIBAND_MTHCA_DEBUG is not set 1118# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
1106CONFIG_INFINIBAND_IPOIB=m 1119CONFIG_INFINIBAND_IPOIB=m
1107# CONFIG_INFINIBAND_IPOIB_DEBUG is not set 1120# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
1108 1121
1109# 1122#
1123# SN Devices
1124#
1125
1126#
1110# File systems 1127# File systems
1111# 1128#
1112CONFIG_EXT2_FS=y 1129CONFIG_EXT2_FS=y
1113CONFIG_EXT2_FS_XATTR=y 1130CONFIG_EXT2_FS_XATTR=y
1114CONFIG_EXT2_FS_POSIX_ACL=y 1131CONFIG_EXT2_FS_POSIX_ACL=y
1115CONFIG_EXT2_FS_SECURITY=y 1132CONFIG_EXT2_FS_SECURITY=y
1133CONFIG_EXT2_FS_XIP=y
1134CONFIG_FS_XIP=y
1116CONFIG_EXT3_FS=y 1135CONFIG_EXT3_FS=y
1117CONFIG_EXT3_FS_XATTR=y 1136CONFIG_EXT3_FS_XATTR=y
1118CONFIG_EXT3_FS_POSIX_ACL=y 1137CONFIG_EXT3_FS_POSIX_ACL=y
@@ -1144,6 +1163,7 @@ CONFIG_XFS_SECURITY=y
1144CONFIG_XFS_POSIX_ACL=y 1163CONFIG_XFS_POSIX_ACL=y
1145# CONFIG_MINIX_FS is not set 1164# CONFIG_MINIX_FS is not set
1146# CONFIG_ROMFS_FS is not set 1165# CONFIG_ROMFS_FS is not set
1166CONFIG_INOTIFY=y
1147# CONFIG_QUOTA is not set 1167# CONFIG_QUOTA is not set
1148CONFIG_DNOTIFY=y 1168CONFIG_DNOTIFY=y
1149CONFIG_AUTOFS_FS=y 1169CONFIG_AUTOFS_FS=y
@@ -1174,7 +1194,6 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1174CONFIG_PROC_FS=y 1194CONFIG_PROC_FS=y
1175CONFIG_PROC_KCORE=y 1195CONFIG_PROC_KCORE=y
1176CONFIG_SYSFS=y 1196CONFIG_SYSFS=y
1177# CONFIG_DEVFS_FS is not set
1178CONFIG_DEVPTS_FS_XATTR=y 1197CONFIG_DEVPTS_FS_XATTR=y
1179CONFIG_DEVPTS_FS_SECURITY=y 1198CONFIG_DEVPTS_FS_SECURITY=y
1180CONFIG_TMPFS=y 1199CONFIG_TMPFS=y
@@ -1206,15 +1225,20 @@ CONFIG_CRAMFS=y
1206# 1225#
1207CONFIG_NFS_FS=y 1226CONFIG_NFS_FS=y
1208CONFIG_NFS_V3=y 1227CONFIG_NFS_V3=y
1228CONFIG_NFS_V3_ACL=y
1209CONFIG_NFS_V4=y 1229CONFIG_NFS_V4=y
1210# CONFIG_NFS_DIRECTIO is not set 1230# CONFIG_NFS_DIRECTIO is not set
1211CONFIG_NFSD=m 1231CONFIG_NFSD=m
1232CONFIG_NFSD_V2_ACL=y
1212CONFIG_NFSD_V3=y 1233CONFIG_NFSD_V3=y
1234CONFIG_NFSD_V3_ACL=y
1213CONFIG_NFSD_V4=y 1235CONFIG_NFSD_V4=y
1214CONFIG_NFSD_TCP=y 1236CONFIG_NFSD_TCP=y
1215CONFIG_LOCKD=y 1237CONFIG_LOCKD=y
1216CONFIG_LOCKD_V4=y 1238CONFIG_LOCKD_V4=y
1217CONFIG_EXPORTFS=m 1239CONFIG_EXPORTFS=m
1240CONFIG_NFS_ACL_SUPPORT=y
1241CONFIG_NFS_COMMON=y
1218CONFIG_SUNRPC=y 1242CONFIG_SUNRPC=y
1219CONFIG_SUNRPC_GSS=y 1243CONFIG_SUNRPC_GSS=y
1220CONFIG_RPCSEC_GSS_KRB5=y 1244CONFIG_RPCSEC_GSS_KRB5=y