From 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 30 Jan 2012 14:54:48 -0800 Subject: [PATCH] telephony: Move to staging This stuff is really old and in quite poor shape. Does anyone still use it? If not, I think it's appropriate to let it simmer in staging for a few releases. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman --- drivers/Kconfig | 2 -- drivers/staging/Kconfig | 2 ++ drivers/{ => staging}/telephony/Kconfig | 0 drivers/{ => staging}/telephony/Makefile | 0 drivers/staging/telephony/TODO | 10 ++++++++++ drivers/{ => staging}/telephony/ixj-ver.h | 0 drivers/{ => staging}/telephony/ixj.c | 0 drivers/{ => staging}/telephony/ixj.h | 0 drivers/{ => staging}/telephony/ixj_pcmcia.c | 0 drivers/{ => staging}/telephony/phonedev.c | 0 10 files changed, 12 insertions(+), 2 deletions(-) rename drivers/{ => staging}/telephony/Kconfig (100%) rename drivers/{ => staging}/telephony/Makefile (100%) create mode 100644 drivers/staging/telephony/TODO rename drivers/{ => staging}/telephony/ixj-ver.h (100%) rename drivers/{ => staging}/telephony/ixj.c (100%) rename drivers/{ => staging}/telephony/ixj.h (100%) rename drivers/{ => staging}/telephony/ixj_pcmcia.c (100%) rename drivers/{ => staging}/telephony/phonedev.c (100%) diff --git a/drivers/Kconfig b/drivers/Kconfig index 5afe5d1f199b..decf8e420856 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -40,8 +40,6 @@ source "drivers/net/Kconfig" source "drivers/isdn/Kconfig" -source "drivers/telephony/Kconfig" - # input before char - char/joystick depends on it. As does USB. source "drivers/input/Kconfig" diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 21e2f4b87f14..aaba36c6f15c 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig @@ -132,4 +132,6 @@ source "drivers/staging/omapdrm/Kconfig" source "drivers/staging/android/Kconfig" +source "drivers/staging/telephony/Kconfig" + endif # STAGING diff --git a/drivers/telephony/Kconfig b/drivers/staging/telephony/Kconfig similarity index 100% rename from drivers/telephony/Kconfig rename to drivers/staging/telephony/Kconfig diff --git a/drivers/telephony/Makefile b/drivers/staging/telephony/Makefile similarity index 100% rename from drivers/telephony/Makefile rename to drivers/staging/telephony/Makefile diff --git a/drivers/staging/telephony/TODO b/drivers/staging/telephony/TODO new file mode 100644 index 000000000000..d47dec3508d7 --- /dev/null +++ b/drivers/staging/telephony/TODO @@ -0,0 +1,10 @@ +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 and +cc Joe Perches if the module should be reactivated. + +If no module activity occurs before version 3.6 is released, this +module should be removed. diff --git a/drivers/telephony/ixj-ver.h b/drivers/staging/telephony/ixj-ver.h similarity index 100% rename from drivers/telephony/ixj-ver.h rename to drivers/staging/telephony/ixj-ver.h diff --git a/drivers/telephony/ixj.c b/drivers/staging/telephony/ixj.c similarity index 100% rename from drivers/telephony/ixj.c rename to drivers/staging/telephony/ixj.c diff --git a/drivers/telephony/ixj.h b/drivers/staging/telephony/ixj.h similarity index 100% rename from drivers/telephony/ixj.h rename to drivers/staging/telephony/ixj.h diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/staging/telephony/ixj_pcmcia.c similarity index 100% rename from drivers/telephony/ixj_pcmcia.c rename to drivers/staging/telephony/ixj_pcmcia.c diff --git a/drivers/telephony/phonedev.c b/drivers/staging/telephony/phonedev.c similarity index 100% rename from drivers/telephony/phonedev.c rename to drivers/staging/telephony/phonedev.c -- 2.20.1