---

yaml --- r: 288924 b: refs/heads/master c: 6222d7a h: refs/heads/master v: v3
git-mirror · Feb 9, 2012 · f8effd2 · f8effd2
1 parent b9d928e
commit f8effd2
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9823ec9ded836ee7ca4fe5ab7964b9cdc8af010c
+refs/heads/master: 6222d7a17745f6e48fddda7245e4bb0d58bfeaf0
diff --git a/trunk/drivers/Kconfig b/trunk/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/trunk/drivers/staging/Kconfig b/trunk/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/trunk/drivers/telephony/Kconfig → trunk/drivers/staging/telephony/Kconfig b/trunk/drivers/telephony/Kconfig → trunk/drivers/staging/telephony/Kconfig
diff --git a/trunk/drivers/telephony/Makefile → trunk/drivers/staging/telephony/Makefile b/trunk/drivers/telephony/Makefile → trunk/drivers/staging/telephony/Makefile
diff --git a/trunk/drivers/staging/telephony/TODO b/trunk/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/trunk/drivers/telephony/ixj-ver.h → trunk/drivers/staging/telephony/ixj-ver.h b/trunk/drivers/telephony/ixj-ver.h → trunk/drivers/staging/telephony/ixj-ver.h
diff --git a/trunk/drivers/telephony/ixj.c → trunk/drivers/staging/telephony/ixj.c b/trunk/drivers/telephony/ixj.c → trunk/drivers/staging/telephony/ixj.c
diff --git a/trunk/drivers/telephony/ixj.h → trunk/drivers/staging/telephony/ixj.h b/trunk/drivers/telephony/ixj.h → trunk/drivers/staging/telephony/ixj.h
diff --git a/trunk/drivers/telephony/ixj_pcmcia.c → trunk/drivers/staging/telephony/ixj_pcmcia.c b/trunk/drivers/telephony/ixj_pcmcia.c → trunk/drivers/staging/telephony/ixj_pcmcia.c
diff --git a/trunk/drivers/telephony/phonedev.c → trunk/drivers/staging/telephony/phonedev.c b/trunk/drivers/telephony/phonedev.c → trunk/drivers/staging/telephony/phonedev.c
Original file line number	Diff line number	Diff line change
Expand Up		@@ -132,4 +132,6 @@ source "drivers/staging/omapdrm/Kconfig"

		source "drivers/staging/android/Kconfig"

		source "drivers/staging/telephony/Kconfig"

		endif # STAGING