Magellan Linux

Diff of /trunk/kernel26-magellan/config-2.6.33-magellan-r3-i686

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1055 by niro, Wed Jul 7 10:02:52 2010 UTC revision 1056 by niro, Mon Jul 12 13:42:59 2010 UTC
# Line 1  Line 1 
1  #  #
2  # Automatically generated make config: don't edit  # Automatically generated make config: don't edit
3  # Linux kernel version: 2.6.33-magellan-r1  # Linux kernel version: 2.6.33-magellan-r3
4  # Sat Apr 24 19:22:16 2010  # Mon Jul 12 15:37:52 2010
5  #  #
6  # CONFIG_64BIT is not set  # CONFIG_64BIT is not set
7  CONFIG_X86_32=y  CONFIG_X86_32=y
# Line 106  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y Line 106  CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
106  CONFIG_GROUP_SCHED=y  CONFIG_GROUP_SCHED=y
107  CONFIG_FAIR_GROUP_SCHED=y  CONFIG_FAIR_GROUP_SCHED=y
108  CONFIG_RT_GROUP_SCHED=y  CONFIG_RT_GROUP_SCHED=y
109  CONFIG_USER_SCHED=y  # CONFIG_USER_SCHED is not set
110  # CONFIG_CGROUP_SCHED is not set  CONFIG_CGROUP_SCHED=y
111  # CONFIG_CGROUPS is not set  CONFIG_CGROUPS=y
112    # CONFIG_CGROUP_DEBUG is not set
113    CONFIG_CGROUP_NS=y
114    CONFIG_CGROUP_FREEZER=y
115    CONFIG_CGROUP_DEVICE=y
116    CONFIG_CPUSETS=y
117    CONFIG_PROC_PID_CPUSET=y
118    CONFIG_CGROUP_CPUACCT=y
119    CONFIG_RESOURCE_COUNTERS=y
120    CONFIG_CGROUP_MEM_RES_CTLR=y
121    CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
122    CONFIG_MM_OWNER=y
123  # CONFIG_SYSFS_DEPRECATED_V2 is not set  # CONFIG_SYSFS_DEPRECATED_V2 is not set
124  CONFIG_RELAY=y  CONFIG_RELAY=y
125  CONFIG_NAMESPACES=y  CONFIG_NAMESPACES=y
# Line 193  CONFIG_BLOCK=y Line 204  CONFIG_BLOCK=y
204  CONFIG_LBDAF=y  CONFIG_LBDAF=y
205  CONFIG_BLK_DEV_BSG=y  CONFIG_BLK_DEV_BSG=y
206  CONFIG_BLK_DEV_INTEGRITY=y  CONFIG_BLK_DEV_INTEGRITY=y
207    CONFIG_BLK_CGROUP=y
208    # CONFIG_DEBUG_BLK_CGROUP is not set
209    
210  #  #
211  # IO Schedulers  # IO Schedulers
# Line 200  CONFIG_BLK_DEV_INTEGRITY=y Line 213  CONFIG_BLK_DEV_INTEGRITY=y
213  CONFIG_IOSCHED_NOOP=y  CONFIG_IOSCHED_NOOP=y
214  CONFIG_IOSCHED_DEADLINE=y  CONFIG_IOSCHED_DEADLINE=y
215  CONFIG_IOSCHED_CFQ=y  CONFIG_IOSCHED_CFQ=y
216    CONFIG_CFQ_GROUP_IOSCHED=y
217    # CONFIG_DEBUG_CFQ_IOSCHED is not set
218  # CONFIG_DEFAULT_DEADLINE is not set  # CONFIG_DEFAULT_DEADLINE is not set
219  CONFIG_DEFAULT_CFQ=y  CONFIG_DEFAULT_CFQ=y
220  # CONFIG_DEFAULT_NOOP is not set  # CONFIG_DEFAULT_NOOP is not set
# Line 913  CONFIG_CLS_U32_MARK=y Line 928  CONFIG_CLS_U32_MARK=y
928  CONFIG_NET_CLS_RSVP=m  CONFIG_NET_CLS_RSVP=m
929  CONFIG_NET_CLS_RSVP6=m  CONFIG_NET_CLS_RSVP6=m
930  CONFIG_NET_CLS_FLOW=m  CONFIG_NET_CLS_FLOW=m
931    CONFIG_NET_CLS_CGROUP=y
932  CONFIG_NET_EMATCH=y  CONFIG_NET_EMATCH=y
933  CONFIG_NET_EMATCH_STACK=32  CONFIG_NET_EMATCH_STACK=32
934  CONFIG_NET_EMATCH_CMP=m  CONFIG_NET_EMATCH_CMP=m
# Line 1072  CONFIG_LIB80211_CRYPT_CCMP=m Line 1088  CONFIG_LIB80211_CRYPT_CCMP=m
1088  CONFIG_LIB80211_CRYPT_TKIP=m  CONFIG_LIB80211_CRYPT_TKIP=m
1089  # CONFIG_LIB80211_DEBUG is not set  # CONFIG_LIB80211_DEBUG is not set
1090  CONFIG_MAC80211=m  CONFIG_MAC80211=m
1091    CONFIG_MAC80211_HAS_RC=y
1092  CONFIG_MAC80211_RC_MINSTREL=y  CONFIG_MAC80211_RC_MINSTREL=y
1093  # CONFIG_MAC80211_RC_DEFAULT_PID is not set  # CONFIG_MAC80211_RC_DEFAULT_PID is not set
1094  CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y  CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y

Legend:
Removed from v.1055  
changed lines
  Added in v.1056