wok diff linux/stuff/linux-slitaz.config @ rev 15670
Up linux (3.2.53)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Dec 18 08:40:48 2013 +0000 (2013-12-18) |
parents | 9437b72fef7a |
children | f4df390821bc |
line diff
1.1 --- a/linux/stuff/linux-slitaz.config Sun Jun 16 20:18:01 2013 +0200 1.2 +++ b/linux/stuff/linux-slitaz.config Wed Dec 18 08:40:48 2013 +0000 1.3 @@ -114,24 +114,30 @@ 1.4 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y 1.5 CONFIG_CGROUPS=y 1.6 # CONFIG_CGROUP_DEBUG is not set 1.7 -# CONFIG_CGROUP_FREEZER is not set 1.8 -# CONFIG_CGROUP_DEVICE is not set 1.9 -# CONFIG_CPUSETS is not set 1.10 -# CONFIG_CGROUP_CPUACCT is not set 1.11 -# CONFIG_RESOURCE_COUNTERS is not set 1.12 -# CONFIG_CGROUP_PERF is not set 1.13 +CONFIG_CGROUP_FREEZER=y 1.14 +CONFIG_CGROUP_DEVICE=y 1.15 +CONFIG_CPUSETS=y 1.16 +CONFIG_PROC_PID_CPUSET=y 1.17 +CONFIG_CGROUP_CPUACCT=y 1.18 +CONFIG_RESOURCE_COUNTERS=y 1.19 +CONFIG_CGROUP_MEM_RES_CTLR=y 1.20 +CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y 1.21 +CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y 1.22 +CONFIG_CGROUP_PERF=y 1.23 CONFIG_CGROUP_SCHED=y 1.24 CONFIG_FAIR_GROUP_SCHED=y 1.25 CONFIG_CFS_BANDWIDTH=y 1.26 # CONFIG_RT_GROUP_SCHED is not set 1.27 -# CONFIG_BLK_CGROUP is not set 1.28 +CONFIG_BLK_CGROUP=y 1.29 +# CONFIG_DEBUG_BLK_CGROUP is not set 1.30 CONFIG_NAMESPACES=y 1.31 -# CONFIG_UTS_NS is not set 1.32 -# CONFIG_IPC_NS is not set 1.33 -# CONFIG_USER_NS is not set 1.34 -# CONFIG_PID_NS is not set 1.35 -# CONFIG_NET_NS is not set 1.36 +CONFIG_UTS_NS=y 1.37 +CONFIG_IPC_NS=y 1.38 +CONFIG_USER_NS=y 1.39 +CONFIG_PID_NS=y 1.40 +CONFIG_NET_NS=y 1.41 CONFIG_SCHED_AUTOGROUP=y 1.42 +CONFIG_MM_OWNER=y 1.43 # CONFIG_SYSFS_DEPRECATED is not set 1.44 # CONFIG_RELAY is not set 1.45 CONFIG_BLK_DEV_INITRD=y 1.46 @@ -224,6 +230,7 @@ 1.47 CONFIG_BLK_DEV_BSG=y 1.48 CONFIG_BLK_DEV_BSGLIB=y 1.49 # CONFIG_BLK_DEV_INTEGRITY is not set 1.50 +# CONFIG_BLK_DEV_THROTTLING is not set 1.51 1.52 # 1.53 # IO Schedulers 1.54 @@ -486,10 +493,10 @@ 1.55 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 1.56 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set 1.57 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 1.58 -CONFIG_CPU_FREQ_GOV_POWERSAVE=m 1.59 +CONFIG_CPU_FREQ_GOV_POWERSAVE=y 1.60 CONFIG_CPU_FREQ_GOV_USERSPACE=y 1.61 CONFIG_CPU_FREQ_GOV_ONDEMAND=y 1.62 -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m 1.63 +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y 1.64 1.65 # 1.66 # x86 CPU frequency scaling drivers 1.67 @@ -518,7 +525,7 @@ 1.68 CONFIG_CPU_IDLE=y 1.69 CONFIG_CPU_IDLE_GOV_LADDER=y 1.70 CONFIG_CPU_IDLE_GOV_MENU=y 1.71 -# CONFIG_INTEL_IDLE is not set 1.72 +CONFIG_INTEL_IDLE=y 1.73 1.74 # 1.75 # Bus options (PCI etc.) 1.76 @@ -1590,13 +1597,13 @@ 1.77 CONFIG_NET_FC=y 1.78 CONFIG_MII=y 1.79 CONFIG_IFB=m 1.80 -CONFIG_MACVLAN=m 1.81 -CONFIG_MACVTAP=m 1.82 +CONFIG_MACVLAN=y 1.83 +CONFIG_MACVTAP=y 1.84 # CONFIG_NETCONSOLE is not set 1.85 # CONFIG_NETPOLL is not set 1.86 # CONFIG_NET_POLL_CONTROLLER is not set 1.87 CONFIG_TUN=y 1.88 -CONFIG_VETH=m 1.89 +CONFIG_VETH=y 1.90 CONFIG_VIRTIO_NET=m 1.91 CONFIG_SUNGEM_PHY=m 1.92 CONFIG_ARCNET=m 1.93 @@ -1764,7 +1771,7 @@ 1.94 CONFIG_8139TOO_TUNE_TWISTER=y 1.95 CONFIG_8139TOO_8129=y 1.96 # CONFIG_8139_OLD_RX_RESET is not set 1.97 -CONFIG_R8169=y 1.98 +CONFIG_R8169=m 1.99 CONFIG_NET_VENDOR_RDC=y 1.100 CONFIG_R6040=m 1.101 CONFIG_NET_VENDOR_SEEQ=y 1.102 @@ -1902,7 +1909,7 @@ 1.103 CONFIG_ATH9K=m 1.104 CONFIG_ATH9K_PCI=y 1.105 CONFIG_ATH9K_AHB=y 1.106 -CONFIG_ATH9K_RATE_CONTROL=y 1.107 +CONFIG_ATH9K_LEGACY_RATE_CONTROL=y 1.108 CONFIG_ATH9K_HTC=m 1.109 # CONFIG_CARL9170 is not set 1.110 CONFIG_ATH6KL=m 1.111 @@ -2349,7 +2356,7 @@ 1.112 CONFIG_HW_CONSOLE=y 1.113 # CONFIG_VT_HW_CONSOLE_BINDING is not set 1.114 CONFIG_UNIX98_PTYS=y 1.115 -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 1.116 +CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 1.117 # CONFIG_LEGACY_PTYS is not set 1.118 # CONFIG_SERIAL_NONSTANDARD is not set 1.119 CONFIG_NOZOMI=m 1.120 @@ -2361,7 +2368,7 @@ 1.121 # Serial drivers 1.122 # 1.123 CONFIG_SERIAL_8250=y 1.124 -# CONFIG_SERIAL_8250_CONSOLE is not set 1.125 +CONFIG_SERIAL_8250_CONSOLE=y 1.126 CONFIG_FIX_EARLYCON_MEM=y 1.127 CONFIG_SERIAL_8250_PCI=y 1.128 CONFIG_SERIAL_8250_PNP=y 1.129 @@ -2376,6 +2383,7 @@ 1.130 # CONFIG_SERIAL_MFD_HSU is not set 1.131 # CONFIG_SERIAL_UARTLITE is not set 1.132 CONFIG_SERIAL_CORE=y 1.133 +CONFIG_SERIAL_CORE_CONSOLE=y 1.134 # CONFIG_SERIAL_JSM is not set 1.135 # CONFIG_SERIAL_TIMBERDALE is not set 1.136 # CONFIG_SERIAL_ALTERA_JTAGUART is not set