update to vzkernel-2.6.32-042stab110.1.src.rpm (API 40-pve)

[pve-kernel-2.6.32.git] / config-2.6.32.diff

diff --git a/config-2.6.32.diff b/config-2.6.32.diff
index 7002c1119064198cab90e58f150d7fc1b758bc8c..69c640b5ac879572463504793221326a89792de5 100644 (file)
--- a/config-2.6.32.diff
+++ b/config-2.6.32.diff
@@ -1,5 +1,5 @@
---- config-2.6.32-042stab085.17.x86_64 2014-03-12 19:23:02.000000000 +0100
-+++ config-2.6.32      2014-04-10 08:18:48.000000000 +0200
+--- config-2.6.32-042stab090.4.x86_64  2014-06-18 08:38:14.000000000 +0200
++++ config-2.6.32      2014-06-21 18:59:08.000000000 +0200
 @@ -212,7 +212,7 @@
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
@@ -57,6 +57,15 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
+@@ -1430,7 +1430,7 @@
+ CONFIG_SCSI_HPSA=m
+ CONFIG_SCSI_3W_9XXX=m
+ CONFIG_SCSI_3W_SAS=m
+-# CONFIG_SCSI_ACARD is not set
++CONFIG_SCSI_ACARD=m
+ CONFIG_SCSI_AACRAID=m
+ CONFIG_SCSI_AIC7XXX=m
+ CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
 @@ -1475,7 +1475,7 @@
  # CONFIG_SCSI_DMX3191D is not set
  # CONFIG_SCSI_EATA is not set
@@ -66,10 +75,11 @@
  CONFIG_SCSI_ISCI=m
  CONFIG_SCSI_IPS=m
  CONFIG_SCSI_INITIO=m
-@@ -1593,7 +1593,7 @@
+@@ -1593,8 +1593,8 @@
  CONFIG_MD_RAID456=m
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
+ CONFIG_BLK_DEV_DM_BUILTIN=y
 -CONFIG_BLK_DEV_DM=m
 +CONFIG_BLK_DEV_DM=y
  CONFIG_DM_DEBUG=y
@@ -99,19 +109,6 @@
  # CONFIG_W35UND is not set
  # CONFIG_PRISM2_USB is not set
  # CONFIG_ECHO is not set
-@@ -4050,7 +4056,11 @@
- CONFIG_REISERFS_FS_XATTR=y
- CONFIG_REISERFS_FS_POSIX_ACL=y
- CONFIG_REISERFS_FS_SECURITY=y
--# CONFIG_JFS_FS is not set
-+CONFIG_JFS_FS=m
-+CONFIG_JFS_POSIX_ACL=y
-+CONFIG_JFS_SECURITY=y
-+# CONFIG_JFS_DEBUG is not set
-+# CONFIG_JFS_STATISTICS is not set
- CONFIG_FS_POSIX_ACL=y
- CONFIG_XFS_FS=m
- CONFIG_XFS_QUOTA=y
 @@ -4140,8 +4150,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set