staging: fix the build breakage cuased by telephony drivers

Fix build error caused by commit:

6222d7a17745f6e48fddda7245e4bb0d58bfeaf0
telephony: Move to staging

The telephony driver was moved to staging but the Makefiles
weren't updated

Cc: Joe Perches <joe@perches.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/Makefile b/drivers/Makefile
index c07be024b962aa9ad8cce1ef635f37acd0a18fae..932e8bf203562dcd2b3e02b95e8eee39115e20f9 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -86,7 +86,6 @@ obj-$(CONFIG_POWER_SUPPLY)    += power/
 obj-$(CONFIG_HWMON)            += hwmon/
 obj-$(CONFIG_THERMAL)          += thermal/
 obj-$(CONFIG_WATCHDOG)         += watchdog/
-obj-$(CONFIG_PHONE)            += telephony/
 obj-$(CONFIG_MD)               += md/
 obj-$(CONFIG_BT)               += bluetooth/
 obj-$(CONFIG_ACCESSIBILITY)    += accessibility/

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 31c81fabfc367719dd95cb360a85d98aa7564d37..077a3f3c0b83008cf57f26527066d575371a50b3 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -58,3 +58,4 @@ obj-$(CONFIG_MFD_NVEC)                += nvec/
 obj-$(CONFIG_DRM_OMAP)         += omapdrm/
 obj-$(CONFIG_ANDROID)          += android/
 obj-$(CONFIG_RAMSTER)          += ramster/
+obj-$(CONFIG_PHONE)            += telephony/