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

Tue Oct 5 11:50:20 CEST 2010

Author: dietmar
Date: 2010-10-05 09:50:20 +0000 (Tue, 05 Oct 2010)
New Revision: 5211

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


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

--- pve-kernel-2.6.32/trunk/README	2010-10-05 07:29:57 UTC (rev 5210)
+++ pve-kernel-2.6.32/trunk/README	2010-10-05 09:50:20 UTC (rev 5211)
@@ -104,8 +104,13 @@
 
   	 CONFIG_BLK_DEV_LOOP=y
  
-- enable CONFIG_ISDN_CAPI_CAPIDRV=m
+- enable old isdn4linux drivers
 
+  CONFIG_ISDN_I4L=m
+  CONFIG_ISDN_CAPI_CAPIDRV=m
+  and many related ISDN settings
+
+
 Testing final kernel with kvm
 -----------------------------
 

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-05 07:29:57 UTC (rev 5210)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-05 09:50:20 UTC (rev 5211)
@@ -1,5 +1,5 @@
 --- 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
++++ config-2.6.32	2010-10-05 10:47:57.000000000 +0200
 @@ -486,7 +486,7 @@
  CONFIG_PCI_MMCONFIG=y
  CONFIG_PCI_DOMAINS=y
@@ -69,16 +69,135 @@
  # CONFIG_DM_DEBUG is not set
  CONFIG_DM_CRYPT=m
  CONFIG_DM_SNAPSHOT=m
-@@ -2186,7 +2187,7 @@
+@@ -2161,7 +2162,7 @@
+ CONFIG_VIRTIO_NET=m
+ CONFIG_VMXNET3=m
+ CONFIG_ISDN=y
+-# CONFIG_ISDN_I4L is not set
++CONFIG_ISDN_I4L=m
+ CONFIG_MISDN=m
+ CONFIG_MISDN_DSP=m
+ CONFIG_MISDN_L1OIP=m
+@@ -2179,6 +2180,86 @@
+ # CONFIG_MISDN_NETJET is not set
+ CONFIG_MISDN_IPAC=m
+ CONFIG_MISDN_ISAR=m
++CONFIG_ISDN_PPP=y
++CONFIG_ISDN_PPP_VJ=y
++CONFIG_ISDN_MPP=y
++CONFIG_IPPP_FILTER=y
++CONFIG_ISDN_PPP_BSDCOMP=m
++CONFIG_ISDN_AUDIO=y
++CONFIG_ISDN_TTY_FAX=y
++CONFIG_ISDN_X25=y
++
++#
++# ISDN feature submodules
++#
++CONFIG_ISDN_DIVERSION=m
++
++#
++# ISDN4Linux hardware drivers
++#
++
++#
++# Passive cards
++#
++CONFIG_ISDN_DRV_HISAX=m
++
++#
++# D-channel protocol features
++#
++CONFIG_HISAX_EURO=y
++CONFIG_DE_AOC=y
++CONFIG_HISAX_NO_SENDCOMPLETE=y
++CONFIG_HISAX_NO_LLC=y
++CONFIG_HISAX_NO_KEYPAD=y
++CONFIG_HISAX_1TR6=y
++CONFIG_HISAX_NI1=y
++CONFIG_HISAX_MAX_CARDS=8
++
++#
++# HiSax supported cards
++#
++CONFIG_HISAX_16_3=y
++CONFIG_HISAX_TELESPCI=y
++CONFIG_HISAX_S0BOX=y
++CONFIG_HISAX_FRITZPCI=y
++CONFIG_HISAX_AVM_A1_PCMCIA=y
++CONFIG_HISAX_ELSA=y
++CONFIG_HISAX_DIEHLDIVA=y
++CONFIG_HISAX_SEDLBAUER=y
++CONFIG_HISAX_NETJET=y
++CONFIG_HISAX_NETJET_U=y
++CONFIG_HISAX_NICCY=y
++CONFIG_HISAX_BKM_A4T=y
++CONFIG_HISAX_SCT_QUADRO=y
++CONFIG_HISAX_GAZEL=y
++CONFIG_HISAX_HFC_PCI=y
++CONFIG_HISAX_W6692=y
++CONFIG_HISAX_HFC_SX=y
++CONFIG_HISAX_ENTERNOW_PCI=y
++# CONFIG_HISAX_DEBUG is not set
++
++#
++# HiSax PCMCIA card service modules
++#
++CONFIG_HISAX_SEDLBAUER_CS=m
++CONFIG_HISAX_ELSA_CS=m
++CONFIG_HISAX_AVM_A1_CS=m
++CONFIG_HISAX_TELES_CS=m
++
++#
++# HiSax sub driver modules
++#
++CONFIG_HISAX_ST5481=m
++CONFIG_HISAX_HFCUSB=m
++CONFIG_HISAX_HFC4S8S=m
++CONFIG_HISAX_FRITZ_PCIPNP=m
++
++#
++# Active cards
++#
++CONFIG_HYSDN=m
++CONFIG_HYSDN_CAPI=y
++CONFIG_ISDN_HDLC=m
+ CONFIG_ISDN_CAPI=m
+ CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+ CONFIG_CAPI_TRACE=y
+@@ -2186,6 +2267,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 @@
+@@ -2204,6 +2286,11 @@
+ CONFIG_ISDN_DIVAS_DIVACAPI=m
+ CONFIG_ISDN_DIVAS_USERIDI=m
+ CONFIG_ISDN_DIVAS_MAINT=m
++CONFIG_ISDN_DRV_GIGASET=m
++CONFIG_GIGASET_BASE=m
++CONFIG_GIGASET_M105=m
++CONFIG_GIGASET_M101=m
++# CONFIG_GIGASET_DEBUG is not set
+ CONFIG_PHONE=m
+ CONFIG_PHONE_IXJ=m
+ CONFIG_PHONE_IXJ_PCMCIA=m
+@@ -3304,6 +3391,11 @@
+ CONFIG_FONT_8x8=y
+ CONFIG_FONT_8x16=y
+ # CONFIG_LOGO is not set
++
++#
++# Bootsplash configuration
++#
++CONFIG_BOOTSPLASH=y
+ CONFIG_SOUND=m
+ CONFIG_SOUND_OSS_CORE=y
+ # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+@@ -4354,7 +4446,7 @@
  # Kernel hacking
  #
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -87,16 +206,16 @@
  CONFIG_ENABLE_WARN_DEPRECATED=y
  CONFIG_ENABLE_MUST_CHECK=y
  CONFIG_FRAME_WARN=2048
-@@ -4391,7 +4392,7 @@
+@@ -4391,7 +4483,7 @@
  CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  CONFIG_DEBUG_BUGVERBOSE=y
 -CONFIG_DEBUG_INFO=y
-+CONFIG_DEBUG_INFO=n
++# CONFIG_DEBUG_INFO is not set
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_VIRTUAL is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4490,7 +4491,7 @@
+@@ -4490,7 +4582,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  CONFIG_SECURITYFS=y
  CONFIG_SECURITY_FILE_CAPABILITIES=y
@@ -105,11 +224,12 @@
  # CONFIG_IMA is not set
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
-@@ -4669,3 +4670,7 @@
- CONFIG_BC_SWAP_ACCOUNTING=y
- CONFIG_BC_PROC=y
- # CONFIG_BC_DEBUG is not set
-+
-+# Bootsplash
-+CONFIG_BOOTSPLASH=y
-+
+@@ -4634,7 +4726,7 @@
+ CONFIG_GENERIC_FIND_LAST_BIT=y
+ CONFIG_CRC_CCITT=m
+ CONFIG_CRC16=m
+-CONFIG_CRC_T10DIF=m
++CONFIG_CRC_T10DIF=y
+ CONFIG_CRC_ITU_T=m
+ CONFIG_CRC32=y
+ CONFIG_CRC7=m


