]>
Commit | Line | Data |
---|---|---|
1 | --- config-2.6.32-042stab112.15.x86_64 2015-10-24 17:15:38.000000000 +0200 | |
2 | +++ linux-2.6-2.6.32/.config 2015-10-27 08:25:22.000000000 +0100 | |
3 | @@ -216,8 +216,7 @@ | |
4 | CONFIG_MODVERSIONS=y | |
5 | CONFIG_MODULE_SRCVERSION_ALL=y | |
6 | CONFIG_MODULE_VERIFY_ELF=y | |
7 | -CONFIG_MODULE_SIG=y | |
8 | -# CONFIG_MODULE_SIG_FORCE is not set | |
9 | +# CONFIG_MODULE_SIG is not set | |
10 | CONFIG_MODULE_VERIFY=y | |
11 | CONFIG_STOP_MACHINE=y | |
12 | CONFIG_BLOCK=y | |
13 | @@ -237,10 +236,10 @@ | |
14 | CONFIG_IOSCHED_CFQ=y | |
15 | CONFIG_CFQ_GROUP_IOSCHED=y | |
16 | # CONFIG_DEFAULT_AS is not set | |
17 | -# CONFIG_DEFAULT_DEADLINE is not set | |
18 | -CONFIG_DEFAULT_CFQ=y | |
19 | +CONFIG_DEFAULT_DEADLINE=y | |
20 | +# CONFIG_DEFAULT_CFQ is not set | |
21 | # CONFIG_DEFAULT_NOOP is not set | |
22 | -CONFIG_DEFAULT_IOSCHED="cfq" | |
23 | +CONFIG_DEFAULT_IOSCHED="deadline" | |
24 | CONFIG_PREEMPT_NOTIFIERS=y | |
25 | CONFIG_FREEZER=y | |
26 | ||
27 | @@ -494,9 +493,9 @@ | |
28 | CONFIG_CPU_FREQ_DEBUG=y | |
29 | CONFIG_CPU_FREQ_STAT=m | |
30 | CONFIG_CPU_FREQ_STAT_DETAILS=y | |
31 | -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set | |
32 | +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y | |
33 | # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set | |
34 | -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y | |
35 | +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set | |
36 | # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set | |
37 | # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set | |
38 | CONFIG_CPU_FREQ_GOV_PERFORMANCE=y | |
39 | @@ -687,7 +686,7 @@ | |
40 | # CONFIG_DEFAULT_RENO is not set | |
41 | CONFIG_DEFAULT_TCP_CONG="cubic" | |
42 | CONFIG_TCP_MD5SIG=y | |
43 | -CONFIG_IPV6=m | |
44 | +CONFIG_IPV6=y | |
45 | CONFIG_IPV6_PRIVACY=y | |
46 | CONFIG_IPV6_ROUTER_PREF=y | |
47 | CONFIG_IPV6_ROUTE_INFO=y | |
48 | @@ -967,9 +966,9 @@ | |
49 | # CONFIG_ATM_MPOA is not set | |
50 | CONFIG_ATM_BR2684=m | |
51 | # CONFIG_ATM_BR2684_IPFILTER is not set | |
52 | -CONFIG_STP=m | |
53 | +CONFIG_STP=y | |
54 | CONFIG_GARP=m | |
55 | -CONFIG_BRIDGE=m | |
56 | +CONFIG_BRIDGE=y | |
57 | CONFIG_BRIDGE_IGMP_SNOOPING=y | |
58 | CONFIG_NET_DSA=y | |
59 | CONFIG_NET_DSA_TAG_DSA=y | |
60 | @@ -983,7 +982,7 @@ | |
61 | CONFIG_VLAN_8021Q=m | |
62 | CONFIG_VLAN_8021Q_GVRP=y | |
63 | # CONFIG_DECNET is not set | |
64 | -CONFIG_LLC=m | |
65 | +CONFIG_LLC=y | |
66 | # CONFIG_LLC2 is not set | |
67 | # CONFIG_IPX is not set | |
68 | # CONFIG_ATALK is not set | |
69 | @@ -1401,10 +1400,10 @@ | |
70 | # | |
71 | # SCSI support type (disk, tape, CD-ROM) | |
72 | # | |
73 | -CONFIG_BLK_DEV_SD=m | |
74 | +CONFIG_BLK_DEV_SD=y | |
75 | CONFIG_CHR_DEV_ST=m | |
76 | CONFIG_CHR_DEV_OSST=m | |
77 | -CONFIG_BLK_DEV_SR=m | |
78 | +CONFIG_BLK_DEV_SR=y | |
79 | CONFIG_BLK_DEV_SR_VENDOR=y | |
80 | CONFIG_CHR_DEV_SG=m | |
81 | CONFIG_CHR_DEV_SCH=m | |
82 | @@ -1440,7 +1439,7 @@ | |
83 | CONFIG_SCSI_HPSA=m | |
84 | CONFIG_SCSI_3W_9XXX=m | |
85 | CONFIG_SCSI_3W_SAS=m | |
86 | -# CONFIG_SCSI_ACARD is not set | |
87 | +CONFIG_SCSI_ACARD=m | |
88 | CONFIG_SCSI_AACRAID=m | |
89 | CONFIG_SCSI_AIC7XXX=m | |
90 | CONFIG_AIC7XXX_CMDS_PER_DEVICE=4 | |
91 | @@ -1486,7 +1485,7 @@ | |
92 | # CONFIG_SCSI_DMX3191D is not set | |
93 | # CONFIG_SCSI_EATA is not set | |
94 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | |
95 | -# CONFIG_SCSI_GDTH is not set | |
96 | +CONFIG_SCSI_GDTH=m | |
97 | CONFIG_SCSI_ISCI=m | |
98 | CONFIG_SCSI_IPS=m | |
99 | CONFIG_SCSI_INITIO=m | |
100 | @@ -1605,7 +1604,7 @@ | |
101 | # CONFIG_MD_MULTIPATH is not set | |
102 | CONFIG_MD_FAULTY=m | |
103 | CONFIG_BLK_DEV_DM_BUILTIN=y | |
104 | -CONFIG_BLK_DEV_DM=m | |
105 | +CONFIG_BLK_DEV_DM=y | |
106 | CONFIG_DM_DEBUG=y | |
107 | CONFIG_DM_BUFIO=m | |
108 | CONFIG_DM_BIO_PRISON=m | |
109 | @@ -3360,6 +3359,11 @@ | |
110 | # CONFIG_LOGO_LINUX_VGA16 is not set | |
111 | CONFIG_LOGO_LINUX_CLUT224=y | |
112 | CONFIG_LOGO_PSBM_CLUT224=y | |
113 | + | |
114 | +# | |
115 | +# Bootsplash configuration | |
116 | +# | |
117 | +CONFIG_BOOTSPLASH=y | |
118 | CONFIG_SOUND=m | |
119 | CONFIG_SOUND_OSS_CORE=y | |
120 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y | |
121 | @@ -3985,7 +3989,9 @@ | |
122 | # CONFIG_SLICOSS is not set | |
123 | # CONFIG_VIDEO_GO7007 is not set | |
124 | # CONFIG_VIDEO_CX25821 is not set | |
125 | -# CONFIG_USB_IP_COMMON is not set | |
126 | +CONFIG_USB_IP_COMMON=m | |
127 | +CONFIG_USB_IP_VHCI_HCD=m | |
128 | +CONFIG_USB_IP_HOST=m | |
129 | # CONFIG_W35UND is not set | |
130 | # CONFIG_PRISM2_USB is not set | |
131 | # CONFIG_ECHO is not set | |
132 | @@ -4109,7 +4115,11 @@ | |
133 | CONFIG_REISERFS_FS_XATTR=y | |
134 | CONFIG_REISERFS_FS_POSIX_ACL=y | |
135 | CONFIG_REISERFS_FS_SECURITY=y | |
136 | -# CONFIG_JFS_FS is not set | |
137 | +CONFIG_JFS_FS=m | |
138 | +CONFIG_JFS_POSIX_ACL=y | |
139 | +CONFIG_JFS_SECURITY=y | |
140 | +# CONFIG_JFS_DEBUG is not set | |
141 | +# CONFIG_JFS_STATISTICS is not set | |
142 | CONFIG_FS_POSIX_ACL=y | |
143 | CONFIG_XFS_FS=m | |
144 | CONFIG_XFS_QUOTA=y | |
145 | @@ -4199,8 +4209,8 @@ | |
146 | # CONFIG_ADFS_FS is not set | |
147 | # CONFIG_AFFS_FS is not set | |
148 | CONFIG_ECRYPT_FS=m | |
149 | -# CONFIG_HFS_FS is not set | |
150 | -# CONFIG_HFSPLUS_FS is not set | |
151 | +CONFIG_HFS_FS=m | |
152 | +CONFIG_HFSPLUS_FS=m | |
153 | # CONFIG_BEFS_FS is not set | |
154 | # CONFIG_BFS_FS is not set | |
155 | # CONFIG_EFS_FS is not set | |
156 | @@ -4348,7 +4358,7 @@ | |
157 | # Kernel hacking | |
158 | # | |
159 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |
160 | -CONFIG_PRINTK_TIME=y | |
161 | +# CONFIG_PRINTK_TIME is not set | |
162 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | |
163 | CONFIG_ENABLE_MUST_CHECK=y | |
164 | CONFIG_FRAME_WARN=2048 | |
165 | @@ -4393,7 +4403,7 @@ | |
166 | CONFIG_STACKTRACE=y | |
167 | # CONFIG_DEBUG_KOBJECT is not set | |
168 | CONFIG_DEBUG_BUGVERBOSE=y | |
169 | -CONFIG_DEBUG_INFO=y | |
170 | +# CONFIG_DEBUG_INFO is not set | |
171 | # CONFIG_DEBUG_VM is not set | |
172 | # CONFIG_DEBUG_VIRTUAL is not set | |
173 | # CONFIG_DEBUG_WRITECOUNT is not set | |
174 | @@ -4526,7 +4536,6 @@ | |
175 | # | |
176 | # Crypto core or helper | |
177 | # | |
178 | -CONFIG_CRYPTO_FIPS=y | |
179 | CONFIG_CRYPTO_ALGAPI=y | |
180 | CONFIG_CRYPTO_ALGAPI2=y | |
181 | CONFIG_CRYPTO_AEAD=m | |
182 | @@ -4640,8 +4649,7 @@ | |
183 | CONFIG_CRYPTO_DRBG_CTR=y | |
184 | CONFIG_CRYPTO_DRBG=m | |
185 | CONFIG_CRYPTO_MPILIB=y | |
186 | -CONFIG_CRYPTO_SIGNATURE=y | |
187 | -CONFIG_CRYPTO_SIGNATURE_DSA=y | |
188 | +# CONFIG_CRYPTO_SIGNATURE is not set | |
189 | CONFIG_CRYPTO_HW=y | |
190 | CONFIG_CRYPTO_DEV_PADLOCK=m | |
191 | CONFIG_CRYPTO_DEV_PADLOCK_AES=m | |
192 | @@ -4674,7 +4682,7 @@ | |
193 | CONFIG_GENERIC_FIND_LAST_BIT=y | |
194 | CONFIG_CRC_CCITT=m | |
195 | CONFIG_CRC16=y | |
196 | -CONFIG_CRC_T10DIF=m | |
197 | +CONFIG_CRC_T10DIF=y | |
198 | CONFIG_CRC_ITU_T=m | |
199 | CONFIG_CRC32=y | |
200 | # CONFIG_CRC32_SELFTEST is not set |