diff --git a/[refs] b/[refs]
index 9a08ae088102..584958953d4d 100644
--- 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
index 5afe5d1f199b..decf8e420856 100644
--- 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
index 21e2f4b87f14..aaba36c6f15c 100644
--- 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 b/trunk/drivers/staging/telephony/Kconfig
similarity index 100%
rename from trunk/drivers/telephony/Kconfig
rename to trunk/drivers/staging/telephony/Kconfig
diff --git a/trunk/drivers/telephony/Makefile b/trunk/drivers/staging/telephony/Makefile
similarity index 100%
rename from trunk/drivers/telephony/Makefile
rename to trunk/drivers/staging/telephony/Makefile
diff --git a/trunk/drivers/staging/telephony/TODO b/trunk/drivers/staging/telephony/TODO
new file mode 100644
index 000000000000..d47dec3508d7
--- /dev/null
+++ 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 b/trunk/drivers/staging/telephony/ixj-ver.h
similarity index 100%
rename from trunk/drivers/telephony/ixj-ver.h
rename to trunk/drivers/staging/telephony/ixj-ver.h
diff --git a/trunk/drivers/telephony/ixj.c b/trunk/drivers/staging/telephony/ixj.c
similarity index 100%
rename from trunk/drivers/telephony/ixj.c
rename to trunk/drivers/staging/telephony/ixj.c
diff --git a/trunk/drivers/telephony/ixj.h b/trunk/drivers/staging/telephony/ixj.h
similarity index 100%
rename from trunk/drivers/telephony/ixj.h
rename to trunk/drivers/staging/telephony/ixj.h
diff --git a/trunk/drivers/telephony/ixj_pcmcia.c b/trunk/drivers/staging/telephony/ixj_pcmcia.c
similarity index 100%
rename from trunk/drivers/telephony/ixj_pcmcia.c
rename to trunk/drivers/staging/telephony/ixj_pcmcia.c
diff --git a/trunk/drivers/telephony/phonedev.c b/trunk/drivers/staging/telephony/phonedev.c
similarity index 100%
rename from trunk/drivers/telephony/phonedev.c
rename to trunk/drivers/staging/telephony/phonedev.c