[pve-devel] r5318 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-11-26 04:45:09 +0000 (Fri, 26 Nov 2010)
New Revision: 5318

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


Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-11-26 04:40:01 UTC (rev 5317)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-11-26 04:45:09 UTC (rev 5318)
@@ -1,5 +1,15 @@
 --- config-2.6.32.org	2010-10-21 09:00:42.000000000 +0200
-+++ config-2.6.32	2010-10-21 09:15:03.000000000 +0200
++++ config-2.6.32	2010-11-26 05:44:06.000000000 +0100
+@@ -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
++# Fri Nov 26 05:42:51 2010
+ #
+ CONFIG_64BIT=y
+ # CONFIG_X86_32 is not set
 @@ -502,7 +502,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_LEGACY=y
@@ -69,7 +79,15 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -3392,6 +3393,11 @@
+@@ -1895,6 +1896,7 @@
+ CONFIG_MLX4_DEBUG=y
+ CONFIG_TEHUTI=m
+ CONFIG_BNX2X=m
++CONFIG_QLCNIC=m
+ CONFIG_QLGE=m
+ CONFIG_SFC=m
+ CONFIG_SFC_MTD=y
+@@ -3392,6 +3394,11 @@
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
@@ -81,7 +99,15 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-@@ -4442,7 +4448,7 @@
+@@ -4008,6 +4015,7 @@
+ # CONFIG_POCH is not set
+ CONFIG_BRCM80211=m
+ CONFIG_BRCM80211_PCI=y
++# CONFIG_BRCMFMAC is not set
+ CONFIG_RT2860=m
+ CONFIG_RT2870=m
+ CONFIG_COMEDI=m
+@@ -4442,7 +4450,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -90,7 +116,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4479,7 +4485,7 @@
+@@ -4479,7 +4487,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -99,7 +125,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4578,7 +4584,7 @@
+@@ -4578,7 +4586,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -108,7 +134,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4722,7 +4728,7 @@
+@@ -4722,7 +4730,7 @@
  CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m