summaryrefslogtreecommitdiff
path: root/packages/linux/linux-rp-2.6.24/defconfig-collie
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-06-01 22:47:13 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-06-01 22:47:13 +0000
commit985964e568ba4da46d1aeac39ee87bd32ef18fcd (patch)
tree5763d9889ab927e8b60dc40323171824901f7899 /packages/linux/linux-rp-2.6.24/defconfig-collie
parentd63b84cd9b2553c798eb0cf4f5277c283f4fb48e (diff)
linux-rp-2.6.24: Sync defconfigs with Poky. Making the crypto modules builtin is wrong and compounds an existing space problem, the should be marked as autoloaded.
Diffstat (limited to 'packages/linux/linux-rp-2.6.24/defconfig-collie')
-rw-r--r--packages/linux/linux-rp-2.6.24/defconfig-collie10
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie
index 847fef882c..4d3f9f8782 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.24/defconfig-collie
@@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -221,7 +221,8 @@ CONFIG_PCMCIA_SA1100=m
CONFIG_PREEMPT=y
CONFIG_NO_IDLE_HZ=y
CONFIG_HZ=100
-# CONFIG_AEABI is not set
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_NODES_SHIFT=2
CONFIG_SELECT_MEMORY_MODEL=y
@@ -326,6 +327,7 @@ CONFIG_INET_TCP_DIAG=m
CONFIG_TCP_CONG_CUBIC=y
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
CONFIG_IPV6=m
# CONFIG_IPV6_PRIVACY is not set
# CONFIG_IPV6_ROUTER_PREF is not set
@@ -1058,7 +1060,7 @@ CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
+CONFIG_MMC_UNSAFE_RESUME=y
#
# MMC/SD Card Drivers
@@ -1308,7 +1310,7 @@ CONFIG_INSTRUMENTATION=y
# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_WARN_DEPRECATED=y
CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set