staging: fix the build breakage cuased by telephony drivers
authorTomas Winkler <tomas.winkler@intel.com>
Thu, 9 Feb 2012 12:56:25 +0000 (14:56 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Feb 2012 17:07:46 +0000 (09:07 -0800)
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>
drivers/Makefile
drivers/staging/Makefile

index c07be024b962aa9ad8cce1ef635f37acd0a18fae..932e8bf203562dcd2b3e02b95e8eee39115e20f9 100644 (file)
@@ -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/
index 31c81fabfc367719dd95cb360a85d98aa7564d37..077a3f3c0b83008cf57f26527066d575371a50b3 100644 (file)
@@ -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/