generic-2.6: refresh patches

[openwrt.git] / target / linux / generic-2.4 / config-default

diff --git a/target/linux/generic-2.4/config-default b/target/linux/generic-2.4/config-default
index a087bb9..c5348ca 100644 (file)
--- a/target/linux/generic-2.4/config-default
+++ b/target/linux/generic-2.4/config-default
@@ -176,12 +176,17 @@ CONFIG_HOTPLUG=y
 CONFIG_IMQ=m
 # CONFIG_INET_ECN is not set
 CONFIG_INET=y
+# CONFIG_INPUT is not set
+# CONFIG_INPUT_DB9 is not set
 # CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_GAMECON is not set
 # CONFIG_INPUT_GAMEPORT is not set
-# CONFIG_INPUT is not set
+# CONFIG_INPUT_IFORCE_USB is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_KEYBDEV is not set
 # CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_SERIO is not set
+# CONFIG_INPUT_TURBOGRAFX is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_INTERMEZZO_FS is not set
 CONFIG_IP6_NF_FILTER=m
@@ -203,6 +208,7 @@ CONFIG_IP6_NF_MATCH_OWNER=m
 CONFIG_IP6_NF_MATCH_RANDOM=m
 # CONFIG_IP6_NF_MATCH_RT is not set
 # CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_TARGET_IMQ=m
 CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_TARGET_MARK=m
@@ -237,6 +243,7 @@ CONFIG_IP_NF_MATCH_CONDITION=m
 CONFIG_IP_NF_MATCH_CONNBYTES=m
 CONFIG_IP_NF_MATCH_CONNMARK=m
 CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_COMMENT=m
 CONFIG_IP_NF_MATCH_DSCP=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_HELPER=m
@@ -277,6 +284,7 @@ CONFIG_IP_NF_NAT_SNMP_BASIC=m
 CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_RAW=m
 CONFIG_IP_NF_RTSP=m
 CONFIG_IP_NF_SET_HASHSIZE=1024
 CONFIG_IP_NF_SET_IPHASH=m
@@ -297,6 +305,7 @@ CONFIG_IP_NF_TARGET_MARK=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
 CONFIG_IP_NF_TARGET_MIRROR=m
 CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_NOTRACK=m
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_SET=m
@@ -406,7 +415,7 @@ CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BOSPORUS is not set
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_CFI_B1 is not set
+CONFIG_MTD_CFI_B1=y
 CONFIG_MTD_CFI_B2=y
 # CONFIG_MTD_CFI_B4 is not set
 # CONFIG_MTD_CFI_B8 is not set
@@ -568,6 +577,20 @@ CONFIG_NONCOHERENT_IO=y
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_RW is not set
 # CONFIG_NVRAM is not set
+# CONFIG_OCF_BENCH is not set
+# CONFIG_OCF_C7108 is not set
+# CONFIG_OCF_CRYPTODEV is not set
+# CONFIG_OCF_CRYPTOSOFT is not set
+# CONFIG_OCF_EP80579 is not set
+# CONFIG_OCF_FIPS is not set
+# CONFIG_OCF_HIFN is not set
+# CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_OCF is not set
+# CONFIG_OCF_OCFNULL is not set
+# CONFIG_OCF_PASEMI is not set
+# CONFIG_OCF_RANDOMHARVEST is not set
+# CONFIG_OCF_SAFE is not set
+# CONFIG_OCF_TALITOS is not set
 # CONFIG_OLIVETTI_M700 is not set
 # CONFIG_OOM_KILLER is not set
 # CONFIG_OSF_PARTITION is not set
@@ -592,7 +615,7 @@ CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_FILTER=y
 CONFIG_PPP=m
 CONFIG_PPP_MPPE_MPPC=m
-# CONFIG_PPP_MULTILINK is not set
+CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=m
 CONFIG_PPP_SYNC_TTY=m
 # CONFIG_PRISM54 is not set