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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-12-15 13:47:35 +0100 (Wed, 15 Dec 2010)
New Revision: 5341

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-12-15 12:44:11 UTC (rev 5340)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-12-15 12:47:35 UTC (rev 5341)
@@ -1,12 +1,12 @@
 --- config-2.6.32.org	2010-10-21 09:00:42.000000000 +0200
-+++ config-2.6.32	2010-11-26 05:44:06.000000000 +0100
++++ config-2.6.32	2010-12-15 13:46:09.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
++# Wed Dec 15 13:45:35 2010
  #
  CONFIG_64BIT=y
  # CONFIG_X86_32 is not set
@@ -87,7 +87,15 @@
  CONFIG_QLGE=m
  CONFIG_SFC=m
  CONFIG_SFC_MTD=y
-@@ -3392,6 +3394,11 @@
+@@ -2780,6 +2782,7 @@
+ CONFIG_ADVANTECH_WDT=m
+ CONFIG_ALIM1535_WDT=m
+ CONFIG_ALIM7101_WDT=m
++CONFIG_F71808E_WDT=m
+ CONFIG_SC520_WDT=m
+ CONFIG_SBC_FITPC2_WATCHDOG=m
+ CONFIG_EUROTECH_WDT=m
+@@ -3392,6 +3395,11 @@
  CONFIG_FONT_8x8=y
  CONFIG_FONT_8x16=y
  # CONFIG_LOGO is not set
@@ -99,7 +107,7 @@
  CONFIG_SOUND=m
  CONFIG_SOUND_OSS_CORE=y
  # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-@@ -4008,6 +4015,7 @@
+@@ -4008,6 +4016,7 @@
  # CONFIG_POCH is not set
  CONFIG_BRCM80211=m
  CONFIG_BRCM80211_PCI=y
@@ -107,7 +115,7 @@
  CONFIG_RT2860=m
  CONFIG_RT2870=m
  CONFIG_COMEDI=m
-@@ -4442,7 +4450,7 @@
+@@ -4442,7 +4451,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -116,7 +124,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4479,7 +4487,7 @@
+@@ -4479,7 +4488,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -125,7 +133,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4578,7 +4586,7 @@
+@@ -4578,7 +4587,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -134,7 +142,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4722,7 +4730,7 @@
+@@ -4722,7 +4731,7 @@
  CONFIG_GENERIC_FIND_LAST_BIT=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=m