]> git.proxmox.com Git - pve-kernel-2.6.32.git/blob - config-2.6.32.diff
add zfs copyright info
[pve-kernel-2.6.32.git] / config-2.6.32.diff
1 --- config-2.6.32-042stab090.4.x86_64 2014-06-18 08:38:14.000000000 +0200
2 +++ config-2.6.32 2014-06-21 18:59:08.000000000 +0200
3 @@ -212,7 +212,7 @@
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
12 @@ -232,10 +232,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 @@ -487,9 +487,9 @@
27 CONFIG_CPU_FREQ_DEBUG=y
28 CONFIG_CPU_FREQ_STAT=m
29 CONFIG_CPU_FREQ_STAT_DETAILS=y
30 -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
31 +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
32 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
33 -CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
34 +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
35 # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
36 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
37 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
38 @@ -961,7 +961,7 @@
39 # CONFIG_ATM_BR2684_IPFILTER is not set
40 CONFIG_STP=m
41 CONFIG_GARP=m
42 -CONFIG_BRIDGE=m
43 +CONFIG_BRIDGE=y
44 CONFIG_BRIDGE_IGMP_SNOOPING=y
45 CONFIG_NET_DSA=y
46 CONFIG_NET_DSA_TAG_DSA=y
47 @@ -1391,10 +1391,10 @@
48 #
49 # SCSI support type (disk, tape, CD-ROM)
50 #
51 -CONFIG_BLK_DEV_SD=m
52 +CONFIG_BLK_DEV_SD=y
53 CONFIG_CHR_DEV_ST=m
54 CONFIG_CHR_DEV_OSST=m
55 -CONFIG_BLK_DEV_SR=m
56 +CONFIG_BLK_DEV_SR=y
57 CONFIG_BLK_DEV_SR_VENDOR=y
58 CONFIG_CHR_DEV_SG=m
59 CONFIG_CHR_DEV_SCH=m
60 @@ -1430,7 +1430,7 @@
61 CONFIG_SCSI_HPSA=m
62 CONFIG_SCSI_3W_9XXX=m
63 CONFIG_SCSI_3W_SAS=m
64 -# CONFIG_SCSI_ACARD is not set
65 +CONFIG_SCSI_ACARD=m
66 CONFIG_SCSI_AACRAID=m
67 CONFIG_SCSI_AIC7XXX=m
68 CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
69 @@ -1475,7 +1475,7 @@
70 # CONFIG_SCSI_DMX3191D is not set
71 # CONFIG_SCSI_EATA is not set
72 # CONFIG_SCSI_FUTURE_DOMAIN is not set
73 -# CONFIG_SCSI_GDTH is not set
74 +CONFIG_SCSI_GDTH=m
75 CONFIG_SCSI_ISCI=m
76 CONFIG_SCSI_IPS=m
77 CONFIG_SCSI_INITIO=m
78 @@ -1593,8 +1593,8 @@
79 CONFIG_MD_RAID456=m
80 # CONFIG_MD_MULTIPATH is not set
81 CONFIG_MD_FAULTY=m
82 CONFIG_BLK_DEV_DM_BUILTIN=y
83 -CONFIG_BLK_DEV_DM=m
84 +CONFIG_BLK_DEV_DM=y
85 CONFIG_DM_DEBUG=y
86 CONFIG_DM_BUFIO=m
87 CONFIG_DM_BIO_PRISON=m
88 @@ -3310,7 +3310,11 @@
89 # CONFIG_LOGO_LINUX_MONO is not set
90 # CONFIG_LOGO_LINUX_VGA16 is not set
91 CONFIG_LOGO_LINUX_CLUT224=y
92 -CONFIG_LOGO_PSBM_CLUT224=y
93 +# CONFIG_LOGO_PSBM_CLUT224 is not set
94 +#
95 +# Bootsplash configuration
96 +#
97 +CONFIG_BOOTSPLASH=y
98 CONFIG_SOUND=m
99 CONFIG_SOUND_OSS_CORE=y
100 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
101 @@ -3927,7 +3931,9 @@
102 # CONFIG_SLICOSS is not set
103 # CONFIG_VIDEO_GO7007 is not set
104 # CONFIG_VIDEO_CX25821 is not set
105 -# CONFIG_USB_IP_COMMON is not set
106 +CONFIG_USB_IP_COMMON=m
107 +CONFIG_USB_IP_VHCI_HCD=m
108 +CONFIG_USB_IP_HOST=m
109 # CONFIG_W35UND is not set
110 # CONFIG_PRISM2_USB is not set
111 # CONFIG_ECHO is not set
112 @@ -4050,7 +4056,11 @@
113 CONFIG_REISERFS_FS_XATTR=y
114 CONFIG_REISERFS_FS_POSIX_ACL=y
115 CONFIG_REISERFS_FS_SECURITY=y
116 -# CONFIG_JFS_FS is not set
117 +CONFIG_JFS_FS=m
118 +CONFIG_JFS_POSIX_ACL=y
119 +CONFIG_JFS_SECURITY=y
120 +# CONFIG_JFS_DEBUG is not set
121 +# CONFIG_JFS_STATISTICS is not set
122 CONFIG_FS_POSIX_ACL=y
123 CONFIG_XFS_FS=m
124 CONFIG_XFS_QUOTA=y
125 @@ -4140,8 +4150,8 @@
126 # CONFIG_ADFS_FS is not set
127 # CONFIG_AFFS_FS is not set
128 CONFIG_ECRYPT_FS=m
129 -# CONFIG_HFS_FS is not set
130 -# CONFIG_HFSPLUS_FS is not set
131 +CONFIG_HFS_FS=m
132 +CONFIG_HFSPLUS_FS=m
133 # CONFIG_BEFS_FS is not set
134 # CONFIG_BFS_FS is not set
135 # CONFIG_EFS_FS is not set
136 @@ -4289,7 +4299,7 @@
137 # Kernel hacking
138 #
139 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
140 -CONFIG_PRINTK_TIME=y
141 +# CONFIG_PRINTK_TIME is not set
142 # CONFIG_ENABLE_WARN_DEPRECATED is not set
143 CONFIG_ENABLE_MUST_CHECK=y
144 CONFIG_FRAME_WARN=2048
145 @@ -4333,7 +4343,7 @@
146 CONFIG_STACKTRACE=y
147 # CONFIG_DEBUG_KOBJECT is not set
148 CONFIG_DEBUG_BUGVERBOSE=y
149 -CONFIG_DEBUG_INFO=y
150 +# CONFIG_DEBUG_INFO is not set
151 # CONFIG_DEBUG_VM is not set
152 # CONFIG_DEBUG_VIRTUAL is not set
153 # CONFIG_DEBUG_WRITECOUNT is not set
154 @@ -4567,8 +4577,8 @@
155 #
156 CONFIG_CRYPTO_ANSI_CPRNG=m
157 CONFIG_CRYPTO_MPILIB=y
158 -CONFIG_CRYPTO_SIGNATURE=y
159 -CONFIG_CRYPTO_SIGNATURE_DSA=y
160 +# CONFIG_CRYPTO_SIGNATURE is not set
161 +# CONFIG_CRYPTO_SIGNATURE_DSA is not set
162 CONFIG_CRYPTO_HW=y
163 CONFIG_CRYPTO_DEV_PADLOCK=m
164 CONFIG_CRYPTO_DEV_PADLOCK_AES=m