[pve-devel] r6098 - pve-kernel-2.6.32/pve2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-17 06:50:27 +0200 (Fri, 17 Jun 2011)
New Revision: 6098

Modified:
   pve-kernel-2.6.32/pve2/config-2.6.32.diff
Log:


Modified: pve-kernel-2.6.32/pve2/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/pve2/config-2.6.32.diff	2011-06-17 04:49:18 UTC (rev 6097)
+++ pve-kernel-2.6.32/pve2/config-2.6.32.diff	2011-06-17 04:50:27 UTC (rev 6098)
@@ -1,12 +1,12 @@
 --- config-2.6.32.org	2010-10-21 09:00:42.000000000 +0200
-+++ config-2.6.32	2010-12-15 13:46:09.000000000 +0100
++++ config-2.6.32	2011-03-29 08:49:43.000000000 +0200
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.32
 -# Tue Oct 19 23:25:36 2010
 +# Linux kernel version: 2.6.32-4-pve
-+# Wed Dec 15 13:45:35 2010
++# Tue Mar 29 08:49:17 2011
  #
  CONFIG_64BIT=y
  # CONFIG_X86_32 is not set
@@ -70,7 +70,15 @@
  CONFIG_CHR_DEV_SCH=m
  CONFIG_SCSI_ENCLOSURE=m
  CONFIG_SCSI_MULTI_LUN=y
-@@ -1686,7 +1687,7 @@
+@@ -1558,6 +1559,7 @@
+ # CONFIG_SCSI_MPT2SAS_LOGGING is not set
+ CONFIG_SCSI_HPTIOP=m
+ CONFIG_SCSI_BUSLOGIC=m
++CONFIG_VMWARE_PVSCSI=m
+ CONFIG_LIBFC=m
+ CONFIG_LIBFCOE=m
+ CONFIG_FCOE=m
+@@ -1686,7 +1688,7 @@
  # CONFIG_ASYNC_RAID6_TEST is not set
  CONFIG_MD_MULTIPATH=m
  CONFIG_MD_FAULTY=m
@@ -79,7 +87,7 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -1895,6 +1896,7 @@
+@@ -1895,6 +1897,7 @@
  CONFIG_MLX4_DEBUG=y
  CONFIG_TEHUTI=m
  CONFIG_BNX2X=m
@@ -87,7 +95,15 @@
  CONFIG_QLGE=m
  CONFIG_SFC=m
  CONFIG_SFC_MTD=y
-@@ -2780,6 +2782,7 @@
+@@ -2698,6 +2701,7 @@
+ CONFIG_SENSORS_ADT7473=m
+ CONFIG_SENSORS_ADT7475=m
+ CONFIG_SENSORS_K8TEMP=m
++CONFIG_SENSORS_K10TEMP=m
+ CONFIG_SENSORS_ASB100=m
+ CONFIG_SENSORS_ATXP1=m
+ CONFIG_SENSORS_DS1621=m
+@@ -2780,6 +2784,7 @@
  CONFIG_ADVANTECH_WDT=m
  CONFIG_ALIM1535_WDT=m
  CONFIG_ALIM7101_WDT=m
@@ -95,7 +111,7 @@
  CONFIG_SC520_WDT=m
  CONFIG_SBC_FITPC2_WATCHDOG=m
  CONFIG_EUROTECH_WDT=m
-@@ -3392,6 +3395,11 @@
+@@ -3392,6 +3397,11 @@
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
@@ -107,7 +123,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-@@ -4008,6 +4016,7 @@
+@@ -4008,6 +4018,7 @@
  # CONFIG_POCH is not set
  CONFIG_BRCM80211=m
  CONFIG_BRCM80211_PCI=y
@@ -115,7 +131,7 @@
  CONFIG_RT2860=m
  CONFIG_RT2870=m
  CONFIG_COMEDI=m
-@@ -4442,7 +4451,7 @@
+@@ -4442,7 +4453,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -124,7 +140,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4479,7 +4488,7 @@
+@@ -4479,7 +4490,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -133,7 +149,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4578,7 +4587,7 @@
+@@ -4578,7 +4589,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -142,7 +158,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4722,7 +4731,7 @@
+@@ -4722,7 +4733,7 @@
  CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m