summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2012-10-26 22:06:04 +0200
committerGreg Kroah-Hartman2012-10-26 22:06:04 +0200
commit7326446c728f633a0d6b3318cf491f71f044dce0 (patch)
tree42dac39eba6e0f38c44767b2732951c098d31abd /drivers/staging/Makefile
parentstaging: slicoss: fix a leak when kzalloc fail (diff)
downloadkernel-qcow2-linux-7326446c728f633a0d6b3318cf491f71f044dce0.tar.gz
kernel-qcow2-linux-7326446c728f633a0d6b3318cf491f71f044dce0.tar.xz
kernel-qcow2-linux-7326446c728f633a0d6b3318cf491f71f044dce0.zip
Staging: remove telephony drivers
We said we would wait until the 3.6 kernel release to remove these drivers. So we waited 6 months longer, that should be fine. If anyone wants them back, it is trivial to revert these, but given that I don't think they even build anymore, I doubt anyone will want them. Cc: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 72e8014c6d12..2b291c01c514 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/
obj-$(CONFIG_MFD_NVEC) += nvec/
obj-$(CONFIG_DRM_OMAP) += omapdrm/
obj-$(CONFIG_ANDROID) += android/
-obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
obj-$(CONFIG_USB_G_CCG) += ccg/
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/