switch over x86 to 2.6.22-rc4

[openwrt.git] / target / linux / x86-2.6 / config / default

diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default
index bde3242..5e40307 100644 (file)
--- a/target/linux/x86-2.6/config/default
+++ b/target/linux/x86-2.6/config/default
@@ -25,7 +25,7 @@ CONFIG_ATA=m
 # CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_PIIX=m
-# CONFIG_B44 is not set
+# CONFIG_ATM_DRIVERS is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
@@ -100,7 +100,6 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
 # CONFIG_HIGH_RES_TIMERS is not set
@@ -116,10 +115,6 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_GEODE=y
 # CONFIG_HW_RANDOM_INTEL is not set
 CONFIG_HW_RANDOM_VIA=y
-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
 CONFIG_I2C=m
 CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_CHARDEV=m
@@ -140,6 +135,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y
 # CONFIG_IDE_CHIPSETS is not set
 CONFIG_IDE_GENERIC=y
 CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_IDE_PROC_FS is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
@@ -150,15 +146,12 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
 # CONFIG_IP_NF_SET_IPPORTHASH is not set
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ITCO_WDT is not set
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_KEXEC is not set
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
@@ -178,7 +171,7 @@ CONFIG_M486=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
 # CONFIG_MATH_EMULATION is not set
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
@@ -193,10 +186,17 @@ CONFIG_M486=y
 # CONFIG_MK6 is not set
 # CONFIG_MK7 is not set
 # CONFIG_MK8 is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
 # CONFIG_MOUSE_PC110PAD is not set
 CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LIFEBOOK is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
 # CONFIG_MPENTIUM4 is not set
@@ -242,6 +242,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_TS5500 is not set
 # CONFIG_MTRR is not set
 # CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
 # CONFIG_MWAVE is not set
 # CONFIG_MWINCHIP2 is not set
 # CONFIG_MWINCHIP3D is not set
@@ -254,17 +255,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_NET_VENDOR_3COM=y
 # CONFIG_NET_VENDOR_RACAL is not set
 # CONFIG_NET_VENDOR_SMC is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NF_NAT_AMANDA is not set
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-CONFIG_NF_NAT_SIP=m
-# CONFIG_NF_NAT_TFTP is not set
+CONFIG_NETDEV_1000=y
 CONFIG_NOHIGHMEM=y
 # CONFIG_NO_HZ is not set
 CONFIG_NSC_GPIO=m
@@ -292,7 +283,6 @@ CONFIG_PCMCIA_PROBE=y
 # CONFIG_PDC_ADMA is not set
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x100000
-# CONFIG_PM is not set
 CONFIG_PNP=y
 # CONFIG_PNPACPI is not set
 # CONFIG_PNPBIOS is not set
@@ -317,6 +307,8 @@ CONFIG_SCx200_I2C_SDA=13
 CONFIG_SCx200_WDT=m
 # CONFIG_SECCOMP is not set
 CONFIG_SEMAPHORE_SLEEPERS=y
+# CONFIG_SENSORS_APPLESMC is not set
+# CONFIG_SENSORS_CORETEMP is not set
 CONFIG_SENSORS_PC87360=m
 # CONFIG_SERIAL_8250_CS is not set
 # CONFIG_SERIAL_8250_EXTENDED is not set
@@ -348,12 +340,10 @@ CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_SPLIT_ISO=y
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 # CONFIG_USB_GTCO is not set
-# CONFIG_USB_KC2190 is not set
 # CONFIG_USB_NET_DM9601 is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_SERIAL_DEBUG is not set
 # CONFIG_USB_STORAGE_ISD200 is not set
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_VGACON_SOFT_SCROLLBACK is not set
@@ -365,6 +355,7 @@ CONFIG_VIA_RHINE_NAPI=y
 # CONFIG_VM86 is not set
 # CONFIG_VMSPLIT_1G is not set
 # CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_2G_OPT is not set
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 CONFIG_VORTEX=m
@@ -417,5 +408,3 @@ CONFIG_X86_PPRO_FENCE=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
 CONFIG_X86_WP_WORKS_OK=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1