From 75abd873d8cfcc55b475079749f0d0bb25b381b5 Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 9 Feb 2012 14:56:25 +0200 Subject: [PATCH] --- yaml --- r: 288974 b: refs/heads/master c: d8e4cd99d5a13f65fb961e627b63ae70ab0fe951 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/Makefile | 1 - trunk/drivers/staging/Makefile | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8aa09ef67ae9..459f51e628fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d9ebe77b7665a431a9816eff3eb588e05176dfa +refs/heads/master: d8e4cd99d5a13f65fb961e627b63ae70ab0fe951 diff --git a/trunk/drivers/Makefile b/trunk/drivers/Makefile index c07be024b962..932e8bf20356 100644 --- a/trunk/drivers/Makefile +++ b/trunk/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/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile index 31c81fabfc36..077a3f3c0b83 100644 --- a/trunk/drivers/staging/Makefile +++ b/trunk/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/