]> git.proxmox.com Git - pve-kernel-2.6.32.git/blob - config-2.6.32.diff
e3d2fc9b7b7b8a7571a6e903dfb6f1963c1b7a4a
[pve-kernel-2.6.32.git] / config-2.6.32.diff
1 --- config-2.6.32-042stab063.2.x86_64 2012-10-24 15:05:41.000000000 +0200
2 +++ config-2.6.32.new 2012-11-05 12:12:15.000000000 +0100
3 @@ -106,7 +106,7 @@
4 CONFIG_FAIR_GROUP_SCHED=y
5 CONFIG_CFS_BANDWIDTH=y
6 CONFIG_CFS_CPULIMIT=y
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
12 @@ -210,7 +210,7 @@
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
21 @@ -944,7 +944,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
30 @@ -1362,10 +1362,10 @@
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
43 @@ -1442,7 +1442,7 @@
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
50 CONFIG_SCSI_IPS=m
51 CONFIG_SCSI_INITIO=m
52 @@ -1560,7 +1560,7 @@
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_BUFIO=m
60 CONFIG_DM_PERSISTENT_DATA=m
61 @@ -3167,7 +3167,11 @@
62 # CONFIG_LOGO_LINUX_MONO is not set
63 # CONFIG_LOGO_LINUX_VGA16 is not set
64 CONFIG_LOGO_LINUX_CLUT224=y
65 -CONFIG_LOGO_PSBM_CLUT224=y
66 +# CONFIG_LOGO_PSBM_CLUT224 is not set
67 +#
68 +# Bootsplash configuration
69 +#
70 +CONFIG_BOOTSPLASH=y
71 CONFIG_SOUND=m
72 CONFIG_SOUND_OSS_CORE=y
73 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
74 @@ -3770,7 +3774,9 @@
75 # CONFIG_SLICOSS is not set
76 # CONFIG_VIDEO_GO7007 is not set
77 # CONFIG_VIDEO_CX25821 is not set
78 -# CONFIG_USB_IP_COMMON is not set
79 +CONFIG_USB_IP_COMMON=m
80 +CONFIG_USB_IP_VHCI_HCD=m
81 +CONFIG_USB_IP_HOST=m
82 # CONFIG_W35UND is not set
83 # CONFIG_PRISM2_USB is not set
84 # CONFIG_ECHO is not set
85 @@ -3902,7 +3908,11 @@
86 CONFIG_REISERFS_FS_XATTR=y
87 CONFIG_REISERFS_FS_POSIX_ACL=y
88 CONFIG_REISERFS_FS_SECURITY=y
89 -# CONFIG_JFS_FS is not set
90 +CONFIG_JFS_FS=m
91 +CONFIG_JFS_POSIX_ACL=y
92 +CONFIG_JFS_SECURITY=y
93 +# CONFIG_JFS_DEBUG is not set
94 +# CONFIG_JFS_STATISTICS is not set
95 CONFIG_FS_POSIX_ACL=y
96 CONFIG_XFS_FS=m
97 CONFIG_XFS_QUOTA=y
98 @@ -3990,8 +4000,8 @@
99 # CONFIG_ADFS_FS is not set
100 # CONFIG_AFFS_FS is not set
101 CONFIG_ECRYPT_FS=m
102 -# CONFIG_HFS_FS is not set
103 -# CONFIG_HFSPLUS_FS is not set
104 +CONFIG_HFS_FS=m
105 +CONFIG_HFSPLUS_FS=m
106 # CONFIG_BEFS_FS is not set
107 # CONFIG_BFS_FS is not set
108 # CONFIG_EFS_FS is not set
109 @@ -4138,7 +4148,7 @@
110 # Kernel hacking
111 #
112 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
113 -CONFIG_PRINTK_TIME=y
114 +# CONFIG_PRINTK_TIME is not set
115 # CONFIG_ENABLE_WARN_DEPRECATED is not set
116 CONFIG_ENABLE_MUST_CHECK=y
117 CONFIG_FRAME_WARN=2048
118 @@ -4182,7 +4192,7 @@
119 CONFIG_STACKTRACE=y
120 # CONFIG_DEBUG_KOBJECT is not set
121 CONFIG_DEBUG_BUGVERBOSE=y
122 -CONFIG_DEBUG_INFO=y
123 +# CONFIG_DEBUG_INFO is not set
124 # CONFIG_DEBUG_VM is not set
125 # CONFIG_DEBUG_VIRTUAL is not set
126 # CONFIG_DEBUG_WRITECOUNT is not set
127 @@ -4413,8 +4423,8 @@
128 #
129 CONFIG_CRYPTO_ANSI_CPRNG=m
130 CONFIG_CRYPTO_MPILIB=y
131 -CONFIG_CRYPTO_SIGNATURE=y
132 -CONFIG_CRYPTO_SIGNATURE_DSA=y
133 +# CONFIG_CRYPTO_SIGNATURE is not set
134 +# CONFIG_CRYPTO_SIGNATURE_DSA is not set
135 CONFIG_CRYPTO_HW=y
136 CONFIG_CRYPTO_DEV_PADLOCK=m
137 CONFIG_CRYPTO_DEV_PADLOCK_AES=m