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

Tue Oct 5 09:29:57 CEST 2010

Author: dietmar
Date: 2010-10-05 07:29:57 +0000 (Tue, 05 Oct 2010)
New Revision: 5210

Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/config-2.6.32.diff
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================

--- pve-kernel-2.6.32/trunk/Makefile	2010-10-04 14:07:28 UTC (rev 5209)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-10-05 07:29:57 UTC (rev 5210)
@@ -3,7 +3,7 @@
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=22
 
-PKGREL=19
+PKGREL=20
 KREL=4
 
 EXTRAVERSION=-${KREL}-pve

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2010-10-04 14:07:28 UTC (rev 5209)
+++ pve-kernel-2.6.32/trunk/README	2010-10-05 07:29:57 UTC (rev 5210)
@@ -104,6 +104,7 @@
 
   	 CONFIG_BLK_DEV_LOOP=y
  
+- enable CONFIG_ISDN_CAPI_CAPIDRV=m
 
 Testing final kernel with kvm
 -----------------------------

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-10-04 14:07:28 UTC (rev 5209)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-10-05 07:29:57 UTC (rev 5210)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-20) unstable; urgency=low
+
+  * enable CAPIDRV module
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 05 Oct 2010 09:28:24 +0200
+
 pve-kernel-2.6.32 (2.6.32-19) unstable; urgency=low
 
   * include latest broadcom bnx2, bnx2x drivers

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-04 14:07:28 UTC (rev 5209)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-05 07:29:57 UTC (rev 5210)
@@ -1,6 +1,6 @@
---- config-2.6.32.org	2010-08-03 12:36:25.000000000 +0200
-+++ config-2.6.32	2010-09-08 11:28:43.000000000 +0200
-@@ -484,7 +484,7 @@
+--- config-2.6.32.org	2010-09-15 12:04:33.000000000 +0200
++++ config-2.6.32	2010-10-05 09:26:31.000000000 +0200
+@@ -486,7 +486,7 @@
  CONFIG_PCI_MMCONFIG=y
  CONFIG_PCI_DOMAINS=y
  CONFIG_DMAR=y
@@ -9,7 +9,7 @@
  CONFIG_DMAR_FLOPPY_WA=y
  CONFIG_INTR_REMAP=y
  CONFIG_PCIEPORTBUS=y
-@@ -498,7 +498,7 @@
+@@ -500,7 +500,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_LEGACY=y
  # CONFIG_PCI_DEBUG is not set
@@ -18,7 +18,7 @@
  CONFIG_HT_IRQ=y
  CONFIG_PCI_IOV=y
  CONFIG_ISA_DMA_API=y
-@@ -575,6 +575,7 @@
+@@ -578,6 +578,7 @@
  CONFIG_NET_KEY=m
  CONFIG_NET_KEY_MIGRATE=y
  CONFIG_INET=y
@@ -26,7 +26,7 @@
  CONFIG_IP_MULTICAST=y
  CONFIG_IP_ADVANCED_ROUTER=y
  CONFIG_ASK_IP_FIB_HASH=y
-@@ -1361,7 +1362,7 @@
+@@ -1364,7 +1365,7 @@
  CONFIG_BLK_DEV_DAC960=m
  CONFIG_BLK_DEV_UMEM=m
  # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -35,7 +35,7 @@
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
  CONFIG_BLK_DEV_DRBD=m
  # CONFIG_DRBD_FAULT_INJECTION is not set
-@@ -1475,7 +1476,7 @@
+@@ -1478,7 +1479,7 @@
  # SCSI device support
  #
  CONFIG_RAID_ATTRS=m
@@ -44,7 +44,7 @@
  CONFIG_SCSI_DMA=y
  CONFIG_SCSI_TGT=m
  CONFIG_SCSI_NETLINK=y
-@@ -1484,12 +1485,12 @@
+@@ -1487,12 +1488,12 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -60,7 +60,7 @@
  CONFIG_CHR_DEV_SCH=m
  CONFIG_SCSI_ENCLOSURE=m
  CONFIG_SCSI_MULTI_LUN=y
-@@ -1681,7 +1682,7 @@
+@@ -1684,7 +1685,7 @@
  # CONFIG_ASYNC_RAID6_TEST is not set
  CONFIG_MD_MULTIPATH=m
  CONFIG_MD_FAULTY=m
@@ -69,7 +69,16 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -4346,7 +4349,7 @@
+@@ -2186,7 +2187,7 @@
+ CONFIG_ISDN_CAPI_CAPI20=m
+ CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+ CONFIG_ISDN_CAPI_CAPIFS=m
+-
++CONFIG_ISDN_CAPI_CAPIDRV=m
+ #
+ # CAPI hardware drivers
+ #
+@@ -4354,7 +4355,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -78,7 +87,7 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4383,7 +4386,7 @@
+@@ -4391,7 +4392,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
@@ -87,7 +96,7 @@
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4482,7 +4485,7 @@
+@@ -4490,7 +4491,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -96,7 +105,7 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4661,3 +4664,7 @@
+@@ -4669,3 +4670,7 @@
  CONFIG_BC_SWAP_ACCOUNTING=y
  CONFIG_BC_PROC=y
  # CONFIG_BC_DEBUG is not set


