summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-02-09 14:56:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-09 09:07:46 -0800
commitd8e4cd99d5a13f65fb961e627b63ae70ab0fe951 (patch)
tree7d389e0aaab3efbd82454a9731fba2a0b1b68d31
parent2d9ebe77b7665a431a9816eff3eb588e05176dfa (diff)
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>
-rw-r--r--drivers/Makefile1
-rw-r--r--drivers/staging/Makefile1
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index c07be024b962..932e8bf20356 100644
--- 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 31c81fabfc36..077a3f3c0b83 100644
--- 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/