projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ppc40x] merge 2.6.28 patches
[openwrt.git]
/
target
/
linux
/
uml
/
config
/
i386
diff --git
a/target/linux/uml/config/i386
b/target/linux/uml/config/i386
index
2d62280
..
bc55df4
100644
(file)
--- a/
target/linux/uml/config/i386
+++ b/
target/linux/uml/config/i386
@@
-2,6
+2,7
@@
# CONFIG_64BIT is not set
CONFIG_ARCH_HAS_SC_SIGNALS=y
CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
# CONFIG_64BIT is not set
CONFIG_ARCH_HAS_SC_SIGNALS=y
CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y
+CONFIG_ARCH_SUPPORTS_AOUT=y
# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
# CONFIG_ATM is not set
CONFIG_BASE_SMALL=0
# CONFIG_BINFMT_AOUT is not set
@@
-10,11
+11,12
@@
CONFIG_BLK_DEV_COW_COMMON=y
CONFIG_BLK_DEV_UBD=y
CONFIG_BLK_DEV_UBD_SYNC=y
# CONFIG_BT is not set
CONFIG_BLK_DEV_UBD=y
CONFIG_BLK_DEV_UBD_SYNC=y
# CONFIG_BT is not set
+CONFIG_CLASSIC_RCU=y
CONFIG_CON_CHAN="xterm"
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CRAMFS=y
# CONFIG_CRYPTO_AES_586 is not set
CONFIG_CON_CHAN="xterm"
CONFIG_CON_ZERO_CHAN="fd:0,fd:1"
CONFIG_CRAMFS=y
# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_
HW
is not set
+# CONFIG_CRYPTO_
SALSA20_586
is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_CRYPTO_TWOFISH_586 is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_STACK_USAGE is not set
@@
-35,13
+37,12
@@
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
# CONFIG_GENERIC_CPU is not set
# CONFIG_HAMRADIO is not set
CONFIG_HAS_DMA=y
# CONFIG_GENERIC_CPU is not set
# CONFIG_HAMRADIO is not set
CONFIG_HAS_DMA=y
+# CONFIG_HAVE_KPROBES is not set
+# CONFIG_HAVE_KRETPROBES is not set
+# CONFIG_HAVE_OPROFILE is not set
# CONFIG_HIGHMEM is not set
CONFIG_HOSTAUDIO=m
CONFIG_HOSTFS=y
# CONFIG_HIGHMEM is not set
CONFIG_HOSTAUDIO=m
CONFIG_HOSTFS=y
-# CONFIG_HOST_VMSPLIT_1G is not set
-# CONFIG_HOST_VMSPLIT_2G is not set
-CONFIG_HOST_VMSPLIT_3G=y
-# CONFIG_HOST_VMSPLIT_3G_OPT is not set
# CONFIG_HPPFS is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_IFB is not set
# CONFIG_HPPFS is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_IFB is not set
@@
-59,6
+60,8
@@
CONFIG_LBD=y
CONFIG_LD_SCRIPT_STATIC=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
CONFIG_LD_SCRIPT_STATIC=y
CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
# CONFIG_M586 is not set
@@
-89,13
+92,7
@@
CONFIG_MPENTIUMII=y
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP2 is not set
# CONFIG_MWINCHIP3D is not set
# CONFIG_MWINCHIPC6 is not set
-CONFIG_NEST_LEVEL=0
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3_ACL=y
-# CONFIG_NFSD_V4 is not set
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_V3_ACL=y
-# CONFIG_NFS_V4 is not set
+CONFIG_NAMESPACES=y
CONFIG_NLS=y
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_ISO8859_15 is not set
CONFIG_NLS=y
# CONFIG_NLS_CODEPAGE_850 is not set
# CONFIG_NLS_ISO8859_15 is not set
@@
-106,6
+103,7
@@
CONFIG_NULL_CHAN=y
CONFIG_PORT_CHAN=y
CONFIG_POSIX_MQUEUE=y
CONFIG_PRINT_QUOTA_WARNING=y
CONFIG_PORT_CHAN=y
CONFIG_POSIX_MQUEUE=y
CONFIG_PRINT_QUOTA_WARNING=y
+CONFIG_PROC_PAGE_MONITOR=y
CONFIG_PTY_CHAN=y
CONFIG_QFMT_V1=y
CONFIG_QFMT_V2=y
CONFIG_PTY_CHAN=y
CONFIG_QFMT_V1=y
CONFIG_QFMT_V2=y
@@
-117,7
+115,8
@@
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_SCSI_WAIT_SCAN=m
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_SLABINFO=y
CONFIG_SCSI_WAIT_SCAN=m
CONFIG_SEMAPHORE_SLEEPERS=y
CONFIG_SLABINFO=y
-# CONFIG_SMP is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
CONFIG_SOFT_WATCHDOG=m
# CONFIG_SPARSEMEM_STATIC is not set
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
@@
-130,7
+129,6
@@
CONFIG_STDERR_CONSOLE=y
CONFIG_STDIO_CONSOLE=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_TICK_ONESHOT=y
CONFIG_STDIO_CONSOLE=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_TICK_ONESHOT=y
-CONFIG_TOP_ADDR=0xC0000000
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
CONFIG_TTY_CHAN=y
CONFIG_UID16=y
# CONFIG_TRACE_IRQFLAGS_SUPPORT is not set
CONFIG_TTY_CHAN=y
CONFIG_UID16=y
@@
-154,6
+152,7
@@
CONFIG_X86_32=y
CONFIG_X86_BSWAP=y
CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG=y
CONFIG_X86_BSWAP=y
CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG=y
+CONFIG_X86_DEBUGCTLMSR=y
CONFIG_X86_GENERIC=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
CONFIG_X86_GENERIC=y
CONFIG_X86_GOOD_APIC=y
CONFIG_X86_INTEL_USERCOPY=y
@@
-166,5
+165,4
@@
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
CONFIG_XTERM_CHAN=y
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_XADD=y
CONFIG_XTERM_CHAN=y
-CONFIG_ZLIB_DEFLATE=m
CONFIG_ZONE_DMA_FLAG=0
CONFIG_ZONE_DMA_FLAG=0
This page took
0.021123 seconds
and
4
git commands to generate.