summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-01-28 13:38:02 -0800
committerKumar Gala <galak@codeaurora.org>2015-03-16 16:10:58 -0500
commit9e0388c3188c602fafdbfff46ca976de32a8008f (patch)
tree650fd85a19278b690abe10f1bc373391cdba1145
parentfb6e987be44c6e9f83b371cde5955ad0f5418504 (diff)
downloadblackbird-op-linux-9e0388c3188c602fafdbfff46ca976de32a8008f.tar.gz
blackbird-op-linux-9e0388c3188c602fafdbfff46ca976de32a8008f.zip
arm: qcom: Update defconfig
After removing ARCH_REQUIRE_GPIOLIB we need to select CONFIG_GPIOLIB to keep building the pinctrl drivers. Make the defconfig smaller too by running savedefconfig. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Kumar Gala <galak@codeaurora.org>
-rw-r--r--arch/arm/configs/qcom_defconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index 881d18b9b4de..2de999338df0 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -97,9 +97,9 @@ CONFIG_PINCTRL_APQ8084=y
CONFIG_PINCTRL_IPQ8064=y
CONFIG_PINCTRL_MSM8960=y
CONFIG_PINCTRL_MSM8X74=y
+CONFIG_GPIOLIB=y
CONFIG_DEBUG_GPIO=y
CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_MSM=y
CONFIG_THERMAL=y
@@ -134,16 +134,15 @@ CONFIG_RTC_CLASS=y
CONFIG_DMADEVICES=y
CONFIG_QCOM_BAM_DMA=y
CONFIG_STAGING=y
-CONFIG_QCOM_GSBI=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_APQ_MMCC_8084=y
-CONFIG_IPQ_GCC_806X=y
CONFIG_IPQ_LCC_806X=y
CONFIG_MSM_GCC_8660=y
CONFIG_MSM_LCC_8960=y
CONFIG_MSM_MMCC_8960=y
CONFIG_MSM_MMCC_8974=y
CONFIG_MSM_IOMMU=y
+CONFIG_QCOM_GSBI=y
CONFIG_PHY_QCOM_APQ8064_SATA=y
CONFIG_PHY_QCOM_IPQ806X_SATA=y
CONFIG_EXT2_FS=y
OpenPOWER on IntegriCloud