diff options
Diffstat (limited to 'drivers')
| -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 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 index b5f78b6ed2bd..b5f78b6ed2bd 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/staging/telephony/Kconfig diff --git a/drivers/telephony/Makefile b/drivers/staging/telephony/Makefile index 1206615d69e4..1206615d69e4 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 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 <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 2031ac6c888c..2031ac6c888c 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 d5f923bcdffe..d5f923bcdffe 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 2c841134f61c..2c841134f61c 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 05032e2cc954..05032e2cc954 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 1915af201175..1915af201175 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/staging/telephony/phonedev.c |