netfilter: move iptable_raw, xt_NOTRACK from conntrack-extra to conntrack

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

diff --git a/target/linux/pxa/config-default b/target/linux/pxa/config-default
index 74491ee..8ac9943 100644 (file)
--- a/target/linux/pxa/config-default
+++ b/target/linux/pxa/config-default
@@ -45,7 +45,6 @@ CONFIG_BT_GUMSTIX=m
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_CIFS is not set
 CONFIG_CMDLINE="console=ttyS0,115200n8"
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_CIFS is not set
 CONFIG_CMDLINE="console=ttyS0,115200n8"

-# CONFIG_CONFIGFS_FS is not set

 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y


@@ -56,7 +55,6 @@ CONFIG_CPU_CP15_MMU=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPU_TLB_V4WBI=y
 CONFIG_CPU_XSCALE=y

-# CONFIG_CRC16 is not set

 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DM9000 is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DM9000 is not set


@@ -153,7 +151,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_MACH_TRIZEPS4 is not set
 # CONFIG_MACH_LOGICPD_PXA270 is not set
 # CONFIG_MACH_MAINSTONE is not set
 # CONFIG_MACH_TRIZEPS4 is not set

-# CONFIG_MAC_PARTITION is not set

 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
 CONFIG_MMC=y
 CONFIG_MII=m
 # CONFIG_MINIX_FS is not set
 CONFIG_MMC=y


@@ -222,8 +219,6 @@ CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 # CONFIG_SND_USB_AUDIO is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096

-# CONFIG_SWAP is not set
-# CONFIG_SYN_COOKIES is not set

 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TINY_SHMEM=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_TINY_SHMEM=y