]> git.proxmox.com Git - pve-kernel-2.6.32.git/blame - config-2.6.32.diff
imported from svn 'pve-kernel-2.6.32-rh/pve2'
[pve-kernel-2.6.32.git] / config-2.6.32.diff
CommitLineData
1cfff965
DM
1--- config-2.6.32-042stab018.1.x86_64 2011-06-24 12:43:39.000000000 +0200
2+++ config-2.6.32 2011-06-27 07:31:18.000000000 +0200
3@@ -101,7 +101,7 @@
4 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
5 CONFIG_GROUP_SCHED=y
6 CONFIG_FAIR_GROUP_SCHED=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@@ -205,7 +205,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@@ -1322,10 +1322,10 @@
22 #
23 # SCSI support type (disk, tape, CD-ROM)
24 #
25-CONFIG_BLK_DEV_SD=m
26+CONFIG_BLK_DEV_SD=y
27 CONFIG_CHR_DEV_ST=m
28 CONFIG_CHR_DEV_OSST=m
29-CONFIG_BLK_DEV_SR=m
30+CONFIG_BLK_DEV_SR=y
31 CONFIG_BLK_DEV_SR_VENDOR=y
32 CONFIG_CHR_DEV_SG=m
33 CONFIG_CHR_DEV_SCH=m
34@@ -1523,7 +1523,7 @@
35 # CONFIG_MULTICORE_RAID456 is not set
36 # CONFIG_MD_MULTIPATH is not set
37 CONFIG_MD_FAULTY=m
38-CONFIG_BLK_DEV_DM=m
39+CONFIG_BLK_DEV_DM=y
40 CONFIG_DM_DEBUG=y
41 CONFIG_DM_CRYPT=m
42 CONFIG_DM_SNAPSHOT=m
43@@ -3092,6 +3092,11 @@
44 # CONFIG_LOGO_LINUX_MONO is not set
45 # CONFIG_LOGO_LINUX_VGA16 is not set
46 CONFIG_LOGO_LINUX_CLUT224=y
47+
48+#
49+# Bootsplash configuration
50+#
51+CONFIG_BOOTSPLASH=y
52 CONFIG_SOUND=m
53 CONFIG_SOUND_OSS_CORE=y
54 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
55@@ -4043,7 +4048,7 @@
56 # Kernel hacking
57 #
58 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
59-CONFIG_PRINTK_TIME=y
60+# CONFIG_PRINTK_TIME is not set
61 # CONFIG_ENABLE_WARN_DEPRECATED is not set
62 CONFIG_ENABLE_MUST_CHECK=y
63 CONFIG_FRAME_WARN=2048
64@@ -4087,7 +4092,7 @@
65 CONFIG_STACKTRACE=y
66 # CONFIG_DEBUG_KOBJECT is not set
67 CONFIG_DEBUG_BUGVERBOSE=y
68-CONFIG_DEBUG_INFO=y
69+# CONFIG_DEBUG_INFO is not set
70 # CONFIG_DEBUG_VM is not set
71 # CONFIG_DEBUG_VIRTUAL is not set
72 # CONFIG_DEBUG_WRITECOUNT is not set