[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_N...

[openwrt.git] / target / linux / ixp4xx / config-default

diff --git a/target/linux/ixp4xx/config-default b/target/linux/ixp4xx/config-default
index a548e66..46dab9d 100644 (file)
--- a/target/linux/ixp4xx/config-default
+++ b/target/linux/ixp4xx/config-default
@@ -19,12 +19,8 @@ CONFIG_ARM=y
 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set
 CONFIG_ATA=m
 # CONFIG_ARPD is not set
 # CONFIG_ARTHUR is not set
 CONFIG_ATA=m

-# CONFIG_ATA_NONSTANDARD is not set
-# CONFIG_ATA_PIIX is not set
-CONFIG_ATA_SFF=y

 # CONFIG_ATMEL is not set
 # CONFIG_ATM is not set
 # CONFIG_ATMEL is not set
 # CONFIG_ATM is not set

-CONFIG_BASE_SMALL=0

 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set


@@ -49,7 +45,6 @@ CONFIG_CPU_PABRT_NOIFAR=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 CONFIG_CRC16=y

-# CONFIG_DEBUG_BUGVERBOSE is not set

 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
 CONFIG_DLCI=m
 # CONFIG_DEBUG_USER is not set
 CONFIG_DEVPORT=y
 CONFIG_DLCI=m


@@ -183,7 +178,6 @@ CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_IXP4XX=y
 CONFIG_MTD_OTP=y
 CONFIG_MTD_REDBOOT_PARTS=y

-# CONFIG_NATSEMI is not set

 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPIP is not set


@@ -195,17 +189,13 @@ CONFIG_MTD_REDBOOT_PARTS=y
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NLS_ISO8859_1 is not set
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set

-# CONFIG_NVRAM is not set

 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_IXP4XX_CF=m
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_IXP4XX_CF=m

-# CONFIG_PATA_SCH is not set

 # CONFIG_PC300 is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PC300 is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCIPCWATCHDOG is not set

-CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y

 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
 CONFIG_RTC_CLASS=y
 # CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
 CONFIG_RTC_CLASS=y


@@ -225,7 +215,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SMC91X is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_SMC91X is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

-CONFIG_TICK_ONESHOT=y

 CONFIG_UID16=y
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_UID16=y
 CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y