| commit | 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0 | [log] [tgz] |
|---|---|---|
| author | Joe Perches <joe@perches.com> | Mon Jan 30 14:54:48 2012 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Feb 08 16:58:04 2012 -0800 |
| tree | 0ab0417437b111c9ee24b14d54faa7829177bf57 | |
| parent | 9823ec9ded836ee7ca4fe5ab7964b9cdc8af010c [diff] |
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 <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/Kconfig b/drivers/Kconfig index 5afe5d1..decf8e4 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig
@@ -40,8 +40,6 @@ 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 21e2f4b..aaba36c 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig
@@ -132,4 +132,6 @@ 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 0000000..d47dec3 --- /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 <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.
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