diff options
| author | Joe Perches <joe@perches.com> | 2012-01-30 14:54:48 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-08 16:58:04 -0800 |
| commit | 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0 (patch) | |
| 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>
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/staging/telephony/Kconfig (renamed from drivers/telephony/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/staging/telephony/Makefile (renamed from drivers/telephony/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/staging/telephony/TODO | 10 | ||||
| -rw-r--r-- | drivers/staging/telephony/ixj-ver.h (renamed from drivers/telephony/ixj-ver.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/telephony/ixj.c (renamed from drivers/telephony/ixj.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/telephony/ixj.h (renamed from drivers/telephony/ixj.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/telephony/ixj_pcmcia.c (renamed from drivers/telephony/ixj_pcmcia.c) | 0 | ||||
| -rw-r--r-- | drivers/staging/telephony/phonedev.c (renamed from drivers/telephony/phonedev.c) | 0 |
10 files changed, 12 insertions, 2 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 5afe5d1f199..decf8e42085 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 21e2f4b87f1..aaba36c6f15 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 index b5f78b6ed2b..b5f78b6ed2b 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/staging/telephony/Kconfig diff --git a/drivers/telephony/Makefile b/drivers/staging/telephony/Makefile index 1206615d69e..1206615d69e 100644 --- a/drivers/telephony/Makefile +++ b/drivers/staging/telephony/Makefile diff --git a/drivers/staging/telephony/TODO b/drivers/staging/telephony/TODO new file mode 100644 index 00000000000..d47dec3508d --- /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 index 2031ac6c888..2031ac6c888 100644 --- a/drivers/telephony/ixj-ver.h +++ b/drivers/staging/telephony/ixj-ver.h diff --git a/drivers/telephony/ixj.c b/drivers/staging/telephony/ixj.c index d5f923bcdff..d5f923bcdff 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/staging/telephony/ixj.c diff --git a/drivers/telephony/ixj.h b/drivers/staging/telephony/ixj.h index 2c841134f61..2c841134f61 100644 --- a/drivers/telephony/ixj.h +++ b/drivers/staging/telephony/ixj.h diff --git a/drivers/telephony/ixj_pcmcia.c b/drivers/staging/telephony/ixj_pcmcia.c index 05032e2cc95..05032e2cc95 100644 --- a/drivers/telephony/ixj_pcmcia.c +++ b/drivers/staging/telephony/ixj_pcmcia.c diff --git a/drivers/telephony/phonedev.c b/drivers/staging/telephony/phonedev.c index 1915af20117..1915af20117 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/staging/telephony/phonedev.c |