|
@@ -1,7 +1,7 @@
|
|
#
|
|
#
|
|
# Automatically generated make config: don't edit
|
|
# Automatically generated make config: don't edit
|
|
-# Linux kernel version: 2.6.32
|
|
+# Linux kernel version: 2.6.33
|
|
-# Mon Feb 1 19:21:16 2010
|
|
+# Mon Mar 22 13:36:55 2010
|
|
#
|
|
#
|
|
CONFIG_MMU=y
|
|
CONFIG_MMU=y
|
|
CONFIG_ZONE_DMA=y
|
|
CONFIG_ZONE_DMA=y
|
|
@@ -40,6 +40,7 @@ CONFIG_SYSVIPC_SYSCTL=y
|
|
#
|
|
#
|
|
CONFIG_TREE_RCU=y
|
|
CONFIG_TREE_RCU=y
|
|
# CONFIG_TREE_PREEMPT_RCU is not set
|
|
# CONFIG_TREE_PREEMPT_RCU is not set
|
|
|
|
+# CONFIG_TINY_RCU is not set
|
|
# CONFIG_RCU_TRACE is not set
|
|
# CONFIG_RCU_TRACE is not set
|
|
CONFIG_RCU_FANOUT=32
|
|
CONFIG_RCU_FANOUT=32
|
|
# CONFIG_RCU_FANOUT_EXACT is not set
|
|
# CONFIG_RCU_FANOUT_EXACT is not set
|
|
@@ -105,14 +106,41 @@ CONFIG_BLOCK=y
|
|
# IO Schedulers
|
|
# IO Schedulers
|
|
#
|
|
#
|
|
CONFIG_IOSCHED_NOOP=y
|
|
CONFIG_IOSCHED_NOOP=y
|
|
-# CONFIG_IOSCHED_AS is not set
|
|
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
-# CONFIG_DEFAULT_AS is not set
|
|
|
|
# CONFIG_DEFAULT_DEADLINE is not set
|
|
# CONFIG_DEFAULT_DEADLINE is not set
|
|
# CONFIG_DEFAULT_CFQ is not set
|
|
# CONFIG_DEFAULT_CFQ is not set
|
|
CONFIG_DEFAULT_NOOP=y
|
|
CONFIG_DEFAULT_NOOP=y
|
|
CONFIG_DEFAULT_IOSCHED="noop"
|
|
CONFIG_DEFAULT_IOSCHED="noop"
|
|
|
|
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
|
|
|
|
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
|
|
|
|
+# CONFIG_INLINE_SPIN_LOCK is not set
|
|
|
|
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
|
|
|
|
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
|
|
|
|
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
|
|
|
|
+CONFIG_INLINE_SPIN_UNLOCK=y
|
|
|
|
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
|
|
|
|
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
|
|
|
|
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
|
|
|
|
+# CONFIG_INLINE_READ_TRYLOCK is not set
|
|
|
|
+# CONFIG_INLINE_READ_LOCK is not set
|
|
|
|
+# CONFIG_INLINE_READ_LOCK_BH is not set
|
|
|
|
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
|
|
|
|
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
|
|
|
|
+CONFIG_INLINE_READ_UNLOCK=y
|
|
|
|
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
|
|
|
|
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
|
|
|
|
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
|
|
|
|
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
|
|
|
|
+# CONFIG_INLINE_WRITE_LOCK is not set
|
|
|
|
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
|
|
|
|
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
|
|
|
|
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
|
|
|
|
+CONFIG_INLINE_WRITE_UNLOCK=y
|
|
|
|
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
|
|
|
|
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
|
|
|
|
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
|
|
|
|
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
|
|
# CONFIG_FREEZER is not set
|
|
# CONFIG_FREEZER is not set
|
|
|
|
|
|
#
|
|
#
|
|
@@ -143,8 +171,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
|
|
CONFIG_ZONE_DMA_FLAG=1
|
|
CONFIG_ZONE_DMA_FLAG=1
|
|
CONFIG_BOUNCE=y
|
|
CONFIG_BOUNCE=y
|
|
CONFIG_VIRT_TO_BUS=y
|
|
CONFIG_VIRT_TO_BUS=y
|
|
-CONFIG_HAVE_MLOCK=y
|
|
|
|
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
|
|
|
|
# CONFIG_KSM is not set
|
|
# CONFIG_KSM is not set
|
|
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
|
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
|
|
|
|
|
@@ -264,7 +290,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
|
|
# CONFIG_IRDA is not set
|
|
# CONFIG_IRDA is not set
|
|
# CONFIG_BT is not set
|
|
# CONFIG_BT is not set
|
|
# CONFIG_AF_RXRPC is not set
|
|
# CONFIG_AF_RXRPC is not set
|
|
-# CONFIG_WIRELESS is not set
|
|
+CONFIG_WIRELESS=y
|
|
|
|
+# CONFIG_CFG80211 is not set
|
|
|
|
+# CONFIG_LIB80211 is not set
|
|
|
|
+
|
|
|
|
+#
|
|
|
|
+# CFG80211 needs to be enabled for MAC80211
|
|
|
|
+#
|
|
# CONFIG_WIMAX is not set
|
|
# CONFIG_WIMAX is not set
|
|
# CONFIG_RFKILL is not set
|
|
# CONFIG_RFKILL is not set
|
|
# CONFIG_NET_9P is not set
|
|
# CONFIG_NET_9P is not set
|
|
@@ -463,8 +495,8 @@ CONFIG_MII=y
|
|
# CONFIG_NETDEV_1000 is not set
|
|
# CONFIG_NETDEV_1000 is not set
|
|
# CONFIG_NETDEV_10000 is not set
|
|
# CONFIG_NETDEV_10000 is not set
|
|
CONFIG_WLAN=y
|
|
CONFIG_WLAN=y
|
|
-# CONFIG_WLAN_PRE80211 is not set
|
|
+# CONFIG_USB_ZD1201 is not set
|
|
-# CONFIG_WLAN_80211 is not set
|
|
+# CONFIG_HOSTAP is not set
|
|
|
|
|
|
#
|
|
#
|
|
# Enable WiMAX (Networking options) to see the WiMAX drivers
|
|
# Enable WiMAX (Networking options) to see the WiMAX drivers
|
|
@@ -728,7 +760,11 @@ CONFIG_MAGIC_SYSRQ=y
|
|
# CONFIG_KEYS is not set
|
|
# CONFIG_KEYS is not set
|
|
# CONFIG_SECURITY is not set
|
|
# CONFIG_SECURITY is not set
|
|
# CONFIG_SECURITYFS is not set
|
|
# CONFIG_SECURITYFS is not set
|
|
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
|
|
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
|
|
|
|
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
|
|
|
|
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
|
|
|
|
+CONFIG_DEFAULT_SECURITY_DAC=y
|
|
|
|
+CONFIG_DEFAULT_SECURITY=""
|
|
CONFIG_CRYPTO=y
|
|
CONFIG_CRYPTO=y
|
|
|
|
|
|
#
|
|
#
|