[generic-2.4] remove nat pptp conntracking patch

[openwrt.git] / target / linux / brcm63xx / config-2.6.27

diff --git a/target/linux/brcm63xx/config-2.6.27 b/target/linux/brcm63xx/config-2.6.27
index fb72aa2..5b3596b 100644 (file)
--- a/target/linux/brcm63xx/config-2.6.27
+++ b/target/linux/brcm63xx/config-2.6.27
@@ -19,12 +19,14 @@ CONFIG_BCM63XX_CPU_6348=y
 CONFIG_BCM63XX_CPU_6358=y
 CONFIG_BCM63XX_ENET=y
 CONFIG_BCM63XX_PHY=y
 CONFIG_BCM63XX_CPU_6358=y
 CONFIG_BCM63XX_ENET=y
 CONFIG_BCM63XX_PHY=y

+CONFIG_BCM63XX_WDT=y

 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_BOARD_BCM963XX=y
 # CONFIG_BOARD_LIVEBOX is not set
 # CONFIG_BSD_DISKLABEL is not set
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BITREVERSE=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_BOARD_BCM963XX=y
 # CONFIG_BOARD_LIVEBOX is not set
 # CONFIG_BSD_DISKLABEL is not set
 CONFIG_BSD_PROCESS_ACCT_V3=y

+CONFIG_CC_OPTIMIZE_FOR_SIZE=y

 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"
 CONFIG_CEVT_R4K=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200"


@@ -59,12 +61,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=y
 CONFIG_CSRC_R4K=y
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=y
 CONFIG_CSRC_R4K=y

-CONFIG_DEFAULT_BIC=y
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-CONFIG_DEFAULT_TCP_CONG="bic"
-# CONFIG_DEFAULT_VEGAS is not set

 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y


@@ -81,6 +77,7 @@ CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVICE=y
 # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVICE=y

+CONFIG_GPIO_SYSFS=y

 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 # CONFIG_HAMRADIO is not set
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y


@@ -106,16 +103,13 @@ CONFIG_HZ_250=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y

-CONFIG_IOSCHED_CFQ=y
-# CONFIG_IOSCHED_DEADLINE is not set
-CONFIG_IP_MROUTE=y

 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IRQ_CPU=y
 # CONFIG_ISDN is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 CONFIG_IRQ_CPU=y
 # CONFIG_ISDN is not set

-CONFIG_KMOD=y
+CONFIG_KEXEC=y

 CONFIG_LBD=y
 CONFIG_LBD=y

-# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_GPIO=y

 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEMOTE_FULONG is not set
 # CONFIG_MACH_ALCHEMY is not set


@@ -124,11 +118,11 @@ CONFIG_LBD=y
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set

-# CONFIG_MAC_PARTITION is not set

 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MIKROTIK_RB532 is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_COBALT is not set

+# CONFIG_MIPS_FPU_EMU is not set

 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_MIPS_MACHINE is not set
 # CONFIG_MIPS_MALTA is not set


@@ -153,10 +147,6 @@ CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 # CONFIG_NATSEMI is not set
 # CONFIG_NO_IOPORT is not set
 CONFIG_PAGEFLAGS_EXTENDED=y

-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set

 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCSPKR_PLATFORM is not set
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCSPKR_PLATFORM is not set


@@ -203,17 +193,14 @@ CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TC35815 is not set
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 # CONFIG_TC35815 is not set

-CONFIG_TCP_CONG_BIC=y
-# CONFIG_TCP_CONG_VEGAS is not set

 CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y

-# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
 CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VM_EVENT_COUNTERS=y

-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG_NOWAYOUT=y

 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_ZONE_DMA_FLAG=0