]> git.proxmox.com Git - pve-kernel-2.6.32.git/blame - config-2.6.32.diff
update to vzkernel-2.6.32-042stab061.8.src.rpm
[pve-kernel-2.6.32.git] / config-2.6.32.diff
CommitLineData
7e70f1cc 1--- config-2.6.32-042stab049.6.x86_64 2012-02-13 07:18:08.000000000 +0100
d9e10626 2+++ config-2.6.32 2012-04-03 07:58:35.000000000 +0200
e21b3827 3@@ -103,7 +103,7 @@
1cfff965 4 CONFIG_FAIR_GROUP_SCHED=y
e21b3827
DM
5 CONFIG_CFS_BANDWIDTH=y
6 CONFIG_CFS_CPULIMIT=y
1cfff965
DM
7-CONFIG_RT_GROUP_SCHED=y
8+# CONFIG_RT_GROUP_SCHED is not set
9 # CONFIG_USER_SCHED is not set
10 CONFIG_CGROUP_SCHED=y
11 CONFIG_VZ_FAIRSCHED=y
e21b3827 12@@ -207,7 +207,7 @@
1cfff965
DM
13 CONFIG_MODVERSIONS=y
14 CONFIG_MODULE_SRCVERSION_ALL=y
15 CONFIG_MODULE_VERIFY_ELF=y
16-CONFIG_MODULE_SIG=y
17+# CONFIG_MODULE_SIG is not set
18 # CONFIG_MODULE_SIG_FORCE is not set
19 CONFIG_MODULE_VERIFY=y
20 CONFIG_STOP_MACHINE=y
2c0fe19a
DM
21@@ -935,7 +935,7 @@
22 # CONFIG_ATM_BR2684_IPFILTER is not set
23 CONFIG_STP=m
24 CONFIG_GARP=m
25-CONFIG_BRIDGE=m
26+CONFIG_BRIDGE=y
27 CONFIG_BRIDGE_IGMP_SNOOPING=y
28 CONFIG_NET_DSA=y
29 CONFIG_NET_DSA_TAG_DSA=y
7e70f1cc 30@@ -1344,10 +1344,10 @@
1cfff965
DM
31 #
32 # SCSI support type (disk, tape, CD-ROM)
33 #
34-CONFIG_BLK_DEV_SD=m
35+CONFIG_BLK_DEV_SD=y
36 CONFIG_CHR_DEV_ST=m
37 CONFIG_CHR_DEV_OSST=m
38-CONFIG_BLK_DEV_SR=m
39+CONFIG_BLK_DEV_SR=y
40 CONFIG_BLK_DEV_SR_VENDOR=y
41 CONFIG_CHR_DEV_SG=m
42 CONFIG_CHR_DEV_SCH=m
7e70f1cc 43@@ -1425,7 +1425,7 @@
229e59d2
DM
44 # CONFIG_SCSI_DMX3191D is not set
45 # CONFIG_SCSI_EATA is not set
46 # CONFIG_SCSI_FUTURE_DOMAIN is not set
47-# CONFIG_SCSI_GDTH is not set
48+CONFIG_SCSI_GDTH=m
49 CONFIG_SCSI_ISCI=m
e21b3827
DM
50 CONFIG_SCSI_IPS=m
51 CONFIG_SCSI_INITIO=m
7e70f1cc 52@@ -1542,7 +1542,7 @@
1cfff965
DM
53 # CONFIG_MULTICORE_RAID456 is not set
54 # CONFIG_MD_MULTIPATH is not set
55 CONFIG_MD_FAULTY=m
56-CONFIG_BLK_DEV_DM=m
57+CONFIG_BLK_DEV_DM=y
58 CONFIG_DM_DEBUG=y
59 CONFIG_DM_CRYPT=m
60 CONFIG_DM_SNAPSHOT=m
7e70f1cc 61@@ -3121,6 +3121,11 @@
1cfff965
DM
62 # CONFIG_LOGO_LINUX_MONO is not set
63 # CONFIG_LOGO_LINUX_VGA16 is not set
64 CONFIG_LOGO_LINUX_CLUT224=y
65+
66+#
67+# Bootsplash configuration
68+#
69+CONFIG_BOOTSPLASH=y
70 CONFIG_SOUND=m
71 CONFIG_SOUND_OSS_CORE=y
72 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
7e70f1cc 73@@ -3719,7 +3724,9 @@
e21b3827
DM
74 # CONFIG_SLICOSS is not set
75 # CONFIG_VIDEO_GO7007 is not set
76 # CONFIG_VIDEO_CX25821 is not set
77-# CONFIG_USB_IP_COMMON is not set
78+CONFIG_USB_IP_COMMON=m
79+CONFIG_USB_IP_VHCI_HCD=m
80+CONFIG_USB_IP_HOST=m
81 # CONFIG_W35UND is not set
82 # CONFIG_PRISM2_USB is not set
83 # CONFIG_ECHO is not set
7e70f1cc
DM
84@@ -3851,7 +3858,11 @@
85 CONFIG_REISERFS_FS_XATTR=y
86 CONFIG_REISERFS_FS_POSIX_ACL=y
87 CONFIG_REISERFS_FS_SECURITY=y
88-# CONFIG_JFS_FS is not set
89+CONFIG_JFS_FS=m
90+CONFIG_JFS_POSIX_ACL=y
91+CONFIG_JFS_SECURITY=y
92+# CONFIG_JFS_DEBUG is not set
93+# CONFIG_JFS_STATISTICS is not set
94 CONFIG_FS_POSIX_ACL=y
95 CONFIG_XFS_FS=m
96 CONFIG_XFS_QUOTA=y
d9e10626
DM
97@@ -3938,8 +3949,8 @@
98 # CONFIG_ADFS_FS is not set
99 # CONFIG_AFFS_FS is not set
100 CONFIG_ECRYPT_FS=m
101-# CONFIG_HFS_FS is not set
102-# CONFIG_HFSPLUS_FS is not set
103+CONFIG_HFS_FS=m
104+CONFIG_HFSPLUS_FS=m
105 # CONFIG_BEFS_FS is not set
106 # CONFIG_BFS_FS is not set
107 # CONFIG_EFS_FS is not set
7e70f1cc 108@@ -4087,7 +4098,7 @@
1cfff965
DM
109 # Kernel hacking
110 #
111 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
112-CONFIG_PRINTK_TIME=y
113+# CONFIG_PRINTK_TIME is not set
114 # CONFIG_ENABLE_WARN_DEPRECATED is not set
115 CONFIG_ENABLE_MUST_CHECK=y
116 CONFIG_FRAME_WARN=2048
7e70f1cc 117@@ -4131,7 +4142,7 @@
1cfff965
DM
118 CONFIG_STACKTRACE=y
119 # CONFIG_DEBUG_KOBJECT is not set
120 CONFIG_DEBUG_BUGVERBOSE=y
121-CONFIG_DEBUG_INFO=y
122+# CONFIG_DEBUG_INFO is not set
123 # CONFIG_DEBUG_VM is not set
124 # CONFIG_DEBUG_VIRTUAL is not set
125 # CONFIG_DEBUG_WRITECOUNT is not set
7e70f1cc 126@@ -4360,8 +4371,8 @@
4718bd9c
DM
127 #
128 CONFIG_CRYPTO_ANSI_CPRNG=m
129 CONFIG_CRYPTO_MPILIB=y
130-CONFIG_CRYPTO_SIGNATURE=y
131-CONFIG_CRYPTO_SIGNATURE_DSA=y
132+# CONFIG_CRYPTO_SIGNATURE is not set
133+# CONFIG_CRYPTO_SIGNATURE_DSA is not set
134 CONFIG_CRYPTO_HW=y
135 CONFIG_CRYPTO_DEV_PADLOCK=m
136 CONFIG_CRYPTO_DEV_PADLOCK_AES=m