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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-08-30 08:42:14 +0000 (Mon, 30 Aug 2010)
New Revision: 5077

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-08-30 08:38:09 UTC (rev 5076)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-08-30 08:42:14 UTC (rev 5077)
@@ -1,5 +1,5 @@
 --- config-2.6.32.org	2010-08-03 12:36:25.000000000 +0200
-+++ config-2.6.32	2010-08-30 10:26:13.000000000 +0200
++++ config-2.6.32	2010-08-30 10:41:17.000000000 +0200
 @@ -207,10 +207,10 @@
  CONFIG_IOSCHED_CFQ=y
  # CONFIG_CFQ_GROUP_IOSCHED is not set
@@ -49,7 +49,23 @@
  CONFIG_IP_MULTICAST=y
  CONFIG_IP_ADVANCED_ROUTER=y
  CONFIG_ASK_IP_FIB_HASH=y
-@@ -4346,7 +4347,7 @@
+@@ -3921,6 +3922,7 @@
+ CONFIG_COMEDI_PCI_DRIVERS=m
+ CONFIG_COMEDI_PCMCIA_DRIVERS=m
+ CONFIG_COMEDI_USB_DRIVERS=m
++CONFIG_COMEDI_8255=m
+ # CONFIG_ASUS_OLED is not set
+ # CONFIG_PANEL is not set
+ # CONFIG_ALTERA_PCIE_CHDMA is not set
+@@ -3994,6 +3996,7 @@
+ CONFIG_SPEAKUP_SYNTH_TXPRT=m
+ CONFIG_SPEAKUP_SYNTH_DUMMY=m
+ # CONFIG_FB_XGI is not set
++# CONFIG_SAMSUNG_LAPTOP is not set
+ CONFIG_X86_PLATFORM_DEVICES=y
+ CONFIG_ACER_WMI=m
+ CONFIG_ACERHDF=m
+@@ -4346,7 +4349,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -58,7 +74,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4383,7 +4384,7 @@
+@@ -4383,7 +4386,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -67,7 +83,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4482,7 +4483,7 @@
+@@ -4482,7 +4485,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -76,7 +92,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4661,3 +4662,7 @@
+@@ -4661,3 +4664,7 @@
  CONFIG_BC_SWAP_ACCOUNTING=y
  CONFIG_BC_PROC=y
  # CONFIG_BC_DEBUG is not set