projects / pve-kernel-2.6.32.git / blame
| Commit | Line | Data |
|---|---|---|
| 229e59d2 DM |
1 | --- config-2.6.32-042stab037.1.x86_64 2011-09-26 09:10:17.000000000 +0200 |
| 2 | +++ config-2.6.32 2011-09-26 09:11:27.000000000 +0200 | |
| 1cfff965 DM |
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 | |
| 4718bd9c | 12 | @@ -206,7 +206,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 | |
| 4718bd9c | 21 | @@ -1323,10 +1323,10 @@ |
| 1cfff965 DM |
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 | |
| 229e59d2 DM |
34 | @@ -1404,7 +1404,7 @@ |
| 35 | # CONFIG_SCSI_DMX3191D is not set | |
| 36 | # CONFIG_SCSI_EATA is not set | |
| 37 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | |
| 38 | -# CONFIG_SCSI_GDTH is not set | |
| 39 | +CONFIG_SCSI_GDTH=m | |
| 40 | CONFIG_SCSI_ISCI=m | |
| 41 | # CONFIG_PBG_HBA_BETA is not set | |
| 42 | CONFIG_PBG_HBA_A2=y | |
| 4718bd9c | 43 | @@ -1524,7 +1524,7 @@ |
| 1cfff965 DM |
44 | # CONFIG_MULTICORE_RAID456 is not set |
| 45 | # CONFIG_MD_MULTIPATH is not set | |
| 46 | CONFIG_MD_FAULTY=m | |
| 47 | -CONFIG_BLK_DEV_DM=m | |
| 48 | +CONFIG_BLK_DEV_DM=y | |
| 49 | CONFIG_DM_DEBUG=y | |
| 50 | CONFIG_DM_CRYPT=m | |
| 51 | CONFIG_DM_SNAPSHOT=m | |
| 229e59d2 | 52 | @@ -3094,6 +3094,11 @@ |
| 1cfff965 DM |
53 | # CONFIG_LOGO_LINUX_MONO is not set |
| 54 | # CONFIG_LOGO_LINUX_VGA16 is not set | |
| 55 | CONFIG_LOGO_LINUX_CLUT224=y | |
| 56 | + | |
| 57 | +# | |
| 58 | +# Bootsplash configuration | |
| 59 | +# | |
| 60 | +CONFIG_BOOTSPLASH=y | |
| 61 | CONFIG_SOUND=m | |
| 62 | CONFIG_SOUND_OSS_CORE=y | |
| 63 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y | |
| 229e59d2 | 64 | @@ -4050,7 +4055,7 @@ |
| 1cfff965 DM |
65 | # Kernel hacking |
| 66 | # | |
| 67 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |
| 68 | -CONFIG_PRINTK_TIME=y | |
| 69 | +# CONFIG_PRINTK_TIME is not set | |
| 70 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | |
| 71 | CONFIG_ENABLE_MUST_CHECK=y | |
| 72 | CONFIG_FRAME_WARN=2048 | |
| 229e59d2 | 73 | @@ -4094,7 +4099,7 @@ |
| 1cfff965 DM |
74 | CONFIG_STACKTRACE=y |
| 75 | # CONFIG_DEBUG_KOBJECT is not set | |
| 76 | CONFIG_DEBUG_BUGVERBOSE=y | |
| 77 | -CONFIG_DEBUG_INFO=y | |
| 78 | +# CONFIG_DEBUG_INFO is not set | |
| 79 | # CONFIG_DEBUG_VM is not set | |
| 80 | # CONFIG_DEBUG_VIRTUAL is not set | |
| 81 | # CONFIG_DEBUG_WRITECOUNT is not set | |
| 229e59d2 | 82 | @@ -4323,8 +4328,8 @@ |
| 4718bd9c DM |
83 | # |
| 84 | CONFIG_CRYPTO_ANSI_CPRNG=m | |
| 85 | CONFIG_CRYPTO_MPILIB=y | |
| 86 | -CONFIG_CRYPTO_SIGNATURE=y | |
| 87 | -CONFIG_CRYPTO_SIGNATURE_DSA=y | |
| 88 | +# CONFIG_CRYPTO_SIGNATURE is not set | |
| 89 | +# CONFIG_CRYPTO_SIGNATURE_DSA is not set | |
| 90 | CONFIG_CRYPTO_HW=y | |
| 91 | CONFIG_CRYPTO_DEV_PADLOCK=m | |
| 92 | CONFIG_CRYPTO_DEV_PADLOCK_AES=m |