]>
Commit | Line | Data |
---|---|---|
43117d4e DM |
1 | --- config-2.6.32-042stab076.7.x86_64 2013-04-29 23:21:00.000000000 +0200 |
2 | +++ config-2.6.32 2013-05-07 06:40:45.000000000 +0200 | |
2c811847 | 3 | @@ -210,7 +210,7 @@ |
1cfff965 DM |
4 | CONFIG_MODVERSIONS=y |
5 | CONFIG_MODULE_SRCVERSION_ALL=y | |
6 | CONFIG_MODULE_VERIFY_ELF=y | |
7 | -CONFIG_MODULE_SIG=y | |
8 | +# CONFIG_MODULE_SIG is not set | |
9 | # CONFIG_MODULE_SIG_FORCE is not set | |
10 | CONFIG_MODULE_VERIFY=y | |
11 | CONFIG_STOP_MACHINE=y | |
43117d4e DM |
12 | @@ -230,10 +230,10 @@ |
13 | CONFIG_IOSCHED_CFQ=y | |
14 | CONFIG_CFQ_GROUP_IOSCHED=y | |
15 | # CONFIG_DEFAULT_AS is not set | |
16 | -# CONFIG_DEFAULT_DEADLINE is not set | |
17 | -CONFIG_DEFAULT_CFQ=y | |
18 | +CONFIG_DEFAULT_DEADLINE=y | |
19 | +# CONFIG_DEFAULT_CFQ is not set | |
20 | # CONFIG_DEFAULT_NOOP is not set | |
21 | -CONFIG_DEFAULT_IOSCHED="cfq" | |
22 | +CONFIG_DEFAULT_IOSCHED="deadline" | |
23 | CONFIG_PREEMPT_NOTIFIERS=y | |
24 | CONFIG_FREEZER=y | |
25 | ||
26 | @@ -946,7 +946,7 @@ | |
2c0fe19a DM |
27 | # CONFIG_ATM_BR2684_IPFILTER is not set |
28 | CONFIG_STP=m | |
29 | CONFIG_GARP=m | |
30 | -CONFIG_BRIDGE=m | |
31 | +CONFIG_BRIDGE=y | |
814f5a02 | 32 | CONFIG_BRIDGE_IGMP_SNOOPING=y |
2c0fe19a DM |
33 | CONFIG_NET_DSA=y |
34 | CONFIG_NET_DSA_TAG_DSA=y | |
e5c53408 | 35 | @@ -1364,10 +1364,10 @@ |
1cfff965 DM |
36 | # |
37 | # SCSI support type (disk, tape, CD-ROM) | |
38 | # | |
39 | -CONFIG_BLK_DEV_SD=m | |
40 | +CONFIG_BLK_DEV_SD=y | |
41 | CONFIG_CHR_DEV_ST=m | |
42 | CONFIG_CHR_DEV_OSST=m | |
43 | -CONFIG_BLK_DEV_SR=m | |
44 | +CONFIG_BLK_DEV_SR=y | |
45 | CONFIG_BLK_DEV_SR_VENDOR=y | |
46 | CONFIG_CHR_DEV_SG=m | |
47 | CONFIG_CHR_DEV_SCH=m | |
e5c53408 | 48 | @@ -1444,7 +1444,7 @@ |
229e59d2 DM |
49 | # CONFIG_SCSI_DMX3191D is not set |
50 | # CONFIG_SCSI_EATA is not set | |
51 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | |
52 | -# CONFIG_SCSI_GDTH is not set | |
53 | +CONFIG_SCSI_GDTH=m | |
54 | CONFIG_SCSI_ISCI=m | |
e21b3827 DM |
55 | CONFIG_SCSI_IPS=m |
56 | CONFIG_SCSI_INITIO=m | |
e5c53408 | 57 | @@ -1562,7 +1562,7 @@ |
1cfff965 DM |
58 | # CONFIG_MULTICORE_RAID456 is not set |
59 | # CONFIG_MD_MULTIPATH is not set | |
60 | CONFIG_MD_FAULTY=m | |
61 | -CONFIG_BLK_DEV_DM=m | |
62 | +CONFIG_BLK_DEV_DM=y | |
63 | CONFIG_DM_DEBUG=y | |
2c811847 DM |
64 | CONFIG_DM_BUFIO=m |
65 | CONFIG_DM_PERSISTENT_DATA=m | |
e5c53408 | 66 | @@ -3169,7 +3169,11 @@ |
1cfff965 DM |
67 | # CONFIG_LOGO_LINUX_MONO is not set |
68 | # CONFIG_LOGO_LINUX_VGA16 is not set | |
69 | CONFIG_LOGO_LINUX_CLUT224=y | |
2c811847 DM |
70 | -CONFIG_LOGO_PSBM_CLUT224=y |
71 | +# CONFIG_LOGO_PSBM_CLUT224 is not set | |
1cfff965 DM |
72 | +# |
73 | +# Bootsplash configuration | |
74 | +# | |
75 | +CONFIG_BOOTSPLASH=y | |
76 | CONFIG_SOUND=m | |
77 | CONFIG_SOUND_OSS_CORE=y | |
78 | CONFIG_SOUND_OSS_CORE_PRECLAIM=y | |
e5c53408 | 79 | @@ -3772,7 +3776,9 @@ |
e21b3827 DM |
80 | # CONFIG_SLICOSS is not set |
81 | # CONFIG_VIDEO_GO7007 is not set | |
82 | # CONFIG_VIDEO_CX25821 is not set | |
83 | -# CONFIG_USB_IP_COMMON is not set | |
84 | +CONFIG_USB_IP_COMMON=m | |
85 | +CONFIG_USB_IP_VHCI_HCD=m | |
86 | +CONFIG_USB_IP_HOST=m | |
87 | # CONFIG_W35UND is not set | |
88 | # CONFIG_PRISM2_USB is not set | |
89 | # CONFIG_ECHO is not set | |
e5c53408 | 90 | @@ -3904,7 +3910,11 @@ |
7e70f1cc DM |
91 | CONFIG_REISERFS_FS_XATTR=y |
92 | CONFIG_REISERFS_FS_POSIX_ACL=y | |
93 | CONFIG_REISERFS_FS_SECURITY=y | |
94 | -# CONFIG_JFS_FS is not set | |
95 | +CONFIG_JFS_FS=m | |
96 | +CONFIG_JFS_POSIX_ACL=y | |
97 | +CONFIG_JFS_SECURITY=y | |
98 | +# CONFIG_JFS_DEBUG is not set | |
99 | +# CONFIG_JFS_STATISTICS is not set | |
100 | CONFIG_FS_POSIX_ACL=y | |
101 | CONFIG_XFS_FS=m | |
102 | CONFIG_XFS_QUOTA=y | |
e5c53408 | 103 | @@ -3992,8 +4002,8 @@ |
d9e10626 DM |
104 | # CONFIG_ADFS_FS is not set |
105 | # CONFIG_AFFS_FS is not set | |
106 | CONFIG_ECRYPT_FS=m | |
107 | -# CONFIG_HFS_FS is not set | |
108 | -# CONFIG_HFSPLUS_FS is not set | |
109 | +CONFIG_HFS_FS=m | |
110 | +CONFIG_HFSPLUS_FS=m | |
111 | # CONFIG_BEFS_FS is not set | |
112 | # CONFIG_BFS_FS is not set | |
113 | # CONFIG_EFS_FS is not set | |
e5c53408 | 114 | @@ -4140,7 +4150,7 @@ |
1cfff965 DM |
115 | # Kernel hacking |
116 | # | |
117 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | |
118 | -CONFIG_PRINTK_TIME=y | |
119 | +# CONFIG_PRINTK_TIME is not set | |
120 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | |
121 | CONFIG_ENABLE_MUST_CHECK=y | |
122 | CONFIG_FRAME_WARN=2048 | |
e5c53408 | 123 | @@ -4184,7 +4194,7 @@ |
1cfff965 DM |
124 | CONFIG_STACKTRACE=y |
125 | # CONFIG_DEBUG_KOBJECT is not set | |
126 | CONFIG_DEBUG_BUGVERBOSE=y | |
127 | -CONFIG_DEBUG_INFO=y | |
128 | +# CONFIG_DEBUG_INFO is not set | |
129 | # CONFIG_DEBUG_VM is not set | |
130 | # CONFIG_DEBUG_VIRTUAL is not set | |
131 | # CONFIG_DEBUG_WRITECOUNT is not set | |
e5c53408 | 132 | @@ -4415,8 +4425,8 @@ |
4718bd9c DM |
133 | # |
134 | CONFIG_CRYPTO_ANSI_CPRNG=m | |
135 | CONFIG_CRYPTO_MPILIB=y | |
136 | -CONFIG_CRYPTO_SIGNATURE=y | |
137 | -CONFIG_CRYPTO_SIGNATURE_DSA=y | |
138 | +# CONFIG_CRYPTO_SIGNATURE is not set | |
139 | +# CONFIG_CRYPTO_SIGNATURE_DSA is not set | |
140 | CONFIG_CRYPTO_HW=y | |
141 | CONFIG_CRYPTO_DEV_PADLOCK=m | |
142 | CONFIG_CRYPTO_DEV_PADLOCK_AES=m |