diff options
author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /arch/ia64/configs/tiger_defconfig | |
parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) |
Merge from-linus to-akpm
Diffstat (limited to 'arch/ia64/configs/tiger_defconfig')
-rw-r--r-- | arch/ia64/configs/tiger_defconfig | 149 |
1 files changed, 81 insertions, 68 deletions
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 73454eee26f1..c853cfcd2d11 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc1-20050629 | 3 | # Linux kernel version: 2.6.13-rc6-tiger-smp |
4 | # Wed Jun 29 15:28:12 2005 | 4 | # Wed Aug 17 10:19:51 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -132,6 +132,7 @@ CONFIG_ACPI_BOOT=y | |||
132 | CONFIG_ACPI_INTERPRETER=y | 132 | CONFIG_ACPI_INTERPRETER=y |
133 | CONFIG_ACPI_BUTTON=m | 133 | CONFIG_ACPI_BUTTON=m |
134 | # CONFIG_ACPI_VIDEO is not set | 134 | # CONFIG_ACPI_VIDEO is not set |
135 | # CONFIG_ACPI_HOTKEY is not set | ||
135 | CONFIG_ACPI_FAN=m | 136 | CONFIG_ACPI_FAN=m |
136 | CONFIG_ACPI_PROCESSOR=m | 137 | CONFIG_ACPI_PROCESSOR=m |
137 | # CONFIG_ACPI_HOTPLUG_CPU is not set | 138 | # CONFIG_ACPI_HOTPLUG_CPU is not set |
@@ -170,6 +171,66 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
170 | # CONFIG_PCCARD is not set | 171 | # CONFIG_PCCARD is not set |
171 | 172 | ||
172 | # | 173 | # |
174 | # Networking | ||
175 | # | ||
176 | CONFIG_NET=y | ||
177 | |||
178 | # | ||
179 | # Networking options | ||
180 | # | ||
181 | CONFIG_PACKET=y | ||
182 | # CONFIG_PACKET_MMAP is not set | ||
183 | CONFIG_UNIX=y | ||
184 | # CONFIG_NET_KEY is not set | ||
185 | CONFIG_INET=y | ||
186 | CONFIG_IP_MULTICAST=y | ||
187 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
188 | CONFIG_IP_FIB_HASH=y | ||
189 | # CONFIG_IP_PNP is not set | ||
190 | # CONFIG_NET_IPIP is not set | ||
191 | # CONFIG_NET_IPGRE is not set | ||
192 | # CONFIG_IP_MROUTE is not set | ||
193 | CONFIG_ARPD=y | ||
194 | CONFIG_SYN_COOKIES=y | ||
195 | # CONFIG_INET_AH is not set | ||
196 | # CONFIG_INET_ESP is not set | ||
197 | # CONFIG_INET_IPCOMP is not set | ||
198 | # CONFIG_INET_TUNNEL is not set | ||
199 | CONFIG_IP_TCPDIAG=y | ||
200 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
201 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
202 | CONFIG_TCP_CONG_BIC=y | ||
203 | # CONFIG_IPV6 is not set | ||
204 | # CONFIG_NETFILTER is not set | ||
205 | |||
206 | # | ||
207 | # SCTP Configuration (EXPERIMENTAL) | ||
208 | # | ||
209 | # CONFIG_IP_SCTP is not set | ||
210 | # CONFIG_ATM is not set | ||
211 | # CONFIG_BRIDGE is not set | ||
212 | # CONFIG_VLAN_8021Q is not set | ||
213 | # CONFIG_DECNET is not set | ||
214 | # CONFIG_LLC2 is not set | ||
215 | # CONFIG_IPX is not set | ||
216 | # CONFIG_ATALK is not set | ||
217 | # CONFIG_X25 is not set | ||
218 | # CONFIG_LAPB is not set | ||
219 | # CONFIG_NET_DIVERT is not set | ||
220 | # CONFIG_ECONET is not set | ||
221 | # CONFIG_WAN_ROUTER is not set | ||
222 | # CONFIG_NET_SCHED is not set | ||
223 | # CONFIG_NET_CLS_ROUTE is not set | ||
224 | |||
225 | # | ||
226 | # Network testing | ||
227 | # | ||
228 | # CONFIG_NET_PKTGEN is not set | ||
229 | # CONFIG_HAMRADIO is not set | ||
230 | # CONFIG_IRDA is not set | ||
231 | # CONFIG_BT is not set | ||
232 | |||
233 | # | ||
173 | # Device Drivers | 234 | # Device Drivers |
174 | # | 235 | # |
175 | 236 | ||
@@ -178,7 +239,7 @@ CONFIG_HOTPLUG_PCI_ACPI=m | |||
178 | # | 239 | # |
179 | CONFIG_STANDALONE=y | 240 | CONFIG_STANDALONE=y |
180 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 241 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
181 | # CONFIG_FW_LOADER is not set | 242 | CONFIG_FW_LOADER=m |
182 | # CONFIG_DEBUG_DRIVER is not set | 243 | # CONFIG_DEBUG_DRIVER is not set |
183 | 244 | ||
184 | # | 245 | # |
@@ -348,6 +409,7 @@ CONFIG_SCSI_QLA22XX=m | |||
348 | CONFIG_SCSI_QLA2300=m | 409 | CONFIG_SCSI_QLA2300=m |
349 | CONFIG_SCSI_QLA2322=m | 410 | CONFIG_SCSI_QLA2322=m |
350 | # CONFIG_SCSI_QLA6312 is not set | 411 | # CONFIG_SCSI_QLA6312 is not set |
412 | # CONFIG_SCSI_QLA24XX is not set | ||
351 | # CONFIG_SCSI_LPFC is not set | 413 | # CONFIG_SCSI_LPFC is not set |
352 | # CONFIG_SCSI_DC395x is not set | 414 | # CONFIG_SCSI_DC395x is not set |
353 | # CONFIG_SCSI_DC390T is not set | 415 | # CONFIG_SCSI_DC390T is not set |
@@ -393,72 +455,8 @@ CONFIG_FUSION_CTL=y | |||
393 | # CONFIG_I2O is not set | 455 | # CONFIG_I2O is not set |
394 | 456 | ||
395 | # | 457 | # |
396 | # Networking support | 458 | # Network device support |
397 | # | ||
398 | CONFIG_NET=y | ||
399 | |||
400 | # | ||
401 | # Networking options | ||
402 | # | 459 | # |
403 | CONFIG_PACKET=y | ||
404 | # CONFIG_PACKET_MMAP is not set | ||
405 | CONFIG_UNIX=y | ||
406 | # CONFIG_NET_KEY is not set | ||
407 | CONFIG_INET=y | ||
408 | CONFIG_IP_MULTICAST=y | ||
409 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
410 | CONFIG_IP_FIB_HASH=y | ||
411 | # CONFIG_IP_PNP is not set | ||
412 | # CONFIG_NET_IPIP is not set | ||
413 | # CONFIG_NET_IPGRE is not set | ||
414 | # CONFIG_IP_MROUTE is not set | ||
415 | CONFIG_ARPD=y | ||
416 | CONFIG_SYN_COOKIES=y | ||
417 | # CONFIG_INET_AH is not set | ||
418 | # CONFIG_INET_ESP is not set | ||
419 | # CONFIG_INET_IPCOMP is not set | ||
420 | # CONFIG_INET_TUNNEL is not set | ||
421 | CONFIG_IP_TCPDIAG=y | ||
422 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
423 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
424 | CONFIG_TCP_CONG_BIC=y | ||
425 | # CONFIG_IPV6 is not set | ||
426 | # CONFIG_NETFILTER is not set | ||
427 | |||
428 | # | ||
429 | # SCTP Configuration (EXPERIMENTAL) | ||
430 | # | ||
431 | # CONFIG_IP_SCTP is not set | ||
432 | # CONFIG_ATM is not set | ||
433 | # CONFIG_BRIDGE is not set | ||
434 | # CONFIG_VLAN_8021Q is not set | ||
435 | # CONFIG_DECNET is not set | ||
436 | # CONFIG_LLC2 is not set | ||
437 | # CONFIG_IPX is not set | ||
438 | # CONFIG_ATALK is not set | ||
439 | # CONFIG_X25 is not set | ||
440 | # CONFIG_LAPB is not set | ||
441 | # CONFIG_NET_DIVERT is not set | ||
442 | # CONFIG_ECONET is not set | ||
443 | # CONFIG_WAN_ROUTER is not set | ||
444 | |||
445 | # | ||
446 | # QoS and/or fair queueing | ||
447 | # | ||
448 | # CONFIG_NET_SCHED is not set | ||
449 | # CONFIG_NET_CLS_ROUTE is not set | ||
450 | |||
451 | # | ||
452 | # Network testing | ||
453 | # | ||
454 | # CONFIG_NET_PKTGEN is not set | ||
455 | CONFIG_NETPOLL=y | ||
456 | # CONFIG_NETPOLL_RX is not set | ||
457 | # CONFIG_NETPOLL_TRAP is not set | ||
458 | CONFIG_NET_POLL_CONTROLLER=y | ||
459 | # CONFIG_HAMRADIO is not set | ||
460 | # CONFIG_IRDA is not set | ||
461 | # CONFIG_BT is not set | ||
462 | CONFIG_NETDEVICES=y | 460 | CONFIG_NETDEVICES=y |
463 | CONFIG_DUMMY=m | 461 | CONFIG_DUMMY=m |
464 | # CONFIG_BONDING is not set | 462 | # CONFIG_BONDING is not set |
@@ -555,6 +553,10 @@ CONFIG_TIGON3=y | |||
555 | # CONFIG_NET_FC is not set | 553 | # CONFIG_NET_FC is not set |
556 | # CONFIG_SHAPER is not set | 554 | # CONFIG_SHAPER is not set |
557 | CONFIG_NETCONSOLE=y | 555 | CONFIG_NETCONSOLE=y |
556 | CONFIG_NETPOLL=y | ||
557 | # CONFIG_NETPOLL_RX is not set | ||
558 | # CONFIG_NETPOLL_TRAP is not set | ||
559 | CONFIG_NET_POLL_CONTROLLER=y | ||
558 | 560 | ||
559 | # | 561 | # |
560 | # ISDN subsystem | 562 | # ISDN subsystem |
@@ -680,6 +682,7 @@ CONFIG_DRM_R128=m | |||
680 | CONFIG_DRM_RADEON=m | 682 | CONFIG_DRM_RADEON=m |
681 | CONFIG_DRM_MGA=m | 683 | CONFIG_DRM_MGA=m |
682 | CONFIG_DRM_SIS=m | 684 | CONFIG_DRM_SIS=m |
685 | # CONFIG_DRM_VIA is not set | ||
683 | CONFIG_RAW_DRIVER=m | 686 | CONFIG_RAW_DRIVER=m |
684 | CONFIG_HPET=y | 687 | CONFIG_HPET=y |
685 | # CONFIG_HPET_RTC_IRQ is not set | 688 | # CONFIG_HPET_RTC_IRQ is not set |
@@ -696,6 +699,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
696 | # I2C support | 699 | # I2C support |
697 | # | 700 | # |
698 | # CONFIG_I2C is not set | 701 | # CONFIG_I2C is not set |
702 | # CONFIG_I2C_SENSOR is not set | ||
699 | 703 | ||
700 | # | 704 | # |
701 | # Dallas's 1-wire bus | 705 | # Dallas's 1-wire bus |
@@ -703,6 +707,12 @@ CONFIG_MAX_RAW_DEVS=256 | |||
703 | # CONFIG_W1 is not set | 707 | # CONFIG_W1 is not set |
704 | 708 | ||
705 | # | 709 | # |
710 | # Hardware Monitoring support | ||
711 | # | ||
712 | CONFIG_HWMON=y | ||
713 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
714 | |||
715 | # | ||
706 | # Misc devices | 716 | # Misc devices |
707 | # | 717 | # |
708 | 718 | ||
@@ -800,6 +810,7 @@ CONFIG_USB_HIDINPUT=y | |||
800 | # CONFIG_USB_EGALAX is not set | 810 | # CONFIG_USB_EGALAX is not set |
801 | # CONFIG_USB_XPAD is not set | 811 | # CONFIG_USB_XPAD is not set |
802 | # CONFIG_USB_ATI_REMOTE is not set | 812 | # CONFIG_USB_ATI_REMOTE is not set |
813 | # CONFIG_USB_KEYSPAN_REMOTE is not set | ||
803 | 814 | ||
804 | # | 815 | # |
805 | # USB Imaging devices | 816 | # USB Imaging devices |
@@ -850,6 +861,7 @@ CONFIG_USB_HIDINPUT=y | |||
850 | # CONFIG_USB_PHIDGETSERVO is not set | 861 | # CONFIG_USB_PHIDGETSERVO is not set |
851 | # CONFIG_USB_IDMOUSE is not set | 862 | # CONFIG_USB_IDMOUSE is not set |
852 | # CONFIG_USB_SISUSBVGA is not set | 863 | # CONFIG_USB_SISUSBVGA is not set |
864 | # CONFIG_USB_LD is not set | ||
853 | # CONFIG_USB_TEST is not set | 865 | # CONFIG_USB_TEST is not set |
854 | 866 | ||
855 | # | 867 | # |
@@ -910,6 +922,7 @@ CONFIG_XFS_EXPORT=y | |||
910 | # CONFIG_XFS_POSIX_ACL is not set | 922 | # CONFIG_XFS_POSIX_ACL is not set |
911 | # CONFIG_MINIX_FS is not set | 923 | # CONFIG_MINIX_FS is not set |
912 | # CONFIG_ROMFS_FS is not set | 924 | # CONFIG_ROMFS_FS is not set |
925 | CONFIG_INOTIFY=y | ||
913 | # CONFIG_QUOTA is not set | 926 | # CONFIG_QUOTA is not set |
914 | CONFIG_DNOTIFY=y | 927 | CONFIG_DNOTIFY=y |
915 | CONFIG_AUTOFS_FS=y | 928 | CONFIG_AUTOFS_FS=y |