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