prepare for the transition to linux 2.6.22 - make it possible to override the kernel...

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

diff --git a/target/linux/ar7-2.6/config/default b/target/linux/ar7-2.6/config/default
index 18d62f2..3092078 100644 (file)
--- a/target/linux/ar7-2.6/config/default
+++ b/target/linux/ar7-2.6/config/default
@@ -6,6 +6,7 @@ CONFIG_AR7_GPIO=y
 CONFIG_AR7_WDT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_AR7_WDT=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set

+CONFIG_ATM_DRIVERS=y

 # CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM43XX is not set
 # CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM43XX is not set


@@ -53,6 +54,7 @@ CONFIG_FIXED_MII_100_FDX=y
 CONFIG_FIXED_PHY=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_FIXED_PHY=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y

+CONFIG_GENERIC_GPIO=y

 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_HAS_IOMEM=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 # CONFIG_GEN_RTC is not set
 CONFIG_HAS_IOMEM=y


@@ -62,13 +64,6 @@ CONFIG_HAS_IOPORT=y
 # CONFIG_HOSTAP_PLX is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HOSTAP_PLX is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y

-CONFIG_HZ=100
-CONFIG_HZ_100=y
-# CONFIG_HZ_1024 is not set
-# CONFIG_HZ_128 is not set
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_256 is not set
-# CONFIG_HZ_48 is not set

 # CONFIG_I2C is not set
 # CONFIG_IDE is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_I2C is not set
 # CONFIG_IDE is not set
 # CONFIG_IPW2100 is not set


@@ -79,6 +74,7 @@ CONFIG_JFFS2_FS_DEBUG=0
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_LEDS_AR7=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_LEDS_AR7=y

+# CONFIG_MACH_ALCHEMY is not set

 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set


@@ -165,17 +161,7 @@ CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_NET_PCI is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NET_PCI is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM 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 is not set

 CONFIG_NODES_SHIFT=6
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 CONFIG_NODES_SHIFT=6
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y


@@ -221,5 +207,3 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB is not set

-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1