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

Commit 7326446c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: remove telephony drivers 



We said we would wait until the 3.6 kernel release to remove these
drivers.  So we waited 6 months longer, that should be fine.

If anyone wants them back, it is trivial to revert these, but given that
I don't think they even build anymore, I doubt anyone will want them.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34ec83f4

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ source "drivers/staging/omapdrm/Kconfig" 


source "drivers/staging/android/Kconfig"



source "drivers/staging/telephony/Kconfig"



source "drivers/staging/ozwpan/Kconfig"



source "drivers/staging/ccg/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/ 
obj-$(CONFIG_MFD_NVEC)		+= nvec/

obj-$(CONFIG_DRM_OMAP)		+= omapdrm/

obj-$(CONFIG_ANDROID)		+= android/

obj-$(CONFIG_PHONE)		+= telephony/

obj-$(CONFIG_USB_WPAN_HCD)	+= ozwpan/

obj-$(CONFIG_USB_G_CCG)		+= ccg/

obj-$(CONFIG_WIMAX_GDM72XX)	+= gdm72xx/

drivers/staging/telephony/Kconfig

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
#

# Telephony device configuration

#



menuconfig PHONE

	tristate "Telephony support"

	depends on HAS_IOMEM

	---help---

	  Say Y here if you have a telephony card, which for example allows

	  you to use a regular phone for voice-over-IP applications.



	  Note: this has nothing to do with modems.  You do not need to say Y

	  here in order to be able to use a modem under Linux.



	  To compile this driver as a module, choose M here: the

	  module will be called phonedev.



if PHONE



config PHONE_IXJ

	tristate "QuickNet Internet LineJack/PhoneJack support"

	depends on ISA || PCI

	---help---

	  Say M if you have a telephony card manufactured by Quicknet

	  Technologies, Inc.  These include the Internet PhoneJACK and

	  Internet LineJACK Telephony Cards. You will get a module called

	  ixj.



	  For the ISA versions of these products, you can configure the

	  cards using the isapnp tools (pnpdump/isapnp) or you can use the

	  isapnp support.  Please read <file:Documentation/telephony/ixj.txt>.



	  For more information on these cards, see Quicknet's web site at:

	  <http://www.quicknet.net/>.



	  If you do not have any Quicknet telephony cards, you can safely

	  say N here.



config PHONE_IXJ_PCMCIA

	tristate "QuickNet Internet LineJack/PhoneJack PCMCIA support"

	depends on PHONE_IXJ && PCMCIA

	help

	  Say Y here to configure in PCMCIA service support for the Quicknet

	  cards manufactured by Quicknet Technologies, Inc.  This changes the

	  card initialization code to work with the card manager daemon.



endif # PHONE

drivers/staging/telephony/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#

# Makefile for drivers/telephony

#



obj-$(CONFIG_PHONE) += phonedev.o

obj-$(CONFIG_PHONE_IXJ) += ixj.o

obj-$(CONFIG_PHONE_IXJ_PCMCIA) += ixj_pcmcia.o

drivers/staging/telephony/TODO

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
TODO

. Determine if the boards are still in use

  and move this module back to drivers/telephony if necessary

. Coding style cleanups



Please send patches to Greg Kroah-Hartman <greg@kroah.com> and

cc Joe Perches <joe@perches.com> if the module should be reactivated.



If no module activity occurs before version 3.6 is released, this

module should be removed.