[kernel] fix possible NULL pointer dereference in sock_sendpage()

[openwrt/svn-archive/archive.git] / target / linux / rb532 / config-2.6.23

diff --git a/target/linux/rb532/config-2.6.23 b/target/linux/rb532/config-2.6.23
index ab7dc3e3fd65eb996d5fb361a474576d5fe4918f..1dcf83680cf39f4e90d0727de79662e928aaaf14 100644 (file)
--- a/target/linux/rb532/config-2.6.23
+++ b/target/linux/rb532/config-2.6.23
@@ -39,7 +39,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYPTO_HW is not set
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -52,6 +51,7 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
@@ -61,6 +61,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=y
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_IRQ_CPU=y
+CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_LKKBD is not set
@@ -132,16 +133,20 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
+# CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_SCH_ESFQ_NFCT is not set
 # CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NF_CONNTRACK=y
 # CONFIG_NO_IOPORT is not set
 # 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_PCIPCWATCHDOG is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
@@ -179,7 +184,11 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB is not set
+CONFIG_USB=m
+# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIA_RHINE=y