Resync 2.6.25 au1000 kernel config

SVN-Revision: 11244

1 files changed, 21 insertions, 18 deletions

diff --git a/target/linux/au1000/config-2.6.25 b/target/linux/au1000/config-2.6.25
index c731afe234..ae36c8444d 100644
--- a/target/linux/au1000/config-2.6.25
+++ b/target/linux/au1000/config-2.6.25
@@ -7,14 +7,15 @@ CONFIG_64BIT_PHYS_ADDR=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUPPORTS_OPROFILE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ATM is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM47XX is not set
 CONFIG_BITREVERSE=y
 # CONFIG_BROADCOM_PHY is not set
-# CONFIG_BT_HCIUART_LL is not set
 CONFIG_CEVT_R4K=y
 CONFIG_CHR_DEV_SG=m
+CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock0 rootfstype=squashfs,jffs2 init=/etc/preinit"
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
@@ -47,12 +48,16 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_VR41XX is not set
 CONFIG_CRAMFS=m
 CONFIG_CRC16=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CSRC_R4K=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DUMMY=m
+# CONFIG_E1000E_ENABLED is not set
 CONFIG_ELF_CORE=y
 # CONFIG_FIXED_PHY is not set
 CONFIG_FS_POSIX_ACL=y
@@ -66,8 +71,11 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAVE_IDE=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+CONFIG_HAVE_OPROFILE=y
 CONFIG_HID=m
-# CONFIG_HIDRAW is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
@@ -89,6 +97,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
@@ -100,12 +109,15 @@ CONFIG_KEYBOARD_GPIO=y
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_TRIGGERS is not set
 # CONFIG_LEMOTE_FULONG is not set
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
 CONFIG_MACH_ALCHEMY=y
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_MDIO_BITBANG is not set
+# CONFIG_MEMSTICK is not set
 CONFIG_MIPS=y
 # CONFIG_MIPS_ATLAS is not set
 CONFIG_MIPS_AU1X00_ENET=y
@@ -180,11 +192,13 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NET_SCH_ESFQ_NFCT is not set
 # CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NO_HZ=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_PCI_DOMAINS=y
 CONFIG_PHYLIB=y
@@ -195,6 +209,8 @@ CONFIG_PHYLIB=y
 # CONFIG_PPP_MPPE is not set
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 # CONFIG_QSEMI_PHY is not set
+# CONFIG_R6040 is not set
+# CONFIG_REALTEK_PHY is not set
 CONFIG_RESOURCES_64BIT=y
 # CONFIG_RTC is not set
 CONFIG_RTC_LIB=y
@@ -210,13 +226,13 @@ CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SGI_IP22 is not set
 # CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP28 is not set
 # CONFIG_SGI_IP32 is not set
 # CONFIG_SIBYTE_BIGSUR is not set
 # CONFIG_SIBYTE_CARMEL is not set
 # CONFIG_SIBYTE_CRHINE is not set
 # CONFIG_SIBYTE_CRHONE is not set
 # CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_PTSWARM is not set
 # CONFIG_SIBYTE_RHONE is not set
 # CONFIG_SIBYTE_SENTOSA is not set
 # CONFIG_SIBYTE_SWARM is not set
@@ -239,30 +255,17 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_KGDB=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 # CONFIG_TC35815 is not set
+# CONFIG_THERMAL is not set
 CONFIG_TICK_ONESHOT=y
 # CONFIG_TMD_HERMES is not set
 # CONFIG_TOSHIBA_JMR3927 is not set
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PWC is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USER_NS is not set
-CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_TCM825X is not set
 CONFIG_VIDEO_V4L1=y
-# CONFIG_VIDEO_VP27SMPX is not set
+CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_WDT_MTX1=y
 CONFIG_ZONE_DMA_FLAG=0