Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c7c204a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
  Add layer1 over IP support
  Add mISDN HFC multiport driver
  Add mISDN HFC PCI driver
  Add mISDN DSP
  Add mISDN core files
  Define AF_ISDN and PF_ISDN
  Add mISDN driver
parents 22842842 3712b42d

Documentation/isdn/README.mISDN

0 → 100644
+6 −0
Original line number Diff line number Diff line 
mISDN is a new modular ISDN driver, in the long term it should replace

the old I4L driver architecture for passiv ISDN cards.

It was designed to allow a broad range of applications and interfaces

but only have the basic function in kernel, the interface to the user

space is based on sockets with a own address family AF_ISDN.

drivers/isdn/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



menuconfig ISDN

	tristate "ISDN support"

	bool "ISDN support"

	depends on NET

	depends on !S390

	---help---
@@ -21,6 +21,8 @@ menuconfig ISDN 


if ISDN



source "drivers/isdn/mISDN/Kconfig"



menuconfig ISDN_I4L

	tristate "Old ISDN4Linux (deprecated)"

	---help---

drivers/isdn/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


obj-$(CONFIG_ISDN_I4L)			+= i4l/

obj-$(CONFIG_ISDN_CAPI)			+= capi/

obj-$(CONFIG_MISDN)			+= mISDN/

obj-$(CONFIG_ISDN_CAPI)			+= hardware/

obj-$(CONFIG_ISDN_DIVERSION)		+= divert/

obj-$(CONFIG_ISDN_DRV_HISAX)		+= hisax/

drivers/isdn/hardware/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 


obj-$(CONFIG_CAPI_AVM)		+= avm/

obj-$(CONFIG_CAPI_EICON)	+= eicon/

obj-$(CONFIG_MISDN)		+= mISDN/

drivers/isdn/hardware/mISDN/Kconfig

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#

# Hardware for mISDN

#

comment "mISDN hardware drivers"



config MISDN_HFCPCI

	tristate "Support for HFC PCI cards"

	depends on MISDN

	depends on PCI

	help

	  Enable support for cards with Cologne Chip AG's

          HFC PCI chip.



config MISDN_HFCMULTI

	tristate "Support for HFC multiport cards (HFC-4S/8S/E1)"

	depends on PCI

	depends on MISDN

	help

	  Enable support for cards with Cologne Chip AG's HFC multiport

	  chip. There are three types of chips that are quite similar,

	  but the interface is different:

	   * HFC-4S (4 S/T interfaces on one chip)

	   * HFC-8S (8 S/T interfaces on one chip)

	   * HFC-E1 (E1 interface for 2Mbit ISDN)